!1 修复bug

Merge pull request !1 from ISFP_T/now_prod

env/.env.development

@@ -4,7 +4,7 @@ NODE_ENV=development
 VITE_DELETE_CONSOLE=false
 
 #本地环境
-VITE_SERVER_BASEURL=https://howhowfresh.com/prod-api
+#VITE_SERVER_BASEURL=https://howhowfresh.com/prod-api
-#VITE_SERVER_BASEURL=http://192.168.5.200:8080
+VITE_SERVER_BASEURL=http://192.168.5.23:8080
 #VITE_SERVER_BASEURL=http://192.168.0.148:8888
 #VITE_SERVER_BASEURL=http://liuyao.nat100.top/meiguowaimai

src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "CHEFLINK delivery",
     "appid" : "__UNI__06509BE",
     "description" : "",
-    "versionName" : "1.0.29",
+    "versionName" : "2.0.1",
-    "versionCode" : 129,
+    "versionCode" : 201,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

src/pages-login/pages/sign-up/index.vue

@@ -85,8 +85,7 @@ function codeSubmit() {
       confirmLoginPwd,
       ...rest
     } = logicStore.registerForm as any
-  appUserRegisterPost({
+    const requestBody: Record<string, any> = {
-    body: {
       ...rest,
       // 后端接收“确认密码”字段名为 newPwd
       newPwd: confirmLoginPwd,
@@ -94,7 +93,21 @@ function codeSubmit() {
       // captcha: data.code,
       // uuid: data.uuid,
       userPort: Config.userPort, // 登录端口2 商户端
-    } as any
+    }
+    if (requestBody.email == null || requestBody.email === '') {
+      delete requestBody.email
+    }
+    const phoneVal = requestBody.phone
+    if (
+      phoneVal == null ||
+      phoneVal === '' ||
+      (typeof phoneVal === 'string' && phoneVal.trim() === '')
+    ) {
+      delete requestBody.phone
+      delete requestBody.areaCode
+    }
+    appUserRegisterPost({
+      body: requestBody as any
     }).then((res) => {
       userStore.token = res.data.token;
       logicStore.reset()
@@ -374,3 +387,4 @@ page {
     height: 94rpx !important;
   }
   </style>
+  

src/pages-store/pages/store/index.vue

@@ -165,6 +165,20 @@ function getStoreDetail() {
       ]
     }
 
+    // 用详情中的首屏菜品初始化列表，并让下一次触底从第 2 页开始，避免仍请求第 1 页导致与详情数据重复
+    const firstRecords = res.data?.dishPage?.records
+    if (firstRecords && firstRecords.length > 0) {
+      dishListByQuery.value = [...firstRecords]
+      const gotFullPage = firstRecords.length >= pageSize.value
+      hasMore.value = gotFullPage
+      pageNum.value = gotFullPage ? 2 : 1
+    } else if (tabs.value.length > 0) {
+      dishListByQuery.value = []
+      hasMore.value = true
+      pageNum.value = 1
+      nextTick(() => loadDishList(false))
+    }
+
     // 商户的经纬度存在,并且用户的经纬度也存在
     if(res.data.latitude && res.data.longitude && userStore.userLocation.latitude && userStore.userLocation.longitude) {
       let distance = getDistanceInMiles(res.data.latitude, res.data.longitude, userStore.userLocation.latitude, userStore.userLocation.longitude)
@@ -309,15 +323,8 @@ const hasMore = ref(true);
 const isLoadingMore = ref(false);
 const dishListByQuery = ref<any[]>([]);
 
-// 计算当前显示的商品列表
+// 计算当前显示的商品列表（统一走 dishListByQuery，避免「全部」首屏用详情、加载更多再拼第 1 页造成重复）
-const currentDishList = computed(() => {
+const currentDishList = computed(() => dishListByQuery.value || [])
-  if(tabs.value[activeTab.value].key==''&&pageNum.value===1){
-    return storeDetail.value?.dishPage?.records
-  }
-  console.log(tabs.value[activeTab.value].key=='');
-  // 使用 dishListByQuery 作为数据源
-  return dishListByQuery.value || []
-})
 
 // 加载菜品列表
 async function loadDishList(isLoadMore = false) {
@@ -352,11 +359,10 @@ async function loadDishList(isLoadMore = false) {
     
     if (res.data && res.data.rows) {
       if (isLoadMore) {
-        // 加载更多，追加数据
+        // 加载更多：按 id 去重，防止接口分页重叠或重复请求时的重复项
-        dishListByQuery.value = [
+        const existingIds = new Set(dishListByQuery.value.map((r: any) => r.id))
-          ...dishListByQuery.value,
+        const nextRows = res.data.rows.filter((r: any) => r != null && !existingIds.has(r.id))
-          ...res.data.rows
+        dishListByQuery.value = [...dishListByQuery.value, ...nextRows]
-        ];
       } else {
         // 首次加载或刷新
         dishListByQuery.value = res.data.rows;