From 00ce725950784e77ab65d01984eec204a1502106 Mon Sep 17 00:00:00 2001
From: liudianxin <liudianxin@bd-apaas.com>
Date: Tue, 23 Jun 2020 12:01:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=A4=B4=E5=83=8F+=E5=AF=86?=
 =?UTF-8?q?=E9=92=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/menu.vue                | 13 ++++++++++---
 src/pages/data-analysis/my-service.vue |  1 +
 src/pages/user/user_info.vue           |  6 +++---
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/components/menu.vue b/src/components/menu.vue
index bcb5442..dcb5821 100644
--- a/src/components/menu.vue
+++ b/src/components/menu.vue
@@ -8,7 +8,7 @@
       >{{ userInfo.user_name }}</span>
       <span v-else @click="gotopage('login')" class="user">请登录</span>
       <img
-        class="user_pic"
+        :class="userInfo.picture_path ? 'user_pic': 'user_default'"
         :src="
           userInfo.picture_path || require('../assets/imgs/home_ic_user.png')
         "
@@ -273,12 +273,19 @@ export default {
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-  margin-right: 40px;
+  margin-right: 20px;
   font-size: 16px;
 }
 .user_pic {
   float: right;
-  margin-right: 15px;
+  margin-right: 10px;
+  margin-top: 26px;
+  width: 30px;
+  height: 30px;
+}
+.user_default {
+  float: right;
+  margin-right: 10px;
   margin-top: 30px;
 }
 .car {
diff --git a/src/pages/data-analysis/my-service.vue b/src/pages/data-analysis/my-service.vue
index ea114e8..34e31c5 100644
--- a/src/pages/data-analysis/my-service.vue
+++ b/src/pages/data-analysis/my-service.vue
@@ -235,6 +235,7 @@ export default {
 .in_analysis {
   padding: 0 10px 10px;
   height: 100%;
+  min-width: 1000px;
 }
 .in_l {
 }
diff --git a/src/pages/user/user_info.vue b/src/pages/user/user_info.vue
index b177967..2f8a981 100644
--- a/src/pages/user/user_info.vue
+++ b/src/pages/user/user_info.vue
@@ -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" :disabled="true"></el-input>
+            <el-input ref="keys" v-model="formBusiness.private_token" :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>
@@ -200,7 +200,7 @@ export default {
       domainName: "",
       ip_white: [],
       ip_black: [],
-      key: "",
+      private_token: "",
       description: ""
     },
     whiteAddShow: false,
@@ -248,7 +248,7 @@ export default {
           this.formBusiness.domainName = data.domain_name;
           this.formBusiness.ip_white = data.ip_whitelist;
           this.formBusiness.ip_black = data.ip_blacklist;
-          this.formBusiness.key = data.key;
+          this.formBusiness.private_token = data.private_token;
           this.formBusiness.description = data.description;
         }
       });
-- 
2.26.0