From 320a65a966c3e2b1fa5ff772cea2d461458ed0c4 Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Mon, 6 May 2019 17:08:28 +0800
Subject: [PATCH] =?UTF-8?q?[=E7=A7=AF=E5=88=86=E8=AF=A6=E6=83=85][?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9]:[=E5=B0=86=E7=A7=AF=E5=88=86=E7=9A=84?=
=?UTF-8?q?=E8=AF=A6=E6=83=85=E6=95=B4=E5=90=88=E5=88=B0=E6=99=AE=E9=80=9A?=
=?UTF-8?q?=E5=88=B8=E7=9A=84=E9=A1=B5=E9=9D=A2=E9=87=8C=E9=9D=A2=EF=BC=8C?=
=?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=88=A4=E6=96=AD=E6=9D=A5=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?=E5=B1=95=E7=A4=BA=E7=9A=84=E5=86=85=E5=AE=B9]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app.json | 3 +-
pages/coupon/detail/index.js | 26 +-
pages/coupon/detail/index.wxml | 19 +-
pages/index/index.js | 86 ++--
pages/integralmall/index.js | 2 +-
pages/integralmall/integcoupondetail/index.js | 159 -------
.../integralmall/integcoupondetail/index.json | 5 -
.../integralmall/integcoupondetail/index.wxml | 54 ---
.../integralmall/integcoupondetail/index.wxss | 405 ------------------
9 files changed, 69 insertions(+), 690 deletions(-)
delete mode 100644 pages/integralmall/integcoupondetail/index.js
delete mode 100644 pages/integralmall/integcoupondetail/index.json
delete mode 100644 pages/integralmall/integcoupondetail/index.wxml
delete mode 100644 pages/integralmall/integcoupondetail/index.wxss
diff --git a/app.json b/app.json
index a03b24f..f864159 100644
--- a/app.json
+++ b/app.json
@@ -60,8 +60,7 @@
"pages/externallinks/index",
"pages/czdetail/czdetail",
"pages/spellGroup/paySpellGroup/index",
- "pages/integralmall/index",
- "pages/integralmall/integcoupondetail/index"
+ "pages/integralmall/index"
],
"navigateToMiniProgramAppIdList": [
"wx192b7d2e8dcbefd0",
diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js
index f8f5be2..62f1841 100644
--- a/pages/coupon/detail/index.js
+++ b/pages/coupon/detail/index.js
@@ -257,20 +257,21 @@ Page({
that.orderFunc();
}, 500)
},
- /**
- * gotopay
- */
gotopay: function(e) {
let that = this;
- console.log(e)
- let formId = e.detail.formId;
- var discount = e.currentTarget.dataset.discount;
- that.setData({
- queueData: null,
- showbutton: true,
- formId: formId
- })
- Http.get({
+ if (e.currentTarget.dataset.type == 51 || e.currentTarget.dataset.type == 50){
+ wx.navigateTo({
+ url: '/pages/integralmall/payIntegcoupondetail/index?couponChannelId=' + that.data.couponChannelId + '&couponId=' + that.data.couponId,
+ })
+ }else{
+ let formId = e.detail.formId;
+ var discount = e.currentTarget.dataset.discount;
+ that.setData({
+ queueData: null,
+ showbutton: true,
+ formId: formId
+ })
+ Http.get({
url: config.api.getQuestion,
data: {
couponType: JSON.stringify(that.data.data.type)
@@ -306,6 +307,7 @@ Page({
mask: false
});
})
+ }
},
setIntervalTime(end_time) {
let that = this;
diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml
index b229eb1..02b8dcc 100644
--- a/pages/coupon/detail/index.wxml
+++ b/pages/coupon/detail/index.wxml
@@ -6,7 +6,7 @@
-
+
@@ -34,10 +34,11 @@
{{data.pressLimitNum+'人可砍至底价'}}
售价:
- {{data.salePriceStr}}
- 元
- {{data.priceStr}}元
- {{data.priceStr}}小时
+ {{data.salePriceStr}}
+ {{data.creditPrice}}积分
+ 元
+ {{data.priceStr}}元
+ {{data.priceStr}}小时
过期不退款
@@ -48,7 +49,6 @@
剩余{{data.remainInventory}}件
-
有效期:自领取之日起
{{validDays}}天内有效(请在有效期内使用)
有效期:
@@ -96,12 +96,13 @@
-