From c14890bbc18c304e91120bd43fafd471b97956a7 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@yolipai.com>
Date: Fri, 3 Jan 2020 15:04:37 +0800
Subject: [PATCH]  我的礼包的功能  购买返回订单号，并跳转到订单成功页

---
 pages/giftpack/buygiftpack/giftpackbuy.js   |  7 +++++--
 pages/giftpack/buygiftpack/giftpackbuy.wxml |  2 +-
 pages/giftpack/payment/payment.js           | 39 +++------------------------------------
 pages/giftpack/payment/payment.wxml         | 20 ++------------------
 pages/user/index/index.js                   |  2 +-
 pages/user/index/index.wxml                 |  2 +-
 6 files changed, 13 insertions(+), 59 deletions(-)

diff --git a/pages/giftpack/buygiftpack/giftpackbuy.js b/pages/giftpack/buygiftpack/giftpackbuy.js
index 04b637b..c07bda3 100644
--- a/pages/giftpack/buygiftpack/giftpackbuy.js
+++ b/pages/giftpack/buygiftpack/giftpackbuy.js
@@ -52,6 +52,8 @@ Page({
     var id = e.currentTarget.dataset.id; //活动id
     var my_confirm = th.selectComponent("#my_confirm"); //组件的id
     var order_sn = e.currentTarget.dataset.order_sn;//订单号
+    var money=e.currentTarget.dataset.money; //支付金额
+
     my_confirm.open(
       "是否确定购买该礼包",
       "取消",
@@ -81,8 +83,9 @@ Page({
           }, // 设置请求的 header
           success: function(res) {
             if (res.data.code == 0) {
-              res = res.data.data;
-              var url = "/pages/giftpack/payment/payment?type=" + 1 + "order_sn=" + order_sn;
+              var order_sn=res.data.data.orderSn;
+              res = res.data.data.result;
+              var url = "/pages/giftpack/payment/payment?money=" + money + "&order_sn=" + order_sn;
               wx.requestPayment({
                 timeStamp: String(res.timeStamp),
                 nonceStr: res.nonceStr,
diff --git a/pages/giftpack/buygiftpack/giftpackbuy.wxml b/pages/giftpack/buygiftpack/giftpackbuy.wxml
index f2b7f28..caa3f98 100644
--- a/pages/giftpack/buygiftpack/giftpackbuy.wxml
+++ b/pages/giftpack/buygiftpack/giftpackbuy.wxml
@@ -62,7 +62,7 @@
           </block>
           <block wx:else>
             <block wx:if="{{items.payMoney>0}}">
-              <view class="flex" bindtap="GetBuyPrice" data-id="{{items.lbId}}">
+              <view class="flex" bindtap="GetBuyPrice" data-id="{{items.lbId}}" data-money="{{items.payMoney}}">
                 <button class="box_button_dui box_button_buy">立即购买</button>
               </view>
             </block>
diff --git a/pages/giftpack/payment/payment.js b/pages/giftpack/payment/payment.js
index 8070790..6356cee 100644
--- a/pages/giftpack/payment/payment.js
+++ b/pages/giftpack/payment/payment.js
@@ -8,52 +8,19 @@ Page({
     url: e.globalData.setting.imghost,
     resourceUrl: e.globalData.setting.resourceUrl,
     iurl: e.globalData.setting.imghost,
-    order: null,
-    type: 1,
     allmoney: 0,
-    user_money: 0,
     order_sn: "",
-    pick: null,
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: async function (options) {
+  onLoad: function (options) {
     wx.setNavigationBarTitle({
       title: '支付成功',
     });
-
-    var type = options.type, order_sn = options.order_sn;
-    var th = this, order = null;
-    //如果是等1，就是单个订单的订单号
-    if (type == 1) {
-      await getApp().request.promiseGet("/api/weshop/order/page",
-        { data: { store_id: e.globalData.setting.stoid, order_sn: order_sn } }).then(res => {
-          order = res.data.data.pageData[0];
-          th.setData({ order: order, order_sn: order_sn })
-        })
-    } else {
-      await getApp().request.promiseGet("/api/weshop/order/page",
-        { data: { store_id: e.globalData.setting.stoid, parent_sn: order_sn } }).then(res => {
-
-          var allmoney = 0, user_money = 0;
-          for (var i in res.data.data.pageData) {
-            var item = res.data.data.pageData[i];
-            allmoney += item.order_amount;
-            user_money += item.user_money ? item.user_money : 0;
-          }
-          order = res.data.data.pageData[0];
-          th.setData({ order: order, type: 2, allmoney: allmoney, order_sn: order_sn, user_money: user_money })
-        })
-    }
-    //--获取门店--
-    if (order.exp_type == 1) {
-      await getApp().request.promiseGet("/api/weshop/pickup/get/" + e.globalData.setting.stoid + "/" + order.pickup_id,
-        { 1: 1 }).then(res => {
-          th.setData({ pick: res.data.data })
-        });
-    }
+    var money = parseFloat(options.money), order_sn = options.order_sn;
+    this.setData({allmoney:money,order_sn:order_sn})
   },
 
   goto: function () {
diff --git a/pages/giftpack/payment/payment.wxml b/pages/giftpack/payment/payment.wxml
index 7bd36f4..8a23c10 100644
--- a/pages/giftpack/payment/payment.wxml
+++ b/pages/giftpack/payment/payment.wxml
@@ -21,32 +21,17 @@
       </view>
 
       <!-- 实付金额 -->
-
       <view class="payitem flex">
         <view>实付金额 :</view>
         <!-- {{filters.toFix()}} -->
-        <view class="pay_money" wx:if="{{type==1}}">{{filters.toFix(order.order_amount+order.user_money+order.pt_tail_money,2)}}元</view>
-        <view class="pay_money" wx:else>{{filters.toFix(allmoney+user_money,2) }}元</view>
+        <view class="pay_money">{{filters.toFix(allmoney,2)}}元</view>
       </view>
 
       <!-- 支付方式 -->
       <view class="payitem flex" wx:if="type==1">
         <view>支付方式 :</view>
-        <view wx:if="{{order.order_amount>0 && order.user_money>0 }}">微信支付,余额支付</view>
-        <view wx:elif="{{order.order_amount>0}}">微信支付</view>
-        <view wx:elif="{{order.user_money>0}}">余额支付</view>
-        <view wx:else>免单</view>
-      </view>
-      <view class="payitem flex"  wx:else>
-          <view>支付方式 :</view>
-          <view wx:if="{{allmoney>0 && user_money>0 }}">微信支付,余额支付</view>
-          <view wx:elif="{{allmoney>0}}">微信支付</view>
-          <view wx:elif="{{user_money>0}}">余额支付</view>
-          <view wx:else>免单</view>
+        <view>微信支付</view>
       </view>
-
-
-
     </view>
   </view>
   <view class="flex-level">
@@ -55,7 +40,6 @@
 
   <!-- 跳转链接 -->
   <view>
-
     <!-- 链接 -->
     <view class="fs32">
       <view class="flex-center">
diff --git a/pages/user/index/index.js b/pages/user/index/index.js
index 700f628..e96911b 100644
--- a/pages/user/index/index.js
+++ b/pages/user/index/index.js
@@ -251,7 +251,7 @@ Page({
     //!this.nomore && this.requestRecommend();
 	  var goods_list = this.selectComponent("#goods_recommend"); //组件的id
     goods_list.init();
-    setTimeOut(function () { goods_list.get_list(); }, 300)  
+    setTimeout(function () { goods_list.get_list(); }, 300)
   },
 
   /**
diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml
index 0075a46..1d8578e 100644
--- a/pages/user/index/index.wxml
+++ b/pages/user/index/index.wxml
@@ -217,7 +217,7 @@
 					<view class="four-level-word">我的服务</view>
 				</view>
         <view class="item t-c" data-url="/pages/giftpack/mygiftpack/mygiftpack" bindtap="goto_nav">
-					<image class="xc-center-img " src="{{iurl}}/miniapp/images/user/wdlb.png"></image>
+					<image class="xc-center-img " src="{{iurl}}/miniapp/images//user/wdlb.png"></image>
 					<view class="four-level-word">我的礼包</view>
 				</view>
       </view>
--
libgit2 0.21.4