From b2d360d9113b6955287108ca9e90d76a1f3c1419 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期日, 29 九月 2024 15:05:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia

---
 wechat_jiaxuan/pages/detailDis/realpic.js |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/wechat_jiaxuan/pages/detailDis/realpic.js b/wechat_jiaxuan/pages/detailDis/realpic.js
index bbbe022..a0384bc 100644
--- a/wechat_jiaxuan/pages/detailDis/realpic.js
+++ b/wechat_jiaxuan/pages/detailDis/realpic.js
@@ -123,15 +123,19 @@
     })
   },
   handleDesign() {
-    const { member } = this.data
+    const { member, origin, info } = this.data
+    let path = '/pages/design/design'
+    if(origin != 'b' && info.users && info.users.id){
+      path = `/pages/design/design?name=${info.users.iamUsername}`
+    }
     if (!member.phone) {
-      wx.setStorageSync('tempPath', '/pages/design/design')
+      wx.setStorageSync('tempPath', path)
       return wx.navigateTo({
         url: '/pages/auth/auth',
       })
     }
     wx.navigateTo({
-      url: '/pages/design/design',
+      url: path,
     })
   },
   openShare() {
@@ -149,13 +153,6 @@
     //   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'
-  //   }
-  // },
   onClose() {
     this.setData({
       showShare: false
@@ -214,8 +211,14 @@
       info
     } = this.data
     console.log('鐐瑰嚮浜嗗垎浜�')
-    return {
-      path: '/pages/detailDis/realpic?id=' + info.id + '&userId=' + info.users.id
+    if(info.users && info.users.id){
+      return {
+        path: '/pages/detailDis/realpic?id=' + info.id + '&userId=' + info.users.id
+      }
+    }else{
+      return {
+        path: '/pages/detailDis/realpic?id=' + info.id 
+      }
     }
   },
 })
\ No newline at end of file

--
Gitblit v1.9.3