Merge remote-tracking branch 'origin/master'

jiangping

2024-08-09 249a271a867df4802a8d59371e0ff10d3eb54298

 h5/pages/staff/index.vue

@@ -63,7 +63,9 @@
        <image class="img" src="@/static/staff/ic_renwuzhongxin.png"></image>
        <view class="h1">任务中心</view>
        <view class="h2">TASK CENTER</view>
        <view class="task_num">{{ taskNum }}</view>
        <view class="task_num">{{
          taskInfo.noticeWaitNum + taskInfo.noticeCopyNum
        }}</view>
      </view>
      <view class="img_wrap" @click="jump('/pages/staff/meetingCalendar')">
        <image class="img" src="@/static/staff/ic_wodehuiyi.png"></image>
@@ -89,22 +91,67 @@
</template>

<script>
import { logoutPost, stagingHead } from '@/api'
import { logoutPost, stagingHead, wxAuthorize, refreshToken } from '@/api'
export default {
  data() {
    return {
      userInfo: uni.getStorageSync('userInfo'),
      taskNum: 0
      taskInfo: 0
    }
  },
  onLoad() {
    console.log('userInfo', this.userInfo)

  },
  onShow() {
    // if (this.userInfo && this.userInfo.name) {
      this.getTaskInfo()
    var that = this
    // if (!that.$store.state.openid) {
    let url = window.location.href
    let code = ''
    let source = ''
    if (url.indexOf('code=') !== -1) {
      const query = url.split('?')
      console.log('app-app', url)
      for (const q of query) {
        if (q.indexOf('code=') !== -1) {
          code = q.substring(q.indexOf('code=') + 5, q.length)
        }
        // if (q.indexOf('source=') !== -1) {
        //   source = q.substring(q.indexOf('source=') + 7, q.indexOf('source=') + 8)
        // }
        // 来源:0=司机；1=访客；2=内部员工
      }
      wxAuthorize({
        code: code,
        source: 2
      }).then(res => {
        console.log('app_ress', res)
        if (res.code === 200) {
          that.$store.commit('setOpenId', res.data.openid)
          if (res.data.member) {
            that.$store.commit('setMember', res.data.member)
          }
        }
      })
    } else {
      // const appID = 'wx4d7c10bdec51942b'
      // let uri = encodeURIComponent(url)
      // let authURL =
      //   `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appID}&redirect_uri=${uri}&response_type=code&scope=snsapi_base&state=123#wechat_redirect`
      // window.location.href = authURL
    }
    // }
    this.getTaskInfo()
    // 刷新token
    setTimeout(() => {
      refreshToken().then(res => {
        if (res.code && res.code === 200) {
          this.$store.commit('setToken', res.data)
        }
      })
    }, 3000)
  },
  mounted() {
    this.$eventBus.$on('taskBack', () => {
      console.log('----');
      this.getTaskInfo()
    })
  },
  methods: {
    jump(path) {
@@ -121,9 +168,9 @@
    },
    getTaskInfo() {
      stagingHead({
        isDetail: '0'
        isDetail: '1'
      }).then(res => {
        this.taskNum = res.data.taskNum
        this.taskInfo = res.data || ''
      })
    },
  }