Merge remote-tracking branch 'origin/master'

rk

2026-04-22 2e3ab7fbbb336cf11ed37b8b0a7871976d597564

 small-program/shop/pages/login/login.vue

@@ -54,15 +54,20 @@
         // 静默登录
         if (this.userInfo.bindShopId) {
            this.$u.api.shopSilentLogin({})
               .then(res => {
               .then(async res => {
                  if (res.code === 200) {
                     this.$store.commit('setUserType', 1)
                     this.$store.commit('setShopToken', res.data.token)
                     // 获取门店信息
                     const shopInfoRes = await this.$u.api.getShopInfo({})
                     if (shopInfoRes.code === 200) {
                        this.$store.commit('setShopInfo', shopInfoRes.data)
                     }
                     setTimeout(() => {
                        uni.reLaunch({
                           url: '/shop/pages/store-home/store-home'
                        });
                     }, 500)
                     }, 1000)
                  }
               })
         }
@@ -101,6 +106,11 @@
               if (res.code === 200) {
                  this.$store.commit('setUserType', 1)
                  this.$store.commit('setShopToken', res.data.token)
                  // 获取门店信息
                  const shopInfoRes = await this.$u.api.getShopInfo({})
                  if (shopInfoRes.code === 200) {
                     this.$store.commit('setShopInfo', shopInfoRes.data)
                  }
                  uni.showToast({ title: '登录成功', icon: 'success' })
                  setTimeout(() => {
                     uni.reLaunch({