幸运购活动列表是否已抢光判断

taiyuan
1 parent cf078b76
Showing 6 changed files with 25 additions and 16 deletions
components/diy_luckyGo/diy_luckyGo.wxml
packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxml
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
pages/index/index/index.wxml
pages/user/order_list/order_list.js
pages/user/order_list/order_list.wxml
@@ -15,7 +15,7 @@
 			<view wx:if="{{object.style==1}}">
 				<swiper-item class="s_it" wx:for="{{goods_array}}">
 					<block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
-						<navigator url="/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id={{aitem.goods_id}}&prom_type=9&group_id={{aitem.id}}"
+						<navigator url="{{aitem.actLen == 0 ? '':('/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + aitem.goods_id + '&prom_type=9&group_id=' + aitem.id)}}"
 						 class="pd20 nav" hover-class="none">
 							<view class="">
 								<view class="img-container row" data-content="{{aitem.group_num}}人团">
@@ -51,7 +51,7 @@
 				<!-- 3个成一组，这里我们默认让它显示goods_array[0],控制显示数量在3个以内 -->
 				<block wx:if="{{index == 0}}">
 					<block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
-						<view class="list-item" data-url="/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id={{aitem.goods_id}}&prom_type=9&group_id={{aitem.id}}" bindtap="go">
+						<view class="list-item" data-url="/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id={{aitem.goods_id}}&prom_type=9&group_id={{aitem.id}}" bindtap="{{aitem.actLen == 0 ? '':'go'}}">
 							<view class="flex ai-center">
 								<view class="img-container">
 									<image class="img-block" src="{{imghost + aitem.original_img}}" data-val="{{aitem.original_img}}"
@@ -68,7 +68,7 @@
 										<view class="flex jc_sb">
 											<progress class="pdr20 f1 progress" percent="{{filters.percent(aitem.num, aitem.group_num)}}" activeColor="#FF6768"
 											 backgroundColor="#d0d0d0" border-radius="12" stroke-width="12" data-content="{{aitem.num}}人已参团"></progress>
-											<view class="btn fs26 {{aitem.goods_num == 0 ? 'gray':''}}" wx:if="{{aitem.goods_num == 0}}">已抢光</view>
+											<view class="btn fs26 {{aitem.actLen == 0 ? 'gray':''}}" wx:if="{{aitem.actLen == 0}}">已抢光</view>
 											<view class="btn fs26" wx:else>去参团</view>
 										</view>
 									</view>
@@ -11,7 +11,7 @@
 	<view class="list">	
 		<block wx:for="{{list.pageData}}">
-			<view class="list-item" wx:if="{{item.status == 1}}" bindtap="go" data-url="/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id={{item.goods_id}}&prom_type=9&group_id={{item.id}}">
+			<view class="list-item" wx:if="{{item.status == 1}}" bindtap="{{item.actLen == 0 ? '':'go'}}" data-url="/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id={{item.goods_id}}&prom_type=9&group_id={{item.id}}">
 				<view class="flex ai-center">
 					<view class="img-container">
 						<image class="img-block" src="{{imghost + item.original_img}}" data-val="{{item.original_img}}"
@@ -26,7 +26,7 @@
 							</view>
 							<view class="flex jc_sb">
 								<progress class="pdr20 f1 progress" percent="{{filters.percent(item.num, item.group_num)}}" activeColor="#FF6768" backgroundColor="#d0d0d0" border-radius="12" stroke-width="12" data-content="{{item.num}}人已参团"></progress>
-								<view class="btn fs26 {{item.goods_num == 0 ? 'gray':''}}" wx:if="{{item.goods_num == 0}}">已抢光</view>
+								<view class="btn fs26 {{item.actLen == 0 ? 'gray':''}}" wx:if="{{item.actLen == 0}}">已抢光</view>
 								<view class="btn fs26" wx:else>去参团</view>
 							</view>
 						</view>
