From cab9d7f7838fc53de6111d3f353a7e3e6379cb97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=85=A2=E6=85=A2?= <994797151@qq.com>
Date: Tue, 29 Dec 2020 09:31:50 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=E7=9A=84?=
 =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E8=B7=B3=E8=BD=AC]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/mall/mall_details/mall_details.js           |  9 +++++++++
 pages/mall/mall_details/mall_details.wxml         | 15 +++++++++------
 pages/mall/mall_details/mall_details.wxss         |  5 +++++
 pages/mall/mall_order_submit/mall_order_submit.js |  4 ++--
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/pages/mall/mall_details/mall_details.js b/pages/mall/mall_details/mall_details.js
index 64d9690..c2897a8 100644
--- a/pages/mall/mall_details/mall_details.js
+++ b/pages/mall/mall_details/mall_details.js
@@ -285,8 +285,17 @@ Page({
      * 用户点击右上角分享
      */
     onShareAppMessage() {
+        console.log(this.data.storyData.cover)
         this.setData({
             shareShow: false
         })
+        return({
+            title   : "#" + this.data.storyData.title,
+            path    : '/pages/mall/mall_details/mall_details?id=' + this.data.storyData.id + '&nameList=share',
+            imageUrl: this.data.storyData.cover
+        })
+
+        // + '&share_user_id=' + app.globalData.userInfo.user_id || 0
     },
+    
 })
\ No newline at end of file
diff --git a/pages/mall/mall_details/mall_details.wxml b/pages/mall/mall_details/mall_details.wxml
index 0da9738..9194875 100644
--- a/pages/mall/mall_details/mall_details.wxml
+++ b/pages/mall/mall_details/mall_details.wxml
@@ -27,7 +27,9 @@
         <view class="goods-title-name">{{storyData.title}}</view>
         <view class="nowrap-multi goods-title-text">{{storyData.description}}</view>
     </view>
-    <view class="goodsMember">
+
+    <!-- 暂时隐藏 -->
+    <view class="goodsMember" style="display: none">
         <view class="goodsMember-name">
             <image class="goods-tips-gold" src="/static/mall_icon/mallDetails_member_grey.png"></image>开通会员，尊享会员价
         </view>
@@ -35,7 +37,8 @@
             </image>
         </view>
     </view>
-    <view class="goods-tips">
+    <!-- 暂时隐藏 -->
+    <view class="goods-tips" style="display: none">
         <image class="goods-tips-gold" src="/static/mall_icon/mallDetails_gold.png"></image>
         分享奖 <text>¥{{changeSku.prices.bonus1}}</text>
     </view>
@@ -135,10 +138,10 @@
             <image src="/static/mall_icon/mallDetails_service.png"></image>
             客服
         </navigator>
-        <navigator hover-class="none" url="/pages/mall_cart/mall_cart" class="footer-img-tool">
+        <navigator hover-class="none" url="/pages/mall/mall_cart/mall_cart" class="footer-img-tool">
             <image src="/static/mall_icon/mallDetails_car.png"></image>
             购物车
-            <text>1</text>
+            <!-- <text>1</text> -->
         </navigator>
     </view>
     <view class="footer-btn" bindtap="specsTap" wx:if="{{changeSku.prices.stock > 0}}">
@@ -270,12 +273,12 @@
             </view>
             <view class="share-list-text">微信好友</view>
         </button>
-        <button class="share-list" hover-class="none" bindtap="canvasCode">
+        <!-- <button class="share-list" hover-class="none" bindtap="canvasCode">
             <view class="share-list-img">
                 <image src="/static/mall_icon/share_pyq.png" mode="aspectFill"></image>
             </view>
             <view class="share-list-text">海报分享</view>
-        </button>
+        </button> -->
     </view>
     <view class="share-tips">好物推荐，和大家一起分享你发现的好物</view>
 </view>
\ No newline at end of file
diff --git a/pages/mall/mall_details/mall_details.wxss b/pages/mall/mall_details/mall_details.wxss
index e395575..2b70297 100644
--- a/pages/mall/mall_details/mall_details.wxss
+++ b/pages/mall/mall_details/mall_details.wxss
@@ -476,6 +476,11 @@ view.footer-btn-buy {
     transition: .2s;
 }
 
+.couponEject {
+    max-height: 70%;
+    overflow-y: scroll;
+}
+
 .couponEject.active,
 .specsEject.active {
     bottom: 0;
diff --git a/pages/mall/mall_order_submit/mall_order_submit.js b/pages/mall/mall_order_submit/mall_order_submit.js
index f5a148f..a8fe2c8 100644
--- a/pages/mall/mall_order_submit/mall_order_submit.js
+++ b/pages/mall/mall_order_submit/mall_order_submit.js
@@ -129,14 +129,14 @@ Page({
                                             icon : 'success'
                                         })
                                         setTimeout(()=>{
-                                            wx.reLaunch({
+                                            wx.redirectTo({
                                                 url: '/pages/mall/mall_order/mall_order'
                                             })
                                         },2000)
                                     }
                                 },
                                 fail  : res=>{
-                                    wx.reLaunch({
+                                    wx.redirectTo({
                                         url: '/pages/mall/mall_order/mall_order?stateType=unpaid'
                                     })
                                 }