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 | 184 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 139 insertions(+), 45 deletions(-)
diff --git a/wechat_jiaxuan/pages/detailDis/product.js b/wechat_jiaxuan/pages/detailDis/product.js
index b7fe333..2bc3305 100644
--- a/wechat_jiaxuan/pages/detailDis/product.js
+++ b/wechat_jiaxuan/pages/detailDis/product.js
@@ -1,91 +1,194 @@
-import { shareContent, getProductInfo, actionDo } from '../../api/index'
+import {
+ getProductInfo,
+ actionDo,
+ getMemberInfo
+} from '../../api/index'
+import { eventBus } from '../../utils/eventBus'
Page({
-
/**
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
data: {
bottomLift: 0,
+ current: 0,
id: '',
+ origin: '',
+ isFold: false,
info: {},
+ isCollection: false,
member: {},
- showShare: false
+ showShare: false,
+ options: {
+ empty: '鏃犲弬鏁�'
+ }
},
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
- */
+ 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
})
- this.getDetail(options.id)
- actionDo({
- actionType: 'view',
+ if (options.origin && options.origin == 'b') {
+ this.setData({ origin: 'b' })
+ }
+ this.setData({
id: options.id
})
- const member = wx.getStorageSync('member')
- this.setData({id: options.id, member})
},
- handleAction(e){
+ bindchange(e) {
+ this.setData({ current: e.detail.current })
+ },
+ priviewBanner(e) {
+ const url = e.currentTarget.dataset.url
+ const {
+ info
+ } = this.data
+ wx.previewImage({
+ urls: info.bannerImgList,
+ current: url
+ })
+ },
+ priviewSpace(e) {
+ const url = e.currentTarget.dataset.url
+ const {
+ info
+ } = this.data
+ wx.previewImage({
+ urls: info.spaceList.map(i => i.spaceImg),
+ current: url
+ })
+ },
+ handleAction(e) {
const actionType = e.currentTarget.dataset.code
- const { info } = this.data
+ let {
+ info, member, isCollection
+ } = this.data
+ if (!member.phone) {
+ return wx.navigateTo({
+ url: '/pages/auth/auth',
+ })
+ }
actionDo({
actionType,
id: this.data.info.id
}).then(res => {
- info.isCollection = info.isCollection || info.isCollection == 'true' ? 'false' : 'true'
- this.setData({info})
+ info.isCollection = !info.isCollection
+ isCollection = !isCollection
+ this.setData({
+ isCollection
+ })
+ wx.showToast({
+ title: actionType == 'collect' ? '鏀惰棌鎴愬姛' : '鍙栨秷鏀惰棌',
+ icon: "none"
+ })
})
},
- getDetail(id) {
- getProductInfo({id}).then(res => {
- this.setData({ info: res.data })
+ getDetail(id, userId) {
+ getProductInfo({
+ id,
+ salesId: userId || null
+ }).then(res => {
+ this.setData({
+ 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() {
wx.previewMedia({
- sources: [{ url: this.data.info.video, type: 'video' }]
+ sources: [{
+ url: this.data.info.video,
+ type: 'video'
+ }]
})
},
bannerbindload(e) {
- const { height, width } = e.detail
+ const {
+ height,
+ width
+ } = e.detail
let activeHeight = height * 670 / width
this.setData({
bannerHeight: activeHeight
})
},
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',
})
},
openShare() {
- this.setData({showShare: true})
+ this.setData({
+ showShare: true
+ })
},
handleShare() {
- console.log('鐐瑰嚮浜嗗垎浜�');
- actionDo({ actionType: 'share', id: this.data.info.id })
+ actionDo({
+ actionType: 'share',
+ id: this.data.info.id
+ })
// shareContent({id: this.data.info.id || this.data.id}).then(res => {
// 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})
+ this.setData({
+ showShare: false
+ })
},
handleDown() {
- let { info } = this.data
+ let {
+ info
+ } = this.data
wx.showToast({
title: '涓嬭浇涓�',
icon: 'loading'
@@ -93,7 +196,7 @@
console.log('info.picUrls', info)
wx.downloadFile({
url: info.picUrls,
- success (res) {
+ success(res) {
// console.log(res)
wx.saveImageToPhotosAlbum({
filePath: res.tempFilePath,
@@ -112,7 +215,7 @@
}
})
},
- fail (err) {
+ fail(err) {
console.log(err.errMsg)
wx.showToast({
title: '涓嬭浇澶辫触',
@@ -124,9 +227,6 @@
onHide() {
},
- onUnload() {
-
- },
onPullDownRefresh() {
},
@@ -134,10 +234,4 @@
},
- /**
- * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
- */
- onShareAppMessage() {
-
- }
})
\ No newline at end of file
--
Gitblit v1.9.3