diff --git a/components/nav_box/nav_box.wxss b/components/nav_box/nav_box.wxss index 3885ad2..6356b8e 100644 --- a/components/nav_box/nav_box.wxss +++ b/components/nav_box/nav_box.wxss @@ -1,6 +1,6 @@ .box_main{ - width:100rpx; - height:100rpx; + width:80rpx; + height:80rpx; background:#272636; transition:width 0.8s; -moz-transition:width 0.8s; /* Firefox 4 */ @@ -18,16 +18,19 @@ } .box_main .dian{ - text-align: center; - width:100rpx; - height:100rpx; - color: #ffff; - font-size: 70rpx; - background: none; + text-align: center; +width: 50rpx; +height: 50rpx; +color: #ffff; +font-size: 50rpx; +background: none; + } .box_main .dian image{ - width:75rpx; height:30rpx;margin-top:36rpx; + width: 60rpx; +height: 20rpx; +margin: 30rpx 0 0 10rpx; } .box_main.box_isopen .dian{ @@ -46,14 +49,18 @@ .box_main .cl_list .item{ display: inline-block; width:100rpx; - height:100rpx; + height:80rpx; text-align: center; - line-height: 100rpx; + line-height: 80rpx; color: #fff; vertical-align: top; + font-size: 32rpx; + } .box_main .cl_list .item.big{ - font-size: 70rpx;line-height: 90rpx; + font-size: 70rpx; +line-height: 70rpx; + } diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index 6529af5..13a8eb4 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -1192,6 +1192,13 @@ Page({ th.calculatePrice(); } th.setData({open_quan:0}); + }, + + cart_set_err:function(e){ + var txt = e.currentTarget.dataset.err; + var ob={}; + ob[txt] = this.data.imgUrl + "/miniapp/images/default_g_img.gif"; + this.setData(ob); } }); diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml index 36f99a4..f8491a3 100644 --- a/pages/cart/cart2/cart2.wxml +++ b/pages/cart/cart2/cart2.wxml @@ -34,7 +34,8 @@ - + @@ -108,7 +109,7 @@ 门店：{{bn_pickname}} - + {{bn_goods.goods_name}} diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js index b89c832..190a2d6 100644 --- a/pages/cart/cart2_pt/cart2_pt.js +++ b/pages/cart/cart2_pt/cart2_pt.js @@ -617,5 +617,13 @@ Page({ var ind=e.detail.value, txt = e.currentTarget.dataset.txt; this.setData({ [txt]: ind }); this.calculatePrice(); - } + }, + + cart_set_err: function (e) { + var txt = e.currentTarget.dataset.err; + var ob = {}; + ob[txt] = this.data.imgUrl + "/miniapp/images/default_g_img.gif"; + this.setData(ob); + } + }); diff --git a/pages/cart/cart2_pt/cart2_pt.wxml b/pages/cart/cart2_pt/cart2_pt.wxml index 04b2851..a6a51a1 100644 --- a/pages/cart/cart2_pt/cart2_pt.wxml +++ b/pages/cart/cart2_pt/cart2_pt.wxml @@ -31,7 +31,8 @@ 门店：{{bn_pickname}} - + {{bn_goods.goods_name}} diff --git a/pages/team/team_ping/team_ping.wxml b/pages/team/team_ping/team_ping.wxml index 3d233e3..4f60b02 100644 --- a/pages/team/team_ping/team_ping.wxml +++ b/pages/team/team_ping/team_ping.wxml @@ -15,7 +15,7 @@ - 订单编号:{{item.order_sn}} + 订单编号：{{item.order_sn}} @@ -25,7 +25,7 @@ - {{item.goods.goods_name}} + {{item.order_goods[0].goods_name}} @@ -33,7 +33,7 @@ ￥ {{item.order_goods[0].goods_price}} - 零售价:￥{{item.order_goods[0].market_price}} + 零售价：￥{{item.order_goods[0].market_price}} @@ -70,9 +70,9 @@ - 定金:￥{{filters.toFix(item.order_amount+item.user_money,2)}} - 金额:￥{{filters.toFix(item.order_amount+item.user_money,2)}} - 尾款:￥{{item.pt_tail_money}} + 定金：￥{{filters.toFix(item.order_amount+item.user_money,2)}} + 金额：￥{{filters.toFix(item.order_amount+item.user_money,2)}} + 尾款：￥{{item.pt_tail_money}} @@ -106,7 +106,7 @@ - 剩余: + 剩余： {{item.djs.day}}天 {{item.djs.hou}}时 {{item.djs.min}}分 diff --git a/pages/team/team_ping/team_ping.wxss b/pages/team/team_ping/team_ping.wxss index bc72682..5b80715 100644 --- a/pages/team/team_ping/team_ping.wxss +++ b/pages/team/team_ping/team_ping.wxss @@ -91,7 +91,7 @@ .pd-wz{ display: inline-block; - font-size: 25rpx; + font-size: 28rpx; line-height: 76rpx; color: #000; font-weight: normal; @@ -188,7 +188,7 @@ height:222rpx; .foot-l-wz{ padding-right: 10rpx; display: inline-block; - font-size: 34rpx; + font-size: 30rpx; color: #e4374d; font-weight: normal; } @@ -325,6 +325,7 @@ margin-right: 20rpx; justify-content:flex-end; width:97%; margin-bottom:40rpx; + line-height: 36rpx; } @@ -333,7 +334,7 @@ margin-bottom:40rpx; border-radius: 7rpx; font-size: 25rpx; margin-right:8rpx; - line-height: 46rpx + line-height: 36rpx } .xc-price-sn{ height:73rpx; @@ -372,9 +373,9 @@ margin-left:5rpx; } .foot-l-wz2{ - font-size: 34rpx; + font-size: 30rpx; color: #e4374d; font-weight: normal; margin-top:-40rpx; - margin-left:80rpx + margin-left:98rpx } \ No newline at end of file diff --git a/pages/team/team_show/team_show.js b/pages/team/team_show/team_show.js index 9675390..8432fdc 100644 --- a/pages/team/team_show/team_show.js +++ b/pages/team/team_show/team_show.js @@ -293,6 +293,8 @@ Page({ teamlist = null, //活动表 goods = null, //商品 teamgroup = null, //活動从表 + max_num = 0, + min_price = 0, th=this; //获取活动从表信息team_id,listno团编号（券号） @@ -365,6 +367,21 @@ Page({ if (res.data.code == 0) { teamlist = res.data.data; goods_id = res.data.data.goods_id; + + //----------查看阶梯团------------ + if (teamlist.ct_rylist != "" && teamlist.ct_rylist != null && teamlist.ct_rylist != undefined) { + var ct_rylist = JSON.parse(teamlist.ct_rylist); + var max = 0; var pri = 0; + ct_rylist.forEach(function (val, ind) { + if (val.rynum > max) { + max = val.rynum; + pri = val.price; + } + }) + max_num = max; + min_price = pri; + } + } }) @@ -403,6 +420,26 @@ Page({ goods = res.data.data }) + //只装5个 + var ordertx2 = [], sf_num = 0, ct_nun = teamlist.ct_num; + if (max_num) { + ct_nun = parseInt(max_num); + if (ct_nun < ordertx.length) ct_nun = ordertx.length; + } + + if (ct_nun > 5) ct_nun = 5; + for (var i = 0; i < ct_nun; i++) { + if (i >= ordertx.length) sf_num++ + else + ordertx2.push(ordertx[i]); + } + + var sf_arr = []; + for (var i = 0; i < sf_num; i++) { + sf_arr.push(i); + } + + if(th.data.is_group_end==1 || th.data.is_group_end==2 ){ getApp().confirmBox(th.data.end_text); @@ -446,6 +483,7 @@ Page({ //获取下redis长度，如果团已经弄完，或者拼单已经卖完 //设置值 ee.setData({ + ordertx2: ordertx2, ordertx: ordertx, teamlist: teamlist, teamgroup: teamgroup, @@ -453,6 +491,7 @@ Page({ pageteam: pageteam, image: original_img, is_show:1, + sf_arr: sf_arr }); ee.countDown2(); //---设置门店--- diff --git a/pages/team/team_show/team_show.wxml b/pages/team/team_show/team_show.wxml index cb36f3f..38a8090 100644 --- a/pages/team/team_show/team_show.wxml +++ b/pages/team/team_show/team_show.wxml @@ -55,22 +55,20 @@ - + - - 团长 + + 团长 + - - + + + + + - - - - - - diff --git a/pages/team/team_show/team_show.wxss b/pages/team/team_show/team_show.wxss index 5a609a0..6b3eba4 100644 --- a/pages/team/team_show/team_show.wxss +++ b/pages/team/team_show/team_show.wxss @@ -102,7 +102,7 @@ page { /* display: flex; justify-content: center; align-items: center; */ - width:590rpx; + } diff --git a/pages/team/team_success/team_success.js b/pages/team/team_success/team_success.js index b13191d..cc637a3 100644 --- a/pages/team/team_success/team_success.js +++ b/pages/team/team_success/team_success.js @@ -185,7 +185,11 @@ Page({ //只装5个 - var ordertx2=[],sf_num=0,ct_nun=teamlist.ct_num;; + var ordertx2=[],sf_num=0,ct_nun=teamlist.ct_num; + if(max_num){ + ct_nun=parseInt(max_num); + if (ct_nun < ordertx.length) ct_nun = ordertx.length; + } if(ct_nun>5) ct_nun=5; for(var i=0;i 当前价格 - ¥{{ct_price}}, 还差 - {{max_num-ordertx.length}}人享受最低价格 - ￥{{min_price}} + ¥{{ct_price}}, + + 还差{{max_num-ordertx.length}}人享受最低价格￥{{min_price}} + + + 该团已经拼购到最低价了哦~ + + +