From ae1e7b1492f5a7852cc6bc2eb1b68e711bcf973a Mon Sep 17 00:00:00 2001
From: cyl <cyl20231031>
Date: Wed, 29 Nov 2023 16:21:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/main.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/main.vue b/src/views/main.vue
index 532f2dd..7949876 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -110,7 +110,8 @@
                     <i class="iconfont icon-youjiantou"></i>
                   </div>
                 </router-link> -->
-                <router-link to="###" v-if="loginValue.agencyName == '郑州一才工作' && (loginValue.agencyRole == 2 || loginValue.agencyRole == 1 )">
+				<!-- 2023-11-29 注释该条件 && (loginValue.agencyRole == 2 || loginValue.agencyRole == 1 ) -->
+                <router-link to="###" v-if="loginValue.agencyName == '郑州一才工作'">
                   <div @click="goAdmin">
                     <span>
                       <i class="iconfont icon-shangjiahoutai"></i>商家后台
@@ -669,12 +670,12 @@ export default {
       let obj = JSON.parse(localStorage.getItem('LOGIN_DATA'))
       if (window.location.hostname == 'localhost') {
         // 测试环境，通过URL获取token
-        window.location.href = 'http://localhost:3000/merchantManagement/homePage?token=' + obj.token + '&username=' + obj.user.userName + '&avatar=' + obj.imgSrc + '&roleid=' + obj.user.agencyRoleId;
+        window.location.href = 'http://localhost:3000/merchantManagement/homePage?token=' + obj.token + '&username=' + (obj.user.userName ? obj.user.userName : obj.user.nickName) + '&avatar=' + obj.imgSrc + '&roleid=' + obj.user.agencyRoleId;
       } else {
         // 正式环境，通过缓存获取
         localStorage.setItem('daotian_to_admin_token', obj.token)
         localStorage.setItem('daotian_to_admin_avatar', obj.imgSrc)
-        localStorage.setItem('daotian_to_admin_username', obj.user.userName)
+        localStorage.setItem('daotian_to_admin_username', obj.user.userName ? obj.user.userName : obj.user.nickName)
 		localStorage.setItem('daotian_to_admin_roleid', obj.user.agencyRoleId)
         window.location.href = 'http://idaotian.com/dist2.0.0/#/merchantManagement/homePage'
       }