From 9ce28811e94fa042adb7cabe6581b0393c6d576d Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 09 十二月 2024 18:17:11 +0800
Subject: [PATCH] ll
---
h5/pages/operation/device.vue | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/h5/pages/operation/device.vue b/h5/pages/operation/device.vue
index 80b70b1..d9b13df 100644
--- a/h5/pages/operation/device.vue
+++ b/h5/pages/operation/device.vue
@@ -5,8 +5,8 @@
<view class="la"><text class="red">*</text>閫夋嫨璁惧</view>
<view class="line">
<view class="sel_wrap" @click="showModal = true">
- <view class="left" :class="param.deviceName ? '' : 'placeholder9'">
- {{ param.deviceName ? param.deviceName : '璇烽�夋嫨璁惧' }}
+ <view class="left" :class="(param.deviceName || param.deviceCode) ? '' : 'placeholder9'">
+ {{ (param.deviceName || param.deviceCode) ? `[${param.deviceCode}] ` + param.deviceName : '璇烽�夋嫨璁惧' }}
</view>
<u-icon name="arrow-right" color="#999999" size="17"></u-icon>
</view>
@@ -144,7 +144,8 @@
activeDevice
} = this
if (!activeDevice.id) return this.showToast('璇峰厛閫夋嫨璁惧')
- this.$set(this.param, 'deviceId', activeDevice.id)
+ this.$set(this.param, 'deviceId', activeDevice.id)
+ this.$set(this.param, 'deviceCode', activeDevice.code)
this.$set(this.param, 'deviceName', activeDevice.name)
this.showModal = false
},
@@ -261,7 +262,7 @@
},
(decodeText, decodeResult) => {
if (decodeText) { //杩欓噷decodeText灏辨槸閫氳繃鎵弿浜岀淮鐮佸緱鍒扮殑鍐呭
- this.action(decodeText) //瀵逛簩缁寸爜閫昏緫澶勭悊
+ this.$set(this.param, 'deviceCode', decodeText)
this.stopScan(); //鍏抽棴鎵爜鍔熻兘
}
},
@@ -408,11 +409,12 @@
}
.sub_btn {
- position: fixed;
- bottom: 68rpx;
- left: 40rpx;
+ // position: fixed;
+ // bottom: 68rpx;
+ // left: 40rpx;
width: 670rpx;
- height: 88rpx;
+ height: 88rpx;
+ margin-top: 80rpx;
background: $primaryColor;
box-shadow: 0rpx 8rpx 20rpx 0rpx rgba(0, 104, 255, 0.3);
border-radius: 44rpx;
@@ -456,8 +458,8 @@
}
.modal_list {
- height: calc(100% - 360rpx);
-
+ height: calc(100% - 360rpx);
+ margin-bottom: -20rpx;
.item {
display: flex;
align-items: center;
--
Gitblit v1.9.3