diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 032a1cb..95836e4 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -97,19 +97,21 @@ Page({
         }
     });
 
-    //先获取是否有关闭使用优惠券
-    getApp().getConfig2(function (ee) {
-      var json_d = JSON.parse(ee.switch_list);
-      th.setData({ is_close_quan: json_d.is_close_quan });
-      //-----先获取物流，再获取用户信息，再展示页面-----
-      th.get_wuliu(th.get_info(th.show_page));
-    })
+
   },
   onUnload: function () { this.setData({ isclose: 1 })},
 
   //----------子页返回父页触发----------
   onShow: function() {
-    console.log('onshow');
+
+      //先获取是否有关闭使用优惠券
+      getApp().getConfig2(function (ee) {
+          var json_d = JSON.parse(ee.switch_list);
+          th.setData({ is_close_quan: json_d.is_close_quan });
+          //-----先获取物流，再获取用户信息，再展示页面-----
+          th.get_wuliu(th.get_info(th.show_page));
+      })
+
     var th=this;
     console.log(th.data.isclose);
     if (th.data.isclose==0){
@@ -230,7 +232,7 @@ Page({
     });
   },
 
-  //-----真的获取购物车--------
+  //-----真的获取购物车,入口--------
   get_cart: function () {
     var th = this,app=getApp();
     a.get("/api/weshop/cart/list", {
@@ -289,7 +291,7 @@ Page({
             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 item=th.data.wu_arr[k]; if(def_exp_code=item.code){  m_wind=k; }
                  }
             }
 
@@ -356,7 +358,6 @@ Page({
                 })
 
                 if(frozenQuan){
-                  console.log("券列表111111111111111111",arr[ind].quan_list);
                   arr[ind].quan_list=th.check_is_frozenQuan(arr[ind].quan_list,frozenQuan);
                 }
 
@@ -372,7 +373,7 @@ Page({
     });
   },
 
-  //-----获取立即购买的商品信息----
+  //-----获取立即购买的商品信息，入口----
   get_buy_goods: function (e){
     var th=this;
     var gg = to.get_b_now();
@@ -396,6 +397,14 @@ Page({
             case 2: et = 0; break;
           }
 
+          var m_wind=0,def_exp_code=getApp().globalData.userInfo.def_exp_code;
+          if(et==0 && def_exp_code){
+                for(var k=0;k<th.data.wu_arr.length;k++){
+                    var item=th.data.wu_arr[k]; if(def_exp_code=item.code){  m_wind=k; }
+                }
+          }
+
+
           switch (gd.prom_type){
             case 0:
             case 6:
@@ -415,7 +424,7 @@ Page({
                 }).then(res=>{
                   if(res.data.code==0)
                     quanlist=res.data.data.pageData;
-                  console.log("22222222222222222222券的列表", quanlist);
+
                   
                 })
               }
@@ -436,7 +445,7 @@ Page({
               t.data.data.prom_type = 0;
              
               th.setData({
-                bn_goods: t.data.data, bn_pickname: gg.pick_name, bn_exp_type: et,
+                bn_goods: t.data.data, bn_pickname: gg.pick_name, bn_exp_type: et,index:m_wind,
                 bn_pick: gg.pick_id, bn_t_exp_t: distr_t,selected_quan_list:quanlist
               });
               //计算价格
@@ -465,7 +474,6 @@ Page({
                        }).then(res=>{
                          if(res.data.code==0)
                              quanlist=res.data.data.pageData;
-                         console.log("券接口的列表333333333333333",quanlist);
                        })
 
                        var frozenQuan=null;
@@ -481,9 +489,9 @@ Page({
                        }
                     } 
                   }
-                  console.log("3333333333券的列表", quanlist);
+
                   th.setData({
-                    bn_goods: t.data.data, bn_pickname: gg.pick_name, bn_exp_type: et,
+                    bn_goods: t.data.data, bn_pickname: gg.pick_name, bn_exp_type: et,index:m_wind,
                     bn_pick: gg.pick_id, bn_t_exp_t: distr_t,selected_quan_list:quanlist
                   });
                   //计算价格
@@ -1087,15 +1095,14 @@ Page({
     });
   },
 
-  //--------立即购买时，选择自提和物流-----------
+  //--------购物车购买时，选择自提和物流-----------
   setexptype_w:function(t){
     
-    var uerinfo= getApp().globalData.userInfo.def_exp_code;
-   
-    console.log(getApp().globalData.userInfo, "获取默认的物流地址", uerinfo );
-    var th=this;
-    
-    var ty = t.currentTarget.dataset.t, txt = t.currentTarget.dataset.txt, ont = t.currentTarget.dataset.ont;
+    var def_exp_code= getApp().globalData.userInfo.def_exp_code,th=this;
+    var ty = t.currentTarget.dataset.t, txt = t.currentTarget.dataset.txt,
+        wl_txt = t.currentTarget.dataset.wl_txt,
+        ont = t.currentTarget.dataset.ont;
+
     th.setData({ [txt]: ty });
     var iszt=1;
    
@@ -1111,37 +1118,51 @@ Page({
       th.setData({ is_all_zt: iszt });
     }
     //判断有没有默认的物流地址值
-    if (uerinfo != "" && uerinfo != null && uerinfo !=undefined) {
+    if (def_exp_code != "" && def_exp_code != null && def_exp_code !=undefined) {
       var wu_arr=this.data.wu_arr;
       if (wu_arr!= null && wu_arr!=""){
           for(var i=0;i<wu_arr.length;i++){
-            if (wu_arr[i].shipping_code == uerinfo){
-              console.log(wu_arr[i],"人生啊，路漫漫，",wu_arr,"判断传出去的下标",i);
-              th.setData({index:i});
-                }
+            if (wu_arr[i].shipping_code == def_exp_code){
+                 var set_txt="cartlist"
+                 th.setData({wl_txt:i});
+            }
           }
       }
-     
     }else{
-    //判断是不是快递
-    if (ont == 66) {
-      this.express_name();
-    }
+        //判断是不是快递
+        if (ont == 66) {
+            this.express_name();
+        }
     }
     //----计算此时购物车的价格----
     th.calculatePrice();
   },
+
   //--------立即购买时，选择自提和物流----------
   setexptype:function(t){
     var th=this;
-    var ty = t.currentTarget.dataset.t;
+    var ty = t.currentTarget.dataset.t,def_exp_code= getApp().globalData.userInfo.def_exp_code;
     th.setData({ bn_exp_type:ty});
     //当物流为空的时候。
     if (ty == 0 && th.data.wu_arr==null){
       return th.get_wuliu(th.calculatePrice2());
     }
-    th.calculatePrice2()
-    console.log('setexptype');
+
+      //判断有没有默认的物流地址值
+      if (def_exp_code != "" && def_exp_code != null && def_exp_code !=undefined) {
+          var wu_arr=this.data.wu_arr;
+          if (wu_arr!= null && wu_arr!=""){
+              for(var i=0;i<wu_arr.length;i++){
+                  if (wu_arr[i].shipping_code == def_exp_code){
+                      th.setData({index:i});
+                  }
+              }
+          }
+      }
+
+
+     th.calculatePrice2()
+     console.log('setexptype');
   },
 
   //--------立即购买时，使用余额--------
diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml
index d2159ca..7bba21d 100644
--- a/pages/cart/cart2/cart2.wxml
+++ b/pages/cart/cart2/cart2.wxml
@@ -111,12 +111,15 @@
      <view class="circle  xc-hookts on"></view>
         </block>
                              
-                            <view bindtap='setexptype_w' data-t='0' data-txt='cartlist[{{pidx}}].exp_type' class="yu_er">快递邮寄</view>
+                            <view bindtap='setexptype_w' data-t='0'
+                                    data-txt='cartlist[{{pidx}}].exp_type'
+                                    data-wl_txt='cartlist[{{pidx}}].wind'
+                                    class="yu_er">快递邮寄</view>
                           </view>
                           </view>
                           <block wx:if="{{item.exp_type==0}}">
                           <view class="flex-vertical">
-                              <view >{{wu_arr[index].name}}</view>
+                              <view >{{wu_arr[item.wind].name}}</view>
                               	<view class="xc-right"></view>
                           </view>
                           </block>
@@ -169,9 +172,7 @@
                           <view class="flex-vertical fs28 xc-ash">商品属性:   <view class="goods-color"> 
                                 <text wx:if="{{bn_goods.goods_spec!=''}}"> {{bn_goods.goods_spec}}/</text>{{bn_goods.goods_color}}</view></view>
 
-
-                            <!-----商品名称规格------>
-
+                          <!-----商品名称规格------>
                           <view class="order-num  flex-space-between">
                           <view class="co-red">￥<text class="fs36">{{filters.toFix(bn_goods.shop_price,2)}}</text></view>
                           <view class="goods-num">x{{bn_goods.buynum}}</view>
@@ -199,11 +200,11 @@
 
                     <view class="use-item flex-space-between">
                     <view class="flex">
-                        <view bindtap='setexptype_w' data-t='1' data-txt='cartlist[{{pidx}}].exp_type'   style="display:{{bn_t_exp_t==2?'none':'flex;align-items:center;'}};">
+                        <view bindtap='setexptype' data-t='1' data-txt='cartlist[{{pidx}}].exp_type'   style="display:{{bn_t_exp_t==2?'none':'flex;align-items:center;'}};">
                           <icon   color="{{bn_exp_type==1?'red':'gray'}}" size="16" type="success"></icon>
                            <view class="yu_er">自提</view>
                         </view>
-                        <view bindtap='setexptype_w' data-t='0' data-txt='cartlist[{{pidx}}].exp_type'  style="display:{{bn_t_exp_t==1?'none':'flex;align-items:center;'}};">
+                        <view bindtap='setexptype' data-t='0' data-txt='cartlist[{{pidx}}].exp_type'  style="display:{{bn_t_exp_t==1?'none':'flex;align-items:center;'}};">
                             <icon  color="{{bn_exp_type==0?'red':'gray'}}" size="16" type="success"></icon>
                             <view class="yu_er">物流</view>
                         </view>
@@ -216,28 +217,6 @@
                               </block>
                     </view>
 
-                    <!-- <view class="use-item" hidden='{{bn_exp_type==1}}'>
-                          <view>使用物流：</view>
-                          <view >{{wu_arr[index].name}}</view> -->
-                          <!-- <picker bindchange="bindPickerChange" value="{{index}}" range="{{wu_arr}}" range-key="name">
-                                
-                          </picker> -->
-                    <!-- </view> -->
-
-                    <!-- <view class="use-item">
-                        <view>使用积分 : </view>
-                        <input bindblur="keyUpChangePay2" maxlength="20" name="pay_points" placeholder="可用积分为:{{order.userInfo.pay_points}}" type="number"></input>
-                        <button class="use-btn" formType="submit">使用</button>
-                    </view>
-                    <view class="use-item">
-                        <view>使用券码 : </view>
-                        <input name="couponCode" placeholder="请输入优惠券券码" type="text"></input>
-                        <button class="use-btn" formType="submit">使用</button>
-                    </view>
-                    <view class="use-item" style="display:{{payWithUserMoney&&payWithPoints?'none':'flex'}}">
-                        <view>支付密码 : </view>
-                        <input password maxlength="20" name="paypwd" placeholder="请输入密码" type="text"></input>
-                    </view> -->
                 </view>
 
                  <!-----使用余额------>
@@ -245,7 +224,6 @@
                   <view class="use-item" bindtap='set_bn_useyuer'>
                           <icon  color="{{bn_use_money?'red':'gray'}}" size="16" type="success"></icon>
                           <view class="yu_er">使用余额 :￥{{yuer}} </view>
-                          <!-- <input bindblur="keyUpChangePay1" maxlength="20" name="user_money" placeholder="可用余额:{{order.userInfo.user_money}}" type="digit"></input> <button class="use-btn" formType="submit">使用</button>-->
                   </view>
                 </view>
                 <view class="coupon-mes flex-vertical">
@@ -381,8 +359,7 @@
                <view class="flex  top-frame">
 
                <view class="frame">
-                  <!-- <view class="flex"> -->
-             
+                     <!-- <view class="flex"> -->
                       <view class="coupon-wode ib flex ellipsis-2 ">  
                                <text class="xc-brand t-c ib white {{filter.setcolor(item.UseObjectType)}}">{{filter.get_type_card(item.UseObjectType)}}
                       </text>
@@ -401,7 +378,7 @@
                    </view> -->
 
                     <block wx:if="{{is_coupon==index}}">
-        <view class="circle white xc-hook fs20 red-b  sn"><text>Γ</text></view>
+        <view class="circle white xc-hook fs20 red-b sn"><text>Γ</text></view>
       </block>
       <block wx:else>
      <view class="circle  xc-hooks on"></view>
diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js
index 6ab543f..1e77a48 100644
--- a/pages/goods/goodsList/goodsList.js
+++ b/pages/goods/goodsList/goodsList.js
@@ -26,14 +26,14 @@ Page({
 	  this.data.is_new=t.is_new;
 	  this.data.is_hot=t.is_hot;
 
-      if (0 != t.cat_id && t.cat_id != undefined) { 
-           url += "&cat_id=" + t.cat_id; 
-           if (t.parent_id == undefined && t.parent_id == null){
-              url +=  "&parent_id=0"; 
-           }else{
-               url +=  "&parent_id="+t.parent_id;
-           }
-      }
+      if (0 != t.cat_id && t.cat_id != undefined) {
+            url += "&cat_id=" + t.cat_id;
+            if (t.pid == undefined || t.pid == null){
+                url +=  "&parent_id=0";
+            }else{
+                url +=  "&parent_id="+t.pid;
+            }
+        }
 
       if (0 != t.brand_id && t.brand_id != undefined) { url += "&brand_id=" + t.brand_id; }
       if (0 != t.nation_id && t.nation_id != undefined) { url += "&nation_id=" + t.nation_id; }