diff --git a/app.js b/app.js index d9c428b..101aeb0 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.isTest76? true : false; + data.isTest = data.isTest78? true : false; this.globalData.configJson = data }).then(() => { // 获取ui配置文件 diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 307b4d7..73f6710 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -211,11 +211,12 @@ 廉洁地图 --> - - - 书香借阅 + + 苏影通 + diff --git a/pages/list/scene/index.wxml b/pages/list/scene/index.wxml index 6c6df21..cbb3e41 100644 --- a/pages/list/scene/index.wxml +++ b/pages/list/scene/index.wxml @@ -8,7 +8,7 @@ - NO.{{index+1}} + {{item.garden_flag_text}} {{item.title}} diff --git a/pages/map/index.js b/pages/map/index.js index 9d7016d..f2de0cf 100644 --- a/pages/map/index.js +++ b/pages/map/index.js @@ -450,7 +450,7 @@ Page({ mapItem.id = index; mapItem.info = item; if(item.type=='red_map'){ - mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20211022/4bb3b753c625e89e1214105c03390e54.png"; + mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20230506/054cea53a068545e9e27fa9cd3acbdec.png"; } else { mapItem.iconPath = "https://static.ticket.sz-trip.com/xcxImages/map/"+item.type+".png"; diff --git a/pages/map/index.wxml b/pages/map/index.wxml index 639b2c4..7451de1 100644 --- a/pages/map/index.wxml +++ b/pages/map/index.wxml @@ -12,40 +12,55 @@ - - 景点 + + + 景点 - - 场馆 + + + + 场馆 - - 特产 + + + + + 特产 - - 美食 + + + + 美食 - - 文保单位 + + + + 文保单位 - - 运河十景 + + + + 运河十景 - - 江南小书场 + + + + 江南小书场 - - 红色地图 + + + 红色地图 - - - - {{product.info.movieName}} - {{product.info.show_date}} {{product.info.show_time}}-{{product.info.close_time}} {{'('+product.info.show_version+')'}} - - {{product.info.cinemaName}} - {{product.info.hallName}} {{product.info.selectSeatInfo.seatInfo}} - - - - 手机号码： - - + + + + {{product.info.movieName}} + {{product.info.show_date}} {{product.info.show_time}}-{{product.info.close_time}} {{'('+product.info.show_version+')'}} + + {{product.info.cinemaName}} + {{product.info.hallName}} {{product.info.selectSeatInfo.seatInfo}} + + + + + 手机号码： + + + + + + + + + 不支持退票 + + + + + + 不支持改签 + + + + + + + + 费用明细 + + + ￥{{price/100}} + + + + + 票价 + + + ￥{{sPrice}} x {{num}} + + + + + 优惠券 + + + - ￥{{coupon?coupon.activity.money/100:0}} + + + + + + + 订单总额:¥{{((price - (coupon?coupon.activity.money:0))>0?(price - (coupon?coupon.activity.money:0)):0)/100}} + + + - - ¥0 - ¥{{((price - (coupon?coupon.activity.money:0))>0?(price - (coupon?coupon.activity.money:0)):0)/100}} - 总计优惠{{coupon?coupon.activity.money/100:0}}元 - - - 立即付款 + + ¥0 + ¥{{((price - (coupon?coupon.activity.money:0))>0?(price - (coupon?coupon.activity.money:0)):0)/100}} + 总计优惠{{coupon?coupon.activity.money/100:0}}元 + + 明细 + 立即付款 \ No newline at end of file diff --git a/pages/order/movie/index.wxss b/pages/order/movie/index.wxss index c2c042b..79403a9 100644 --- a/pages/order/movie/index.wxss +++ b/pages/order/movie/index.wxss @@ -104,4 +104,67 @@ page { background: #D62828; font-size: 36rpx; font-weight: 500; +} +.tips{ + display: flex; + margin-left: 25.3rpx; +} +.tips-box{ + display: flex; + align-items: center; + margin-right: 27rpx; + font-size: 27rpx; + font-family: PingFang SC; + font-weight: 500; + color: #111111; + +} +.tips-box image{ + width: 26.6rpx; + height: 26.6rpx; +} +.fix-info{ + width: 750rpx; + min-height: 305rpx; + background: #FFFFFF; + padding: 36rpx 46rpx 36rpx 46rpx; + box-sizing: border-box; + position: fixed; + bottom:113rpx; +} +.info-item{ + display: flex; + align-items: center; + justify-content: space-between; +} +.info-item:first-child{ + font-size: 31rpx; + font-family: PingFang SC; + font-weight: bold; + color: #000000; +} +.info-item:nth-child(2){ + margin-top: 40rpx; + font-size: 31rpx; + font-family: PingFang SC; + font-weight: 500; + color: #999999; + +} +.info-item:nth-child(3){ + margin-top: 31rpx; + font-size: 31rpx; + font-family: PingFang SC; + font-weight: 500; + color: #999999; +} +.info-item:nth-child(4){ + margin-top: 40rpx; + font-size: 31rpx; + font-family: PingFang SC; + font-weight: 500; + color: #999999; +} +.fix-info.hide{ + bottom:-300rpx; } \ No newline at end of file diff --git a/pages/pbService/sceneComfort/index.js b/pages/pbService/sceneComfort/index.js index b299a62..db8e5d5 100644 --- a/pages/pbService/sceneComfort/index.js +++ b/pages/pbService/sceneComfort/index.js @@ -121,6 +121,16 @@ Page({ list:this.data.list.concat(res.data.rows), total:res.data.total }) + console.log(this.data.list.length); + console.log(res.data.total); + + if (this.data.list.length {{sceneLevelObj[item.scene_level]}} - + + + + + + + 当前舒适度: + + {{itemY.desc}} + + + 瞬时承载量:{{item.ins_carry_capacity}}人 + + + 更新时间:{{item.status_time}} - 当前舒适度/瞬时承载量 + + \ No newline at end of file diff --git a/pages/pbService/sceneComfort/index.wxss b/pages/pbService/sceneComfort/index.wxss index 4ce2ac2..c801dbe 100644 --- a/pages/pbService/sceneComfort/index.wxss +++ b/pages/pbService/sceneComfort/index.wxss @@ -118,4 +118,64 @@ page { line-height: 38rpx; border: 1rpx solid; margin-right: 20rpx; +} +.two { + padding: 0 12rpx; + border-radius: 20rpx; + line-height: 38rpx; + border: 1rpx solid; + margin-left: 10rpx; + + +font-size: 24rpx; +font-family: PingFang SC; +font-weight: 500; +color: #83D851; +} +.info{ + width: 650rpx; + min-height: 134rpx; + border-radius: 10rpx; + padding: 28rpx 20rpx; + box-sizing: border-box; +} +.yongji{ + background: rgba(204, 25, 25, .08); +} +.jiaoyongji{ +background: rgba(252, 133, 58, .08); +} +.yiban{ + background: rgba(255, 198, 41, .08); +} +.info.jiaoshushi{ + background: rgba(66, 146, 201, .08); +} +.shushi{ + background: rgba(131, 216, 81, .08); +} +.top-info{ + display: flex; + align-items: center; + justify-content: space-between; +} +.comft{ + display: flex; + + +font-size: 26rpx; +font-family: PingFang SC; +font-weight: 500; +color: #333333; +align-items: center; +} +.num{ + border-left: 1rpx solid #D8D8D8; + padding-left: 50rpx; + + +font-size: 26rpx; +font-family: PingFang SC; +font-weight: 500; +color: #333333; } \ No newline at end of file diff --git a/pages/user/coupon/index.wxml b/pages/user/coupon/index.wxml index 8d46f82..1d26442 100644 --- a/pages/user/coupon/index.wxml +++ b/pages/user/coupon/index.wxml @@ -1,22 +1,35 @@ - 可使用 - 已使用 - 已失效 + 可使用 + 已使用 + 已失效 - - {{item.activity.name}} - ￥{{item.activity.money/100}} - - 使用条件：满{{item.activity.mini_money/100}}元 - 有效期：{{item.end_time}} - 优惠码：{{item.key}} - - 使用规则 - + + {{item.activity.name}} + ￥{{item.activity.money/100}} + + 使用条件：满{{item.activity.mini_money/100}}元 + 有效期：{{item.end_time}} 前使用 + 优惠码：{{item.key}} + + + + + --------------------------------------------- + + + + + + + 使用规则 + + {{item.note}} + +