diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 78bcb3b..5200043 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -86,7 +86,9 @@
- -->
+
diff --git a/pages/pbService/sceneComfort/index.js b/pages/pbService/sceneComfort/index.js
index db8e5d5..f026153 100644
--- a/pages/pbService/sceneComfort/index.js
+++ b/pages/pbService/sceneComfort/index.js
@@ -43,6 +43,7 @@ Page({
comfortLevel:res.data,
comfortObj:comfortObj
})
+ this.getList();
})
commonApi._post('pbservice/Other/getSuzhouAreas').then(res=>{
let areaObj = {}
@@ -62,7 +63,6 @@ Page({
areas:res.data,
areaObj:areaObj
})
- this.getList();
})
commonApi._post("pbservice/Comfort/getSceneLevel").then(res=>{
console.log(res)
@@ -117,6 +117,15 @@ Page({
page_num:10,
scene_level:this.data.sceneLevelIndex>0?this.data.sceneLevel[this.data.sceneLevelIndex].level:null
}).then(res=>{
+ let resData = res.data.rows
+ // 处理舒适度
+ resData.forEach(v=>{
+ v.comforLevel = this.data.comfortLevel.find(x=>x.level == v.comfort_level)
+ // v.comfort_level_str = comforLevel.desc
+ v.hourflowLeve = this.data.comfortLevel.find(x=>x.level == v.hour_flow_level)
+ // v.hour_flow_level_str = hourflowLeve.desc
+ })
+
this.setData({
list:this.data.list.concat(res.data.rows),
total:res.data.total
diff --git a/pages/pbService/sceneComfort/index.wxml b/pages/pbService/sceneComfort/index.wxml
index 04e38f1..bf7d5bd 100644
--- a/pages/pbService/sceneComfort/index.wxml
+++ b/pages/pbService/sceneComfort/index.wxml
@@ -34,7 +34,7 @@
舒适度：
{{item.desc}}
-更新时间:2025-05-26 10:00:00
+更新时间:{{list[0].status_time}}
@@ -43,37 +43,54 @@
-
- {{item.third_scene_name}}
-
-
- {{areaObj[item.area]}}
-
- {{sceneLevelObj[item.scene_level]}}
-
-
-
-
-
-
-
- 当前舒适度:
+
+
+ 本预测趋势图由AI生成，内容仅供参考。
+
+
+
+
+
+
+
+ {{item.third_scene_name}}
+ {{item.area}}
+ {{sceneLevelObj[item.scene_level]}}
- {{itemY.desc}}
-
-
+
+
+
+
+ 当前:
+ {{item.comforLevel.desc}}
+
+
+
+
+
+
+
+ 未来一小时:
+ {{item.comforLevel.desc}}
+
+
+
+
+
+
+
+ 更新时间:{{item.status_time}}
+
+
+
+
+
+
+
-
- 更新时间:{{item.status_time}}
-
-
+
diff --git a/pages/pbService/sceneComfort/index.wxss b/pages/pbService/sceneComfort/index.wxss
index a9b3637..3939af1 100644
--- a/pages/pbService/sceneComfort/index.wxss
+++ b/pages/pbService/sceneComfort/index.wxss
@@ -1,33 +1,77 @@
/* pages/pbService/sceneComfort/index.wxss */
page {
- background: #f6f6f6;
+ background: #EDEDED;
}
.comfort-item {
- margin: 30rpx;
- background: white;
- padding: 30rpx;
- padding-top: 10rpx;
- color: #333;
- border-radius: 20rpx;
+ display: flex;
+ width: 100%;
+ padding-bottom: 24rpx;
+}
+.item-container{
+ width: 100%;
+ background: white;
+ padding: 24rpx 10rpx 24rpx 24rpx;
+ box-sizing: border-box;
+ border-radius: 20rpx;
+}
+.comfort-item-img{
+ width: 172rpx;
+ height: 224rpx;
+ flex-shrink: 0;
+ border-radius: 16rpx;
+ object-fit: cover;
+}
+.comfort-item-content{
+ width: 1rpx;
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ padding:0rpx 0rpx 15rpx 15rpx;
}
+
.scene-title {
font-size: 30rpx;
line-height: 48rpx;
-}
-.comfort-tip {
display: flex;
align-items: center;
- font-size: 26rpx;
- margin-top: 10rpx;
- margin-bottom: 27rpx;
+ font-weight: 500;
+ font-size: 32rpx;
+ color: #000000;
+}
+.area-tag{
+ padding: 0 10rpx;
+ height: 31rpx;
+ background: rgba(204,168,25,0.4);
+ border-radius: 4rpx;
+ line-height: 31rpx;
+ font-weight: 400;
+ font-size: 22rpx;
+ color: #7D5B00;
+ margin-left: 15rpx;
+ flex-shrink: 0;
+ word-break: keep-all;
+ word-wrap: none;
}
-.comfort-tip image {
- width: 30rpx;
- margin-right: 7rpx;
+.slevel-tag{
+ padding: 0 10rpx;
+ height: 31rpx;
+ background: rgba(204,97,25,0.4);
+ border-radius: 4rpx;
+ line-height: 31rpx;
+ font-weight: 400;
+ font-size: 22rpx;
+ color: #CC6119;
+ margin-left: 15rpx;
+ flex-shrink: 0;
+ word-break: keep-all;
+ word-wrap: none;
}
+
.progress-item {
position: relative;
-
+ margin-top: 14rpx;
+ width: 176rpx;
}
.progress-text {
position: absolute;
@@ -44,7 +88,6 @@ page {
.other-tip {
font-size: 24rpx;
color: #888;
- margin-top: 33rpx;
display: flex;
justify-content: space-between;
align-items: center;
@@ -125,17 +168,10 @@ font-size: 26rpx;
background: #FFFFFF;
}
.two {
- padding: 0 12rpx;
- border-radius: 20rpx;
- line-height: 38rpx;
- border: 1rpx solid;
- margin-left: 10rpx;
-
-
+ padding-left: 8rpx;
font-size: 24rpx;
font-family: PingFang SC;
font-weight: 500;
-color: #83D851;
}
.info{
width: 630rpx;
@@ -166,13 +202,12 @@ background: rgba(252, 133, 58, .08);
}
.comft{
display: flex;
-
-
-font-size: 26rpx;
-font-family: PingFang SC;
-font-weight: 500;
-color: #333333;
-align-items: center;
+ font-size: 24rpx;
+ font-family: PingFang SC;
+ font-weight: 500;
+ color: #333333;
+ align-items: center;
+ word-break: keep-all;
}
.num{
border-left: 1rpx solid #D8D8D8;
@@ -189,6 +224,7 @@ color: #333333;
padding: 0 30rpx;
width: 100%;
margin-top: 30rpx;
+ box-sizing: border-box;
}
.comfort-container .comfort-head{
width: 690rpx;
@@ -202,4 +238,28 @@ color: #333333;
font-size: 32rpx;
color: #FFFFFF;
align-items: flex-end;
-}
\ No newline at end of file
+}
+.comfort-content{
+ width: 100%;
+ background:#EFFAF4;
+ border-radius: 20rpx;
+ padding: 24rpx;
+ box-sizing: border-box;
+ position: relative;
+ top: -46rpx;
+}
+.ai-tip{
+ height: 67rpx;
+ background: rgba(255, 150, 0, 0.08);
+ border-radius: 10rpx;
+ line-height: 67rpx;
+ padding: 0 20rpx;
+ font-weight: 500;
+font-size: 25rpx;
+color: #FF9900;
+width: fit-content;
+display: flex;
+align-items: center;
+margin-bottom: 30rpx;
+}
+