Merge branch 'master' of http://10.0.41.100:3000/lishenfeng/ss-system-web

src/setupProxy.js

@@ -5,6 +5,8 @@ module.exports = function (app) {
       '/gunshiApp/ss',
       createProxyMiddleware({
         target: 'http://223.75.53.141:83/',//正式环境
+        // target: 'http://192.168.66.7:24305/',//wy开发环境
+
         changeOrigin: true,
       })
     );  

src/views/systemMange/role/rolePage/form.js

@@ -23,11 +23,12 @@ const ModalForm = ({ mode, record,onEdit,onSave, onCrudSuccess, close  }) => {
       values.roleId = record.roleId
       const {code} = await qzc_xyt_httpput(apiurl.systemManagement.role.save,values)
       if(code===200){
-        message.success('新增成功')
+        message.success('修改成功')
         onCrudSuccess()
         close()
       }else{
-        message.error('新增失败')
+
+        message.error('修改失败')
       }
     }
     if (mode === 'save') {

src/views/systemMange/role/rolePage/index.js

@@ -44,12 +44,12 @@ const Page = () => {
         message.error('无法删除超级管理员')
         return 
       }
-      const {code, msg} = await httpdelete(apiurl.systemManagement.role.delete+params.roleId)
+      const {code, description} = await httpdelete(apiurl.systemManagement.role.delete+params.roleId)
       if(code===200){
           refresh()
           message.success('删除成功')
       }else{
-          message.error(msg)
+        message.error(description||'删除失败')
       }
     } else if (type === 'cjxgl') {
       refModal2.current.show(params)