aike/emis-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uu

Browse Source
This commit is contained in:
aihe 2024-06-23 16:19:00 +08:00
parent f5ecf271e1
commit 1242118a62
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/messageNotice/index.js
View File

@ -30,5 +30,5 @@ export const onPushMessage = async()=> {
}) })
let cltRes = await getPushClientId() let cltRes = await getPushClientId()
// 复制 PushClientId // 复制 PushClientId
setClipboardData(cltRes.cid) // setClipboardData(cltRes.cid)
} }

3
components/tpx-bluetooth-native/tpx-bluetooth-native.vue
View File

@ -199,6 +199,7 @@ export default {
var _this = this var _this = this
showLoading('正在连接设备') showLoading('正在连接设备')
console.log("连接蓝牙 设备=====", deviceId) console.log("连接蓝牙 设备=====", deviceId)
_this.isStateOn = false
let bl = await new Promise((resolve)=> { let bl = await new Promise((resolve)=> {
bluetoothTool.connDevice(deviceId,(result) => { bluetoothTool.connDevice(deviceId,(result) => {
console.log('bluetoothTool.connDevice result ====== ', result) console.log('bluetoothTool.connDevice result ====== ', result)
@ -215,7 +216,7 @@ export default {
return bl return bl
}, },
getConData() { getConData() {
return { deviceId: this.deviceId, } return { deviceId: this.deviceId, isStateOn: this.isStateOn }
} }
} }
} }

6
components/tpx-bluetooth-print/render-template-native.vue
View File

@ -120,10 +120,10 @@ export default {
}, },
checkPrintParam() { checkPrintParam() {
let msg = '', bl = false let msg = '', bl = false
let { deviceId } = this.$refs.curBlueTooth.getConData() let { deviceId, isStateOn } = this.$refs.curBlueTooth.getConData()
!this.imgData && (msg = '打印内容不能为空，请重试') !this.imgData && (msg = '打印内容不能为空，请重试')
if(!msg && !(deviceId)) { if(!msg && !(deviceId && isStateOn)) {
msg = '请选选择打印设备' msg = '未连接打印设备'
} }
msg && (showToast(msg)) msg && (showToast(msg))
return { return {