Merge remote-tracking branch 'origin/master'

jiangping

2024-12-20 53b6400ec10c8ca61ccec91c82c358d2488eead8

 h5/pages/staff/index.vue

@@ -53,7 +53,8 @@
      stagingHead,

      wxAuthorize,

      refreshToken,

      app_url

      app_url,
      delHkUserOpenid

   } from '@/api'

   export default {

      data() {

@@ -130,23 +131,23 @@
      onLoad() {

         const ywinfo = uni.getStorageSync('ywinfo') || {}

         if (ywinfo.ywid && ywinfo.type == 2) {

            setTimeout(() => {

               uni.removeStorageSync('ywinfo')

            }, 500)

            uni.setStorageSync('ywinfo',{})

            const yw = ywinfo.yw

            if (yw == 1 || yw == 6) {

               this.jump('/pages/staff/meetingDetail?id=' + ywinfo.ywid)

            } else if (yw == 2) {

               this.jump('/pages/staff/task/visitorApprove?id=' + ywinfo.ywid)

            } else if (yw == 3) {

               this.jump('/pages/staff/task/visitorReport?id=' + ywinfo.ywid)

            } else if (yw == 4) {

               this.jump('/pages/staff/task/vDangetAppr?id=' + ywinfo.ywid)

            } else if (yw == 7) {

               this.jump('/pages/staff/task/driver?id=' + ywinfo.ywid)

            } else if (yw == 5) {

               this.jump('/pages/staff/vehicle/index')

            }

            setTimeout(() => {

               if (yw == 1 || yw == 6) {

                  this.jump('/pages/staff/meetingDetail?id=' + ywinfo.ywid)

               } else if (yw == 2) {

                  this.jump('/pages/staff/task/visitorApprove?id=' + ywinfo.ywid)

               } else if (yw == 3) {

                  this.jump('/pages/staff/task/visitorReport?id=' + ywinfo.ywid)

               } else if (yw == 4) {

                  this.jump('/pages/staff/task/vDangetAppr?id=' + ywinfo.ywid)

               } else if (yw == 7) {

                  this.jump('/pages/staff/task/driver?id=' + ywinfo.ywid)

               } else if (yw == 5) {

                  this.jump('/pages/staff/vehicle/sendACarDetail')

               }

            }, 100)

         }

      },

      onShow() {

@@ -173,10 +174,24 @@
            logoutPost({

               isH5: 1

            }).then(res => {
               const userInfo = uni.getStorageSync('userInfo')
               const openId = uni.getStorageSync('openId')
               this.$store.commit('empty')
               setTimeout(() => {
                  window.location.href = app_url
               }, 300)
               if(openId){
                  delHkUserOpenid({
                     userName: userInfo.username,
                     openId
                  }).then(ress => {
                     setTimeout(() => {
                        window.location.href = app_url
                     }, 300)
                  })
               }else{
                  setTimeout(() => {
                     window.location.href = app_url
                  }, 300)
               }
					
            })

         },

         getTaskInfo() {