diff --git a/images/homeSel.png b/images/homeSel.png deleted file mode 100755 index 718704c..0000000 Binary files a/images/homeSel.png and /dev/null differ diff --git a/images/index-seld.png b/images/index-seld.png deleted file mode 100644 index c45cad0..0000000 Binary files a/images/index-seld.png and /dev/null differ diff --git a/images/mapSeld.png b/images/mapSeld.png deleted file mode 100755 index e52c619..0000000 Binary files a/images/mapSeld.png and /dev/null differ diff --git a/images/my-seld.png b/images/my-seld.png deleted file mode 100644 index 3a88c5c..0000000 Binary files a/images/my-seld.png and /dev/null differ diff --git a/images/tuyou-seld.png b/images/tuyou-seld.png deleted file mode 100644 index ff577b2..0000000 Binary files a/images/tuyou-seld.png and /dev/null differ diff --git a/images/userSel.png b/images/userSel.png deleted file mode 100755 index 12c5867..0000000 Binary files a/images/userSel.png and /dev/null differ diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml index d826ce0..acc1842 100644 --- a/pages/list/activitynew/index.wxml +++ b/pages/list/activitynew/index.wxml @@ -7,8 +7,9 @@ - {{areas[area].area_name}} - + {{areas[area].area_name}} + + diff --git a/pages/list/activitynew/index.wxss b/pages/list/activitynew/index.wxss index c5f9f59..337ffad 100644 --- a/pages/list/activitynew/index.wxss +++ b/pages/list/activitynew/index.wxss @@ -299,7 +299,8 @@ background: rgba(11, 137, 142, .1); align-items: center; border-radius: 30rpx; height: 60rpx; - background: #ededed; + /* background: #ededed; */ + background-color: rgba(204,204,204, .3); margin-bottom: 0; font-size: 26rpx; } @@ -318,7 +319,7 @@ background: rgba(11, 137, 142, .1); flex-shrink: 0; line-height: 40rpx; border-left: 1rpx solid #ccc; - color: #0B898E; + color: #DE4126; } .new-top-search-box { display: flex; diff --git a/pages/map/index.js b/pages/map/index.js index 7bf0522..0d73bd3 100644 --- a/pages/map/index.js +++ b/pages/map/index.js @@ -31,6 +31,7 @@ Page({ timeList:{}, showMore:'close', scrollLeft: 0, + levelList:[] }, listenScroll(e) { this.setData({ @@ -74,6 +75,11 @@ Page({ }) }) + commonApi._post("pbservice/Comfort/getComfortLevel").then(res=>{ + that.setData({ + levelList:res.data + }) + }) }, changeClose() { this.setData({ @@ -631,6 +637,15 @@ Page({ mapItem.info = item; if(item.type=='scenic'){ mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/c59dc041fcfd8b7a62ad2ac2444adcda.png"; + if (mapItem.info.comfort_arr) { + that.data.levelList.forEach(element => { + if (element.level == mapItem.info.comfort_arr.comfort_level) { + mapItem.info.comfort_arr.text = element.desc + mapItem.info.comfort_arr.color = element.color + mapItem.info.comfort_arr.bgColor = element.bgColor + } + }); + } }else if (item.type=='venue') { mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/04aedae4dc498d45267f3636d5524af6.png"; }else if (item.type=='room') { diff --git a/pages/map/index.wxml b/pages/map/index.wxml index 29cc225..8bcf488 100644 --- a/pages/map/index.wxml +++ b/pages/map/index.wxml @@ -34,7 +34,7 @@ - + @@ -186,7 +186,36 @@ 查看详情 - + + + + + + {{info.info.title}} + 地址:{{info.info.address}} + + + {{info.info.comfort_arr.text}} + + 查看详情 + + + + + + + 当前客流量:{{info.info.comfort_arr.ins_carry_capacity}}人 + + + 景区最大承载量:{{info.info.comfort_arr.max_carry_capacity}}人 + + + + 更新时间:{{info.info.comfort_arr.updated_time}} + + + + diff --git a/pages/map/index.wxss b/pages/map/index.wxss index 6af56b0..bde614b 100644 --- a/pages/map/index.wxss +++ b/pages/map/index.wxss @@ -109,28 +109,37 @@ border-top: none; } .map-item { - display: flex; + /* display: flex; */ background: #FFFFFF; box-shadow: 0px 0px 13rpx 0px rgba(0, 0, 0, 0.3); border-radius: 13rpx; - justify-content: space-between; - padding: 25rpx; - width: 530rpx; + /* justify-content: space-between; */ + padding: 13rpx; + /* padding: 25rpx; + width: 530rpx; */ + width: 670rpx; position: absolute; - left: 44rpx; + left: 26rpx; + /* left: 44rpx; */ top: 50%; margin-top: -100rpx; } +.scenic-item { + background-color: rgba(255,255,255, .8); +} + .map-item image { display: block; - width: 200rpx; - height: 207rpx; + width: 213rpx; + height: 213rpx; + border-radius: 13rpx; flex-shrink: 0; margin-right: 20rpx; } .map-item .info { - width: 300rpx; + /* width: 300rpx; */ + width: 100%; display: flex; flex-direction: column; justify-content: space-between; @@ -146,9 +155,12 @@ margin: 10rpx 0; } .info-btn { - margin: 0 auto; - width: 199rpx; - line-height: 56rpx; + /* margin: 0 auto; */ + /* width: 199rpx; */ + width: 173rpx; + height: 46.67rpx; + line-height: 46.67rpx; + /* line-height: 56rpx; */ color: #fff; background: linear-gradient(180deg, #FDAB70, #FE7F19); font-size: 28rpx; @@ -628,8 +640,10 @@ } .img-icon { - width: 686.67rpx; - height: 40rpx; + width: 105.33rpx; + height: 17.33rpx; + display: block; + margin: 18rpx auto 24.67rpx; } .img-icon-new { @@ -637,4 +651,25 @@ height: 17.33rpx; margin: 17rpx auto 32rpx; display: block; +} + +.comfort-box { + display: flex; + font-weight: 500; + font-size: 27rpx; + color: #333333; + justify-content: space-between; + margin-bottom: 34rpx; +} + +.sort { + width: 93rpx; + height: 40rpx; + /* border: 4rpx solid #83d851; */ + border-radius: 20rpx; + font-weight: bold; + font-size: 27rpx; + /* color: #83D851; */ + text-align: center; + line-height: 40rpx; } \ No newline at end of file