From 4c682f103403c51cab44f435bcc0594a2fad2378 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Fri, 28 Mar 2025 03:27:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95=EF=BC=9A?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E7=99=BB=E5=BD=95=E6=94=B9=E4=B8=BA=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7ID=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                       |  4 +-
 src/api/passport/login/index.ts        |  2 +-
 src/layout/components/header-tools.vue | 83 ++++++------------------
 src/utils/common.ts                    |  2 +-
 src/views/passport/login/index.vue     | 88 ++++++++++++--------------
 5 files changed, 64 insertions(+), 115 deletions(-)

diff --git a/.env.development b/.env.development
index 8c274fb..af79934 100644
--- a/.env.development
+++ b/.env.development
@@ -1,11 +1,11 @@
 VITE_APP_NAME=后台管理系统
 VITE_SOCKET_URL=wss://server.gxwebsoft.com
 VITE_SERVER_URL=https://server.gxwebsoft.com/api
-#VITE_API_URL=https://cms-api.websoft.top/api
+VITE_API_URL=https://cms-api.websoft.top/api
 
 
 #VITE_SOCKET_URL=ws://127.0.0.1:9191
 #VITE_SERVER_URL=http://127.0.0.1:8000/api
-VITE_API_URL=http://127.0.0.1:9000/api
+#VITE_API_URL=http://127.0.0.1:9000/api
 #VITE_THINK_URL=http://127.0.0.1:9099/api
 #/booking/bookingItem
diff --git a/src/api/passport/login/index.ts b/src/api/passport/login/index.ts
index 9f0cbdb..866d064 100644
--- a/src/api/passport/login/index.ts
+++ b/src/api/passport/login/index.ts
@@ -15,7 +15,7 @@ import { SERVER_API_URL } from '@/config/setting';
  */
 export async function login(data: LoginParam) {
   const res = await request.post<ApiResult<LoginResult>>(
-    'https://common-api.websoft.top/api/login',
+    '/loginByUserId',
     data
   );
   if (res.data.code === 0) {
diff --git a/src/layout/components/header-tools.vue b/src/layout/components/header-tools.vue
index ca61c5f..9d69f0a 100644
--- a/src/layout/components/header-tools.vue
+++ b/src/layout/components/header-tools.vue
@@ -1,10 +1,6 @@
 <!-- 顶栏右侧区域 -->
 <template>
   <div class="ele-admin-header-tool">
-    <!-- 网站首页 -->
-    <div class="ele-admin-header-tool-item" v-if="domain" @click="openUrl(`https://${domain}`)">
-      <HomeOutlined />
-    </div>
     <!-- 消息通知 -->
     <div class="ele-admin-header-tool-item" @click="openUrl(`/user/notice`)">
       <header-notice/>
@@ -20,21 +16,17 @@
       <fullscreen-exit-outlined v-if="fullscreen"/>
       <fullscreen-outlined v-else/>
     </div>
-    <!-- 语言切换 -->
-    <div v-if="lang.length > 0" class="ele-admin-header-tool-item">
-      <i18n-icon/>
-    </div>
     <!-- 用户信息 -->
     <div class="ele-admin-header-tool-item">
       <a-dropdown placement="bottom" :overlay-style="{ minWidth: '280px' }">
         <div class="ele-admin-header-avatar">
-          <a-avatar :src="website?.websiteLogo">
-            <template v-if="!website?.websiteLogo" #icon>
+          <a-avatar :src="loginUser?.avatar">
+            <template v-if="!loginUser?.avatar" #icon>
               <user-outlined/>
             </template>
           </a-avatar>
           <span :class="{ 'hidden-sm-and-down': styleResponsive }">
-            {{ website?.websiteName }}
+            {{ loginUser.nickname }}
           </span>
           <down-outlined style="margin-left: 6px"/>
         </div>
@@ -50,13 +42,9 @@
                         }}</span>
                     </div>
                     <div class="text-gray-400">
