diff --git a/pages/goods/details.vue b/pages/goods/details.vue
index b87ccd1..43c5e01 100644
--- a/pages/goods/details.vue
+++ b/pages/goods/details.vue
@@ -116,6 +116,9 @@
满{{item.full}}可用
+
+
+
提货券
@@ -202,12 +205,15 @@
userLogin.Login()
return
}
- this.$Router.push({
- name: 'Buy',
- params: {
- skuId: this.goodsObj.skus[0].sku_id,
- qty : this.goodsObj.skus[0].number
- }
+ // this.$Router.push({
+ // name: 'Buy',
+ // params: {
+ // skuId: this.goodsObj.skus[0].sku_id,
+ // qty : this.goodsObj.skus[0].number
+ // }
+ // })
+ uni.navigateTo({
+ url: '/pages/property/coupon/confirmOrder?qty=1&type=2&goods_sku_id=' + this.goodsObj.skus[0].sku_id
})
},
// 打开微信小程序
@@ -637,9 +643,10 @@
overflow: hidden;
position: relative;
margin-top: $margin;
+ // background-color: red;
.coupons-tips {
// background-color: #211e17;
- background-image: linear-gradient(to right, #f8e5c0, #d6a46a);
+ background-image: linear-gradient(to right, #f8e5c0, #d6a46a);
color: #8d4928;
position: absolute;
border-radius: 0 0 20rpx 0;
@@ -648,6 +655,7 @@
line-height: 34rpx;
left: 0;
top: 0;
+ z-index: 10;
.coupons-tips-text {
font-size: 24rpx;
transform:scale(.85);
@@ -661,6 +669,11 @@
text-align: center;
padding: $padding - 10 0;
border-right: 2rpx dashed #eccdd4;
+ .coupon-left-img{
+ width: 180rpx;
+ height: 100rpx;
+ border-radius: 20rpx;
+ }
.coupons-number {
font-size: 40rpx;
font-weight: 600;
diff --git a/pages/order/buy.vue b/pages/order/buy.vue
index 32eb9b5..6280756 100644
--- a/pages/order/buy.vue
+++ b/pages/order/buy.vue
@@ -20,7 +20,7 @@
{{amount}}
-
+
@@ -134,7 +134,6 @@
// 选择支付类型
payType(e){
console.log(e.detail.value)
-
this.payValue = e.detail.value
},
//数量变化
@@ -149,7 +148,7 @@
goods_sku_id : this.$Route.query.skuId,
qty : this.qty,
coupon_grant_id : this.couponId,
- type : 1,
+ type : this.payValue === 'wx'?2:1,
remark : 'app订单,易货产品',
channel : 'app'
}, 'POST').then(res=>{
diff --git a/pages/property/coupon/confirmOrder.vue b/pages/property/coupon/confirmOrder.vue
index fac3a26..c69437f 100644
--- a/pages/property/coupon/confirmOrder.vue
+++ b/pages/property/coupon/confirmOrder.vue
@@ -148,11 +148,12 @@
this.coupon_price = res.coupon_price
} else {
this.order_no = res.order_no
- this.$refs.uToast.show({
- title: '下单成功',
- duration: 1888,
- type: 'primary',
- })
+ // this.$refs.uToast.show({
+ // title: '下单成功',
+ // duration: 1888,
+ // type: 'primary',
+ // })
+
this.nowPay()
}
}).catch(err => {
@@ -190,8 +191,9 @@
}
apiUrl(data).then(res => {
if (this.selectTypeId === '2') {
+ console.log(typeof res)
+ if (typeof res === 'string') {
let payInfo = JSON.parse(res)
- if (payInfo.timestamp) {
// app 支付未完。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。
diff --git a/unpackage/dist/dev/app-plus/app-service.js b/unpackage/dist/dev/app-plus/app-service.js
index a323f6f..a5f42f6 100644
Binary files a/unpackage/dist/dev/app-plus/app-service.js and b/unpackage/dist/dev/app-plus/app-service.js differ
diff --git a/unpackage/dist/dev/app-plus/app-view.js b/unpackage/dist/dev/app-plus/app-view.js
index 49bd1be..26cc3fc 100644
--- a/unpackage/dist/dev/app-plus/app-view.js
+++ b/unpackage/dist/dev/app-plus/app-view.js
@@ -22716,7 +22716,7 @@ var render = function() {
),
attrs: { _i: "61-" + $34 }
},
- [_vm._v("代金券")]
+ [_vm._v("代金券11")]
)
: _c(
"v-uni-text",