From 53b6400ec10c8ca61ccec91c82c358d2488eead8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 20 十二月 2024 09:50:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/index.vue | 55 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 35 insertions(+), 20 deletions(-)
diff --git a/h5/pages/staff/index.vue b/h5/pages/staff/index.vue
index aa7dd2b..20f1ebf 100644
--- a/h5/pages/staff/index.vue
+++ b/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() {
--
Gitblit v1.9.3