Pārlūkot izejas kodu

fix:2.0bug修改

guotianliang 4 gadi atpakaļ
vecāks
revīzija
e1ef92eaea

+ 1 - 0
app.js

@@ -15,6 +15,7 @@ App({
         } else {
           this.globalData.CustomBar = StatusBar + 50
         }
+        console.log(capsule,"hah",this.globalData.StatusBar,"18")
       }
     })
   },

+ 1 - 1
app.json

@@ -16,7 +16,7 @@
     "backgroundTextStyle": "light",
     "navigationBarBackgroundColor": "#ffffff",
     "navigationBarTitleText": "",
-    "navigationBarTextStyle": "black"
+    "navigationBarTextStyle":"black"
   },
   "usingComponents": {
     "header": "./components/header/header",

+ 10 - 5
app.wxss

@@ -7,11 +7,16 @@ page,view,text,swiper,swiper-item,image,navigator{
 /* 定义主题颜色 */
 page{
   --themeColor:#191B26;
-  --nodateColor:#eeeeee;
-  --envredColor:#ee595a;
-  --envgreenColor:#69d8a6;
-  --envyellowColor:#ffc400;
-  --envblueColor:#479bef;
+  --nodateColor:#EFF0F1;
+  --nodatetxtColor:#373C43;
+  --envredColor:#FDE3E2;
+  --envredtxtColor:#F54E45;
+  --envgreenColor:#D9F5D6;
+  --envgreentxtColor:#34C724;
+  --envyellowColor:#FEEAD2;
+  --envyellowtxtColor:#F58300;
+  --envblueColor:#E1F2FF;
+  --envbluetxtColor:#0091FF;
 }
 .flex_column{
   display: flex;

+ 10 - 13
components/spacecard/index.wxml

@@ -2,32 +2,29 @@
 
 <wxs src="../../utils/filter.wxs" module="filter" />
 <view>
-<!--  class="{{imgShow?'hide_box':'del_box'}}" -->
 	<view class="card_box" bindtap="goHome">
 		<view class="card_img">
-		<!-- 1592813009674.jpg -->
 			<view wx:if="{{!imgShow}}" class="picinit">
-				<!-- <van-loading type="spinner" color="#1989fa" size="18"/> -->
 				 <image src="{{picInitUrl}}" lazy-load="{{true}}" wx:if="{{!item.pic}}"/>
 			</view>
-			<!-- <image src="{{cardDate.picInit}}" wx:if="{{!imgShow}}"></image> -->
 			<image src="{{imgbaseUrl+cardDate.pic}}&width=136&height=108" wx:if="{{cardDate.pic}}" class='{{imgShow ? "" : "before-load"}}'  bindload="imageLoad" lazy-load="{{true}}"></image>
-			<!-- <view wx:if="{{!cardDate.pic}}" class="noimgbox">暂无图片</view> -->
+
 		</view>
 		<view class="card_msg">
-			<view>
-				<text>{{cardDate.localName}}</text>
-			</view>
-			<view>
+			<view class="card_name">
+				<view class="nametxt">
+					<text>{{cardDate.localName}}</text>
+				</view>
 				<view class="imgbox">
 					<view  class="lottie {{canvashidden?'':lottiehidden}}" wx:if="{{canvashidden}}">
-					<lottie id="lottie{{cardDate.id}}" canId="{{cardDate.id}}" animationData="{{statusList[cardDate.stateId].canvasDate}}" width="25" height="25"/></view>
+						<lottie id="lottie{{cardDate.id}}" canId="{{cardDate.id}}" animationData="{{statusList[cardDate.stateId].canvasDate}}" width="25" height="25"/>
+					</view>
 					<!-- <image src="{{statusList[cardDate.stateId].canvasDate}}"></image> -->
 					<text>{{cardDate.state}}</text>
 				</view>
-				<view class="tempnum">
-					{{filter.mathFormat(cardDate.temperature)|| '--'}}{{unit}}
-				</view>
+			</view>
+			<view class="tempnum">
+				{{filter.mathFormat(cardDate.temperature)|| '--'}}<text> {{unit}}</text>
 			</view>
 		</view>
 	</view>

+ 23 - 5
components/spacecard/index.wxss

@@ -35,15 +35,20 @@
 .card_msg{
   flex: 1;
   padding-left: 32rpx;
-}
-.card_msg>view{
   display: flex;
-  justify-content: space-between;
   flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
+.card_msg>.card_name{
+  display: flex;
+  /* justify-content: space-between; */
+  flex-direction: column;
 }
 .imgbox{
   display: flex;
   align-items: center;
+  margin-top: 16rpx;
   transform: translateZ(0)
 }
 .imgbox image{
@@ -51,18 +56,31 @@
   height: 40rpx;
   margin-right: 6rpx;
 }
+.nametxt text{
+  font-size: 32rpx;
+  color: #191B26;
+}
+.imgbox text{
+  color: #80838F;
+  font-size: 28rpx;
+}
 .card_msg>view:nth-child(1){
   margin-top: 4rpx;
   color:rgba(25,27,38,1);
   font-size: 32rpx;
 }
-.card_msg>view:nth-child(2){
+/* .card_msg>view:nth-child(2){
   color: #80838F;
   font-size: 28rpx;
   margin-top: 16rpx;
+} */
+.card_msg>.tempnum{
+  color: #191B26;
+  font-size: 36rpx;
 }
-.card_msg>view .tempnum{
+.card_msg>.tempnum text{
   color: #191B26;
+  font-size: 28rpx;
 }
 .lottie{
   width: 50rpx;

+ 38 - 3
pages/adjust/index.js

@@ -122,6 +122,32 @@ Page({
       projectid:this.data.spaceDetail.projectId})
     }
   },
+  checkLevel(value,name){
+    let objList={
+      humidity:{
+        range:[30,70],
+        text:["干燥","适宜","湿润"]
+      },
+      co2:{
+        range:[800,1500],
+        text:["适宜","偏高","超标"]
+      },
+      pm25:{
+        range:[35,75],
+        text:["优","良","差"]
+      },
+      hcho:{
+        range:[0.05,0.08],
+        text:["适宜","偏高","超标"]
+      }
+    };
+    value =Number(value)
+    let sortArr=[value,...objList[name].range].sort((a,b)=>{return a-b});
+
+    let level=sortArr.findIndex(item=>item===value);
+    let levelTxt = objList[name].text[level];
+    return {level,levelTxt}
+  },
   // 检查是否过引导
   checkGuide(){
     if(this.data.spaceDetail.isClose.toString()=="true"){
@@ -724,10 +750,13 @@ Page({
    */
   onLoad: function (options) {
     options = JSON.parse(decodeURIComponent(JSON.stringify(options)));
-
     if(options.md1){
       this.getDetail(options.md1);
     }else{
+      options.humidity&&(options.humiditylevel = this.checkLevel(options.humidity,"humidity"));
+      options.co2&&(options.co2level = this.checkLevel(options.co2,"co2"));
+      options.pm25&&(options.pm25level = this.checkLevel(options.pm25,"pm25"));
+      options.hcho&&(options.hcholevel = this.checkLevel(options.hcho,"hcho"));
       this.setData({spaceDetail:options},()=>{
         this.checkGuide();
         this.getnowSeason();
@@ -748,7 +777,7 @@ Page({
       data= {
         criteria: {
           "spaceId": value,
-          "userId": $.store.get('userId'),
+          "userId": $.store.get('userId')||$.storage.get('userId'),
           "projectId": projectId
         }
       }
@@ -756,7 +785,7 @@ Page({
       data= {
         criteria: {
           "spaceId": this.data.spaceDetail.id,
-          "userId": $.store.get('userId'),
+          "userId": $.store.get('userId')||$.storage.get('userId'),
           "projectId": this.data.spaceDetail.projectId
         }
       }
@@ -765,6 +794,12 @@ Page({
     let res = await getSpacedetail(data);
     wx.hideLoading();
     let {content} = res;
+    if(content){
+      (content[0].humidity||content[0].humidity==0)&&(content[0].humiditylevel = this.checkLevel(content[0].humidity,"humidity"));
+      (content[0].co2||content[0].co2==0)&&(content[0].co2level = this.checkLevel(content[0].co2,"co2"));
+      (content[0].pm25||content[0].pm25==0)&&(content[0].pm25level = this.checkLevel(content[0].pm25,"pm25"));
+      (content[0].hcho||content[0].hcho==0)&&(content[0].hcholevel = this.checkLevel(content[0].hcho,"hcho"));
+    }
     this.setData({spaceDetail:content[0]},()=>{
       this.checkGuide();
       this.getnowSeason();

+ 2 - 1
pages/adjust/index.json

@@ -9,5 +9,6 @@
     "van-toast": "../../vant-weapp/dist/toast/index",
     "van-loading": "../../vant-weapp/dist/loading/index"
   },
-  "navigationStyle":"custom"
+  "navigationStyle":"custom",
+  "navigationBarTextStyle":"white"
 }

+ 97 - 8
pages/adjust/index.less

@@ -1,6 +1,9 @@
 page{
     height: 100%;
 }
+.j_page{
+    padding-bottom: 64rpx;
+}
 .mini_mask{
     width: 100%;
     z-index: 100;
@@ -14,7 +17,7 @@ page{
         box-shadow:0 0 5px 800px rgba(0,0,0,0.2);
     }
     .step_one{
-        height:310rpx;
+        height:346rpx;
         width: 100%;
         top: 510rpx;
         left: 0;
@@ -22,7 +25,7 @@ page{
             position: absolute;
             width: 201px;
             height: 40px;
-            top: 340rpx;
+            top: 380rpx;
             background: #04B49C;
             box-shadow: 0px 1px 16px 0px rgba(227, 227, 227, 0.5);
             border-radius: 6px;
@@ -88,7 +91,8 @@ page{
     display: flex;
     align-items: center;
     flex-direction: row;
-    padding:0 34rpx;
+    // padding:0 34rpx;
+    padding:0 26rpx;
     width: 100%;
     justify-content: space-between;
     .mode_box{
@@ -149,8 +153,8 @@ page{
                 justify-content:flex-start;
                 &>view{
                     margin-left: 18rpx;
-                    width: 34rpx;
-                    height: 34rpx;
+                    width: 46rpx;
+                    height: 46rpx;
                 }
             }
         }
@@ -163,12 +167,19 @@ page{
     }
     .space_paramelist{
         margin: 0 24rpx;
-        height: 140rpx;
+        // height: 140rpx;
+        // padding: 30rpx 0;
         background: #F8F9FA;
         border-radius: 4px;
         .parame_item{
-            width: 25%;
+            max-width: 25%;
+            min-width: 25%;
+            padding:32rpx 0rpx 32rpx 0rpx;
+            display: flex;
+            justify-content: flex-start;
+            align-items: flex-start;
             .icon_name{
+                justify-content: flex-start;
                 image{
                     width: 32rpx;
                     height: 32rpx;
@@ -184,6 +195,78 @@ page{
                     font-size: 32rpx;
                 }
             }
+            .parame_tag{
+                margin:8rpx 0;
+                padding: 4rpx 14rpx;
+                color: #ffffff;
+                border-radius: 24rpx;
+                // height: 30rpx;
+                font-size: 18rpx;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                min-width: 72rpx;
+            }
+            .taghumiditybg0{
+                background:var(--envredColor);
+                color:var(--envredtxtColor);
+            }
+            .taghumiditybg1{
+                background:var(--envgreenColor);
+                color:var(--envgreentxtColor);
+            }
+            .taghumiditybg2{
+                background:var(--envblueColor);
+                color:var(--envbluetxtColor);
+            }
+            .tagpm25bg0{
+                background:var(--envgreenColor);
+                color:var(--envgreentxtColor);
+            }
+            .tagpm25bg1{
+                background:var(--envyellowColor);
+                color:var(--envyellowtxtColor);
+            }
+            .tagpm25bg2{
+                background:var(--envredColor);
+                color:var(--envredtxtColor);
+            }
+            .tagco2bg0{
+                background:var(--envgreenColor);
+                color:var(--envgreentxtColor);
+            }
+            .tagco2bg1{
+                background:var(--envyellowColor);
+                color:var(--envyellowtxtColor);
+            }
+            .tagco2bg2{
+                background:var(--envredColor);
+                color:var(--envredtxtColor);
+            }
+            .taghchobg0{
+                background:var(--envgreenColor);
+                color:var(--envgreentxtColor);
+            }
+            .taghchobg1{
+                background:var(--envyellowColor);
+                color:var(--envyellowtxtColor);
+            }
+            .taghchobg2{
+                background:var(--envredColor);
+                color:var(--envredtxtColor);
+            }
+            .novalue{
+                min-height:16px;
+                font-weight: bold;
+                background:var(--nodateColor);
+                color:var(--nodatetxtColor);
+            }
+        }
+        .parame_item:nth-child(1){
+            padding:32rpx 0rpx 32rpx 24rpx;
+        }
+        .parame_item:nth-child(4){
+            padding:32rpx 24rpx 32rpx 0rpx;
         }
     }
     .space_btns{
@@ -265,6 +348,9 @@ page{
                 margin-right: 24rpx;
             }
         }
+        &>.windstyle{
+            width: 100%;
+        }
         &>.typelistactive {
             background-color: #EAFAF8;
           }
@@ -277,7 +363,7 @@ page{
     justify-content: center;
     align-items: center;
     background: #FFFFFF;
-    border-radius: 20px;
+    border-radius: 40rpx;
     border: 1px solid #EFF0F1;
     color: #04B49C;
     image{
@@ -286,6 +372,9 @@ page{
         margin-right: 10rpx;
     }
 }
+.iosbottom{
+    margin: 15rpx 32rpx 0rpx;
+}
 .uptime{
     position: absolute;
     bottom: 20px;

+ 11 - 7
pages/adjust/index.wxml

@@ -16,7 +16,7 @@
     <header class="header_custom" wx:if="{{headerShow}}" customClass="{{true}}">
         <view slot="content" class="header-title">
             <view class='goback' bindtap="goBack">
-                <van-icon color="#FFFFFF" name="arrow-left" />
+                <van-icon color="#FFFFFF" name="arrow-left" size="18px"/>
             </view>
             <view class='mode_box' bindtap="changeMode">
                 <image src="../../static/images/modechange.png" />
@@ -25,7 +25,7 @@
         </view>
     </header>
 </van-sticky>
-<view id="j_page">
+<view id="j_page" class="j_page">
     <!-- <view class="flex_row uptime" wx:if="{{nextOpenTime}}">
         预计 {{nextOpenTime}} 重新开启环境调节
     </view> -->
@@ -46,7 +46,7 @@
                 </view>
             </view>
             <view class="msg_right" bindtap="toDetail">
-                <text>{{spaceDetail.temperature}}</text>°C
+                <text>{{spaceDetail.temperature || '--'}}</text>°C
             </view>
         </view>
         <view class="space_paramelist flex_row" hidden="{{!StandardMode}}">
@@ -56,6 +56,10 @@
                     <image src="{{value.imgSrc}}" /> {{value.name}}
                     </view>
                     <view class="parame_num"><text>{{(spaceDetail[key]&&(spaceDetail[key]+'')) || '--'}}</text>{{value.unit}}</view>
+                    <view class="parame_tag tag{{key}}bg{{spaceDetail[key+'level'].level}}" wx:if="{{(spaceDetail[key]||spaceDetail[key]==0)}}">
+                        <text>{{spaceDetail[key+'level'].levelTxt}}</text>
+                    </view>
+                    <view class="parame_tag novalue" wx:else><text>- -</text></view>
                 </view>
             </block>
         </view>
@@ -84,18 +88,18 @@
             </view>
             <view class="list_body">
                 <block wx:for="{{windType}}" key="{{index}}">
-                    <view bindtap="changeType" class="{{windTypeValue===item.id?'typelistactive':''}}" data-index="{{item.id}}" data-type="wind">
+                    <view bindtap="changeType" class="{{windTypeValue===item.id?'typelistactive':''}} windstyle" data-index="{{item.id}}" data-type="wind">
                         <image src="{{item.imgSrc}}"></image>{{item.value}}
                     </view>
                 </block>
             </view>
         </view>
-        <view class="closedown" bindtap="turnDown">
+        <view class="closedown iosbottom" bindtap="turnDown">
             <image src="../../static/images/turndown.png"></image>关机
         </view>
     </view>
     <view class="turndown" hidden="{{!StandardMode}}" wx:if="{{(spaceDetail.isClose+'')=='true'}}">
-        <view class="closedown" bindtap="turnUp">
+        <view class="closedown iosbottom" bindtap="turnUp">
             <image src="../../static/images/turndown.png"></image>开启
         </view>
 
@@ -208,7 +212,7 @@
                 </block>
             </swiper>
         </view>
-        <view class="envpanel flex_row" wx:if="{{currentIndex!=5}}">
+        <view class="envpanel flex_row" wx:if="{{currentIndex!=5&&spaceDetail.temperature}}">
             <view class="panel_left">
                 <text class="left_txt">当前温度</text>
                 <view><text class="left_num">{{spaceDetail.temperature}}</text>°C</view>

+ 93 - 8
pages/adjust/index.wxss

@@ -1,6 +1,9 @@
 page {
   height: 100%;
 }
+.j_page {
+  padding-bottom: 64rpx;
+}
 .mini_mask {
   width: 100%;
   z-index: 100;
@@ -14,7 +17,7 @@ page {
   box-shadow: 0 0 5px 800px rgba(0, 0, 0, 0.2);
 }
 .mini_mask .step_one {
-  height: 310rpx;
+  height: 346rpx;
   width: 100%;
   top: 510rpx;
   left: 0;
@@ -23,7 +26,7 @@ page {
   position: absolute;
   width: 201px;
   height: 40px;
-  top: 340rpx;
+  top: 380rpx;
   background: #04B49C;
   box-shadow: 0px 1px 16px 0px rgba(227, 227, 227, 0.5);
   border-radius: 6px;
@@ -81,7 +84,7 @@ page {
   display: flex;
   align-items: center;
   flex-direction: row;
-  padding: 0 34rpx;
+  padding: 0 26rpx;
   width: 100%;
   justify-content: space-between;
 }
@@ -142,8 +145,8 @@ page {
 }
 .adjust_main .space_msg .msg_left .spacestate > view {
   margin-left: 18rpx;
-  width: 34rpx;
-  height: 34rpx;
+  width: 46rpx;
+  height: 46rpx;
 }
 .adjust_main .space_msg .msg_right text {
   font-size: 46rpx;
@@ -151,14 +154,19 @@ page {
 }
 .adjust_main .space_paramelist {
   margin: 0 24rpx;
-  height: 140rpx;
   background: #F8F9FA;
   border-radius: 4px;
 }
 .adjust_main .space_paramelist .parame_item {
-  width: 25%;
+  max-width: 25%;
+  min-width: 25%;
+  padding: 32rpx 0rpx 32rpx 0rpx;
+  display: flex;
+  justify-content: flex-start;
+  align-items: flex-start;
 }
 .adjust_main .space_paramelist .parame_item .icon_name {
+  justify-content: flex-start;
   color: #8D9399;
   font-size: 24rpx;
 }
@@ -174,6 +182,77 @@ page {
 .adjust_main .space_paramelist .parame_item .parame_num text {
   font-size: 32rpx;
 }
+.adjust_main .space_paramelist .parame_item .parame_tag {
+  margin: 8rpx 0;
+  padding: 4rpx 14rpx;
+  color: #ffffff;
+  border-radius: 24rpx;
+  font-size: 18rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  min-width: 72rpx;
+}
+.adjust_main .space_paramelist .parame_item .taghumiditybg0 {
+  background: var(--envredColor);
+  color: var(--envredtxtColor);
+}
+.adjust_main .space_paramelist .parame_item .taghumiditybg1 {
+  background: var(--envgreenColor);
+  color: var(--envgreentxtColor);
+}
+.adjust_main .space_paramelist .parame_item .taghumiditybg2 {
+  background: var(--envblueColor);
+  color: var(--envbluetxtColor);
+}
+.adjust_main .space_paramelist .parame_item .tagpm25bg0 {
+  background: var(--envgreenColor);
+  color: var(--envgreentxtColor);
+}
+.adjust_main .space_paramelist .parame_item .tagpm25bg1 {
+  background: var(--envyellowColor);
+  color: var(--envyellowtxtColor);
+}
+.adjust_main .space_paramelist .parame_item .tagpm25bg2 {
+  background: var(--envredColor);
+  color: var(--envredtxtColor);
+}
+.adjust_main .space_paramelist .parame_item .tagco2bg0 {
+  background: var(--envgreenColor);
+  color: var(--envgreentxtColor);
+}
+.adjust_main .space_paramelist .parame_item .tagco2bg1 {
+  background: var(--envyellowColor);
+  color: var(--envyellowtxtColor);
+}
+.adjust_main .space_paramelist .parame_item .tagco2bg2 {
+  background: var(--envredColor);
+  color: var(--envredtxtColor);
+}
+.adjust_main .space_paramelist .parame_item .taghchobg0 {
+  background: var(--envgreenColor);
+  color: var(--envgreentxtColor);
+}
+.adjust_main .space_paramelist .parame_item .taghchobg1 {
+  background: var(--envyellowColor);
+  color: var(--envyellowtxtColor);
+}
+.adjust_main .space_paramelist .parame_item .taghchobg2 {
+  background: var(--envredColor);
+  color: var(--envredtxtColor);
+}
+.adjust_main .space_paramelist .parame_item .novalue {
+  min-height: 16px;
+  font-weight: bold;
+  background: var(--nodateColor);
+  color: var(--nodatetxtColor);
+}
+.adjust_main .space_paramelist .parame_item:nth-child(1) {
+  padding: 32rpx 0rpx 32rpx 24rpx;
+}
+.adjust_main .space_paramelist .parame_item:nth-child(4) {
+  padding: 32rpx 24rpx 32rpx 0rpx;
+}
 .adjust_main .space_btns {
   display: flex;
   align-items: center;
@@ -253,6 +332,9 @@ page {
   height: 56rpx;
   margin-right: 24rpx;
 }
+.envstate_list .list_body > .windstyle {
+  width: 100%;
+}
 .envstate_list .list_body > .typelistactive {
   background-color: #EAFAF8;
 }
@@ -263,7 +345,7 @@ page {
   justify-content: center;
   align-items: center;
   background: #FFFFFF;
-  border-radius: 20px;
+  border-radius: 40rpx;
   border: 1px solid #EFF0F1;
   color: #04B49C;
 }
@@ -272,6 +354,9 @@ page {
   height: 24rpx;
   margin-right: 10rpx;
 }
+.iosbottom {
+  margin: 15rpx 32rpx 0rpx;
+}
 .uptime {
   position: absolute;
   bottom: 20px;

+ 2 - 2
pages/adjustlog/index.js

@@ -73,12 +73,12 @@ Page({
           res.content.forEach(item=>{
             item.text=this.data.tempType[item.itemId] || '';
             if(!item.text){
-              item.text = item.valueType==3?'设置全天温度计划':`调温至${item.value}°C`;
+              item.text = item.valueType==3?'设置全天温度计划':`调温至${item.value}°C`;
             }
             item.createTime = formatMsgTime(new Date(item.createTime)); //this.initDate
           })
         }
-        this.setData({dataList:this.data.dataList.concat(res.content)});
+        res.content&&this.setData({dataList:this.data.dataList.concat(res.content)});
         // console.log(res);
       })
       wx.hideLoading()

+ 17 - 1
pages/adjustlog/index.less

@@ -1,7 +1,8 @@
 .header-title{
     background-color: #ffffff;
     justify-content: space-between;
-    padding: 0 32rpx;
+    // padding:0 34rpx;
+    padding:0 26rpx;
     width: 100%;
     .titlename{
         font-size: 17px;
@@ -45,4 +46,19 @@
 .nomore{
     height: 90rpx;
     color: #8D9399;
+}
+.nolist_box{
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-direction: column;
+    margin-top: 354rpx;
+    image{
+        width: 240rpx;
+        height: 240rpx;
+    }
+    text{
+        color: #8D9399;
+    }
+
 }

+ 5 - 1
pages/adjustlog/index.wxml

@@ -4,7 +4,7 @@
         <view slot="content" class="header-title flex_row">
             <view class="flex_row">
                 <view class='goback' bindtap="goBack">
-                    <van-icon name="arrow-left" />
+                    <van-icon name="arrow-left" size="18px"/>
                 </view>
                 <view class="gohome" bindtap="goHome">
                     <image src="../../static/images/home.png" />
@@ -25,4 +25,8 @@
         </view>
     </block>
     <view class="nomore flex_row" wx:if="{{dataList&&(dataList.length==allCount)}}">没有更多了哦!</view>
+    <view class="nolist_box" wx:if="{{dataList&&(!dataList.length)}}">
+        <image src="../../static/images/nolog.png" />
+        <text>暂无调节记录</text>
+    </view>
 </view>

+ 15 - 1
pages/adjustlog/index.wxss

@@ -1,7 +1,7 @@
 .header-title {
   background-color: #ffffff;
   justify-content: space-between;
-  padding: 0 32rpx;
+  padding: 0 26rpx;
   width: 100%;
 }
 .header-title .titlename {
@@ -46,3 +46,17 @@
   height: 90rpx;
   color: #8D9399;
 }
+.nolist_box {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+  margin-top: 354rpx;
+}
+.nolist_box image {
+  width: 240rpx;
+  height: 240rpx;
+}
+.nolist_box text {
+  color: #8D9399;
+}

+ 2 - 1
pages/auth/index.js

@@ -58,7 +58,8 @@ Page({
   async creatUser(){
     const data={};
     data.phone = $.store.get('phoneNumber');
-    data.openId =$.store.get('openId') ;
+    data.openId =$.store.get('openId') ||$.storage.get('openId');
+    console.log($.store.get('openId') ,$.storage.get('openId'),"$.storage.get('openId')")
     const {nickName} = $.store.get('userInfo')
     data.nickname=nickName;
     // data.userName=app.globalData.userInfo.nickName;

+ 66 - 11
pages/detail/index.js

@@ -1,7 +1,7 @@
 import $ from './../../utils/Tool';
 import router from './../../utils/router';
 import {
-  getPropertyData
+  getPropertyData,getCurrentSeason,getTransfrom
 } from "../../requests/api";
 Page({
 
@@ -10,12 +10,23 @@ Page({
    */
   data: {
     envLevel:{
-      temperature:[
-        {name:"偏冷",value:"22-24°C",min:22,active:true},
-        {name:"舒适",value:"24-26°C",min:24},
-        {name:"",value:"26-28°C",min:26,active:true},
-        {name:"偏热",value:"28-30°C",min:28},
-        {name:"",value:"30-32°C",min:30,active:true},
+      temperatureWarm:[
+        {name:"偏冷",value:"18-21°C",min:18,active:true},
+        {name:"舒适",value:"22-24°C",min:22,active:true},
+        {name:"偏热",value:"25-27°C",min:25,active:true},
+      ],
+      temperatureCooling:[
+        {name:"偏冷",value:"21-23°C",min:21,active:true},
+        {name:"舒适",value:"24-26°C",min:24,active:true},
+        {name:"偏热",value:"26-28°C",min:26,active:true},
+      ],
+      temperatureTransition:[
+        {name:"舒适",value:'',min:0,active:true},
+        {name:"偏热",value:"26°C以上",min:26,active:true},
+      ],
+      temperatureTransitioncold:[
+        {name:"偏冷",value:"18°C以下",min:-10,active:true},
+        {name:"舒适",value:"",min:18,active:true},
       ],
       humidity:[
         {name:"",value:"0-35%",min:0,active:true},
@@ -57,7 +68,8 @@ Page({
     funcid:"",
     spaceId:"",
     projectId:"",
-    tragetChart:[]
+    tragetChart:[],
+    seasonType:''
   },
   goBack(){
     router.pop()
@@ -77,12 +89,55 @@ Page({
     let {avg,propertyData,dayTarget}=res;
     this.initChartdate(propertyData,dayTarget);
     let levelList=[];
-    this.data.envLevel[this.data.envType].forEach(item=>{
-      levelList.push(item.min)
-    })
+
+    if(this.data.envType=="temperature"){
+      let day = new Date();
+      let year = day.getFullYear();
+      let month = day.getMonth() + 1;
+      let today = day.getDate();
+      const data={
+        projectId:$.store.get('projectId')||$.storage.get('projectId'),
+        dateTiime:`${year}${month}${today}`
+      }
+      let res = await getTransfrom(data);
+      let {seasonType,type} = (res.content&&res.content[0])||{seasonType:'Warm',type:2};
+      this.setData({seasonType:seasonType,seasonNum:type},()=>{
+        let that= this;
+        wx.createSelectorQuery().select('.param_list').boundingClientRect(function(rect){
+          that.setData({'tableHight':rect.height})
+        }).exec()
+      })
+
+      if(seasonType==="Transition"){
+        // 3 供冷-供暖
+        if(type==3){
+          this.data.envLevel[this.data.envType+seasonType+'cold'].forEach(item=>{
+            levelList.push(item.min)
+          })
+          this.setData({'envLevel.temperatureTransition':this.data.envLevel.temperatureTransitioncold});
+        }
+        // 4 供暖-供冷
+        if(type==4){
+          this.data.envLevel[this.data.envType+seasonType].forEach(item=>{
+            levelList.push(item.min)
+          })
+        }
+      }else{
+        this.data.envLevel[this.data.envType+seasonType].forEach(item=>{
+          levelList.push(item.min)
+        })
+      }
+
+    }else{
+      this.data.envLevel[this.data.envType].forEach(item=>{
+        levelList.push(item.min)
+      })
+    }
+
     levelList.push(Number(avg))
     let valueIndex = levelList.sort((a,b)=>{return a-b}).findIndex(item=>item===avg);
     valueIndex = valueIndex<0?0:valueIndex;
+    console.log(valueIndex,levelList,"valueIndex")
     this.setData({pointerTop:38*valueIndex});
   },
   initChartdate(propertyData,dayTarget){

+ 12 - 4
pages/detail/index.less

@@ -1,6 +1,7 @@
 .header-title{
     justify-content: space-between;
-    padding: 0 32rpx;
+    // padding:0 34rpx;
+    padding:0 26rpx;
     width: 100%;
     .goback{
         width:30px;
@@ -70,19 +71,26 @@
             position: relative;
             background: linear-gradient(180deg, #34C724 0%, #B3D600 25%, #FFC60A 50%, #F54E45 75%, #F01D94 100%);
             border-radius: 4px;
+            transition: all 0.3s ease;
             .pointer{
                 position: absolute;
                 top: 0;
                 left: -30rpx;
-                transition: all 0.3s ease;
+                transition: all 0.4s ease;
                 image{
-                    width: 68rpx;
+                    width: 20rpx;
                     height: 24rpx;
                 }
             }
         }
         .temperature_line{
-            background: linear-gradient(180deg, #1054f4 0%, #34C724 50%, #FFC60A 65%, #F01D94 100%);
+            background: linear-gradient(180deg, #1054f4 0%, #34C724 60%, #FFC60A 80%, #F01D94 100%);
+        }
+        .temperature_line4{
+            background: linear-gradient(180deg, #34C724 0%, #34C724 20%,  #1054f4 100%,);
+        }
+        .temperature_line3{
+            background: linear-gradient(180deg, #1054f4 0%, #1054f4 20%,  #34C724 100%,);
         }
         .humidity_line{
             background: linear-gradient(180deg,#F01D94 0%, #FFC60A 20%, #34C724 60%,#1054f4 100%, );

+ 4 - 4
pages/detail/index.wxml

@@ -3,7 +3,7 @@
     <header>
         <view slot="content" class="header-title flex_row">
             <view class='goback' bindtap="goBack">
-                <van-icon name="arrow-left" />
+                <van-icon name="arrow-left" size="18px"/>
             </view>
             <text class="titlename">{{paramName}}</text>
             <text class="righttext"></text>
@@ -26,9 +26,9 @@
         <view class="param_icon">
             <!-- <image src="" /> -->
         </view>
-        <view class="param_line {{envType=='hcho'?'hcho_line':''}} {{envType=='co2'?'co2_line':''}} {{envType=='temperature'?'temperature_line':''}} {{envType=='humidity'?'humidity_line':''}}" style="height:{{tableHight}}px">
+        <view class="param_line {{envType=='hcho'?'hcho_line':''}} {{envType=='co2'?'co2_line':''}}  {{envType=='humidity'?'humidity_line':''}} {{seasonNum=='1'?'temperature_line':''}} {{seasonNum=='2'?'temperature_line':''}} {{seasonNum=='3'?'temperature_line3':''}} {{seasonNum=='4'?'temperature_line':''}}"  style="height:{{tableHight}}px">
             <view class="pointer" style="top:{{pointerTop}}px">
-                <image src="../../static/images/envPointer.png" />
+                <image src="../../static/images/envPointer.png"/>
             </view>
         </view>
         <view class="param_table">
@@ -36,7 +36,7 @@
                 <text class="header_title_one">{{localName}}等级</text>
                 <text class="header_title_two">24小时{{localName}}平均值标准值</text>
             </view>
-            <block wx:for="{{envLevel[envType]}}" wx:for-index="key">
+            <block wx:for="{{envLevel[envType+seasonType]}}" wx:for-index="key">
                 <view class="table_body">
                     <text class="header_title_one {{item.active?'header_title_one_active':''}}">{{item.name}}</text>
                     <text class="header_title_two">{{item.value}}</text>

+ 11 - 4
pages/detail/index.wxss

@@ -1,6 +1,6 @@
 .header-title {
   justify-content: space-between;
-  padding: 0 32rpx;
+  padding: 0 26rpx;
   width: 100%;
 }
 .header-title .goback {
@@ -71,19 +71,26 @@
   position: relative;
   background: linear-gradient(180deg, #34C724 0%, #B3D600 25%, #FFC60A 50%, #F54E45 75%, #F01D94 100%);
   border-radius: 4px;
+  transition: all 0.3s ease;
 }
 .param_mian .param_list .param_line .pointer {
   position: absolute;
   top: 0;
   left: -30rpx;
-  transition: all 0.3s ease;
+  transition: all 0.4s ease;
 }
 .param_mian .param_list .param_line .pointer image {
-  width: 68rpx;
+  width: 20rpx;
   height: 24rpx;
 }
 .param_mian .param_list .temperature_line {
-  background: linear-gradient(180deg, #1054f4 0%, #34C724 50%, #FFC60A 65%, #F01D94 100%);
+  background: linear-gradient(180deg, #1054f4 0%, #34C724 60%, #FFC60A 80%, #F01D94 100%);
+}
+.param_mian .param_list .temperature_line4 {
+  background: linear-gradient(180deg, #34C724 0%, #34C724 20%, #1054f4 100%);
+}
+.param_mian .param_list .temperature_line3 {
+  background: linear-gradient(180deg, #1054f4 0%, #1054f4 20%, #34C724 100%);
 }
 .param_mian .param_list .humidity_line {
   background: linear-gradient(180deg, #F01D94 0%, #FFC60A 20%, #34C724 60%, #1054f4 100%);

+ 8 - 5
pages/feedback/index.js

@@ -137,7 +137,7 @@ Page({
 
   },
   clearImg(){
-    this.setData({fileList:[],showUpload:true,photoType:''})
+    this.setData({fileList:[],showUpload:true,photoType:null})
   },
   getKeeper(){
     let data={
@@ -170,8 +170,8 @@ Page({
     })
   },
   async submitFeed(){
-    wx.hideLoading();
     if(!this.data.spaceId){
+      wx.hideLoading();
       wx.showToast({
         title: '未选择空间',
         duration: 1500
@@ -187,15 +187,18 @@ Page({
       })
       return
     }
+    let projectId = $.store.get('projectId') ||$.storage.get('projectId');
+    let userId = $.store.get('userId') || $.storage.get('userId');
     let data={
-      "projectId":$.store.get('projectId'),
+      "projectId":projectId,
       "spaceId":this.data.spaceId,
-      "userId":$.store.get('userId'),
+      "userId":userId,
       "phone":$.store.get('phone'),//反馈人手机号
       "type":0,//反馈来源 0 小程序 1 app 2 pc
       "suggest":this.data.suggest,//反馈建议
     }
     this.data.debunkValue&&(data.item=this.data.debunkValue);
+    console.log(this.data.photoType,"this.data.photoType")
     if(this.data.photoType!==''){
       let res  = await this.uploadFile();
       data.photoList=[{"type":this.data.photoType,"photo":this.data.fileName}]
@@ -209,7 +212,7 @@ Page({
             duration: 2000
           })
         }, 300)
-        this.setData({fileList:[],debunkValue:0,suggest:'',showUpload:true})
+        this.setData({fileList:[],debunkValue:0,suggest:'',showUpload:true,photoType:''})
       }
     })
   },

+ 4 - 1
pages/feedback/index.less

@@ -1,7 +1,8 @@
 .header-title{
     background-color: #ffffff;
     justify-content: space-between;
-    padding: 0 32rpx;
+    // padding:0 34rpx;
+    padding:0 26rpx;
     width: 100%;
     .titlename{
         font-size: 17px;
@@ -47,6 +48,7 @@ page{
                 z-index:-1;
             }
             .card_left{
+                margin-right: 20rpx;
                 &>text{
                     font-size: 32rpx;
                     color: #2B3036;
@@ -60,6 +62,7 @@ page{
                     font-weight: bold;
                     color: #04B49C;
                     margin: 40rpx 0 30rpx;
+                    justify-content: flex-start;
                     image{
                         width: 36rpx;
                         height: 36rpx;

+ 1 - 1
pages/feedback/index.wxml

@@ -3,7 +3,7 @@
         <view slot="content" class="header-title flex_row">
             <view class="flex_row">
                 <view class='goback' catchtap="goBack">
-                    <van-icon name="arrow-left" />
+                    <van-icon name="arrow-left" size="18px"/>
                 </view>
                 <view class="gohome" bindtap="goHome">
                     <image src="../../static/images/home.png" />

+ 5 - 1
pages/feedback/index.wxss

@@ -1,7 +1,7 @@
 .header-title {
   background-color: #ffffff;
   justify-content: space-between;
-  padding: 0 32rpx;
+  padding: 0 26rpx;
   width: 100%;
 }
 .header-title .titlename {
@@ -46,6 +46,9 @@ page {
   left: 0;
   z-index: -1;
 }
+.feedback_content .contact .contact_card .card_left {
+  margin-right: 20rpx;
+}
 .feedback_content .contact .contact_card .card_left > text {
   font-size: 32rpx;
   color: #2B3036;
@@ -59,6 +62,7 @@ page {
   font-weight: bold;
   color: #04B49C;
   margin: 40rpx 0 30rpx;
+  justify-content: flex-start;
 }
 .feedback_content .contact .contact_card .card_left .phone image {
   width: 36rpx;

+ 46 - 22
pages/index/index.js

@@ -46,6 +46,18 @@ Page({
     temperatureNum:'--',
     guideUser:false,
   },
+  toDetail(e){
+    if(!e.currentTarget.dataset.istemp){
+      router.push("detail",e.currentTarget.dataset)
+    }else{
+      router.push("detail",{name:"温度",
+      localname:"温度",
+      param:"temperature",
+      funcid:"Tdb",
+      spaceid:e.currentTarget.dataset.spaceid,
+      projectid:e.currentTarget.dataset.projectid})
+    }
+  },
    // 检查是否过引导
   checkGuide(){
     if(!this.data.tenantName){
@@ -88,10 +100,10 @@ Page({
   },
   // 置顶操作
   tapItem(e){
-    let {id,top} = e.currentTarget.dataset.spaceid;
+    let {id,top,projectId} = e.currentTarget.dataset.spaceid;
     let spaceIndex = e.currentTarget.dataset.index;
     let data = {
-      "projectId":this.data.projectId,
+      "projectId":projectId,
       "spaceId":id,
       "userId":this.data.userId,
       "top":top?0:1
@@ -162,7 +174,11 @@ Page({
           } else {
             await that.getTenant(res);
             // 第一次进入获取数据
+            console.log($.storage.get('wxqcode'),"$.storage.get('wxqcode')")
             !$.storage.get('wxqcode')&&that.getData();
+            if($.storage.get('wxqcode')&&$.storage.get('logined')){
+              this.checkCode($.storage.get('wxqcode'));
+            }
           }
         });
       }
@@ -187,9 +203,9 @@ Page({
       this.setData({logined:true});
       !$.storage.get('openId')&&$.storage.set('openId', res.content.openId);
       !$.storage.get('openId')&&$.storage.set('userId', res.content.id);
-      $.storage.set('projectId',  $.store.get("projectId"));
-      $.storage.set('tenantId', $.store.get('tenantId'));
-      $.storage.set('tenantName', $.store.get('tenantName'));
+      $.storage.set('projectId', currentTenant.projectId);
+      $.storage.set('tenantId', currentTenant.tenantId);
+      $.storage.set('tenantName',currentTenant.tenantName);
 
       this.setData({
         projectId: $.store.get('projectId'),
@@ -263,11 +279,11 @@ Page({
               current = value[0];
             }
           }
-        }else{
-          current.projectId = currntProjectId;
-          current.tenantId = currntProjecttenantId;
-          current.tenantName = currntProjecttenantName;
-        }
+      }else{
+        current.projectId = currntProjectId;
+        current.tenantId = currntProjecttenantId;
+        current.tenantName = currntProjecttenantName;
+      }
 
       resolve(current)
     })
@@ -282,24 +298,28 @@ Page({
    */
   async getData() {
     // $.loading()
+    let userId = $.store.get('userId')||$.storage.get('userId');
+    if(!userId){
+      return;
+    }
     wx.showLoading({
       title:"加载中"
     })
     const data = {
       "criteria": {
-        "userId": $.store.get('userId'),
-        "projectId": $.store.get('projectId'),
-        "tenantId":  $.store.get('tenantId')
+        "userId": userId,
+        "projectId": $.store.get('projectId')||$.storage.get('projectId'),
+        "tenantId":  $.store.get('tenantId')||$.storage.get('tenantId')
       }
     }
     // let res = await queryRotation(data);
     let res = await getSpaceAdjustList(data);
     if(res.count){
       res.content.forEach(item=>{
-        item.humidity&&(item.humiditylevel = this.checkLevel(item.humidity,"humidity"));
-        item.co2&&(item.co2level = this.checkLevel(item.co2,"co2"));
-        item.pm25&&(item.pm25level = this.checkLevel(item.pm25,"pm25"));
-        item.hcho&&(item.hcholevel = this.checkLevel(item.hcho,"hcho"));
+        (item.humidity||item.humidity==0)&&(item.humiditylevel = this.checkLevel(item.humidity,"humidity"));
+        (item.co2||item.co2==0)&&(item.co2level = this.checkLevel(item.co2,"co2"));
+        (item.pm25||item.pm25==0)&&(item.pm25level = this.checkLevel(item.pm25,"pm25"));
+        (item.hcho||item.hcho==0)&&(item.hcholevel = this.checkLevel(item.hcho,"hcho"));
       })
       this.setData({cardList:res.content})
     }else{
@@ -311,7 +331,7 @@ Page({
   checkLevel(value,name){
     let objList={
       humidity:{
-        range:[20,50],
+        range:[30,70],
         text:["干燥","适宜","湿润"]
       },
       co2:{
@@ -330,6 +350,7 @@ Page({
     let sortArr=[value,...objList[name].range].sort((a,b)=>{return a-b});
 
     let level=sortArr.findIndex(item=>item===value);
+    console.log(level,349)
     let levelTxt = objList[name].text[level];
     return {level,levelTxt}
   },
@@ -422,11 +443,13 @@ Page({
       let q = decodeURIComponent(options.q);
       // let q="https://duoduoenv.sagacloud.cn/scan?key=Sp110108025988e09ed4cd8c45b5a496f18622ab81ca";
       $.storage.set('wxqcode', q);
+      // console.log($.storage.get('wxqcode'),"123")
     }
     await this.inItUserdate();
-    if($.storage.get('wxqcode')&&this.data.logined){
-      this.checkCode($.storage.get('wxqcode'));
-    }
+    console.log($.storage.get('wxqcode'),$.storage.get('logined'),"449")
+    // if($.storage.get('wxqcode')&&$.storage.get('logined')){
+    //   this.checkCode($.storage.get('wxqcode'));
+    // }
     this.getWeatherNum();
     this.checkGuide();
     // 加载数据
@@ -447,9 +470,10 @@ Page({
    */
   async onShow() {
     // await this.inItUserdate();
-    if($.store.get("tenantId")&&!$.store.get('changeTenantId')&&!this.data.formList){
+    if($.storage.get("tenantId")&&!$.store.get('changeTenantId')&&!this.data.formList){
       this.getData();
     }
+
     if(this.data.formList){
       this.setData({
         tenantName:$.store.get('tenantName'),

+ 2 - 1
pages/index/index.json

@@ -4,5 +4,6 @@
     "van-toast": "../../vant-weapp/dist/toast/index"
   },
   "navigationStyle":"custom",
-  "enablePullDownRefresh": true
+  "enablePullDownRefresh": true,
+  "navigationBarTextStyle":"black"
 }

+ 52 - 13
pages/index/index.less

@@ -1,5 +1,9 @@
+page{
+    overflow-x: hidden;
+}
 .header-title{
-    padding: 0 32rpx;
+    // padding:0 34rpx;
+    padding:0 26rpx;
     width: 100%;
     display: flex;
     flex-direction: row;
@@ -19,7 +23,7 @@
         box-shadow:0 0 5px 800px rgba(0,0,0,0.2);
     }
     .step_one{
-        height: 97rpx;
+        height: 130rpx;
         width: 450rpx;
         top: 43rpx;
         left: 0;
@@ -27,7 +31,7 @@
             position: absolute;
             width: 201px;
             height: 40px;
-            top: 137rpx;
+            top: 170rpx;
             background: #04B49C;
             box-shadow: 0px 1px 16px 0px rgba(227, 227, 227, 0.5);
             border-radius: 6px;
@@ -102,11 +106,15 @@
         margin:20rpx 32rpx 0;
         .space_item{
             width: 100%;
-            height: 840rpx;
+            // height: 840rpx;
+            padding-bottom: 40rpx;
             background: #FFFFFF;
-            box-shadow: 0px 6px 20px 0px rgba(43, 48, 54, 0.1);
+            box-shadow: 0px 4px 3px 0px rgba(43, 48, 54, 0.1);
             border-radius: 8px;
             margin-bottom: 40rpx;
+            &>view{
+                text-align: left;
+            }
             .space_bg{
                 width: 100%;
                 height: 398rpx;
@@ -140,8 +148,8 @@
                         justify-content:flex-start;
                         &>view{
                             margin-left: 18rpx;
-                            width: 34rpx;
-                            height: 34rpx;
+                            width: 46rpx;
+                            height: 46rpx;
                         }
                    }
                }
@@ -154,12 +162,18 @@
             }
             .space_paramelist{
                 margin: 0 24rpx;
-                height: 140rpx;
+                // height: 140rpx;
                 background: #F8F9FA;
                 border-radius: 4px;
                 .parame_item{
-                    width: 25%;
+                    max-width: 25%;
+                    min-width: 25%;
+                    padding:32rpx 0rpx 32rpx 0rpx;
+                    display: flex;
+                    justify-content: flex-start;
+                    align-items: flex-start;
                     .icon_name{
+                        justify-content: flex-start;
                         image{
                             width: 32rpx;
                             height: 32rpx;
@@ -172,6 +186,7 @@
                         color: #646A73;
                         font-size: 24rpx;
                         font-weight: bold;
+                        float: left;
                         text{
                             font-size: 32rpx;
                         }
@@ -190,44 +205,65 @@
                     }
                     .taghumiditybg0{
                         background:var(--envredColor);
+                        color:var(--envredtxtColor);
                     }
                     .taghumiditybg1{
                         background:var(--envgreenColor);
+                        color:var(--envgreentxtColor);
                     }
                     .taghumiditybg2{
                         background:var(--envblueColor);
+                        color:var(--envbluetxtColor);
                     }
                     .tagpm25bg0{
                         background:var(--envgreenColor);
+                        color:var(--envgreentxtColor);
                     }
                     .tagpm25bg1{
                         background:var(--envyellowColor);
+                        color:var(--envyellowtxtColor);
                     }
                     .tagpm25bg2{
                         background:var(--envredColor);
+                        color:var(--envredtxtColor);
                     }
                     .tagco2bg0{
                         background:var(--envgreenColor);
+                        color:var(--envgreentxtColor);
                     }
                     .tagco2bg1{
                         background:var(--envyellowColor);
+                        color:var(--envyellowtxtColor);
                     }
                     .tagco2bg2{
                         background:var(--envredColor);
+                        color:var(--envredtxtColor);
                     }
                     .taghchobg0{
                         background:var(--envgreenColor);
+                        color:var(--envgreentxtColor);
                     }
                     .taghchobg1{
                         background:var(--envyellowColor);
+                        color:var(--envyellowtxtColor);
                     }
                     .taghchobg2{
                         background:var(--envredColor);
+                        color:var(--envredtxtColor);
                     }
                     .novalue{
-                        background:#cccccc;
+                        min-height:16px;
+                        font-weight: bold;
+                        background:var(--nodateColor);
+                        color:var(--nodatetxtColor);
                     }
                 }
+                .parame_item:nth-child(1){
+                    padding:32rpx 0rpx 32rpx 24rpx;
+                }
+                .parame_item:nth-child(4){
+                    padding:32rpx 24rpx 32rpx 0rpx;
+                }
             }
             .space_btns{
                 display: flex;
@@ -252,7 +288,8 @@
                 .btns_top{
                     width: 162rpx;
                     color: #8D9399;
-                    border: 1px solid #EFF0F1;
+                    // border: 1px solid #EFF0F1;
+                    border: 1px solid transparent;
                 }
                 .btns_top_active{
                     background: #EAFAF8;
@@ -271,6 +308,7 @@
     .nospace{
         width: 100%;
         max-width: 343px;
+        margin:0 auto;
         height: 339px;
         border-radius: 8px;
         border: 1px dashed #DDDDDD;
@@ -304,6 +342,7 @@
     .scannospace{
         width: 100%;
         max-width: 343px;
+        margin: 0 auto;
         height: 254px;
         margin-top: 40rpx;
         background: #FFFFFF;
@@ -343,9 +382,9 @@
     position:fixed;
     bottom: 0;
     width: 100%;
-    padding: 0 32rpx;
+    padding: 26rpx 32rpx 68rpx;
     box-sizing: border-box;
-    height: 78px;
+    // height: 78px;
     background: #ffffff;
     display: flex;
     justify-content: space-around;

+ 10 - 10
pages/index/index.wxml

@@ -12,7 +12,7 @@
             <view class='user-img' bindtap="gotoUser">
                 <open-data type="userAvatarUrl"></open-data>
             </view>
-            <view class='home-icon'>
+            <view class='home-icon' hidden="{{!tenants}}">
                 <view class="projectname flex_row" bindtap="chooseTenant">{{tenantName}}<image src="../../static/images/downarrow2.png" wx:if="{{tenants.length>1?true:false}}"/></view>
                 <view class="daytmp flex_row">
                     <image src="../../static/images/sun.png" />
@@ -23,7 +23,7 @@
     </header>
 </van-sticky>
 <van-toast id="van-toast" />
-<view class="contant_box {{logined?'':'faillogin'}}" id="j_page">
+<view class="contant_box {{(cardList&&cardList.length)?'':'faillogin'}}" id="j_page">
     <view class="spacelist_box">
         <view class="nospace flex_column" wx:if="{{cardList&&!cardList.length}}">
             <view class="nospace_center flex_column">
@@ -36,7 +36,7 @@
                 <image class="nospace_down" src="../../static/images/downarrow.png"/>
             </view>
         </view>
-        <view class="scannospace flex_column" bindtap="getScancode" wx:if="{{!logined}}">
+        <view class="scannospace flex_column" bindtap="getScancode" wx:if="{{!logined||!tenants}}">
             <view class="scan_box flex_column">
                 <image src="../../static/images/qrcode.png" />
             </view>
@@ -55,24 +55,24 @@
                             <text class="spacename">{{item.localName}}</text>
                             <view class="spacestate flex_row">
                                 <text>{{item.state}}</text>
-                                <view><lottie id="lottie{{item.id}}" animationData="{{statusList[item.stateId].canvasDate}}" width="20" height="20"/></view>
+                                <view><lottie id="lottie{{item.id}}" animationData="{{statusList[item.stateId].canvasDate}}" width="25" height="25"/></view>
                             </view>
                         </view>
-                        <view class="msg_right">
-                            <text>{{item.temperature}}</text>°C
+                        <view class="msg_right" catchtap="toDetail" data-istemp="{{true}}" data-spaceid="{{item.id}}" data-projectid="{{item.projectId}}">
+                            <text>{{item.temperature || '--'}}</text>°C
                         </view>
                     </view>
                     <view class="space_paramelist flex_row">
                         <block wx:for="{{envNamelist}}" wx:for-index="key" wx:for-item="value">
-                            <view class="parame_item flex_column one-line-text" bindtap="toDetail" :key="index">
+                            <view class="parame_item flex_column one-line-text" bindtap="toDetail" data-param="{{key}}" data-spaceid="{{item.id}}" data-projectid="{{item.projectId}}" data-funcid="{{value.funcid}}" data-localname="{{value.localName}}" data-name="{{value.name}}" :key="index">
                                 <view class="icon_name flex_row">
-                                <image src="{{value.imgSrc}}" /> {{value.name}}
+                                    <image src="{{value.imgSrc}}" /> {{value.name}}
                                 </view>
                                 <view class="parame_num"><text>{{(item[key]||item[key]==0)?item[key]:'--'}}</text>{{value.unit}}</view>
                                 <view class="parame_tag tag{{key}}bg{{item[key+'level'].level}}" wx:if="{{(item[key]||item[key]==0)}}">
                                     <text>{{item[key+'level'].levelTxt}}</text>
                                 </view>
-                                <view class="parame_tag novalue" wx:else><text>无数据</text></view>
+                                <view class="parame_tag novalue" wx:else><text>- -</text></view>
                             </view>
                         </block>
                     </view>
@@ -95,7 +95,7 @@
     <view class='placeholder-view' hidden="{{cardList&&cardList.length<=1}}"></view>
 </view>
 
-<cover-view class="footer_box" wx:if="{{logined&&tenantName}}">
+<cover-view class="footer_box" wx:if="{{logined&&tenants}}">
     <cover-view class="spacedetail" wx:for="{{meauList}}" wx:key="{{index}}" bindtap="meauClick" data-index="{{item.id}}">
         <cover-view class="item_img">
             <cover-image src="{{item.imgSrc}}" mode="aspectFill"></cover-image>

+ 47 - 13
pages/index/index.wxss

@@ -1,5 +1,8 @@
+page {
+  overflow-x: hidden;
+}
 .header-title {
-  padding: 0 32rpx;
+  padding: 0 26rpx;
   width: 100%;
   display: flex;
   flex-direction: row;
@@ -19,7 +22,7 @@
   box-shadow: 0 0 5px 800px rgba(0, 0, 0, 0.2);
 }
 .mini_mask .step_one {
-  height: 97rpx;
+  height: 130rpx;
   width: 450rpx;
   top: 43rpx;
   left: 0;
@@ -28,7 +31,7 @@
   position: absolute;
   width: 201px;
   height: 40px;
-  top: 137rpx;
+  top: 170rpx;
   background: #04B49C;
   box-shadow: 0px 1px 16px 0px rgba(227, 227, 227, 0.5);
   border-radius: 6px;
@@ -96,12 +99,15 @@
 }
 .contant_box .spacelist_box .space_item {
   width: 100%;
-  height: 840rpx;
+  padding-bottom: 40rpx;
   background: #FFFFFF;
-  box-shadow: 0px 6px 20px 0px rgba(43, 48, 54, 0.1);
+  box-shadow: 0px 4px 3px 0px rgba(43, 48, 54, 0.1);
   border-radius: 8px;
   margin-bottom: 40rpx;
 }
+.contant_box .spacelist_box .space_item > view {
+  text-align: left;
+}
 .contant_box .spacelist_box .space_item .space_bg {
   width: 100%;
   height: 398rpx;
@@ -136,8 +142,8 @@
 }
 .contant_box .spacelist_box .space_item .space_msg .msg_left .spacestate > view {
   margin-left: 18rpx;
-  width: 34rpx;
-  height: 34rpx;
+  width: 46rpx;
+  height: 46rpx;
 }
 .contant_box .spacelist_box .space_item .space_msg .msg_right text {
   font-size: 46rpx;
@@ -145,14 +151,19 @@
 }
 .contant_box .spacelist_box .space_item .space_paramelist {
   margin: 0 24rpx;
-  height: 140rpx;
   background: #F8F9FA;
   border-radius: 4px;
 }
 .contant_box .spacelist_box .space_item .space_paramelist .parame_item {
-  width: 25%;
+  max-width: 25%;
+  min-width: 25%;
+  padding: 32rpx 0rpx 32rpx 0rpx;
+  display: flex;
+  justify-content: flex-start;
+  align-items: flex-start;
 }
 .contant_box .spacelist_box .space_item .space_paramelist .parame_item .icon_name {
+  justify-content: flex-start;
   color: #8D9399;
   font-size: 24rpx;
 }
@@ -165,6 +176,7 @@
   color: #646A73;
   font-size: 24rpx;
   font-weight: bold;
+  float: left;
 }
 .contant_box .spacelist_box .space_item .space_paramelist .parame_item .parame_num text {
   font-size: 32rpx;
@@ -182,42 +194,63 @@
 }
 .contant_box .spacelist_box .space_item .space_paramelist .parame_item .taghumiditybg0 {
   background: var(--envredColor);
+  color: var(--envredtxtColor);
 }
 .contant_box .spacelist_box .space_item .space_paramelist .parame_item .taghumiditybg1 {
   background: var(--envgreenColor);
+  color: var(--envgreentxtColor);
 }
 .contant_box .spacelist_box .space_item .space_paramelist .parame_item .taghumiditybg2 {
   background: var(--envblueColor);
+  color: var(--envbluetxtColor);
 }
 .contant_box .spacelist_box .space_item .space_paramelist .parame_item .tagpm25bg0 {
   background: var(--envgreenColor);
+  color: var(--envgreentxtColor);
 }
 .contant_box .spacelist_box .space_item .space_paramelist .parame_item .tagpm25bg1 {
   background: var(--envyellowColor);
+  color: var(--envyellowtxtColor);
 }
 .contant_box .spacelist_box .space_item .space_paramelist .parame_item .tagpm25bg2 {
   background: var(--envredColor);
+  color: var(--envredtxtColor);
 }
 .contant_box .spacelist_box .space_item .space_paramelist .parame_item .tagco2bg0 {
   background: var(--envgreenColor);
+  color: var(--envgreentxtColor);
 }
 .contant_box .spacelist_box .space_item .space_paramelist .parame_item .tagco2bg1 {
   background: var(--envyellowColor);
+  color: var(--envyellowtxtColor);
 }
 .contant_box .spacelist_box .space_item .space_paramelist .parame_item .tagco2bg2 {
   background: var(--envredColor);
+  color: var(--envredtxtColor);
 }
 .contant_box .spacelist_box .space_item .space_paramelist .parame_item .taghchobg0 {
   background: var(--envgreenColor);
+  color: var(--envgreentxtColor);
 }
 .contant_box .spacelist_box .space_item .space_paramelist .parame_item .taghchobg1 {
   background: var(--envyellowColor);
+  color: var(--envyellowtxtColor);
 }
 .contant_box .spacelist_box .space_item .space_paramelist .parame_item .taghchobg2 {
   background: var(--envredColor);
+  color: var(--envredtxtColor);
 }
 .contant_box .spacelist_box .space_item .space_paramelist .parame_item .novalue {
-  background: #cccccc;
+  min-height: 16px;
+  font-weight: bold;
+  background: var(--nodateColor);
+  color: var(--nodatetxtColor);
+}
+.contant_box .spacelist_box .space_item .space_paramelist .parame_item:nth-child(1) {
+  padding: 32rpx 0rpx 32rpx 24rpx;
+}
+.contant_box .spacelist_box .space_item .space_paramelist .parame_item:nth-child(4) {
+  padding: 32rpx 24rpx 32rpx 0rpx;
 }
 .contant_box .spacelist_box .space_item .space_btns {
   display: flex;
@@ -243,7 +276,7 @@
 .contant_box .spacelist_box .space_item .space_btns .btns_top {
   width: 162rpx;
   color: #8D9399;
-  border: 1px solid #EFF0F1;
+  border: 1px solid transparent;
 }
 .contant_box .spacelist_box .space_item .space_btns .btns_top_active {
   background: #EAFAF8;
@@ -259,6 +292,7 @@
 .contant_box .nospace {
   width: 100%;
   max-width: 343px;
+  margin: 0 auto;
   height: 339px;
   border-radius: 8px;
   border: 1px dashed #DDDDDD;
@@ -289,6 +323,7 @@
 .contant_box .scannospace {
   width: 100%;
   max-width: 343px;
+  margin: 0 auto;
   height: 254px;
   margin-top: 40rpx;
   background: #FFFFFF;
@@ -327,9 +362,8 @@
   position: fixed;
   bottom: 0;
   width: 100%;
-  padding: 0 32rpx;
+  padding: 26rpx 32rpx 68rpx;
   box-sizing: border-box;
-  height: 78px;
   background: #ffffff;
   display: flex;
   justify-content: space-around;

+ 6 - 3
pages/search/index.js

@@ -49,11 +49,14 @@ Page({
     router.pop();
   },
   async getallList(){
+    let projectId = $.store.get('projectId') ||$.storage.get('projectId');
+    let tenantId = $.store.get('tenantId')||$.storage.get('tenantId');
+    let userId = $.store.get('userId') || $.storage.get('userId');
     const data={
       "criteria": {
-          "userId":$.store.get('userId'),
-          "projectId": $.store.get('projectId'),
-          "tenantId": $.store.get('tenantId')
+          "userId":userId,
+          "projectId": projectId,
+          "tenantId": tenantId
       },
       // page:this.data.currtPage + 1,
       // size:20,

+ 2 - 1
pages/search/index.less

@@ -1,6 +1,7 @@
 .header-title{
     justify-content: space-between;
-    padding: 0 32rpx;
+    // padding:0 34rpx;
+    padding:0 26rpx;
     width: 100%;
     .goback{
         width:30px;

+ 1 - 1
pages/search/index.wxml

@@ -2,7 +2,7 @@
     <header>
         <view slot="content" class="header-title flex_row">
             <view class='goback' bindtap="goBack">
-                <van-icon name="arrow-left" />
+                <van-icon name="arrow-left" size="18px"/>
             </view>
             <text class="titlename">空间选择</text>
             <text class="righttext"></text>

+ 1 - 1
pages/search/index.wxss

@@ -1,6 +1,6 @@
 .header-title {
   justify-content: space-between;
-  padding: 0 32rpx;
+  padding: 0 26rpx;
   width: 100%;
 }
 .header-title .goback {

+ 7 - 3
pages/spacelist/index.js

@@ -22,11 +22,15 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    let projectId = $.store.get('projectId') ||$.storage.get('projectId');
+    let tenantId = $.store.get('tenantId')||$.storage.get('tenantId');
+    let userId = $.store.get('userId') || $.storage.get('userId');
+    
     this.setData({
       currtPage:0,
-      projectId:$.store.get('projectId'),
-      tenantId:$.store.get('tenantId'),
-      userId:$.store.get('userId'),
+      projectId:projectId,
+      tenantId:tenantId,
+      userId:userId,
     })
     this.getallList();
   },

+ 6 - 3
pages/spacelog/index.js

@@ -35,11 +35,14 @@ Page({
     wx.showLoading({
       title:"加载中"
     })
+    let projectId = $.store.get('projectId') ||$.storage.get('projectId');
+    let tenantId = $.store.get('tenantId')||$.storage.get('tenantId');
+    let userId = $.store.get('userId') || $.storage.get('userId');
     let data={
       "criteria": {
-        "userId": $.store.get('userId'),
-        "projectId": $.store.get('projectId'),
-        "tenantId":  $.store.get('tenantId'),
+        "userId": userId,
+        "projectId":projectId,
+        "tenantId":  tenantId,
           spaceId:value
       },
       orders:[

+ 26 - 5
pages/usercenter/index.js

@@ -14,6 +14,9 @@ function chartFn(data=[]) {
       数值: {
         tickCount: 2,
         formatter: (v) => {
+          if(v==0){
+            return v
+          }
           return v +'次'
         },
       }
@@ -21,9 +24,13 @@ function chartFn(data=[]) {
     chart.axis("数值",{
       grid:null,
     });
+    let size = 9;
+    if(data&&data.length&&data.length>=20){
+        size=6;
+    }
     chart.interval()
       .position('温度*数值')
-      .color('name',['#04B49C','#FF8800']).size(10).adjust({
+      .color('name',['#04B49C','#FF8800']).size(size).adjust({
         type: 'dodge',
         marginRatio: 0.001 // 设置分组间柱子的间距
       });
@@ -92,20 +99,34 @@ Page({
       if(res.count){
         let {content} =res;
         let arrChart=[];
-        content.forEach(item => {
+        let arrlength = content&&(content.length-1);
+
+        content.forEach((item,index) => {
           if(item.fbTemp=="-9999"){
             return
           }
           let objCold = {
             name:'冷',
-            温度:item.fbTemp+'°C',
+            温度:item.fbTemp+'',
             数值:item.fbColdNum
           };
           let objHot= {
             name:'热',
-            温度:item.fbTemp+'°C',
+            温度:item.fbTemp+'',
             数值:item.fbHotNum
           };
+          if(arrlength===index){
+            objCold = {
+              name:'冷',
+              温度:item.fbTemp+'°C',
+              数值:item.fbColdNum
+            };
+            objHot= {
+              name:'热',
+              温度:item.fbTemp+'°C',
+              数值:item.fbHotNum
+            };
+          }
           arrChart.push(objCold);
           arrChart.push(objHot);
         });
@@ -148,7 +169,7 @@ Page({
     let month = day.getMonth() + 1;
     let today = day.getDate();
     const data={
-      projectId:$.store.get('projectId'),
+      projectId:$.store.get('projectId')||$.storage.get('projectId'),
       date:`${year}${month}${today}`
     }
     await getCurrentSeason(data).then(res=>{

+ 1 - 0
pages/usercenter/index.json

@@ -3,5 +3,6 @@
     "f2": "@antv/f2-canvas"
   },
   "navigationStyle":"custom",
+  "navigationBarTextStyle":"white",
   "enablePullDownRefresh": false
 }

+ 2 - 1
pages/usercenter/index.less

@@ -6,7 +6,8 @@
     display: flex;
     align-items: center;
     flex-direction: row;
-    padding:0 34rpx;
+    // padding:0 34rpx;
+    padding:0 26rpx;
     justify-content: flex-start;
     width: 100%;
     .goback{

+ 1 - 1
pages/usercenter/index.wxml

@@ -2,7 +2,7 @@
     <header class="header_custom" wx:if="{{headerShow}}" customClass="{{true}}">
         <view slot="content" class="header-title">
             <view class='goback' bindtap="goBack">
-                <van-icon name="arrow-left" />
+                <van-icon name="arrow-left" size="18px"/>
             </view>
         </view>
     </header>

+ 1 - 1
pages/usercenter/index.wxss

@@ -6,7 +6,7 @@
   display: flex;
   align-items: center;
   flex-direction: row;
-  padding: 0 34rpx;
+  padding: 0 26rpx;
   justify-content: flex-start;
   width: 100%;
 }

+ 5 - 0
requests/api.js

@@ -113,6 +113,10 @@ function getCurrentSeason(data){
 function contactTenant(data){
   return http.post('/server/spaceAdjust/adjustSpace',data,test)
 }
+
+function getTransfrom(data){
+  return http.get('/duoduo-service/custom-service/custom/getSeasonBySeasonDate',data,test)
+}
 module.exports = {
   getopenId, // 获取到openId
   getuserPhone, // 获取用户电话
@@ -145,4 +149,5 @@ module.exports = {
   submitAdjust, //提交温度计划
   getCurrentSeason, //获取当前季节类型
   contactTenant, //建立租户关系
+  getTransfrom, // 查询冬转夏 夏转东
 }

BIN
static/images/envPointer.png


BIN
static/images/nolog.png