From 015b4f31cebbecf6f6da760ed2f8af3da721e802 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 18 四月 2025 16:17:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/App.vue | 152 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 122 insertions(+), 30 deletions(-)
diff --git a/h5/App.vue b/h5/App.vue
index 9cacafa..8c4787c 100644
--- a/h5/App.vue
+++ b/h5/App.vue
@@ -11,52 +11,144 @@
},
methods: {
async init() {
- // if (!this.$store.state.userInfo) {
- // let res = await this.$u.api.login({ code: 'ShiXuHui' })
- // if (res.code === 200) {
- // this.$store.commit('setUserInfo', res.data)
- // }
- // }
- // return
- let code = this.getQueryVariable('code')
- if (code) {
- let res = await this.$u.api.login({ code: code })
+ if (!this.$store.state.userInfo) {
+ let res = await this.$u.api.login({ code: 'ShiXuHui' })
if (res.code === 200) {
this.$store.commit('setUserInfo', res.data)
- this.initRegister()
+ }
+ }
+ return
+ let code = this.getQueryVariable('code')
+ if (code) {
+ if (!uni.getStorageSync('code')) {
+ uni.setStorageSync('code', code);
- // 鍒ゆ柇鏄惁璺宠浆璇︽儏
- let url = window.location.href
- if (url.indexOf('state=') !== -1 && url.indexOf('#') !== -1) {
- let value = url.substring(url.indexOf('state=') + 6, url.indexOf('#')).split('_')
- console.log(value)
- if (value.length > 0) {
- if (value[0] == 0) {
- uni.navigateTo({
- url: `/pages/details_she/details_she?id=${value[1]}`
- })
- } else if (value[0] == 1) {
- uni.navigateTo({
- url: `/pages/workOrder_dca/workOrder_dca?id=${value[1]}`
- })
- } else if (value[0] == 3) {
- uni.navigateTo({
- url: `/pages/workOrder_she/workOrder_she?id=${value[1]}`
- })
+ let res = await this.$u.api.login({ code: code })
+ if (res.code === 200) {
+ this.$store.commit('setUserInfo', res.data)
+ this.initRegister()
+
+ // 鍒ゆ柇鏄惁璺宠浆璇︽儏
+ let url = window.location.href
+ if (url.indexOf('state=') !== -1 && url.indexOf('#') !== -1) {
+ let value = url.substring(url.indexOf('state=') + 6, url.indexOf('#')).split('_')
+ console.log(value)
+ if (value[0] !== '') {
+ if (value[0] == 0) {
+ uni.navigateTo({
+ url: `/pages/details_she/details_she?id=${value[1]}`
+ })
+ } else if (value[0] == 1) {
+ uni.navigateTo({
+ url: `/pages/details_dca/details_dca?id=${value[1]}&isShow=true`
+ })
+ } else if (value[0] == 3) {
+ uni.navigateTo({
+ url: `/pages/workOrder_she/workOrder_she?id=${value[1]}`
+ })
+ }
}
}
}
+ } else if (uni.getStorageSync('code') !== code) {
+
+ uni.setStorageSync('code', code);
+
+ let res = await this.$u.api.login({ code: code })
+ if (res.code === 200) {
+ this.$store.commit('setUserInfo', res.data)
+ this.initRegister()
+
+ // 鍒ゆ柇鏄惁璺宠浆璇︽儏
+ let url = window.location.href
+ if (url.indexOf('state=') !== -1 && url.indexOf('#') !== -1) {
+ let value = url.substring(url.indexOf('state=') + 6, url.indexOf('#')).split('_')
+ console.log(value)
+ if (value[0] !== '') {
+ if (value[0] == 0) {
+ uni.navigateTo({
+ url: `/pages/details_she/details_she?id=${value[1]}`
+ })
+ } else if (value[0] == 1) {
+ uni.navigateTo({
+ url: `/pages/details_dca/details_dca?id=${value[1]}&isShow=true`
+ })
+ } else if (value[0] == 3) {
+ uni.navigateTo({
+ url: `/pages/workOrder_she/workOrder_she?id=${value[1]}`
+ })
+ }
+ }
+ }
+ }
+
+ } else {
+ let loc_href = encodeURIComponent("https://dmtest.ahapp.net/lianhelihua_web/")
+
+ let corpId = 'wweea8f71b54e3b835';
+ let agentId = '1000095';
+
+ let wxUrl = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${corpId}&redirect_uri=${loc_href}&response_type=code&scope=snsapi_base&state=#wechat_redirect`
+
+ location.href = wxUrl;
}
} else {
let loc_href = encodeURIComponent("https://dmtest.ahapp.net/lianhelihua_web/")
let corpId = 'wweea8f71b54e3b835';
let agentId = '1000095';
-
+
let wxUrl = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${corpId}&redirect_uri=${loc_href}&response_type=code&scope=snsapi_base&state=#wechat_redirect`
location.href = wxUrl;
}
+ // ShiXuHui
+ // if (!this.$store.state.userInfo) {
+ // let res = await this.$u.api.login({ code: 'GuoJiWenWu' })
+ // if (res.code === 200) {
+ // this.$store.commit('setUserInfo', res.data)
+ // }
+ // }
+ // return
+ // let code = this.getQueryVariable('code')
+ // if (code) {
+ // let res = await this.$u.api.login({ code: code })
+ // if (res.code === 200) {
+ // this.$store.commit('setUserInfo', res.data)
+ // this.initRegister()
+
+ // // 鍒ゆ柇鏄惁璺宠浆璇︽儏
+ // let url = window.location.href
+ // if (url.indexOf('state=') !== -1 && url.indexOf('#') !== -1) {
+ // let value = url.substring(url.indexOf('state=') + 6, url.indexOf('#')).split('_')
+ // console.log(value)
+ // if (value[0] !== '') {
+ // if (value[0] == 0) {
+ // uni.navigateTo({
+ // url: `/pages/details_she/details_she?id=${value[1]}`
+ // })
+ // } else if (value[0] == 1) {
+ // uni.navigateTo({
+ // url: `/pages/workOrder_dca/workOrder_dca?id=${value[1]}`
+ // })
+ // } else if (value[0] == 3) {
+ // uni.navigateTo({
+ // url: `/pages/workOrder_she/workOrder_she?id=${value[1]}`
+ // })
+ // }
+ // }
+ // }
+ // }
+ // } else {
+ // let loc_href = encodeURIComponent("https://dmtest.ahapp.net/lianhelihua_web/")
+
+ // let corpId = 'wweea8f71b54e3b835';
+ // let agentId = '1000095';
+
+ // let wxUrl = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${corpId}&redirect_uri=${loc_href}&response_type=code&scope=snsapi_base&state=#wechat_redirect`
+
+ // location.href = wxUrl;
+ // }
},
// 鑾峰彇url鍙傛暟
getQueryVariable(variable) {
--
Gitblit v1.9.3