合并主分支

# Conflicts:
#	pages/210/deviceControl/index.vue
#	pages/650/HBY650.vue
#	pages/common/index/index.vue
#	unpackage/dist/dev/app-plus/static/tabs/device-HL.png
#	unpackage/dist/dev/app-plus/static/tabs/device.png
#	unpackage/dist/dev/app-plus/static/tabs/my-HL.png
#	unpackage/dist/dev/app-plus/static/tabs/my.png
#	utils/BleReceive.js
#	utils/loading.js

pages/common/qrcode/qrcode.vue

@@ -5,13 +5,17 @@
 			<image src="/static/images/common/svg.png" class="svg"></image>
 			<view class="scanT">ID: {{ deviceId }}</view>
 		</view>
+
 		<!-- 连接中状态 -->
 		<view class="connecting-container" v-else>
 			<view class="device-info">
 				<view class="">
 					<image src="/static/images/common/svg.png" class="svg"></image>
 				</view>
-
+				<!-- 			<view>
+					<image src="/static/images/bip.6.png" class="bip"></image>
+				</view> -->
+				
 				<text class="device-name">设备名：{{deviceId}}</text>
 				<text class="device-model1">ID:{{deviceId}}</text>
 			</view>
@@ -67,7 +71,6 @@
 						})
 						console.log(this.deviceId, res);
 						if (res.code == 200) {
-							
 							this.isConnectNo = false
 							this.isSuccess = true
 							uni.hideLoading()