From a00268269095bb7450c3e03a0aeff2738a7d526d Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Thu, 10 Oct 2019 13:51:15 +0800
Subject: [PATCH] 购物车加减修改， 商品列表

---
 pages/cart/cart2/cart2.js          | 14 ++++++++++----
 pages/cart/cart2/cart2.wxml        |  3 ---
 pages/goods/goodsList/goodsList.js |  7 +++----
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 4815154..032a1cb 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -153,8 +153,6 @@ Page({
 
     var th = this;
     to.getwuliu(function (e) {
-      console.log("ws");
-      console.log("物流的数据77777777777777",e);
       th.setData({ wu_arr: e })
       typeof func == "function" && func();
     })
@@ -286,9 +284,17 @@ Page({
             //如果是物流的话，全部自提的控制要弄成0
             if (e_t == 0) th.setData({ is_all_zt:0});
             var narr = new Array(); narr.push(item);
-            //-----------拼装购物车结算的数组-----------------
+
+            //-----------拼装购物车结算的数组,如果有默认物流时要用默认物流编号-----------------
+            var m_wind=0,def_exp_code=getApp().globalData.userInfo.def_exp_code;
+            if(e_t==0 && def_exp_code){
+                 for(var k=0;k<th.data.wu_arr.length;k++){
+                      var itme=th.data.wu_arr[k]; if(def_exp_code=item.code){  m_wind=k; }
+                 }
+            }
+
             var ie = {
-              pickup_id: pcid, pname: pikname, goods: narr, exp_type: e_t, wind: 0, distr_t: dis_t,
+              pickup_id: pcid, pname: pikname, goods: narr, exp_type: e_t, wind: m_wind, distr_t: dis_t,
               goods_price: 0, shipping_price: 0, user_money: 0, total_amount: 0, order_amount: 0, user_note:0};
             arr.push(ie);
           }
diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml
index ab02bb9..d2159ca 100644
--- a/pages/cart/cart2/cart2.wxml
+++ b/pages/cart/cart2/cart2.wxml
@@ -79,9 +79,6 @@
                 </view>
 
 
-
-
-
                 <view class="set-mes">
                     <view wx:if="{{order.store_prom}}">
                     <icon color="#f23030" size="16" type="info"></icon>
diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js
index f33037d..6ab543f 100644
--- a/pages/goods/goodsList/goodsList.js
+++ b/pages/goods/goodsList/goodsList.js
@@ -26,13 +26,12 @@ Page({
 	  this.data.is_new=t.is_new;
 	  this.data.is_hot=t.is_hot;
 
-      console.log(t.cat_id);
-      console.log(t.pid);    
-      
       if (0 != t.cat_id && t.cat_id != undefined) { 
            url += "&cat_id=" + t.cat_id; 
-           if (t.pid != undefined && t.pid != null){
+           if (t.parent_id == undefined && t.parent_id == null){
               url +=  "&parent_id=0"; 
+           }else{
+               url +=  "&parent_id="+t.parent_id;
            }
       }
 
--
libgit2 0.21.4