From 7fff65b4e42b7f3a36d40c55db577aa7ef1f4c81 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, 24 Oct 2024 16:50:40 +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

---
 nuxt.config.ts                                |  4 +--
 pages/item/components/PageBanner.vue          | 28 +++++++++----------
 pages/passport/login.vue                      |  6 ++--
 .../{market => plug}/components/CardList.vue  |  0
 .../components/PageBanner.vue                 |  0
 pages/{market => plug}/detail/[plugId].vue    |  0
 .../detail/components/Header.vue              |  0
 pages/{market => plug}/index.vue              |  0
 pages/user/auth.vue                           |  6 ++++
 pages/user/components/Auth.vue                |  2 +-
 pages/user/index.vue                          |  6 ++++
 pages/user/order.vue                          |  6 ++++
 pages/user/password.vue                       |  6 ++++
 13 files changed, 44 insertions(+), 20 deletions(-)
 rename pages/{market => plug}/components/CardList.vue (100%)
 rename pages/{market => plug}/components/PageBanner.vue (100%)
 rename pages/{market => plug}/detail/[plugId].vue (100%)
 rename pages/{market => plug}/detail/components/Header.vue (100%)
 rename pages/{market => plug}/index.vue (100%)

diff --git a/nuxt.config.ts b/nuxt.config.ts
index 0c9cc42..9b8377c 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -33,10 +33,10 @@ export default defineNuxtConfig({
         public: {
             // 开发环境配置
             // tenantId: '5',
-            // apiServer: 'http://127.0.0.1:30000/api',
+            apiServer: 'http://127.0.0.1:30000/api',
 
             // 生产环境
-            apiServer: 'https://common-api.websoft.top/api',
+            // apiServer: 'https://common-api.websoft.top/api',
             globalTitle: '网宿软件',
             domain: 'websoft.top'
         },
diff --git a/pages/item/components/PageBanner.vue b/pages/item/components/PageBanner.vue
index 62d95ed..01f9c82 100644
--- a/pages/item/components/PageBanner.vue
+++ b/pages/item/components/PageBanner.vue
@@ -49,22 +49,22 @@
                   <el-space class="mt-4">
 
                     <!-- 1. 未购买 -->
-                    <el-button
-                        v-if="!form.isBuy && !form.price"
-                        type="success"
-                        @click="onBuy(form)"
-                    >
-                      立即开通
-                    </el-button>
+<!--                    <el-button-->
+<!--                        v-if="!form.isBuy && !form.price"-->
+<!--                        type="success"-->
+<!--                        @click="onBuy(form)"-->
+<!--                    >-->
+<!--                      立即开通-->
+<!--                    </el-button>-->
 
                     <!-- 2. 已购买 -->
-                    <el-button
-                        v-else
-                        type="warning"
-                        @click="installPlug"
-                    >
-                      立即安装
-                    </el-button>
+<!--                    <el-button-->
+<!--                        v-else-->
+<!--                        type="warning"-->
+<!--                        @click="installPlug"-->
+<!--                    >-->
+<!--                      立即安装-->
+<!--                    </el-button>-->
 
                     <!-- 3. 其他按钮 -->
                     <template v-for="(item,index) in form.links" :key="index">
diff --git a/pages/passport/login.vue b/pages/passport/login.vue
index 2c9a06f..e58cff5 100644
--- a/pages/passport/login.vue
+++ b/pages/passport/login.vue
@@ -212,10 +212,10 @@ const checkUser = async () => {
   const {data: hasUser } = await useServerRequest<ApiResult<CaptchaResult>>('/existence',{baseURL: runtimeConfig.public.apiServer,method: "get",params: {
       field: 'phone', value: form.phone
     }});
-  if(hasUser.value?.code == 0){
+  if(hasUser.value?.code == 0 || loginBar.value){
     await sendCode();
   }
-  if(hasUser.value?.code != 0){
+  if(hasUser.value?.code != 0 && loginBar.value){
     ElMessage.error('该手机号码未注册');
   }
 };
@@ -324,6 +324,7 @@ const onSubmitBySms = async () => {
  * 账号密码注册
  */
 const onRegister = async () => {
+  form.isAgree = false;
   const {data: response} = await useServerRequest<ApiResult<LoginResult>>('/register',{baseURL: runtimeConfig.public.apiServer,method: "post",body: {
       companyName: '应用名称',
       username: form.phone,
@@ -333,7 +334,6 @@ const onRegister = async () => {
       email: form.email,
       isSuperAdmin: true
     }})
-
   // 登录成功
   if(response.value?.code == 0){
     console.log(response.value)
diff --git a/pages/market/components/CardList.vue b/pages/plug/components/CardList.vue
similarity index 100%
rename from pages/market/components/CardList.vue
rename to pages/plug/components/CardList.vue
diff --git a/pages/market/components/PageBanner.vue b/pages/plug/components/PageBanner.vue
similarity index 100%
rename from pages/market/components/PageBanner.vue
rename to pages/plug/components/PageBanner.vue
diff --git a/pages/market/detail/[plugId].vue b/pages/plug/detail/[plugId].vue
similarity index 100%
rename from pages/market/detail/[plugId].vue
rename to pages/plug/detail/[plugId].vue
diff --git a/pages/market/detail/components/Header.vue b/pages/plug/detail/components/Header.vue
similarity index 100%
rename from pages/market/detail/components/Header.vue
rename to pages/plug/detail/components/Header.vue
diff --git a/pages/market/index.vue b/pages/plug/index.vue
similarity index 100%
rename from pages/market/index.vue
rename to pages/plug/index.vue
diff --git a/pages/user/auth.vue b/pages/user/auth.vue
index e1cbf81..7a49479 100644
--- a/pages/user/auth.vue
+++ b/pages/user/auth.vue
@@ -29,6 +29,12 @@ const config = useConfigInfo();
 const merchantApply = ref<ShopMerchantApply>();
 
 const reload = async () => {
+  // 未登录状态(是否强制登录)
+  const token = localStorage.getItem('token');
+  if (!token || token == '') {
+    navigateTo('/passport/login');
+    return false;
+  }
   const {data: response} = await useServerRequest<ApiResult<ShopMerchantApply>>('/shop/shop-merchant-apply/getByUserId', {baseURL: runtimeConfig.public.apiServer})
   if (response.value?.data) {
     merchantApply.value = response.value.data;
diff --git a/pages/user/components/Auth.vue b/pages/user/components/Auth.vue
index c1567d3..040f14a 100644
--- a/pages/user/components/Auth.vue
+++ b/pages/user/components/Auth.vue
@@ -15,7 +15,7 @@
     </el-tabs>
     <!-- 已完成认证 -->
     <template v-if="form.status === 1">
-      <template v-if="form.merchantCode == ''">
+      <template v-if="form.type == 0">
         <el-result
             icon="success"
             title="个人认证已通过"
diff --git a/pages/user/index.vue b/pages/user/index.vue
index e4acca0..6b460aa 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -71,6 +71,12 @@ const onSubmit = async () => {
 }
 
 const reload = async () => {
+  // 未登录状态(是否强制登录)
+  const token = localStorage.getItem('token');
+  if (!token || token == '') {
+      navigateTo('/passport/login');
+      return false;
+  }
   const {data: response} = await useServerRequest<ApiResult<User>>('/auth/user', {baseURL: runtimeConfig.public.apiServer})
   if (response.value?.data) {
     userInfo.value = response.value?.data;
diff --git a/pages/user/order.vue b/pages/user/order.vue
index e1c4de9..212e8a1 100644
--- a/pages/user/order.vue
+++ b/pages/user/order.vue
@@ -68,6 +68,12 @@ const onSubmit = async () => {
 }
 
 const reload = async () => {
+  // 未登录状态(是否强制登录)
+  const token = localStorage.getItem('token');
+  if (!token || token == '') {
+    navigateTo('/passport/login');
+    return false;
+  }
   const {data: response} = await useServerRequest<ApiResult<User>>('/auth/user',{baseURL: runtimeConfig.public.apiServer})
   if(response.value?.data){
     userInfo.value = response.value?.data;
diff --git a/pages/user/password.vue b/pages/user/password.vue
index 91b1766..654f2d3 100644
--- a/pages/user/password.vue
+++ b/pages/user/password.vue
@@ -115,6 +115,12 @@ const onDone = (index: string) => {
 }
 
 const reload = async () => {
+  // 未登录状态(是否强制登录)
+  const token = localStorage.getItem('token');
+  if (!token || token == '') {
+    navigateTo('/passport/login');
+    return false;
+  }
   const {data: response} = await useServerRequest<ApiResult<User>>('/auth/user', {baseURL: runtimeConfig.public.apiServer})
   if (response.value?.data) {
     userInfo.value = response.value?.data;