diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 99b8d55..63a297b 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -1061,7 +1061,7 @@ Page({ if (this.data.prom_type == 1 || this.data.prom_type == 2) { this.getactLen(function (num) { if (num < th.data.goodsInputNum) { - getApp().my_warnning("秒杀库存不足!", 0, th); + getApp().my_warnning("活动库存不足!", 0, th); return false; } else { th.add_cart_func(t); diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js index e08bef1..0268b85 100644 --- a/pages/goods/goodsList/goodsList.js +++ b/pages/goods/goodsList/goodsList.js @@ -233,7 +233,7 @@ Page({ var rd= { store_id: oo.stoid, presell_id: presell_id, - goods_id: val.goods_id + goods_id: item.goods_id } //------获取预售从表---------- await getApp().request.promiseGet(url1, { diff --git a/pages/team/team_show/team_show.js b/pages/team/team_show/team_show.js index 43edf06..83ba2f1 100644 --- a/pages/team/team_show/team_show.js +++ b/pages/team/team_show/team_show.js @@ -270,14 +270,11 @@ Page({ var num = this.data.num; var ii = this.data.ii; var minusStatus = num > 1 ? 'normal' : 'disable'; - if (ii == 0) { - getApp().showWarning("请选择门店"); return false; - } - if (ii == 1) { + num++; //要判断库存数量,限购数量 th.check_num(num,minusStatus); - } + }, async check_num(num,minusStatus){ diff --git a/pages/team/team_show/team_show.wxml b/pages/team/team_show/team_show.wxml index bbe5d82..f745637 100644 --- a/pages/team/team_show/team_show.wxml +++ b/pages/team/team_show/team_show.wxml @@ -255,7 +255,7 @@ - - 1 + 1 + diff --git a/pages/user/coupons/coupons.js b/pages/user/coupons/coupons.js index e69de90..d597009 100644 --- a/pages/user/coupons/coupons.js +++ b/pages/user/coupons/coupons.js @@ -188,7 +188,7 @@ Page({ */ qrcode:function(val){ // console.log(val); - // barcode('barcode', val, 600,160); + barcode('barcode', val, 600,160); qrcode('qrcode', val, 300, 300); }, diff --git a/pages/user/coupons/coupons.wxml b/pages/user/coupons/coupons.wxml index 8192f42..6fc738d 100644 --- a/pages/user/coupons/coupons.wxml +++ b/pages/user/coupons/coupons.wxml @@ -165,14 +165,18 @@ {{filter.getNum(details[useIndex].Sum)}}元微券 - {{filter.getNum(details[useIndex].Sum)}} - + + + + + {{details[useIndex].CashRepNo}} + {{details[useIndex].no}} + + - {{details[useIndex].CashRepNo}} - {{details[useIndex].no}} - + 有效期:{{details[useIndex].BeginDate==null ? " " : time.replace_time2(details[useIndex].BeginDate)}} 至 {{time.replace_time2(details[useIndex].ValidDate)}} 有效期:{{details[useIndex].use_start_time==null ? " " : time.format_time(details[useIndex].use_start_time)}} 至 {{time.format_time(details[useIndex].use_end_time)}} 有效期:不限 @@ -181,62 +185,5 @@ - - - - - - - - - + diff --git a/pages/user/coupons/coupons.wxss b/pages/user/coupons/coupons.wxss index 3112183..e28dc91 100644 --- a/pages/user/coupons/coupons.wxss +++ b/pages/user/coupons/coupons.wxss @@ -322,12 +322,12 @@ color:#999999; font-family:'SimHei',Arial; } /* 点击条形 */ +.bar-container { + padding: 40rpx 20rpx 20rpx 20rpx; +} .barcode { - height: 320rpx; - flex-direction: column; - justify-content: center; - align-items: center; - margin-left: 30rpx; + width: 100%; + height: 100rpx; } /* 二维码边框*/ .qrcode_rim { diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml index 5dd50ce..4735e7b 100644 --- a/pages/user/order_list/order_list.wxml +++ b/pages/user/order_list/order_list.wxml @@ -97,6 +97,7 @@ 秒杀 团购 + 幸运购 @@ -179,11 +180,11 @@ - + 取消订单 拼团失败 - + 申请退款 申请退款 @@ -194,8 +195,9 @@ - - 订单详情 + + 订单详情 + 订单详情 @@ -221,9 +223,9 @@ 立即支付 - + 再来一单 + data-index="{{index}}">再来一单