Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

.idea/codeStyles/Project.xml

@@ -1,6 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <JSCodeStyleSettings version="0">
+    <JSCodeStyleSettings>
       <option name="USE_SEMICOLON_AFTER_STATEMENT" value="false" />
       <option name="FORCE_SEMICOLON_STYLE" value="true" />
       <option name="SPACE_BEFORE_GENERATOR_MULT" value="true" />

config/dev.env.js

@@ -8,10 +8,10 @@ module.exports = {
   ENV_CONFIG: '"dev"',
   BASE_API:  '"http://api.xt.test.sgjyun.com"',// //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
 
-  // SSO_HOST: '"http://testsso.sgjyun.com"',
-  // SRCM_HOST: '"http://test1.sgjyun.com"',
-  // XT_HOST: '"http://xt.test.sgjyun.com"',
-  // MIRCO_MALL_HOST: '"http://mall.test.sgjyun.com"',
-  // CDM_HOST: '"http://cdm.test.sgjyun.com"',
+  SSO_HOST: '"http://testsso.sgjyun.com"',
+  SRCM_HOST: '"http://test1.sgjyun.com"',
+  XT_HOST: '"http://xt.test.sgjyun.com"',
+  MIRCO_MALL_HOST: '"http://mall.test.sgjyun.com"',
+  CDM_HOST: '"http://cdm.test.sgjyun.com"',
 }
 

config/index.js

@@ -17,11 +17,10 @@ module.exports = {
     // can be overwritten by process.env.HOST
     // if you want dev by ip, please set host: '0.0.0.0'
 
-    host: 'xt.test.sgjyun.com',
-    // host: 'xt.kuyicloud.com',
     // host: 'xt.test.sgjyun.com',
-    // host:'localhost',
-    port:9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+    // host: 'xt.kuyicloud.com',
+    host: 'xt.test.sgjyun.com',
+    port: 9526, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,
     notifyOnErrors: false,

src/xt_pages/role/admin.vue

@@ -171,6 +171,7 @@ export default {
       })
     },
     recoverAdminAction: function(row) {
+    
       const loading = this.$loading({
         lock: true,
         text: '正在恢复管理员...',

src/xt_pages/role/components/AdminInfoForm.vue

@@ -133,11 +133,13 @@ export default {
           this.loading = false
           var resp = rs.data
           if (resp.state === 1) {
-            this.roles.push(...resp.data.roles)
+            // this.roles.push(...resp.data.roles)
+            this.roles =  resp.data.roles
             this.qntoken = resp.data.qntoken
-            if (this.roles.length > 0) {
-              this.form.role = this.roles[0].id
-            }
+            // if (this.roles.length > 0) {
+            //   this.form.role = this.roles[0].id;
+            //   console.log("国庆快乐",this.form.role)
+            // }
           } else {
             this.$message.error(resp.msg)
           }
@@ -162,11 +164,11 @@ export default {
             this.form.role = admin.role_id
             this.form.intro = admin.intro
           } else {
-            this.$message.error(resp.msg)
+            this.$message.error("该用户不存在")
           }
         }).catch(err => {
           this.loading = false
-          this.$message.error(err)
+          this.$message.error("该用户不存在")
         })
       }