From 997036b27927bcc1e9207a40b7a69c106a10f30c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 31 七月 2024 15:49:52 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
wechat_jiaxuan/app.js | 57 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 46 insertions(+), 11 deletions(-)
diff --git a/wechat_jiaxuan/app.js b/wechat_jiaxuan/app.js
index b72e299..1aa5ea5 100644
--- a/wechat_jiaxuan/app.js
+++ b/wechat_jiaxuan/app.js
@@ -1,32 +1,57 @@
import {
wxLoginCustomer
} from './api/index'
+import CustomHook from 'spa-custom-hooks';
+let globalData = {
+ token: '',
+ primary: '#B08771',
+ bottomLift: ''
+}
App({
- globalData: {
- primary: '#B08771',
- bottomLift: ''
- },
- onLaunch: function () {
+ globalData,
+ onLaunch: function (op) {
+ console.log('options', op.query)
+ let pathMap = [
+ '/pages/detailDis/product',
+ '/pages/detailDis/case',
+ '/pages/detailDis/realpic',
+ '/pages/consult/detail',
+ '/pages/productVideo/index',
+ ]
//鑾峰彇褰撳墠璁惧淇℃伅
const WindowInfo = wx.getWindowInfo()
if (WindowInfo.safeArea.top > 20) {
- this.globalData.bottomLift = WindowInfo.screenHeight - WindowInfo.safeArea.bottom;
+ this.globalData.bottomLift = WindowInfo.screenHeight - WindowInfo.safeArea.bottom
}
// 鎺堟潈鐧诲綍
wx.login({
timeout: 5000,
- success(res) {
+ success: (res) => {
+ var userId = null
+ if (op.query.scene) {
+ let temp = op.query.scene.split('_')
+ userId = temp[2]
+ }
if (res.code) {
//鍙戣捣缃戠粶璇锋眰
wxLoginCustomer({
- code: res.code
+ code: res.code,
+ userId
+
}).then(res => {
- console.log(res)
+ wx.setStorageSync('token', res.data.token)
+ this.globalData.token = res.data.token
+ if (op.query.scene) {
+ let temp = op.query.scene.split('_')
+ wx.navigateTo({
+ url: `${pathMap[temp[1]]}?id=${temp[0]}&userId=${temp[2]}`,
+ })
+ }
+ console.log('鎷垮埌token浜�', res.data.token);
if (res && res.data.member) {
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('鐧诲綍澶辫触锛�')
}
@@ -43,4 +68,14 @@
}
-})
\ No newline at end of file
+})
+CustomHook.install({
+ 'Login':{
+ name:'Login',
+ watchKey: 'token',
+ onUpdate(val){
+ //鏈塼oken鍒欒Е鍙戞閽╁瓙
+ return !!val;
+ }
+ }
+ }, globalData || 'globalData')
\ No newline at end of file
--
Gitblit v1.9.3