幸运购订单、幸运购商品详情修改

taiyuan
1 parent 15414865
Showing 3 changed files with 116 additions and 48 deletions
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js
@@ -276,6 +276,9 @@ Page({
 		luckGoInfo: {},
 		showDetails: false,
 		num_success: 0, //成团已中商品数量
+		isTimeUp: false,
+		
+		surplus: 0,
  
   },
  
@@ -1005,6 +1008,24 @@ Page({
     });
     this.data.enterAddressPage && (this.data.enterAddressPage = !1);
  
+		// 检查幸运购活动商品库存
+		getApp().request.get("/api/weshop/activitylist/getActLen/" + o.stoid + "/9/" + this.data.group_id, {
+			success: function(res) {
+				//console.log('当前幸运购活动的剩余库存', res.data.data);
+				if(res.data.code == 0) {
+					th.setData({
+						// 剩余库存量
+						surplus: res.data.data,
+					});
+				}; 
+				// else {
+				// 	th.setData({
+				// 		surplus: 0,
+				// 	});
+				// }
+			}
+		});
+		
  
 		// 检查是否已经参团购买
 		getApp().request.get("/api/weshop/prom/luckyOrder/getUserOrderInfo/" + o.stoid + "/" + oo.user_id + "/" + this.data.group_id, {
@@ -1077,18 +1098,37 @@ Page({
 			}
 		}).then(res => {
 		  if (res.data.code == 0) {
-		    // console.log('成团信息=======》', res.data.data);
+		    console.log('成团信息=======》', res.data.data);
+				if(res.data.data.pageData && res.data.data.pageData.length == 0) {
+					let obj = {
+					  day: '00',
+					  hou: '00',
+					  min: '00',
+					  sec: '00'
+					};
+					
+					th.setData({
+						djs: obj,
+						isTimeUp: true,
+					});
+				} else {
+					th.setData({
+						luckGoInfo: res.data.data.pageData[0],
+						team_id: res.data.data.pageData[0].team_id,
+						luckGoMembers: [],
+					});
+					wx.setStorage({
+					  key: 'team_id',
+					  data: th.data.team_id,
+					});
+					th.countDown(th.data.luckGoInfo.end_time, 0);
+				};
+				
+		  } else {
 				th.setData({
-					luckGoInfo: res.data.data.pageData[0],
-					team_id: res.data.data.pageData[0].team_id,
-					luckGoMembers: [],
-				});
-				wx.setStorage({
-				  key: 'team_id',
-				  data: th.data.team_id,
+					isTimeUp: true,
 				});
-				th.countDown(th.data.luckGoInfo.end_time, 0);
-		  };
+			};
  
  
 		});
@@ -3682,41 +3722,63 @@ Page({
         min: this.timeFormat(min),
         sec: this.timeFormat(sec)
       }
+			// console.log('cd');
     } else {
-      if (th.data.prom_st == 0) {
-        //var endTime2 = new Date(th.data.prom_end_time).getTime();
-        var endTime2 = th.data.prom_act.end_time;
-        th.setData({
-          prom_time_text: '距结束还剩:',
-          prom_st: 1
-        })
-        setTimeout(function () {
-          th.countDown(endTime2)
-        }, 1000);
-        return false;
+      // if (th.data.prom_st == 0) {
+      //   //var endTime2 = new Date(th.data.prom_end_time).getTime();
+      //   var endTime2 = th.data.prom_act.end_time;
+      //   th.setData({
+      //     prom_time_text: '距结束还剩:',
+      //     prom_st: 1
+      //   })
+      //   setTimeout(function () {
+      //     th.countDown(endTime2)
+      //   }, 1000);
+      //   return false;
  
-      } else {
-        //活动已结束，全部设置为'00'
-        obj = {
-          day: '00',
-          hou: '00',
-          min: '00',
-          sec: '00'
-        }
-        th.setData({
-          prom_time_text: '活动已经结束:',
-          prom_st: 3
-        })
-        th.setData({
-          djs: obj
-        });
-        return false;
-      }
+      // } else {
+      //   //活动已结束，全部设置为'00'
+      //   obj = {
+      //     day: '00',
+      //     hou: '00',
+      //     min: '00',
+      //     sec: '00'
+      //   }
+      //   th.setData({
+      //     prom_time_text: '活动已经结束:',
+      //     prom_st: 3
+      //   })
+      //   th.setData({
+      //     djs: obj
+      //   });
+      //   return false;
+      // }
+			
+			
+			obj = {
+			  day: '00',
+			  hou: '00',
+			  min: '00',
+			  sec: '00'
+			}
+			
+			th.setData({
+			  djs: obj,
+				isTimeUp: true,
+			});
+			console.log('i am here');
+			return false;
     }
-
-    th.setData({
-      djs: obj
-    });
+		
+		// ----
+		
+		
+		
+		
+		th.setData({
+		  djs: obj
+		});
+		// ----
     setTimeout(function () {
       th.countDown(endTime)
     }, 1000);
@@ -920,9 +920,14 @@
 				</view>
 				<!-- data-ind="2" -->
 				<!-- openSpecModel_pt -->
-				<view class="btn-red f1 flex ai-center jc-center" bindtap="go" data-it="0" data-url="/packageC/pages/luckyGo/luckyGo_details/luckyGo_details?group_id={{luckGoInfo.id}}&goods_id={{luckGoInfo.goods_id}}&goods_name={{data.goods_name}}&team_id={{buyInfo.team_id}}&&from=list" wx:if="{{showDetails}}">查看详情</view>
-				<view class="btn-red f1 flex ai-center jc-center" bindtap="openSpecModel_pt" data-it="0" wx:elif="{{!showDetails && (luckGoInfo.goods_num != 0)}}">立即参团</view>
-				<view class="btn-red f1 flex ai-center jc-center" wx:else>已经抢光</view>
+				<view class="xc-ash-b f1 flex ai-center jc-center white fs26" wx:if="{{isTimeUp}}">活动已经结束</view>
+				<block wx:else>
+					<view class="btn-red f1 flex ai-center jc-center" bindtap="go" data-it="0" data-url="/packageC/pages/luckyGo/luckyGo_details/luckyGo_details?group_id={{luckGoInfo.id}}&goods_id={{luckGoInfo.goods_id}}&goods_name={{data.goods_name}}&team_id={{buyInfo.team_id}}&&from=list" wx:if="{{showDetails}}">查看详情</view>
+					<view class="btn-red f1 flex ai-center jc-center" bindtap="openSpecModel_pt" data-it="0" wx:elif="{{!showDetails && surplus != 0}}">立即参团</view>
+					<view class="f1 flex ai-center jc-center xc-ash-b fs26 white" wx:elif="{{!showDetails && surplus == 0}}">已经抢光了</view>
+				</block>
+				
+				<!-- <view class="btn-red f1 flex ai-center jc-center" wx:else>已经抢光</view> -->
 				<!-- <view class="btn-red f1 flex ai-center jc-center" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" data-action="buy">立即参团</view> -->
 			</view>
         <!-- <view bindtap="openSpecModel" data-ind="1" class="btn-buy flex fdc jc-center">
@@ -17,7 +17,8 @@ Page({
     onLoad: function(e) {
         var th=this;
         var r = void 0 !== e.isGoup && e.isGoup;
-
+				// console.log('e*************>>>>>>', e);
+				this.data.group_id = e.group_id;
         getApp().getConfig2(function (e) {
  
             th.setData({conf: e,sales_rules:e.sales_rules, userInfo: getApp().globalData.userInfo});
@@ -1472,7 +1473,7 @@ Page({
  
     //跳转到商品
     go_gd:function (e) {
-			console.log(e);
+			// console.log(e);
         var gd= e.currentTarget.dataset.gd;
 				var prom_type = this.data.order.order_goods[0].prom_type;
 				// var good_url='';
@@ -1482,7 +1483,7 @@ Page({
 				// 	good_url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + gd;
 				// };
  
-        var good_url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + gd;
+        var good_url="/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=" + gd + '&group_id=' + this.data.group_id;
 				getApp().goto(good_url);
  
         // var url="/api/weshop/activitylist/getGoodActInfo";