From 99312c0d79044c16bb783cb967dbd4ff60a383bd Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 09 十二月 2024 23:20:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/operation/device.vue | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/h5/pages/operation/device.vue b/h5/pages/operation/device.vue
index 80b70b1..b9a4c5f 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.deviceName ? `[${param.deviceCode}] ` + param.deviceName : `[${param.deviceCode}]` : '璇烽�夋嫨璁惧' }}
</view>
<u-icon name="arrow-right" color="#999999" size="17"></u-icon>
</view>
@@ -118,6 +118,25 @@
} = this
if (!param.deviceId) return this.showToast('璇峰厛閫夋嫨瑕佺淮鎶ょ殑璁惧')
+ if (param.status != 0) {
+ uni.showModal({
+ title: '娓╅Θ鎻愮ず',
+ content: '璁惧杩愮淮缁撴灉寮傚父锛屾槸鍚﹀墠寰�鎻愪氦宸ュ崟?',
+ success: function(res) {
+ if (res.confirm) {
+ this.handleP()
+ } else if (res.cancel) {}
+ }
+ });
+ }else{
+ this.handleP()
+ }
+ },
+ handleP() {
+ const {
+ param,
+ fileList
+ } = this
ywDeviceCreate({
...param,
userId: uni.getStorageSync('userInfo').id,
@@ -145,6 +164,7 @@
} = this
if (!activeDevice.id) return this.showToast('璇峰厛閫夋嫨璁惧')
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 +281,7 @@
},
(decodeText, decodeResult) => {
if (decodeText) { //杩欓噷decodeText灏辨槸閫氳繃鎵弿浜岀淮鐮佸緱鍒扮殑鍐呭
- this.action(decodeText) //瀵逛簩缁寸爜閫昏緫澶勭悊
+ this.$set(this.param, 'deviceCode', decodeText)
this.stopScan(); //鍏抽棴鎵爜鍔熻兘
}
},
@@ -408,11 +428,12 @@
}
.sub_btn {
- position: fixed;
- bottom: 68rpx;
- left: 40rpx;
+ // position: fixed;
+ // bottom: 68rpx;
+ // left: 40rpx;
width: 670rpx;
height: 88rpx;
+ margin-top: 80rpx;
background: $primaryColor;
box-shadow: 0rpx 8rpx 20rpx 0rpx rgba(0, 104, 255, 0.3);
border-radius: 44rpx;
@@ -457,6 +478,7 @@
.modal_list {
height: calc(100% - 360rpx);
+ margin-bottom: -20rpx;
.item {
display: flex;
--
Gitblit v1.9.3