柒零 hace 1 año
padre
commit
0bde5d2332
Se han modificado 2 ficheros con 19 adiciones y 4 borrados
  1. 12 0
      pages/index/index.js
  2. 7 4
      pages/index/index.wxml

+ 12 - 0
pages/index/index.js

@@ -1717,6 +1717,10 @@ Page({
 	// 更改空调的值
 	changeClimate(e) {
 		var that = this;
+		let state = e.currentTarget.dataset.state;
+		if (state == "auto") {
+			return
+		}
 		this.setData({
 			isClickedOnClimateUp: true
 		});
@@ -1780,6 +1784,10 @@ Page({
 	// 更改空调的值
 	minusClimate(e) {
 		var that = this;
+		let state = e.currentTarget.dataset.state;
+		if (state == "auto") {
+			return
+		}
 		this.setData({
 			isClickedOnClimateUp: true
 		});
@@ -1844,6 +1852,10 @@ Page({
 	// 更改空调的值
 	addClimate(e) {
 		var that = this;
+		let state = e.currentTarget.dataset.state;
+		if (state == "auto") {
+			return
+		}
 		this.setData({
 			isClickedOnClimateUp: true
 		});

+ 7 - 4
pages/index/index.wxml

@@ -216,7 +216,10 @@
             </view>
             <view class="data-media-player">
 
-              <text class="value-display">
+              <text wx:if="{{item.state!='auto'}}" class="value-display">
+                {{item.temperature}}<text class="value-display_unit">°C</text>
+              </text>
+              <text wx:else class="value-display" style="opacity: 0;">
                 {{item.temperature}}<text class="value-display_unit">°C</text>
               </text>
               <view class="button-row" style="margin-left: 15rpx;">
@@ -224,19 +227,19 @@
                   min="{{item.min_temp}}" max="{{item.max_temp}}" step="1" data-value="{{item.temperature}}"
                   data-state="{{item.state}}" data-id="{{item.entity_id}}" data-domain="{{item.domain}}"
                   data-min="{{item.min_temp}}" data-max="{{item.max_temp}}" data-temperature="{{item.temperature}}"
-                  data-fanMode="{{item.fan_mode}}"></image>
+                  data-fanMode="{{item.fan_mode}}" disabled="{{item.state=='auto'}}"></image>
                 <van-slider bar-height="52rpx" active-color="#3A87FD" class="tui-slider-box" bind:change="changeClimate"
                   min="{{item.min_temp}}" max="{{item.max_temp}}" step="1" value="{{item.temperature}}"
                   data-state="{{item.state}}" data-id="{{item.entity_id}}" data-domain="{{item.domain}}"
                   data-min="{{item.min_temp}}" data-max="{{item.max_temp}}" data-temperature="{{item.temperature}}"
-                  data-fanMode="{{item.fan_mode}}">
+                  data-fanMode="{{item.fan_mode}}" disabled="{{item.state=='auto'}}">
                   <!-- <text style="color:black">{{sliderValueClimate}}</text> -->
                 </van-slider>
                 <image src="/static/icons/ic_add.svg" style="width: 112rpx;height: 112rpx;" bindtap="addClimate"
                   min="{{item.min_temp}}" max="{{item.max_temp}}" step="1" data-value="{{item.temperature}}"
                   data-state="{{item.state}}" data-id="{{item.entity_id}}" data-domain="{{item.domain}}"
                   data-min="{{item.min_temp}}" data-max="{{item.max_temp}}" data-temperature="{{item.temperature}}"
-                  data-fanMode="{{item.fan_mode}}"></image>
+                  data-fanMode="{{item.fan_mode}}" disabled="{{item.state=='auto'}}"></image>
 
               </view>
               <view class="air-conditioner-controls">