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

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;