1 participants
-
Status changed to merged
-
mentioned in commit 983e62114360af739d4ad4ac1e7531ee78e06fd1
Showing
12 changed files
components/nav_box/nav_box.wxss
| 1 | .box_main{ | 1 | .box_main{ |
| 2 | - width:100rpx; | ||
| 3 | - height:100rpx; | 2 | + width:80rpx; |
| 3 | + height:80rpx; | ||
| 4 | background:#272636; | 4 | background:#272636; |
| 5 | transition:width 0.8s; | 5 | transition:width 0.8s; |
| 6 | -moz-transition:width 0.8s; /* Firefox 4 */ | 6 | -moz-transition:width 0.8s; /* Firefox 4 */ |
| @@ -18,16 +18,19 @@ | @@ -18,16 +18,19 @@ | ||
| 18 | } | 18 | } |
| 19 | 19 | ||
| 20 | .box_main .dian{ | 20 | .box_main .dian{ |
| 21 | - text-align: center; | ||
| 22 | - width:100rpx; | ||
| 23 | - height:100rpx; | ||
| 24 | - color: #ffff; | ||
| 25 | - font-size: 70rpx; | ||
| 26 | - background: none; | 21 | + text-align: center; |
| 22 | +width: 50rpx; | ||
| 23 | +height: 50rpx; | ||
| 24 | +color: #ffff; | ||
| 25 | +font-size: 50rpx; | ||
| 26 | +background: none; | ||
| 27 | + | ||
| 27 | } | 28 | } |
| 28 | 29 | ||
| 29 | .box_main .dian image{ | 30 | .box_main .dian image{ |
| 30 | - width:75rpx; height:30rpx;margin-top:36rpx; | 31 | + width: 60rpx; |
| 32 | +height: 20rpx; | ||
| 33 | +margin: 30rpx 0 0 10rpx; | ||
| 31 | } | 34 | } |
| 32 | 35 | ||
| 33 | .box_main.box_isopen .dian{ | 36 | .box_main.box_isopen .dian{ |
| @@ -46,14 +49,18 @@ | @@ -46,14 +49,18 @@ | ||
| 46 | .box_main .cl_list .item{ | 49 | .box_main .cl_list .item{ |
| 47 | display: inline-block; | 50 | display: inline-block; |
| 48 | width:100rpx; | 51 | width:100rpx; |
| 49 | - height:100rpx; | 52 | + height:80rpx; |
| 50 | text-align: center; | 53 | text-align: center; |
| 51 | - line-height: 100rpx; | 54 | + line-height: 80rpx; |
| 52 | color: #fff; | 55 | color: #fff; |
| 53 | vertical-align: top; | 56 | vertical-align: top; |
| 57 | + font-size: 32rpx; | ||
| 58 | + | ||
| 54 | } | 59 | } |
| 55 | 60 | ||
| 56 | .box_main .cl_list .item.big{ | 61 | .box_main .cl_list .item.big{ |
| 57 | - font-size: 70rpx;line-height: 90rpx; | 62 | + font-size: 70rpx; |
| 63 | +line-height: 70rpx; | ||
| 64 | + | ||
| 58 | } | 65 | } |
| 59 | 66 |
pages/cart/cart2/cart2.js
| @@ -1192,6 +1192,13 @@ Page({ | @@ -1192,6 +1192,13 @@ Page({ | ||
| 1192 | th.calculatePrice(); | 1192 | th.calculatePrice(); |
| 1193 | } | 1193 | } |
| 1194 | th.setData({open_quan:0}); | 1194 | th.setData({open_quan:0}); |
| 1195 | + }, | ||
| 1196 | + | ||
| 1197 | + cart_set_err:function(e){ | ||
| 1198 | + var txt = e.currentTarget.dataset.err; | ||
| 1199 | + var ob={}; | ||
| 1200 | + ob[txt] = this.data.imgUrl + "/miniapp/images/default_g_img.gif"; | ||
| 1201 | + this.setData(ob); | ||
| 1195 | } | 1202 | } |
| 1196 | 1203 | ||
| 1197 | }); | 1204 | }); |
pages/cart/cart2/cart2.wxml
| @@ -34,7 +34,8 @@ | @@ -34,7 +34,8 @@ | ||
| 34 | <view class="order-detail" wx:for="{{item.goods}}" wx:for-index="idx" wx:for-item="items"> | 34 | <view class="order-detail" wx:for="{{item.goods}}" wx:for-index="idx" wx:for-item="items"> |
| 35 | <!----商品图片-----> | 35 | <!----商品图片-----> |
| 36 | <view class="goods-img"> | 36 | <view class="goods-img"> |
| 37 | - <image class="wh100" src="{{items.original_img}}"></image> | 37 | + <image class="wh100" src="{{items.original_img}}" binderror='cart_set_err' |
| 38 | + data-err='cartlist[{{pidx}}].goods[{{idx}}].original_img' ></image> | ||
| 38 | </view> | 39 | </view> |
| 39 | <!----商品名称规格----> | 40 | <!----商品名称规格----> |
| 40 | <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{items.goods_id}}"> | 41 | <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{items.goods_id}}"> |
| @@ -108,7 +109,7 @@ | @@ -108,7 +109,7 @@ | ||
| 108 | <image class="dp" src='{{imgUrl}}/miniapp/images/dianpu.png'> </image> <view>门店：{{bn_pickname}}</view></view> | 109 | <image class="dp" src='{{imgUrl}}/miniapp/images/dianpu.png'> </image> <view>门店：{{bn_pickname}}</view></view> |
| 109 | <view class="order-detail"> | 110 | <view class="order-detail"> |
| 110 | <view class="goods-img"> | 111 | <view class="goods-img"> |
| 111 | - <image class="wh100" src="{{bn_goods.original_img}}"></image> | 112 | + <image class="wh100" src="{{bn_goods.original_img}}" binderror='cart_set_err' data-err="bn_goods.original_img"></image> |
| 112 | </view> | 113 | </view> |
| 113 | <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{bn_goods.goods_id}}"> | 114 | <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{bn_goods.goods_id}}"> |
| 114 | <view class="goods-name">{{bn_goods.goods_name}}</view> | 115 | <view class="goods-name">{{bn_goods.goods_name}}</view> |
pages/cart/cart2_pt/cart2_pt.js
| @@ -617,5 +617,13 @@ Page({ | @@ -617,5 +617,13 @@ Page({ | ||
| 617 | var ind=e.detail.value, txt = e.currentTarget.dataset.txt; | 617 | var ind=e.detail.value, txt = e.currentTarget.dataset.txt; |
| 618 | this.setData({ [txt]: ind }); | 618 | this.setData({ [txt]: ind }); |
| 619 | this.calculatePrice(); | 619 | this.calculatePrice(); |
| 620 | - } | 620 | + }, |
| 621 | + | ||
| 622 | + cart_set_err: function (e) { | ||
| 623 | + var txt = e.currentTarget.dataset.err; | ||
| 624 | + var ob = {}; | ||
| 625 | + ob[txt] = this.data.imgUrl + "/miniapp/images/default_g_img.gif"; | ||
| 626 | + this.setData(ob); | ||
| 627 | + } | ||
| 628 | + | ||
| 621 | }); | 629 | }); |
pages/cart/cart2_pt/cart2_pt.wxml
| @@ -31,7 +31,8 @@ | @@ -31,7 +31,8 @@ | ||
| 31 | <image class="dp" src='{{imgUrl}}/miniapp/images/dianpu.png'> </image> <view>门店：{{bn_pickname}}</view></view> | 31 | <image class="dp" src='{{imgUrl}}/miniapp/images/dianpu.png'> </image> <view>门店：{{bn_pickname}}</view></view> |
| 32 | <view class="order-detail"> | 32 | <view class="order-detail"> |
| 33 | <view class="goods-img"> | 33 | <view class="goods-img"> |
| 34 | - <image class="wh100" src="{{bn_goods.original_img}}"></image> | 34 | + <image class="wh100" src="{{bn_goods.original_img}}" |
| 35 | + binderror='cart_set_err' data-err="bn_goods.original_img"></image> | ||
| 35 | </view> | 36 | </view> |
| 36 | <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{bn_goods.goods_id}}"> | 37 | <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{bn_goods.goods_id}}"> |
| 37 | <view class="goods-name">{{bn_goods.goods_name}}</view> | 38 | <view class="goods-name">{{bn_goods.goods_name}}</view> |
pages/team/team_ping/team_ping.wxml
| @@ -15,7 +15,7 @@ | @@ -15,7 +15,7 @@ | ||
| 15 | <!--top--> | 15 | <!--top--> |
| 16 | <view class='pd-list-top'> | 16 | <view class='pd-list-top'> |
| 17 | <!-- <image src='{{iurl}}/miniapp/images/dianpu.png'></image> --> | 17 | <!-- <image src='{{iurl}}/miniapp/images/dianpu.png'></image> --> |
| 18 | - <text class='pd-wz'>订单编号:{{item.order_sn}}</text> | 18 | + <text class='pd-wz'>订单编号：{{item.order_sn}}</text> |
| 19 | <image class='jt' src='{{iurl}}/miniapp/images/icojiantou1.png'></image> | 19 | <image class='jt' src='{{iurl}}/miniapp/images/icojiantou1.png'></image> |
| 20 | </view> | 20 | </view> |
| 21 | <!--image--> | 21 | <!--image--> |
| @@ -25,7 +25,7 @@ | @@ -25,7 +25,7 @@ | ||
| 25 | <image src='{{item.gimage}}' binderror='images_err' data-err="order[{{index}}].gimage"></image> | 25 | <image src='{{item.gimage}}' binderror='images_err' data-err="order[{{index}}].gimage"></image> |
| 26 | </view> | 26 | </view> |
| 27 | <view> | 27 | <view> |
| 28 | - <view class='pd-img-wz1 ellipsis-2'>{{item.goods.goods_name}} | 28 | + <view class='pd-img-wz1 ellipsis-2'>{{item.order_goods[0].goods_name}} |
| 29 | </view> | 29 | </view> |
| 30 | 30 | ||
| 31 | 31 | ||
| @@ -33,7 +33,7 @@ | @@ -33,7 +33,7 @@ | ||
| 33 | <view class="flex"> | 33 | <view class="flex"> |
| 34 | <text class='fs24 xc-wc {{item.pt_status==1?"xc-rmbs":"xc-rmb"}}'>￥</text> | 34 | <text class='fs24 xc-wc {{item.pt_status==1?"xc-rmbs":"xc-rmb"}}'>￥</text> |
| 35 | <view class='pd-jg xc-wc'>{{item.order_goods[0].goods_price}}</view> | 35 | <view class='pd-jg xc-wc'>{{item.order_goods[0].goods_price}}</view> |
| 36 | - <view class="flex word-line xc-ash {{item.pt_status==1?'xc-rmbs':'xc-rmb'}}"><text class="fs24 xc-black">零售价:</text><text class="fs24 xc-wc">￥</text><text class="fs26 xc-wc">{{item.order_goods[0].market_price}}</text> </view> | 36 | + <view class="flex word-line xc-ash {{item.pt_status==1?'xc-rmbs':'xc-rmb'}}"><text class="fs24 xc-black">零售价：</text><text class="fs24 xc-wc">￥</text><text class="fs26 xc-wc">{{item.order_goods[0].market_price}}</text> </view> |
| 37 | </view> | 37 | </view> |
| 38 | <view class="xc-still-bad flex fs24" wx:if="{{item.pt_status==1}}"> | 38 | <view class="xc-still-bad flex fs24" wx:if="{{item.pt_status==1}}"> |
| 39 | <block wx:if="{{item.ct_num-item.tx.length>0}}"> | 39 | <block wx:if="{{item.ct_num-item.tx.length>0}}"> |
| @@ -70,9 +70,9 @@ | @@ -70,9 +70,9 @@ | ||
| 70 | </block> | 70 | </block> |
| 71 | <block wx:else> | 71 | <block wx:else> |
| 72 | <view class='foot-l-wz fs35' wx:if="item.is_zsorder==4"> | 72 | <view class='foot-l-wz fs35' wx:if="item.is_zsorder==4"> |
| 73 | - 定金:￥{{filters.toFix(item.order_amount+item.user_money,2)}}</view> | ||
| 74 | - <view class='foot-l-wz fs35' wx:else>金额:￥{{filters.toFix(item.order_amount+item.user_money,2)}}</view> | ||
| 75 | - <view class='foot-l-wz2 fs35' wx:if="{{item.pt_tail_money>0}}">尾款:￥{{item.pt_tail_money}}</view> | 73 | + 定金：￥{{filters.toFix(item.order_amount+item.user_money,2)}}</view> |
| 74 | + <view class='foot-l-wz fs35' wx:else>金额：￥{{filters.toFix(item.order_amount+item.user_money,2)}}</view> | ||
| 75 | + <view class='foot-l-wz2 fs35' wx:if="{{item.pt_tail_money>0}}">尾款：￥{{item.pt_tail_money}}</view> | ||
| 76 | </block> | 76 | </block> |
| 77 | 77 | ||
| 78 | </block> | 78 | </block> |
| @@ -106,7 +106,7 @@ | @@ -106,7 +106,7 @@ | ||
| 106 | 106 | ||
| 107 | </view> | 107 | </view> |
| 108 | <view class='bodytimecen flex' wx:if="{{item.pt_status==1}}"> | 108 | <view class='bodytimecen flex' wx:if="{{item.pt_status==1}}"> |
| 109 | - 剩余: | 109 | + 剩余： |
| 110 | <span>{{item.djs.day}}</span>天 | 110 | <span>{{item.djs.day}}</span>天 |
| 111 | <span>{{item.djs.hou}}</span>时 | 111 | <span>{{item.djs.hou}}</span>时 |
| 112 | <span>{{item.djs.min}}</span>分 | 112 | <span>{{item.djs.min}}</span>分 |
pages/team/team_ping/team_ping.wxss
| @@ -91,7 +91,7 @@ | @@ -91,7 +91,7 @@ | ||
| 91 | .pd-wz{ | 91 | .pd-wz{ |
| 92 | 92 | ||
| 93 | display: inline-block; | 93 | display: inline-block; |
| 94 | - font-size: 25rpx; | 94 | + font-size: 28rpx; |
| 95 | line-height: 76rpx; | 95 | line-height: 76rpx; |
| 96 | color: #000; | 96 | color: #000; |
| 97 | font-weight: normal; | 97 | font-weight: normal; |
| @@ -188,7 +188,7 @@ height:222rpx; | @@ -188,7 +188,7 @@ height:222rpx; | ||
| 188 | .foot-l-wz{ | 188 | .foot-l-wz{ |
| 189 | padding-right: 10rpx; | 189 | padding-right: 10rpx; |
| 190 | display: inline-block; | 190 | display: inline-block; |
| 191 | - font-size: 34rpx; | 191 | + font-size: 30rpx; |
| 192 | color: #e4374d; | 192 | color: #e4374d; |
| 193 | font-weight: normal; | 193 | font-weight: normal; |
| 194 | } | 194 | } |
| @@ -325,6 +325,7 @@ margin-right: 20rpx; | @@ -325,6 +325,7 @@ margin-right: 20rpx; | ||
| 325 | justify-content:flex-end; | 325 | justify-content:flex-end; |
| 326 | width:97%; | 326 | width:97%; |
| 327 | margin-bottom:40rpx; | 327 | margin-bottom:40rpx; |
| 328 | + line-height: 36rpx; | ||
| 328 | 329 | ||
| 329 | } | 330 | } |
| 330 | 331 | ||
| @@ -333,7 +334,7 @@ margin-bottom:40rpx; | @@ -333,7 +334,7 @@ margin-bottom:40rpx; | ||
| 333 | border-radius: 7rpx; | 334 | border-radius: 7rpx; |
| 334 | font-size: 25rpx; | 335 | font-size: 25rpx; |
| 335 | margin-right:8rpx; | 336 | margin-right:8rpx; |
| 336 | - line-height: 46rpx | 337 | + line-height: 36rpx |
| 337 | } | 338 | } |
| 338 | .xc-price-sn{ | 339 | .xc-price-sn{ |
| 339 | height:73rpx; | 340 | height:73rpx; |
| @@ -372,9 +373,9 @@ margin-left:5rpx; | @@ -372,9 +373,9 @@ margin-left:5rpx; | ||
| 372 | } | 373 | } |
| 373 | 374 | ||
| 374 | .foot-l-wz2{ | 375 | .foot-l-wz2{ |
| 375 | - font-size: 34rpx; | 376 | + font-size: 30rpx; |
| 376 | color: #e4374d; | 377 | color: #e4374d; |
| 377 | font-weight: normal; | 378 | font-weight: normal; |
| 378 | margin-top:-40rpx; | 379 | margin-top:-40rpx; |
| 379 | - margin-left:80rpx | 380 | + margin-left:98rpx |
| 380 | } | 381 | } |
| 381 | \ No newline at end of file | 382 | \ No newline at end of file |
pages/team/team_show/team_show.js
| @@ -293,6 +293,8 @@ Page({ | @@ -293,6 +293,8 @@ Page({ | ||
| 293 | teamlist = null, //活动表 | 293 | teamlist = null, //活动表 |
| 294 | goods = null, //商品 | 294 | goods = null, //商品 |
| 295 | teamgroup = null, //活動从表 | 295 | teamgroup = null, //活動从表 |
| 296 | + max_num = 0, | ||
| 297 | + min_price = 0, | ||
| 296 | th=this; | 298 | th=this; |
| 297 | 299 | ||
| 298 | //获取活动从表信息team_id,listno团编号（券号） | 300 | //获取活动从表信息team_id,listno团编号（券号） |
| @@ -365,6 +367,21 @@ Page({ | @@ -365,6 +367,21 @@ Page({ | ||
| 365 | if (res.data.code == 0) { | 367 | if (res.data.code == 0) { |
| 366 | teamlist = res.data.data; | 368 | teamlist = res.data.data; |
| 367 | goods_id = res.data.data.goods_id; | 369 | goods_id = res.data.data.goods_id; |
| 370 | + | ||
| 371 | + //----------查看阶梯团------------ | ||
| 372 | + if (teamlist.ct_rylist != "" && teamlist.ct_rylist != null && teamlist.ct_rylist != undefined) { | ||
| 373 | + var ct_rylist = JSON.parse(teamlist.ct_rylist); | ||
| 374 | + var max = 0; var pri = 0; | ||
| 375 | + ct_rylist.forEach(function (val, ind) { | ||
| 376 | + if (val.rynum > max) { | ||
| 377 | + max = val.rynum; | ||
| 378 | + pri = val.price; | ||
| 379 | + } | ||
| 380 | + }) | ||
| 381 | + max_num = max; | ||
| 382 | + min_price = pri; | ||
| 383 | + } | ||
| 384 | + | ||
| 368 | } | 385 | } |
| 369 | }) | 386 | }) |
| 370 | 387 | ||
| @@ -403,6 +420,26 @@ Page({ | @@ -403,6 +420,26 @@ Page({ | ||
| 403 | goods = res.data.data | 420 | goods = res.data.data |
| 404 | }) | 421 | }) |
| 405 | 422 | ||
| 423 | + //只装5个 | ||
| 424 | + var ordertx2 = [], sf_num = 0, ct_nun = teamlist.ct_num; | ||
| 425 | + if (max_num) { | ||
| 426 | + ct_nun = parseInt(max_num); | ||
| 427 | + if (ct_nun < ordertx.length) ct_nun = ordertx.length; | ||
| 428 | + } | ||
| 429 | + | ||
| 430 | + if (ct_nun > 5) ct_nun = 5; | ||
| 431 | + for (var i = 0; i < ct_nun; i++) { | ||
| 432 | + if (i >= ordertx.length) sf_num++ | ||
| 433 | + else | ||
| 434 | + ordertx2.push(ordertx[i]); | ||
| 435 | + } | ||
| 436 | + | ||
| 437 | + var sf_arr = []; | ||
| 438 | + for (var i = 0; i < sf_num; i++) { | ||
| 439 | + sf_arr.push(i); | ||
| 440 | + } | ||
| 441 | + | ||
| 442 | + | ||
| 406 | 443 | ||
| 407 | if(th.data.is_group_end==1 || th.data.is_group_end==2 ){ | 444 | if(th.data.is_group_end==1 || th.data.is_group_end==2 ){ |
| 408 | getApp().confirmBox(th.data.end_text); | 445 | getApp().confirmBox(th.data.end_text); |
| @@ -446,6 +483,7 @@ Page({ | @@ -446,6 +483,7 @@ Page({ | ||
| 446 | //获取下redis长度，如果团已经弄完，或者拼单已经卖完 | 483 | //获取下redis长度，如果团已经弄完，或者拼单已经卖完 |
| 447 | //设置值 | 484 | //设置值 |
| 448 | ee.setData({ | 485 | ee.setData({ |
| 486 | + ordertx2: ordertx2, | ||
| 449 | ordertx: ordertx, | 487 | ordertx: ordertx, |
| 450 | teamlist: teamlist, | 488 | teamlist: teamlist, |
| 451 | teamgroup: teamgroup, | 489 | teamgroup: teamgroup, |
| @@ -453,6 +491,7 @@ Page({ | @@ -453,6 +491,7 @@ Page({ | ||
| 453 | pageteam: pageteam, | 491 | pageteam: pageteam, |
| 454 | image: original_img, | 492 | image: original_img, |
| 455 | is_show:1, | 493 | is_show:1, |
| 494 | + sf_arr: sf_arr | ||
| 456 | }); | 495 | }); |
| 457 | ee.countDown2(); | 496 | ee.countDown2(); |
| 458 | //---设置门店--- | 497 | //---设置门店--- |
pages/team/team_show/team_show.wxml
| @@ -55,22 +55,20 @@ | @@ -55,22 +55,20 @@ | ||
| 55 | </view> | 55 | </view> |
| 56 | <!--头像--> | 56 | <!--头像--> |
| 57 | <view class="flex_tou"> | 57 | <view class="flex_tou"> |
| 58 | - <view class='bodyimg flex-level' wx:for="{{ordertx}}" wx:key> | 58 | + <view class='bodyimg flex-level' wx:for="{{ordertx2}}" wx:key> |
| 59 | <view class='d'> | 59 | <view class='d'> |
| 60 | - <image src='{{item.head_pic}}'></image> | ||
| 61 | - <span wx:if="{{item.is_pt_tz==1}}">团长</span> | 60 | + <image src='{{item.head_pic}}'></image> |
| 61 | + <span wx:if="{{item.is_pt_tz==1}}">团长</span> | ||
| 62 | + </view> | ||
| 62 | </view> | 63 | </view> |
| 63 | - <view class='d'> | ||
| 64 | - <image src='{{imageurl}}/miniapp/images/shafa.png'></image> | 64 | + <view class='d' wx:for="{{sf_arr}}" > |
| 65 | + <image src='{{iurl}}/miniapp/images/shafa.png'></image> | ||
| 66 | + </view> | ||
| 67 | + <view class='xc-ellipsis-img' wx:if="{{ordertx.length>5}}"> | ||
| 68 | + <image style='width:56rpx;height:56rpx;margin-left:10rpx;' src="{{imageurl}}/miniapp/images/xc_ellipsis.png"></image> | ||
| 65 | </view> | 69 | </view> |
| 66 | - | ||
| 67 | - <view class='xc-ellipsis-img' wx:if="{{length>5}}"> | ||
| 68 | - <image style='width:56rpx;height:56rpx;margin-left:10rpx;' src="{{imageurl}}/miniapp/images/xc_ellipsis.png"></image> | ||
| 69 | - </view> | ||
| 70 | - </view> | ||
| 71 | 70 | ||
| 72 | 71 | ||
| 73 | - | ||
| 74 | </view> | 72 | </view> |
| 75 | 73 | ||
| 76 | <view class='bodytime'> | 74 | <view class='bodytime'> |
pages/team/team_show/team_show.wxss
pages/team/team_success/team_success.js
| @@ -185,7 +185,11 @@ Page({ | @@ -185,7 +185,11 @@ Page({ | ||
| 185 | 185 | ||
| 186 | 186 | ||
| 187 | //只装5个 | 187 | //只装5个 |
| 188 | - var ordertx2=[],sf_num=0,ct_nun=teamlist.ct_num;; | 188 | + var ordertx2=[],sf_num=0,ct_nun=teamlist.ct_num; |
| 189 | + if(max_num){ | ||
| 190 | + ct_nun=parseInt(max_num); | ||
| 191 | + if (ct_nun < ordertx.length) ct_nun = ordertx.length; | ||
| 192 | + } | ||
| 189 | 193 | ||
| 190 | if(ct_nun>5) ct_nun=5; | 194 | if(ct_nun>5) ct_nun=5; |
| 191 | for(var i=0;i<ct_nun;i++){ | 195 | for(var i=0;i<ct_nun;i++){ |
pages/team/team_success/team_success.wxml
| @@ -45,9 +45,15 @@ | @@ -45,9 +45,15 @@ | ||
| 45 | <!-- 阶梯团 --> | 45 | <!-- 阶梯团 --> |
| 46 | <view class='bodytop' wx:if="{{teamlist.kttype==3&& p_status==1}}"> | 46 | <view class='bodytop' wx:if="{{teamlist.kttype==3&& p_status==1}}"> |
| 47 | 当前价格 | 47 | 当前价格 |
| 48 | - <text class="xc-wc">¥{{ct_price}}</text>, 还差 | ||
| 49 | - <text class="xc-wc">{{max_num-ordertx.length}}</text>人享受最低价格 | ||
| 50 | - <text class="xc-wc">￥{{min_price}}</text> | 48 | + <text class="xc-wc">¥{{ct_price}}</text>, |
| 49 | + <block wx:if="{{max_num-ordertx.length>0}}"> | ||
| 50 | + <text class="xc-wc">还差{{max_num-ordertx.length}}</text>人享受最低价格<text class="xc-wc">￥{{min_price}}</text> | ||
| 51 | + </block> | ||
| 52 | + <block wx:else> | ||
| 53 | + 该团已经拼购到最低价了哦~ | ||
| 54 | + </block> | ||
| 55 | + | ||
| 56 | + | ||
| 51 | </view> | 57 | </view> |
| 52 | <!-- 拼团成功 --> | 58 | <!-- 拼团成功 --> |
| 53 | <view class="xc-ptcomplete-ladder flex-level fs28" wx:if="{{teamlist.kttype==3&&p_status==2}}"> | 59 | <view class="xc-ptcomplete-ladder flex-level fs28" wx:if="{{teamlist.kttype==3&&p_status==2}}"> |