Merge branch 'ft_local_dev' into 'main'

pref：优化命令详情

See merge request huang/thingskit-app!90

@@ -71,7 +71,11 @@ export default {
 			return formatToDate(date, 'YYYY-MM-DD HH:mm:ss');
 			return formatToDate(date, 'YYYY-MM-DD HH:mm:ss');
 		},
 		},
 		formatValue(value) {
 		formatValue(value) {
-			return JSON.stringify(value);
+			const val = JSON.stringify(value);
+			return val
+				.replace(/\\"/g, '"')
+				.replace(/]"/g, ']')
+				.replace(/"\[/g, '[');
 		}
 		}
 	},
 	},
 	onLoad(options) {
 	onLoad(options) {

@@ -62,7 +62,7 @@
 						<u-radio activeColor="#3388FF" label="双向" name="TwoWay"></u-radio>
 						<u-radio activeColor="#3388FF" label="双向" name="TwoWay"></u-radio>
 					</u-radio-group>
 					</u-radio-group>
 				</view>
 				</view>
-				<view style="margin-top: 28rpx;width: 100%;"><u--textarea placeholder="请输入下发内容" v-model="commandValue" /></view>
+				<view style="margin-top: 28rpx;width: 100%;"><u--textarea placeholder="请输入下发内容(json格式)" v-model="inputCommandVal" /></view>
 
 
 				<view class="button-group">
 				<view class="button-group">
 					<view><u-button :customStyle="{ color: '#333' }" color="#e3e3e5" shape="circle" text="取消" @click="cancelCommand"></u-button></view>
 					<view><u-button :customStyle="{ color: '#333' }" color="#e3e3e5" shape="circle" text="取消" @click="cancelCommand"></u-button></view>
@@ -87,13 +87,8 @@ export default {
 		return {
 		return {
 			showModel: false,
 			showModel: false,
 			commandType: 'OneWay',
 			commandType: 'OneWay',
-			commandValue: JSON.stringify({
-				method: 'methodThingskit',
-				params: {
-					method: 'methodThingskit',
-					params: { pin: 7, value: 1 }
-				}
-			})
+			commandValue: {},
+			inputCommandVal: ''
 		};
 		};
 	},
 	},
 	computed: {
 	computed: {
@@ -130,6 +125,7 @@ export default {
 		},
 		},
 		showModal() {
 		showModal() {
 			this.showModel = true;
 			this.showModel = true;
+			this.inputCommandVal = '';
 		},
 		},
 		disabledScroll() {
 		disabledScroll() {
 			return;
 			return;
@@ -139,12 +135,16 @@ export default {
 		},
 		},
 		async confirmCommand() {
 		async confirmCommand() {
 			try {
 			try {
-				const commandValue = JSON.parse(this.commandValue);
-				commandValue.persistent = true;
-				commandValue.additionalInfo = {
+				const commandJsonValue = JSON.parse(this.inputCommandVal);
+				this.commandValue.persistent = true;
+				this.commandValue.additionalInfo = {
 					cmdType: 'API'
 					cmdType: 'API'
 				};
 				};
-				await issueCommand(this.commandType, this.deviceDetail.tbDeviceId, commandValue);
+				this.commandValue.method = 'methodThingskit';
+				this.commandValue.params = {
+					params: commandJsonValue
+				};
+				await issueCommand(this.commandType, this.deviceDetail.tbDeviceId, this.commandValue);
 				this.hiddenModal();
 				this.hiddenModal();
 				uni.$u.toast('下发成功~');
 				uni.$u.toast('下发成功~');
 			} catch (e) {
 			} catch (e) {