Merge remote-tracking branch 'origin/master'

rk

2026-04-22 2e3ab7fbbb336cf11ed37b8b0a7871976d597564

 small-program/store/index.js

@@ -9,6 +9,7 @@
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({
   
@@ -19,6 +20,7 @@
      token: token || '',
      openid: openid || '',
      shopToken: shopToken || '',
      shopInfo: shopInfo || '',
      userType: 0,   // 0:会员 1:门店
      
      latitude: '',
@@ -40,9 +42,13 @@
         uni.setStorageSync('token', val);
      },
      // 设置门店token
      setShopToken(state, val) {
         state.shopToken = val
         uni.setStorageSync('shopToken', val);
      setShopToken(state, shopToken) {
         state.shopToken = shopToken
         uni.setStorageSync('shopToken', shopToken);
      },
      setShopInfo(state, shopInfo) {
         state.shopInfo = shopInfo
         uni.setStorageSync('shopInfo', shopInfo);
      },
      // 设置当前用户类型
      setUserType(state, val) {
@@ -61,12 +67,14 @@
      },
      // 设置经纬度
      setPosition(state, obj) {
         console.log('obj', obj)
         state.latitude = obj.latitude
         state.longitude = obj.longitude
         state.address = obj.address
         state.cityId = obj.cityId
         console.log("地址设置完成")
      },
      // 清除城市id
      clearCityId(state) {
         state.cityId = ''
      },
      // 清除缓存数据
      empty(state) {