diff --git a/app.js b/app.js
index 81893c1..70097da 100644
--- a/app.js
+++ b/app.js
@@ -21,7 +21,7 @@ App({
unique_key: "wechatxcx"
}).then(res => {
let data = JSON.parse(res.data);
- data.isTest = data.isTest73? true : false;
+ data.isTest = data.isTest74? true : false;
this.globalData.configJson = data
}).then(() => {
// 获取ui配置文件
diff --git a/pages/list/activitynew/index.js b/pages/list/activitynew/index.js
index 604547e..acb4921 100644
--- a/pages/list/activitynew/index.js
+++ b/pages/list/activitynew/index.js
@@ -335,7 +335,6 @@ Page({
url: '/pages/list/movieticket/list/info/index?id=' + item.third_id
})
} else if (this.data.type == 4) {
- return
wx.navigateTo({
url: '/pages/list/movieticket/list/cinema/index?id=' + item.third_id
})
diff --git a/pages/order/coupon/index.wxml b/pages/order/coupon/index.wxml
index 704ff1e..6ee7140 100644
--- a/pages/order/coupon/index.wxml
+++ b/pages/order/coupon/index.wxml
@@ -5,7 +5,7 @@
{{item.activity.money/100}}
满{{item.activity.mini_money/100}}元可用
- {{item.activity.end_time}}到期
+ {{item.end_time}}到期
diff --git a/pages/order/movie/index.js b/pages/order/movie/index.js
index f33494f..efa2c54 100644
--- a/pages/order/movie/index.js
+++ b/pages/order/movie/index.js
@@ -28,7 +28,7 @@ Page({
let product = app.globalData.product,price=0;
product.info.selectSeatInfo = JSON.parse(options.selectSeatInfo)
product.info.selectSeatInfo.seatPriceInfo.map(item=>{
- price =price + Number(item.split('-')[1])
+ price =price +Math.ceil(Number(item.split('-')[1])*1.006 * 100) / 100
})
console.log(price);
this.setData({
diff --git a/pages/user/coupon/index.wxml b/pages/user/coupon/index.wxml
index c5db573..8d46f82 100644
--- a/pages/user/coupon/index.wxml
+++ b/pages/user/coupon/index.wxml
@@ -12,7 +12,7 @@
¥{{item.activity.money/100}}
使用条件:满{{item.activity.mini_money/100}}元
- 有效期:{{item.activity.end_time}}
+ 有效期:{{item.end_time}}
优惠码:{{item.key}}
使用规则