添加类型路由后，合并版本

components/global-loading/global-loading.vue

@@ -26,7 +26,7 @@
 				dotColors: ['#CEF231c2'], 
 				text: '请稍候...',//文本文字
 				textColor: '#FFFFFFde',//文本颜色
-				radius: 50,//圆的半径
+				radius: 35,//圆的半径
 				duration: 1200,//动画的播放速度
 				colorIndex: 0
 			}
@@ -130,7 +130,8 @@
 		align-items: center;
 		z-index: 99999999999;
 		pointer-events: auto;
-
+		box-sizing: border-box;
+		padding-bottom: 70%;
 	}
 
 	/* 内容居中 */
@@ -149,7 +150,7 @@
 		position: relative;
 		width: 200rpx;
 		height: 200rpx;
-		margin-bottom: 30rpx;
+		
 	}
 
 	/* 单个刻度点 */
@@ -157,8 +158,8 @@
 		position: absolute;
 		top: 50%;
 		left: 50%;
-		width: 14rpx;
+		width: 4rpx;
-		height: 52rpx;
+		height: 30rpx;
 		border-radius: 12rpx;
 	/* 	margin-top: -4rpx;
 		margin-left: -4rpx; */
@@ -187,8 +188,8 @@
 		letter-spacing: 1.4rpx;
 		text-align: center;
 		max-width: 80vw;
-		padding: 0 20px;
+		
-		line-height: 1.5;
+		
 		font-family: 'PingFang SC';
 	}
 	

pages/210/deviceControl/index.vue

@@ -780,7 +780,7 @@
 			uni.showLoading({
 				title: '加载中...'
 			})
-			eventChannel.on('deviceControl', (data) => {
+			eventChannel.on('detailData', (data) => {
 				console.log(data, '这是传过来的惨呼啊');
 				this.itemInfo = data.data;
 				this.deviceID = data.data.id;

pages/6170/allShare/index.vue

@@ -143,7 +143,7 @@
 					url: "/pages/6170/deviceControl/index",
 					success: (res) => {
 						// 页面跳转成功后的回调函数
-						res.eventChannel.emit('deviceControl', {
+						res.eventChannel.emit('detailData', {
 							data: item,
 							apiType: 'listB' // 自定义标识 // 自定义标识，详情哪里根据这个参数不同信息
 						});

pages/6170/shareManagement/index.vue

@@ -100,7 +100,7 @@
 					url: "/pages/6170/deviceControl/index",
 					success: (res) => {
 						// 页面跳转成功后的回调函数
-						res.eventChannel.emit('deviceControl', {
+						res.eventChannel.emit('detailData', {
 							data: item,
 							apiType: 'listB' // 自定义标识 // 自定义标识，详情哪里根据这个参数不同信息
 						});

pages/650/HBY650.vue

@@ -24,7 +24,7 @@
 		<view class="eqinfo">
 			<view class="item">
 				<text class="lbl">蓝牙名称</text>
-				<text class="value">{{formData.name}}</text>
+				<text class="value">{{formData.blename}}</text>
 			</view>
 			<view class="item">
 				<text class="lbl">设备名称</text>
@@ -156,7 +156,7 @@
 					<view class="icoContent center" v-on:click.stop="checkImgUpload()">
 						<image mode="aspectFit" class="img" src="/static/images/6155/DeviceDetail/add.png"></image>
 					</view>
-				</view>			
+				</view>
 			</view>
 		</BottomSlideMenuPlus>
 
@@ -238,7 +238,7 @@
 					img: '/static/images/6155/DeviceDetail/equip.png',
 					battary: '',
 					xuhang: '',
-					name: '',
+					blename: '',
 					deviceId: '',
 					deviceName: '',
 					RSSI: '',
@@ -273,7 +273,7 @@
 			ble.addReceiveCallback(these.bleValueNotify);
 			let eventChannel = this.getOpenerEventChannel();
 
-			eventChannel.on('deviceControl', function(data) {
+			eventChannel.on('detailData', function(data) {
 
 				console.log("收到父页面的参数：" + JSON.stringify(data));
 				var device = data.data;
@@ -305,13 +305,14 @@
 						these.formData[key] = form[key];
 					}
 				}
-				these.formData.name = device.bluetoothName ? device.bluetoothName : "Unname";
+				these.formData.blename = f.name ? f.name : "Unname";
 				these.formData.deviceName = device.deviceName;
 				these.formData.img = device.devicePic;
 				these.formData.id = device.id;
-
-
 				ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId);
+				these.setBleFormData();
+
+
 
 			});
 
@@ -1125,7 +1126,9 @@
 
 				];
 
-
+				showLoading(this, {
+					text: "请稍候..."
+				});
 				let f = this.getDevice();
 				if (!f) {
 					these.showPop({
@@ -1136,9 +1139,7 @@
 					});
 					return;
 				}
-				showLoading(this, {
+
-					text: "请稍候..."
-				});
 				var sendText = function() {
 
 
@@ -1664,9 +1665,9 @@
 	}
 
 
-	
 
-	.addIco{
+
+	.addIco {
 		width: 100%;
 		height: 360rpx;
 		display: flex;