From 268c1b00c161e3c1a654a386527ebfb138f97ea2 Mon Sep 17 00:00:00 2001
From: F5VT98DI7XY4X12\Administrator <765199919@qq.com>
Date: Thu, 5 Sep 2019 22:08:07 +0800
Subject: [PATCH] 支付尾款， 拼团的普通购买

---
 pages/cart/cart2_pt/cart2_pt.js | 12 ++++++++----
 pages/cart/cart_wk/cart_wk.js   |  8 ++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js
index 7d7ffab..ec125d0 100644
--- a/pages/cart/cart2_pt/cart2_pt.js
+++ b/pages/cart/cart2_pt/cart2_pt.js
@@ -386,11 +386,15 @@ Page({
           'pickup_id': th.data.bn_pick,       //门店
           'exp_type': th.data.bn_exp_type,    //配送方式
           'is_normal':th.data.bn_goods.is_normal, //是否是普通购买
-					'pt_prom_id':th.data.bn_goods.prom_id,  //拼单ID
-					'is_zsorder':th.data.kt_type+1,         //开团类型
-					'is_pt_tz':th.data.is_pt_tz,            //开团类型
-					'order_goods':new Array(),
+		  'pt_prom_id':th.data.bn_goods.prom_id,  //拼单ID
+		  'is_pt_tz':th.data.is_pt_tz,            //开团类型
+		  'order_goods':new Array(),
        };
+
+       if(!th.data.bn_goods.is_normal){
+           item.is_zsorder=th.data.kt_type+1;         //开团类型
+       }
+
        if(th.data.qh!='')
        {
          item.team_qh=th.data.qh;
diff --git a/pages/cart/cart_wk/cart_wk.js b/pages/cart/cart_wk/cart_wk.js
index cb71c0f..8235649 100644
--- a/pages/cart/cart_wk/cart_wk.js
+++ b/pages/cart/cart_wk/cart_wk.js
@@ -34,7 +34,7 @@ Page({
     enterAddressPage: 0,  //进入地址页面
 
     allpice:0,
-		show_pay_type:0,
+	show_pay_type:0,
 
     teamgroup: null,
   },
@@ -290,10 +290,10 @@ Page({
     }else{
       var allpice= parseFloat(th.data.order.order_amount)
             + parseFloat(th.data.order.user_money)
-            +parseFloat(th.data.order.pt_tail_money);
+            +parseFloat(th.data.order.tail_money);
       allpice=allpice.toFixed(2);
       this.setData({
-        allpice: allpice
+        allpice: allpice, exp_price: 0,
       });
     }
   },
@@ -424,7 +424,7 @@ Page({
             exp_price = parseFloat(exp_price);
             th.setData({ exp_price: exp_price,allpice:allpice })
         }else {
-          var allpice=th.data.order.order_amount+th.data.order.user_money+th.data.order.pt_tail_money;
+          var allpice=th.data.order.order_amount+th.data.order.user_money+th.data.order.tail_money;
           allpice=allpice.toFixed(2);
           th.setData({ exp_price: 0,allpice:allpice })
         }
--
libgit2 0.21.4