From 8bbf81f708f5ca2f3aba0d264d522ade307955d7 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 14 Jun 2022 16:49:40 +0800
Subject: [PATCH] 1.    同城配送 2.    地址栏的bug

---
 pages/cart/cart2/cart2.js   | 19 +++++++++++++------
 pages/cart/cart2/cart2.wxml |  5 +++--
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 18af99a..3e821e5 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -420,6 +420,8 @@ Page({
                 var arr = new Array();
                 var carr = su.data.data.pageData;
 
+                th.setData({ is_all_zt: 1 });
+
                 //-- 找出所有的门店 --
                 var pick_id_arr=[]; var len=carr.length;
                 for(var i=0;i<len;i++){
@@ -644,7 +646,7 @@ Page({
                                     }
                                     arr[j].exp_type = e_t;
                                     if (e_t == 0) th.setData({ is_all_zt: 0 });
-                                    else if (e_t == 1) th.setData({ is_all_zt: 1 });
+                                    //else if (e_t == 1) th.setData({ is_all_zt: 1 });
                                 }
 
                                 //-- 把等级卡会优惠多少钱装进去 --
@@ -688,7 +690,7 @@ Page({
                         }
                         //如果是物流的话，全部自提的控制要弄成0
                         if (e_t == 0) th.setData({ is_all_zt: 0 });
-                        else th.setData({ is_all_zt: 1 });
+                        //else th.setData({ is_all_zt: 1 });
 
                         var narr = new Array();
                         narr.push(car_item);
@@ -737,7 +739,6 @@ Page({
 
                                 //-- 是不是全部自提清空 --
                                 if (ie.exp_type == 0 || ie.exp_type == 2) th.setData({ is_all_zt: 0 });
-
                                 break;
                             }
                         }
@@ -811,7 +812,10 @@ Page({
                     var fd=arr[ik].goods.filter(function (e) {
                        return e.is_same_city!=1 || e.whsle_id>0
                     })
-                    if(!fd || fd.length==0) arr[ik].show_same_city=1;
+                    if(!fd || fd.length==0){
+                        arr[ik].show_same_city=1;
+                        th.setData({is_all_zt:0})
+                    }
                 }
 
                 //深拷贝
@@ -1906,11 +1910,13 @@ Page({
                     var order_prom_amount = 0;
                     var order_prom_id = 0;
                     var o_condition = cart_item.order_amount;
+                    var t_o_condition=cart_item.order_amount;
+
+
                     //看一下是不是不用组合购的订单优惠的叠加
                     if (is_has_zh) {
                         o_condition = o_price_no_zh - quan_price;
                     }
-
                     //看一下是不是不用组合购的订单优惠的叠加
                     if (is_has_ladder) {
                         o_condition = o_price_no_zh - quan_price;
@@ -1918,6 +1924,7 @@ Page({
 
                     if(whsle_goods_price>0){
                         o_condition=o_condition-whsle_goods_price;
+                        t_o_condition=t_o_condition-whsle_goods_price;
                     }
 
                     //-- 在选择到同城配送的时候 --
@@ -1926,7 +1933,7 @@ Page({
                         var gd_w=0;
                         for (let ib in c_arr[i].goods) {
                             let item_bb = c_arr[i].goods[ib];
-                            gd_w += item_bb['weight'] * item_bb['buynum'];
+                            gd_w += item_bb['weight'] * item_bb['goods_num'];
                         }
 
                         if(!lon) {
diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml
index b5daffb..4356d5d 100644
--- a/pages/cart/cart2/cart2.wxml
+++ b/pages/cart/cart2/cart2.wxml
@@ -166,7 +166,7 @@
 							</view>
 
 							<!-- 同城配送 -->
-							<view data-t='2' data-txt='cartlist[{{pidx}}].exp_type' data-ind="{{pidx}}" bindtap="setexptype_w2" style="display:{{item.show_same_city?'none':'flex;align-items: center'}};">
+							<view data-t='2' data-txt='cartlist[{{pidx}}].exp_type' data-ind="{{pidx}}" bindtap="setexptype_w2" style="display:{{!item.show_same_city?'none':'flex;align-items: center'}};">
 
 								<block wx:if="{{item.exp_type==2}}">
 									<icon data-t='2' data-txt='cartlist[{{pidx}}].exp_type' color="red" size="16" type="success"></icon>
@@ -175,7 +175,8 @@
 									<view class="circle  xc-hookts on"></view>
 								</block>
 
-								<view bindtap='setexptype_w2' data-t='2' data-ind="{{pidx}}" data-txt='cartlist[{{pidx}}].exp_type' data-wl_txt='cartlist[{{pidx}}].wind' class="yu_er">同城配送</view>
+								<view bindtap='setexptype_w2' data-t='2' data-ind="{{pidx}}"
+									  data-txt='cartlist[{{pidx}}].exp_type' data-wl_txt='cartlist[{{pidx}}].wind' class="yu_er">同城配送</view>
 							</view>
 						</view>
 
--
libgit2 0.21.4