From 5ec4dba861ae35da9699da4054abc6eff7fc4ca7 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Fri, 15 Oct 2021 10:46:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=94=E5=9B=9E=E5=BB=B6=E8=BF=9F=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/rightBox/profileBox.vue   |  3 +--
 nezha-fronted/src/components/layout/header.vue      |  3 ---
 .../src/components/page/config/profile.vue          | 13 ++++++++++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/nezha-fronted/src/components/common/rightBox/profileBox.vue b/nezha-fronted/src/components/common/rightBox/profileBox.vue
index 652b9fdcf..6c7ba551c 100644
--- a/nezha-fronted/src/components/common/rightBox/profileBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/profileBox.vue
@@ -21,7 +21,7 @@
           <el-form-item :label="$t('profile.mobile')" prop="mobile">
             <el-input maxlength="64" show-word-limit v-model="editProfile.mobile" size="small" type="text"></el-input>
           </el-form-item>
-          <el-form-item :label="$t('profile.role')" v-if="editProfile.roles[0].i18n != ''" prop="roles">
+          <el-form-item :label="$t('profile.role')" v-if="editProfile.roles[0].i18n !== ''" prop="roles">
             <el-input maxlength="64" show-word-limit v-model="editProfile.roles[0].i18n" disabled size="small" type="text"></el-input>
           </el-form-item>
           <el-form-item :label="$t('profile.role')" v-else prop="roles">
@@ -82,7 +82,6 @@ export default {
         { value: 'en', label: 'English' },
         { value: 'cn', label: '简体中文' }
       ],
-      roles: [],
       rules: {
         name: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
diff --git a/nezha-fronted/src/components/layout/header.vue b/nezha-fronted/src/components/layout/header.vue
index 27fccffff..58253da40 100644
--- a/nezha-fronted/src/components/layout/header.vue
+++ b/nezha-fronted/src/components/layout/header.vue
@@ -116,7 +116,6 @@ export default {
           permission: 'header_add_rule'
         }
       ],
-      showChangePin: false,
       showGuide: false
     }
   },
@@ -165,7 +164,6 @@ export default {
     //   })
     // },
     showPinDialog () {
-      // this.showChangePin = true
       this.$router.push({
         path: '/profile',
         query: {
@@ -174,7 +172,6 @@ export default {
       })
     },
     dialogClosed () {
-      this.showChangePin = false
       this.showGuide = false
     },
     cancel () {
diff --git a/nezha-fronted/src/components/page/config/profile.vue b/nezha-fronted/src/components/page/config/profile.vue
index 15b7b6c86..5435eff18 100644
--- a/nezha-fronted/src/components/page/config/profile.vue
+++ b/nezha-fronted/src/components/page/config/profile.vue
@@ -142,7 +142,7 @@ import QRCode from "qrcodejs2"
 import MessageBox from "element-ui/packages/message-box/src/main"
 import i18n from "@/components/common/i18n"
 import profileBox from '@/components/common/rightBox/profileBox'
-import dataList from '@/components/common/mixin/dataList'
+// import dataList from '@/components/common/mixin/dataList'
 
 export default {
   name: 'profile',
@@ -150,7 +150,7 @@ export default {
     operationRecord,
     profileBox
   },
-  mixins: [dataList],
+  // mixins: [dataList],
   data () {
     return {
       username: sessionStorage.getItem('nz-username'),
@@ -165,6 +165,10 @@ export default {
       authToken: '',
       url: 'sys/user/profile',
       object: {},
+      // 侧滑
+      rightBox: {
+        show: false
+      },
       blankObject: { // 空白对象
         id: '',
         name: '',
@@ -306,11 +310,14 @@ export default {
       })
     },
     profileBox () {
-      this.rightBox.show = true
       this.$get(this.url).then(res => {
         this.object = res.user
+        this.rightBox.show = true
       })
     },
+    closeRightBox () {
+      this.rightBox.show = false
+    },
     clickProfile () {
       this.personalCenter()
     },