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 |   65 ++++++++++++++++++++++++--------
 1 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/wechat_jiaxuan/pages/detailDis/product.js b/wechat_jiaxuan/pages/detailDis/product.js
index ba7ac8f..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({
   /**
    * 椤甸潰鐨勫垵濮嬫暟鎹�
@@ -13,8 +15,12 @@
     origin: '',
     isFold: false,
     info: {},
+    isCollection: false,
     member: {},
-    showShare: false
+    showShare: false,
+    options: {
+      empty: '鏃犲弬鏁�'
+    }
   },
   changeFold() {
     this.setData({ isFold: !this.data.isFold })
@@ -26,6 +32,15 @@
       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({
@@ -34,10 +49,8 @@
     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) {
@@ -65,11 +78,10 @@
   },
   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',
       })
@@ -79,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"
       })
     })
   },
@@ -93,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() {
@@ -119,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',
     })
@@ -140,8 +170,14 @@
   onShareAppMessage: function () {
     let { info } = this.data
     console.log('鐐瑰嚮浜嗗垎浜�')
-    return {
-      path: '/pages/detailDis/product?id=' + info.id + '&userId=' + info.users.id
+    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() {
@@ -189,9 +225,6 @@
     })
   },
   onHide() {
-
-  },
-  onUnload() {
 
   },
   onPullDownRefresh() {

--
Gitblit v1.9.3