Merge branch 'master' of http://82.156.35.112:3000/qiubinghui/zhywpt-sp

subpackage/after-sale/activation/activate.vue

@@ -140,8 +140,6 @@
 			getObuId();
 		}
 		
-		
-		
 		console.log("state.transfer", state.transfer, state.transfer == 0, state.transfer == 1, getItem(
 			"orderInfo"))
 	})
@@ -259,14 +257,14 @@
 					console.log("err", err)
 					errorLog(datas.cmd, JSON.stringify(err), datas.stepNo)
 					tools.hideLoadingAlert();
-					state.showPopup = false
+
 					state.disabled = true
 				});
 			})
 			.catch((err) => {
 				console.log(err);
 				tools.hideLoadingAlert();
-				state.showPopup = false
+
 				state.disabled = true
 			});
 	}
@@ -354,7 +352,6 @@
 	};
 	const activateQuqet = () => {
 		state.disabled = false
-		state.showPopup = true
 		console.log('orderInfo参数', orderInfo, state.disabled)
 		stopHeartbeat();
 		if(state.transfer == '1') {
@@ -377,25 +374,28 @@
 			method: "POST",
 			showLoading: false,
 		}
-		
+		tools.showLoadingAlert("执行指令");
 		requestNew(vfjObuActive, options)
 			.then((res) => {
 				tools.hideLoadingAlert();
 				console.log("在线激活 请求");
 				console.log(res);
 				const datas = res;
+				let cmdArr = datas.apdu.split(',')
 				tools.showLoadingAlert("执行指令");
-				bluetoothUtil.transCmd([datas.apdu.split(',')], "20", function (res) {
+				bluetoothUtil.transCmd(cmdArr, "20", function (res) {
 					tools.hideLoadingAlert();
 					console.log(res);
 					if (res[0] == "9000") {
-						console.log("在线激活执行指令88888  请求", res);
-						cfmActiveRequest(datas.orderNo)
+						msg('激活成功');
+						navTo(`/pages/order/order?index=${0}`);
+					} else {
+						msg(`激活失败，提示码：${res[0]}`);
 					}
 				});
 			})
 			.catch((err) => {
-				console.log(err);
+				tools.hideLoadingAlert();
 			});
 	}
 	

utils/network/request.js

@@ -55,6 +55,7 @@ export function request(code, options = {}, start = false) {
   // options.url = envs[process.env.NODE_ENV].baseUrl + '/api/interfaceMidGroundIn'
   options.url =
     envs[process.env.NODE_ENV].baseUrl + "/ndev/api/interfaceMidGroundIn";
+
   //默认json数据格式提交`
   let contentType = "application/x-www-form-urlencoded";
 
@@ -319,6 +320,7 @@ export function requestNew(code, options = {}, start = false, clie = () => {}) {
   console.log("Common", Common, getItem("customerObj"));
   // options.url = envs[process.env.NODE_ENV].baseUrl+'/prod' + code
   options.url = envs[process.env.NODE_ENV].baseUrl + "/newProd/prod" + code;
+  // options.url = envs[process.env.NODE_ENV].baseUrl + "/newDev/ndev" + code;
   //默认json数据格式提交`
   let contentType = "application/json";
 

utils/utils.ts

@@ -523,6 +523,7 @@ export const uploadFile = (tempImagePath, imageType) => {
 	console.log("tempImagePath", tempImagePath, tempImagePath.size,imageType)
 	return new Promise((resolve, reject) => {
 		uni.uploadFile({
+			// url: 'https://qtzl.etcjz.cn/newDev/minIo/upload', //测试
 			url: 'https://qtzl.etcjz.cn/newProd/minIo/upload', //仅为示例，非真实的接口地址
 			filePath: tempImagePath,
 			name: 'file',