diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml
index e4d2973..4b72586 100644
--- a/pages/cart/cart2/cart2.wxml
+++ b/pages/cart/cart2/cart2.wxml
@@ -341,11 +341,13 @@
                   <text class="xc-rmb-val">{{item.Sum}}</text>
                 </view>
 
-            <view class="coupon-explain t-c" wx:if="{{item.BuySum==0}}">   
-            无使用门槛            
+
+
+            <view class="coupon-explain t-c" wx:if="{{item.BuySum>0}}">
+                满{{item.BuySum}}元可用
             </view>
-          <view class="coupon-explain t-c" wx:if="{{item.BuySum>0}}"> 
-            {{UseObjectName}}
+            <view class="coupon-explain t-c" wx:else>
+                满0元可用
             </view>
 
           </view>
@@ -360,9 +362,7 @@
                       <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>
-                       <block wx:if="{{item.buy_sum>0}}">满{{item.buy_sum}}减{{item.Sum}}优惠券</block>
-                       <block wx:else>全场通用减{{item.Sum}}优惠券</block>
-                          <!-- </view> -->
+                      <block>{{item.Sum}}元优惠券</block>
                     </view>
                     <view class="coupon-time">
                     {{filters.replace_time2(item.BeginDate)}}至{{filters.replace_time2(item.BillDate)}}</view>
@@ -425,9 +425,7 @@
     <view class="cx-popup radius {{open_express==1?'up' : 'down'}}" >
         <view class="tops flex">
             <view class="top-content fs32">
-                <view>
-                    选择物流名字
-                </view>
+                <view>选择物流名字</view>
             </view>
             <view class="close-frame"  bindtap='close_express' >
                 <view class="xc-close-express">×</view>
diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js
index e8269c1..cde3db4 100644
--- a/pages/cart/cart2_pt/cart2_pt.js
+++ b/pages/cart/cart2_pt/cart2_pt.js
@@ -338,7 +338,6 @@ Page({
          });
       });
     },
