|
@@ -193,16 +193,16 @@
|
|
>
|
|
>
|
|
<view class="feedback_box">
|
|
<view class="feedback_box">
|
|
<view class="feedimgbox flex_row">
|
|
<view class="feedimgbox flex_row">
|
|
- <view class="lottie">
|
|
|
|
|
|
+ <view class="lottie" >
|
|
<lottie id="lottie" animationData="{{spacestatusList[spaceStatusId].canvasDate}}" width="20" height="20"/>
|
|
<lottie id="lottie" animationData="{{spacestatusList[spaceStatusId].canvasDate}}" width="20" height="20"/>
|
|
</view>
|
|
</view>
|
|
<text class="feedtext_title">{{spaceStatus}}</text>
|
|
<text class="feedtext_title">{{spaceStatus}}</text>
|
|
</view>
|
|
</view>
|
|
<view class="flex_column feedtext_box" wx:for="{{notice}}" wx:key="{{index}}">
|
|
<view class="flex_column feedtext_box" wx:for="{{notice}}" wx:key="{{index}}">
|
|
- <text class="feedtext_desc flex_rew">{{item}}</text>
|
|
|
|
|
|
+ <text class="feedtext_desc flex_rew" style="font-size: 14px;margin: 20rpx 0">{{item}}</text>
|
|
</view>
|
|
</view>
|
|
<!-- 滚动列表 -->
|
|
<!-- 滚动列表 -->
|
|
- <view class="noticbox" wx:if="{{equipmentStatustext&&equipmentStatustext.length}}">
|
|
|
|
|
|
+ <view class="noticbox" wx:if="{{equipmentStatustext&&equipmentStatustext.length }}">
|
|
<swiper vertical autoplay duration="300" circular interval="1500">
|
|
<swiper vertical autoplay duration="300" circular interval="1500">
|
|
<block wx:for="{{equipmentStatustext}}" >
|
|
<block wx:for="{{equipmentStatustext}}" >
|
|
<swiper-item>
|
|
<swiper-item>
|
|
@@ -214,7 +214,7 @@
|
|
</block>
|
|
</block>
|
|
</swiper>
|
|
</swiper>
|
|
</view>
|
|
</view>
|
|
- <view class="envpanel flex_row" wx:if="{{currentIndex!=5&&spaceDetail.temperature}}">
|
|
|
|
|
|
+ <view class="envpanel flex_row" wx:if="{{willAvg !='--' && currentIndex!=5 && spaceDetail.temperature }}">
|
|
<view class="panel_left">
|
|
<view class="panel_left">
|
|
<text class="left_txt">当前温度</text>
|
|
<text class="left_txt">当前温度</text>
|
|
<view><text class="left_num">{{spaceDetail.temperature}}</text>°C</view>
|
|
<view><text class="left_num">{{spaceDetail.temperature}}</text>°C</view>
|
|
@@ -230,7 +230,7 @@
|
|
<text class="left_num" wx:else>{{willAvg}}</text>°C</view>
|
|
<text class="left_num" wx:else>{{willAvg}}</text>°C</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
- <view class="envpanel flex_row" wx:if="{{currentIndex==5}}">
|
|
|
|
|
|
+ <view class="envpanel flex_row" wx:if="{{currentIndex==5 }}">
|
|
<view class="panel_left">
|
|
<view class="panel_left">
|
|
<text class="left_txt">当前风速</text>
|
|
<text class="left_txt">当前风速</text>
|
|
<view class="rotate">
|
|
<view class="rotate">
|
|
@@ -259,8 +259,8 @@
|
|
>
|
|
>
|
|
<view class="feedback_box">
|
|
<view class="feedback_box">
|
|
<view class="flex_column feed_tips">
|
|
<view class="flex_column feed_tips">
|
|
- <text>正在关机</text>
|
|
|
|
- <text>反馈已提交,设备正在关机中!</text>
|
|
|
|
|
|
+ <text> {{failmessage ? '空调无法频繁开关' : '正在关机' }}</text>
|
|
|
|
+ <text>{{failmessage ? failmessage :'反馈已提交,设备正在关机中!'}}</text>
|
|
</view>
|
|
</view>
|
|
<view class="closedown iknow" catchtap="knowCloseClick">
|
|
<view class="closedown iknow" catchtap="knowCloseClick">
|
|
我知道了
|
|
我知道了
|
|
@@ -273,12 +273,13 @@
|
|
>
|
|
>
|
|
<view class="seconddetail">
|
|
<view class="seconddetail">
|
|
<view class="secondtxt flex_row secondtxt_title">
|
|
<view class="secondtxt flex_row secondtxt_title">
|
|
- <view class="lottie" hidden="{{!lottieShow}}">
|
|
|
|
|
|
+ <view class="lottie" wx:if="{{!lottieShow}}">
|
|
<lottie id="lottieup" animationData="{{spacestatusList[secondIcon-1].canvasDate}}" width="25" height="25" />
|
|
<lottie id="lottieup" animationData="{{spacestatusList[secondIcon-1].canvasDate}}" width="25" height="25" />
|
|
</view>
|
|
</view>
|
|
- {{secondSpaceStatus}}
|
|
|
|
|
|
+ {{secondSpaceStatus || '空调无法频繁开关'}}
|
|
</view>
|
|
</view>
|
|
<view class="secondtxt flex_row">{{secondNotice}}</view>
|
|
<view class="secondtxt flex_row">{{secondNotice}}</view>
|
|
|
|
+ <view class="secondtxt flex_row" style="padding-bottom: 40rpx;" wx:if="{{failmessage}}">{{failmessage}}</view>
|
|
<view class="closedown iknow" bindtap="commitClose">关闭</view>
|
|
<view class="closedown iknow" bindtap="commitClose">关闭</view>
|
|
</view>
|
|
</view>
|
|
</van-action-sheet>
|
|
</van-action-sheet>
|