6155完成部分协议对接

pages/common/addBLE/LinkBle.vue

@@ -19,13 +19,18 @@
 			连接
 		</view>
 
-
+<global-loading ref="loading" />
 	</view>
 </template>
 
 <script>
 	import request from '@/utils/request.js';
 	import bleTool from '@/utils/BleHelper.js'
+		import {
+			showLoading,
+			hideLoading,
+			updateLoading
+		} from '@/utils/loading.js'
 	var these = null;
 	var eventChannel = null;
 	var ble=null;
@@ -110,9 +115,9 @@
 				}
 				these.Statu.bound = null;
 				these.Statu.boundRemark = "";
-				uni.showLoading({
-					mask: true,
-					title: "连接中..."
+				showLoading(these,{
+					
+					text: "连接中..."
 				})
 				let promise = request({
 					url: '/app/device/bind',
@@ -142,7 +147,7 @@
 					these.Statu.bound = false;
 					these.Statu.boundRemark = '出现了未知的异常,操作失败';
 				}).finally(() => {
-					uni.hideLoading();
+					hideLoading(this);
 				});
 			}
 		}