Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

后端研发-苏泰源
2 parents 2a921062 0e2bcd18
Showing 15 changed files with 343 additions and 212 deletions
packageA/pages/checkin/checkin.wxml
packageA/pages/distribution/myteam/myteam.wxml
packageB/pages/zuhegou/index/index.js
packageC/pages/group_list/group_list.wxml
packageC/pages/presell/goodsInfo/goodsInfo.js
packageC/pages/presell/list/list.wxml
pages/cart/cart/zh_calculate.js
pages/cart/cart2/zh_calculate.js
pages/goods/goodsInfo/goodsInfo.js
pages/goods/search/g_filter.wxs
pages/team/team_success/team_success.js
pages/user/order_detail/order_detail.js
pages/user/order_detail/order_detail.wxml
pages/user/order_list/order_list.js
pages/user/order_list/order_list.wxml
@@ -91,41 +91,40 @@
 	</view>
 	<view class="jfbuy-container">
-		<view class="jfbuy flex">
-			<!-- <image class="jfbuy-img" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/integral/liwu.png"></image> -->
-			<!-- <view class="right">
-				<view>
-					<view class="t1">小积分大作为</view>
-					<view class="t2">积分抵用现金，积少成多</view>
-				</view>
-				<view class="t-c">
-					<view class="btn-buy" bindtap="goto" data-url="/packageA/pages/jfbuy/jfbuy">去购物 Go!</view>
-				</view>
-			</view> -->
-			<block wx:if="{{ad_data}}">
-				<swiper class="swiper" circular="true" autoplay="true" indicator-dots="true" interval="2500" style="height:240rpx;width: 670rpx;">
-					<block wx:for="{{ad_data}}">
-						<navigator url="{{item.ad_weapplink}}"  wx:if="{{g_filter.has_char(item.ad_weapplink,'plugin')>=0}}">
-							<swiper-item>
-								<image src="{{item.ad_code}}" style="width: 100%;height: 240rpx;" data-index="{{index}}" class="slide-image" mode="widthFix" lazy-load="true" />
-							</swiper-item>
-						</navigator>
+		<block wx:if="{{ad_data}}">
+			<swiper class="swiper" circular="true" autoplay="true" indicator-dots="true" interval="2500">
+				<block wx:for="{{ad_data}}">
+					<navigator url="{{item.ad_weapplink}}" wx:if="{{g_filter.has_char(item.ad_weapplink,'plugin')>=0}}">
+						<swiper-item>
+							<image src="{{item.ad_code}}" data-index="{{index}}" class="slide-image" mode="widthFix" lazy-load="true" />
+						</swiper-item>
+					</navigator>
-						<view data-url="{{item.ad_weapplink}}" wx:else bindtap="go_url">
-							<swiper-item>
-								<image src="{{item.ad_code}}" style="width: 100%;height: 240rpx;" class="slide-image" mode="widthFix" lazy-load="true" />
-							</swiper-item>
-						</view>
+					<view data-url="{{item.ad_weapplink}}" wx:else bindtap="go_url">
+						<swiper-item>
+							<image src="{{item.ad_code}}" class="slide-image" mode="widthFix" lazy-load="true" />
+						</swiper-item>
+					</view>
+				</block>
+			</swiper>
+		</block>
+		<block wx:else>
+			<view class="jfbuy flex">
-					</block>
-				</swiper>
+				<image class="jfbuy-img" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/integral/liwu.png"></image>
+				<view class="right">
+					<view>
+						<view class="t1">小积分大作为</view>
+						<view class="t2">积分抵用现金，积少成多</view>
+					</view>
+					<view class="t-c">
+						<view class="btn-buy" bindtap="goto" data-url="/packageA/pages/jfbuy/jfbuy">去购物 Go!</view>
+					</view>
+				</view>
+			</view>
-			</block>
-			<block wx:else>
-				<image class="xc-top-img" src="{{url}}/miniapp/images/seckill_top_img.jpg"></image>
-			</block>
-		</view>
+		</block>
 	</view>
 	<view class="popup-container" wx:if="{{isShowRules}}">
