1、自定义模板的点击跳转

2、服务卡项购买显示已售，限购 3、订单列表显示异常的优化

1、自定义模板的点击跳转
2、服务卡项购买显示已售，限购 3、订单列表显示异常的优化
yvan.ni
1 parent 0525ae00
Showing 11 changed files with 117 additions and 100 deletions
components/diy_groupbuy/diy_groupbuy.js
components/diy_groupbuy/diy_groupbuy.wxml
components/diy_pingd_buy/diy_pingd_buy.js
components/diy_pregoods/diy_pregoods.js
components/diy_public/diy_public.js
components/diy_seckill/diy_seckill.js
packageA/pages/goodsInfo/goodsInfo.js
packageA/pages/goodsInfo/goodsInfo.wxml
packageG/pages/group_buy/goodsInfo/goodsInfo.js
packageG/pages/group_buy/goodsInfo/goodsInfo.wxml
pages/user/order_list/order_list.js
@@ -84,7 +84,7 @@ Component({
 		       if(!user_id){ user_id=0;}
 		       //--调用接口,读取团购--
-		       app.request.promiseGet("/api/weshop/goods/groupBuy/getGoodsList?store_id="
+		       app.request.promiseGet("/api/weshop/goods/groupBuy/getGoodsList?isnew=1&store_id="
 		         + os.stoid + "&aidlist=" + goodsidlist+"&user_id="+user_id, {}).then(res => {
 		           console.log(res,100);
 		           //如果秒杀的数组为空的时候    
@@ -106,7 +106,7 @@ Component({
 		   if(!user_id){ user_id=0;}
 		   var req={ store_id: os.stoid, is_end: 0, is_show: 1, timetype: 2,user_id:user_id};
-		   getApp().request.promiseGet("/api/weshop/goods/groupBuy/page?page=1&pageSize=9",
+		   getApp().request.promiseGet("/api/weshop/goods/groupBuy/page?isnew=1&page=1&pageSize=9",
 		     { isShowLoading: 1, data:req  }
 		   ).then(res => {
 		     if (res.data.code == 0 && res.data.data.pageData && res.data.data.pageData.length > 0) {
@@ -122,15 +122,11 @@ Component({
 		   var newTime = ut.gettimestamp(), all_array = [], th = this;
 		   th.setData({ newTime: newTime });
 		   if (g_id) {
-		     /*--商品队列按照添加的顺序排列--*/
-		     g_id.forEach(function (val, ind) {
+		     
 		       goodslist.forEach(function (vy, indy) {
-		         if (val.goodsid == vy.goods_id) {
-		           if(!vy.id) vy.id=vy.prom_id;
 		           all_array.push(vy);
-		         }
 		       })
-		     })
+		     
 		   } else {
 		     all_array = goodslist;
 		   }
@@ -221,11 +217,25 @@ Component({
 		 //跳转到团购列表
 		 go_to_group: function () {
-		
 		    var  url="/packageC/pages/group_list/group_list";
 			getApp().goto(url);
+		 },
+
+
+		 //跳转到商品详情，要区别商品和服务卡项
+		 go_group_buy(e){
+			 let index=e.currentTarget.dataset.index;
+			 let idx=e.currentTarget.dataset.idx;
+			 let aitem=this.data.goods_array[index][idx];
+			 var url="/pages/goods/goodsInfo/goodsInfo?goods_id="+aitem.goods_id+"&prom_type=2&prom_id="+aitem.prom_id;
+			 //如果是服务卡项的时候
+			 if(aitem.goods_type==1){
+				 url="/packageG/pages/group_buy/goodsInfo/goodsInfo?goods_id="+aitem.goods_id+"&prom_id="+aitem.prom_id;
+			 }
+			 getApp().goto(url);
 		 }
+
@@ -17,7 +17,9 @@
 			<swiper-item class="s_it" wx:for="{{goods_array}}">
 				<block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
 					<navigator
-						url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&prom_type=2&prom_id={{aitem.prom_id}}"
+					    bindtap="go_group_buy"
+                        data-index="{{index}}"
+                        data-idx="{{aind}}"
 						class="s1_gk_a1">
 						<view class='one'>
 							<view class='sp_top'>
@@ -64,7 +66,9 @@
 		<block wx:for="{{goods_array}}">
 			<block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
 				<navigator
-					url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&prom_type=2&prom_id={{aitem.prom_id}}"
+					bindtap="go_group_buy"
+					data-index="{{index}}"
+					data-idx="{{aind}}"
 					class="s1_gk_a1">
 					<view class="flex jc_sb" style="padding: 0 20rpx; margin-top: 10rpx;">
 						<view>
@@ -135,14 +135,12 @@ Component({
 		var th=this,all_array=[];
 		if(g_id){
 			/*--商品队列按照添加的顺序排列--*/
-			g_id.forEach(function(val, ind) {
+		
 			  goodslist.forEach(function (vy,indy) {
-				if(val.goodsid==vy.goods_id){
-				  all_array.push(vy);
-				  //th.setData({goods_array:arr});
-				}
+				   all_array.push(vy);
+				   //th.setData({goods_array:arr});
 			  })
-			})
+			
 		}else{
 			all_array=goodslist;
 		}
@@ -112,12 +112,11 @@ Component({
 		var newTime = ut.gettimestamp(),all_array = [],th=this;
 		th.setData({newTime:newTime});		
 		if(g_id){
-			/*--商品队列按照添加的顺序排列--*/
-			g_id.forEach(function(val, ind) {
-			  goodslist.forEach(function (vy,indy) {
-				if(val.goodsid==vy.goods_id){  all_array.push(vy); }
+		    /*--商品队列按照添加的顺序排列--*/
+			  goodslist.forEach(function (vy,indy) {			
+           all_array.push(vy); 
 			  })
-			})
+			
 		}else{
 			all_array=goodslist;
 		}
@@ -99,7 +99,7 @@ Component({
     if (this.data.prom_type==2) {  //团购
       this.setData({
         prom_text:'已团',
-        nav1:'/pages/goods/goodsInfo/goodsInfo?',
+        nav1:'/packageG/pages/group_buy/goodsInfo/goodsInfo?',
         nav2:'/pages/goods/goodsInfo/goodsInfo?'
       }) 
     }
@@ -168,7 +168,7 @@ Component({
           }
           if (th.data.prom_type==2) { //团购
-            gUrl="/api/weshop/goods/groupBuy/getGoodsList?store_id="
+            gUrl="/api/weshop/goods/groupBuy/getGoodsList?isnew=1&store_id="
             +os.stoid+"&aidlist="+goodsidlist + "&user_id="+user_id;
           }
@@ -278,14 +278,13 @@ Component({
       var newTime = ut.gettimestamp(), all_array = [], th = this;
       th.setData({ newTime: newTime });
       if (g_id) {
-        /*--商品队列按照添加的顺序排列--*/
-        g_id.forEach(function (val, ind) {
+        
           goodslist.forEach(function (vy, indy) {
-            if (val.goodsid == vy.goods_id) {
-              all_array.push(vy);
-            }
+        
+            all_array.push(vy);
+            
           })
-        })
+      
       } else {
          all_array = goodslist;
       }
@@ -157,14 +157,11 @@ Component({
       var newTime = ut.gettimestamp(), all_array = [], th = this;
       th.setData({ newTime: newTime });
       if (g_id) {
-        /*--商品队列按照添加的顺序排列--*/
-        g_id.forEach(function (val, ind) {
-          goodslist.forEach(function (vy, indy) {
-            if (val.goodsid == vy.goods_id) {
+          /*--商品队列按照添加的顺序排列--*/
+          goodslist.forEach(function (vy, indy) {      
               all_array.push(vy);
-            }
           })
-        })
+        
       } else {
          all_array = goodslist;
       }
@@ -998,6 +998,19 @@ Page({
 				await this.getactLen().then(async function(res) {
 					redisNums = res;
 					let curNum = th.data.goodsInputNum;
+
+                    if(curNum > res) { // t当前增减的数量
+                        // wx.showModal({
+                        // 	title: '超出活动库存',
+                        // });
+                        getApp().my_warnning('超出活动库存', 0, self);
+                        th.setData({
+                            goodsInputNum: res || 1
+                        });
+                        is_ok=0;
+                        return false;
+                    }
+
 					// res: redis可购买数量
 					console.log('当前可以购买的数量:', res);
 					if(res <= 0) {
@@ -1028,24 +1041,9 @@ Page({
 							if(canBuyNum <= 0) {
 								canBuyNum = 0;
-							};
-							
-							if(canBuyNum > res) {
-								if(curNum > res) { // t当前增减的数量
-									// wx.showModal({
-									// 	title: '超出活动库存',
-									// });
-									getApp().my_warnning('超出活动库存', 0, self);
-									th.setData({
-										goodsInputNum: res || 1
-									});
-                                    is_ok=0;
-									return false;
-								};
-							};
-							
-							if(canBuyNum <= res) {
-								if(curNum > canBuyNum) {
+							}
+
+							if(curNum > canBuyNum) {
 									// wx.showModal({
 									// 	title: '超出限购数量',
 									// });
@@ -1055,8 +1053,8 @@ Page({
 									});
                                     is_ok=0;
 									return false;
-								}
 							}
+
 						})
 					}
@@ -136,8 +136,9 @@
 						      <view class="stock" wx:if="{{prom_act.buy_limit>0}}">限购:{{prom_act.buy_limit}}件</view>
 						      <view class="stock" wx:else>限购:不限</view>
-									<view class="sales">已售:{{prom_act.buy_num+prom_act.virtual}}件</view>
-						
+							  <view wx:if="{{prom_st>0}}"  class="sales">已售:{{prom_act.buy_num+prom_act.virtual}}件</view>
+							  <view wx:else class="sales">已售:{{prom_act.buy_num}}件</view>
+
 						      <!-- <block wx:if="{{prom_st==0}}">
 						        <view class="sales">已购:0件</view>
 						      </block> -->
@@ -911,14 +911,6 @@ Page({
                         if (canBuyNum <= 0) {
                             canBuyNum = 0;
                         }
-                        if (canBuyNum > res) {
-                                getApp().my_warnning('超出活动库存', 0, self);
-                                th.setData({
-                                    goodsInputNum: res || 1
-                                });
-                                is_ok = 0;
-                                return false;
-                        }
                         if (curNum > canBuyNum) {
                             getApp().my_warnning('超出限购数量', 0, self);
@@ -1100,6 +1092,19 @@ Page({
         // 如果数量为0，设置和显示已抢光
         // 否则，进一步判断是否超出限购或超出库存
         await this.getactLen().then(async function (res) {
+
+            if (t > res) { // t当前增减的数量
+                // wx.showModal({
+                // 	title: '超出活动库存',
+                // });
+                getApp().my_warnning('超出活动库存', 0, self);
+                th.setData({
+                    goodsInputNum: res || 1,
+                });
+                return false;
+            }
+
+
             // res: redis可购买数量
             // console.log('当前可以购买的数量:', res);
             if (res <= 0) {
@@ -1123,35 +1128,16 @@ Page({
                     if (canBuyNum <= 0) {
                         canBuyNum = 0;
                     }
-                    ;
-
-                    if (limited > res) {
-                        if (t > res) { // t当前增减的数量
-                            // wx.showModal({
-                            // 	title: '超出活动库存',
-                            // });
-                            getApp().my_warnning('超出活动库存', 0, self);
-                            th.setData({
-                                goodsInputNum: res || 1,
-                            });
-                            return false;
-                        }
-
-                    }
-
-
-                    if (limited <= res) {
-                        if (t > canBuyNum) {
-                            // wx.showModal({
-                            // 	title: '超出限购数量',
-                            // });
-                            getApp().my_warnning('超出限购数量', 0, self);
-                            th.setData({
-                                goodsInputNum: canBuyNum || 1,
-                            });
-                            return false;
-                        }
+                    if (t > canBuyNum) {
+                        // wx.showModal({
+                        // 	title: '超出限购数量',
+                        // });
+                        getApp().my_warnning('超出限购数量', 0, self);
+                        th.setData({
+                            goodsInputNum: canBuyNum || 1,
+                        });
+                        return false;
                     }
@@ -83,8 +83,8 @@
 					<view class="abs flex fs36" style="align-items:flex-end;color: #fff; margin-top: 34rpx; margin-left: 10rpx; height: 60rpx">￥{{prom_price}}
-						<view wx:if="{{is_retail_price}}" class="word-line fs24 no_line_c" style="margin-left: 10rpx;position: relative;top: -6rpx; color:#fff !important">零售价：￥{{filters.toFix(front_g.market_price,2)}}</view>
-						<view wx:else class="word-line no_line_x fs24" style="margin-left: 10rpx;position: relative;top: -6rpx;color:#fff !important">￥{{filters.toFix(front_g.shop_price,2)}}</view>
+						<view wx:if="{{is_retail_price}}" class="word-line fs24 no_line_c" style="margin-left: 10rpx;position: relative;top: -6rpx; color:#fff !important">零售价：￥{{filters.toFix(data.show_price,2)}}</view>
+						<view wx:else class="word-line no_line_x fs24" style="margin-left: 10rpx;position: relative;top: -6rpx;color:#fff !important">￥{{filters.toFix(data.shop_price,2)}}</view>
 					</view>
 					<image class="abs" style="width: 120rpx;top: 32rpx; right: 220rpx;" mode="widthFix" src='{{iurl+"/miniapp/images/activity-time.png"}}'></image>
@@ -133,12 +133,28 @@
 						      <view class="stock" wx:if="{{prom_act.buy_limit>0}}">限购:{{prom_act.buy_limit}}件</view>
 						      <view class="stock" wx:else>限购:不限</view>
-									<view class="sales">已售:{{prom_act.buy_num+prom_act.virtual}}件</view>
+							  <view wx:if="{{prom_st>0}}"  class="sales">已售:{{prom_act.buy_num+prom_act.virtual}}件</view>
+							  <view wx:else class="sales">已售:{{prom_act.buy_num}}件</view>
 						    </block>
 						  </view>
 						</block>
+						<block wx:if="{{prom_type==2}}">
+							<view class="goods-num">
+								<block>
+									<view class="stock">总数量：{{ prom_act.goods_num+prom_act.virtualNum}}件</view>
+
+									<view class="stock" wx:if="{{prom_act.buy_limit>0}}">限购:{{prom_act.buy_limit}}件</view>
+									<view class="stock" wx:else>限购:不限</view>
+									<view wx:if="{{prom_st>0}}" class="sales">已售:{{prom_act.buy_num+prom_act.virtualNum}}件</view>
+									<view wx:else class="sales">已售:{{prom_act.buy_num}}件</view>
+
+								</block>
+							</view>
+						</block>
+
+
 						<view class="goods-num" wx:else>
 							<view class="sales">销量：{{data.sales_sum}}</view>
 							<view class="sales">有效天数：{{data.validDays?data.validDays:'不限'}}</view>
@@ -91,14 +91,17 @@ Page({
     var startDate = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate();
-    if (t.index && t.tabindex) {
+    if (t.index) {
+      if(t.tabindex) t.tabindex=0;
       this.setData({
         currentIndex: t.index,
         tabIndex: t.tabindex,
       });
-      this.clickTab();
+      //this.clickTab();
     };
+
+
     this.setData({
       currentDate: this.currentDate(),
       startDate: startDate,
@@ -185,8 +188,13 @@ Page({
         }
       }, 1)
-      th.resetData(), th.requestOrderList(th.data.activeCategoryId);
-      th.clickTab();
+      th.resetData();
+      if(th.data.currentIndex>0){
+        th.clickTab();
+      }else{
+        th.requestOrderList(th.data.activeCategoryId);
+      }
+
     },1500);
   },
@@ -2735,6 +2743,7 @@ Page({
     app.request.promiseGet(url, {
       data: data
     }).then(async res => {
+      wx.hideLoading();
       // 关闭加载状态
       th.data.is_load2 = 0;
       // 请求成功