diff --git a/pages/bargain/bargain.wxml b/pages/bargain/bargain.wxml
index 7f487f3..1dddbfe 100644
--- a/pages/bargain/bargain.wxml
+++ b/pages/bargain/bargain.wxml
@@ -30,7 +30,8 @@
{{item.title}}
{{item.subTitle}}
- 距砍价到{{item.salePrice/100}}元还差:{{item.pressCurrentValue/100}}元
+ 距砍价到{{item.salePrice/100}}元还差:
+ {{item.pressCurrentValue/100}}元
已砍价到底价:{{item.salePrice/100}}元
diff --git a/pages/bargain/bargain.wxss b/pages/bargain/bargain.wxss
index df6345d..f565eff 100644
--- a/pages/bargain/bargain.wxss
+++ b/pages/bargain/bargain.wxss
@@ -164,7 +164,11 @@ page{
padding-bottom: 100rpx;
}
.mr{
- margin-top: 60rpx;
+ height: 40rpx;
+ line-height: 40rpx;
+}
+.txt004{
+ margin-top: 10rpx;
}
.market {
width: 100%;
diff --git a/pages/bargain/bargainDatail/bargainDatail.js b/pages/bargain/bargainDatail/bargainDatail.js
index 7f68ce9..2819a9f 100644
--- a/pages/bargain/bargainDatail/bargainDatail.js
+++ b/pages/bargain/bargainDatail/bargainDatail.js
@@ -17,7 +17,8 @@ Page({
sec: null,
showPage: false,
discountStatus:null,
- disabled:false
+ disabled:false,
+ display:"block!important"
},
/**
@@ -205,6 +206,8 @@ Page({
},
payOrderUpdate: (orderId, payOrderId, status, reason, type, _this) => {
let that = this;
+ console.log(that)
+ console.log(_this)
// 支付成功
Http.post({
url: config.api.payOrderUpdate,
@@ -216,7 +219,10 @@ Page({
}
})
.then(res => {
- wx.hideLoading()
+ wx.hideLoading();
+ _this.setData({
+ display: "none!important",
+ })
// 有价券
if (!type && type != 'free') {
wx.navigateTo({
@@ -291,7 +297,7 @@ Page({
/**
* 用户支付成功以后跳转到券包列表
*/
- if (that.data.cardType == 7) {
+ if (that.data.cardType == 100) {
wx.setStorage({
key: 'couponNum2',
data: "couponNum2"
@@ -330,7 +336,7 @@ Page({
} else {
// 免费券
that.payOrderUpdate(orderId, "0", 1, '', 'free');
- if (that.data.cardType == 7) {
+ if (that.data.cardType == 100) {
wx.setStorage({
key: 'couponNum2',
data: "couponNum2"
diff --git a/pages/bargain/bargainDatail/bargainDatail.wxml b/pages/bargain/bargainDatail/bargainDatail.wxml
index e376b65..aa7bb23 100644
--- a/pages/bargain/bargainDatail/bargainDatail.wxml
+++ b/pages/bargain/bargainDatail/bargainDatail.wxml
@@ -60,7 +60,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/pages/cardorder/detail/index.js b/pages/cardorder/detail/index.js
index f531a2b..13c5c41 100644
--- a/pages/cardorder/detail/index.js
+++ b/pages/cardorder/detail/index.js
@@ -131,7 +131,7 @@ Page({
* 页面需要初始渲染的效果
*/
Http.get({
- url: config.api.couponOrderDetail,
+ url: config.api.couponOrderDetail,
data: {
couponOrderId: options.quancode
}
diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js
index 28ffa8e..50b5f9b 100644
--- a/pages/coupon/detail/index.js
+++ b/pages/coupon/detail/index.js
@@ -242,7 +242,7 @@ Page({
showPage: true
})
}
- if (res.data.type == 7) {
+ if (res.data.type == 100) {
wx.setNavigationBarTitle({
title: "卡详情"
})
@@ -293,6 +293,9 @@ Page({
inviteFriend: function () {
let that = this;
that.orderFunc("discount");
+ that.setData({
+ showbutton:true
+ })
},
/**
* 支付订单更新
@@ -499,7 +502,7 @@ Page({
/**
* 用户支付成功以后跳转到券包列表
*/
- if (that.data.cardType == 7) {
+ if (that.data.cardType == 100) {
wx.setStorage({
key: 'couponNum2',
data: "couponNum2"
@@ -537,7 +540,7 @@ Page({
} else {
// 免费券
that.payOrderUpdate(orderId, "0", 1, '', 'free');
- if (that.data.cardType == 7) {
+ if (that.data.cardType == 100) {
wx.setStorage({
key: 'couponNum2',
data: "couponNum2"
@@ -560,9 +563,9 @@ Page({
})
},
onShow() {
- this.setData({
- showbutton: false
- })
+ // this.setData({
+ // showbutton: false
+ // })
},
onShareAppMessage: function (options) {
var that = this;
diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml
index 81dcb62..00df499 100644
--- a/pages/coupon/detail/index.wxml
+++ b/pages/coupon/detail/index.wxml
@@ -27,7 +27,7 @@
{{sec}}
- {{data.title}}电子卡
+ {{data.title}}电子卡
{{data.subTitle}}
售价:
@@ -99,7 +99,7 @@
立即购买
diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml
index d79d77b..211769f 100644
--- a/pages/order/detail/index.wxml
+++ b/pages/order/detail/index.wxml
@@ -35,7 +35,7 @@
只有支付完成的时
才显示兑换码
-->
-
+
兑换码
{{order.couponOrderId}}
@@ -78,8 +78,4 @@
-
-
\ No newline at end of file
diff --git a/pages/passCar/couponDetail/couponDetail.js b/pages/passCar/couponDetail/couponDetail.js
index 5ee5b91..adcba1a 100644
--- a/pages/passCar/couponDetail/couponDetail.js
+++ b/pages/passCar/couponDetail/couponDetail.js
@@ -11,7 +11,8 @@ Page({
expiredTime: "",
updateDate: "",
//存储计时器
- setInter: ""
+ setInter: "",
+ showPage:false
},
onUnload: function () {
let that = this;
@@ -34,14 +35,15 @@ Page({
}
}).then(res => {
that.setData({
- data: res.data
+ data: res.data,
+ showPage:true
});
that.setData({
expiredTime: util.fmtDate(that.data.data.expiredTime),
updateDate: util.formatTime(that.data.data.updateDate, "yyyy-MM-dd hh:mm:ss"),
createDate: util.formatTime(that.data.data.createDate, "yyyy-MM-dd hh:mm:ss")
});
- util.barcode("barcode", options.quancode, 510, 100);
+ // util.barcode("barcode", options.quancode, 510, 100);
util.qrcode("qrcode", options.quancode, 350, 350);
})
.catch(err => {
diff --git a/pages/passCar/couponDetail/couponDetail.wxml b/pages/passCar/couponDetail/couponDetail.wxml
index 96e9ff3..1f0ccd0 100644
--- a/pages/passCar/couponDetail/couponDetail.wxml
+++ b/pages/passCar/couponDetail/couponDetail.wxml
@@ -1,4 +1,4 @@
-
+