From 64985934b6b7378d1c101313083b456a231c7fd5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 03 十二月 2024 17:36:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/operation/device.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/h5/pages/operation/device.vue b/h5/pages/operation/device.vue
index 02c6b7d..03eb655 100644
--- a/h5/pages/operation/device.vue
+++ b/h5/pages/operation/device.vue
@@ -61,7 +61,7 @@
</view>
<view class="modal_list">
<view class="item" v-for="item,i in deviceList" @click="deviceClick(item)">
- <view class="name">{{ item.name }}</view>
+ <view class="name">[{{item.code}}] {{ item.name }}</view>
<image v-if="activeDevice.id == item.id" src="@/static/radioed.png" mode=""></image>
</view>
</view>
@@ -106,7 +106,7 @@
multifileList: fileList
}).then(res => {
this.showToast('鎻愪氦鎴愬姛')
- // uni.navigateBack()
+ uni.navigateBack()
})
},
getDevice(){
--
Gitblit v1.9.3