From 97e1b9d6c8d7da0891aa7a1e00116b4b14e1b942 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 05 七月 2024 18:22:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/index.vue | 73 +++++++++++++++++++++++++++++++-----
1 files changed, 62 insertions(+), 11 deletions(-)
diff --git a/h5/pages/staff/index.vue b/h5/pages/staff/index.vue
index 341f9b3..5b07e1b 100644
--- a/h5/pages/staff/index.vue
+++ b/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,71 @@
</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
+ // const token = uni.getStorageSync('token')
+ // if (token) {
+ // refreshToken().then(res => {
+ // if (res.code && res.code === 200) {
+ // this.$store.commit('setToken', res.data)
+ // console.log('res', res.data);
+ // // setTimeout(() => {
+ // // this.getTaskInfo()
+ // // }, 1000)
+ // }
+ // })
+ // }
+ },
+ mounted() {
+ this.$eventBus.$on('taskBack', () => {
+ this.getTaskInfo()
+ })
},
methods: {
jump(path) {
@@ -121,9 +172,9 @@
},
getTaskInfo() {
stagingHead({
- isDetail: '0'
+ isDetail: '1'
}).then(res => {
- this.taskNum = res.data.taskNum
+ this.taskInfo = res.data
})
},
}
--
Gitblit v1.9.3