From b7fd27a4a7ac72eef5fc142cae9bb63fe69ef233 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 22 七月 2024 15:34:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_jiaxuan/utils/request.js | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/wechat_jiaxuan/utils/request.js b/wechat_jiaxuan/utils/request.js
index b58d028..fbd20fd 100644
--- a/wechat_jiaxuan/utils/request.js
+++ b/wechat_jiaxuan/utils/request.js
@@ -1,4 +1,5 @@
import { baseUrl } from "./config"
+import { wxLoginCustomer } from '../api/index'
export function request(options){
let loading = options.loading || '1' // 榛樿鍊�1鏄剧ず锛屽惁鍒欎笉鏄剧ず
@@ -19,9 +20,40 @@
if (res.data.code === 200) {
resolve(res.data || true)
} else {
- if(res.data.code == 5111 && res.data.code == 5112){
- wx.navigateTo({
- url: '/pages/auth/auth',
+ // if(res.data.code == 5112){
+ // wx.navigateTo({
+ // url: '/pages/auth/auth ',
+ // })
+ // }
+ if(res.data.code == 5111 || res.data.code == 5112){
+ wx.login({
+ timeout: 5000,
+ success(res) {
+ if (res.code) {
+ //鍙戣捣缃戠粶璇锋眰
+ wxLoginCustomer({
+ code: res.code
+ }).then(res => {
+ console.log(res)
+ if (res && res.data.member) {
+ wx.switchTab({
+ url: '/pages/index/index',
+ })
+ wx.setStorageSync('member', res.data.member)
+ wx.setStorageSync('openid', res.data.member.openid)
+ wx.setStorageSync('sessionKey', res.data.sessionKey)
+ wx.setStorageSync('token', res.data.token)
+ } else {
+ console.log('鐧诲綍澶辫触锛�')
+ }
+ })
+ } else {
+ console.log('鐧诲綍澶辫触锛�' + res)
+ }
+ },
+ fail(err) {
+ console.log(err)
+ }
})
}
res.data.message && wx.showToast({
--
Gitblit v1.9.3