@@ -76,7 +76,10 @@ Page({
 	onLoad: function(t) {
-		console.log('收到的传参', t);
+		// console.log('收到的传参', t);
+		wx.setNavigationBarTitle({
+		  title: '填写订单',
+		});
 		self = this;
 		this.setData({
 			is_b_now: t.is_bnow == undefined ? 0 : t.is_bnow,
@@ -243,7 +243,7 @@
 				</view>
 			</navigator>
 			<view class=" luck">
-				<view class="list-item" wx:for="{{luckGo_list}}" bindtap="go_url" data-aid="{{item.id}}" data-remark="2" data-url="/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id={{item.goods_id}}&group_id={{item.id}}" wx:if="{{item.status == 1}}">
+				<view class="list-item" wx:for="{{luckGo_list}}" bindtap="{{item.actLen == 0 ? '':'go_url'}}" data-aid="{{item.id}}" data-remark="2" data-url="/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id={{item.goods_id}}&group_id={{item.id}}" wx:if="{{item.status == 1}}">
 					<view class="flex ai-center">
 						<view class="img-container"><image class="img-block" src="{{url + item.original_img}}" data-val="{{item.original_img}}"
 							data-errorimg="luckGo_list[{{index}}].original_img" binderror="bind_bnerr2" lazy-load="true"></image></view>
@@ -257,7 +257,7 @@
 								</view>
 								<view class="flex jc_sb">
 									<progress class="pdr20 f1 progress" percent="{{filter.percent(item.num, item.group_num)}}" activeColor="#FF6768" backgroundColor="#d0d0d0" border-radius="12" stroke-width="12" data-content="{{item.num}}人已参团"></progress>
-									<view class="btn fs26 {{item.goods_num == 0 ? 'gray':''}}" wx:if="{{item.goods_num == 0}}">已抢光</view>
+									<view class="btn fs26 {{item.actLen == 0 ? 'gray':''}}" wx:if="{{item.actLen == 0}}">已抢光</view>
 									<view class="btn fs26" wx:else>去参团</view>
 									<!-- &title=狐狸3号测速003&prom_type=7&prom_id=468 -->
 								</view>
@@ -205,8 +205,14 @@ Page({
 											}
 								    }).then(res => {
 								        if(res.data.code==0){
-														// console.log('luckyGo', res.data.data[0]['team_status']);
-								            data[ind]['team_status'] = res.data.data[0]['team_status'];
+														// console.log('luckyGo+++++++++>>>', res.data.data);
+														// data[ind]['team_status'] = res.data.data[0]['team_status'];
+														if(res.data.data[0] && res.data.data[0]['team_status']) {
+															data[ind]['team_status'] = res.data.data[0]['team_status'];
+														} else {
+															data[ind]['team_status'] = 0;
+														};
+								            
 								            // data[ind]['ord_url']='/packageC/pages/presell/cart/cart';
 								        }
 								    })
@@ -593,7 +599,7 @@ Page({
             }
             //如果是预售的时候，
-            if(good.prom_type==8){
+            if(good.prom_type==8) {
                 await  getApp().request.promiseGet("/api/weshop/order/orderPresell/countBuyGoodsSum",{
                     data: {store_id: os.stoid, user_id: user_id, goods_id: good.goods_id, prom_id: good.prom_id},
                 }).then(e=>{
@@ -715,7 +721,7 @@ Page({
                     return false;
                 }
-            } else {
+            } else { 
                 if ((gg.prom_type == 1 || good.prom_type == 2 || gg.prom_type == 3 || gg.prom_type == 5 || gg.prom_type == 6 || gg.prom_type == 4)
                     && !good.is_collocation && !good.is_gift && !good.is_integral_normal && !good.is_pd_normal) {
                     var prom = null;
@@ -66,8 +66,8 @@
 			</block>
 			<!-- 幸运购 -->
 			<block wx:elif="{{item.order_goods[0].prom_type == 9}}">
-				<view wx:if="{{item.is_back ==1}}">已退款</view>
-				<view wx:if="{{item.pay_status ==1 && item.team_status == 0}}">已支付,待成团</view>
+				<view wx:if="{{item.is_back ==1 && item.pay_status ==1}}">已退款</view>
+				<view wx:elif="{{item.is_back == 0 && item.pay_status ==1 && item.team_status == 0}}">已支付,待成团</view>
 				<view wx:if="{{(item.order_status==0&&item.pay_status==0)}}">未支付</view>
 				<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0 && item.team_status == 2)}}">待发货</view>
 				<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1 && item.team_status == 2)}}">待收货</view>
@@ -108,7 +108,7 @@
 	    <view>
 				 <!-- url="/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id={{item.order_id}}" wx:if="{{item.order_goods[0].prom_type==9}}"
 				{{item.ord_url}}?order_id={{item.order_id}} -->
-	      <navigator class="detail_commodity flex-vertical padding" wx:for="{{item.order_goods}}" wx:for-item="goods"  wx:for-index="pinx" url="{{item.order_goods[0].prom_type==9 ? ('/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id=' + item.order_id):(item.ord_url + '?order_id=' + item.order_id)}}">
+	      <navigator class="detail_commodity flex-vertical padding" wx:for="{{item.order_goods}}" wx:for-item="goods"  wx:for-index="pinx" url="{{item.order_goods[0].prom_type==9 ? ('/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id=' + item.order_id + '&group_id=' + item.order_goods[0].prom_id):(item.ord_url + '?order_id=' + item.order_id)}}">
 	        <!-- 商品图片 -->
 	        <navigator class="rel">
 	          <image src="{{resourceUrl+goods.original_img}}" binderror="bind_bnerr" lazy-load="{{true}}" data-errorimg="orderList[{{index}}].order_goods[{{pinx}}].original_img"></image>
@@ -217,7 +217,7 @@
 	          <navigator class="commodity_To_evaluate flex-level View_evaluation" hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==1)}}" url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</navigator>
 	          <navigator class="commodity_To_evaluate flex-level View_evaluation" hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==2)}}" url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</navigator>
-				<navigator class="commodity_To_evaluate flex-level View_evaluation" url="/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id={{item.order_id}}" wx:if="{{item.order_goods[0].prom_type==9}}">订单详情</navigator>	 
+				<navigator class="commodity_To_evaluate flex-level View_evaluation" url="/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id={{item.order_id}}&&group_id={{item.order_goods[0].prom_id}}" wx:if="{{item.order_goods[0].prom_type==9}}">订单详情</navigator>	 
 			  <navigator class="commodity_To_evaluate flex-level View_evaluation" url="{{item.ord_url}}?order_id={{item.order_id}}" wx:else>订单详情</navigator>
 	          <block wx:if="{{!(item.has_rt || item.return_btn==2 || item.return_btn==4)}}">