From b8ff83019d8f06ab2a74b1531c8a0bd554b39cc9 Mon Sep 17 00:00:00 2001
From: sjeam <359824901@qq.com>
Date: Fri, 1 Aug 2025 14:20:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 env/.env                         |  8 +--
 env/.env.test                    |  2 +-
 src/api/user/types.ts            |  2 +-
 src/manifest.json                |  4 +-
 src/pages/common/goods/order.vue |  7 ++-
 src/pages/common/login/index.vue | 93 ++++++++++++++++----------------
 src/pages/tab/list/index.vue     |  3 +-
 src/utils/request/index.ts       |  2 +-
 8 files changed, 63 insertions(+), 58 deletions(-)

diff --git a/env/.env b/env/.env
index dd83a91..3cb2619 100644
--- a/env/.env
+++ b/env/.env
@@ -5,8 +5,8 @@ VITE_APP_TITLE=uniapp-vue3模板项目
 VITE_APP_ENV=development
 
 # 接口地址
-VITE_API_BASE_URL=http://www.caipu.com:8545
-# VITE_API_BASE_URL=http://ceshi-recipeapi.lihaink.cn/
+# VITE_API_BASE_URL=http://www.caipu.com:8545
+VITE_API_BASE_URL=https://ceshi-recipeapi.lihaink.cn/
 
 # 端口号
 VITE_APP_PORT=9527
@@ -15,8 +15,8 @@ VITE_APP_PORT=9527
 VITE_APP_PROXY=true
 
 # API代理前缀 
-VITE_API_PREFIX= http://www.caipu.com:8545
-# VITE_API_PREFIX= http://ceshi-recipeapi.lihaink.cn/
+# VITE_API_PREFIX= http://www.caipu.com:8545
+VITE_API_PREFIX= https://ceshi-recipeapi.lihaink.cn/
 
 # 删除console
 VITE_DROP_CONSOLE=false
diff --git a/env/.env.test b/env/.env.test
index 88a6c6f..ca985dd 100644
--- a/env/.env.test
+++ b/env/.env.test
@@ -2,7 +2,7 @@
 VITE_APP_ENV=staging
 
 # 接口地址
-VITE_API_BASE_URL=http://localhost:8080/staging
+VITE_API_BASE_URL=http://ceshi-recipeapi.lihaink.cn
 
 # 删除console
 VITE_DROP_CONSOLE=true
diff --git a/src/api/user/types.ts b/src/api/user/types.ts
index 9014a3a..61260bf 100644
--- a/src/api/user/types.ts
+++ b/src/api/user/types.ts
@@ -10,7 +10,7 @@ export interface ProfileRes {
   user?: any;
 }
 export interface LoginReq {
-  phone: string;
+  account: string;
   code: string;
 }
 export interface LoginReqPassword {
diff --git a/src/manifest.json b/src/manifest.json
index 4b5966d..f81a4bd 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,5 +1,5 @@
 {
-    "name" : "",
+    "name" : "菜谱",
     "appid" : "",
     "description" : "",
     "versionName" : "1.0.0",
@@ -63,7 +63,7 @@
                 "desc" : "获取您的位置"
             }
         },
-        "requiredPrivateInfos" : ["login" ,"getLocation", "chooseAddress" , "chooseLocation" ]
+        "requiredPrivateInfos" : [ "getLocation", "chooseAddress" , "chooseLocation" ]
     },
     "mp-alipay" : {
         "usingComponents" : true
diff --git a/src/pages/common/goods/order.vue b/src/pages/common/goods/order.vue
index 6ce8410..fb07c59 100644
--- a/src/pages/common/goods/order.vue
+++ b/src/pages/common/goods/order.vue
@@ -9,6 +9,11 @@
 	white-space: nowrap;
 	/* 确保元素有宽度 */
 }
+
+html,
+body {
+  height: 0rpx;
+}
 </style>
 
 <template>
@@ -24,7 +29,7 @@
 			maxlength="-1" height="60rpx" @change="searchSP()">
 		</up-search>
 
-		<z-paging :fixed="false" height="calc(100vh - 320rpx)" width="calc(100vw - 50rpx)"
+		<z-paging :fixed="false" height="calc(100vh - 380rpx)" width="calc(100vw - 50rpx)"
 			:paging-style="{ 'background-color': '#FFFFFFFF', 'padding': '20rpx' }" ref="pagingRefSP"
 			v-model="matchedItems_sp" @query="changeSP" class="fv-page  flex-col ">
 			<view v-for="(item, index) in matchedItems_sp" :key="index">
