From 6fc17e77246dddf306d1bb3e9f8478484650cab6 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 27 May 2025 11:16:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E6=A0=B8=E9=94=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                  |  2 +-
 pages/pbService/sceneComfort/index.wxml | 81 +++++++++++++++----------
 pages/pbService/sceneComfort/index.wxss | 34 +++++++++--
 pages/user/user.wxml                    |  2 +-
 project.private.config.json             |  6 +-
 5 files changed, 82 insertions(+), 43 deletions(-)

diff --git a/app.js b/app.js
index f827a54..16d71a8 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest190? true : false;
+            data.isTest = data.isTest191? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/pbService/sceneComfort/index.wxml b/pages/pbService/sceneComfort/index.wxml
index deb8f2e..04e38f1 100644
--- a/pages/pbService/sceneComfort/index.wxml
+++ b/pages/pbService/sceneComfort/index.wxml
@@ -1,5 +1,5 @@
 <!--pages/pbService/sceneComfort/index.wxml-->
-<title title="景区舒适度"></title>
+<title title="AI避高峰"></title>
 <view class="my-top-search">
   <view class="my-search-box">
     <view class="iconfont icon-sousuo"></view>
@@ -26,40 +26,55 @@
       </view>
     </picker>
   </view>
-  <view class="comfort-levels">
+
+</view>
+<view style="height:200rpx"></view>
+
+<view class="comfort-levels">
     <text>舒适度：</text>
     <view wx:if="{{index!=0}}" style="color:{{item.color}}" wx:for="{{comfortLevel}}" class="comfort-level">{{item.desc}}</view>
-  </view>
 </view>
-<view style="height:220rpx"></view>
-<view class="comfort-item" wx:for="{{list}}">
-  <view class="scene-title">{{item.third_scene_name}}</view>
-  <view class="comfort-tip">
-    <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/comfort1.png" mode="widthFix"></image>
-    <text style="margin-right:30rpx">{{areaObj[item.area]}}</text>
-    <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/comfort2.png" mode="widthFix"></image>
-    <text>{{sceneLevelObj[item.scene_level]}}</text>
-  </view>
-  <!-- <view class="progress-item">
-    <progress percent="{{item.in_count/item.ins_carry_capacity * 100}}" color="{{comfortObj[item.comfort_level].color}}" stroke-width="{{40 * radio}}" border-radius="{{20 * radio}}"></progress>
-    <view class="progress-text">{{comfortObj[item.comfort_level].name}}/{{item.ins_carry_capacity}}人</view>
-  </view> -->
+<view style="padding-top: 25rpx;" class="comfort-levels">更新时间:2025-05-26 10:00:00</view>
 
-	<view class="'info'{{item.comfort_level==5?'shushi':''}}{{item.comfort_level==4?'jiaoshushi':''}}{{item.comfort_level==3?'yiban':''}}{{item.comfort_level==2?'jiaoyongji':''}}{{item.comfort_level==1?'yongji':''}}">
-	<view class="top-info">
-		<view class="comft">
-		<view>
-			当前舒适度:
-		</view>
-		<view wx:if="{{item.comfort_level===itemY.level}}" wx:for-item="itemY" style="color:{{itemY.color}}" wx:for="{{comfortLevel}}" class="two">{{itemY.desc}}</view>
-	</view>
-	<!-- <view class="num">
-		瞬时承载量:{{item.ins_carry_capacity}}人
-	</view> -->
-	</view>
-	<view class="other-tip">
-    <text>更新时间:{{item.status_time}}</text>
-  </view>
-  </view>
+<view class="comfort-container">
+    <view class="comfort-head">
+        <image style="width: 39.67rpx;height: 39.67rpx;" src="https://static.ticket.sz-trip.com/uploads/20250527/ca10f9d72f8d5f3696dee41081357c82.png"></image>
+        <text style="height: fit-content;padding-left: 20rpx;">景区舒适度</text>
+    </view>
+
+    <view class="comfort-content">
+        <view class="comfort-item" wx:for="{{list}}">
+            <view class="scene-title">{{item.third_scene_name}}</view>
+            <view class="comfort-tip">
+                <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/comfort1.png" mode="widthFix"></image>
+                <text style="margin-right:30rpx">{{areaObj[item.area]}}</text>
+                <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/comfort2.png" mode="widthFix"></image>
+                <text>{{sceneLevelObj[item.scene_level]}}</text>
+            </view>
+            <!-- <view class="progress-item">
+                <progress percent="{{item.in_count/item.ins_carry_capacity * 100}}" color="{{comfortObj[item.comfort_level].color}}" stroke-width="{{40 * radio}}" border-radius="{{20 * radio}}"></progress>
+                <view class="progress-text">{{comfortObj[item.comfort_level].name}}/{{item.ins_carry_capacity}}人</view>
+            </view> -->
+
+                <view class="'info'{{item.comfort_level==5?'shushi':''}}{{item.comfort_level==4?'jiaoshushi':''}}{{item.comfort_level==3?'yiban':''}}{{item.comfort_level==2?'jiaoyongji':''}}{{item.comfort_level==1?'yongji':''}}">
+                <view class="top-info">
+                    <view class="comft">
+                    <view>
+                        当前舒适度:
+                    </view>
+                    <view wx:if="{{item.comfort_level===itemY.level}}" wx:for-item="itemY" style="color:{{itemY.color}}" wx:for="{{comfortLevel}}" class="two">{{itemY.desc}}</view>
+                </view>
+                <!-- <view class="num">
+                    瞬时承载量:{{item.ins_carry_capacity}}人
+                </view> -->
+                </view>
+                <view class="other-tip">
+                <text>更新时间:{{item.status_time}}</text>
+            </view>
+            </view>
+
+            </view>
+    </view>
+
+</view>
 
