1. bug修复
This commit is contained in:
parent
2233dd2f68
commit
c895912432
@ -67,7 +67,7 @@
|
||||
})
|
||||
if (code === 0) {
|
||||
eventChannel.emit('refresherList', {})
|
||||
$basic.backAndToast('绑卡成功', 2)
|
||||
$basic.backAndToast('添加成功', 2)
|
||||
} else {
|
||||
$basic.backAndToast(message)
|
||||
}
|
||||
|
||||
@ -64,7 +64,7 @@
|
||||
})
|
||||
if (code === 0) {
|
||||
eventChannel.emit('refresherList', {})
|
||||
$basic.backAndToast('绑卡成功', 2)
|
||||
$basic.backAndToast('添加成功', 2)
|
||||
} else {
|
||||
$basic.backAndToast(message)
|
||||
}
|
||||
|
||||
@ -192,6 +192,10 @@
|
||||
}
|
||||
|
||||
const changeCoerced = async () => {
|
||||
const netWork = await $basic.getNetworkType()
|
||||
if (!netWork) {
|
||||
return
|
||||
}
|
||||
if (pending.value) return
|
||||
pending.value = true
|
||||
uni.showLoading({
|
||||
|
||||
@ -50,13 +50,13 @@
|
||||
:value="temporaryAccount"
|
||||
title="接收者"
|
||||
placeholder="请输入手机号或者邮箱"
|
||||
@change-input="changeAccount('permanent', $event)"
|
||||
@change-input="changeAccount('temporary', $event)"
|
||||
></LockInput>
|
||||
<LockInput
|
||||
:value="temporaryName"
|
||||
title="姓名"
|
||||
placeholder="请输入"
|
||||
@change-input="changeName('permanent', $event)"
|
||||
@change-input="changeName('temporary', $event)"
|
||||
></LockInput>
|
||||
<view class="mt-3">
|
||||
<LockDatetimePicker
|
||||
@ -64,7 +64,6 @@
|
||||
:value="temporaryStartTime"
|
||||
:minDate="minDate"
|
||||
:maxDate="maxDate"
|
||||
type="datehour"
|
||||
@change-time="changeDate('temporaryStartTime', $event)"
|
||||
></LockDatetimePicker>
|
||||
</view>
|
||||
@ -74,7 +73,6 @@
|
||||
:value="temporaryEndTime"
|
||||
:minDate="minDate"
|
||||
:maxDate="maxDate"
|
||||
type="datehour"
|
||||
@change-time="changeDate('temporaryEndTime', $event)"
|
||||
></LockDatetimePicker>
|
||||
</view>
|
||||
@ -83,7 +81,7 @@
|
||||
:value="temporaryManageSelf"
|
||||
title="仅管理自己创建的用户"
|
||||
:tip="tip"
|
||||
@change="changeAdmin('permanent', $event)"
|
||||
@change="changeAdmin('temporary', $event)"
|
||||
></LockSwitch>
|
||||
</view>
|
||||
<view class="button mt-5" @click="create('temporary')">发送</view>
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
placeholder="请输入"
|
||||
@change-input="changeName('permanent', $event)"
|
||||
></LockInput>
|
||||
<view class="mt-3">
|
||||
<view class="mt-3" v-if="$bluetooth.currentLockInfo.userType === 110301">
|
||||
<LockSwitch
|
||||
:value="permanentAdmin"
|
||||
title="是否为管理员"
|
||||
@ -71,7 +71,7 @@
|
||||
@change-time="changeDate('temporaryEndTime', $event)"
|
||||
></LockDatetimePicker>
|
||||
</view>
|
||||
<view class="mt-3">
|
||||
<view class="mt-3" v-if="$bluetooth.currentLockInfo.userType === 110301">
|
||||
<LockSwitch
|
||||
:value="temporaryAdmin"
|
||||
title="是否为管理员"
|
||||
@ -98,7 +98,7 @@
|
||||
<view class="mt-3">
|
||||
<LockCycle @change="changeCycle"></LockCycle>
|
||||
</view>
|
||||
<view class="mt-3">
|
||||
<view class="mt-3" v-if="$bluetooth.currentLockInfo.userType === 110301">
|
||||
<LockSwitch
|
||||
:value="cycleAdmin"
|
||||
title="是否为管理员"
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
placeholder="请输入"
|
||||
@change-input="changeName('permanent', $event)"
|
||||
></LockInput>
|
||||
<view class="mt-3">
|
||||
<view class="mt-3" v-if="$bluetooth.currentLockInfo.userType === 110301">
|
||||
<LockSwitch
|
||||
:value="permanentAdmin"
|
||||
title="是否为管理员"
|
||||
@ -63,7 +63,7 @@
|
||||
@change-time="changeDate('temporaryEndTime', $event)"
|
||||
></LockDatetimePicker>
|
||||
</view>
|
||||
<view class="mt-3">
|
||||
<view class="mt-3" v-if="$bluetooth.currentLockInfo.userType === 110301">
|
||||
<LockSwitch
|
||||
:value="temporaryAdmin"
|
||||
title="是否为管理员"
|
||||
@ -83,7 +83,7 @@
|
||||
<view class="mt-3">
|
||||
<LockCycle @change="changeCycle"></LockCycle>
|
||||
</view>
|
||||
<view class="mt-3">
|
||||
<view class="mt-3" v-if="$bluetooth.currentLockInfo.userType === 110301">
|
||||
<LockSwitch
|
||||
:value="cycleAdmin"
|
||||
title="是否为管理员"
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
placeholder="请输入"
|
||||
@change-input="changeName('permanent', $event)"
|
||||
></LockInput>
|
||||
<view class="mt-3">
|
||||
<view class="mt-3" v-if="$bluetooth.currentLockInfo.userType === 110301">
|
||||
<LockSwitch
|
||||
:value="permanentAdmin"
|
||||
title="是否为管理员"
|
||||
@ -71,7 +71,7 @@
|
||||
@change-time="changeDate('temporaryEndTime', $event)"
|
||||
></LockDatetimePicker>
|
||||
</view>
|
||||
<view class="mt-3">
|
||||
<view class="mt-3" v-if="$bluetooth.currentLockInfo.userType === 110301">
|
||||
<LockSwitch
|
||||
:value="temporaryAdmin"
|
||||
title="是否为管理员"
|
||||
@ -98,7 +98,7 @@
|
||||
<view class="mt-3">
|
||||
<LockCycle @change="changeCycle"></LockCycle>
|
||||
</view>
|
||||
<view class="mt-3">
|
||||
<view class="mt-3" v-if="$bluetooth.currentLockInfo.userType === 110301">
|
||||
<LockSwitch
|
||||
:value="cycleAdmin"
|
||||
title="是否为管理员"
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
placeholder="请输入"
|
||||
@change-input="changeName('permanent', $event)"
|
||||
></LockInput>
|
||||
<view class="mt-3">
|
||||
<view class="mt-3" v-if="$bluetooth.currentLockInfo.userType === 110301">
|
||||
<LockSwitch
|
||||
:value="permanentAdmin"
|
||||
title="是否为管理员"
|
||||
@ -71,7 +71,7 @@
|
||||
@change-time="changeDate('temporaryEndTime', $event)"
|
||||
></LockDatetimePicker>
|
||||
</view>
|
||||
<view class="mt-3">
|
||||
<view class="mt-3" v-if="$bluetooth.currentLockInfo.userType === 110301">
|
||||
<LockSwitch
|
||||
:value="temporaryAdmin"
|
||||
title="是否为管理员"
|
||||
@ -99,7 +99,7 @@
|
||||
<view class="mt-3">
|
||||
<LockCycle @change="changeCycle"></LockCycle>
|
||||
</view>
|
||||
<view class="mt-3">
|
||||
<view class="mt-3" v-if="$bluetooth.currentLockInfo.userType === 110301">
|
||||
<LockSwitch
|
||||
:value="cycleAdmin"
|
||||
title="是否为管理员"
|
||||
|
||||
@ -98,7 +98,7 @@
|
||||
@change-time="changeDate('customEndTime', $event)"
|
||||
></LockDatetimePicker>
|
||||
</view>
|
||||
<view class="mt-3">
|
||||
<view class="mt-3" v-if="$bluetooth.currentLockInfo.userType === 110301">
|
||||
<LockSwitch
|
||||
:value="customAdmin"
|
||||
title="是否为管理员"
|
||||
|
||||
@ -134,6 +134,10 @@
|
||||
}
|
||||
|
||||
const changeCoerced = async () => {
|
||||
const netWork = await $basic.getNetworkType()
|
||||
if (!netWork) {
|
||||
return
|
||||
}
|
||||
if (pending.value) return
|
||||
pending.value = true
|
||||
uni.showLoading({
|
||||
|
||||
@ -518,6 +518,13 @@
|
||||
this.getBluetoothStatus()
|
||||
return
|
||||
}
|
||||
if (lock.keyStatus === 110403) {
|
||||
uni.showToast({
|
||||
title: '您的钥匙未生效',
|
||||
icon: 'none'
|
||||
})
|
||||
return
|
||||
}
|
||||
if (lock.keyStatus === 110412) {
|
||||
uni.showToast({
|
||||
title: '钥匙已过期',
|
||||
|
||||
@ -46,7 +46,7 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="menu" v-if="currentLockInfo.keyRight === 1">
|
||||
<view class="menu">
|
||||
<view class="menu-title">
|
||||
<image class="menu-image" src="/static/images/icon_menu.png"></image>
|
||||
<view>功能</view>
|
||||
@ -250,7 +250,7 @@
|
||||
if (this.pending) {
|
||||
return
|
||||
}
|
||||
if (this.currentLockInfo.lockSetting.appUnlockOnline) {
|
||||
if (this.currentLockInfo.lockSetting.appUnlockOnline && type !== 'close') {
|
||||
const netWork = await this.getNetworkType()
|
||||
if (!netWork) {
|
||||
return
|
||||
@ -265,7 +265,7 @@
|
||||
icon: 'none'
|
||||
})
|
||||
}
|
||||
if (this.currentLockInfo.lockSetting.appUnlockOnline) {
|
||||
if (this.currentLockInfo.lockSetting.appUnlockOnline && type !== 'close') {
|
||||
const result = await this.getNetToken()
|
||||
if (!result) {
|
||||
this.$refs.loading.close()
|
||||
|
||||
@ -126,6 +126,10 @@
|
||||
const pending = ref(false)
|
||||
|
||||
const changeCoerced = async () => {
|
||||
const netWork = await $basic.getNetworkType()
|
||||
if (!netWork) {
|
||||
return
|
||||
}
|
||||
if (pending.value) return
|
||||
pending.value = true
|
||||
uni.showLoading({
|
||||
|
||||
@ -91,9 +91,20 @@
|
||||
</view>
|
||||
</view>
|
||||
</scroll-view>
|
||||
<view class="button">
|
||||
<view class="button-reset" @click="reset">清空记录</view>
|
||||
<view class="button-create" @click="syncRecord">同步记录</view>
|
||||
<view class="button" v-if="$bluetooth.currentLockInfo.keyRight === 1">
|
||||
<view
|
||||
class="button-reset"
|
||||
@click="reset"
|
||||
v-if="$bluetooth.currentLockInfo.userType === 110301"
|
||||
>清空记录</view
|
||||
>
|
||||
<view
|
||||
class="button-create"
|
||||
:style="{ width: $bluetooth.currentLockInfo.userType === 110301 ? '300rpx' : '650rpx' }"
|
||||
@click="syncRecord"
|
||||
>
|
||||
同步记录</view
|
||||
>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user