柒零 1 rok pred
rodič
commit
f37d32618a

+ 7 - 0
pages/index/index.js

@@ -2176,10 +2176,17 @@ Page({
 		this.getService("/services", "/" + domain, "/set_hvac_mode", "POST", data);
 	},
 	onClimateOff(e) {
+		let state = e.currentTarget.dataset.state;
+		if (state == 'off') {
+			// 如果是关闭的就开成自动
+			this.onClimateAuto(e);
+			return
+		}
 		let domain = e.currentTarget.dataset.domain;
 		let entity_id = e.currentTarget.dataset.id;
 		let list = this.data.listClimate;//这里是将需要循环的数组赋值给list
 		let indexS = Number(e.currentTarget.dataset.index);
+		
 		// 将本地缓存数据渲染到对应修改的案例
 		list.forEach(function (value, index, array) {
 			if (index == indexS) {

+ 1 - 1
pages/index/index.wxml

@@ -151,7 +151,7 @@
                   <view class="data-card__value">
                     <image class="power-btn-small"
                       src="{{item2.state=='on'? '/static/icons/ic_power.svg' : '/static/icons/ic_power_off.svg'}}"
-                      data-param0="{{index}}" data-param1="/services" data-param2="/{{item2.domain}}"
+                      data-param0="{{index2}}" data-param1="/services" data-param2="/{{item2.domain}}"
                       data-param3='{{item2.state=="on"?"/turn_off":"/turn_on"}}'
                       data-param4='{{item2.state=="on"?"0":"1"}}' data-param5="{{item2.entity_id}}" bindtap="onTap_All">
                     </image>

+ 4 - 1
subpages/sleepEvaluation/sleepEvaluation.js

@@ -330,7 +330,10 @@ Page({
 		wx.showToast({
 			title: '问卷提交成功',
 			icon: 'success',
-			duration: 2000
+			duration: 2000,
+			success() {
+				wx.navigateBack()
+			}
 		});
 
 		// 清空表单:  

+ 1 - 1
subpages/sleepQualityIndexAssessment/sleepQualityIndexAssessment.wxml

@@ -94,7 +94,7 @@
 		position="bottom" bind:close="onCloseDateDialog" custom-class="custom-date-class"
 		bind:click-overlay="onCloseDateDialog">
 		<van-datetime-picker type="time" formatter="{{ formatter }}" title="{{currentDateItem.question_1}}"
-			value="{{ currentDate }}" min-hour="0" max-hour="24" bind:confirm="onDateInput"
+			value="{{ currentDate }}" min-hour="0" max-hour="23" bind:confirm="onDateInput"
 			bind:cancel="onCloseDateDialog" toolbar-class="toolbar-class" />
 	</van-popup>