From 85734f416acce0543ce820413254dc35ad3caf1b Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Wed, 21 Jun 2023 15:42:14 +0800
Subject: [PATCH] cart2的优化

---
 packageE/pages/cart/cart2/cart2.js         | 55 ++++++++++---------------------------------------------
 pages/goods/categoryList/categoryList.wxml |  2 +-
 2 files changed, 11 insertions(+), 46 deletions(-)

diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index f1a3afd..f80da51 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -1019,41 +1019,6 @@ Page({
       }
     }
 
-          var car_item = item;
-          /*----接口要弄出来的，先顶着-----*/
-          var pcid = car_item.pick_id;
-          var find = 0;
-          //----如果有就加进去，没有就新增一个----
-          //-----------循环查找门店-------------
-          if (arr.length > 0) {
-            for (var j = 0; j < arr.length; j++) {
-              if (arr[j].pickup_id == pcid) {
-                if (item.is_gift != 1) {
-                  //确定配送方式
-                  if (arr[j].distr_t == 0) {
-                    arr[j].distr_t = car_item.distr_type;
-                  }
-                  var e_t = 0
-                  switch (arr[j].distr_t) {
-                    case 0:
-                      e_t = 1;
-                      if (th.data.json_d.pickupway && th.data.json_d.pickupway == 1) e_t = 0;
-                      break;
-                    case 1:
-                      e_t = 1;
-                      break;
-                    case 2:
-                      e_t = 0;
-                      break;
-                  }
-                  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 });
-                }
-                
-                //-- 把等级卡会优惠多少钱装进去 --
-                if (car_item.cut_price1) arr[j].card_cut_price += car_item.cut_price1;
-
     //在分组的时候，就不要再调用接口，await
     for (var i = 0; i < carr.length; i++) {
       var item = carr[i];
@@ -1170,16 +1135,6 @@ Page({
             sto = th.data.allsto[k];
             break;
           }
-        }else{
-
-          var is_a_zt =1;
-          for (var ih in arr) {
-              var ie = arr[ih];
-              //-- 是不是全部自提清空 --
-              if (ie.exp_type == 0 || ie.exp_type == 2) is_a_zt= 0;
-          }
-          th.setData({ is_all_zt: is_a_zt});
-
         }
         var e_t = 0, dis_t = 0;//物流方式，配送方式
         if (item.distr_type == 0) {
@@ -1267,6 +1222,16 @@ Page({
         }
       }
     }
+    else{
+      var is_a_zt =1;
+      for (var ih in arr) {
+        var ie = arr[ih];
+        //-- 是不是全部自提清空 --
+        if (ie.exp_type == 0 || ie.exp_type == 2) is_a_zt= 0;
+      }
+      th.setData({ is_all_zt: is_a_zt});
+
+    }
 
     var cart_commission = 0;
     //-- 循环计算一下线下取价 --
diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml
index f28e8f8..5c9ea8e 100644
--- a/pages/goods/categoryList/categoryList.wxml
+++ b/pages/goods/categoryList/categoryList.wxml
@@ -15,7 +15,7 @@
   <view class="search-box " bindtap="goseach">
     <view class="search-inner">
       <view class="search-img">
-        <image class="wh100" src="{{iurl}}/miniapp/images/search.png"></image>
+        <image class="wh100" src="{{iurl}}/miniapp/images/search.png" style="vertical-align:text-top"></image>
       </view>
       <input bindfocus="goseach" class="search-cont" placeholder="寻找好口碑" type="text"></input>
     </view>
--
libgit2 0.21.4