From a3d2fe9dff3b6cd9fa8fdd91e87aac843f694c0f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 29 七月 2024 16:23:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 wechat_jiaxuan/pages/detailDis/product.js |   29 +++++++++++------------------
 1 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/wechat_jiaxuan/pages/detailDis/product.js b/wechat_jiaxuan/pages/detailDis/product.js
index fd243ff..5226359 100644
--- a/wechat_jiaxuan/pages/detailDis/product.js
+++ b/wechat_jiaxuan/pages/detailDis/product.js
@@ -15,7 +15,7 @@
     member: {},
     showShare: false
   },
-  onLoadLogin(options){
+  onLoadLogin(options) {
     this.getDetail(options.id, options.userId || '')
     actionDo({
       actionType: 'view',
@@ -27,7 +27,7 @@
     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')
@@ -45,7 +45,7 @@
       info
     } = this.data
     wx.previewImage({
-      urls: info.imageurlList,
+      urls: info.bannerImgList,
       current: url
     })
   },
@@ -55,7 +55,7 @@
       info
     } = this.data
     wx.previewImage({
-      urls: info.imageurlList,
+      urls: info.spaceList.map(i => i.spaceImg),
       current: url
     })
   },
@@ -125,7 +125,6 @@
     })
   },
   handleShare() {
-    console.log('鐐瑰嚮浜嗗垎浜�');
     actionDo({
       actionType: 'share',
       id: this.data.info.id
@@ -134,13 +133,13 @@
     //   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('鐐瑰嚮浜嗗垎浜�')
+    return {
+      path: '/pages/detailDis/product?id=' + info.id + '&userId=' + info.users.id
+    }
+  },
   onClose() {
     this.setData({
       showShare: false
@@ -198,10 +197,4 @@
 
   },
 
-  /**
-   * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
-   */
-  onShareAppMessage() {
-
-  }
 })
\ No newline at end of file

--
Gitblit v1.9.3