-</view>
\ No newline at end of file
diff --git a/pages/pbService/sceneComfort/index.wxss b/pages/pbService/sceneComfort/index.wxss
index b699e0b..a9b3637 100644
--- a/pages/pbService/sceneComfort/index.wxss
+++ b/pages/pbService/sceneComfort/index.wxss
@@ -53,7 +53,7 @@ page {
   position: fixed;
   left: 0;
   right: 0;
-  padding: 20rpx 30rpx;
+  padding: 20rpx 30rpx 30rpx;
   background: #fff;
   z-index: 1;
   font-size: 26rpx;
@@ -65,8 +65,9 @@ page {
   justify-content: space-between;
   align-items: center;
   padding-left: 20rpx;
-  background: #EDEDED;
+  /* background: #EDEDED; */
   border-radius: 30rpx;
+  border: 1px solid #848484;
 }
 .my-search-box .iconfont {
   color: #999999;
@@ -98,8 +99,7 @@ page {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  margin-top: 30rpx;
-  margin-bottom: 20rpx;
+  padding: 30rpx 30rpx 0;
 }
 .picker .iconfont {
   font-size: 16rpx;
@@ -107,17 +107,22 @@ page {
   margin-left: 10rpx;
 }
 .comfort-levels {
+    width: 691rpx;
+    margin: 0 auto;
   display: flex;
   align-items: center;
   margin-top: 10rpx;
   white-space: nowrap;
+  font-weight: 500;
+font-size: 26rpx;
 }
 .comfort-level {
   padding: 0 16rpx;
   border-radius: 20rpx;
   line-height: 38rpx;
-  border: 1rpx solid;
+  border: none;
   margin-right: 20rpx;
+  background: #FFFFFF;
 }
 .two {
 	padding: 0 12rpx;
@@ -178,4 +183,23 @@ font-size: 26rpx;
 font-family: PingFang SC;
 font-weight: 500;
 color: #333333;
+}
+
+.comfort-container{
+    padding: 0 30rpx;
+    width: 100%;
+    margin-top: 30rpx;
+}
+.comfort-container .comfort-head{
+    width: 690rpx;
+    height: 132rpx;
+    background: linear-gradient(91deg, #5AB2D6 0%, #6BCEAF 100%);
+    border-radius: 20rpx;
+    display: flex;
+    padding: 0rpx 30rpx 68.33rpx;
+    box-sizing: border-box;
+    font-weight: 500;
+    font-size: 32rpx;
+    color: #FFFFFF;
+    align-items: flex-end;
 }
\ No newline at end of file
diff --git a/pages/user/user.wxml b/pages/user/user.wxml
index 06731c6..caca19b 100644
--- a/pages/user/user.wxml
+++ b/pages/user/user.wxml
@@ -122,7 +122,7 @@
     <navigator url="userPrivacy/index?id=14" class="user-box-line" catchtap="pagePoint" data-event="mine_receiveinfo">
       第三方共享信息清单
     </navigator>
-    <navigator url="/pages/pbService/web/index?weburl=https://m.supplier.cloud.sz-trip.com/login" class="user-box-line" catchtap="pagePoint" data-event="mine_receiveinfo">
+    <navigator url="/pages/pbService/web/index?weburl=https://m.supplier.cloud.sz-trip.com" class="user-box-line" catchtap="pagePoint" data-event="mine_receiveinfo">
       商户核销
     </navigator>
   </view>
diff --git a/project.private.config.json b/project.private.config.json
index b200949..88e6abb 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -7,9 +7,9 @@
     "miniprogram": {
       "list": [
         {
-          "name": "pages/order/joinOrder/index",
-          "pathName": "pages/order/pay/index",
-          "query": "id=28182505231709189176&token=0b62878b-b30c-41d8-a91f-119f8365d86e",
+          "name": "pages/pbService/sceneComfort/index",
+          "pathName": "pages/pbService/sceneComfort/index",
+          "query": "",
           "launchMode": "default",
           "scene": null
         },