激活优化内容

datas/vehiclePlateColor.js

@@ -22,10 +22,10 @@ export const vehiclePlateColor = [{
 		id: 5,
 		color: '黄绿双拼色'
 	},
-	{
-		id: 6,
-		color: '蓝白渐变色'
-	},
+	// {
+	// 	id: 6,
+	// 	color: '蓝白渐变色'
+	// },
 	{
 		id: 9,
 		color: '未确定'
@@ -81,11 +81,11 @@ export const vehiclePlateColorPai = [{
 		color: '黄绿双拼牌',
 		showColor: "rgb(252,204,1)",
 	},
-	{
-		id: 6,
-		color: '蓝白渐变牌',
-		showColor: "rgb(56,139,252)",
-	},
+	// {
+	// 	id: 6,
+	// 	color: '蓝白渐变牌',
+	// 	showColor: "rgb(56,139,252)",
+	// },
 	{
 		id: 9,
 		color: '未确定',

pages/bluetooth/bluetooth.vue

@@ -344,6 +344,8 @@
 													_name = "埃特斯";
 												} else if (name.split("-")[1] == "MC") {
 													_name = "铭创";
+												}else if (name.split("-")[1] == "WQ") {
+													_name = "握奇";
 												}
 												break;
 											case "WJ":
@@ -485,6 +487,8 @@
 							obj = ArtcBleUtilApi
 						} else if (device.name.includes("MC")) {
 							obj = mcApi9901
+						} else if (device.name.includes("WQ")) {
+							obj = wqApi
 						}
 						console.log("新")
 						obj.connectDevice(
@@ -585,7 +589,7 @@
 						);
 						break;
 					case "WQ":
-						device['sendTimeout'] = 20000
+					   console.log("wqApi",wqApi)
 						wqApi.connectDevice(
 							device,
 							function (res) {
@@ -676,7 +680,7 @@
 			tools.hideLoadingAlert(); //关闭加载框
 			datas.setData("bluLinkStatus", true);
 			datas.setData("connectPrefixName", connectPrefixName.value);
-			startHeartbeat() //执行心跳
+			// startHeartbeat() //执行心跳
 			oks();
 		} else {
 			alertF(res.msg);
@@ -685,7 +689,7 @@
 
 	// ====================== 页面卸载时清理资源 ======================
 	onUnload(() => {
-		stopHeartbeat();
+		// stopHeartbeat();
 		// 实际项目中需调用 uni.closeBLEConnection 断开连接
 		console.log('页面卸载，清理资源');
 	});

static/etcUtil/index.js

@@ -66,6 +66,8 @@ function disconnectDevice() {
 				obj=ArtcBleUtilApi
 			}else if (datas.getData("deviceName").includes("MC")) {
 				obj=mcApi9901
+			}else if (datas.getData("deviceName").includes("WQ")) {
+				obj=wqApi
 			}
 			obj.disconnectDevice(function(res) {
 				datas.setData("bluLinkStatus", false);
@@ -176,6 +178,8 @@ function transCmd(cmdArr, type, func, callBack = null) {
 				obj=ArtcBleUtilApi
 			} else if (datas.getData("deviceName").includes("MC")) {
 				obj=mcApi9901
+			}else if (datas.getData("deviceName").includes("WQ")) {
+				obj=wqApi
 			}
 			obj.transCmd(cmdArr, type, function(res) {
 				console.log(datas.getData("deviceName")+'执行内容====11111', res)

static/etcUtil/tools.js

@@ -223,10 +223,10 @@ function vehiclePlateStr(num, successFun) {
 			successFun(vehicleColorStr);
 			break;
 
-		case 6:
-			vehicleColorStr = '蓝白渐变色';
-			successFun(vehicleColorStr);
-			break;
+		// case 6:
+		// 	vehicleColorStr = '蓝白渐变色';
+		// 	successFun(vehicleColorStr);
+		// 	break;
 
 		case 7:
 			vehicleColorStr = '临时牌照';

subpackage/after-sale/activation/activate.vue

@@ -719,6 +719,16 @@
 			func(data)
 		});
 	};
+	//提示对话框
+	const alertF = (msg) => {
+	
+		//隐藏加载框
+		tools.hideLoadingAlert();
+	
+		//提示对话框
+		tools.showModalAlert(msg);
+		stopHeartbeat();
+	}
 </script>
 
 <style>

subpackage/orders/components/layout-numberplate-color.vue

@@ -50,7 +50,7 @@
 			{ src: 'bg-yellow_green', checkSrc: 'icon-select-yellow_green', id: 5, color: '#ffffff', title: '黄绿双拼色' },
 			{ src: 'bg-black', checkSrc: 'icon-select-black', id: 2, color: '#ffffff', title: '黑色' },
 			{ src: 'bg-white', checkSrc: 'icon-select-white', id: 3, color: '#000000', title: '白色' },
-			{ src: 'bg-white_blue', checkSrc: 'icon-select-blue', id: 6, color: '#ffffff', title: '蓝白渐变色' },
+			// { src: 'bg-white_blue', checkSrc: 'icon-select-blue', id: 6, color: '#ffffff', title: '蓝白渐变色' },
 			{ src: 'green', checkSrc: 'icon-green', id: 11, color: '#ffffff', title: '绿色' },
 			{ src: 'rad', checkSrc: 'icon-select-red', id: 12, color: '#ffffff', title: '红色' },
 		]

subpackage/personal-center/components/layout-numberplate-color.vue

@@ -37,7 +37,7 @@
 			{src:'bg-white',checkSrc:'icon-select-white',id:3,color:'#000000',title:'白色'},
 			{src:'bg-green',checkSrc:'icon-select-green',id:4,color:'#000000',title:'渐变绿色'},			
 			{src:'bg-yellow_green',checkSrc:'icon-select-yellow_green',id:5,color:'#000000',title:'黄绿双拼'},			
-			{src:'bg-white_blue',checkSrc:'icon-select-blue',id:6,color:'#000000',title:'蓝白渐变'},
+			// {src:'bg-white_blue',checkSrc:'icon-select-blue',id:6,color:'#000000',title:'蓝白渐变'},
 			{src:'green',checkSrc:'icon-green',id:11,color:'#ffffff',title:'绿色'},
 			{src:'rad',checkSrc:'icon-select-red',id:12,color:'#ffffff',title:'红色'},
 		],  

subpackage/personal-center/setting/car-information/car-change.vue

@@ -222,10 +222,10 @@
 			label: "黄绿双拼色",
 			value: 5,
 		},
-		{
-			label: "蓝白渐变色",
-			value: 6,
-		},
+		// {
+		// 	label: "蓝白渐变色",
+		// 	value: 6,
+		// },
 		{
 			label: "未确定",
 			value: 9,

subpackage/personal-center/setting/car-information/car-create.vue

@@ -233,10 +233,10 @@
 			label: "黄绿双拼色",
 			value: 5,
 		},
-		{
-			label: "蓝白渐变色",
-			value: 6,
-		},
+		// {
+		// 	label: "蓝白渐变色",
+		// 	value: 6,
+		// },
 		{
 			label: "未确定",
 			value: 9,

utils/network/request.js

@@ -343,8 +343,8 @@ export function requestNew(code, options = {}, start = false,clie=()=>{}) {
 	// #ifdef MP-WEIXIN
 	Common['orderSource'] = "WECHAT"
 	// #endif
-	options.url = envs[process.env.NODE_ENV].baseUrl+'/prod' + code
-	// options.url = envs[process.env.NODE_ENV].baseUrl+'/ndev' + code
+	// options.url = envs[process.env.NODE_ENV].baseUrl+'/prod' + code
+	options.url = envs[process.env.NODE_ENV].baseUrl+'/ndev' + code
 	//默认json数据格式提交`
 	let contentType = 'application/json'