From b2d360d9113b6955287108ca9e90d76a1f3c1419 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期日, 29 九月 2024 15:05:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
wechat_jiaxuan/pages/detailDis/product.js | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/wechat_jiaxuan/pages/detailDis/product.js b/wechat_jiaxuan/pages/detailDis/product.js
index cc5c0d8..89f8e81 100644
--- a/wechat_jiaxuan/pages/detailDis/product.js
+++ b/wechat_jiaxuan/pages/detailDis/product.js
@@ -15,6 +15,7 @@
origin: '',
isFold: false,
info: {},
+ isCollection: false,
member: {},
showShare: false,
options: {
@@ -77,8 +78,8 @@
},
handleAction(e) {
const actionType = e.currentTarget.dataset.code
- const {
- info, member
+ let {
+ info, member, isCollection
} = this.data
if (!member.phone) {
return wx.navigateTo({
@@ -90,8 +91,9 @@
id: this.data.info.id
}).then(res => {
info.isCollection = !info.isCollection
+ isCollection = !isCollection
this.setData({
- info
+ isCollection
})
wx.showToast({
title: actionType == 'collect' ? '鏀惰棌鎴愬姛' : '鍙栨秷鏀惰棌',
@@ -105,7 +107,8 @@
salesId: userId || null
}).then(res => {
this.setData({
- info: res.data
+ info: res.data,
+ isCollection: res.data.isCollection
})
wx.setNavigationBarTitle({
title: res.data.title
@@ -139,15 +142,19 @@
})
},
handleDesign() {
- const { member } = this.data
+ const { member, origin, info } = this.data
+ let path = '/pages/design/design'
+ if(origin != 'b' && info.users && info.users.id){
+ path = `/pages/design/design?name=${info.users.iamUsername}`
+ }
if (!member.phone) {
- wx.setStorageSync('tempPath', '/pages/design/design')
+ wx.setStorageSync('tempPath', path)
return wx.navigateTo({
url: '/pages/auth/auth',
})
}
wx.navigateTo({
- url: '/pages/design/design',
+ url: path,
})
},
openShare() {
@@ -167,8 +174,14 @@
onShareAppMessage: function () {
let { info } = this.data
console.log('鐐瑰嚮浜嗗垎浜�')
- return {
- path: '/pages/detailDis/product?id=' + info.id + '&userId=' + info.users.id
+ if(info.users && info.users.id){
+ return {
+ path: '/pages/detailDis/product?id=' + info.id + '&userId=' + info.users.id
+ }
+ }else{
+ return {
+ path: '/pages/detailDis/product?id=' + info.id
+ }
}
},
onClose() {
--
Gitblit v1.9.3