From 04b4bddaac0a222760113899568d20b45af701f4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 九月 2024 19:04:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_jiaxuan/pages/detailDis/case.js | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/wechat_jiaxuan/pages/detailDis/case.js b/wechat_jiaxuan/pages/detailDis/case.js
index b5a3cb3..3a5e508 100644
--- a/wechat_jiaxuan/pages/detailDis/case.js
+++ b/wechat_jiaxuan/pages/detailDis/case.js
@@ -1,6 +1,7 @@
import {
actionDo,
- getWholecaseInfo
+ getWholecaseInfo,
+ getMemberInfo
} from '../../api/index'
import {
eventBus
@@ -27,6 +28,9 @@
setTimeout(() => {
eventBus.emit('caseDeBack', this.data.info)
}, 500)
+ },
+ onShow(){
+ this.setData({ member: wx.getStorageSync('member') })
},
onLoad(options) {
var app = getApp().globalData
@@ -78,8 +82,14 @@
info
} = this.data
console.log('鐐瑰嚮浜嗗垎浜�')
- return {
- path: '/pages/detailDis/case?id=' + info.id + '&userId=' + info.users.id
+ if(info.users && info.users.id){
+ return {
+ path: '/pages/detailDis/case?id=' + info.id + '&userId=' + info.users.id
+ }
+ }else{
+ return {
+ path: '/pages/detailDis/case?id=' + info.id
+ }
}
},
handleAction(e) {
@@ -88,7 +98,7 @@
info
} = this.data
const member = wx.getStorageSync('member')
- if (member.authStatus == '0') {
+ if (!member.phone) {
return wx.navigateTo({
url: '/pages/auth/auth',
})
@@ -139,11 +149,19 @@
this.setData({
member: res.data
})
+ wx.setStorageSync('member', res.data)
})
}
})
},
handleDesign() {
+ const { member } = this.data
+ if (!member.phone) {
+ wx.setStorageSync('tempPath', '/pages/design/design')
+ return wx.navigateTo({
+ url: '/pages/auth/auth',
+ })
+ }
wx.navigateTo({
url: '/pages/design/design',
})
@@ -161,14 +179,6 @@
showShare: false
})
},
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
- */
- onShow() {
-
- },
-
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
*/
--
Gitblit v1.9.3