diff --git a/src/pages/common/login/index.vue b/src/pages/common/login/index.vue
index 7cceffa..fd843d6 100644
--- a/src/pages/common/login/index.vue
+++ b/src/pages/common/login/index.vue
@@ -125,9 +125,50 @@ function getCode () {
 
 
 async function wechatLogin () {
-
-  if (!isWechat.value) {
-
+  if (isWechat.value === true) {
+    if (!uni.$u.test.mobile(Number(account.value))) {
+      uni.$u.toast('请输入正确的手机号');
+      return;
+    }
+    if (loginType.value === 0) {
+      if (!password.value) {
+        uni.$u.toast('请输入密码');
+        return;
+      }
+      await userStore.passwordLogin({ account: account.value, password: password.value }).catch((res) => {
+        console.log(res);
+        if (res.code === 1) {
+          // const token = res.data.token;
+          // if (token) {
+          //   setToken(token.token_type+' '+token.token);
+          // }
+          uni.$u.toast('登录成功');
+        }
+        else {
+          uni.$u.toast(`登录失败,${res.msg}`);
+        }
+      });
+    }
+    else {
+      if (!code.value) {
+        uni.$u.toast('请输入验证码');
+        return;
+      }
+      await userStore.login({ account: account.value, code: password.value }).catch(() => {
+        if (res.code === 1) {
+          // const token = res.data.token;
+          // if (token) {
+          //   setToken(token.token_type+' '+token.token);
+          // }
+          uni.$u.toast('登录成功');
+        }
+        else {
+          uni.$u.toast(`登录失败,${res.msg}`);
+        }
+      });
+    }
+  } else {
+    console.log('222微信登录');
     uni.login({
       provider: 'weixin',
       // onlyAuthorize: true,// 微信登录仅请求授权认证
@@ -145,7 +186,7 @@ async function wechatLogin () {
         //     uni.setStorageSync('token', res.token)
         //   }
         // });
-        userStore.login({ account: account.value, code: event.code }).catch(() => {
+        userStore.login({ account: account.value, code: event.code }).catch((res) => {
           if (res.code === 1) {
             // const token = res.data.token;
             // if (token) {
@@ -154,7 +195,7 @@ async function wechatLogin () {
             uni.$u.toast('登录成功');
           }
           else {
-            uni.$u.toast(`登录失败,${res.message}`);
+            uni.$u.toast(`登录失败,${res.msg}`);
           }
         });
 
@@ -164,51 +205,9 @@ async function wechatLogin () {
         // err.code是错误码
       }
     })
-    return;
   }
 
 
-  if (!uni.$u.test.mobile(Number(account.value))) {
-    uni.$u.toast('请输入正确的手机号');
-    return;
-  }
-  if (loginType.value === 0) {
-    if (!password.value) {
-      uni.$u.toast('请输入密码');
-      return;
-    }
-    await userStore.passwordLogin({ account: account.value, password: password.value }).catch((res) => {
-      console.log(res);
-      if (res.code === 1) {
-        // const token = res.data.token;
-        // if (token) {
-        //   setToken(token.token_type+' '+token.token);
-        // }
-        uni.$u.toast('登录成功');
-      }
-      else {
-        uni.$u.toast(`登录失败,${res.message}`);
-      }
-    });
-  }
-  else {
-    if (!code.value) {
-      uni.$u.toast('请输入验证码');
-      return;
-    }
-    await userStore.login({ account: account.value, code: password.value }).catch(() => {
-      if (res.code === 1) {
-        // const token = res.data.token;
-        // if (token) {
-        //   setToken(token.token_type+' '+token.token);
-        // }
-        uni.$u.toast('登录成功');
-      }
-      else {
-        uni.$u.toast(`登录失败,${res.message}`);
-      }
-    });
-  }
   if (isLogin()) {
     // await userStore.info()
     setTimeout(() => {
diff --git a/src/pages/tab/list/index.vue b/src/pages/tab/list/index.vue
index 3f8497f..1e0ce1b 100644
--- a/src/pages/tab/list/index.vue
+++ b/src/pages/tab/list/index.vue
@@ -445,7 +445,8 @@ export default defineComponent({
           if (this.totalNum == 1) {
             this.totalNum = res.data.peopleNumber
           }
-
+        }else{
+            uni.$u.toast(res.msg);
         }
       });
     },
diff --git a/src/utils/request/index.ts b/src/utils/request/index.ts
index 7fa7f17..a4aa7a0 100644
--- a/src/utils/request/index.ts
+++ b/src/utils/request/index.ts
@@ -29,7 +29,7 @@ export function request<T = any>(config: HttpRequestConfig): Promise<T> {
       const { result } = res.data;
       resolve(result as T);
     }).catch((res: any) => {
-      if(res.data.code==401){
+      if(res.code==401){
           //未登录拦截跳转
           uni.$u.toast(res.data.msg);
            usePermission();