Merge remote-tracking branch 'origin/master'

doum

2026-04-23 2800434db8a3117cf4f1ccb119e7ac939f0511bb

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

@@ -39,7 +39,7 @@

   export default {
      computed: {
         ...mapState(['openid'])
         ...mapState(['openid', 'userInfo'])
      },
      data() {
         return {
@@ -48,6 +48,28 @@
               telephone: '',
               password: ''
            }
         }
      },
      onLoad() {
         // 静默登录
         if (this.userInfo.bindShopId) {
            this.$u.api.shopSilentLogin({})
               .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'
                        });
                     }, 1000)
                  }
               })
         }
      },
      methods: {
@@ -84,11 +106,16 @@
               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.switchTab({
                        url: '/pages/shop-index/shop-index'
                     })
                     uni.reLaunch({
                        url: '/shop/pages/store-home/store-home'
                     });
                  }, 1500)
               } else {
                  uni.showToast({