Merge remote-tracking branch 'origin/master'

jiangping

2025-01-07 41d11d9db46ccd44163860f6be6bfd2137aff369

 h5/store/index.js

@@ -14,6 +14,7 @@
const time = uni.getStorageSync('time')
const userInfo = uni.getStorageSync('userInfo')
const driverInfo = uni.getStorageSync('driverInfo')
const waybillInfo = uni.getStorageSync('waybillInfo')
const sessionKey = uni.getStorageSync('sessionKey')

const store = new Vuex.Store({
@@ -27,6 +28,7 @@
      time: time || null,
      userInfo: userInfo || {},
      driverInfo: driverInfo || {},
      waybillInfo: waybillInfo || {},
      height: height || '0',
      sessionKey: sessionKey || '',
      primaryColor: '#279baa'
@@ -42,6 +44,10 @@
      setMember(state, val) {
         state.member = val
         uni.setStorageSync('member', val)
      },
      setWaybillInfo(state, val) {
         state.waybillInfo = val
         uni.setStorageSync('waybillInfo', val)
      },
      // 设置导航栏高度
      setHeight(state, val) {
@@ -84,6 +90,7 @@
         state.openId = ''
         state.userInfo = {}
         state.driverInfo = {}
         state.waybillInfo = {}
      }
   },
   actions: {