From 94865b4fe4de5b55e2675e9a61c77e0ae5680c18 Mon Sep 17 00:00:00 2001
From: liudianxin <liudianxin@bd-apaas.com>
Date: Tue, 23 Jun 2020 10:24:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=A1=A3=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/user/user_info.vue | 42 ++++++++++++------------------------
 src/request/api/user.js      |  2 +-
 2 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/src/pages/user/user_info.vue b/src/pages/user/user_info.vue
index 395db05..197e260 100644
--- a/src/pages/user/user_info.vue
+++ b/src/pages/user/user_info.vue
@@ -73,9 +73,9 @@
           <el-form-item class="info_item">
             <p>IP（白名单）：</p>
             <div class="ip_block">
-              <div v-for="item in formBusiness.ip_white" :key="item.id" class="ip_item">
-                {{ item.ip }}
-                <i class="el-icon-close ip_del" @click="delIp(item.ip, 'white')"></i>
+              <div v-for="item in formBusiness.ip_white" :key="item" class="ip_item">
+                {{ item }}
+                <i class="el-icon-close ip_del" @click="delIp(item, 'white')"></i>
               </div>
               <el-input
                 v-if="whiteAddShow"
@@ -89,9 +89,9 @@
           <el-form-item class="info_item">
             <p>IP（黑名单）：</p>
             <div class="ip_block">
-              <div v-for="item in formBusiness.ip_black" :key="item.id" class="ip_item">
-                {{ item.ip }}
-                <i class="el-icon-close ip_del" @click="delIp(item.ip, 'black')"></i>
+              <div v-for="item in formBusiness.ip_black" :key="item" class="ip_item">
+                {{ item }}
+                <i class="el-icon-close ip_del" @click="delIp(item, 'black')"></i>
               </div>
               <el-input
                 v-if="blackAddShow"
@@ -104,7 +104,7 @@
           </el-form-item>
           <el-form-item class="info_item info_item_right_btn_2">
             <p>密钥：</p>
-            <el-input ref="keys" v-model="formBusiness.key"></el-input>
+            <el-input ref="keys" v-model="formBusiness.key" :disabled="true"></el-input>
             <el-button class="option_btn" @click="copyKey">复制</el-button>
             <el-button class="option_btn_gray" @click="resetKey">重置</el-button>
           </el-form-item>
@@ -198,22 +198,8 @@ export default {
     formBusiness: {
       businessSystemName: "",
       domainName: "",
-      ip_white: [
-        { ip: "255.255.255.255", id: "123789244" },
-        { ip: "255.255.255.255", id: "123576744" },
-        { ip: "255.255.255.255", id: "123467866874" },
-        { ip: "255.255.255.255", id: "1226783544" }
-      ],
-      ip_black: [
-        { ip: "255.255.255.255", id: "12773844" },
-        { ip: "255.255.255.255", id: "12561344" },
-        { ip: "255.255.255.255", id: "1235672344" },
-        { ip: "255.255.255.255", id: "12342314" },
-        { ip: "255.255.255.255", id: "12386444" },
-        { ip: "255.255.255.255", id: "12783544" },
-        { ip: "255.255.255.255", id: "121678344" },
-        { ip: "255.255.255.255", id: "127678344" }
-      ],
+      ip_white: [],
+      ip_black: [],
       key: "",
       description: ""
     },
@@ -328,7 +314,7 @@ export default {
           origin_password: this.form.passwordOld,
           new_password: this.form.passwordNew
         }
-      }
+      };
       this.$api.user.editUserPassword(query).then(response => {
         if (response.data.success == 1) {
           this.$message({
@@ -365,12 +351,12 @@ export default {
       this.$api.authority.updateLevel().then(response => {
         if (response.data.success == 1) {
           this.$message({
-            message: "重置密钥成功",
+            message: "申请升级开发者成功",
             type: "success"
           });
         } else {
           this.$message({
-            message: "重置密钥失败",
+            message: "申请升级开发者失败",
             type: "error"
           });
         }
@@ -407,7 +393,7 @@ export default {
     watchKeyboardWhite() {
       let self = this;
       if (self.newIpWhite != "") {
-        self.formBusiness.ip_white.push({ ip: self.newIpWhite, id: 0 });
+        self.formBusiness.ip_white.push(self.newIpWhite);
         self.whiteAddShow = false;
         self.newIpWhite = "";
       }
@@ -415,7 +401,7 @@ export default {
     watchKeyboardBlack() {
       let self = this;
       if (self.newIpBlack != "") {
-        self.formBusiness.ip_black.push({ ip: self.newIpBlack, id: 0 });
+        self.formBusiness.ip_black.push(self.newIpBlack);
         self.blackAddShow = false;
         self.newIpBlack = "";
       }
diff --git a/src/request/api/user.js b/src/request/api/user.js
index 6ab284d..2252292 100644
--- a/src/request/api/user.js
+++ b/src/request/api/user.js
@@ -44,7 +44,7 @@ const user = {
         return axios.get(`/apaas/backmgt/user/detail/${params.id}`);
     },
     editUserPassword(params) {
-        return axios.post(`/apaas/backmgt/user/password/${params.id}`, params.form);
+        return axios.post(`/apaas/backmgt/user/password/${params.id}`, qs.stringify(params.form));
     },
 }
 
-- 
2.26.0