From d50f0f282c6953755690fd1b012ea8c304c2c1a1 Mon Sep 17 00:00:00 2001
From: red-deng-deng <1924913374@qq.com>
Date: Tue, 23 Nov 2021 20:47:40 +0800
Subject: [PATCH] gengxin

---
 src/assets/api.js                         | 23 ++++---------------
 src/assets/comm.css                       |  2 +-
 src/pages/exchangepage/main/main.js       | 28 ++++++-----------------
 src/pages/exchangepage/mytemplate/main.js |  3 +--
 src/pages/home/home.js                    |  8 ++++---
 src/pages/order/list/list.js              |  1 +
 6 files changed, 19 insertions(+), 46 deletions(-)

diff --git a/src/assets/api.js b/src/assets/api.js
index 9afa506a..e8d78b77 100644
--- a/src/assets/api.js
+++ b/src/assets/api.js
@@ -348,8 +348,8 @@ export const postRole = (data) => {
 	return req('post', baseurl + "/auth/adminRole",data)
 }
 //角色编辑
-export const postEditRole = (id,data) => {
-	return req('post', baseurl + "/auth/adminRole/"+id,data)
+export const putEditRole = (id,data) => {
+	return req('put', baseurl + "/auth/adminRole/"+id,data)
 }
 
 
@@ -428,16 +428,11 @@ export const postLogin = (data) => {
 //连续输入三次，需验证码校验
 export const getVerify = (params) => {
 	return req('post', baseurl + "/auth/login/verify", params)
-	return req('post', baseurl + "/auth/admin/status", data)
 }
 //获取用户信息接口
 export const getUserinfo= (params) => {
 	return req('get', baseurl + "/auth/admin/userinfo",params)
 }
-//退出登录接口
-export const postLogOut = (data) => {
-	return req('post', baseurl + "/auth/logout", data)
-}
 
 
 
@@ -483,19 +478,9 @@ export const getSystemTemplate= (data) => {
 
 
 
-//登录
-export const postLogin = (data) => {
-	return req('post', baseurl + "/auth/login", data)
-}
+
 // logout退出登录
-//连续输入三次，需验证码校验
-export const getVerify = (params) => {
-	return req('post', baseurl + "/auth/login/verify", params)
-}
-//获取用户信息接口
-export const getUserinfo= (params) => {
-	return req('get', baseurl + "/auth/admin/userinfo",params)
-}
+
 //退出登录接口
 export const postLogOut = (data) => {
 	return req('post', baseurl + "/auth/logout", data)
diff --git a/src/assets/comm.css b/src/assets/comm.css
index b8112a20..2fdbc6b7 100644
--- a/src/assets/comm.css
+++ b/src/assets/comm.css
@@ -103,7 +103,7 @@ html,body,h1,h2,h3,h4,h5,h6,p,ul,li,dl,dd,dt,ol,input{
   vertical-align: middle;
   /* border: 2px solid rgb(159, 222, 252); */
   margin-right: 5px;
-
+}
 
 .delfilebtn{
   color: #296bef;
diff --git a/src/pages/exchangepage/main/main.js b/src/pages/exchangepage/main/main.js
index e8c82bff..1af97a17 100644
--- a/src/pages/exchangepage/main/main.js
+++ b/src/pages/exchangepage/main/main.js
@@ -269,24 +269,13 @@ export default class acclist extends React.Component {
 			current,
 			pageSize
 		} = this.state;
-		return ( <
-			div id = "dislist" >
-			<
-			TabPage tabs = {
-				this.state.tabList
-			}
-			tabChange = {
+		return ( <div id = "dislist" >
+			<TabPage tabs = {this.state.tabList} tabChange = {
 				(e) => this.tabChange(e)
 			} >
-			<
-			div className = "distable dflexj" >
-			<
-			Button type = "primary"
-			icon = "plus"
-			onClick = {
-				this.clickFn.bind(this)
-			} > 我的模板 < /Button> <
-			Ipt icon = "search"
+			<div className = "distable dflexj" >
+			<Button type = "primary" icon = "plus"
+			onClick = {this.clickFn.bind(this)} > 我的模板 </Button> <Ipt icon = "search"
 			placeholder = {
 				"请输入关键字进行搜索"
 			}
@@ -302,12 +291,9 @@ export default class acclist extends React.Component {
 			alignment = {
 				'left'
 			}
-			/> <
-			/div> <
-			div >
+			/> </div> <div >
 
-			<
-			Grid isBorder = {
+			<Grid isBorder = {
 				true
 			}
 			spliteColor = {
diff --git a/src/pages/exchangepage/mytemplate/main.js b/src/pages/exchangepage/mytemplate/main.js
index 3ab0a360..4bebdfec 100644
--- a/src/pages/exchangepage/mytemplate/main.js
+++ b/src/pages/exchangepage/mytemplate/main.js
@@ -226,8 +226,7 @@ delFn(e,row){
          		a onClick={(e)=>{this.delFn(e,rowData)}}
          	className = "grid-link" > 删除 < /a>
          
-         		<
-         		/span>
+         		</span>
          }
         }}
         />
diff --git a/src/pages/home/home.js b/src/pages/home/home.js
index 76de6ec3..5cb687bc 100644
--- a/src/pages/home/home.js
+++ b/src/pages/home/home.js
@@ -6,7 +6,7 @@ import React, {
 import {
 	HashRouter as Router,
 	Route,
-	Link,
+  Link,
 	Redirect
 } from "react-router-dom";
 import "./home.less"
@@ -14,7 +14,9 @@ import "../../assets/comm.css"
 // import Topnav from "../../components/topNav/main"
 import Subnav from "../../components/subnav/main"
 import {
-	Avatar,
+  Avatar,
+  Pop,
+  Sweetalert,
 	Notify
 } from 'zent';
 import extension from '../extension/main/main';
@@ -60,7 +62,7 @@ import distributoradd from '../distributor/add/add';
 import mytempMouldadd from '../exchangepage/template/main.js'
 import edittemplate from '../exchangepage/edittemplate/main.js'
 import myexchangetemplate from '../exchangepage/mytemplate/main.js'
-
+import {getUserinfo,handelResponse,postLogOut} from "../../assets/api.js"
 let timerstop = null;
 export default class App extends Component {
 
diff --git a/src/pages/order/list/list.js b/src/pages/order/list/list.js
index 2d7e787f..b386bc78 100644
--- a/src/pages/order/list/list.js
+++ b/src/pages/order/list/list.js
@@ -218,6 +218,7 @@ export default class orderlist extends React.Component{
 
   //作废
   deleteFn(e,row){
+    let self=this;
       Sweetalert.confirm({
         type:'warning',
         closeBtn:true,