feat: 优化

pages/index/index.js

@@ -821,7 +821,7 @@ Page({
 		});
 
 	},
-// switch
+	// switch
 	onSelect_All(e) {
 		var that = this;
 		const tempListSwitch = that.data.listSwitch;
@@ -874,6 +874,60 @@ Page({
 			},
 		});
 
+	},
+	// 香薰机开关
+	onSelect_All_AromatherapyMachine(e) {
+		var that = this;
+		const tempListSwitch = that.data.listAromatherapyMachine;
+		// 获取绑定的参数
+		var param0 = e.currentTarget.dataset.param0;
+		var param1 = e.currentTarget.dataset.param1;
+		var param2 = e.currentTarget.dataset.param2;
+		// var param3 = e.currentTarget.dataset.param3;
+		var param4 = e.currentTarget.dataset.param4 // 0 || 1;
+		var param5 = e.currentTarget.dataset.param5;
+		console.log('param1=' + param1);
+		console.log('param2=' + param2);
+		// console.log('param3='+param3);
+		// console.log('param4='+param4);
+		console.log('param5=' + param5);
+		if (param4 == '1') {
+			tempListSwitch[param0].state = "on"
+		} else {
+			tempListSwitch[param0].state = "off"
+		}
+
+		that.setData({
+			listAromatherapyMachine: tempListSwitch
+		})
+		// this.setData({
+		//   status_beep: Number(param4)
+		// })
+		// if(param3 == "/turn_on"){
+		// 	that.data.listSwitch[param0].state = "off";
+		// 	that.data.listSwitch[param0].service = "turn_off";
+		// }else if(param3 == "/turn_off"){
+		// 	that.data.listSwitch[param0].state = "on";
+		// 	that.data.listSwitch[param0].service = "turn_on";
+		// }
+		console.log('switch 发生 change 事件，携带值为', e.detail)
+		wx.request({
+			url: `${homeApi_https}` + param1 + param2 + (e.detail ? '/turn_on' : '/turn_off'),
+			method: 'POST',
+			data: {
+				"entity_id": param5
+			},
+			header: {
+				'content-type': 'application/json', // 默认值
+				'Authorization': 'Bearer ' + token // 在头部设置认证信息，例如使用Bearer Token
+			},
+			success(res) {
+				// if(res.data){
+				// 	that.getSwitch(res.data,that)
+				// }
+			},
+		});
+
 	},
 	onTap_All(e) {
 		var that = this;
@@ -1521,7 +1575,7 @@ Page({
 						//是否 是香薰机灯光
 						obj.isAromlight = obj.friendly_name.includes('香薰机灯光')
 						obj.isAromAtomization = obj.friendly_name.includes('香薰机雾化')
-						obj.isAromatherapy = obj.friendly_name.endsWith('香薰机')
+						obj.isAromatherapy = obj.friendly_name.endsWith('香薰机') || obj.friendly_name.endsWith('香薰机开关')
 						if (obj.entity_id && obj.state && checkState(obj.state) && obj.friendly_name && obj.domain && !obj.isAromlight && !obj.isAromAtomization && !obj.isAromatherapy) {
 							listSwitchTemp.push(obj)
 						} else if ((obj.isAromlight || obj.isAromAtomization || obj.isAromatherapy) && checkState(obj.state)) {
@@ -2737,7 +2791,7 @@ Page({
 										obj.imgSrc = '/static/icons/ic_xxjwh.svg';
 										obj.selectedImgSrc = '/static/icons/ic_xxjwh.svg';
 
-									} else if (obj.friendly_name.endsWith('香薰机')) {
+									} else if (obj.friendly_name.endsWith('香薰机') || obj.friendly_name.endsWith('香薰机开关')) {
 										obj.imgSrc = '/static/icons/ic_xxj.svg';
 										obj.selectedImgSrc = '/static/icons/ic_xxj.svg';
 									} else if (obj.friendly_name.includes("灯")) {
@@ -2767,7 +2821,7 @@ Page({
 									//是否 是香薰机灯光
 									obj.isAromlight = obj.friendly_name.includes('香薰机灯光')
 									obj.isAromAtomization = obj.friendly_name.includes('香薰机雾化')
-									obj.isAromatherapy = obj.friendly_name.endsWith('香薰机')
+									obj.isAromatherapy = obj.friendly_name.endsWith('香薰机') || obj.friendly_name.endsWith('香薰机开关')
 									if (obj.entity_id && obj.state && checkState(obj.state) && obj.friendly_name && obj.domain && obj.domain != 'automation' && !obj.isAromlight && !obj.isAromAtomization && !obj.isAromatherapy) {
 										listSwitchTemp.push(obj)
 									} else if ((obj.isAromlight || obj.isAromAtomization || obj.isAromatherapy) && checkState(obj.state)) {
@@ -3283,7 +3337,7 @@ Page({
 										obj.imgSrc = '/static/icons/ic_xxjwh.svg';
 										obj.selectedImgSrc = '/static/icons/ic_xxjwh.svg';
 
-									} else if (obj.friendly_name.endsWith('香薰机')) {
+									} else if (obj.friendly_name.endsWith('香薰机') || obj.friendly_name.endsWith('香薰机开关')) {
 										obj.imgSrc = '/static/icons/ic_xxj.svg';
 										obj.selectedImgSrc = '/static/icons/ic_xxj.svg';
 									}
@@ -3315,7 +3369,7 @@ Page({
 									//是否 是香薰机灯光
 									obj.isAromlight = obj.friendly_name.includes('香薰机灯光')
 									obj.isAromAtomization = obj.friendly_name.includes('香薰机雾化')
-									obj.isAromatherapy = obj.friendly_name.endsWith('香薰机')
+									obj.isAromatherapy = obj.friendly_name.endsWith('香薰机') || obj.friendly_name.endsWith('香薰机开关')
 									if (obj.entity_id && obj.state && checkState(obj.state) && obj.friendly_name && obj.domain && obj.domain != 'automation' && obj.domain != 'automation' && !obj.isAromlight && !obj.isAromAtomization && !obj.isAromatherapy) {
 										listSwitchTemp.push(obj)
 									} else if ((obj.isAromlight || obj.isAromAtomization || obj.isAromatherapy) && checkState(obj.state)) {

pages/index/index.wxml

@@ -120,27 +120,27 @@
             </view>
             <view class="data-media-player" style="flex-direction: row;">
 
-              <view class="data-media-1">
-                <text class="sub-title">香薰机灯光</text>
-                <view class="btn-pos-view" bindtap="onSelect_All_aromlight" data-param0="{{index}}"
-                  data-param1="/services" data-param2="/{{item.domain}}" data-param3="/turn_on"
-                  data-param4='{{item.state=="on"?"0":"1"}}' data-param5="{{item.entity_id}}">
+              <view class="data-media-1" wx:for="{{listAromatherapyMachine}}" wx:for-index="index2" wx:for-item="item2"
+                wx:if="{{item2.isAromlight}}">
+                <text class="sub-title">{{item2.friendly_name}}</text>
+                <view class="btn-pos-view" bindtap="onSelect_All_aromlight" data-param0="{{index2}}"
+                  data-param1="/services" data-param2="/{{item2.domain}}" data-param3="/turn_on"
+                  data-param4='{{item2.state=="on"?"0":"1"}}' data-param5="{{item2.entity_id}}">
                   <image src="/static/images/ic_light_button_bg.png"></image>
                   <text>灯光切换</text>
                 </view>
               </view>
               <view class="card-line-v"></view>
               <view class="data-media-1">
-                <view class="card-data" wx:for="{{listAromatherapyMachine}}" wx:for-index="index2" wx:for-item="item2"
-                  wx:if="{{item2.isAromatherapy}}">
-                  <image class="data-card__icon" src="{{item2.imgSrc}}" />
-                  <text class="data-card__title1">{{item2.friendly_name}}</text>
+                <view class="card-data">
+                  <image class="data-card__icon" src="{{item.imgSrc}}" />
+                  <text class="data-card__title1">{{item.friendly_name}}</text>
                   <view class="data-card__value">
                     <van-switch size="22px" active-color="#2CCEB8" inactive-color="#E8EAEB"
-                      checked="{{item2.state=='on'}}" bindtap="onTap_All" 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}}"
+                      checked="{{item.state=='on'}}" bind:change="onSelect_All_AromatherapyMachine"
+                      data-param0="{{index}}" data-param1="/services" data-param2="/{{item.domain}}"
+                      data-param3='{{item.state=="on"?"/turn_off":"/turn_on"}}'
+                      data-param4='{{item.state=="on"?"0":"1"}}' data-param5="{{item.entity_id}}"
                       custom-class="customSwitch" />
                   </view>
                 </view>

subpages/sleepEvaluation/sleepEvaluation.wxml

@@ -164,7 +164,7 @@
       </view>
 
       <view class="section" id="wayImprovementSleep">
-        <text>9、您倾向于下面哪些方式来帮助改善睡眠？</text>
+        <text>9、您倾向于下面哪些方式来帮助改善睡眠？（多选）</text>
 
 
         <van-checkbox-group value="{{ wayImprovementSleep }}" bind:change="bindWayImprovementSleep">