修改

config/app.js

@@ -1,6 +1,6 @@
 // let domain = "https://www.shuibeibyg.com/front-api"; // 正式环境IP
-// let domain = "https://test.shuibeibyg.com/front-api"; // 测试环境IP
-let domain = 'http://192.168.100.199:8081' // 晋守桦IP
+let domain = "https://test.shuibeibyg.com/front-api"; // 测试环境IP
+// let domain = 'http://192.168.100.199:8081' // 晋守桦IP
 // let domain = 'http://192.168.100.246:8081' // 韩朝龙IP
 let share = "https://www.shuibeibyg.com";
 
@@ -39,15 +39,19 @@ export const LIMIT = 10;
 // 401白名单
 export const WHITELIST = [
   "/pages/index/index",
-  "/pages/login/login",
   "/pages/user/index",
   "/pages/users/login/index",
-  "/pages/users/about/index",
-  "/pages/users/utils/dapan",
   "/pages/change_password/change_password",
   "/pages/users/vault/index",
   "/pages/users/ranking_list/index",
-  "/pages/VIP/VIP",
+  "/pages/users/browsing_history/index",
+  "/pages/users/user_goods_collection/index",
+  "/pages/users/user_address_list/index",
+  "/pages/users/personal_info/personal_info",
+  "/pages/order_list/index",
+  "/pages/users/VIP/VIP",
+  "/pages/order_addcart/order_addcart",
+  "/pages/mall/dapan",
 ];
 
 // oss对象存储地址

pages.json

@@ -112,14 +112,6 @@
 			"root": "pages/users",
 			"name": "users",
 			"pages": [
-				{
-					"path": "order_list/index",
-					"style": {
-						"navigationBarTitleText": "我的订单",
-						"navigationBarBackgroundColor": "#e93323",
-						"navigationBarTextStyle": "black"
-					}
-				},
 				{
 					"path": "login/index",
 					"style": {
@@ -272,14 +264,14 @@
 						}
 					}
 				},
