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}} 场馆介绍 diff --git a/pages/info/museumInfo/index.wxss b/pages/info/museumInfo/index.wxss index 838c4c4..ed15b1a 100644 --- a/pages/info/museumInfo/index.wxss +++ b/pages/info/museumInfo/index.wxss @@ -306,4 +306,22 @@ width: 33rpx; display: block; margin-right: 10rpx; +} +.status-text { + position: absolute; + right: 0; + top: 22rpx; + width: 140rpx; + line-height: 47rpx; + background: rgba(11, 137, 142, .1); + text-align: center; + color: #0B898E; + font-size: 25rpx; + font-weight: bold; + border-radius: 23rpx 0px 0px 23rpx; +} +.status-text.disable { + width: 120rpx; + background: rgba(51, 51, 51, .1); + color: #666666; } \ No newline at end of file diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml index df8613a..a1e33b9 100644 --- a/pages/info/sceneProductInfo/index.wxml +++ b/pages/info/sceneProductInfo/index.wxml @@ -14,7 +14,7 @@ - + {{info.title}} {{item}} @@ -28,6 +28,7 @@ 地址:{{info.address}} + {{info.garden_flag_text}} diff --git a/pages/info/sceneProductInfo/index.wxss b/pages/info/sceneProductInfo/index.wxss index a5d86da..13cf581 100644 --- a/pages/info/sceneProductInfo/index.wxss +++ b/pages/info/sceneProductInfo/index.wxss @@ -401,4 +401,22 @@ page { font-size: 31rpx; font-weight: 500; margin-top: 50rpx; +} +.status-text { + position: absolute; + right: 0; + top: 22rpx; + width: 140rpx; + line-height: 47rpx; + background: rgba(11, 137, 142, .1); + text-align: center; + color: #0B898E; + font-size: 25rpx; + font-weight: bold; + border-radius: 23rpx 0px 0px 23rpx; +} +.status-text.disable { + width: 120rpx; + background: rgba(51, 51, 51, .1); + color: #666666; } \ No newline at end of file diff --git a/pages/list/museum/index.wxml b/pages/list/museum/index.wxml index 968dce8..0157b4b 100644 --- a/pages/list/museum/index.wxml +++ b/pages/list/museum/index.wxml @@ -2,7 +2,10 @@ - + + + {{item.garden_flag_text}} + {{item.title}} 地址:{{item.address}} diff --git a/pages/list/museum/index.wxss b/pages/list/museum/index.wxss index c7ab354..a3564c8 100644 --- a/pages/list/museum/index.wxss +++ b/pages/list/museum/index.wxss @@ -11,6 +11,7 @@ page { width: 353rpx; height: 296rpx; border-radius: 17rpx; + display: block; } .list .item:nth-child(2n){ flex-direction: row-reverse; @@ -85,4 +86,16 @@ page { } .info .tip-box .com-flex { height: 71rpx; +} +.status-text { + position: absolute; + left: 0; + right: 0; + bottom: 0; + line-height: 57rpx; + text-align: center; + color: #fff; + background: rgba(0, 0, 0, 0.5); + font-size: 31rpx; + border-radius: 0 0 17rpx 17rpx; } \ No newline at end of file diff --git a/pages/list/scene/index.wxml b/pages/list/scene/index.wxml index 2b9e6ca..6c6df21 100644 --- a/pages/list/scene/index.wxml +++ b/pages/list/scene/index.wxml @@ -9,6 +9,7 @@ NO.{{index+1}} + {{item.garden_flag_text}} {{item.title}} diff --git a/pages/list/scene/index.wxss b/pages/list/scene/index.wxss index 261f759..c6f453d 100644 --- a/pages/list/scene/index.wxss +++ b/pages/list/scene/index.wxss @@ -58,6 +58,18 @@ top: 0; text-align: center; } +.item .status-text { + position: absolute; + left: 0; + bottom: 0; + width: 233rpx; + line-height: 47rpx; + background: rgba(0, 0, 0, 0.5); + border-radius: 0 0 11rpx 11rpx; + font-size: 25rpx; + color: #ffffff; + text-align: center; +} .tags { display: flex; margin-top: 16rpx;