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_staff/pages/detailDis/product.js | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/wechat_staff/pages/detailDis/product.js b/wechat_staff/pages/detailDis/product.js
index f22f525..7ffee42 100644
--- a/wechat_staff/pages/detailDis/product.js
+++ b/wechat_staff/pages/detailDis/product.js
@@ -14,8 +14,10 @@
current: 0,
id: '',
info: {},
+ spaceList: [],
member: {},
showShare: false,
+ isFold: false,
enjoyList: []
},
onShow(){
@@ -79,10 +81,11 @@
actionType: flag ? 'collect' : 'collect_cancel'
}).then(res => {
info.isCollection = flag
- wx.showToast({title: flag ? '鏀惰棌鎴愬姛' : '鍙栨秷鏀惰棌'})
+ wx.showToast({title: flag ? '鏀惰棌鎴愬姛' : '鍙栨秷鏀惰棌', icon: 'none'})
this.setData({
info
})
+ wx.setStorageSync('conentCountTemp', this.data.info)
})
}
},
@@ -92,7 +95,7 @@
info
} = this.data
wx.previewImage({
- urls: info.imageurlList,
+ urls: info.bannerImgList,
current: url
})
},
@@ -100,12 +103,13 @@
this.setData({ current: e.detail.current })
},
priviewSpace(e) {
+ return
const url = e.currentTarget.dataset.url
const {
info
} = this.data
wx.previewImage({
- urls: info.imageurlList,
+ urls: info.spaceList.map(i => i.spaceImg),
current: url
})
},
@@ -117,13 +121,16 @@
getProductInfo({
id
}).then(res => {
- const index = enjoyList.findIndex( i => i.id === res.data.id )
+ const index = enjoyList.findIndex( i =>(res.data && i.id === res.data.id) )
this.setData({
+ spaceList: res.data.spaceList || [],
info: {
...res.data,
isEnjoy: index > -1
}
})
+ const { info} = this.data
+ wx.setStorageSync('conentCountTemp', info)
wx.setNavigationBarTitle({
title: res.data.title
})
@@ -167,18 +174,16 @@
// this.setData({showShare: false})
// })
},
+ changeFold() {
+ this.setData({ isFold: !this.data.isFold })
+ },
// onShareAppMessage: function () {
// // let { productDetail, userInfo } = this.data
// return {
// title: productDetail.title,
// path: '/pages/index/index?id=' + productDetail.id + '&shareuserid=' + userInfo.id + '&type=0'
// }
- // },
- onClose() {
- this.setData({
- showShare: false
- })
- },
+ // },
handleDown() {
let {
info
--
Gitblit v1.9.3