Merge remote-tracking branch 'origin/master'

doum

2026-04-29 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea

 small-program/store/index.js

@@ -8,6 +8,8 @@
const userInfo = uni.getStorageSync('userInfo');
const token = uni.getStorageSync('token');
const openid = uni.getStorageSync('openid');
const shopToken = uni.getStorageSync('shopToken');
const shopInfo = uni.getStorageSync('shopInfo');

const store = new Vuex.Store({
   
@@ -17,9 +19,13 @@
      userInfo: userInfo || {},
      token: token || '',
      openid: openid || '',
      shopToken: shopToken || '',
      shopInfo: shopInfo || '',
      userType: 0,   // 0:会员 1:门店
      
      latitude: '',
      longitude: '',
      cityId: '',
      address:'定位中'
   },
   mutations: {
@@ -30,13 +36,27 @@
         uni.setStorageSync('navHeight', val.navHeight);
         uni.setStorageSync('statusbarHeight', val.statusbarHeight);
      },
      // 设置token
      // 设置会员token
      setToken(state, val) {
         state.token = val
         uni.setStorageSync('token', val);
      },
      // 设置token
      // 设置门店token
      setShopToken(state, shopToken) {
         state.shopToken = shopToken
         uni.setStorageSync('shopToken', shopToken);
      },
      setShopInfo(state, shopInfo) {
         state.shopInfo = shopInfo
         uni.setStorageSync('shopInfo', shopInfo);
      },
      // 设置当前用户类型
      setUserType(state, val) {
         state.userType = val
      },
      // 设置openid
      setOpenid(state, val) {
         console.log('val', val)
         state.openid = val
         uni.setStorageSync('openid', val);
      },
@@ -49,15 +69,21 @@
      setPosition(state, obj) {
         state.latitude = obj.latitude
         state.longitude = obj.longitude
         state.address = obj.address  
         console.log("地址设置完成")
         state.address = obj.address
         state.cityId = obj.cityId
      },
      // 清除城市id
      clearCityId(state) {
         state.cityId = ''
      },
      // 清除缓存数据
      empty(state) {
         state.userInfo = ''
         state.token = ''
         state.openid = ''
         uni.removeStorageSync('token');
         uni.removeStorageSync('userInfo');
         uni.removeStorageSync('openid');
      }
   },