-                      租户ID：<span class="ele-text-secondary">{{
-                        loginUser.tenantId
+                      用户ID：<span class="ele-text-secondary" @click="copyText(loginUser.userId)">{{
+                        loginUser.userId
                       }}</span>
-                      <copy-outlined
-                        style="margin-left: 10px"
-                        @click="copyText(loginUser.tenantId)"
-                      />
                     </div>
                     <div class="text-gray-400">
                       昵称：<span class="ele-text-secondary">{{
@@ -68,6 +56,11 @@
                         loginUser.mobile
                       }}</span>
                     </div>
+                    <div class="text-gray-400">
+                      租户：<span class="ele-text-secondary" @click="copyText(loginUser.tenantId)">{{
+                        loginUser.tenantId
+                      }}</span>
+                    </div>
                     <div class="text-gray-400">
                       角色：
                       <template
@@ -98,12 +91,12 @@
               </div>
             </a-menu-item>
             <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">-->
+              <!--                <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="system">
                 <div class="ele-cell">
@@ -135,7 +128,7 @@
 </template>
 
 <script lang="ts" setup>
-import {computed, createVNode, ref, watch} from 'vue';
+import {computed, createVNode, ref} from 'vue';
 import {useRouter} from 'vue-router';
 import {useI18n} from 'vue-i18n';
 import {Modal} from 'ant-design-vue/es';
@@ -148,7 +141,7 @@ import {
   HomeOutlined
 } from '@ant-design/icons-vue';
 import {storeToRefs} from 'pinia';
-import {copyText, navTo, openNew, openUrl} from '@/utils/common';
+import {copyText, openNew, openUrl} from '@/utils/common';
 import {useThemeStore} from '@/store/modules/theme';
 import HeaderNotice from './header-notice.vue';
 import PasswordModal from './password-modal.vue';
@@ -158,13 +151,8 @@ import {logout} from '@/utils/page-tab-util';
 import type {Menu} from '@/api/system/menu/model';
 import {isExternalLink} from 'ele-admin-pro';
 import {listRoles} from '@/api/system/role';
-import {getSiteInfo} from "@/api/layout";
 import I18nIcon from './i18n-icon.vue';
 import {CmsWebsite} from "@/api/cms/cmsWebsite/model";
-import {listCmsLangLog} from "@/api/cms/cmsLangLog";
-import {CmsLangLog} from "@/api/cms/cmsLangLog/model";
-import {getCmsWebsiteSetting} from "@/api/cms/cmsWebsiteSetting";
-import {useWebsiteSettingStore} from "@/store/modules/setting";
 
 // 是否开启响应式布局
 const themeStore = useThemeStore();
@@ -184,7 +172,6 @@ defineProps<{
 const {push} = useRouter();
 const {t} = useI18n();
 const userStore = useUserStore();
-const setting = useWebsiteSettingStore();
 // 是否显示修改密码弹窗
 const passwordVisible = ref(false);
 
@@ -195,10 +182,7 @@ const domain = ref(localStorage.getItem('Domain'))
 // 当前用户信息
 const loginUser = computed(() => userStore.info ?? {});
 const menuList = ref<Menu[]>([]);
-const parentId = ref<number>();
-const bordered = ref<boolean>(false);
 const website = ref<CmsWebsite>();
-const lang = ref<CmsLangLog[]>([]);
 
 /* 用户信息下拉点击 */
 const onUserDropClick = ({key}) => {
@@ -250,28 +234,6 @@ const toggleFullscreen = () => {
 };
 
 const reload = () => {
-  // 获取网站信息
-  getSiteInfo().then((data) => {
-    website.value = data;
-    // 网站ID
-    localStorage.setItem('WebsiteId', `${data.websiteId}`);
-    // 读取网站设置
-    if(data.setting){
-      setting.setSetting(data.setting);
-    }
-    getCmsWebsiteSetting(Number(data.websiteId)).then((settingInfo) => {
-      if (settingInfo) {
-        setting.setSetting(settingInfo);
-        if (settingInfo.editor) {
-          localStorage.setItem('Editor', `${settingInfo.editor}`)
-        }
-      }
-    })
-  }).catch(() => {
-    // 首页加载分配资源
-    localStorage.removeItem('WebsiteId')
-    localStorage.setItem('NotActive', '1')
-  });
 
   // 查询商户角色的roleId
   if (!localStorage.getItem('RoleIdByMerchant')) {
@@ -283,15 +245,6 @@ const reload = () => {
       }
     });
   }
-
-  // 国际化
-  listCmsLangLog({}).then(list => {
-    lang.value = list;
-    if (list.length > 0 && !i18n) {
-      localStorage.setItem('i18n-lang', `${list[0].code}`);
-    }
-  })
-
 };
 
 reload();
diff --git a/src/utils/common.ts b/src/utils/common.ts
index 4424aea..bb95696 100644
--- a/src/utils/common.ts
+++ b/src/utils/common.ts
@@ -310,7 +310,7 @@ export const copyText = (text) => {
   // 执行浏览器复制命令
   // 复制命令会将当前选中的内容复制到剪切板中（这里就是创建的input标签）
   // Input要在正常的编辑状态下原生复制方法才会生效
-  message.success(`复制成功 ${text}`);
+  message.success(`复制成功`);
   document.execCommand('copy');
 
   // 复制成功后再将构造的标签 移除
diff --git a/src/views/passport/login/index.vue b/src/views/passport/login/index.vue
index 84f9b64..22cf509 100644
--- a/src/views/passport/login/index.vue
+++ b/src/views/passport/login/index.vue
@@ -31,8 +31,16 @@
       <div class="login-title flex justify-center items-center px-12">
         <h4
           class="title-btn"
+          :class="loginType === 'sms' ? 'active' : ''"
           @click="onLoginType('sms')"
-        >登录</h4
+        >短信登录</h4
+        >
+        <a-divider type="vertical" style="height: 20px"/>
+        <h4
+          class="title-btn"
+          :class="loginType === 'account' ? 'active' : ''"
+          @click="onLoginType('account')"
+        >密码登录</h4
         >
       </div>
       <div class="login-bar absolute top-0 right-0 cursor-pointer">
@@ -47,13 +55,12 @@
         <!--        <span class="absolute top-3 right-1.5 text-sm text-white font-bold cursor-pointer">{{ '登录' }}</span>-->
       </div>
       <template v-if="loginType === 'account'">
-        <a-form-item name="username">
+        <a-form-item name="userId">
           <a-input
             allow-clear
             size="large"
-            :maxlength="11"
-            v-model:value="form.username"
-            :placeholder="`请输入登录账号`"
+            v-model:value="form.userId"
+            :placeholder="`请输入用户ID`"
           >
             <template #prefix>
               <UserOutlined/>
@@ -259,7 +266,7 @@ const {t} = useI18n();
 const {locale} = useI18n();
 
 // 登录框方向, 0 居中, 1 居右, 2 居左
-const direction = ref(1);
+const direction = ref(0);
 // 加载状态
 const loading = ref(false);
 // 是否显示tenantId填写输入框
@@ -268,11 +275,13 @@ const loginType = ref('sms');
 const config = ref<Config>();
 // 配置信息
 const {form} = useFormData<User>({
+  userId: undefined,
   username: '',
   phone: '',
   password: '',
   code: '',
   smsCode: '',
+  tenantId: undefined,
   templateId: TEMPLATE_ID,
   isSuperAdmin: true,
   remember: true
@@ -295,14 +304,14 @@ let countdownTimer: number | null = null;
 // 多用户选择账号登录
 const showSelectLoginUser = ref<boolean>(false)
 const admins = ref<User[]>([]);
-const tenantId = getTenantId();
+// const tenantId = getTenantId();
 
 // 表格选中数据
 const formRef = ref<FormInstance | null>(null);
 
 // 表单验证规则
 const rules = reactive({
-  username: [
+  userId: [
     {
       required: true,
       message: t('login.username'),
@@ -408,11 +417,11 @@ const onLoginBySms = () => {
             return false;
           } else {
             message.success(msg);
+            loading.value = false;
+            resetFields();
+            cleanPageTabs();
+            goHome();
           }
-          loading.value = false;
-          resetFields();
-          cleanPageTabs();
-          goHome();
         })
         .catch((e: Error) => {
           message.error(e.message);
@@ -436,37 +445,26 @@ const submit = () => {
   formRef.value
     .validate()
     .then(() => {
-      if (form.code?.toLowerCase() !== text.value) {
-        message.error('验证码错误');
-        changeCaptcha();
-        return;
-      }
+      // if (form.code?.toLowerCase() !== text.value) {
+      //   message.error('验证码错误');
+      //   changeCaptcha();
+      //   return;
+      // }
       loading.value = true;
       form.code = form.code?.toLowerCase();
+      form.phone = undefined;
       login(form)
         .then((msg) => {
+          if(msg == '请选择登录用户'){
+            showSelectLoginUser.value = true;
+            return false;
+          }
           // 登录成功
           message.success(msg);
           loading.value = false;
           resetFields();
           cleanPageTabs();
           goHome();
-          // 是否已购买本产品
-          // pageOrderGoods({ userId: Number(localStorage.getItem('UserId')),orderStatus: 1}).then(res => {
-          //   if(res?.count == 0){
-          //     message.error('请先安装本应用插件！');
-          //     setTimeout(() => {
-          //       push('/login')
-          //     },1000)
-          //     return false;
-          //   }
-          //   // 登录成功
-          //   message.success(msg);
-          //   loading.value = false;
-          //   resetFields();
-          //   cleanPageTabs();
-          //   goHome();
-          // })
         })
         .catch((e: Error) => {
           message.error(e.message);
@@ -507,9 +505,7 @@ const loginConnect = () => {
 
 /* 获取图形验证码 */
 const changeCaptcha = () => {
-  configWebsiteField({
-    lang: locale.value
-  }).then((data) => {
+  configWebsiteField({lang: locale.value}).then((data) => {
     config.value = data;
   });
   // 这里演示的验证码是后端返回base64格式的形式, 如果后端地址直接是图片请参考忘记密码页面
@@ -536,16 +532,16 @@ watch(
   currentRoute,
   () => {
     // 解析二级域名获取租户ID
-    const tenantId = getTenantId();
-    if (tenantId) {
-      form.tenantId = Number(tenantId);
-      showTenantId.value = false;
-    }
-    const tid = localStorage.getItem('TenantId');
-    if (tid) {
-      form.tenantId = Number(tid);
-      showTenantId.value = false;
-    }
+    // const tenantId = getTenantId();
+    // if (tenantId) {
+    //   form.tenantId = Number(tenantId);
+    //   showTenantId.value = false;
+    // }
+    // const tid = localStorage.getItem('TenantId');
+    // if (tid) {
+    //   form.tenantId = Number(tid);
+    //   showTenantId.value = false;
+    // }
   },
   {immediate: true}
 );