Merge remote-tracking branch 'origin/master'

jiangping

2024-12-12 fdd38a72d0b0b87724aa94f7f9b5b0885f34cff5

 h5/pages/driver/index.vue

@@ -111,6 +111,20 @@
         driverInfo: uni.getStorageSync('driverInfo'),



      }

   },
   onLoad() {
      const ywinfo = uni.getStorageSync('ywinfo') || {}
      if(ywinfo.ywid && ywinfo.type == 0){
         setTimeout(() => {
            uni.removeStorageSync('ywinfo')
         }, 500)
         const yw = ywinfo.yw
         if(yw == 7){
            this.jump('/pages/driver/reservedDetail?id=' + ywinfo.ywid)
         }else if(yw == 8){
            this.jump('/pages/driver/taskDetail?id=' + ywinfo.ywid)
         }
      }
   },

   onShow() {

      this.initData()

@@ -133,9 +147,12 @@
         })

      },

      loginOut() {
         logoutPost({isH5: 1})

         this.$store.commit('empty')

         window.location.href = app_url

         logoutPost({isH5: 1}).then(res => {
            this.$store.commit('empty')
            setTimeout(() => {
               window.location.href = app_url
            }, 300)
         })

      },

      taskClick(item) {

         const status = item.status