diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 897329b..7e40634 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -52,6 +52,7 @@ Page({
     /*----------物流选择--------*/
     wu_arr:null,
     index:0,
+    w_sele_index:0,
 
     //判断页面是返回回来的还是 首次进入的
     isclose:1,
@@ -979,6 +980,7 @@ Page({
       }
       console.log(pdata);
     }
+
     if (pdata.length==0) return;
     var str = JSON.stringify(pdata);
     wx.showLoading({title: "加载中"});
@@ -1096,7 +1098,7 @@ Page({
   enterAddressPage: function() {
     getApp().globalData.is_cart_old=1;
     this.data.enterAddressPage = !0, wx.navigateTo({
-      url: "/pages/user/address_list/address_list?is_back=1"
+      url: "/pages/user/address_list/address_list"
     });
   },
 
@@ -1409,17 +1411,26 @@ Page({
   //// 开启物流的弹窗
   show_wu_arr:function(e){
     var wu_arr_txt=e.currentTarget.dataset.txt;
-    this.setData({ open_express: 1,wu_arr_txt:wu_arr_txt});
+    var w_sele_index=e.currentTarget.dataset.w_sele_index;
+    var is_express=null;
+    var ob={open_express: 1,wu_arr_txt:wu_arr_txt,disabled:1};
+
+    //--如果是多个门店的时候--
+    if(w_sele_index!=undefined){
+        is_express=this.data.cartlist[w_sele_index].wind;
+        ob['is_express']=is_express;
+    }
+    this.setData(ob);
   },
     // 关闭物流的弹窗
   close_express:function(){
-    this.setData({ open_express:0 });
+    this.setData({ open_express:0,disabled:0 });
   },
     // 选择物流
     click_express_name:function(e){
       var express_name = e.currentTarget.dataset.name, shippingcode = e.currentTarget.dataset.shippingcode;
       var index=e.currentTarget.dataset.idxe;
-      var ob={ is_express: index, is_shipping_code: shippingcode};
+      var ob={ is_express: index, is_shipping_code: shippingcode,disabled:0};
       ob[this.data.wu_arr_txt]=index;
       this.setData(ob);
     },
@@ -1435,7 +1446,6 @@ Page({
  
   //点击打开优惠券使用说明
   clik_coupons:function(e){
- 
     var ind = e.currentTarget.dataset.idx;
     var is_open = this.data.selected_quan_list[ind].is_open;
     console.log(is_open,"是什么东西");
@@ -1445,6 +1455,7 @@ Page({
     var txt = "selected_quan_list[" + ind + "].is_open"
     var obj = {}; obj[txt] = is_open;
     this.setData(obj);
+    this.setData({disabled:1})
   },
   //选择券
   sele_coupon:function(e){
@@ -1484,8 +1495,8 @@ Page({
                  if (def_exp_code == item.code) { m_wind = k; }
              }
              //--如果是立即购买--
-             if (this.data.is_b_now == 1) {
-                 th.setData({index: m_wind});
+             if (th.data.is_b_now == 1) {
+                 th.setData({index: m_wind,is_express:m_wind});
              } else {
                  var ui = setInterval(function () {
                      if (th.data.cartlist) {
@@ -1493,8 +1504,7 @@ Page({
                          for (var i in c_arr) {
                              c_arr[i].wind = m_wind;
                          }
-                         th.setData({cartlist: c_arr})
-
+                         th.setData({cartlist: c_arr,is_express:m_wind})
                          clearInterval(ui);
                      }
                  }, 500)
diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml
index 056739d..e4d2973 100644
--- a/pages/cart/cart2/cart2.wxml
+++ b/pages/cart/cart2/cart2.wxml
@@ -36,7 +36,7 @@
         <block wx:if="{{is_b_now==0}}">
          <view class="xc-border main-top"></view>
             <view  wx:for="{{cartlist}}" wx:for-index="pidx">
-            <view class="use-item bfff">
+               <view class="use-item bfff">
             
                       <image class="dp" src='{{imgUrl}}/miniapp/images/goodscategory/new_store.png'> </image> <view>门店：{{item.pname}}</view></view>
                 <view class="order-detail" wx:for="{{item.goods}}" wx:for-index="idx"  wx:for-item="items">
@@ -48,12 +48,13 @@
                     <!----商品名称规格---->
                     <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{items.goods_id}}">
                         <view class="goods-name">{{items.goods_name}}</view>
-                        
                           <!-- 商品属性 -->
-                          <view class="flex-vertical fs28 color-gray">商品属性: <view class="goods-color"> 
-                                <text wx:if="{{items.goods_spec!='' && items.goods_spec!=null }}"> {{items.goods_spec}}/</text>
-                     {{items.goods_color==null?"":items.goods_color}}
-                          </view></view>
+                          <view class="flex-vertical fs28 color-gray n_guige">
+                              <view class="goods-color">
+                                  <text wx:if="{{items.goods_spec!='' && items.goods_spec!=null }}"> {{items.goods_spec}}</text>
+                                  {{items.goods_color==null || items.goods_color=='' ?"":"/"+items.goods_color}}
+                              </view>
+                          </view>
 
 
                             <!-----商品名称规格------>
@@ -119,7 +120,7 @@
                           </view>
                           <block wx:if="{{item.exp_type==0}}">
                               <!-- 点击显示物流选择 -->
-                              <view class="flex-vertical" bindtap="show_wu_arr"  data-txt='cartlist[{{pidx}}].wind'>
+                              <view class="flex-vertical" bindtap="show_wu_arr"  data-txt='cartlist[{{pidx}}].wind' data-w_sele_index="{{pidx}}">
                                   <view >{{wu_arr[item.wind].name}}</view><view class="xc-right"></view>
                               </view>
                           </block>
@@ -127,30 +128,31 @@
 
                     <!-- <view bindtap="express_name" class="use-item" hidden='{{item.exp_type==1}}'>
                           <view>选择物流：</view> -->
-                         
                           <!-- <picker bindchange="bindPickerChange_w" data-txt='cartlist[{{pidx}}].wind'  value="{{item.wind}}" range="{{wu_arr}}" range-key="name">
                                 <view >{{wu_arr[item.wind].name}}</view>
                           </picker> -->
                     <!-- </view> -->
                 </view>
-                 <!-----使用余额------>
-            <view class="set-mes" wx:if="{{yuer>0}}">
-                    <view class="use-item" bindtap='set_js_useyuer'>
-                            <icon  color="{{js_use_money?'red':'gray'}}" size="16" type="success"></icon>
-                            <view class="yu_er">使用余额 :￥{{yuer}} </view>
-                    </view>
-            </view>
-               
-            </view>
 
-             <!-- 留言 -->
+                <!-- 留言 -->
                 <view class="coupon-mes flex-vertical">
                     <view>留言</view>
                     <view class="leave-word">
-                        <textarea placeholder-class="fs28" placeholder='给商家留言，最多100字'bindinput="keyUpChangeNum" disabled="{{disabled}}" class="word-box" maxlength="100" name="user_note_{{item.pickup_id}}"></textarea>
-                     
+                        <input placeholder-class="fs28" placeholder='给商家留言，最多100字'bindinput="keyUpChangeNum"
+                                  disabled="{{disabled}}" class="word-box" maxlength="100" name="user_note_{{item.pickup_id}}"></input>
+
                     </view>
                 </view>
+               
+            </view>
+
+            <!-----使用余额------>
+            <view class="set-mes" wx:if="{{yuer>0}}">
+                <view class="use-item" bindtap='set_js_useyuer'>
+                    <icon  color="{{js_use_money?'red':'gray'}}" size="16" type="success"></icon>
+                    <view class="yu_er">使用余额 :￥{{yuer}} </view>
+                </view>
+            </view>
            
         </block>
 
@@ -224,7 +226,7 @@
                 <view class="coupon-mes flex-vertical">
                     <view>留言</view>
                     <view class="leave-word">
-                        <textarea placeholder-class="fs28" placeholder='给商家留言，最多100字' bindinput="keyUpChangeNum" disabled="{{disabled}}" class="word-box" maxlength="100" name="user_note"></textarea>
+                        <input placeholder-class="fs28" placeholder='给商家留言，最多100字' bindinput="keyUpChangeNum" disabled="{{disabled}}" class="word-box" maxlength="100" name="user_note"></input>
              
                     </view>
                 </view>
@@ -356,10 +358,11 @@
                <view class="frame">
                      <!-- <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 class="xc-brand t-c ib white {{filter.setcolor(item.UseObjectType)}}">{{filter.get_type_card(item.UseObjectType)}}
                       </text>
-                         {{item.PrivilegeName}}
-                      <!-- </view> -->
+                       <block wx:if="{{item.buy_sum>0}}">满{{item.buy_sum}}减{{item.Sum}}优惠券</block>
+                       <block wx:else>全场通用减{{item.Sum}}优惠券</block>
+                          <!-- </view> -->
                     </view>
                     <view class="coupon-time">
                     {{filters.replace_time2(item.BeginDate)}}至{{filters.replace_time2(item.BillDate)}}</view>
@@ -382,7 +385,7 @@
 
     
             
-           <view class="abs flex-vertical-between bottmo-explain" bindtap='clik_coupons' data-idx="{{index}}">
+           <view class="abs flex-vertical-between bottmo-explain" catchtap='clik_coupons' data-idx="{{index}}">
                <view></view>
            <view class="font-word flex">优惠券使用说明
            <view class="circle circle-size flex t-c">
diff --git a/pages/cart/cart2/cart2.wxss b/pages/cart/cart2/cart2.wxss
index de46099..815590e 100644
--- a/pages/cart/cart2/cart2.wxss
+++ b/pages/cart/cart2/cart2.wxss
@@ -5,20 +5,18 @@
     color: #444;
 }
 .user-contact {
-    padding: 24rpx 80rpx;
+    padding: 24rpx 70rpx;
     font-weight: 600; 
-    
-
 }
  
 .location {
     position: relative;
-    padding: 0 80rpx 24rpx;
+    padding: 0 70rpx 24rpx;
 }
 
 .pos-icon {
     position: absolute;
-    left: 30rpx;
+    left: 22rpx;
     top: 9rpx;
     width: 32rpx;
     height: 37.5rpx;
@@ -84,8 +82,6 @@
 
 .goods-color {
     font-size: 24rpx;
-    margin-left: 15rpx;
-
 }
 
 .order-num {
@@ -106,10 +102,10 @@ margin:auto;
 
 }
 .use-item>view{
-   display: flex;margin-right: 10rpx;
+   display: flex;margin-right: 12rpx;
 }
 .use-item.bfff{ background-color: #fff;}
-.use-item .dp{width: 56rpx; height: 56rpx;}
+.use-item .dp{width: 56rpx; height: 56rpx; margin-left: -5rpx}
 
 .set-item {
     justify-content: space-between;
@@ -822,5 +818,6 @@ margin-left: 20rpx;
 }
 .color-gray{
   color: #808080;
+}
 
-}
\ No newline at end of file
+.n_guige{ display: inline-block; background:rgb(236, 236, 236); color: rgb(63,63,63); padding: 3rpx 10rpx; border-radius: 3rpx }
\ No newline at end of file
diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js
index 39016ca..e8269c1 100644
--- a/pages/cart/cart2_pt/cart2_pt.js
+++ b/pages/cart/cart2_pt/cart2_pt.js
@@ -341,7 +341,6 @@ Page({
 
     //--------------------提交订单-----------------------
     submitForm:function(t){
-
         if(this.data.is_summit_ing==1) return false; //--提交中退出--
         this.data.is_summit_ing=1;
 
@@ -540,9 +539,9 @@ Page({
         });
     },
     enterAddressPage: function() {
-        getApp().globalData.is_cart2_old=1;
+        getApp().globalData.is_cart_old=1;
         this.data.enterAddressPage = !0, wx.navigateTo({
-            url: "/pages/user/address_list/address_list?operate=select"
+            url: "/pages/user/address_list/address_list"
         });
     },
 
diff --git a/pages/cart/cart2_pt/cart2_pt.wxml b/pages/cart/cart2_pt/cart2_pt.wxml
index 53c3308..488abcb 100644
--- a/pages/cart/cart2_pt/cart2_pt.wxml
+++ b/pages/cart/cart2_pt/cart2_pt.wxml
@@ -39,10 +39,10 @@
                       <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{bn_goods.goods_id}}">
                           <view class="goods-name">{{bn_goods.goods_name}}</view>
                                <!-- 商品属性 -->
-                          <view class="flex-vertical fs28 color-gray">商品属性: 
-                          <view class="goods-color">
-                                <text wx:if="{{bn_goods.goods_spec!=''}}">  {{bn_goods.goods_spec}}/</text>{{bn_goods.goods_color}}
-                          </view> </view>
+                          <view class="flex-vertical fs28 color-gray n_guige">
+                                 <view class="goods-color">
+                                   <text wx:if="{{bn_goods.goods_spec!=''}}">  {{bn_goods.goods_spec}}/</text>{{bn_goods.goods_color}}
+                          </view></view>
 
 
                              <!-----商品名称规格------>
@@ -114,7 +114,7 @@
                 <view class="coupon-mes flex-vertical">
                     <view>留言</view>
                     <view class="leave-word">
-                        <textarea placeholder-class="fs28" placeholder='给商家留言，最多100字'bindinput="keyUpChangeNum" disabled="{{disabled}}" class="word-box" maxlength="100" name="user_note_{{item.pickup_id}}"></textarea>
+                        <textarea placeholder-class="fs28" placeholder='给商家留言，最多100字'bindinput="keyUpChangeNum" disabled="{{disabled}}" class="word-box" maxlength="100" name="user_note"></textarea>
                      
                     </view>
                 </view>
diff --git a/pages/cart/cart2_pt/cart2_pt.wxss b/pages/cart/cart2_pt/cart2_pt.wxss
index 3ab1875..753ef7b 100644
--- a/pages/cart/cart2_pt/cart2_pt.wxss
+++ b/pages/cart/cart2_pt/cart2_pt.wxss
@@ -5,19 +5,19 @@
     color: #444;
 }
 .user-contact {
-    padding: 24rpx 80rpx;
+    padding: 24rpx 70rpx;
     font-weight: 600;
 
 }
 
 .location {
     position: relative;
-    padding: 0 80rpx 24rpx;
+    padding: 0 70rpx 24rpx;
 }
 
 .pos-icon {
     position: absolute;
-    left: 30rpx;
+    left: 22rpx;
     top: 20rpx;
     width: 32rpx;
     height: 40rpx;
@@ -108,7 +108,7 @@
    display: flex;margin-right: 10rpx;
 }
 .use-item.bfff{ background-color: #fff;}
-.use-item .dp{width: 56rpx; height: 56rpx;}
+.use-item .dp{width: 56rpx; height: 56rpx; margin-left: -5rpx}
 
 .set-item {
     justify-content: space-between;
@@ -563,5 +563,6 @@ height:30rpx;
 }
 .color-gray{
   color: #808080;
+}
 
-}
\ No newline at end of file
+.n_guige{ display: inline-block; background:rgb(236, 236, 236); color: rgb(63,63,63); padding: 3rpx 10rpx; border-radius: 3rpx }
\ No newline at end of file
diff --git a/pages/goods/categoryList/categoryList.js b/pages/goods/categoryList/categoryList.js
index 48798d0..0fba700 100644
--- a/pages/goods/categoryList/categoryList.js
+++ b/pages/goods/categoryList/categoryList.js
@@ -46,7 +46,7 @@ Page({
         letters = this.data.letters;
 
       var that = this;
-      this.requestFirstCategoris();
+     
       this.setData({
         abc: t.globalData.heigth-88-88-16,
         windowHeight: res.windowHeight,
@@ -84,6 +84,7 @@ Page({
 
     onShow:function(){
       var that=this;
+      this.requestFirstCategoris();
       
       getApp().getConfig2(function (e) {
 
@@ -98,17 +99,15 @@ Page({
         that.setData({ store_config: e,is_do:1 });
         if (   that.data.is_show_gb != 1 && that.data.is_show_pp != 1){
           console.log("品类数据", that.data.is_pl_time);
-          var one_level_classify = that.data.one_level_classify;
+        
           that.data.pl_timer = setInterval(function () {
-            console.log("品类数据", that.data.is_pl_time);
-            that.requestFirstCategoris();
-            if (that.data.is_pl_time==1){
-              console.log("品类数据", that.data.is_pl_time);
+            var one_level_classify = that.data.one_level_classify;    
+            if (that.data.is_pl_time == 1 && one_level_classify.length>0){
+              that.setData({ select_classify_on: 0, index: 0, goodslist: one_level_classify[0].array }); 
               clearInterval(that.data.pl_timer);
             }
-          }, 6000);
-          console.log(one_level_classify,"999999999999999999999999999999999" );
-          that.setData({ select_classify_on: 0, index: 0, goodslist: one_level_classify[0].array}); 
+          }, 500);
+         
         } else if (that.data.is_show_gb != 1 ){
          // console.log("品类数据", that.data.is_show_pl);
        
diff --git a/pages/user/address_list/address_list.js b/pages/user/address_list/address_list.js
index 8e2a2dd..b5caeec 100644
--- a/pages/user/address_list/address_list.js
+++ b/pages/user/address_list/address_list.js
@@ -24,10 +24,11 @@ Page({
     });
 
     this.data.operate = e.operate;
-    var is_back=e.is_back;
-    if (is_back) this.setData({ is_back: is_back})
   },
   onShow: function () {
+    var is_back=getApp().globalData.is_cart_old;
+    if (is_back) this.setData({ is_back: is_back})
+
     this.data.curpage = 1;
     this.data.addresses = [];
     this.requestAddressList();
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index 790ff33..9ee4051 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -56,8 +56,9 @@
             <view class="flex-space-between">
               <!-- 商品规格 -->
               <view class="Commodity_spec fs28 flex-center">
-
-                <text class="ellipsis-1">{{goods.goods_color.length>1 && goods.goods_spec.length>1?goods.goods_color+"/"+goods.goods_spec:goods.goods_color.length>1 || goods.goods_spec.length>1?goods.goods_color+goods.goods_spec:'规格1'}}</text>
+                <text class="ellipsis-1" wx:if="{{goods.goods_color.length>1 && goods.goods_spec.length>1}}">{{goods.goods_color+"/"+goods.goods_spec}}</text>
+                <text class="ellipsis-1" wx:elif="{{goods.goods_color.length>1 || goods.goods_spec.length>1}}">{{goods.goods_color==undefined?"":goods.goods_color}}{{goods.goods_spec==undefined?"":goods.goods_spec}}</text>
+                <text class="ellipsis-1" wx:else>规格1</text>
               </view>
               <view class="flex-level-right fs26 refund">
                 <!-- 不是整单退的时候 -->