Commit 4af3f14d330ebb6a4a2fa626a4a643ddfd2e78c7
1 parent
cf078b76
幸运购活动列表是否已抢光判断
Showing
6 changed files
with
25 additions
and
16 deletions
components/diy_luckyGo/diy_luckyGo.wxml
| ... | ... | @@ -15,7 +15,7 @@ |
| 15 | 15 | <view wx:if="{{object.style==1}}"> |
| 16 | 16 | <swiper-item class="s_it" wx:for="{{goods_array}}"> |
| 17 | 17 | <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind"> |
| 18 | - <navigator url="/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id={{aitem.goods_id}}&prom_type=9&group_id={{aitem.id}}" | |
| 18 | + <navigator url="{{aitem.actLen == 0 ? '':('/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + aitem.goods_id + '&prom_type=9&group_id=' + aitem.id)}}" | |
| 19 | 19 | class="pd20 nav" hover-class="none"> |
| 20 | 20 | <view class=""> |
| 21 | 21 | <view class="img-container row" data-content="{{aitem.group_num}}人团"> |
| ... | ... | @@ -51,7 +51,7 @@ |
| 51 | 51 | <!-- 3个成一组，这里我们默认让它显示goods_array[0],控制显示数量在3个以内 --> |
| 52 | 52 | <block wx:if="{{index == 0}}"> |
| 53 | 53 | <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind"> |
| 54 | - <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"> | |
| 54 | + <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'}}"> | |
| 55 | 55 | <view class="flex ai-center"> |
| 56 | 56 | <view class="img-container"> |
| 57 | 57 | <image class="img-block" src="{{imghost + aitem.original_img}}" data-val="{{aitem.original_img}}" |
| ... | ... | @@ -68,7 +68,7 @@ |
| 68 | 68 | <view class="flex jc_sb"> |
| 69 | 69 | <progress class="pdr20 f1 progress" percent="{{filters.percent(aitem.num, aitem.group_num)}}" activeColor="#FF6768" |
| 70 | 70 | backgroundColor="#d0d0d0" border-radius="12" stroke-width="12" data-content="{{aitem.num}}人已参团"></progress> |
| 71 | - <view class="btn fs26 {{aitem.goods_num == 0 ? 'gray':''}}" wx:if="{{aitem.goods_num == 0}}">已抢光</view> | |
| 71 | + <view class="btn fs26 {{aitem.actLen == 0 ? 'gray':''}}" wx:if="{{aitem.actLen == 0}}">已抢光</view> | |
| 72 | 72 | <view class="btn fs26" wx:else>去参团</view> |
| 73 | 73 | </view> |
| 74 | 74 | </view> | ... | ... |
packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxml
| ... | ... | @@ -11,7 +11,7 @@ |
| 11 | 11 | |
| 12 | 12 | <view class="list"> |
| 13 | 13 | <block wx:for="{{list.pageData}}"> |
| 14 | - <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}}"> | |
| 14 | + <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}}"> | |
| 15 | 15 | <view class="flex ai-center"> |
| 16 | 16 | <view class="img-container"> |
| 17 | 17 | <image class="img-block" src="{{imghost + item.original_img}}" data-val="{{item.original_img}}" |
| ... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 | </view> |
| 27 | 27 | <view class="flex jc_sb"> |
| 28 | 28 | <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> |
| 29 | - <view class="btn fs26 {{item.goods_num == 0 ? 'gray':''}}" wx:if="{{item.goods_num == 0}}">已抢光</view> | |
| 29 | + <view class="btn fs26 {{item.actLen == 0 ? 'gray':''}}" wx:if="{{item.actLen == 0}}">已抢光</view> | |
| 30 | 30 | <view class="btn fs26" wx:else>去参团</view> |
| 31 | 31 | </view> |
| 32 | 32 | </view> | ... | ... |
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
| ... | ... | @@ -76,7 +76,10 @@ Page({ |
| 76 | 76 | |
| 77 | 77 | onLoad: function(t) { |
| 78 | 78 | |
| 79 | - console.log('收到的传参', t); | |
| 79 | + // console.log('收到的传参', t); | |
| 80 | + wx.setNavigationBarTitle({ | |
| 81 | + title: '填写订单', | |
| 82 | + }); | |
| 80 | 83 | self = this; |
| 81 | 84 | this.setData({ |
| 82 | 85 | is_b_now: t.is_bnow == undefined ? 0 : t.is_bnow, | ... | ... |
pages/index/index/index.wxml
| ... | ... | @@ -243,7 +243,7 @@ |
| 243 | 243 | </view> |
| 244 | 244 | </navigator> |
| 245 | 245 | <view class=" luck"> |
| 246 | - <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}}"> | |
| 246 | + <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}}"> | |
| 247 | 247 | <view class="flex ai-center"> |
| 248 | 248 | <view class="img-container"><image class="img-block" src="{{url + item.original_img}}" data-val="{{item.original_img}}" |
| 249 | 249 | data-errorimg="luckGo_list[{{index}}].original_img" binderror="bind_bnerr2" lazy-load="true"></image></view> |
| ... | ... | @@ -257,7 +257,7 @@ |
| 257 | 257 | </view> |
| 258 | 258 | <view class="flex jc_sb"> |
| 259 | 259 | <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> |
| 260 | - <view class="btn fs26 {{item.goods_num == 0 ? 'gray':''}}" wx:if="{{item.goods_num == 0}}">已抢光</view> | |
| 260 | + <view class="btn fs26 {{item.actLen == 0 ? 'gray':''}}" wx:if="{{item.actLen == 0}}">已抢光</view> | |
| 261 | 261 | <view class="btn fs26" wx:else>去参团</view> |
| 262 | 262 | <!-- &title=狐狸3号测速003&prom_type=7&prom_id=468 --> |
| 263 | 263 | </view> | ... | ... |
pages/user/order_list/order_list.js
| ... | ... | @@ -205,8 +205,14 @@ Page({ |
| 205 | 205 | } |
| 206 | 206 | }).then(res => { |
| 207 | 207 | if(res.data.code==0){ |
| 208 | - // console.log('luckyGo', res.data.data[0]['team_status']); | |
| 209 | - data[ind]['team_status'] = res.data.data[0]['team_status']; | |
| 208 | + // console.log('luckyGo+++++++++>>>', res.data.data); | |
| 209 | + // data[ind]['team_status'] = res.data.data[0]['team_status']; | |
| 210 | + if(res.data.data[0] && res.data.data[0]['team_status']) { | |
| 211 | + data[ind]['team_status'] = res.data.data[0]['team_status']; | |
| 212 | + } else { | |
| 213 | + data[ind]['team_status'] = 0; | |
| 214 | + }; | |
| 215 | + | |
| 210 | 216 | // data[ind]['ord_url']='/packageC/pages/presell/cart/cart'; |
| 211 | 217 | } |
| 212 | 218 | }) |
| ... | ... | @@ -593,7 +599,7 @@ Page({ |
| 593 | 599 | } |
| 594 | 600 | |
| 595 | 601 | //如果是预售的时候， |
| 596 | - if(good.prom_type==8){ | |
| 602 | + if(good.prom_type==8) { | |
| 597 | 603 | await getApp().request.promiseGet("/api/weshop/order/orderPresell/countBuyGoodsSum",{ |
| 598 | 604 | data: {store_id: os.stoid, user_id: user_id, goods_id: good.goods_id, prom_id: good.prom_id}, |
| 599 | 605 | }).then(e=>{ |
| ... | ... | @@ -715,7 +721,7 @@ Page({ |
| 715 | 721 | return false; |
| 716 | 722 | } |
| 717 | 723 | |
| 718 | - } else { | |
| 724 | + } else { | |
| 719 | 725 | 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) |
| 720 | 726 | && !good.is_collocation && !good.is_gift && !good.is_integral_normal && !good.is_pd_normal) { |
| 721 | 727 | var prom = null; | ... | ... |
pages/user/order_list/order_list.wxml
| ... | ... | @@ -66,8 +66,8 @@ |
| 66 | 66 | </block> |
| 67 | 67 | <!-- 幸运购 --> |
| 68 | 68 | <block wx:elif="{{item.order_goods[0].prom_type == 9}}"> |
| 69 | - <view wx:if="{{item.is_back ==1}}">已退款</view> | |
| 70 | - <view wx:if="{{item.pay_status ==1 && item.team_status == 0}}">已支付,待成团</view> | |
| 69 | + <view wx:if="{{item.is_back ==1 && item.pay_status ==1}}">已退款</view> | |
| 70 | + <view wx:elif="{{item.is_back == 0 && item.pay_status ==1 && item.team_status == 0}}">已支付,待成团</view> | |
| 71 | 71 | <view wx:if="{{(item.order_status==0&&item.pay_status==0)}}">未支付</view> |
| 72 | 72 | <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0 && item.team_status == 2)}}">待发货</view> |
| 73 | 73 | <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1 && item.team_status == 2)}}">待收货</view> |
| ... | ... | @@ -108,7 +108,7 @@ |
| 108 | 108 | <view> |
| 109 | 109 | <!-- url="/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id={{item.order_id}}" wx:if="{{item.order_goods[0].prom_type==9}}" |
| 110 | 110 | {{item.ord_url}}?order_id={{item.order_id}} --> |
| 111 | - <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)}}"> | |
| 111 | + <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)}}"> | |
| 112 | 112 | <!-- 商品图片 --> |
| 113 | 113 | <navigator class="rel"> |
| 114 | 114 | <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 @@ |
| 217 | 217 | <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> |
| 218 | 218 | <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> |
| 219 | 219 | |
| 220 | - <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> | |
| 220 | + <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> | |
| 221 | 221 | <navigator class="commodity_To_evaluate flex-level View_evaluation" url="{{item.ord_url}}?order_id={{item.order_id}}" wx:else>订单详情</navigator> |
| 222 | 222 | |
| 223 | 223 | <block wx:if="{{!(item.has_rt || item.return_btn==2 || item.return_btn==4)}}"> | ... | ... |