-
     //--------------------提交订单-----------------------
     submitForm:function(t){
         if(this.data.is_summit_ing==1) return false; //--提交中退出--
@@ -469,7 +468,7 @@ Page({
                     util_pay.pay(data.data, function() {
                         setTimeout(function () {
                             wx.navigateTo({
-                                url: "/pages/payment/pay_success/pay_success?type="+1+"&order_sn="+data.data,
+                                url: "/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data,
                             })
                         },1000)
                     }, function () {
@@ -496,9 +495,12 @@ Page({
                         th.setData({ isclose: 0 });
 
                         if(th.data.is_normal==1){
+                            /*--
                             wx.navigateTo({
                               url: "/pages/user/order_list/order_list",
-                            })
+                            })--*/
+                            var url="/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data;
+                            getApp().goto(url);
                         }else{
                             wx.navigateTo({
                               url: "/pages/team/team_success/team_success?ordersn=" + data.data,
diff --git a/pages/goods/categoryList/categoryList.js b/pages/goods/categoryList/categoryList.js
index a176505..89c9478 100644
--- a/pages/goods/categoryList/categoryList.js
+++ b/pages/goods/categoryList/categoryList.js
@@ -428,7 +428,14 @@ Page({
     _errObj[_errImg] = this.data.iurl+"/miniapp/images/default_g_img.gif";
     this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;  
   },
-  //商品图片失败，默认图片
+    //图片失败，默认图片
+    bind_bnerr_pp: function (e) {
+        var _errImg = e.target.dataset.errorimg;
+        var _errObj = {};
+        _errObj[_errImg] = this.data.iurl+"/miniapp/images/no_brand_def.jpg\n";
+        this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+    },
+    //商品图片失败，默认图片
   goods_bnerr: function (e) {
     var _errImg = e.target.dataset.err; 
     var _errObj = {};
diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml
index c66972e..5f55063 100644
--- a/pages/goods/categoryList/categoryList.wxml
+++ b/pages/goods/categoryList/categoryList.wxml
@@ -186,7 +186,7 @@
          <view class="brand_img_frame "wx:for="{{brand_list.array}}"wx:for-item="user" wx:for-index="idx" bindtap="go_brand" data-bid="{{user.id}}" >
 
             <view class="brand_img t-c">
-               <image class=" brand_img" src="{{user.logo}}"data-errorimg="groups[{{pidx}}].array[{{idx}}].logo" binderror="bind_bnerr"></image>
+               <image class=" brand_img" src="{{user.logo}}"data-errorimg="groups[{{pidx}}].array[{{idx}}].logo" binderror="bind_bnerr_pp"></image>
                 <view class="brand_img_name ellipsis-2 fs24">{{user.name}}</view>
            </view>
          </view>
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 216297c..ee23483 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -230,7 +230,8 @@ Page({
     default_store: {}, //创建添加默认门店地址的对象
 
     comments_no_more:0,
-    get_c:0,
+    get_c:0,               //获取评价是不是成
+    is_collect_load:0,     //是不是处理
   },
 
   //------初始化加载----------
@@ -986,9 +987,14 @@ Page({
       getApp().showWarning("未登录");
       return false;
     } else {
+
+      if(t.data.is_collect_load) return false;
+      t.data.is_collect_load=1;
+
       if (t.data.is_collect == 1) { //删除收藏
         i.delete("/api/weshop/goodscollect/del/" + o.stoid + "/" + t.data.collect_id, {
           success: function(e) {
+            t.data.is_collect_load=0;
             if (e.data.code == 0) {
               t.setData({
                 is_collect: 0,
@@ -1009,6 +1015,7 @@ Page({
         i.post("/api/weshop/goodscollect/save", { //添加收藏
           data: d,
           success: function(e) {
+            t.data.is_collect_load=0;
             if (e.data.code == 0) {
               t.setData({
                 is_collect: 1,
@@ -2879,7 +2886,7 @@ Page({
       activeCategoryId3: val,
       comments: null
     });
-    this.requestComments();
+    this.requestComments_new();
   },
 
   //--跳转到商品详情页面--
@@ -3060,17 +3067,14 @@ Page({
       th.setData({
         openSpecModal: !0,
         openSpecModal_ind: openindstore,
-
-        openSpecModal_pt:1
       });
     } 
-    
     else if (openindstore == 4) { //4就是拼团
       th.setData({
         openSpecModal_pt: 1,      //打开拼团购买界面        
-        store: 0,                 //关闭门店       
+        store: 0,                 //关闭门店
         choice_sort_store: 0,     //关闭门店2级
-        sort_store: 0,             //关闭门店2级  
+        sort_store: 0,             //关闭门店2级
       });
     }
     
@@ -3122,16 +3126,16 @@ Page({
         def_pickup_id
       },
       success: function(res) {
-
         if (res.data.code == 0) {
           if (th.data.choice_sort_store == 0) th.setData({
             fir_pick_index: 0
           });
-          s.showWarning("设置门店地址成功", null, 500, !1);
+          //s.showWarning("设置门店地址成功", null, 500, !1);
           getApp().globalData.pk_store = item;
         } else {
           console.log("门店地址失败");
-          s.showWarning("设置默认门店地址失败", null, 500, !1);
+          //s.showWarning("设置默认门店地址失败", null, 500, !1);
+          getApp().my_warnning("设置默认门店地址失败",0,th)
         }
 
       }
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 2e3fd81..3112e58 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -783,14 +783,12 @@
           <view class="flex ai_end xc-val-money">
           <view class="spec-goods-price" wx:if="{{prom_price==null}}"><text class="fs20">￥</text>{{sele_g.shop_price}}</view>
           <view class="spec-goods-price" wx:else><text class="fs20">￥</text>{{prom_price}}</view>
-         
         </view>
        
           <block wx:if="{{prom_type==0}}">
           <view class="flex">
             <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view>
             <view class="spec-goods-stock">可售：{{sele_g.store_count}}</view>
-
        
             </view>
           </block>
@@ -891,26 +889,36 @@
   <view class="spec-model">
     <view class="pding">
       <icon bindtap="closeSpecModal" class="modal-close" color="gray" size="22" type="cancel"></icon>
+
+      <!-- 商品名称 -->
       <view class="spec-goods">
-        <image class="wh100 spec-img" src="{{data.original_img}}"  binderror="pop_err_img"  data-errorimg="data.original_img"></image>
+        <image class="wh100 spec-img xc-distance-bottom" src="{{data.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image>
         <view class="spec-goods-info">
-          <!-- <view class="spec-goods-name ellipsis-1">{{data.goods_name}}</view> -->
-          <view class="spec-goods-price" wx:if="{{is_normal==1}}">￥ {{sele_g.shop_price}}</view>
-          <view class="spec-goods-price" wx:else>￥ {{prom_price}}</view>
+          <view class="spec-goods-name ellipsis-1">{{sele_g.goods_name}}</view>
+          <view class="flex ai_end xc-val-money">
+            <view class="spec-goods-price" wx:if="{{is_normal==1}}">￥ {{sele_g.shop_price}}</view>
+            <view class="spec-goods-price" wx:else>￥ {{prom_price}}</view>
+          </view>
 
-          <block wx:if="{{is_normal==0}}">
-            <view class="spec-goods-stock">已售：{{prom_act.buy_num}}</view>
-            <view class="spec-goods-stock">可售：{{prom_act.goods_num-prom_act.buy_num}}</view>
-            <view class="spec-goods-stock">已选：{{sele_g.gg}}</view>
+          <block wx:if="{{is_normal==1}}">
+            <view class="flex">
+              <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view>
+              <view class="spec-goods-stock">可售：{{sele_g.store_count}}</view>
+            </view>
           </block>
-          <block wx:else>
-            <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view>
-            <view class="spec-goods-stock">可售：{{sele_g.store_count}}</view>
-            <view class="spec-goods-stock">已选：{{sku_g_pt[0].gg}}</view>
+          <block wx:if="{{is_normal==0}}">
+            <view class="flex">
+              <view class="spec-goods-stock" wx:if="{{prom_st>0}}">已售：{{prom_act.buy_num}}</view>
+              <view class="spec-goods-stock" wx:else >已售：{{prom_act.buy_num}}</view>
+              <view class="spec-goods-stock">可售：{{prom_act.goods_num-prom_act.buy_num}}</view>
+            </view>
           </block>
         </view>
+
       </view>
 
+
+
       <view style="clear: both"></view>
       <view style="margin-top: 20rpx">
         <view  class="flex-space-between address ai_end xc-width ">
@@ -956,8 +964,7 @@
      </view>
 
 
-      <view>
-
+     <view>
         <!--<view bindtap="getmendian" class="quhuo logistics-item" hidden="{{ismend==1}}">-->
           <!--<view wx:if="{{sto_sele_name==''}}">取货门店-->
             <!--<text class='small'>（选择门店）</text>-->
@@ -1243,7 +1250,6 @@
   </view>
 </block>  
 
-
 <!--  ---------------分享弹窗--------------- -->
 <!--二维码显示页面-->
 <canvas canvas-id='share' style='width:750rpx;height:1217rpx;' wx:if='{{!canvasHidden}}'></canvas>
diff --git a/pages/payment/pay_success/pay_success.js b/pages/payment/pay_success/pay_success.js
index 4f5bb90..a48406b 100644
--- a/pages/payment/pay_success/pay_success.js
+++ b/pages/payment/pay_success/pay_success.js
@@ -37,11 +37,11 @@ Page({
           await  getApp().request.promiseGet("/api/weshop/order/page",
               {data:{store_id:e.globalData.setting.stoid,parent_sn:order_sn}}).then(res=>{
 
-              var allmoney=0;
+              var allmoney=0,user_money=0;
               for(var i in res.data.data.pageData){
                   var item=res.data.data.pageData[i];
                   allmoney+=item.order_amount;
-                  user_money += item.user_money;
+                  user_money += item.user_money?item.user_money:0;
               }
               order=res.data.data.pageData[0];
                 th.setData({ order: order, type: 2, allmoney: allmoney, order_sn: order_sn, user_money: user_money})
diff --git a/pages/payment/pay_success/pay_success.wxml b/pages/payment/pay_success/pay_success.wxml
index 878c01c..3623006 100644
--- a/pages/payment/pay_success/pay_success.wxml
+++ b/pages/payment/pay_success/pay_success.wxml
@@ -25,19 +25,28 @@
       <view class="payitem flex">
         <view>实付金额 :</view>
         <!-- {{filters.toFix()}} -->
-        <view class="pay_money" wx:if="{{type==1}}">{{filters.toFix(order.order_amount+order.user_money+order.pt_tail_money)}}元</view>
-        <view class="pay_money" wx:else>{{filters.toFix(allmoney+user_money,2)  }}元</view>
+        <view class="pay_money" wx:if="{{type==1}}">{{filters.toFix(order.order_amount+order.user_money+order.pt_tail_money,2)}}元</view>
+        <view class="pay_money" wx:else>{{filters.toFix(allmoney+user_money,2) }}元</view>
       </view>
 
       <!-- 支付方式 -->
-      <view class="payitem flex">
-        <view>支付方式 :</view>    
+      <view class="payitem flex" wx:if="type==1">
+        <view>支付方式 :</view>
+        <view wx:if="{{order.order_amount>0 && order.user_money>0 }}">微信支付,余额支付</view>
+        <view wx:elif="{{order.order_amount>0}}">微信支付</view>
+        <view wx:elif="{{order.user_money>0}}">余额支付</view>
+        <view wx:else>免单</view>
+      </view>
+      <view class="payitem flex"  wx:else>
+          <view>支付方式 :</view>
           <view wx:if="{{allmoney>0 && user_money>0 }}">微信支付,余额支付</view>
-          <view wx:elif="{{allmoney>0}}">微信支付,余额支付</view>
-          <view wx:elif="{{user_money>0}}">微信支付,余额支付</view>
+          <view wx:elif="{{allmoney>0}}">微信支付</view>
+          <view wx:elif="{{user_money>0}}">余额支付</view>
           <view wx:else>免单</view>
       </view>
 
+
+
     </view>
   </view>
   <view class="flex-level">