修改

pages/change_password/change_password.vue

@@ -133,8 +133,8 @@ const submit = async () => {
     });
     Toast({ title: "修改成功", icon: "none" });
     setTimeout(() => {
-      uni.switchTab({
-        url: "/pages/index/index",
+      uni.navigateTo({
+        url: "/pages/users/login/index",
       });
     }, 1000);
   } catch (err) {

pages/goods/goods_details/index.vue

@@ -195,7 +195,7 @@
 <!--                </view>-->
 <!--              </view>-->
 <!--            </view>-->
-            <view class="store-card" @click="toStore">
+            <view class="store-card" @click="toStore" v-if="sbMerchantInfo?.id">
               <view class="left">
                 <image class="storeImg" :src="sbMerchantInfo.merchantLogo" mode="aspectFit"></image>
               </view>

pages/goods/goods_search/index.vue

@@ -166,7 +166,7 @@ page {
 .searchGood .search .input {
   width: 598rpx;
   background-color: #f7f7f7;
-  border-radius: 33rpx;
+  border-radius: 16rpx;
   padding: 0 35rpx;
   box-sizing: border-box;
   height: 66rpx;

pages/index/index.vue

@@ -5,7 +5,7 @@
         :bgColor="navBgColor"
     >
       <template #left>
-        <view class="nav-slot" v-if="merchantInfo && merchantInfo.merchantName" @click="toBrowsingHistory()">
+        <view class="nav-slot" v-if="!merchantNameShow()" @click="toBrowsingHistory()">
           <image class="dianpu" src="@/static/images/dianpu.png" mode="widthFix"></image>
           <view class="storeName line1">{{ merchantInfo.merchantName }}</view>
           <image class="zhankai" src="@/static/images/zhankai.png" mode="widthFix"></image>
@@ -273,7 +273,7 @@ onLoad(async (options) => {
   } else {
     merchantId.value = '';
   }
-  console.log('onLoad',isFirstLoad.value)
+
   if(isFirstLoad.value){
     await initPageData();
     isFirstLoad.value = false;
@@ -281,19 +281,29 @@ onLoad(async (options) => {
 
 });
 onShow(async () => {
-  console.log('onShow',isFirstLoad.value)
   const isLogin = appStore.isLogin;
   if(isLogin){
     rightsStore.getUserBenefits(appStore.userInfo?.userId);
     getUserBenefits();
   }
-
-
-  uni.setNavigationBarTitle({ title: site_name.value });
+  if (appStore.merchantId && appStore.merchantId !== '') {
+    merchantId.value = appStore.merchantId;
+    if (!isLogin) {
+      toLogin();
+      return; // 登录后页面会刷新，避免继续执行
+    }
+  } else if (appStore?.userInfo?.merchant?.id) {
+    merchantId.value = appStore.userInfo.merchant.id;
+  } else {
+    merchantId.value = '';
+  }
   if(!isFirstLoad.value){
     await initPageData();
   }
 
+  uni.setNavigationBarTitle({ title: site_name.value });
+
+
 });
 const initPageData = async () => {
   try {

pages/merchantCenters/components/merchant_cate.vue

@@ -21,7 +21,7 @@
             <view class='list acea-row'>
               <view v-for="(itemn,indexn) in item.child" :key="indexn">
                 <navigator hover-class='none'
-                           :url='"/pages/goods_search/index?cid="+itemn.id+"&title="+itemn.name+"&merchantId="+props.merchantId'
+                           :url='"/pages/goods/goods_search/index?cid="+itemn.id+"&title="+itemn.name+"&merchantId="+props.merchantId'
                            class='item acea-row row-column row-middle'>
                   <view class='name line1'>{{itemn.name}}</view>
                 </navigator>

pages/users/login/index.vue

@@ -1,21 +1,21 @@
 <template>
-  <div class="login-wrapper">
-    <div
+  <view class="login-wrapper">
+    <view
       class="back_extend"
       v-if="appStore?.$wxConfig?.auditModeEnabled"
       @click="backHome"
     >
       {{ "<" }} 回到首页
-    </div>
-    <div class="shading">
+    </view>
+    <view class="shading">
       <image :src="logoUrl" />
       <!-- <image src="/static/images/logo2.png" v-if="!logoUrl" /> -->
-    </div>
-    <div class="whiteBg" v-if="formItem === 1">
-      <div class="list" v-if="current !== 1">
+    </view>
+    <view class="whiteBg" v-if="formItem === 1">
+      <viewview class="list" v-if="current !== 1">
         <form @submit.prevent="submit">
-          <div class="item">
-            <div class="acea-row row-middle">
+          <view class="item">
+            <view class="acea-row row-middle">
               <image
                 src="https://sb-admin.oss-cn-shenzhen.aliyuncs.com/crmebimage/public/maintain/2025/08/28/phone_1.png"
                 style="width: 24rpx; height: 34rpx"
@@ -27,10 +27,10 @@
                 v-model="account"
                 required
               />
-            </div>
-          </div>
-          <div class="item">
-            <div class="acea-row row-middle">
+            </view>
+          </view>
+          <view class="item">
+            <view class="acea-row row-middle">
               <image
                 src="https://sb-admin.oss-cn-shenzhen.aliyuncs.com/crmebimage/public/maintain/2025/08/28/1cfaad5f37a64884b3eef985d254606eqzlswf1m9g.png"
                 style="width: 28rpx; height: 32rpx"
@@ -41,17 +41,21 @@
                 placeholder="填写登录密码"
                 v-model="password"
                 required
+                :focus="isFocus"
+                confirm-type="done"
+                @focus="isFocus = true"
+                @blur="isFocus =false"
               />
-            </div>
-          </div>
+            </view>
+          </view>
         </form>
-      </div>
-      <div
+      </viewview>
+      <view
         class="list"
         v-if="current !== 0 || appLoginStatus || appleLoginStatus"
       >
-        <div class="item">
-          <div class="acea-row row-middle">
+        <view class="item">
+          <view class="acea-row row-middle">
             <image
               src="https://sb-admin.oss-cn-shenzhen.aliyuncs.com/crmebimage/public/maintain/2025/08/28/phone_1.png"
               style="width: 24rpx; height: 34rpx"
@@ -62,10 +66,10 @@
               placeholder="输入手机号码"
               v-model="account"
             />
-          </div>
-        </div>
-        <div class="item">
-          <div class="acea-row row-middle">
+          </view>
+        </view>
+        <view class="item">
+          <view class="acea-row row-middle">
             <image
               src="https://sb-admin.oss-cn-shenzhen.aliyuncs.com/crmebimage/public/maintain/2025/08/28/1cfaad5f37a64884b3eef985d254606eqzlswf1m9g.png"
               style="width: 28rpx; height: 32rpx"
@@ -84,18 +88,18 @@
             >
               {{ text }}
             </button>
-          </div>
-        </div>
-        <div class="item">
-          <div class="text-row row-middle">
+          </view>
+        </view>
+        <view class="item">
+          <view class="text-row row-middle">
             新用户可使用验证码登录，将自动注册账号
-          </div>
-          <div class="text-row row-middle" v-if="invite_code">
+          </view>
+          <view class="text-row row-middle" v-if="invite_code">
             邀请码:{{ invite_code }}
-          </div>
-        </div>
-        <div class="item" v-if="isShowCode">
-          <div class="acea-row row-middle">
+          </view>
+        </view>
+        <view class="item" v-if="isShowCode">
+          <view class="acea-row row-middle">
             <image
               src="https://sb-admin.oss-cn-shenzhen.aliyuncs.com/crmebimage/public/maintain/2025/08/28/1cfaad5f37a64884b3eef985d254606eqzlswf1m9g.png"
               style="width: 28rpx; height: 32rpx"
@@ -106,20 +110,20 @@
               class="codeIput"
               v-model="codeVal"
             />
-            <div class="code" @click="again"><img :src="codeUrl" /></div>
-          </div>
-        </div>
-      </div>
-      <div class="tips">
-        <div v-if="current == 0" @click="current = 1">快速登录</div>
-        <div v-if="current == 1" @click="current = 0">账号登录</div>
-        <div @click="change_password">忘记密码</div>
-      </div>
-      <div class="logon" @click="loginMobile" v-if="current !== 0">登录</div>
-      <div class="logon" @click="submit" v-if="current === 0">登录</div>
-    </div>
-    <div class="bottom"></div>
-  </div>
+            <view class="code" @click="again"><img :src="codeUrl" /></view>
+          </view>
+        </view>
+      </view>
+      <view class="tips">
+        <view v-if="current == 0" @click="current = 1">快速登录</view>
+        <view v-if="current == 1" @click="current = 0">账号登录</view>
+        <view @click="change_password">忘记密码</view>
+      </view>
+      <view class="logon" @click="loginMobile" v-if="current !== 0">登录</view>
+      <view class="logon" @click="submit" v-if="current === 0">登录</view>
+    </view>
+    <view class="bottom"></view>
+  </view>
 </template>
 
 <script setup>
@@ -170,6 +174,7 @@ const appleShow = ref(false);
 const invite_code = ref("");
 const merchantId = ref('');
 const userInfo = ref({});
+const isFocus = ref(false)
 
 // Watch formItem to update type
 watch(formItem, (newVal) => {

pages/users/user_address_list/index.vue

@@ -166,7 +166,7 @@ onLoad((options) => {
     isGroupBuy.value = options.isGroupBuy === "1"; // 接收团购订单标识
     getAddressListFn(true);
   } else {
-    toLogin();
+    // toLogin();
   }
 });
 

pages/users/user_goods_collection/index.vue

@@ -275,7 +275,7 @@ onLoad(() => {
     collectProductList.value = [];
     get_user_collect_product();
   } else {
-    toLogin();
+    // toLogin();
   }
 });
 

stores/app.js

@@ -84,6 +84,8 @@ export const useAppStore = defineStore("app", {
     LOGOUT() {
       this.token = undefined;
       this.uid = undefined;
+      this.merchantId = null;
+      this.userInfo = null;
       Cache.clear(LOGIN_STATUS);
       Cache.clear(UID);
       Cache.clear(USER_INFO);