diff --git a/app.js b/app.js
index f7818a5..78f4313 100644
--- a/app.js
+++ b/app.js
@@ -22,7 +22,7 @@ App({
unique_key: "wechatxcx"
}).then(res => {
let data = JSON.parse(res.data);
- data.isTest = data.isTest17?true:false;
+ data.isTest = data.isTest18?true:false;
this.globalData.configJson = data
})
diff --git a/pages/info/museumInfo/index.js b/pages/info/museumInfo/index.js
index 5cf29b8..d599b24 100644
--- a/pages/info/museumInfo/index.js
+++ b/pages/info/museumInfo/index.js
@@ -256,7 +256,7 @@ Page({
ctx.setFillStyle("#999999");
ctx.setFontSize(28 * ratio); //字大小
ctx.setTextAlign('left'); //是否居中显示,参考点画布中线
- let subtitle = that.data.info.product_venue.subtitle;
+ let subtitle = that.data.info.product_venue?that.data.info.product_venue.subtitle:that.data.info.sub_title
if (subtitle.length > 10) {
subtitle = subtitle.substr(0, 10) + '...'
}
diff --git a/pages/info/museumInfo/index.wxml b/pages/info/museumInfo/index.wxml
index 1a1123a..940dd71 100644
--- a/pages/info/museumInfo/index.wxml
+++ b/pages/info/museumInfo/index.wxml
@@ -16,16 +16,18 @@
{{info.title}}(团体预约)
-
-
- {{info.title}}
+
+
+
{{info.address}}
{{info.tel}}
-
-
+
+
+ {{info.title}}
{{info.address}}
{{info.tel}}
+ {{info.garden_flag_text}}