diff --git a/app.js b/app.js
index 8aa3646..170af3f 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.isTest156? true : false;
+ data.isTest = data.isTest? true : false;
this.globalData.configJson = data
}).then(() => {
// 获取ui配置文件
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index bf41bb6..e67ee4f 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -19,7 +19,7 @@
-
+
@@ -107,6 +107,11 @@
剧场演出
+
+
+ 酒店住宿
+
+
一日游
@@ -124,6 +129,12 @@
非遗专卖
+
+
+
+ 研学游
+
+
diff --git a/pages/order/orderList/index.js b/pages/order/orderList/index.js
index 27c84fd..5ffd963 100644
--- a/pages/order/orderList/index.js
+++ b/pages/order/orderList/index.js
@@ -25,7 +25,7 @@ Page({
linkmanList:[],
finalPrice: 0,
- showCoupon: false,
+ showCoupon: true,
},
/**
@@ -38,16 +38,22 @@ Page({
kjId: app.globalData.kjId,
gp_id: app.globalData.gp_id || app.globalData.team_id,
flag:options.flag,
- showCoupon: (app.globalData.list || []).length<=0,
+ // showCoupon: (app.globalData.list || []).length<=0,
// linkmanList: app.globalData.linkmanList
})
console.log('-------------',this.data.ticketList);
// debugger
let price = 0, sku_id = [] ,postFee= 0;
app.globalData.postProduct.map(item => {
+ try {
+ item.postFee = parseFloat(item.postFee)
+ } catch(e){
+ item.postFee = 0
+ }
+
if (!app.globalData.kjId && !this.data.gp_id) {
price = price + item.sku.price * item.productNum;
- postFee +=item.postFee
+ postFee += item.postFee
}
else if (this.data.gp_id) {
price = price + item.sku.event_price * item.productNum;
diff --git a/pages/order/pay/index.wxml b/pages/order/pay/index.wxml
index c67f2a2..93508e9 100644
--- a/pages/order/pay/index.wxml
+++ b/pages/order/pay/index.wxml
@@ -82,8 +82,9 @@
-
+
确认{{showTipMaskSecond<=0?'':'('+showTipMaskSecond+'s)'}}
+ 数币红包可使用1000元旅游红包,1000元购物红包无法在本平台使用
diff --git a/pages/order/postOrder/index.wxml b/pages/order/postOrder/index.wxml
index fd18ba0..0dedbe3 100644
--- a/pages/order/postOrder/index.wxml
+++ b/pages/order/postOrder/index.wxml
@@ -34,7 +34,7 @@
- 小计:¥{{item.sku.price * item.productNum /100}}
+ 小计:¥{{(item.sku.price * item.productNum + item.postFee || 0) /100}}
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 9577afb..56e5a75 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -310,6 +310,10 @@ Page({
this.totalPrice(this.data.singlePrice)
},
totalPrice(price) {
+ this.setData({
+ singlePrice:price
+ })
+
let allPrice
if (this.data.coupon) {
if (this.data.coupon.activity.discount_type == 'pricebreak') {
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index 8fa77b0..0a896a9 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -34,7 +34,7 @@
- {{product && product.isGroup!=1?product.sku.sku_name:'预约人数'}}
+ {{product && product.isGroup!=1?product.sku.sku_name:'预约人数'}}