@@ -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>
@@ -1914,7 +1914,7 @@ Page({
         var need_to_buy = 0;
         var data = this.data.list;
         var all_zhqty = 0; //所有商品要求起购数之后
-        var zhqty_bz=[]; //超量
+        var zhqty_bz = []; //超量
         var no_in_arr = [];
         for (var i in data) {
             var item = data[i];
@@ -1965,91 +1965,107 @@ Page({
             //看一下剩下的数量有没有满足组合购的要求，以及要不要倍增
             if (this.data.act.is_bz && no_in_arr.length >= this.data.act.zhbuyqty) {
-                var bz_num_ok=0; //超量倍增是否满足
-                var delete_num=0;
-                var zhqty_len=0; //几个超量倍增
+                var bz_num_ok = 0; //超量倍增是否满足
+                var delete_num = 0;
+                var zhqty_len = 0; //几个超量倍增
                 var be = parseInt(no_in_arr.length / this.data.act.zhbuyqty); //看一下是几倍
-                if(this.data.act.is_bzyh && zhqty_bz.length > 0 ){
-                    if(zhqty_bz.length>1){
-                        zhqty_len=1;
-                        let min_bz_num= Math.min.apply(Math, zhqty_bz.map(function(o) {return o['num']}));
-                        let new_arr=zhqty_bz.filter(ii=>{
-                            return ii['num']==min_bz_num
+                if (this.data.act.is_bzyh && zhqty_bz.length > 0) {
+                    if (zhqty_bz.length > 1) {
+                        let zhqty_bz_arr = [];
+                        let zhqty_bz_flag = zhqty_bz.every((item1, i) => {
+                            var bz_num = be * item1['zhqty']; //超量倍增
+                            var num = item1['num'] - item1['zhqty']; //购买数量减去超量
+                            if (bz_num > num) {
+                                zhqty_bz_arr.push(item1);
+                                zhqty_bz.splice(i, 1)
+                            }
+                            return bz_num <= num;
                         })
-                        var vv=new_arr[0];
-                        // be=new_arr[0].zhqty;
-                        var bz_num=be*new_arr[0].zhqty; //超量倍增
-                        var num=min_bz_num-new_arr[0].zhqty; //购买数量减去超量
-                        // if(num > 0){
-                            bz_num_ok=bz_num-num;
-                            if(bz_num_ok <= 0){
+                        if (zhqty_bz_flag) {
+                            for (let i = 0; i < zhqty_bz.length; i++) {
+                                var vv = zhqty_bz[i];
+                                for (let j = 0; j < be * vv['zhqty']; j++) {
+                                    let index = no_in_arr.findIndex(i => {
+                                        return vv.goods_id === i.goods_id
+                                    })
+                                    if (index > -1) {
+                                        delete_num++
+                                        no_in_arr.splice(index, 1)
+                                    }
+                                }
+                            }
+                        } else {
+                            let min_bz_num = Math.min.apply(Math, zhqty_bz_arr.map(function (o) {
+                                return o['num']
+                            }));
+                            let new_arr = zhqty_bz_arr.filter(ii => {
+                                return ii['num'] == min_bz_num
+                            })
+                            var vv = new_arr[0];
+                            var bz_num = be * new_arr[0].zhqty; //超量倍增
+                            var num = min_bz_num - new_arr[0].zhqty; //购买数量减去超量
+                            bz_num_ok = bz_num - num;
+                            if (bz_num_ok <= 0) {
                                 //超量倍增满足,超量倍增就等于倍数
-                                bz_num_ok=bz_num;
-                            }else{
+                                bz_num_ok = bz_num;
+                            } else {
                                 //超量倍增不满足,倍数要减去多出得
-                                    // be=be-bz_num_ok;
-                                    if(num % vv.zhqty == 0){
-                                        be=num/vv.zhqty;
-                                        // bz_num_ok=num;
-                                    }else{
-                                        be = Math.floor(num/vv.zhqty)
-                                        // bz_num_ok=be * vv.zhqty ;
-                                    }
-                                    bz_num_ok=be * vv.zhqty ;
+                                // be=be-bz_num_ok;
+                                if (num % vv.zhqty == 0) {
+                                    be = num / vv.zhqty;
+                                } else {
+                                    be = Math.floor(num / vv.zhqty)
+                                }
+                                bz_num_ok = be * vv.zhqty;
                             }
-                            for(let i=0;i<zhqty_bz.length;i++){
-                                var vv=zhqty_bz[i];
-                                for(let j=0;j<bz_num_ok;j++){
-                                    let index= no_in_arr.findIndex(i=>{
-                                         return vv.goods_id===i.goods_id
-                                     })
-                                     if(index > -1){
-                                        delete_num++
-                                        no_in_arr.splice(index,1)
-                                     }
-                                 }
+
+                            for (let j = 0; j < bz_num_ok; j++) {
+                                let index = no_in_arr.findIndex(i => {
+                                    return vv.goods_id === i.goods_id
+                                })
+                                if (index > -1) {
+                                    delete_num++
+                                    no_in_arr.splice(index, 1)
+                                }
                             }
-                        // }
-                        aprice += be * aprice;
-                       }else{
-                            var vv=zhqty_bz[0];
-                            var bz_num=be*vv.zhqty; //超量倍增
-                            var num=vv['num']-vv.zhqty; //购买数量减去超量
-                            if(num > 0){
-                                bz_num_ok=bz_num-num;
-                                if(bz_num_ok <= 0){
-                                    //超量倍增满足,超量倍增就等于倍数
-                                    bz_num_ok=bz_num;
-                                }else{
-                                    //超量倍增不满足,倍数要减去多出得
-                                    // be=be-bz_num_ok;
-                                    if(num % vv.zhqty == 0){
-                                        be=num/vv.zhqty;
-                                        // bz_num_ok=num;
-                                    }else{
-                                        be = Math.floor(num/vv.zhqty)
-                                        // bz_num_ok=be * vv.zhqty;
-                                    }
-                                    bz_num_ok=be * vv.zhqty;
+                        }
+                    } else {
+                        var vv = zhqty_bz[0];
+                        var bz_num = be * vv.zhqty; //超量倍增
+                        var num = vv['num'] - vv.zhqty; //购买数量减去超量
+                        if (num > 0) {
+                            bz_num_ok = bz_num - num;
+                            if (bz_num_ok <= 0) {
+                                //超量倍增满足,超量倍增就等于倍数
+                                bz_num_ok = bz_num;
+                            } else {
+                                //超量倍增不满足,倍数要减去多出得
+                                // be=be-bz_num_ok;
+                                if (num % vv.zhqty == 0) {
+                                    be = num / vv.zhqty;
+                                } else {
+                                    be = Math.floor(num / vv.zhqty)
                                 }
-                                for(let j=0;j<bz_num_ok;j++){
-                                    let index= no_in_arr.findIndex(i=>{
-                                         return vv.goods_id===i.goods_id
-                                     })
-                                     if(index > -1){
-                                        delete_num++
-                                        no_in_arr.splice(index,1)
-                                     }
+                                bz_num_ok = be * vv.zhqty;
+                            }
+                            for (let j = 0; j < bz_num_ok; j++) {
+                                let index = no_in_arr.findIndex(i => {
+                                    return vv.goods_id === i.goods_id
+                                })
+                                if (index > -1) {
+                                    delete_num++
+                                    no_in_arr.splice(index, 1)
                                 }
-                            }else{
-                                zhqty_len=1;
                             }
-                       }
+                        } else {
+                            zhqty_len = 1;
+                        }
+                    }
                 }
-                if(!zhqty_len){
+                if (!zhqty_len) {
                     //多个超量就不用pop了
                     aprice += be * aprice;
-                    let pop_num=be * this.data.act.zhbuyqty - delete_num;
+                    let pop_num = be * this.data.act.zhbuyqty - delete_num;
                     for (var m = 0; m < pop_num; m++) {
                         no_in_arr.pop();
                     }
@@ -21,7 +21,9 @@
 				</view>
 				<view class="flex jc_sb ai-center c-7b">
 					<view class="fs24">
-						<view>已售{{item.buy_num+item.virtual_num}}件</view>
+
+						<view>已售<block wx:if="{{type == 1}}">{{item.buy_num+item.virtual_num}}</block><block wx:else>0</block>件</view>
+
 						<view class=""><text class="iconfont icon-shizhong fs24"></text>{{goodlist[index].djs.day}}天{{goodlist[index].djs.hou}}时{{goodlist[index].djs.min}}分{{goodlist[index].djs.sec}}秒</view>
 					</view>
@@ -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,
@@ -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>
@@ -238,35 +238,54 @@ module.exports = {
 					var be = parseInt(no_in_arr.length / act.zhbuyqty); //看一下是几倍
 					if (act.is_bzyh && zhqty_bz.length > 0) {
 						if (zhqty_bz.length > 1) {
-							zhqty_len = 1;
-							let min_bz_num = Math.min.apply(Math, zhqty_bz.map(function (o) {
-								return o['num']
-							}));
-							let new_arr = zhqty_bz.filter(ii => {
-								return ii['num'] == min_bz_num
+							let zhqty_bz_arr = [];
+							let zhqty_bz_flag = zhqty_bz.every((item1, i) => {
+								var bz_num = be * item1['zhqty']; //超量倍增
+								var num = item1['num'] - item1['zhqty']; //购买数量减去超量
+								if (bz_num > num) {
+									zhqty_bz_arr.push(item1);
+									zhqty_bz.splice(i, 1)
+								}
+								return bz_num <= num;
 							})
-							var vv = new_arr[0];
-							// be=new_arr[0].zhqty;
-							var bz_num = be * new_arr[0].zhqty; //超量倍增
-							var num = min_bz_num - new_arr[0].zhqty; //购买数量减去超量
-							// if(num > 0){
-							bz_num_ok = bz_num - num;
-							if (bz_num_ok <= 0) {
-								//超量倍增满足,超量倍增就等于倍数
-								bz_num_ok = bz_num;
+							if (zhqty_bz_flag) {
+								for (let i = 0; i < zhqty_bz.length; i++) {
+									var vv = zhqty_bz[i];
+									for (let j = 0; j < be * vv['zhqty']; j++) {
+										let index = no_in_arr.findIndex(i => {
+											return vv.goods_id === i.goods_id
+										})
+										if (index > -1) {
+											delete_num++
+											no_in_arr.splice(index, 1)
+										}
+									}
+								}
 							} else {
-								//超量倍增不满足,倍数要减去多出得
-								// be=be-bz_num_ok;
-								if (num % vv.zhqty == 0) {
-									be = num / vv.zhqty;
-									bz_num_ok = num;
+								let min_bz_num = Math.min.apply(Math, zhqty_bz_arr.map(function (o) {
+									return o['num']
+								}));
+								let new_arr = zhqty_bz_arr.filter(ii => {
+									return ii['num'] == min_bz_num
+								})
+								var vv = new_arr[0];
+								var bz_num = be * new_arr[0].zhqty; //超量倍增
+								var num = min_bz_num - new_arr[0].zhqty; //购买数量减去超量
+								bz_num_ok = bz_num - num;
+								if (bz_num_ok <= 0) {
+									//超量倍增满足,超量倍增就等于倍数
+									bz_num_ok = bz_num;
 								} else {
-									be = Math.floor(num / vv.zhqty)
-									bz_num_ok = num - (be * vv.zhqty);
+									//超量倍增不满足,倍数要减去多出得
+									// be=be-bz_num_ok;
+									if (num % vv.zhqty == 0) {
+										be = num / vv.zhqty;
+									} else {
+										be = Math.floor(num / vv.zhqty)
+									}
+									bz_num_ok = be * vv.zhqty;
 								}
-							}
-							for (let i = 0; i < zhqty_bz.length; i++) {
-								var vv = zhqty_bz[i];
+	
 								for (let j = 0; j < bz_num_ok; j++) {
 									let index = no_in_arr.findIndex(i => {
 										return vv.goods_id === i.goods_id
@@ -277,9 +296,7 @@ module.exports = {
 									}
 								}
 							}
-							// }
-							aprice += be * aprice;
-						} else {
+						}  else {
 							var vv = zhqty_bz[0];
 							var bz_num = be * vv.zhqty; //超量倍增
 							var num = vv['num'] - vv.zhqty; //购买数量减去超量
@@ -293,11 +310,12 @@ module.exports = {
 									// be=be-bz_num_ok;
 									if (num % vv.zhqty == 0) {
 										be = num / vv.zhqty;
-										bz_num_ok = num;
+										// bz_num_ok = num;
 									} else {
 										be = Math.floor(num / vv.zhqty)
-										bz_num_ok = num - (be * vv.zhqty);
+										// bz_num_ok = num - (be * vv.zhqty);
 									}
+									bz_num_ok = be * vv.zhqty;
 								}
 								// be=vv.num;
 								for (let j = 0; j < bz_num_ok; j++) {
@@ -151,49 +151,65 @@ module.exports = {
                     let be = parseInt(no_in_arr.length / act.zhbuyqty); //看一下是几倍
                     if (act.is_bzyh && zhqty_bz.length > 0) {
                         if (zhqty_bz.length > 1) {
-                            zhqty_len = 1;
-                            let min_bz_num = Math.min.apply(Math, zhqty_bz.map(function (o) {
-                                return o['num']
-                            }));
-                            let new_arr = zhqty_bz.filter(ii => {
-                                return ii['num'] == min_bz_num
+                            let zhqty_bz_arr = [];
+                            let zhqty_bz_flag = zhqty_bz.every((item1, i) => {
+                                var bz_num = be * item1['zhqty']; //超量倍增
+                                var num = item1['num'] - item1['zhqty']; //购买数量减去超量
+                                if (bz_num > num) {
+                                    zhqty_bz_arr.push(item1);
+                                    zhqty_bz.splice(i, 1)
+                                }
+                                return bz_num <= num;
                             })
-                            var vv = new_arr[0];
-                            // be=new_arr[0].zhqty;
-                            var bz_num = be * new_arr[0].zhqty; //超量倍增
-                            var num = min_bz_num - new_arr[0].zhqty; //购买数量减去超量
-                            // if(num > 0){
-                            bz_num_ok = bz_num - num;
-                            if (bz_num_ok <= 0) {
-                                //超量倍增满足,超量倍增就等于倍数
-                                bz_num_ok = bz_num;
+                            if (zhqty_bz_flag) {
+                                for (let i = 0; i < zhqty_bz.length; i++) {
+                                    var vv = zhqty_bz[i];
+                                    for (let j = 0; j < be * vv['zhqty']; j++) {
+                                        let index = no_in_arr.findIndex(i => {
+                                            return vv.goods_id === i.goods_id
+                                        })
+                                        if (index > -1) {
+                                            delete_num++
+                                            no_in_arr.splice(index, 1)
+                                        }
+                                    }
+                                }
                             } else {
-                                //超量倍增不满足,倍数要减去多出得
-                                // be=be-bz_num_ok;
-                                if (num % vv.zhqty == 0) {
-                                    be = num / vv.zhqty;
-                                    bz_num_ok = num;
+                                let min_bz_num = Math.min.apply(Math, zhqty_bz_arr.map(function (o) {
+                                    return o['num']
+                                }));
+                                let new_arr = zhqty_bz_arr.filter(ii => {
+                                    return ii['num'] == min_bz_num
+                                })
+                                var vv = new_arr[0];
+                                var bz_num = be * new_arr[0].zhqty; //超量倍增
+                                var num = min_bz_num - new_arr[0].zhqty; //购买数量减去超量
+                                bz_num_ok = bz_num - num;
+                                if (bz_num_ok <= 0) {
+                                    //超量倍增满足,超量倍增就等于倍数
+                                    bz_num_ok = bz_num;
                                 } else {
-                                    be = Math.floor(num / vv.zhqty)
-                                    bz_num_ok = num - (be * vv.zhqty);
+                                    //超量倍增不满足,倍数要减去多出得
+                                    // be=be-bz_num_ok;
+                                    if (num % vv.zhqty == 0) {
+                                        be = num / vv.zhqty;
+                                    } else {
+                                        be = Math.floor(num / vv.zhqty)
+                                    }
+                                    bz_num_ok = be * vv.zhqty;
                                 }
-                            }
-                            for (let i = 0; i < zhqty_bz.length; i++) {
-                                var vv = zhqty_bz[i];
+    
                                 for (let j = 0; j < bz_num_ok; j++) {
                                     let index = no_in_arr.findIndex(i => {
                                         return vv.goods_id === i.goods_id
                                     })
-                                    if(index > -1){
+                                    if (index > -1) {
                                         delete_num++
                                         no_in_arr.splice(index, 1)
                                     }
-                                    
                                 }
                             }
-                            // }
-                            aprice += be * aprice;
-                        } else {
+                        }  else {
                             var vv = zhqty_bz[0];
                             var bz_num = be * vv.zhqty; //超量倍增
                             var num = vv['num'] - vv.zhqty; //购买数量减去超量
@@ -207,11 +223,12 @@ module.exports = {
                                     // be=be-bz_num_ok;
                                     if (num % vv.zhqty == 0) {
                                         be = num / vv.zhqty;
-                                        bz_num_ok = num;
+                                        // bz_num_ok = num;
                                     } else {
                                         be = Math.floor(num / vv.zhqty)
-                                        bz_num_ok = num - (be * vv.zhqty);
+                                        // bz_num_ok = num - (be * vv.zhqty);
                                     }
+                                    bz_num_ok = be * vv.zhqty;
                                 }
                                 // be=vv.num;
                                 for (let j = 0; j < bz_num_ok; j++) {
@@ -706,6 +706,7 @@ Page({
   //---展示---
   onShow: function () {
     var goods_list = null, th = this, that = this;
+    this.data.is_go_to_team_show=0;
     var show_prew_img = this.data.show_prew_img
     if (show_prew_img) {
       show_prew_img = 0;
@@ -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
         		   }
@@ -183,6 +183,14 @@ Page({
     await getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + pt_prom_id, {
       data: { }
     }).then(res => {
+      if(res.data.code==0){
+        teamlist=res.data.data;
+        this.setData({
+          teamlist:teamlist
+        });
+        var nt =ut.gettimestamp();
+        teamlist.status=0;
+     
          if (nt >= teamlist.start_time) teamlist.status = 1;
           goods_id = res.data.data.goods_id;
           id = res.data.data.id;
@@ -200,10 +208,9 @@ Page({
             })
             max_num=max;
             min_price=pri;
-           
           }
-		  
+        }
 		  //获取商品信息
 		  getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + goods_id, {
 		  }).then(res => {
@@ -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);
     },
@@ -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>
@@ -509,6 +509,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;
@@ -530,6 +533,7 @@ Page({
             if (knum <= 0) {
                 getApp().confirmBox("库存为0，支付失败");
+                th.setData({paying:0});
                 return false;
             }
@@ -544,6 +548,7 @@ Page({
                     title: '提示',
                     content: '线下取价功能已经关闭或者过期！'
                 });
+                th.setData({paying:0});
                 return false;
             }
@@ -577,6 +582,7 @@ Page({
             if (buyed_mum2 > limit && limit > 0) {
                 var content = gg.goods_name + '购买数量超出商品限购,请取消订单';
                 th.toast(content);
+                th.setData({paying:0});
                 return false;
             }
             //当是组合优惠的时候
@@ -611,6 +617,7 @@ Page({
                 if (!isok) {
                     var content = gg.goods_name + '活动已经结束,请取消订单';
                     th.toast(content);
+                    th.setData({paying:0});
                     return false;
                 }
@@ -637,6 +644,7 @@ Page({
                     if (good.goods_num + promgoodsbuynum > good['buyqty']) {
                         var content = good['goods_name'] + "超出活动限购\n";
                         th.toast(content);
+                        th.setData({paying:0});
                         return false;
                     }
                 }
@@ -674,12 +682,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;
                     }
@@ -753,7 +763,10 @@ Page({
                     })
                 }
-                if (!p_ok) return false;
+                if (!p_ok){
+                    th.setData({paying:0});
+                    return false;
+                }
             }
             //商品的普通购买 ，不要进行判断
@@ -762,6 +775,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;
                 }
@@ -814,6 +828,7 @@ Page({
                             var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买';
                             th.toast(content);
+                            th.setData({paying:0});
                             return false;
                         }
                     }
@@ -832,7 +847,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) + ",";
@@ -856,6 +873,7 @@ Page({
                         var content = gg.goods_name + '商品的价格发生了变化,请取消订单重新购买1'
                         th.toast(content);
+                        th.setData({paying:0});
                         return false;
                     }
                 }
@@ -870,6 +888,7 @@ Page({
                         var content = gg.goods_name + '门店库存不足,请取消订单';
                         th.toast(content);
+                        th.setData({paying:0});
                         return false;
                     }
@@ -878,6 +897,7 @@ Page({
                         var content = gg.goods_name + '商品的库存不足,请取消订单';
                         th.toast(content);
+                        th.setData({paying:0});
                         return false;
                     }
@@ -929,6 +949,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;
                 }
@@ -937,6 +958,7 @@ Page({
                     var content = goodsinfo.goods_name + '购买数量超出商品活动限购,请取消订单'
                     th.toast(content);
+                    th.setData({paying:0});
                     return false;
                 }
@@ -944,6 +966,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;
                 }
@@ -951,6 +974,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;
 				}
@@ -959,12 +983,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;
 					}          
                 }
@@ -977,7 +1003,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: {
@@ -1005,6 +1033,7 @@ Page({
                     var content = good.goods_name + '商品的价格发生了变化,请取消订单重新购买';
                     th.toast(content);
+                    th.setData({paying:0});
                     return false;
                 }
             }
@@ -1024,13 +1053,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;
 	  }
@@ -1042,10 +1073,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);
   },
@@ -260,7 +260,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)}}">