diff --git a/common/api/shop.js b/common/api/shop.js index fb05bd6..8b65eef 100644 --- a/common/api/shop.js +++ b/common/api/shop.js @@ -339,7 +339,11 @@ export default { page, name_search: name_search }) - } + }, + // 是否弹出新人优惠券 + isNewmembervoucher() { + return vm.$u.post('Coupon/isNewmembervoucher') + }, } } diff --git a/pageB/coupon/details.vue b/pageB/coupon/details.vue new file mode 100644 index 0000000..3d368a2 --- /dev/null +++ b/pageB/coupon/details.vue @@ -0,0 +1,253 @@ + + + \ No newline at end of file diff --git a/pageB/sdetails/index.vue b/pageB/sdetails/index.vue index b75e7b0..29e1236 100644 --- a/pageB/sdetails/index.vue +++ b/pageB/sdetails/index.vue @@ -4,10 +4,10 @@ - ￥{{ groupbuyInfo.groupbuy_price }} - ￥{{ groupbuyInfo.goods_price }} + ￥{{ groupbuyInfo.groupbuy_price || '0.00' }} + ￥{{ groupbuyInfo.goods_price || '0.00' }} - 剩余数量{{ groupbuyInfo.inventory - groupbuyInfo.groupbuy_buy_quantity }}件 + 剩余数量{{ groupbuyInfo.inventory - groupbuyInfo.groupbuy_buy_quantity || '0' }}件 {{ isSrartSpike ? '结束倒计时' : '秒杀倒计时' }} @@ -24,8 +24,8 @@ - ￥{{ goodsInfo.goods_price }} - ￥{{ goodsInfo.goods_marketprice }} + ￥{{ goodsInfo.pintuan_price || '0.00' }} + ￥{{ goodsInfo.goods_price || '0.00' }} @@ -213,7 +213,7 @@ export default { sel: "", // 拼接的规格 quanxuan: false, // 规格是否选择 debounce: true, // 防止多次提交订单 - storeid:0 //店铺id + storeid:0 // 店铺id } }, components: { @@ -369,7 +369,7 @@ export default { // 普通商品详情 ordinaryDetails(id) { this.$u.api.getGoodsDetails({ id: id }).then((res)=>{ - console.log(res) + // console.log(res) if (res.errCode == 0) { this.evaluate = res.data.goods_evaluate_info; this.goodsInfo = res.data.goods; @@ -527,7 +527,7 @@ export default { xuanze(id){ // console.log(id) // 选择完规格后设商品type = 1 - this.type = 1; + // this.type = 1; this.getGoodsDetails(this.glist[id]) this.id = this.glist[id]; }, diff --git a/pageB/search/out.vue b/pageB/search/out.vue index 19e24cf..7833a07 100644 --- a/pageB/search/out.vue +++ b/pageB/search/out.vue @@ -80,11 +80,11 @@ export default { this.value = option.value; this.setViewHeight(); this.ShopSearch() - this.setNavSearchInput(); + this.setNavSearchInput(this.value); }, onNavigationBarSearchInputConfirmed(value) { this.value = value.text - console.log(this.value) + // console.log(this.value) this.ShopSearch() }, methods: { diff --git a/pageC/cart/ConfirmOrder.vue b/pageC/cart/ConfirmOrder.vue index 3915deb..a3ab02e 100644 --- a/pageC/cart/ConfirmOrder.vue +++ b/pageC/cart/ConfirmOrder.vue @@ -26,7 +26,7 @@ {{ goods.goods_name }} - ￥{{ goods.goods_price }} + ￥{{ goods.goods_total }} ×{{ goods.goods_num }} diff --git a/pageE/order/Details.vue b/pageE/order/Details.vue index 4104884..12015bf 100644 --- a/pageE/order/Details.vue +++ b/pageE/order/Details.vue @@ -154,6 +154,9 @@ export default { case 4: state = '2'; break; + case 5: + state = '3'; + break; case 6: state = '7'; break; diff --git a/pages.json b/pages.json index 5cafb39..7e95a04 100644 --- a/pages.json +++ b/pages.json @@ -237,6 +237,18 @@ "softinputMode": "adjustResize" } } + }, + { + "path": "coupon/details", + "style": { + "navigationBarTitleText": "优惠券介绍", + "app-plus": { + "titleNView": { + "titleColor": "#333333", + "backgroundColor": "#FFFFFF" + } + } + } } ] }, diff --git a/pages/index/index.vue b/pages/index/index.vue index 800a58a..e9752d2 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -87,6 +87,13 @@ + + + {{ newMemberCoupon.price }} + + + + @@ -198,6 +205,42 @@ margin: 200rpx auto 0; text-align: center; } + .u-coupon-popup { + /deep/ .u-mode-center-box { + background-color: transparent; + } + .coupon { + width: 750rpx; + height: 583rpx; + position: relative; + .price { + z-index: 3; + color: #EBB36E; + position: absolute; + font-size: 108rpx; + font-weight: bold; + top: 200rpx; + left: 50%; + transform: translate(-68%, 0); + } + .coupon-image { + width: 568rpx; + height: 583rpx; + position: absolute; + top: 0; + left: 50%; + transform: translate(-60%, 0); + } + .close-image { + position: absolute; + top: 0; + right: 155rpx; + width: 60rpx; + height: 60rpx; + } + } + } + diff --git a/static/image/common/21.png b/static/image/common/21.png new file mode 100644 index 0000000..411ef72 Binary files /dev/null and b/static/image/common/21.png differ diff --git a/static/image/common/22.png b/static/image/common/22.png new file mode 100644 index 0000000..a4843f5 Binary files /dev/null and b/static/image/common/22.png differ diff --git a/static/image/common/23.png b/static/image/common/23.png new file mode 100644 index 0000000..8dee11b Binary files /dev/null and b/static/image/common/23.png differ diff --git a/static/image/common/24.png b/static/image/common/24.png new file mode 100644 index 0000000..c701201 Binary files /dev/null and b/static/image/common/24.png differ diff --git a/static/image/common/25.png b/static/image/common/25.png new file mode 100644 index 0000000..7734c4c Binary files /dev/null and b/static/image/common/25.png differ diff --git a/static/image/common/26.png b/static/image/common/26.png new file mode 100644 index 0000000..7aa4c8f Binary files /dev/null and b/static/image/common/26.png differ diff --git a/static/image/common/27.png b/static/image/common/27.png new file mode 100644 index 0000000..db964e0 Binary files /dev/null and b/static/image/common/27.png differ diff --git a/static/image/common/28.png b/static/image/common/28.png new file mode 100644 index 0000000..5cf98e3 Binary files /dev/null and b/static/image/common/28.png differ diff --git a/static/image/common/29.png b/static/image/common/29.png new file mode 100644 index 0000000..370b866 Binary files /dev/null and b/static/image/common/29.png differ diff --git a/static/image/common/30.png b/static/image/common/30.png new file mode 100644 index 0000000..e162dd2 Binary files /dev/null and b/static/image/common/30.png differ