-//				{
-//					"path": "vault/index",
-//					"style": {
-//						"navigationBarTitleText": "钱包",
-//						"navigationBarBackgroundColor": "#ffe079",
-//						"navigationBarTextStyle": "black"
-//					}
-//				},
+				{
+					"path": "vault/index",
+					"style": {
+						"navigationBarTitleText": "明细",
+						"navigationBarBackgroundColor": "#ffe079",
+						"navigationBarTextStyle": "black"
+					}
+				},
 				{
 					"path": "user_goods_collection/index",
 					"style": {

pages/change_password/change_password.vue

@@ -48,7 +48,7 @@
                 style="width: 28rpx; height: 32rpx"
               ></image>
               <input
-                type="password"
+                type="safe-password"
                 class="texts"
                 placeholder="填写新密码"
                 v-model="password"
@@ -63,7 +63,7 @@
                 style="width: 28rpx; height: 32rpx"
               ></image>
               <input
-                type="password"
+                :password="true"
                 class="texts"
                 placeholder="重复新密码"
                 v-model="passwordRP"

pages/index/index.vue

@@ -136,7 +136,7 @@
                   </text>
                   <!-- <view class="txt">券</view> -->
                 </view>
-                <template v-if="item?.merchant?.id &&(!appStore.userInfo || (appStore.userInfo && !appStore.merchantId))">
+                <template v-if="item?.merchant?.id && merchantNameShow()">
                   <view class="merchantInfo" @click.stop="toMerchant(item.merchant.id)">
                     <image class="merchantLogo" :src="item.merchant.merchantLogo" mode="scaleToFill"></image>
                     <text class="merchantName">{{item.merchant.merchantName}}</text>
@@ -273,16 +273,16 @@ onLoad(async (options) => {
     merchantId.value = '';
   }
 
-  // 3. 根据商户ID获取不同数据
   await initPageData();
 });
-onShow(() => {
+onShow(async () => {
   const isLogin = appStore.isLogin;
   if(isLogin){
     rightsStore.getUserBenefits(appStore.userInfo?.userId);
     getUserBenefits();
   }
-
+  goodScroll.value = true;
+  await initPageData();
   uni.setNavigationBarTitle({ title: site_name.value });
 
 });
@@ -299,7 +299,6 @@ const initPageData = async () => {
     } else {
       promises.push(getIndexConfig());
     }
-
     promises.push(getGroomList());
     promises.push(getAllCategory());
 
@@ -463,7 +462,9 @@ const isNoDataState = computed(() => {
 
 // Product Lists
 const getGroomList = async () => {
+  console.log('111111111111111')
   if (!goodScroll.value) return;
+  console.log('=====================++++++')
   try {
     loading.value = true;
     merchantId.value!='' ?  params.value.merchantId = merchantId.value:'';
@@ -508,6 +509,13 @@ const toGoodsCate = (item) => {
   uni.setStorageSync('goods_cate', { id: item.id }); // 存储参数
   uni.switchTab({url:`/pages/goods_cate/goods_cate`})
 }
+const merchantNameShow = () => {
+  if(!appStore.userInfo ||((appStore.userInfo && !appStore.userInfo.merchant && !appStore.merchantId))){
+    return true;
+  }else{
+    return false;
+  }
+}
 </script>
 
 <style>

pages/order_addcart/order_addcart.vue

@@ -428,9 +428,9 @@ watch(isAllSelect, (newVal) => {
 });
 
 onLoad((options) => {
-  if (!isLogin) {
-    toLogin();
-  }
+  // if (!isLogin) {
+  //   toLogin();
+  // }
 });
 
 onShow(() => {

pages/order_list/index.vue

@@ -178,7 +178,7 @@ onShow(() => {
     getOrderData();
     getOrderListFn();
   } else {
-    toLogin();
+    // toLogin();
   }
 });
 onLoad((options)=>{
@@ -189,7 +189,7 @@ onLoad((options)=>{
       toReturnList()
     }
   } else {
-    toLogin();
+    // toLogin();
   }
 })
 

pages/user/index.vue

@@ -226,7 +226,7 @@ const commonFunctions = computed(() => {
     { src: `${HTTP_REQUEST_URL_IMG}setting/dingwei.png`, name: '收货地址', pageUrl: '/pages/users/user_address_list/index', show: true },
     { src: `${HTTP_REQUEST_URL_IMG}setting/dianpu.png`, name: '联系商家', pageUrl: '/pages/users/my_merchant/index', show: lxsjShow.value },
     { src: `${HTTP_REQUEST_URL_IMG}setting/dianpu.png`, name: '门店主页', pageUrl: '/pages/merchantCenter/index', show: merchantZYShow.value },
-    { src: `${HTTP_REQUEST_URL_IMG}setting/xiazaiapp.png`, name: '下载APP', pageUrl: 'download', show: true },
+    // { src: `${HTTP_REQUEST_URL_IMG}setting/xiazaiapp.png`, name: '下载APP', pageUrl: 'download', show: true },
     { src: `${HTTP_REQUEST_URL_IMG}setting/lianxikefu.png`, name: '平台客服', show: true },
     { src: `${HTTP_REQUEST_URL_IMG}setting/logout.png`, name: '退出登录', pageUrl: 'logout', show: logoutShow.value }
   ];
@@ -459,7 +459,7 @@ function handleEdit() {
 async function fetchMetalBalance() {
   // 若appStore.uid为空，则请求失败
   if (!appStore?.uid) {
-    Toast({ title: "未登录，请前往登录后访问" });
+    // Toast({ title: "未登录，请前往登录后访问" });
     return;
   }
   const params = { userId: appStore.uid };

pages/users/login/index.vue

@@ -36,7 +36,7 @@
                 style="width: 28rpx; height: 32rpx"
               ></image>
               <input
-                type="password"
+                :password="true"
                 class="texts"
                 placeholder="填写登录密码"
                 v-model="password"

pages/users/order_list/index.vue

@@ -1,6 +0,0 @@
-<template>
-    <view></view>
-</template>
-<script setup>
-    
-</script>