From 598a85f7b9da7180dd75e1334faf04e1c98393c0 Mon Sep 17 00:00:00 2001
From: luo <17530855@qq.com>
Date: Wed, 13 Mar 2024 13:49:29 +0800
Subject: [PATCH] 优化起订价优惠

---
 packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml |  2 +-
 packageC/pages/presell/cart/cart.js                         |  6 +++++-
 packageC/pages/presell/cart/cart.wxml                       |  2 +-
 packageE/pages/cart/cart2_pt/cart2_pt.js                    | 50 +++++++++++++++++++++++++++-----------------------
 4 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml
index 097b433..631d09b 100644
--- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml
+++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml
@@ -226,7 +226,7 @@
         <view class="payable"><text class="co-red fs24">{{sameCityExp_info}}</text></view>
         <!-- <view class="co-red big"></view> -->
       </view>
-      <button wx:if="{{sameCityExp_off==2}}" class="tips-btn" catchtap="qcd">去凑单</button>
+      <!-- <button wx:if="{{sameCityExp_off==2}}" class="tips-btn" catchtap="qcd">去凑单</button> -->
     </block>
     <block wx:else>
       <view class="pay-amount">
diff --git a/packageC/pages/presell/cart/cart.js b/packageC/pages/presell/cart/cart.js
index f32bc27..e6d2731 100644
--- a/packageC/pages/presell/cart/cart.js
+++ b/packageC/pages/presell/cart/cart.js
@@ -2612,10 +2612,14 @@ Page({
                     }
                 })
                 var gd_w = good['weight'] * good['buynum'];
+                //这个不是取尾款而是取总金额
+                let order_amount = parseFloat(o_condition);
+                // var o_condition1 = parseFloat(o_condition);
+                if (order_amount < 0) order_amount = 0;
                 //-- 获取距离  --
                 var req_data = {
                     store_id: os.stoid,
-                    order_amount: parseFloat(o_condition1),
+                    order_amount: parseFloat(order_amount),
                     lon: lon, lat: lat,
                     pickup_id: bn_pick,
                     goods_weight: gd_w,
diff --git a/packageC/pages/presell/cart/cart.wxml b/packageC/pages/presell/cart/cart.wxml
index 04a7734..3a03245 100644
--- a/packageC/pages/presell/cart/cart.wxml
+++ b/packageC/pages/presell/cart/cart.wxml
@@ -396,7 +396,7 @@
                 </view>
             </view>
             <!-- <button wx:if="{{no_start || is_end || is_complete}}" class="tips-btn gray">支付尾款</button> -->
-            <button wx:if="{{sameCityExp_off==2}}"  class="tips-btn" catchtap="qcd">去凑单</button>
+            <!-- <button wx:if="{{sameCityExp_off==2}}"  class="tips-btn" catchtap="qcd">去凑单</button> -->
           </block>
           <block wx:else>
             <view class="pay-amount" hidden="{{disabled_btn}}">
diff --git a/packageE/pages/cart/cart2_pt/cart2_pt.js b/packageE/pages/cart/cart2_pt/cart2_pt.js
index 85519ea..a817215 100644
--- a/packageE/pages/cart/cart2_pt/cart2_pt.js
+++ b/packageE/pages/cart/cart2_pt/cart2_pt.js
@@ -1078,6 +1078,31 @@ Page({
       th.setData({ [wl_txt]: 0, })
     }
 
+
+
+    //-- 如果是订单优惠的时候,allpice要拿来减掉一些 --
+    var order_prom_id=0;
+    var order_prom_amount=0;
+    if(ord_prom){
+      order_prom_id = ord_prom['id'];
+      switch (ord_prom['type']) {
+        case 0:
+          allpice = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
+          order_prom_amount = (o_condition - allpice).toFixed(2);
+          break;
+        case 1:
+          //-- 如果有优惠促销倍减的时候 --
+          var bs = 1;
+          if (ord_prom.is_bz) {
+            bs = Math.floor(o_condition / ord_prom.money);
+          }
+          allpice = o_condition - bs * ord_prom['expression'];//满额优惠金额
+          order_prom_amount = ord_prom['expression'];
+          break;
+      }
+    }
+
+    
     //判断是否同城配送,而且没有调用过
     if (th.data.bn_exp_type == 2 && th.data.user_addr) {
       var lon = 0;
@@ -1118,7 +1143,7 @@ Page({
           th.setData({
             sameCityExp_off:0,
             sameCityExp_info:''
-          })
+          }) 
         } else {
           if (res.data.code==-2) {  //未达到起送价
             th.setData({
@@ -1131,7 +1156,7 @@ Page({
               sameCityExp_info:res.data.msg
             })
           }
-          is_next = 0;
+          // is_next = 0;
           wx.showToast({
             title: res.data.msg, icon: 'none', duration: 2000
           })
@@ -1150,27 +1175,6 @@ Page({
 
     }
 
-    //-- 如果是订单优惠的时候,allpice要拿来减掉一些 --
-    var order_prom_id=0;
-    var order_prom_amount=0;
-    if(ord_prom){
-      order_prom_id = ord_prom['id'];
-      switch (ord_prom['type']) {
-        case 0:
-          allpice = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
-          order_prom_amount = (o_condition - allpice).toFixed(2);
-          break;
-        case 1:
-          //-- 如果有优惠促销倍减的时候 --
-          var bs = 1;
-          if (ord_prom.is_bz) {
-            bs = Math.floor(o_condition / ord_prom.money);
-          }
-          allpice = o_condition - bs * ord_prom['expression'];//满额优惠金额
-          order_prom_amount = ord_prom['expression'];
-          break;
-      }
-    }
 
     //--订单优惠的显示--
     var order_prom_txt1 = "formData.order_prom_id";
--
libgit2 0.21.4