From 2faa6546a9f9ddb29f81cbc9770fc25b95703695 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 26 七月 2024 17:02:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 wechat_jiaxuan/pages/detailDis/product.js |   35 +++++++++++++++++++++++++++++++----
 1 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/wechat_jiaxuan/pages/detailDis/product.js b/wechat_jiaxuan/pages/detailDis/product.js
index a9c7492..acd6c6d 100644
--- a/wechat_jiaxuan/pages/detailDis/product.js
+++ b/wechat_jiaxuan/pages/detailDis/product.js
@@ -23,7 +23,7 @@
     this.setData({
       bottomLift: app.bottomLift
     })
-    this.getDetail(options.id)
+    this.getDetail(options.id, options.userId || '')
     actionDo({
       actionType: 'view',
       id: options.id
@@ -34,16 +34,42 @@
       member
     })
   },
+  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,
+      current: url
+    })
+  },
   handleAction(e) {
     const actionType = e.currentTarget.dataset.code
     const {
       info
     } = this.data
+    const member = wx.getStorageSync('member')
+    if (member.authStatus == '0') {
+      return wx.navigateTo({
+        url: '/pages/auth/auth',
+      })
+    }
     actionDo({
       actionType,
       id: this.data.info.id
     }).then(res => {
-      info.collection = !info.collection
+      info.isCollection = !info.isCollection
       this.setData({
         info
       })
@@ -52,9 +78,10 @@
       })
     })
   },
-  getDetail(id) {
+  getDetail(id, userId) {
     getProductInfo({
-      id
+      id,
+      salesId: userId || null
     }).then(res => {
       this.setData({
         info: res.data

--
Gitblit v1.9.3