diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 46b7daf..12434fd 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -82,6 +82,7 @@ Page({
     expres_name:"",//点击选定
     isopen:0,//券的说明
     is_coupon:0,//选择券的控制属性
+    is_shipping_code:"",//插入用户默认地址
   },
   onLoad: function(t) {
 
@@ -153,7 +154,7 @@ Page({
     var th = this;
     to.getwuliu(function (e) {
       console.log("ws");
-      console.log(e);
+      console.log("物流的数据77777777777777",e);
       th.setData({ wu_arr: e })
       typeof func == "function" && func();
     })
@@ -349,6 +350,7 @@ Page({
                 })
 
                 if(frozenQuan){
+                  console.log("券列表111111111111111111",arr[ind].quan_list);
                   arr[ind].quan_list=th.check_is_frozenQuan(arr[ind].quan_list,frozenQuan);
                 }
 
@@ -407,6 +409,7 @@ Page({
                 }).then(res=>{
                   if(res.data.code==0)
                     quanlist=res.data.data.pageData;
+                  console.log("22222222222222222222券的列表", quanlist);
                   
                 })
               }
@@ -425,7 +428,7 @@ Page({
 
               t.data.data.prom_id = 0;
               t.data.data.prom_type = 0;
-              console.log("44444444444444券的列表", quanlist);
+             
               th.setData({
                 bn_goods: t.data.data, bn_pickname: gg.pick_name, bn_exp_type: et,
                 bn_pick: gg.pick_id, bn_t_exp_t: distr_t,selected_quan_list:quanlist
@@ -456,6 +459,7 @@ Page({
                        }).then(res=>{
                          if(res.data.code==0)
                              quanlist=res.data.data.pageData;
+                         console.log("券接口的列表333333333333333",quanlist);
                        })
 
                        var frozenQuan=null;
@@ -1079,6 +1083,10 @@ 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;
@@ -1096,10 +1104,24 @@ Page({
      
       th.setData({ is_all_zt: iszt });
     }
+    //判断有没有默认的物流地址值
+    if (uerinfo != "" && uerinfo != null && uerinfo !=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});
+                }
+          }
+      }
+     
+    }else{
     //判断是不是快递
     if (ont == 66) {
       this.express_name();
     }
+    }
     //----计算此时购物车的价格----
     th.calculatePrice();
   },
@@ -1241,19 +1263,15 @@ Page({
 
   /*--点击选择券--*/
   sele_quan_item:function(e) {
-    var no_use=e.currentTarget.dataset.no, quanlist=this.data.selected_quan_list;
-    
+    var no_use=e.currentTarget.dataset.no, quanlist=this.data.selected_quan_list;  
     //---所有的券的显示红色选择都清理一遍---
     for(var ind in quanlist){
        quanlist[ind].show_red=0;
     }
-    
     this.setData({selected_quan_list:quanlist});
     var using_quan=this.data.using_quan;
     var th=this;
-
     //---如果是不使用优惠券---
-  
     if(no_use==1){
       console.log("有进来吗券", no_use);
           if(using_quan[th.data.selected_quan_pick]){
@@ -1267,15 +1285,17 @@ Page({
     }
 
     var ind = e.currentTarget.dataset.ind;
+    
     var quan_item = this.data.selected_quan_list[ind];
     var txt = "selected_quan_list[" + ind + "].show_red";
+    
     var obj = {};
     obj[txt] = 1;
     if (quan_item.show_red) {
       obj[txt] = 0;
     }
     this.setData(obj);
-
+    console.log(this.data.selected_quan_list, "选中的券的下标", quan_item, "数据都在这里", txt);
     if(using_quan[th.data.selected_quan_pick]){
       using_quan[th.data.selected_quan_pick].is_nouse_red=0;
     }
@@ -1288,14 +1308,18 @@ Page({
 
   //--确认使用券---
   confirm_quan:function () {
-      console.log(1111);
+   
       var using_quan=this.data.using_quan,pickid=this.data.selected_quan_pick;
       var th=this,selected_quan_list=this.data.selected_quan_list;
       //选择了的券
       var sele_quan=null;
+    console.log(selected_quan_list, "确认使用券");
       for(var i in selected_quan_list){
+        
           var item=selected_quan_list[i];
+        console.log(item, "确认使用券",item.show_red);
           if(item.show_red) {
+            console.log(item.show_red, "确定的券7");
              th.insert_into_using_quan(item,using_quan,pickid);
              return;
           }
@@ -1341,6 +1365,7 @@ Page({
 
   //--验证是否已经冻结--
   check_is_frozenQuan:function(quanlist,frozenQuan){
+    console.log("券列表",quanlist);
         var arr=[];
         for(var i=0;i<quanlist.length;i++){
             var item=quanlist[i];
@@ -1368,21 +1393,17 @@ Page({
   },
   // 选择物流
     click_express_name:function(e){
-      var express_name=e.currentTarget.dataset.name;
+      var express_name = e.currentTarget.dataset.name, shippingcode = e.currentTarget.dataset.shippingcode;
+      console.log("判断是不是11111111111111111111111111111", shippingcode);
       var index=e.currentTarget.dataset.idxe;
-      this.setData({  is_express: index, index: index});
+      this.setData({ is_express: index, index: index, is_shipping_code: shippingcode});
     },
     //点击确定物流
   determine_expres:function(e){
-    
-   var name=this.data.expres_name
     this.setData({ open_express: 0});
     this.calculatePrice();
   },
-  //设置默认物流
-  set_default:function(){
-    
-  },
+ 
   //点击打开优惠券使用说明
   clik_coupons:function(e){
  
@@ -1401,6 +1422,22 @@ Page({
     var ind = e.currentTarget.dataset.ind;
     console.log("下标", ind);
     this.setData({ is_coupon: ind});
-
-  }
+  },
+ 
+  //设置默认物流
+  select_default_logistics: function () {
+    var th=this;
+    var is_shipping_code=this.data.is_shipping_code
+    getApp().request.put("/api/weshop/users/update",{
+      data: { user_id: getApp().globalData.user_id, store_id: oo.stoid, def_exp_code: is_shipping_code},
+      success:function(rse){
+        if (rse.data.code==0){
+          th.setData({ open_express: 0 });
+          //----计算此时购物车的价格----
+          th.calculatePrice();
+       }
+      }
+    })
+         
+  },
 });
diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml
index d01a2c8..ab02bb9 100644
--- a/pages/cart/cart2/cart2.wxml
+++ b/pages/cart/cart2/cart2.wxml
@@ -202,19 +202,21 @@
 
                     <view class="use-item flex-space-between">
                     <view class="flex">
-                        <view bindtap='setexptype' data-t='1'  style="display:{{bn_t_exp_t==2?'none':'flex;align-items:center;'}};">
+                        <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;'}};">
                           <icon   color="{{bn_exp_type==1?'red':'gray'}}" size="16" type="success"></icon>
                            <view class="yu_er">自提</view>
                         </view>
-                        <view bindtap='setexptype' data-t='0'  style="display:{{bn_t_exp_t==1?'none':'flex;align-items:center;'}};">
+                        <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;'}};">
                             <icon  color="{{bn_exp_type==0?'red':'gray'}}" size="16" type="success"></icon>
                             <view class="yu_er">物流</view>
                         </view>
 </view>
+                           <block wx:if="{{item.exp_type==0}}">
                          <view class="flex-vertical">
                           <view class="logistics-name">{{wu_arr[index].name}}</view>
                           		<view class="xc-right"></view>
                               </view>
+                              </block>
                     </view>
 
                     <!-- <view class="use-item" hidden='{{bn_exp_type==1}}'>
@@ -331,7 +333,7 @@
         <view class="xc-frame flex-level">
             <view class="list-frame">	
 
-           <view wx:for="{{selected_quan_list}}" bindtap="sele_quan_item" data-ind="{{index}}" wx:for-item="item"wx:for-index="index">
+           <view wx:for="{{selected_quan_list}}" bindtap="sele_quan_item"  wx:if="{{!item.is_using}}"  data-ind="{{index}}" wx:for-item="item"wx:for-index="index">
             <view class="xc-coupon-frame flex-center" bindtap="sele_coupon" data-ind="{{index}}">
       <view class="coupon-frame flex rel">
           <!-- 锯齿 -->
@@ -463,7 +465,7 @@
         </view>
       <view class="express_list">
         <view  wx:for="{{wu_arr}}" wx:for-item="express_list" wx:for-index="idx">
-        <view class="express_list_frame" bindtap="click_express_name" data-name="{{express_list.name}}" data-idxe="{{idx}}">
+        <view class="express_list_frame" bindtap="click_express_name" data-shippingcode="{{express_list.shipping_code}}" data-name="{{express_list.name}}" data-idxe="{{idx}}">
         <block wx:if="{{is_express==idx}}">
         <view class="circle white xc-hook fs20 red-b"><text>Γ</text></view>
       </block>
@@ -479,8 +481,8 @@
         <view class="xc-determine flex-center" bindtap="determine_expres">
             <view class="flex-vertical  t-c">确定</view>
         </view>
-         <view class="xc-confirms flex-center" bindtap="set_default">
-            <view class="flex-vertical  t-c">设为默认</view>
+         <view class="xc-confirms flex-center" bindtap="select_default_logistics">
+            <view class="flex-vertical  t-c">设为默认</view> 
         </view>
         </view>
         
diff --git a/pages/goods/categoryList/categoryList.js b/pages/goods/categoryList/categoryList.js
index 2d17669..9afd7b3 100644
--- a/pages/goods/categoryList/categoryList.js
+++ b/pages/goods/categoryList/categoryList.js
@@ -36,7 +36,8 @@ Page({
       brand_list:null,//品牌列表
 
       one_level_classify:[],// 新的版本左边的边分类1级
-      is_level_three:0//判断有没有3级
+      is_level_three:0,//判断有没有3级
+      cat_id:0,
     },
     onLoad: function(tt) { 
       const res = wx.getSystemInfoSync(),
@@ -461,7 +462,7 @@ Page({
    }
    }
    
-   this.setData({ select_classify_on: indexs, index: indexs, classify_name: name });
+   this.setData({ select_classify_on: indexs, index: indexs, classify_name: name, cat_id: cid});
   
  },
 //  图片失败
diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml
index 7164fa2..2825a7a 100644
--- a/pages/goods/categoryList/categoryList.wxml
+++ b/pages/goods/categoryList/categoryList.wxml
@@ -207,7 +207,7 @@
 <!-- 只是2级的 -->
 <block wx:if="{{select_classify_on!=220&&select_classify_on!=223&&is_level_three!=1}}">
 <view>
-<view class="classify_name fs32 flex-space-between"data-pid="0"data-cid="{{goods.items.id}}" bindtap='select_more'>
+<view class="classify_name fs32 flex-space-between"data-pid="0"data-cid="{{cat_id}}" bindtap='select_more'>
 <view>{{classify_name}}</view>
   <view class="flex select_more" > 
     <view class="red-co fs32" >选择更多</view>