diff --git a/packageA/pages/distribution/myteam/myteam.wxml b/packageA/pages/distribution/myteam/myteam.wxml
index 445c02c..23f27bb 100644
--- a/packageA/pages/distribution/myteam/myteam.wxml
+++ b/packageA/pages/distribution/myteam/myteam.wxml
@@ -11,7 +11,7 @@
 				<view>
 					<view>
 						{{item.nickname}}
-						<view style="color: #FF6768;display:block;" wx:if="{{item.is_distribut == 1}}">分销会员</view>
+						<view style="color: #FF6768;display:block;font-size:26rpx" wx:if="{{item.is_distribut == 1}}">分销会员</view>
 						<view style="color: #FF6768;display:block;" wx:else>普通会员</view>
 					</view>
 					<view class="fs24 c-a">{{filter.format_time(item.reg_time)}}</view>
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js
index eb94f46..816801e 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.js
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.js
@@ -420,13 +420,14 @@ Page({
         })
       }
     });
+
+
     //更新点击量
     getApp().request.put("/api/weshop/goods/updateClick", {
       data: { store_id: os.stoid, goods_id: gid }
     })
   },
 
-
   //--- 设置一下默认库存的数量 ----
   set_def_storage(ee) {
     var that = this, th = this;
@@ -799,6 +800,7 @@ Page({
 
           }
           else {
+            console.log('xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')
             wx.showModal({
               title: t.data.msg,
               showCancel: !1,
diff --git a/packageC/pages/presell/list/list.wxml b/packageC/pages/presell/list/list.wxml
index 3deb8f2..30665c7 100644
--- a/packageC/pages/presell/list/list.wxml
+++ b/packageC/pages/presell/list/list.wxml
@@ -78,7 +78,8 @@
   <view class="no-more" wx:elif="{{no_more}}">-- 没有更多 --</view>
   <view style="height:10rpx"></view>
 
-  <!-- 底部按钮 -->
+  <!-- 底部按钮 暂时隐藏-->
+  <!--
   <view class="kill-time xc-seckill-bottom">
     <view class="theader" >
         <view bindtap='tip' data-ty="1" class="xc-border-right flex-center timeac left {{type==1?'active':''}}">
@@ -93,7 +94,7 @@
 
     </view>
 </view>
-
+-->
 
 </view>
 
diff --git a/pages/goods/search/g_filter.wxs b/pages/goods/search/g_filter.wxs
index 814e187..7b575ba 100644
--- a/pages/goods/search/g_filter.wxs
+++ b/pages/goods/search/g_filter.wxs
@@ -84,7 +84,8 @@ var g_filters = {
 
         		get_goods_url:function(item){
 
-        		   var url1="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id
+							 var url1="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id
+							//  预售活动
         		   if(item.prom_type==8){
         		      url1="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id
         		   }
diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index a8a3b1e..811eae6 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -334,8 +334,11 @@ Page({
 
     //--------立即支付----------
     async jumpToCart4(e) {
-			
-		var th=this;	
+
+        if(this.data.paying) return false;
+        this.setData({paying:1});
+
+        var th=this;
         if(this.data.optionIsGoup) 
 		     wx.navigateTo({
                  url: "/pages/team/team_confirm/team_confirm?orderSn=" + this.data.order.order_sn + "&orderPay=true"
@@ -353,6 +356,7 @@ Page({
 				   title: '提示',
 				   content: '线下取价功能已经关闭或者过期！'
 				 });
+                th.setData({paying:0});
 				 return false;
 		}	
 		
@@ -385,9 +389,10 @@ Page({
 			var buyed_mum2=goodsbuynum+good.goods_num;		
 			if (buyed_mum2 > limit && limit > 0) {
 			 
-			  var content=gg.goods_name+'购买数量超出商品限购,请取消订单';
-			  th.toast(content);
-			  return false;
+			   var content=gg.goods_name+'购买数量超出商品限购,请取消订单';
+			   th.toast(content);
+               th.setData({paying:0});
+			    return false;
 			}
             //当是组合优惠的时候
             if(good.prom_type==7){
@@ -421,7 +426,8 @@ Page({
                 if (!isok){
                     var  content=gg.goods_name+'活动已经结束,请取消订单';
                     th.toast(content);
-                    return false;
+                    th.setData({paying:0});
+                     return false;
                 }
 
                 var url1 = "/api/weshop/prom/zhbuyGoods/page";
@@ -450,6 +456,7 @@ Page({
 
                         var  content= good['goods_name']+"超出活动限购\n";
                         th.toast(content);
+                        th.setData({paying:0});
                         return false;
                     }
                 }
@@ -493,6 +500,7 @@ Page({
 
                             var content = good.goods_name + '未找到活动,请取消订单重新购买'
                             th.toast(content);
+                            th.setData({paying:0});
                             p_ok = 0;
                         }
                     })
@@ -522,7 +530,9 @@ Page({
                     })
 
                 }
-                if (!p_ok) return false;
+                if (!p_ok){
+                    th.setData({paying:0});return false;
+                }
 			}
 								
 			//商品的普通购买 ，不要进行判断
@@ -530,7 +540,8 @@ Page({
 				   if(gg.prom_type!=good.prom_type && gg.prom_type>0)	{
 					   var content=gg.goods_name+'商品的活动发生了变化,请取消订单重新购买';
 					   th.toast(content);
-					   return false;		   
+                       th.setData({paying:0});
+					    return false;
 				   }
 			  }else{
 				  if((gg.prom_type==1 || gg.prom_type==3 || gg.prom_type==5 || gg.prom_type==6 || gg.prom_type==4)
@@ -581,9 +592,10 @@ Page({
 				  					  var t_now=ut.gettimestamp();
 				  					  if(prom.is_end==0 && prom.start_time<t_now && prom.end_time>t_now){
 				  						  
-				  						  var  content=gg.goods_name+'商品的活动发生了变化,请取消订单重新购买';
-				  						  th.toast(content);
-				  						  return false;	
+				  						   var  content=gg.goods_name+'商品的活动发生了变化,请取消订单重新购买';
+				  						   th.toast(content);
+                                           th.setData({paying:0});
+				  						   return false;
 				  					  }
 				  				  } 				  
 				  }else{
@@ -602,7 +614,9 @@ Page({
 									  }
 								  }
 							  })
-							  if(!t_ok) return false;
+							  if(!t_ok) {
+                                  th.setData({paying:0});return false;
+                              }
 						  }
 
 						  //-- 如果有参加线下取价 --		  
@@ -626,7 +640,8 @@ Page({
 		                 
 		                  var content=gg.goods_name + '商品的价格发生了变化,请取消订单重新购买22';
 		                  th.toast(content);
-		                  return false;
+                          th.setData({paying:0});
+		                   return false;
 		              }
 		          }
 				
@@ -637,17 +652,18 @@ Page({
 						   ob=obj;
 					   })
 					   if(ob.code==-1){
-						 
 						   var content=gg.goods_name+'门店库存不足,请取消订单';
 						   th.toast(content);
-						   return false;		
+                           th.setData({paying:0});
+						    return false;
 					   }				   
 					   
 				  }else{
 					  if(good.goods_num>store_count){
 						  
-						   var content=gg.goods_name+'商品的库存不足,请取消订单';
-						   th.toast(content);
+						  var content=gg.goods_name+'商品的库存不足,请取消订单';
+						  th.toast(content);
+                          th.setData({paying:0});
 						   return false;		
 					  }
 					  
@@ -703,41 +719,46 @@ Page({
 			  				
 			  				var content=goodsinfo.goods_name+'商品的活动已经结束,请取消订单重新购买';
 			  				th.toast(content);
+                            th.setData({paying:0});
 			  				return false;		
 			  			  }
 			  			  
 			  			  buyed_mum2=promgoodsbuynum+good.goods_num;
 			  			  if (buyed_mum2 > prom.buy_limit && prom.buy_limit > 0) {
-			  			   
-			  			    var content=goodsinfo.goods_name+'购买数量超出商品活动限购,请取消订单重新购买';
-			  			    th.toast(content);
-			  			    return false;
+			  			     var content=goodsinfo.goods_name+'购买数量超出商品活动限购,请取消订单重新购买';
+			  			     th.toast(content);
+                              th.setData({paying:0});
+			  			      return false;
 			  			  }
 			  			  //看一下会员的秒杀价格是不是发生了变化
                           if(goodsinfo.prom_type==1 && goodsinfo.goods_price!=prom.price){
                                var content=goodsinfo.goods_name+'秒杀活动的价格发生了变化';
                                th.toast(content);
+                               th.setData({paying:0});
                                return false;
                           }
 						  
 						  //看一下会员的团购价格是不是发生了变化
 						  if(goodsinfo.prom_type==2 && goodsinfo.goods_price!=prom.price){
-						       var content=goodsinfo.goods_name+'秒杀活动的价格发生了变化';
-						       th.toast(content);
+						      var content=goodsinfo.goods_name+'秒杀活动的价格发生了变化';
+						      th.toast(content);
+                              th.setData({paying:0});
 						       return false;
 						  }
 
 			  			  if(goodsinfo.prom_type==4){
 			  				  if (good.goods_num > prom.limitqty-prom.buy_num) {
 			  				   
-			  				    var content=goodsinfo.goods_name+'购买数量超出商品活动库存,请取消订单';
-			  				    th.toast(content);
-			  				    return false;
+			  				      var content=goodsinfo.goods_name+'购买数量超出商品活动库存,请取消订单';
+			  				      th.toast(content);
+                                  th.setData({paying:0});
+			  				       return false;
 			  				  }				  
 			  			  }else if(goodsinfo.prom_type == 1 || goodsinfo.prom_type == 2 || goodsinfo.prom_type == 6 ) {
 								if(order.add_time+5*60<ut.gettimestamp()) {
 									var content = gg.goods_name + '该订单已经超时无法支付,请取消订单';
 									th.toast(content);
+                                    th.setData({paying:0});
 									return false;
 								}
 						}
@@ -751,7 +772,9 @@ Page({
 			wlist=ut.sub_last(wlist);
 			var keyid=order.pickup_id;
 			var user_info=getApp().globalData.userInfo;
-			if(!keyid) return false;	
+			if(!keyid) {
+                th.setData({paying:0});return false;
+            }
 			var offarr=null;	
 			await getApp().request.promiseGet("/api/weshop/goods/listWarePrice", {
 			       data:{
@@ -776,8 +799,9 @@ Page({
 				if(newarr[good.erpwareid] && 
 				   parseFloat(newarr[good.erpwareid].WarePrice)!=parseFloat(good.goods_price)){		
 					
-					 var content=good.goods_name + '商品的价格发生了变化,请取消订单重新购买';
-					 th.toast(content);
+					var content=good.goods_name + '商品的价格发生了变化,请取消订单重新购买';
+					th.toast(content);
+                    th.setData({paying:0});
 					 return false;	
 				}
 			}	
@@ -792,9 +816,12 @@ Page({
         }, 1);--*/
 
         py.pay(this.data.order.order_sn, function() {
+            th.setData({paying:0});
             wx.showToast({title: '支付成功'})
 			wx.navigateBack();
-        },null,os.stoid,1);
+        },function () {
+            th.setData({paying:0});
+        },os.stoid,1);
 
 
     },
diff --git a/pages/user/order_detail/order_detail.wxml b/pages/user/order_detail/order_detail.wxml
index 36ab62f..72ce859 100644
--- a/pages/user/order_detail/order_detail.wxml
+++ b/pages/user/order_detail/order_detail.wxml
@@ -150,7 +150,10 @@
     <view class="btn-wrap">
 
         <view bindtap="zfwk" class="tips-btn" wx:if="{{order.pt_tail_money>0 && order.pt_status==2 }}">支付尾款</view>
-        <view bindtap="jumpToCart4" class="tips-btn" hidden="{{!order.pay_btn}}">立即付款</view>
+        <view bindtap="jumpToCart4" class="tips-btn" hidden="{{!order.pay_btn}}">
+            <text wx:if="{{paying}}">支付中</text>
+            <text wx:else>立即付款</text>
+        </view>
 
         <block wx:if="{{!(order.has_rt || order.return_btn==2 || order.return_btn==4)}}">
            <navigator bindtap="confirmOrder" class="tips-btn" hidden="{{!order.receive_btn}}">收货确认</navigator>
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index 33661b6..ea0e942 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -485,6 +485,9 @@ Page({
     /*----------跳转支付-----------*/
     async jumpToCart4(t) {
 
+        if(this.data.paying) return false;
+        this.setData({paying:1});
+
         var o_index = t.currentTarget.dataset.idx;
         var e = this.data.orderList[o_index];
         var th = this;
@@ -506,6 +509,7 @@ Page({
 
             if (knum <= 0) {
                 getApp().confirmBox("库存为0，支付失败");
+                th.setData({paying:0});
                 return false;
             }
 
@@ -520,6 +524,7 @@ Page({
                     title: '提示',
                     content: '线下取价功能已经关闭或者过期！'
                 });
+                th.setData({paying:0});
                 return false;
             }
             
@@ -553,6 +558,7 @@ Page({
             if (buyed_mum2 > limit && limit > 0) {
                 var content = gg.goods_name + '购买数量超出商品限购,请取消订单';
                 th.toast(content);
+                th.setData({paying:0});
                 return false;
             }
             //当是组合优惠的时候
@@ -587,6 +593,7 @@ Page({
                 if (!isok) {
                     var content = gg.goods_name + '活动已经结束,请取消订单';
                     th.toast(content);
+                    th.setData({paying:0});
                     return false;
                 }
 
@@ -613,6 +620,7 @@ Page({
                     if (good.goods_num + promgoodsbuynum > good['buyqty']) {
                         var content = good['goods_name'] + "超出活动限购\n";
                         th.toast(content);
+                        th.setData({paying:0});
                         return false;
                     }
                 }
@@ -650,12 +658,14 @@ Page({
                     if(good.goods_num>presellList.presell_sumqty-presellList.buy_goodnum){
                         var content = good.goods_name + '购买数量超出商品库存,请取消订单';
                         th.toast(content);
+                        th.setData({paying:0});
                         return false;
                     }
                     var buyed_mum3 = promgoodsbuynum + good.goods_num;
                     if (buyed_mum3 > presellList.vip_butyqty && presellList.vip_butyqty > 0) {
                         var content = good.goods_name + '购买数量超出商品限购,请取消订单';
                         th.toast(content);
+                        th.setData({paying:0});
                         return false;
                     }
 
@@ -729,7 +739,10 @@ Page({
                     })
 
                 }
-                if (!p_ok) return false;
+                if (!p_ok){
+                    th.setData({paying:0});
+                    return false;
+                }
             }
 
             //商品的普通购买 ，不要进行判断
@@ -738,6 +751,7 @@ Page({
                 if (gg.prom_type != good.prom_type && gg.prom_type>0) {
                     var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买';
                     th.toast(content);
+                    th.setData({paying:0});
                     return false;
                 }
 
@@ -790,6 +804,7 @@ Page({
 
                             var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买';
                             th.toast(content);
+                            th.setData({paying:0});
                             return false;
                         }
                     }
@@ -808,7 +823,9 @@ Page({
                                 }
                             }
                         })
-                        if (!t_ok) return false;
+                        if (!t_ok){
+                            th.setData({paying:0}); return false;
+                        }
                     }
                     //-- 如果有参加线下取价 --
                     if (good.offline_cut > 0) wlist += encodeURIComponent(gg.erpwareid) + ",";
@@ -832,6 +849,7 @@ Page({
 
                         var content = gg.goods_name + '商品的价格发生了变化,请取消订单重新购买1'
                         th.toast(content);
+                        th.setData({paying:0});
                         return false;
                     }
                 }
@@ -846,6 +864,7 @@ Page({
 
                         var content = gg.goods_name + '门店库存不足,请取消订单';
                         th.toast(content);
+                        th.setData({paying:0});
                         return false;
                     }
 
@@ -854,6 +873,7 @@ Page({
 
                         var content = gg.goods_name + '商品的库存不足,请取消订单';
                         th.toast(content);
+                        th.setData({paying:0});
                         return false;
                     }
 
@@ -905,6 +925,7 @@ Page({
                 if (prom.is_end == 1 && prom.end_time < now) {
                     var content = goodsinfo.goods_name + '商品的活动已经结束,请取消订单'
                     th.toast(content);
+                    th.setData({paying:0});
                     return false;
                 }
 
@@ -913,6 +934,7 @@ Page({
 
                     var content = goodsinfo.goods_name + '购买数量超出商品活动限购,请取消订单'
                     th.toast(content);
+                    th.setData({paying:0});
                     return false;
                 }
 
@@ -920,6 +942,7 @@ Page({
                 if(goodsinfo.prom_type==1 && goodsinfo.goods_price!=prom.price){
                     var content=goodsinfo.goods_name+'秒杀活动的价格发生了变化';
                     th.toast(content);
+                    th.setData({paying:0});
                     return false;
                 }
 				
@@ -927,6 +950,7 @@ Page({
 				if(goodsinfo.prom_type==2 && goodsinfo.goods_price!=prom.price){
 				    var content=goodsinfo.goods_name+'秒杀活动的价格发生了变化';
 				    th.toast(content);
+                    th.setData({paying:0});
 				    return false;
 				}
 
@@ -935,12 +959,14 @@ Page({
 
                         var content = goodsinfo.goods_name + '购买数量超出商品活动库存,请取消订单'
                         th.toast(content);
+                        th.setData({paying:0});
                         return false;
                     }
                 } else if(goodsinfo.prom_type == 1 || goodsinfo.prom_type == 2 || goodsinfo.prom_type == 6 ) {	
                     if(order.add_time+5*60<ut.gettimestamp()) {
                         var content = gg.goods_name + '该订单已经超时无法支付,请取消订单';
                         th.toast(content);
+                        th.setData({paying:0});
                         return false;
 					}          
                 }
@@ -953,7 +979,9 @@ Page({
             wlist = ut.sub_last(wlist);
             var keyid = order.pickup_id;
             var user_info = getApp().globalData.userInfo;
-            if (!keyid) return false;
+            if (!keyid){
+                th.setData({paying:0});return false;
+            }
             var offarr = null;
             await getApp().request.promiseGet("/api/weshop/goods/listWarePrice", {
                     data: {
@@ -981,6 +1009,7 @@ Page({
 
                     var content = good.goods_name + '商品的价格发生了变化,请取消订单重新购买';
                     th.toast(content);
+                    th.setData({paying:0});
                     return false;
                 }
             }
@@ -1000,13 +1029,15 @@ Page({
 	    getApp().request.post("/api/weshop/order/pay/createOrder", {
 	      data: dd,
 	      success: function(t) {
-	        if (t.data.code == 0) {
+            th.setData({paying:0});
+            if (t.data.code == 0) {
 	          th.onload();
 	        } else {
 	          getApp().confirmBox(t.data.msg + "请您取消该订单");
 	        }
 	      }
 	    })
+
 	    return false;
 	  }
 
@@ -1018,10 +1049,13 @@ Page({
 	  });--*/
 
       t.pay(e.order_sn, function() {
+          th.setData({paying:0});
           wx.showToast({title: '支付成功'})
           th.data.orderList.splice(o_index,1);
           th.setData({orderList:th.data.orderList});
-      },null,os.stoid,1);
+      },function () {
+          th.setData({paying:0});
+      },os.stoid,1);
 
 
   },
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index 9bc26c9..98c314a 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -241,7 +241,10 @@
 	
 	
 	          <navigator class="commodity_To_evaluate flex-level comment_go" url="/pages/cart/cart_wk/cart_wk?order_id={{item.order_id}}" data-idx="{{index}}" wx:if="{{item.pt_status==2 && item.pt_tail_money>0}}">支付尾款</navigator>
-	          <navigator class="commodity_To_evaluate flex-level comment_go" bindtap="jumpToCart4" data-idx="{{index}}" wx:if="{{(item.order_status==0&&item.pay_status==0)}}">立即支付</navigator>
+	          <navigator class="commodity_To_evaluate flex-level comment_go" bindtap="jumpToCart4" data-idx="{{index}}" wx:if="{{(item.order_status==0&&item.pay_status==0)}}">
+				<text wx:if="{{paying}}">支付中</text>
+				<text wx:else>立即支付</text>
+			  </navigator>
 			  
 			  <!-- 积分购  拼团 搭配购没有有再来一单 -->
 			  <block wx:if="{{(item.pay_status==1 || item.order_status==3) && !item.presell && item.pt_prom_id<=0 && item.integral<=0 && item.order_goods[0].prom_type!=5 && !(item.order_goods[0].prom_type==9)}}">