修复重复记录的bug

pages/reshui/reshui.vue

@@ -47,10 +47,10 @@
 			<view class="start_up_process">
 				<uni-steps :options="list1" :active-color="colorPrimary" :active="active" />
 			</view>
-			<view class="ad">
+			<!-- <view class="ad">
 				<image src="../../static/images/ad_reshui.jpg" mode="aspectFill" class="ad_img" @tap="ad_redirect">
 				</image>
-			</view>
+			</view> -->
 			<view class="title">
 				消费记录
 			</view>
@@ -518,35 +518,49 @@
 							}
 						})
 					} else {
+						setTimeout(() => {
+							this.isChecked = false
+						}, 200)
+						
 						uni.showToast({
 							icon: 'none',
 							title: '先【扫码连接】，后【开启设备】',
 							duration: 1500
 						})
-
+					}
+				} else {
+					if (!(this.deviceId && this.serviceId)) {
+						uni.showToast({
+							icon: 'none',
+							title: '与设备连接中断！请在设备上手动停止即可！',
+							duration: 3000
+						})
+					
 						setTimeout(() => {
-							this.isChecked = false
+							this.setInit()
 						}, 300)
+						
+						return
 					}
-				} else {
+					
 					uni.showModal({
 						title: '提示',
 						content: '确定要关闭设备？',
 						success: (res) => {
 							if (res.confirm) {
-								this.isChecked = false
-
 								if (this.deviceId && this.serviceId) {
+									this.isChecked = false
 									this.send('stop')
 								} else {
 									uni.showToast({
 										icon: 'none',
 										title: '与设备连接中断！请在设备上手动停止即可！',
-										duration: 5000
+										duration: 3000
 									})
 
 									setTimeout(() => {
-										this.isChecked = true
+										// this.isChecked = true;
+										this.setInit()
 									}, 300)
 								}
 							} else if (res.cancel) {
@@ -1274,8 +1288,8 @@
 
 					this.get_Bluetooth_Bevice = false
 					this.rooms = [] // 宿舍号，蓝牙连接具有时效性，断开连接后清空
-					// this.start_code = ''
-				})
+					this.start_code = ''
+				}, 200)
 			},
 
 			/**
@@ -1338,20 +1352,21 @@
 						// console.log(res)
 						if (val == 'start') {
 							setTimeout(() => {
-								this.isChecked = true
-								this.isConnected = true
+								this.isChecked = true;
+								this.isConnected = true;
+								this.byte35 = '';
 							}, 300)
 
 							this.process_control(3)
 						} else if (val == 'stop') {
 							setTimeout(() => {
-								this.isChecked = false
+								this.isChecked = false;
 							}, 300)
 						}
 					},
 					fail: (err) => {
 						// console.log(err)
-						if (err.errCode == 10006) {
+						if (err.errCode !== 0) {
 							setTimeout(() => {
 								this.setInit()
 							}, 300)
@@ -1359,12 +1374,14 @@
 							if (this.isConnected) {
 								uni.showToast({
 									title: '设备连接已断开！请在水表上手动停止！',
-									icon: 'none'
+									icon: 'none',
+									duration: 5000
 								})
 							} else {
 								uni.showToast({
 									title: '设备连接失败！请重试扫描连接！',
-									icon: 'none'
+									icon: 'none',
+									duration: 5000
 								})
 							}
 						}

pagesAir/accountBalance/accountBalance.vue

@@ -32,7 +32,7 @@
 		</view>
 		<view class=" line"></view>
 		<input class="input-balance" type="text" v-model="amount" @input="onInput" @blur="onBlur"
-			placeholder="请输入充值金额，金额大于10" placeholder-class="pc" />
+			placeholder="请输入充值金额，金额大于10" placeholder-class="pc" maxlength="4" />
 		<view class="line"></view>
 		<view class="btn-pay">
 			<button class="btn" url="/pagesAir/rechargeRecord/rechargeRecord" @tap="btn_click">
@@ -162,7 +162,7 @@
 				if (param_code == '' || this.amount == '' || this.id_card == '') {
 					uni.showToast({
 						icon: 'none',
-						title: 'code、充值金额或身份证号为空',
+						title: 'code、充值金额 或 身份证号为空',
 						duration: 3000
 					});
 					return
@@ -190,6 +190,15 @@
 						duration: 3000
 					});
 				} else {
+					if (res.data.code === 205) {
+						uni.showToast({
+							title: '服务器返回：' + res.data.message,
+							icon: 'none',
+							duration: 3000
+						});
+						
+						return
+					}
 					// 调起微信支付
 					wx.requestPayment({
 						timeStamp: res.data.timeStamp,