diff --git a/app.js b/app.js
index cc9c5ec..13bd865 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.isTest187? true : false;
+ data.isTest = data.isTest188? true : false;
this.globalData.configJson = data
}).then(() => {
// 获取ui配置文件
diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index fc15461..52cbacb 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -131,7 +131,7 @@
-
+
合计: {{showPrice/100}}
diff --git a/pages/order/components/date/index.js b/pages/order/components/date/index.js
index 8193e31..0a26eb7 100644
--- a/pages/order/components/date/index.js
+++ b/pages/order/components/date/index.js
@@ -19,6 +19,11 @@ Component({
isTeam: {
type: Number,
default: 0
+ },
+ // 日期结束天数
+ endDays: {
+ type: Number,
+ value: 60
}
},
@@ -53,7 +58,7 @@ Component({
skuName
})
// 在组件实例进入页面节点树时执行
- let product = app.globalData.product, today = util.formatDate(new Date()), end_date = util.formatDate(new Date(new Date().getTime() + 60 * 24 * 60 * 60 * 1000));
+ let product = app.globalData.product, today = util.formatDate(new Date()), end_date = util.formatDate(new Date(new Date().getTime() + this.properties.endDays * 24 * 60 * 60 * 1000));
if (product.product.title.indexOf("苏州博物馆") != -1) {
this.setData({
isSzMuseum: true
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index 1e5683e..06c34fe 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -135,7 +135,7 @@
-
+
合计: {{price}}
diff --git a/pages/user/order/movieOrderInfo/index.wxml b/pages/user/order/movieOrderInfo/index.wxml
index 77c75b6..5c2b8fe 100644
--- a/pages/user/order/movieOrderInfo/index.wxml
+++ b/pages/user/order/movieOrderInfo/index.wxml
@@ -48,7 +48,7 @@
{{info.paid_money/100}}
- 再次购买
+
退款详情
取消订单
取消订单
diff --git a/project.private.config.json b/project.private.config.json
index cbcdfce..7a8a3d8 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -6,6 +6,13 @@
"condition": {
"miniprogram": {
"list": [
+ {
+ "name": "pages/user/order/movieOrderInfo/index",
+ "pathName": "pages/user/order/movieOrderInfo/index",
+ "query": "id=46022504271632102675",
+ "launchMode": "default",
+ "scene": null
+ },
{
"name": "subPackages/indexGQ/index",
"pathName": "subPackages/index/index",
diff --git a/subPackages/goods/oneCardTour/info/index.wxml b/subPackages/goods/oneCardTour/info/index.wxml
index aab520f..25b2774 100644
--- a/subPackages/goods/oneCardTour/info/index.wxml
+++ b/subPackages/goods/oneCardTour/info/index.wxml
@@ -65,17 +65,18 @@
- 年卡权益
- 合作景区
- 使用说明
+ 使用说明
+ 年卡权益
+ 合作景区
-
+
-
+
+
+
-
diff --git a/utils/util.js b/utils/util.js
index f3bb4d6..0dcba04 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -350,9 +350,10 @@ const orderMoreTime = function(item){
return
}
else if(info.product_model=='movie'){
- wx.navigateTo({
- url: '/pages/list/movieticket/index',
- })
+ // wx.navigateTo({
+ // url: '/pages/list/movieticket/index',
+ // })
+ goMovieList()
}
else if(info.product_model=='activity'){
wx.navigateTo({