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/product.js | 94 +++++++++++++++++++++++++++++++----------------
1 files changed, 62 insertions(+), 32 deletions(-)
diff --git a/wechat_jiaxuan/pages/detailDis/product.js b/wechat_jiaxuan/pages/detailDis/product.js
index fd243ff..2bc3305 100644
--- a/wechat_jiaxuan/pages/detailDis/product.js
+++ b/wechat_jiaxuan/pages/detailDis/product.js
@@ -1,7 +1,9 @@
import {
getProductInfo,
- actionDo
+ actionDo,
+ getMemberInfo
} from '../../api/index'
+import { eventBus } from '../../utils/eventBus'
Page({
/**
* 椤甸潰鐨勫垵濮嬫暟鎹�
@@ -11,29 +13,44 @@
current: 0,
id: '',
origin: '',
+ isFold: false,
info: {},
+ isCollection: false,
member: {},
- showShare: false
+ showShare: false,
+ options: {
+ empty: '鏃犲弬鏁�'
+ }
},
- onLoadLogin(options){
+ changeFold() {
+ this.setData({ isFold: !this.data.isFold })
+ },
+ onLoadLogin(options) {
this.getDetail(options.id, options.userId || '')
actionDo({
actionType: 'view',
id: options.id
})
},
+ onShow(){
+ this.setData({ member: wx.getStorageSync('member') })
+ },
+ onUnload() {
+ console.log('璇︽儏杩涜浜嗛攢姣�');
+ setTimeout(() => {
+ eventBus.emit('productDeBack', this.data.info)
+ }, 500)
+ },
onLoad(options) {
var app = getApp().globalData
this.setData({
bottomLift: app.bottomLift
})
- if(options.origin && options.origin == 'b'){
+ if (options.origin && options.origin == 'b') {
this.setData({ origin: 'b' })
}
- const member = wx.getStorageSync('member')
this.setData({
- id: options.id,
- member
+ id: options.id
})
},
bindchange(e) {
@@ -45,7 +62,7 @@
info
} = this.data
wx.previewImage({
- urls: info.imageurlList,
+ urls: info.bannerImgList,
current: url
})
},
@@ -55,17 +72,16 @@
info
} = this.data
wx.previewImage({
- urls: info.imageurlList,
+ urls: info.spaceList.map(i => i.spaceImg),
current: url
})
},
handleAction(e) {
const actionType = e.currentTarget.dataset.code
- const {
- info
+ let {
+ info, member, isCollection
} = this.data
- const member = wx.getStorageSync('member')
- if (member.authStatus == '0') {
+ if (!member.phone) {
return wx.navigateTo({
url: '/pages/auth/auth',
})
@@ -75,11 +91,13 @@
id: this.data.info.id
}).then(res => {
info.isCollection = !info.isCollection
+ isCollection = !isCollection
this.setData({
- info
+ isCollection
})
wx.showToast({
title: actionType == 'collect' ? '鏀惰棌鎴愬姛' : '鍙栨秷鏀惰棌',
+ icon: "none"
})
})
},
@@ -89,11 +107,20 @@
salesId: userId || null
}).then(res => {
this.setData({
- info: res.data
+ info: res.data,
+ isCollection: res.data.isCollection
})
wx.setNavigationBarTitle({
title: res.data.title
})
+ if(userId){
+ getMemberInfo().then(res => {
+ this.setData({ member: res.data })
+ wx.setStorageSync('member', res.data)
+ })
+ }else{
+ this.setData({ member: wx.getStorageSync('member') })
+ }
})
},
playVideo() {
@@ -115,6 +142,13 @@
})
},
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',
})
@@ -125,7 +159,6 @@
})
},
handleShare() {
- console.log('鐐瑰嚮浜嗗垎浜�');
actionDo({
actionType: 'share',
id: this.data.info.id
@@ -134,13 +167,19 @@
// this.setData({showShare: false})
// })
},
- // onShareAppMessage: function () {
- // // let { productDetail, userInfo } = this.data
- // return {
- // title: productDetail.title,
- // path: '/pages/index/index?id=' + productDetail.id + '&shareuserid=' + userInfo.id + '&type=0'
- // }
- // },
+ onShareAppMessage: function () {
+ let { info } = this.data
+ console.log('鐐瑰嚮浜嗗垎浜�')
+ 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() {
this.setData({
showShare: false
@@ -188,9 +227,6 @@
onHide() {
},
- onUnload() {
-
- },
onPullDownRefresh() {
},
@@ -198,10 +234,4 @@
},
- /**
- * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
- */
- onShareAppMessage() {
-
- }
})
\ No newline at end of file
--
Gitblit v1.9.3