From febecb146a1216d48452255b96712df927415ee6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Thu, 9 Jan 2025 10:28:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/header-tools.vue | 54 +++++++++--------
 src/views/cms/article/index.vue        |  6 +-
 src/views/cms/navigation/index.vue     |  2 +-
 src/views/cms/photo/list.vue           |  2 +-
 src/views/passport/login/index.vue     |  2 +-
 src/views/system/profile/index.vue     | 80 ++++++++++++--------------
 6 files changed, 69 insertions(+), 77 deletions(-)

diff --git a/src/layout/components/header-tools.vue b/src/layout/components/header-tools.vue
index b3f0913..53ed144 100644
--- a/src/layout/components/header-tools.vue
+++ b/src/layout/components/header-tools.vue
@@ -58,7 +58,7 @@
             </template>
           </a-avatar>
           <span :class="{ 'hidden-sm-and-down': styleResponsive }">
-            {{ merchantName ? merchantName : loginUser.realName }}
+            {{ loginUser.realName || loginUser.nickname }}
           </span>
           <down-outlined style="margin-left: 6px" />
         </div>
@@ -69,7 +69,12 @@
                 <div class="user-info">
                   <div class="nickname">
                     <div class="ele-text-placeholder">
-                      UID：<span class="ele-text-secondary">{{
+                      租户：<span class="ele-text-secondary">{{
+                        loginUser.tenantName
+                      }}</span>
+                    </div>
+                    <div class="ele-text-placeholder">
+                      用户ID：<span class="ele-text-secondary">{{
                         loginUser.userId
                       }}</span>
                       <copy-outlined
@@ -77,21 +82,20 @@
                         @click="copyText(loginUser.userId)"
                       />
                     </div>
-                    <span class="ele-text-placeholder">
-                      昵称：
-                      <span class="ele-text-secondary">{{
-                        loginUser.nickname
+                    <div class="ele-text-placeholder">
+                      手机：<span class="ele-text-secondary">{{
+                        loginUser.phone
                       }}</span>
-                    </span>
-                    <div class="role" style="margin-top: 10px">
+                    </div>
+                    <div class="ele-text-placeholder">
+                      角色：
                       <template
                         v-for="(item, index) in loginUser.roles"
                         :key="item.roleId"
                       >
-                        <a-tag color="blue" v-if="index === 0">
+                        <a-tag v-if="index === 0">
                           <div class="role-name">
                             <span>{{ item.roleName }}</span>
-                            <span v-if="index === 1">等</span>
                           </div>
                         </a-tag>
                       </template>
@@ -103,32 +107,26 @@
             <a-menu-divider />
             <a-menu-item key="profile">
               <div class="ele-cell">
-                <div class="ele-cell-content"> 个人中心 </div>
+                <div class="ele-cell-content"> {{ t('layout.header.profile')}} </div>
               </div>
             </a-menu-item>
             <a-menu-divider />
             <a-menu-item key="password">
               <div class="ele-cell">
-                <div class="ele-cell-content"> 修改密码 </div>
+                <div class="ele-cell-content"> {{ t('layout.header.password') }} </div>
               </div>
             </a-menu-item>
-            <template v-if="loginUser.username == 'admin'">
+            <template v-if="loginUser.username == 'admin' || loginUser.username == 'superAdmin'">
+              <!--              <a-menu-divider />-->
+              <!--              <a-menu-item key="accessKey">-->
+              <!--                <div class="ele-cell">-->
+              <!--                  <div class="ele-cell-content"> {{ t('layout.header.accessKey') }} </div>-->
+              <!--                </div>-->
+              <!--              </a-menu-item>-->
               <a-menu-divider />
-              <a-menu-item key="accessKey" v-if="loginUser.username == 'admin'">
+              <a-menu-item key="system">
                 <div class="ele-cell">
-                  <div class="ele-cell-content"> 秘钥管理 </div>
-                </div>
-              </a-menu-item>
-              <a-menu-divider />
-              <a-menu-item key="skin" v-if="loginUser.username == 'admin'">
-                <div class="ele-cell">
-                  <div class="ele-cell-content"> 偏好设置 </div>
-                </div>
-              </a-menu-item>
-              <a-menu-divider />
-              <a-menu-item key="system" v-if="loginUser.username == 'admin'">
-                <div class="ele-cell">
-                  <div class="ele-cell-content"> 系统设置 </div>
+                  <div class="ele-cell-content"> {{ t('layout.header.system') }} </div>
                 </div>
               </a-menu-item>
             </template>
@@ -349,7 +347,7 @@
       });
     }
     // 写入缓存
-    if (loginUser.value.merchantId) {
+    if (loginUser.value.merchantId && loginUser.value.merchantName) {
       localStorage.setItem('MerchantId', `${loginUser.value.merchantId}`);
       localStorage.setItem('MerchantName', `${loginUser.value.merchantName}`);
       if (loginUser.value.merchantAvatar) {
diff --git a/src/views/cms/article/index.vue b/src/views/cms/article/index.vue
index 5a94439..06c1d2f 100644
--- a/src/views/cms/article/index.vue
+++ b/src/views/cms/article/index.vue
@@ -147,7 +147,7 @@
     if (categoryId.value) {
       where.categoryId = categoryId.value;
     }
-    where.merchantId = getMerchantId();
+    // where.merchantId = getMerchantId();
     return pageArticle({
       ...where,
       ...orders,
@@ -334,9 +334,7 @@
 
   // 加载栏目数据
   if (!navigationList.value) {
-    listNavigation({
-      merchantId: getMerchantId()
-    }).then((res) => {
+    listNavigation({}).then((res) => {
       navigationList.value = toTreeData({
         data: res?.map((d) => {
           d.value = d.navigationId;
diff --git a/src/views/cms/navigation/index.vue b/src/views/cms/navigation/index.vue
index 5bdaf0f..4d1583a 100644
--- a/src/views/cms/navigation/index.vue
+++ b/src/views/cms/navigation/index.vue
@@ -354,7 +354,7 @@
       where.bottom = undefined;
     }
     where.isMpWeixin = false;
-    where.merchantId = getMerchantId();
+    // where.merchantId = getMerchantId();
     return listNavigation({ ...where });
   };
 
diff --git a/src/views/cms/photo/list.vue b/src/views/cms/photo/list.vue
index f1dfb40..57a27c4 100644
--- a/src/views/cms/photo/list.vue
+++ b/src/views/cms/photo/list.vue
@@ -264,7 +264,7 @@
     if (type.value == 'groupId') {
       where.groupId = groupId.value;
     }
-    where.merchantId = getMerchantId();
+    // where.merchantId = getMerchantId();
     return pageFiles({ ...where, ...orders, page, limit });
   };
 
diff --git a/src/views/passport/login/index.vue b/src/views/passport/login/index.vue
index f6a6d60..13006f5 100644
--- a/src/views/passport/login/index.vue
+++ b/src/views/passport/login/index.vue
@@ -158,7 +158,7 @@
     <div class="login-copyright">
       <a-space>
         <span>© {{ new Date().getFullYear() }}</span>
-        <span>{{ config?.copyright || 'websoft.top Inc.' }}</span>
+        <span>{{ config?.copyright || 'WebSoft Inc.' }}</span>
       </a-space>
     </div>
     <!-- 编辑弹窗 -->
diff --git a/src/views/system/profile/index.vue b/src/views/system/profile/index.vue
index f15bfd4..f06a12f 100644
--- a/src/views/system/profile/index.vue
+++ b/src/views/system/profile/index.vue
@@ -40,12 +40,15 @@
                 >
               </a-space>
             </a-form-item>
-            <a-form-item label="专属域名">
+            <a-form-item label="管理后台">
               <a-space class="justify">
-                <a class="cursor-pointer" @click="openSpmUrl(`https://${form.domain}`)">{{ `${form.domain}` }}</a>
-                <a @click="onEdit('专属域名', 'freeDomain', form.freeDomain)">修改</a>
+                <a class="cursor-pointer" @click="openSpmUrl(`http://admin.gxtyzx.cn`)">{{ `admin.gxtyzx.cn` }}</a>
+<!--                <a @click="onEdit('专属域名', 'freeDomain', form.freeDomain)">修改</a>-->
               </a-space>
             </a-form-item>
+            <a-form-item label="租户ID">
+              <span class="ele-text-heading">{{ form.tenantId }}</span>
+            </a-form-item>
             <!--            <a-form-item label="应用类型">-->
             <!--              <a-space class="justify">-->
             <!--                <span>Tenant</span>-->
@@ -81,21 +84,18 @@
             <a-form-item label="主体名称">
               <a-space class="justify">
                 <div class="ele-text-heading">
-                  <span style="padding-right: 12px">{{ form.companyName ? form.companyName : "-" }}</span>
+                  <span style="padding-right: 12px">南宁威宁文化体育发展有限公司</span>
                 </div>
-                <a @click="onEdit('主体名称', 'companyName', form.companyName)">修改</a>
               </a-space>
             </a-form-item>
             <a-form-item label="主体类型">
               <a-space class="justify">
                 <a-tag>{{ form.companyType }}</a-tag>
-                <a @click="onEdit('主体类型', 'companyType', form.companyType)">修改</a>
               </a-space>
             </a-form-item>
             <a-form-item label="实名认证">
               <a-space class="justify">
-                <a-tag v-if="form.authentication == 1" color="green">已认证</a-tag>
-                <a-tag v-else color="orange" class="cursor-pointer" @click="openSpmUrl(`https://websoft.top/user/auth`)">未认证</a-tag>
+                <a-tag color="green">已认证</a-tag>
               </a-space>
             </a-form-item>
             <a-form-item label="所属行业">
@@ -106,21 +106,21 @@
                 >
               </a-space>
             </a-form-item>
-            <a-form-item label="用户数量">
-              <a-space class="justify ele-text-heading">
-                <span>{{ form.users }}/{{ form.members }}</span>
-              </a-space>
-            </a-form-item>
+<!--            <a-form-item label="用户数量">-->
+<!--              <a-space class="justify ele-text-heading">-->
+<!--                <span>{{ form.users }}/{{ form.members }}</span>-->
+<!--              </a-space>-->
+<!--            </a-form-item>-->
             <!--            <a-form-item label="部门数量">-->
             <!--              <a-space class="justify ele-text-heading">-->
             <!--                <span>{{ form.departments }}</span>-->
             <!--              </a-space>-->
             <!--            </a-form-item>-->
-            <a-form-item label="存储空间">
-              <a-space class="justify ele-text-heading">
-                <span>{{ getFileSize(form.storage) }}/{{ getFileSize(form.storageMax) }}</span>
-              </a-space>
-            </a-form-item>
+<!--            <a-form-item label="存储空间">-->
+<!--              <a-space class="justify ele-text-heading">-->
+<!--                <span>{{ getFileSize(form.storage) }}/{{ getFileSize(form.storageMax) }}</span>-->
+<!--              </a-space>-->
+<!--            </a-form-item>-->
 <!--            <a-form-item label="所属地区">-->
 <!--              <a-space class="justify">-->
 <!--                <span-->
@@ -151,36 +151,32 @@
             <!--                <span>{{ form.email }}</span>-->
             <!--              </a-space>-->
             <!--            </a-form-item>-->
-            <a-divider style="padding-bottom: 20px" />
-            <a-form-item label="租户ID">
-              <span class="ele-text-heading">{{ form.tenantId }}</span>
-            </a-form-item>
-            <a-form-item label="应用类型">
-              <a-space class="justify">
-                <a-tag>{{ form.appType }}</a-tag>
-                <a @click="onEdit('应用类型', 'appType', form.appType)">修改</a>
-              </a-space>
-            </a-form-item>
+<!--            <a-form-item label="应用类型">-->
+<!--              <a-space class="justify">-->
+<!--                <a-tag>小程序</a-tag>-->
+<!--                <a @click="onEdit('应用类型', 'appType', form.appType)">修改</a>-->
+<!--              </a-space>-->
+<!--            </a-form-item>-->
 <!--            <a-form-item label="专属域名">-->
 <!--              <a-space class="justify">-->
 <!--                <span class="cursor-pointer" @click="openSpmUrl(`https://${form.domain}`)">{{ `${form.domain}` }}</span>-->
 <!--                <a @click="onEdit('专属域名', 'domain', form.domain)">修改</a>-->
 <!--              </a-space>-->
 <!--            </a-form-item>-->
-            <a-form-item label="当前版本">
-              <a-space class="justify ele-text-heading">
-                {{ form.versionName }}
-                <a @click="openUrl('/system/version')">更新</a>
-              </a-space>
-            </a-form-item>
-            <a-divider style="padding-bottom: 20px" />
-            <a-form-item
-              v-if="form.tenantId"
-              label="注销"
-            >
-              <a-button @click="destruction(form.tenantId)" :disabled="true">注销</a-button>
-              <div class="ele-text-placeholder">注销后，当前应用的数据将会销毁,且不可恢复，请谨慎操作</div>
-            </a-form-item>
+<!--            <a-form-item label="当前版本">-->
+<!--              <a-space class="justify ele-text-heading">-->
+<!--                {{ form.versionName }}-->
+<!--                <a @click="openUrl('/system/version')">更新</a>-->
+<!--              </a-space>-->
+<!--            </a-form-item>-->
+<!--            <a-divider style="padding-bottom: 20px" />-->
+<!--            <a-form-item-->
+<!--              v-if="form.tenantId"-->
+<!--              label="注销"-->
+<!--            >-->
+<!--              <a-button @click="destruction(form.tenantId)" :disabled="true">注销</a-button>-->
+<!--              <div class="ele-text-placeholder">注销后，当前应用的数据将会销毁,且不可恢复，请谨慎操作</div>-->
+<!--            </a-form-item>-->
           </a-form>
         </a-tab-pane>
       </a-tabs>