From 52787adceb282c1914589c7ceb252bdb03e2df36 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 02 八月 2024 11:26:12 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia

---
 wechat_jiaxuan/pages/detailDis/product.js |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/wechat_jiaxuan/pages/detailDis/product.js b/wechat_jiaxuan/pages/detailDis/product.js
index c65744e..4c4970b 100644
--- a/wechat_jiaxuan/pages/detailDis/product.js
+++ b/wechat_jiaxuan/pages/detailDis/product.js
@@ -3,6 +3,7 @@
   actionDo,
   getMemberInfo
 } from '../../api/index'
+import { eventBus } from '../../utils/eventBus'
 Page({
   /**
    * 椤甸潰鐨勫垵濮嬫暟鎹�
@@ -15,7 +16,10 @@
     isFold: false,
     info: {},
     member: {},
-    showShare: false
+    showShare: false,
+    options: {
+      empty: '鏃犲弬鏁�'
+    }
   },
   changeFold() {
     this.setData({ isFold: !this.data.isFold })
@@ -26,11 +30,12 @@
       actionType: 'view',
       id: options.id
     })
-    getMemberInfo().then(res => {
-      this.setData({
-        member: res.data
-      })
-    })
+  },
+  onUnload() {
+    console.log('璇︽儏杩涜浜嗛攢姣�');
+    setTimeout(() => {
+      eventBus.emit('productDeBack', this.data.info)
+    }, 500)
   },
   onLoad(options) {
     var app = getApp().globalData
@@ -87,6 +92,7 @@
       })
       wx.showToast({
         title: actionType == 'collect' ? '鏀惰棌鎴愬姛' : '鍙栨秷鏀惰棌',
+        icon: "none"
       })
     })
   },
@@ -100,6 +106,9 @@
       })
       wx.setNavigationBarTitle({
         title: res.data.title
+      })
+      getMemberInfo().then(res => {
+        this.setData({ member: res.data })
       })
     })
   },
@@ -192,9 +201,6 @@
     })
   },
   onHide() {
-
-  },
-  onUnload() {
 
   },
   onPullDownRefresh() {

--
Gitblit v1.9.3