From f5bb8dd52d1b8a8c56e5e207877f594acc4f3b05 Mon Sep 17 00:00:00 2001
From: iceling <iceling.qian@meidd.com>
Date: Mon, 13 Jan 2020 17:45:36 +0800
Subject: [PATCH] 礼包详情购买和兑换的bug修改以及图片显示问题

---
 pages/giftpack/giftpacklist/giftpacklist.js   | 49 +++++++++++++++++++++++--------------------------
 pages/giftpack/giftpacklist/giftpacklist.wxml |  6 +++---
 2 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js
index 74604d0..3ed78b4 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.js
+++ b/pages/giftpack/giftpacklist/giftpacklist.js
@@ -33,8 +33,6 @@ Page({
     var th = this;
     th.setData({
       isBuy: options.isBuy,
-      getStorageID: a.stoid,
-      getUserID: d.user_id,
       getGiftID: options.lbId,
       orderSn: options.orderSn
     })
@@ -43,9 +41,6 @@ Page({
     } else {
       th.GetBuyGiftList();
     }
-    th.setData({
-      giftRemark: th.data.giftRemark.replace(/<p><img/gi, "<p class='img'><img")
-    })
     th.close();
   },
   onShow: function() {
@@ -55,6 +50,7 @@ Page({
     var that = this.data;
     var th = this;
     // var id = e.currentTarget.dataset.id;//活动id
+    var money = e.currentTarget.dataset.money;
     var my_confirm = th.selectComponent("#my_confirm"); //组件的id
     my_confirm.open(
       "是否确定购买该礼包",
@@ -69,9 +65,9 @@ Page({
           "actId": '', //活动Id
           "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
           "buyType": '2', //1=积分兑换 2=余额购买
-          "lbId": that.getGiftID, //礼包Id
-          "storeId": that.getStorageID, //商家Id
-          "userId": that.getUserID, //用户ID
+          "giftBagId": that.getGiftID, //礼包Id
+          "storeId": a.stoid, //商家Id
+          "userId": d.user_id, //用户ID
           "buyFrom": 2
         };
         var data = JSON.stringify(json);
@@ -85,18 +81,20 @@ Page({
           }, // 设置请求的 header
           success: function(res) {
             if (res.data.code == 0) {
-              res = res.data.data;
+              var res = res.data.data;
+              var order_sn = res.orderSn;
+              var url = "/pages/giftpack/payment/payment?money=" + money + "&order_sn=" + order_sn;
               wx.requestPayment({
-                timeStamp: String(res.timeStamp),
-                nonceStr: res.nonceStr,
-                package: res.packageValue,
-                signType: res.signType,
-                paySign: res.paySign,
+                timeStamp: String(res.result.timeStamp),
+                nonceStr: res.result.nonceStr,
+                package: res.result.packageValue,
+                signType: res.result.signType,
+                paySign: res.result.paySign,
                 success: function(n) {
-
+                  getApp().goto(url);
                 },
                 fail: function(n) {
-
+                  getApp().my_confirm("取消支付", 0, th);
                 }
               });
             } else {
@@ -130,9 +128,9 @@ Page({
           "actId": '', //活动Id
           "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
           "buyType": '1', //1=积分兑换 2=余额购买
-          "lbId": that.getGiftID, //礼包Id
-          "storeId": that.getStorageID, //商家Id
-          "userId": that.getUserID //用户ID
+          "giftBagId": that.getGiftID, //礼包Id
+          "storeId": a.stoid, //商家ID
+          "userId": d.user_id, //用户ID
         };
         var data = JSON.stringify(json);
         var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert";
@@ -161,8 +159,8 @@ Page({
     var th = this;
     getApp().request.get('/api/weshop/marketing/my/giftbag/detail/get', {
       data: {
-        "storeId": th.data.getStorageID, //商家ID
-        "userId": th.data.getUserID, //用户ID
+        "storeId": a.stoid, //商家ID
+        "userId": d.user_id, //用户ID
         "orderSn": th.data.orderSn
       },
       success: function success(res) {
@@ -177,7 +175,7 @@ Page({
             })
           } else {
             th.setData({
-              giftRemark: res.data.data.giftRemark
+              giftRemark: res.data.data.giftRemark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"')
             })
           }
 
@@ -228,8 +226,8 @@ Page({
     var th = this.data;
     getApp().request.get('/api/weshop/marketing/giftbag/detail/get', {
       data: {
-        "storeId": th.getStorageID, //商家ID
-        "userId": th.getUserID, //用户ID
+        "storeId": a.stoid, //商家ID
+        "userId": d.user_id, //用户ID
         "giftBagId": th.getGiftID
       },
       success: function success(res) {
@@ -239,13 +237,12 @@ Page({
             giftTitle: res.data.data.giftTitle
           })
           if (res.data.data.giftRemark == '') {
-
             _this2.setData({
               giftRemark: '暂无详情......'
             })
           } else {
             _this2.setData({
-              giftRemark: res.data.data.giftRemark
+              giftRemark: res.data.data.giftRemark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"')
             })
           }
 
diff --git a/pages/giftpack/giftpacklist/giftpacklist.wxml b/pages/giftpack/giftpacklist/giftpacklist.wxml
index 394c4e5..a19778b 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.wxml
+++ b/pages/giftpack/giftpacklist/giftpacklist.wxml
@@ -95,14 +95,14 @@
       <text class="data-v-3a5b7e36">活动说明</text>
     </view>
     <view class="foot_box_remark data-v-3a5b7e36">
-      <rich-text nodes="{{giftRemark}}"></rich-text>
+      <rich-text nodes="{{giftRemark}}" style="word-break:break-all;word-wrap:break-word"></rich-text>
     </view>
   </view>
   <view class="foot_empty data-v-3a5b7e36"></view>
   <block wx:if="{{isBuy==1}}">
     <view class="foot_button data-v-3a5b7e36">
       <block wx:if="{{giftPrice>0&&giftIntegral>0}}">
-        <view class="foot_button_left data-v-3a5b7e36" data-id="{{lbId}}" bindtap="GetBuyPrice">
+        <view class="foot_button_left data-v-3a5b7e36" data-money="{{giftPrice}}" data-id="{{lbId}}" bindtap="GetBuyPrice">
           <text class="data-v-3a5b7e36">立即购买</text>
         </view>
       </block>
@@ -112,7 +112,7 @@
         </view>
       </block>
       <block wx:if="{{giftPrice>0 && giftIntegral<=0}}">
-        <view class="foot_button_buy data-v-3a5b7e36" bindtap="GetBuyPrice" data-id="{{lbId}}">
+        <view class="foot_button_buy data-v-3a5b7e36" data-money="{{giftPrice}}" bindtap="GetBuyPrice" data-id="{{lbId}}">
           <text class="data-v-3a5b7e36">立即购买</text>
         </view>
       </block>
--
libgit2 0.21.4