guotianliang 4 years ago
parent
commit
964aeceb07

+ 3 - 2
app.json

@@ -9,12 +9,13 @@
     "pages/usercenter/index",
     "pages/feedback/index",
     "pages/spacelist/index",
-    "pages/adjustlog/index"
+    "pages/adjustlog/index",
+    "pages/spacelog/index"
   ],
   "window": {
     "backgroundTextStyle": "light",
     "navigationBarBackgroundColor": "#ffffff",
-    "navigationBarTitleText": "WeChat",
+    "navigationBarTitleText": "",
     "navigationBarTextStyle": "black"
   },
   "usingComponents": {

+ 4 - 0
app.wxss

@@ -8,6 +8,10 @@ page,view,text,swiper,swiper-item,image,navigator{
 page{
   --themeColor:#191B26;
   --nodateColor:#eeeeee;
+  --envredColor:#ee595a;
+  --envgreenColor:#69d8a6;
+  --envyellowColor:#ffc400;
+  --envblueColor:#479bef;
 }
 .flex_column{
   display: flex;

+ 29 - 17
pages/adjust/index.js

@@ -204,7 +204,7 @@ Page({
     })
   },
   // 建立租户关联
-  buildContact(){
+  async buildContact(){
     let currentTenantId=$.storage.get('tenantId');
     if(currentTenantId!==this.data.spaceDetail.tenantId){
       // 通过扫码改变租户
@@ -214,14 +214,17 @@ Page({
       $.storage.set('projectId',this.data.spaceDetail.projectId);
       $.storage.set('tenantId',this.data.spaceDetail.tenantId);
     }
+    let top = (this.data.spaceDetail.top.toString())=="false"?0:1;
     const data={
       "userId":$.store.get('userId'),//用户id
       "projectId":this.data.spaceDetail.projectId,//项目id
       "spaceId":this.data.spaceDetail.id,//空间id
       "openId":$.store.get('openId'),
-      flag:1
+      flag:1,
+      top:top,
     }
-    contactTenant(data).then(res=>{
+    console.log(this.data.spaceDetail.top,"this.data.spaceDetail.top?")
+    await contactTenant(data).then(res=>{
       console.log("成功")
     })
   },
@@ -504,8 +507,11 @@ Page({
   // 加期望温度
   addClick(){
     let tepNum=this.data.targetTemp;
-    let firstNum = tepNum.toString().split('.')[0]
-    let lastNum = tepNum.toString().split('.')[1]
+    let firstNum = tepNum.toString().split('.')[0];
+    let lastNum = tepNum.toString().split('.')[1];
+    if(firstNum>=28){
+      return
+    }
     if(lastNum>=5){
       this.setData({targetTemp:Number(firstNum)+1})
     }else{
@@ -517,6 +523,9 @@ Page({
     let tepNum=this.data.targetTemp;
     let firstNum = tepNum.toString().split('.')[0]
     let lastNum = tepNum.toString().split('.')[1]
+    if(firstNum<=18&&!lastNum){
+      return ;
+    }
     if(lastNum>5){
       this.setData({targetTemp:Number(firstNum)+0.5})
     }else if(lastNum<=5){
@@ -548,7 +557,7 @@ Page({
       "value":this.data.targetTemp
     }
 
-    submitAdjust(data).then(res=>{
+    submitAdjust(data).then(async res=>{
       if(res.result="success"){
         wx.hideLoading();
         setTimeout(function () {
@@ -559,9 +568,10 @@ Page({
         }, 300)
 
       }
-      this.setData({effectTime:-1})
-      this.buildContact();
-      this.getChartDate();
+      // this.setData({effectTime:-1})
+      await this.buildContact();
+      this.isfeeded();
+      // this.getChartDate();
     })
   },
   // 修改全天温度
@@ -587,7 +597,7 @@ Page({
       "value":this.data.targetTemp,
       "customPlan":customPlan
     }
-    submitAdjust(data).then(res=>{
+    submitAdjust(data).then(async res=>{
       wx.hideLoading();
       setTimeout(function () {
         wx.showToast({
@@ -595,8 +605,9 @@ Page({
           duration: 2000
         })
       }, 300)
-      this.buildContact();
-      this.getChartDate();
+      await this.buildContact();
+      this.isfeeded();
+      // this.getChartDate();
     })
   },
   showTips(){
@@ -720,7 +731,8 @@ Page({
       this.setData({spaceDetail:options},()=>{
         this.checkGuide();
         this.getnowSeason();
-        if(this.data.spaceDetail.roomFuncType&&this.data.spaceDetail.roomFuncType.startsWith("31")){
+        let higthSpace=["311","312"];
+        if(this.data.spaceDetail.roomFuncType&&higthSpace.includes(this.data.spaceDetail.roomFuncType)){
           this.setData({singleOffice:true})
         }
         this.checkPower();
@@ -756,10 +768,10 @@ Page({
     this.setData({spaceDetail:content[0]},()=>{
       this.checkGuide();
       this.getnowSeason();
-      if(this.data.spaceDetail.nextOpenTime){
-        let value = this.formatTimeall(this.data.spaceDetail.nextOpenTime);
-        this.setData({nextOpenTime:value})
-      }
+      // if(this.data.spaceDetail.nextOpenTime){
+      //   let value = this.formatTimeall(this.data.spaceDetail.nextOpenTime);
+      //   this.setData({nextOpenTime:value})
+      // }
       if(this.data.spaceDetail.roomFuncType&&this.data.spaceDetail.roomFuncType.startsWith("31")){
         this.setData({singleOffice:true})
       }

+ 6 - 1
pages/adjust/index.less

@@ -79,6 +79,10 @@ page{
 .header_custom{
     float: left;
     width: 100%;
+    .goback{
+        width:30px;
+        text-align: center;
+    }
 }
 .header-title{
     display: flex;
@@ -532,7 +536,7 @@ page{
             height: 40rpx;
         }
         .feedtext_title{
-            font-size: 34rpx;
+            font-size: 38rpx;
             font-weight: 500;
             color: #000000;
             margin-bottom: 16rpx;
@@ -548,6 +552,7 @@ page{
         width: 100%;
         height:65rpx;
         font-size: 28rpx;
+        margin-top: 14rpx;
         .noticbox_text{
             text-align: center;
         }

+ 7 - 7
pages/adjust/index.wxml

@@ -3,12 +3,12 @@
 <view class="mini_mask" style="height:{{pageHight}}px" wx:if="{{guideInit}}" bindtap="nextStep">
     <view class="stepmask step_one" wx:if="{{guideStep===1}}">
         <view class="one_contant flex_row">
-            可以点击查看科普数据哦
+            点击查看科普数据哦
         </view>
     </view>
     <view class="stepmask step_two"  wx:if="{{guideStep===2}}">
         <view class="two_contant flex_row">
-            可以根据个人感受,点击任意一项即可生效哦!
+            根据个人感受,点击任意一项即可生效哦!
         </view>
     </view>
 </view>
@@ -26,9 +26,9 @@
     </header>
 </van-sticky>
 <view id="j_page">
-    <view class="flex_row uptime" wx:if="{{nextOpenTime}}">
-            预计 {{nextOpenTime}} 重新开启环境调节
-        </view>
+    <!-- <view class="flex_row uptime" wx:if="{{nextOpenTime}}">
+        预计 {{nextOpenTime}} 重新开启环境调节
+    </view> -->
     <!-- banner -->
     <view class="adjust_main">
         <view class="space_bg">
@@ -41,7 +41,7 @@
                 <view class="spacestate flex_row">
                     {{spaceDetail.state}}
                     <view>
-                        <lottie id="lottie{{spaceDetail.id}}" canId="{{spaceDetail.id}}" animationData="{{statusList[spaceDetail.stateId].canvasDate}}" width="20" height="20"/>
+                        <lottie wx:if="{{!feedBack}}" id="lottie{{spaceDetail.id}}" canId="{{spaceDetail.id}}" animationData="{{statusList[spaceDetail.stateId].canvasDate}}" width="20" height="20"/>
                     </view>
                 </view>
             </view>
@@ -55,7 +55,7 @@
                     <view class="icon_name flex_row">
                     <image src="{{value.imgSrc}}" /> {{value.name}}
                     </view>
-                    <view class="parame_num"><text>{{spaceDetail[key] || '--'}}</text>{{value.unit}}</view>
+                    <view class="parame_num"><text>{{(spaceDetail[key]&&(spaceDetail[key]+'')) || '--'}}</text>{{value.unit}}</view>
                 </view>
             </block>
         </view>

+ 6 - 1
pages/adjust/index.wxss

@@ -73,6 +73,10 @@ page {
   float: left;
   width: 100%;
 }
+.header_custom .goback {
+  width: 30px;
+  text-align: center;
+}
 .header-title {
   display: flex;
   align-items: center;
@@ -494,7 +498,7 @@ page {
   height: 40rpx;
 }
 .feedback_box .feedimgbox .feedtext_title {
-  font-size: 34rpx;
+  font-size: 38rpx;
   font-weight: 500;
   color: #000000;
   margin-bottom: 16rpx;
@@ -507,6 +511,7 @@ page {
   width: 100%;
   height: 65rpx;
   font-size: 28rpx;
+  margin-top: 14rpx;
 }
 .feedback_box .noticbox .noticbox_text {
   text-align: center;

+ 1 - 0
pages/adjustlog/index.less

@@ -8,6 +8,7 @@
     }
     .goback{
         width:30px;
+        text-align: center;
     }
     .righttext{
         width: 112rpx;

+ 1 - 0
pages/adjustlog/index.wxss

@@ -9,6 +9,7 @@
 }
 .header-title .goback {
   width: 30px;
+  text-align: center;
 }
 .header-title .righttext {
   width: 112rpx;

+ 1 - 0
pages/detail/index.less

@@ -4,6 +4,7 @@
     width: 100%;
     .goback{
         width:30px;
+        text-align: center;
     }
     .righttext{
         width: 30px;

+ 1 - 0
pages/detail/index.wxss

@@ -5,6 +5,7 @@
 }
 .header-title .goback {
   width: 30px;
+  text-align: center;
 }
 .header-title .righttext {
   width: 30px;

+ 4 - 4
pages/feedback/index.js

@@ -98,6 +98,7 @@ Page({
       success: function(res) {
 
           let tempFilePaths = res.tempFiles[0].tempFilePath;
+
           if(tempFilePaths.split('.').pop()==="mp4"){
             that.setData({photoType:'1'})
           }else{
@@ -169,7 +170,7 @@ Page({
     })
   },
   async submitFeed(){
-    console.log("进入提交函数")
+    wx.hideLoading();
     if(!this.data.spaceId){
       wx.showToast({
         title: '未选择空间',
@@ -177,7 +178,8 @@ Page({
       })
       return
     }
-    if(!this.data.debunkValue&&!this.data.suggest&&!this.photoType){
+    if(!this.data.debunkValue&&!this.data.suggest&&!this.data.photoType){
+      wx.hideLoading();
       wx.showToast({
         title: '请填写内容!',
         icon:'none',
@@ -185,7 +187,6 @@ Page({
       })
       return
     }
-    console.log("进入提交函数2")
     let data={
       "projectId":$.store.get('projectId'),
       "spaceId":this.data.spaceId,
@@ -199,7 +200,6 @@ Page({
       let res  = await this.uploadFile();
       data.photoList=[{"type":this.data.photoType,"photo":this.data.fileName}]
     }
-    console.log(data,"正在提交")
     submitFeedback(data).then(res=>{
       if(res.result=="success"){
         wx.hideLoading();

+ 2 - 0
pages/feedback/index.less

@@ -122,6 +122,7 @@ page{
 
         }
         .addpicture{
+            overflow: hidden;
             &>.item_title{
                 font-size: 17px;
                 color: rgba(0, 0, 0, 0.9);
@@ -170,6 +171,7 @@ page{
             height: 80rpx;
             font-size:32rpx;
             margin-top: 40rpx;
+            width: auto!important;
             color:#FFFFFF;
             background: #04B49C;
             border-radius: 20px;

+ 2 - 2
pages/feedback/index.wxml

@@ -71,8 +71,8 @@
             <view class="item_title">反馈和建议</view>
             <textarea placeholder="请输入"  value="{{suggest}}" bindinput="inputChange" class="txtarea" maxlength="200" cursor-spacing="10"/>
         </view>
-        <view class="submit flex_row" bindtap="submitFeed">
+        <button class="submit flex_row" catchtap="submitFeed">
             提交
-        </view>
+        </button>
     </view>
 </view>

+ 4 - 0
pages/feedback/index.wxss

@@ -111,6 +111,9 @@ page {
 .feedback_content .debunk .debunk_card .rodio_box .custom-rodio:nth-child(2n) {
   width: 200rpx;
 }
+.feedback_content .debunk .addpicture {
+  overflow: hidden;
+}
 .feedback_content .debunk .addpicture > .item_title {
   font-size: 17px;
   color: rgba(0, 0, 0, 0.9);
@@ -155,6 +158,7 @@ page {
   height: 80rpx;
   font-size: 32rpx;
   margin-top: 40rpx;
+  width: auto!important;
   color: #FFFFFF;
   background: #04B49C;
   border-radius: 20px;

+ 58 - 4
pages/index/index.js

@@ -44,14 +44,34 @@ Page({
     logined:$.storage.get('logined'),
     havePower:{result: "fail",message: "未定位到您的位置"},
     temperatureNum:'--',
+    guideUser:false,
+  },
+   // 检查是否过引导
+  checkGuide(){
+    if(!this.data.tenantName){
+      return
+    }
+    !$.storage.get('guideUser')&&this.getPageheight();
+    this.setData({'guideUser':!$.storage.get('guideUser')})
+  },
+  // 步骤引导函数
+  nextStep(e){
+      $.storage.set('guideUser',true);
+      this.setData({'guideUser':false});
+  },
+   // 获取容器高度
+  getPageheight:function(){
+    let that =this;
+    wx.createSelectorQuery().select('#j_page').boundingClientRect(function(rect){
+      that.setData({'pageHight':rect.height})
+    }).exec()
   },
   swipeClick(e){
     let that = this;
-    console.log(e,"50")
     let {spaceid} = e.currentTarget.dataset;
     wx.showModal({
       title: '删除',
-      content: '是否删除改空间',
+      content: '是否删除空间',
       success (res) {
         if (res.confirm) {
           let data={
@@ -275,6 +295,12 @@ Page({
     // 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"));
+      })
       this.setData({cardList:res.content})
     }else{
       this.setData({noDate:true,cardList:[]})
@@ -282,6 +308,31 @@ Page({
     wx.hideLoading()
     // $.hideLoading()
   },
+  checkLevel(value,name){
+    let objList={
+      humidity:{
+        range:[20,50],
+        text:["干燥","适宜","湿润"]
+      },
+      co2:{
+        range:[800,1500],
+        text:["适宜","偏高","超标"]
+      },
+      pm25:{
+        range:[35,75],
+        text:["优","良","差"]
+      },
+      hcho:{
+        range:[0.05,0.08],
+        text:["适宜","偏高","超标"]
+      }
+    };
+    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}
+  },
   /**
    * 去立即调节页面
    */
@@ -325,6 +376,7 @@ Page({
   },
   // 检查二维码
   async checkCode(value) {
+    console.log(value,381)
     let scanArr = value.split("?");
     let domain = scanArr[0];
     let qualifiedUrl=["http://meos.sagacloud.cn/scan",'https://duoduoenv.sagacloud.cn/scan']
@@ -368,14 +420,15 @@ Page({
     // 是否从微信直接进来
     if (options.q !== undefined) {
       let q = decodeURIComponent(options.q);
-      // let q="https://duoduoenv.sagacloud.cn/scan?key=Sp1101080002daf52978cdd34cd08a57cbf0d25e4980";
+      // let q="https://duoduoenv.sagacloud.cn/scan?key=Sp110108025988e09ed4cd8c45b5a496f18622ab81ca";
       $.storage.set('wxqcode', q);
     }
     await this.inItUserdate();
     if($.storage.get('wxqcode')&&this.data.logined){
       this.checkCode($.storage.get('wxqcode'));
     }
-    this.getWeatherNum()
+    this.getWeatherNum();
+    this.checkGuide();
     // 加载数据
     // this.getData();
   },
@@ -410,6 +463,7 @@ Page({
     if($.store.get('changeTenantId')){
       await this.remoteCheck();
       this.getWeatherNum();
+      this.checkGuide();
     }
 
   },

+ 96 - 0
pages/index/index.less

@@ -6,6 +6,50 @@
     align-items: center;
     background: rgba(255, 255, 255, 0.6);
 }
+.mini_mask{
+    width: 100%;
+    z-index: 100;
+    position: absolute;
+    // overflow: hidden;
+    .stepmask{
+        padding:0 16rpx;
+        background:rgba(0, 0, 0, 0);
+        position: absolute;
+        border-radius: 4px;
+        box-shadow:0 0 5px 800px rgba(0,0,0,0.2);
+    }
+    .step_one{
+        height: 97rpx;
+        width: 450rpx;
+        top: 43rpx;
+        left: 0;
+        .one_contant{
+            position: absolute;
+            width: 201px;
+            height: 40px;
+            top: 137rpx;
+            background: #04B49C;
+            box-shadow: 0px 1px 16px 0px rgba(227, 227, 227, 0.5);
+            border-radius: 6px;
+            color: #FFFFFF;
+            font-size: 14px;
+            &::before{
+                content: '';
+                width: 17px;
+                height: 17px;
+                position: absolute;
+                top:-7px;
+                left: 50rpx;
+                background:#04B49C;
+                transform: rotate(45deg);
+                // border-top: 10px solid transparent;
+                // border-left: 10px solid black;
+                // border-bottom: 10px solid transparent;
+                border-radius: 5px;
+            }
+        }
+    }
+}
 .user-img{
     width: 64rpx;
     height: 64rpx;
@@ -127,10 +171,62 @@
                     .parame_num{
                         color: #646A73;
                         font-size: 24rpx;
+                        font-weight: bold;
                         text{
                             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);
+                    }
+                    .taghumiditybg1{
+                        background:var(--envgreenColor);
+                    }
+                    .taghumiditybg2{
+                        background:var(--envblueColor);
+                    }
+                    .tagpm25bg0{
+                        background:var(--envgreenColor);
+                    }
+                    .tagpm25bg1{
+                        background:var(--envyellowColor);
+                    }
+                    .tagpm25bg2{
+                        background:var(--envredColor);
+                    }
+                    .tagco2bg0{
+                        background:var(--envgreenColor);
+                    }
+                    .tagco2bg1{
+                        background:var(--envyellowColor);
+                    }
+                    .tagco2bg2{
+                        background:var(--envredColor);
+                    }
+                    .taghchobg0{
+                        background:var(--envgreenColor);
+                    }
+                    .taghchobg1{
+                        background:var(--envyellowColor);
+                    }
+                    .taghchobg2{
+                        background:var(--envredColor);
+                    }
+                    .novalue{
+                        background:#cccccc;
+                    }
                 }
             }
             .space_btns{

+ 13 - 2
pages/index/index.wxml

@@ -1,4 +1,11 @@
 <loading id="loading"/>
+<view class="mini_mask" style="height:{{pageHight}}px" wx:if="{{guideUser}}" bindtap="nextStep">
+    <view class="stepmask step_one">
+        <view class="one_contant flex_row">
+            点击头像到用户页
+        </view>
+    </view>
+</view>
 <van-sticky>
     <header>
         <view slot="content" class="header-title">
@@ -16,7 +23,7 @@
     </header>
 </van-sticky>
 <van-toast id="van-toast" />
-<view class="contant_box {{logined?'':'faillogin'}}">
+<view class="contant_box {{logined?'':'faillogin'}}" id="j_page">
     <view class="spacelist_box">
         <view class="nospace flex_column" wx:if="{{cardList&&!cardList.length}}">
             <view class="nospace_center flex_column">
@@ -62,6 +69,10 @@
                                 <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>
                         </block>
                     </view>
@@ -84,7 +95,7 @@
     <view class='placeholder-view' hidden="{{cardList&&cardList.length<=1}}"></view>
 </view>
 
-<cover-view class="footer_box" wx:if="{{logined}}">
+<cover-view class="footer_box" wx:if="{{logined&&tenantName}}">
     <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>

+ 91 - 0
pages/index/index.wxss

@@ -6,6 +6,46 @@
   align-items: center;
   background: rgba(255, 255, 255, 0.6);
 }
+.mini_mask {
+  width: 100%;
+  z-index: 100;
+  position: absolute;
+}
+.mini_mask .stepmask {
+  padding: 0 16rpx;
+  background: rgba(0, 0, 0, 0);
+  position: absolute;
+  border-radius: 4px;
+  box-shadow: 0 0 5px 800px rgba(0, 0, 0, 0.2);
+}
+.mini_mask .step_one {
+  height: 97rpx;
+  width: 450rpx;
+  top: 43rpx;
+  left: 0;
+}
+.mini_mask .step_one .one_contant {
+  position: absolute;
+  width: 201px;
+  height: 40px;
+  top: 137rpx;
+  background: #04B49C;
+  box-shadow: 0px 1px 16px 0px rgba(227, 227, 227, 0.5);
+  border-radius: 6px;
+  color: #FFFFFF;
+  font-size: 14px;
+}
+.mini_mask .step_one .one_contant::before {
+  content: '';
+  width: 17px;
+  height: 17px;
+  position: absolute;
+  top: -7px;
+  left: 50rpx;
+  background: #04B49C;
+  transform: rotate(45deg);
+  border-radius: 5px;
+}
 .user-img {
   width: 64rpx;
   height: 64rpx;
@@ -124,10 +164,61 @@
 .contant_box .spacelist_box .space_item .space_paramelist .parame_item .parame_num {
   color: #646A73;
   font-size: 24rpx;
+  font-weight: bold;
 }
 .contant_box .spacelist_box .space_item .space_paramelist .parame_item .parame_num text {
   font-size: 32rpx;
 }
+.contant_box .spacelist_box .space_item .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;
+}
+.contant_box .spacelist_box .space_item .space_paramelist .parame_item .taghumiditybg0 {
+  background: var(--envredColor);
+}
+.contant_box .spacelist_box .space_item .space_paramelist .parame_item .taghumiditybg1 {
+  background: var(--envgreenColor);
+}
+.contant_box .spacelist_box .space_item .space_paramelist .parame_item .taghumiditybg2 {
+  background: var(--envblueColor);
+}
+.contant_box .spacelist_box .space_item .space_paramelist .parame_item .tagpm25bg0 {
+  background: var(--envgreenColor);
+}
+.contant_box .spacelist_box .space_item .space_paramelist .parame_item .tagpm25bg1 {
+  background: var(--envyellowColor);
+}
+.contant_box .spacelist_box .space_item .space_paramelist .parame_item .tagpm25bg2 {
+  background: var(--envredColor);
+}
+.contant_box .spacelist_box .space_item .space_paramelist .parame_item .tagco2bg0 {
+  background: var(--envgreenColor);
+}
+.contant_box .spacelist_box .space_item .space_paramelist .parame_item .tagco2bg1 {
+  background: var(--envyellowColor);
+}
+.contant_box .spacelist_box .space_item .space_paramelist .parame_item .tagco2bg2 {
+  background: var(--envredColor);
+}
+.contant_box .spacelist_box .space_item .space_paramelist .parame_item .taghchobg0 {
+  background: var(--envgreenColor);
+}
+.contant_box .spacelist_box .space_item .space_paramelist .parame_item .taghchobg1 {
+  background: var(--envyellowColor);
+}
+.contant_box .spacelist_box .space_item .space_paramelist .parame_item .taghchobg2 {
+  background: var(--envredColor);
+}
+.contant_box .spacelist_box .space_item .space_paramelist .parame_item .novalue {
+  background: #cccccc;
+}
 .contant_box .spacelist_box .space_item .space_btns {
   display: flex;
   align-items: center;

+ 0 - 3
pages/projectlist/index.js

@@ -35,9 +35,6 @@ Page({
     $.store.set('projectId',value.projectId)
     $.store.set('tenantId',value.tenantId)
     $.store.set('tenantName',value.tenantName)
-    // app.globalData.projectId = value.projectId;
-    // app.globalData.tenantId =value.tenantId;
-    // app.globalData.tenantName = value.tenantName;
     let pages = getCurrentPages();
     let prevPage = pages[ pages.length - 2 ];
     prevPage.setData({  // 将我们想要传递的参数在这里直接setData。上个页面就会执行这里的操作。

+ 1 - 1
pages/projectlist/index.wxml

@@ -1,6 +1,6 @@
 <view class="projectbox">
   <block wx:for="{{projectList}}" wx:key="{{index}}">
-    <view>{{item.projectName}}</view>
+    <view class="proname">{{item.projectName}}</view>
     <block wx:for="{{item.children}}" wx:for-item="items"  wx:key="{{items.tenantId}}">
       <view class="children children{{items.tenantId===tenantId?'active':''}}" data-index="{{items}}"  bindtap="chooseTenant">{{items.tenantName}}</view>
     </block>

+ 30 - 5
pages/projectlist/index.wxss

@@ -1,6 +1,6 @@
 page{
   width: 100%;
-  height: 100%; 
+  height: 100%;
   background-color: #F9F9FD;
 }
 .projectbox{
@@ -12,13 +12,38 @@ page{
   line-height: 88rpx;
   margin-left: 30rpx;
   padding-left: 36rpx;
-  
-  border-bottom: 1px solid #EEEEEE;
+
+  /* border-bottom: 1px solid #EEEEEE; */
+}
+.proname{
+  font-size: 32rpx;
+  color: #949494;
 }
 .projectbox .children{
   padding-left:72rpx;
+  position: relative;
+}
+.projectbox .children::before{
+  content: '';
+  width: 18rpx;
+  top: 29rpx;
+  left: 41rpx;
+  position: absolute;
+  height: 18rpx;
+  border-bottom: 1px solid #cccccc;
+  border-left: 1px solid #cccccc;
 }
 .projectbox .childrenactive{
-  background-color: #f0f0f0;
-  color: #191B26;
+  /* background-color: #f0f0f0; */
+  color: #0089ff;
+}
+.projectbox .childrenactive::before{
+  content: '';
+  width: 18rpx;
+  top: 29rpx;
+  left: 41rpx;
+  position: absolute;
+  height: 18rpx;
+  border-bottom: 1px solid #0089ff;
+  border-left: 1px solid #0089ff;
 }

+ 1 - 0
pages/search/index.less

@@ -4,6 +4,7 @@
     width: 100%;
     .goback{
         width:30px;
+        text-align: center;
     }
     .righttext{
         width: 30px;

+ 1 - 0
pages/search/index.wxss

@@ -5,6 +5,7 @@
 }
 .header-title .goback {
   width: 30px;
+  text-align: center;
 }
 .header-title .righttext {
   width: 30px;

+ 71 - 0
pages/spacelog/index.js

@@ -0,0 +1,71 @@
+// pages/spacelog/index.js
+import {
+  queryAllspace,
+} from "../../requests/api";
+import $ from './../../utils/Tool'
+import router from './../../utils/router'
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    projectId:"",
+    tenantId:"",
+    userId:"",
+    alllistContent:[],
+    noDate:false
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    options = JSON.parse(decodeURIComponent(JSON.stringify(options)))||{};
+    let arr = [];
+    for (let i in options) {
+        arr.push(options[i]); //属性
+        //arr.push(obj[i]); //值
+    }
+    console.log(options,"options");
+    this.getData(arr);
+  },
+  async getData(value=[]) {
+    // $.loading()
+    wx.showLoading({
+      title:"加载中"
+    })
+    let data={
+      "criteria": {
+        "userId": $.store.get('userId'),
+        "projectId": $.store.get('projectId'),
+        "tenantId":  $.store.get('tenantId'),
+          spaceId:value
+      },
+      orders:[
+        {
+          column:"localName",
+          asc:"true"
+        }
+      ]
+    };
+    let res = await queryAllspace(data);
+    if(res.count){
+      this.setData({alllistContent:res.content})
+    }else{
+      this.setData({noDate:true,alllistContent:[]})
+    }
+    wx.hideLoading()
+  },
+  listClick(e){
+    let data = e.detail.cardDate;
+    data.outLine&&(data.outLine="");
+    router.push("adjust",data);
+  },
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

+ 7 - 0
pages/spacelog/index.json

@@ -0,0 +1,7 @@
+{
+  "usingComponents": {
+    "spacecard": "../../components/spacecard/index",
+    "van-divider": "../../vant-weapp/dist/divider/index"
+  },
+  "navigationBarTitleText": "调节记录"
+}

+ 9 - 0
pages/spacelog/index.wxml

@@ -0,0 +1,9 @@
+<view>
+	<view class="cardlist" >
+		<block wx:for="{{alllistContent}}" wx:key="index">
+			<spacecard bind:listClick="listClick" cardDate="{{item}}"></spacecard>
+			<van-divider/>
+		</block>
+    </view>
+     <view class="nomore flex_row" wx:if="{{noDate}}">没有更多了哦!</view>
+</view>

+ 47 - 0
pages/spacelog/index.wxss

@@ -0,0 +1,47 @@
+.cardlist{
+  padding: 0 32rpx;
+}
+/* 修改标签页样式 */
+.van-tabs__wrap{
+  margin-bottom: 24rpx;
+  height: 72rpx!important;
+}
+.van-tabs__nav--card{
+  height: 72rpx!important;
+  overflow: hidden;
+  border-radius: 8rpx!important;
+  /* border:1px solid rgba(25,27,38,0.1)!important; */
+}
+.van-ellipsis{
+  line-height: 72rpx!important;
+}
+.van-tab{
+  height: 72rpx!important;
+  color: #000000!important;
+}
+.van-tab--active{
+  color: #ffffff!important;
+  /* border:1px solid #5575FF!important; */
+}
+.nolist{
+  display: flex;
+  margin-top: 240rpx;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+  color: #80838F;
+}
+.nolist image{
+  width: 160rpx;
+  height: 160rpx;
+}
+.nolist>text:nth-child(3){
+  margin-top: 18rpx;
+}
+.del_box{
+  display: none;
+}
+.nomore{
+    height: 90rpx;
+    color: #8D9399;
+}

+ 15 - 24
pages/usercenter/index.js

@@ -9,37 +9,23 @@ function chartFn(data=[]) {
       height,
       // padding:[10,-10,0,30]
     });
-    chart.legend('name', {
-      marker: 'square',
-      // custom: true,
-      // items:[
-      //   {
-      //     name: '冷',
-      //     marker: 'square',
-      //     fill: '#FACC14',
-      //     checked: true
-      //   },
-      //   {
-      //     name: '热',
-      //     marker: 'square',
-      //     fill: '#FF8800',
-      //     checked: true
-      //   }
-      // ]
-    });
+    chart.legend(false);
     chart.source(data, {
       数值: {
         tickCount: 2,
+        formatter: (v) => {
+          return v +'次'
+        },
       }
     });
-    // chart.tooltip({
-
-    // });
+    chart.axis("数值",{
+      grid:null,
+    });
     chart.interval()
       .position('温度*数值')
       .color('name',['#04B49C','#FF8800']).size(10).adjust({
         type: 'dodge',
-        marginRatio: 0.05 // 设置分组间柱子的间距
+        marginRatio: 0.001 // 设置分组间柱子的间距
       });
       // .adjust('stack');
     chart.render();
@@ -63,7 +49,8 @@ Page({
     adjustSpaceNum:0,
     currentSeason:'',
     nochartDate:false,
-    bgSeasonType:'Cooling'
+    bgSeasonType:'Cooling',
+    spaceIds:[],
   },
   goBack(){
     router.pop();
@@ -76,6 +63,9 @@ Page({
     let {type} =e.currentTarget.dataset;
     router.push("adjustlog",{spaceFeedbackNum:this.data.spaceFeedbackNum,type:type})
   },
+  gotoSpacelog(e){
+    router.push("spacelog",this.data.spaceIds)
+  },
   changeSeason(e){
     let type=e.currentTarget.dataset.index;
     this.setData({seasonType:type},()=>{
@@ -147,7 +137,8 @@ Page({
     getSpaceNum(data).then(res=>{
       this.setData({
         spaceFeedbackNum:res.spaceFeedbackNum,
-        adjustSpaceNum:res.adjustSpaceNum
+        adjustSpaceNum:res.adjustSpaceNum,
+        spaceIds:res.spaceIds||[],
       })
     })
   },

+ 31 - 1
pages/usercenter/index.less

@@ -11,6 +11,7 @@
     width: 100%;
     .goback{
         width:30px;
+        text-align: center;
     }
 }
 .userbg{
@@ -62,7 +63,36 @@
             border: 1px solid transparent;
         }
     }
-
+    .lenged_box{
+        justify-content: flex-end;
+        font-size:14px;
+        &>text{
+            color: var(--nodateColor);
+        }
+        .lenged_item{
+            font-size: 13px;
+            color: #8D9399;
+            &>view{
+                margin-right: 12px;
+            }
+            .leng::before{
+                content: '';
+                display: inline-block;
+                width: 10px;
+                height: 10px;
+                margin-right: 5px;
+                background: #04B49C;
+            }
+            .re::before{
+                content: '';
+                display: inline-block;
+                width: 10px;
+                height: 10px;
+                margin-right: 5px;
+                background: #FF8800;
+            }
+        }
+    }
     .logchart{
         height: 420rpx;
         width: 100%;

+ 8 - 1
pages/usercenter/index.wxml

@@ -21,7 +21,7 @@
         <text>{{spaceFeedbackNum || 0}}</text>
         <text>共调节数量</text>
     </view>
-    <view class="list_item flex_column" bindtap="gotoAdjustlog" data-type="space">
+    <view class="list_item flex_column" bindtap="gotoSpacelog" data-type="space">
         <text>{{adjustSpaceNum || 0}}</text>
         <text>曾调节空间</text>
     </view>
@@ -34,7 +34,14 @@
             </view>
         </block>
     </view>
+    <view class="lenged_box flex_row">
+        <view class="lenged_item flex_row">
+            <view class="leng">冷</view>
+            <view class="re">热</view>
+        </view>
+    </view>
     <view class="logchart" hidden="{{nochartDate}}">
+
         <f2 class="f2-chart" id="column-dom" canvas-id="column" opts="{{opts}}" />
     </view>
     <view class="logchart flex_row" hidden="{{!nochartDate}}">

+ 31 - 0
pages/usercenter/index.wxss

@@ -12,6 +12,7 @@
 }
 .header-title .goback {
   width: 30px;
+  text-align: center;
 }
 .userbg {
   height: 500rpx;
@@ -62,6 +63,36 @@
   color: #04B49C;
   border: 1px solid transparent;
 }
+.chart_box .lenged_box {
+  justify-content: flex-end;
+  font-size: 14px;
+}
+.chart_box .lenged_box > text {
+  color: var(--nodateColor);
+}
+.chart_box .lenged_box .lenged_item {
+  font-size: 13px;
+  color: #8D9399;
+}
+.chart_box .lenged_box .lenged_item > view {
+  margin-right: 12px;
+}
+.chart_box .lenged_box .lenged_item .leng::before {
+  content: '';
+  display: inline-block;
+  width: 10px;
+  height: 10px;
+  margin-right: 5px;
+  background: #04B49C;
+}
+.chart_box .lenged_box .lenged_item .re::before {
+  content: '';
+  display: inline-block;
+  width: 10px;
+  height: 10px;
+  margin-right: 5px;
+  background: #FF8800;
+}
 .chart_box .logchart {
   height: 420rpx;
   width: 100%;

+ 3 - 2
project.config.json

@@ -4,7 +4,7 @@
     "ignore": []
   },
   "setting": {
-    "urlCheck": false,
+    "urlCheck": true,
     "es6": true,
     "enhance": true,
     "postcss": true,
@@ -30,7 +30,8 @@
     "useCompilerModule": true,
     "userConfirmedUseCompilerModuleSwitch": false,
     "packNpmManually": false,
-    "packNpmRelationList": []
+    "packNpmRelationList": [],
+    "minifyWXSS": true
   },
   "compileType": "miniprogram",
   "libVersion": "2.11.1",

+ 0 - 1
requests/http.js

@@ -14,7 +14,6 @@ function get(url, data = {},testenv){
     pubname: "sagacare",
     openid:$.storage.get('openId')
   });
-  console.log(_url,data)
   return new Promise(function (resolve, reject) {
     wx.request({
       url: _url,

+ 2 - 1
utils/router.js

@@ -9,7 +9,8 @@ const pages = {
     feedback:'/pages/feedback/index',
     spacelist:'/pages/spacelist/index',
     search:'/pages/search/index',
-    adjustlog:'/pages/adjustlog/index'
+    adjustlog:'/pages/adjustlog/index',
+    spacelog:'/pages/spacelog/index',
   }
 
   function to(page, data) {