图游，活动日历修改

pages/list/activitynew/index.wxml

@@ -7,8 +7,9 @@
   <view class="acitivity-search-box">
     <picker mode="selector" value="{{area}}" range="{{areas}}" range-key="area_name" bindchange="changeArea" wx:if="{{type!=4}}">
       <view class="picker">
-        <view class="areatext">{{areas[area].area_name}}</view>
+        <view class="areatext" style="font-size: 31rpx;font-weight: bold;color: #000;">{{areas[area].area_name}}</view>
-        <image src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
+        <image src="https://static.ticket.sz-trip.com/uploads/20240429/be4c68c518d5ee781e6345a09121f882.png" mode="widthFix"></image>
+        <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image> -->
       </view>
     </picker>
     <view class="my-search-box">

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;

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') {

pages/map/index.wxml

@@ -34,7 +34,7 @@
 </view>
 <view class="menus2" wx:else>
   <!-- <image class="shouqi" bindtap="changeClose" src="https://static.ticket.sz-trip.com/uploads/20240123/2ce83ab3fb61f0bf2b3aa8338ac30d73.png" mode=""/> -->
-  <image bindtap="changeClose" class="img-icon" src="https://static.ticket.sz-trip.com/uploads/20240129/4450fe629f3c33cb6c8407e8f6ebb021.png" mode=""/>
+  <image bindtap="changeClose" class="img-icon" src="https://static.ticket.sz-trip.com/uploads/20240429/f2443b72067da82373d545db179f4dca.png" mode=""/>
   <scroll-view scroll-x style="height:280rpx" bindscroll="listenScroll" class="">
     <view class="menus-list1" style="margin-bottom:30rpx">
       <view class="menus-item{{type==1?' active':''}}" bindtap="changeType" data-title="景点" data-type="1">
@@ -186,7 +186,36 @@
     <view wx:if="{{info.info.type!='academes'}}" bindtap="gotoDetail"  data-item="{{info}}" class="info-btn" style="margin-right: 0;">查看详情</view>
   </view>
 </view>
-<view class="map-item" wx:if="{{showInfo && info && (info.info.type!='park' &&info.info.type!='publicBycicle' &&info.info.type!='tourist' &&info.info.type!='luggage')}}">
+<view class="map-item scenic-item" wx:if="{{showInfo && info && info.info.type=='scenic'}}">
+  <view style="display: flex;">
+    <view class="iconfont icon-ic_searchclosed" bindtap="hideInfo"></view>
+    <image wx:if="{{info.info.headimg}}" src="{{info.info.headimg}}" mode="aspectFill"></image>
+    <view class="info" style="{{info.info.headimg?'':'width:100%'}}">
+      <view class="title textOver">{{info.info.title}}</view>
+      <view class="subtitle textOver2">地址：{{info.info.address}}</view>
+      <view style="display: flex;justify-content:space-between;width: 426rpx;">
+        <view wx:if="{{info.info.comfort_arr}}" class="sort" style="border: 2rpx solid {{ info.info.comfort_arr.color}};color: {{ info.info.comfort_arr.color}};">
+          {{info.info.comfort_arr.text}}
+        </view>
+        <view wx:if="{{info.info.type!='academes'}}" bindtap="gotoDetail" class="info-btn">查看详情</view>
+      </view>
+    </view>
+  </view>
+  <view wx:if="{{info.info.comfort_arr}}" style="background: {{ info.info.comfort_arr.bgColor}};border-radius: 7rpx;padding: 28rpx 32rpx 22rpx 20rpx;margin-top: 19.33rpx;">
+    <view class="comfort-box">
+      <view>
+        当前客流量:{{info.info.comfort_arr.ins_carry_capacity}}人 
+      </view>
+      <view>
+        景区最大承载量:{{info.info.comfort_arr.max_carry_capacity}}人
+      </view>
+    </view>
+    <view style="font-weight: 500;font-size: 25rpx;color: #666666;">
+      更新时间:{{info.info.comfort_arr.updated_time}}
+    </view>
+  </view>
+</view>
+<view class="map-item" wx:if="{{showInfo && info && (info.info.type!='park' &&info.info.type!='publicBycicle' &&info.info.type!='tourist' &&info.info.type!='luggage'&&info.info.type!='scenic')}}">
   <view class="iconfont icon-ic_searchclosed" bindtap="hideInfo"></view>
   <image wx:if="{{info.info.headimg}}" src="{{info.info.headimg}}" mode="aspectFill"></image>
   <view class="info" style="{{info.info.headimg?'':'width:100%'}}">

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;
+  /* justify-content: space-between; */
-  padding: 25rpx;
+  padding: 13rpx;
-  width: 530rpx;
+  /* 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;
+  width: 213rpx;
-  height: 207rpx;
+  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;
+  /* margin: 0 auto; */
-  width: 199rpx;
+  /* width: 199rpx; */
-  line-height: 56rpx;
+  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;
+    width: 105.33rpx;
-  height: 40rpx;
+    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;
 }