From 3ac695aaee5aab01d8cb39a56388c2740913dbec Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 06 十二月 2024 17:18:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/index.vue | 57 +++++++++++----------------------------------------------
1 files changed, 11 insertions(+), 46 deletions(-)
diff --git a/h5/pages/staff/index.vue b/h5/pages/staff/index.vue
index 87dae86..15b25ae 100644
--- a/h5/pages/staff/index.vue
+++ b/h5/pages/staff/index.vue
@@ -121,7 +121,7 @@
{ name: '鐢ㄨ溅鐢宠', url: '/pages/staff/vehicle/index', img: require('@/static/home/ic_yongcheshenqing@3x.png'),auth: 'weixin:menu:usecar' },
{ name: '棰勭害浼氳瀹�', url: '/pages/staff/meetingSub', img: require('@/static/home/ic_yuyuehuiyishi@3x.png'),auth: 'weixin:menu:meeting' },
{ name: '淇敼瀵嗙爜', url: '/pages/changePassword/changePassword', img: require('@/static/home/ic_xiugaimima@3x.png'),auth: 'weixin:menu:password' },
- { name: '鍛樺伐鑰冨嫟', url: '', img: require('@/static/home/ic_kaoqin@3x.png'),auth: 'weixin:menu:attendance' },
+ { name: '鎴戠殑鑰冨嫟', url: '/pages/staff/signin', img: require('@/static/home/ic_kaoqin@3x.png'),auth: 'weixin:menu:attendance' },
],
list2: [
{ name: '浠诲姟涓績', url: '/pages/staff/task/index', img: require('@/static/home/ic_renwuzhongxin@3x.png'),auth: 'weixin:menu:taskcenter' },
@@ -133,52 +133,16 @@
}
},
onLoad() {
- 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)
+ // setTimeout(() => {
+ // refreshToken().then(res => {
+ // if (res.code && res.code === 200) {
+ // this.$store.commit('setToken', res.data)
+ // }
+ // })
+ // }, 3000)
},
mounted() {
this.$eventBus.$on('taskBack', () => {
@@ -224,6 +188,7 @@
justify-content: space-between;
align-items: center;
margin-bottom: 24rpx;
+ padding-top: 10rpx;
.name {
font-weight: 600;
font-size: 34rpx;
@@ -317,7 +282,7 @@
position: fixed;
width: 100%;
left: 0;
- bottom: 88rpx;
+ bottom: 48rpx;
image {
width: 40rpx;
height: 40rpx;
--
Gitblit v1.9.3