From 7d42b0c706b471ad8d82f5d2e9c8e3f464340246 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, 7 Nov 2024 19:36:37 +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

---
 components/AppHeader.vue        | 6 ++++--
 composables/useServerRequest.ts | 3 +--
 layouts/default.vue             | 5 ++++-
 pages/components/Flash.vue      | 2 +-
 pages/index.vue                 | 2 +-
 pages/passport/login.vue        | 5 ++++-
 pages/passport/register.vue     | 2 +-
 7 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/components/AppHeader.vue b/components/AppHeader.vue
index 3c28e3a..25964a0 100644
--- a/components/AppHeader.vue
+++ b/components/AppHeader.vue
@@ -60,6 +60,7 @@
         </div>
         <div class="header__right items-center pr-4 xl:pr-0 md:flex hidden">
           <el-space class="sm:flex hidden" size="large" v-if="config.showSearchTools">
+            <el-button v-if="token" @click="loginAdminByToken">控制台</el-button>
 <!--                      <el-button v-if="token" @click="navigateTo(`/manage`)">控制台</el-button>-->
 <!--                      <el-button v-if="config.showSearchIcon" circle :icon="ElIconSearch" @click="navigateTo('/search')"></el-button>-->
 <!--            <el-button v-if="token" @click="loginAdminByToken">控制台</el-button>-->
@@ -76,7 +77,7 @@
                       <el-dropdown-item command="password" @click="openSpmUrl(`/user/password`)">修改密码</el-dropdown-item>
                       <el-dropdown-item command="auth" @click="openSpmUrl(`/user/auth`)">实名认证</el-dropdown-item>
                       <el-dropdown-item command="order" @click="openSpmUrl(`/user/order`)">我的订单</el-dropdown-item>
-                      <el-dropdown-item divided command="order" @click="loginDeveloperCenterByToken({domain:'developer.websoft.top'})">开发者中心</el-dropdown-item>
+<!--                      <el-dropdown-item divided command="order" @click="loginDeveloperCenterByToken({domain:'developer.websoft.top'})">开发者中心</el-dropdown-item>-->
                       <el-dropdown-item divided command="logOut" @click="openSpmUrl('/user/logout')">退出登录
                       </el-dropdown-item>
                     </el-dropdown-menu>
@@ -84,7 +85,8 @@
                 </el-dropdown>
               </template>
               <template v-else>
-                <el-button v-if="config.showLoginButton" circle :icon="ElIconUserFilled" @click="goLogin"></el-button>
+                <el-button type="primary"  v-if="!token" @click="navigateTo(`/passport/login`)">登录/注册</el-button>
+<!--                <el-button v-if="config.showLoginButton" circle :icon="ElIconUserFilled" @click="goLogin"></el-button>-->
               </template>
             </ClientOnly>
           </el-space>
diff --git a/composables/useServerRequest.ts b/composables/useServerRequest.ts
index a7d4766..1a11ae1 100644
--- a/composables/useServerRequest.ts
+++ b/composables/useServerRequest.ts
@@ -40,9 +40,8 @@ export const useServerRequest = <T>(url: string, opts?: UseFetchOptions<T, unkno
         // options.headers.tenantid = `${subDomain}`;
       }
       // TODO 2 从绑定域名解构的租户ID
-      // options.headers.tenantid = `5`;
       if(localStorage.getItem('TID_ADMIN')){
-        options.headers.tenantid = `${localStorage.getItem('TID_ADMIN')}`;
+        options.headers.TenantId = `5`;
       }
     },
     onResponse({ response }) {
diff --git a/layouts/default.vue b/layouts/default.vue
index 823c528..8b39a64 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -77,7 +77,10 @@ const reload = async () => {
 
   // TODO 2 读取服务器缓存数据
   const {data: websiteInfo} = await useServerRequest<ApiResult<Website>>('/cms/cms-website/getSiteInfo', {
-    baseURL: runtimeConfig.public.apiServer
+    baseURL: runtimeConfig.public.apiServer,
+    headers: {
+      TenantId: `5`
+    }
   });
   if (!websiteInfo.value) {
     ElMessage.error('require is not defined.')
diff --git a/pages/components/Flash.vue b/pages/components/Flash.vue
index 758efa7..9aa2595 100644
--- a/pages/components/Flash.vue
+++ b/pages/components/Flash.vue
@@ -98,7 +98,7 @@
         <div class="mt-10 flex flex-wrap gap-x-6 gap-y-3 justify-center">
           <div class="flex flex-col gap-4">
             <div class="flex items-center">
-              <el-button size="large" type="primary" v-if="!token" :icon="ElIconArrowRight" @click="openSpmUrl(`/passport/login`, {},0,true)">立即开始</el-button>
+              <el-button size="large" type="primary" v-if="!token" :icon="ElIconArrowRight" @click="openSpmUrl(`/passport/login`)">立即开始</el-button>
               <el-button size="large" type="primary" v-else :icon="ElIconArrowRight" @click="loginAdminByToken">进入控制台</el-button>
               <el-button size="large" type="success"  :icon="ElIconDownload" @click="openSpmUrl(`http://git.gxwebsoft.com/free`, {},0,true)">源码下载</el-button>
               <el-button size="large" type="danger" @click="openSpmUrl(`https://admin.websoft.top`, {},123)">商业版演示</el-button>
diff --git a/pages/index.vue b/pages/index.vue
index b160e27..d402c4c 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -2,7 +2,7 @@
 
   <Flash/>
 
-  <CompanyList :param="{official: true,recommend: true,limit: 12}" :fit="`cover`"  title="产品服务" comments="拥抱开源、坚守品质；致力于打造安全稳定高可用的WEB应用！"/>
+  <CompanyList :param="{official: true,recommend: true,limit: 4}" :fit="`cover`"  title="产品服务" comments="拥抱开源、坚守品质；致力于打造安全稳定高可用的WEB应用！"/>
 
 <!--  <ProductList :param="{type:0, official: true,limit: 4}" :fit="`cover`" title="产品服务" comments="拥抱开源、坚守品质；致力于打造安全稳定高可用的WEB应用！"/>-->
 
diff --git a/pages/passport/login.vue b/pages/passport/login.vue
index ba252ed..3dede4a 100644
--- a/pages/passport/login.vue
+++ b/pages/passport/login.vue
@@ -324,7 +324,6 @@ const onSubmitBySms = async () => {
  * 账号密码注册
  */
 const onRegister = async () => {
-  form.isAgree = false;
   const loading = ElLoading.service({
     lock: true,
     text: 'Loading'
@@ -349,6 +348,10 @@ const onRegister = async () => {
       ElMessage.error(response?.message)
       changeCaptcha()
     }
+  }).catch(() => {
+    loading.close();
+  }).finally(() => {
+    loading.close();
   })
 
 }
diff --git a/pages/passport/register.vue b/pages/passport/register.vue
index 5ccabc7..281f859 100644
--- a/pages/passport/register.vue
+++ b/pages/passport/register.vue
@@ -1,5 +1,5 @@
 <template>
-  <PageBanner title="入驻" desc="Authentication"/>
+  <PageBanner title="入驻" desc="Register Account"/>
   <div class="login-layout m-auto sm:w-screen-xl w-full">
     <div class="m-auto flex sm:flex-row flex-col sm:px-0 px-3 ">
       <div class="flash bg-white rounded-lg px-8 py-4 w-full">