优化激活进度

subpackage/after-sale/activation/activate.vue

@@ -179,6 +179,7 @@
 	});
 	function cmdResult1() {
 		// tools.showLoadingAlert('正在激活，请等待')
+		state.progressNum=10
 		const options = {
 			type: 2, //type: 2,JSON格式提交数据(默认表单形式提交)
 			showLoading: false,
@@ -206,17 +207,20 @@
 					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
 			});
 	}
 
 	function implementCmd(transOrderId, cmd, cmdResult, stepNo) {
-		state.progressNum=state.progressNum+5
+		console.log("datas.stepNo1",stepNo)
+		state.progressNum=Number(stepNo)*10+10
 		const options = {
 			type: 2, //type: 2,JSON格式提交数据(默认表单形式提交)
 			showLoading: false,
@@ -261,6 +265,7 @@
 					}, (err) => {
 						console.log("err",err)
 						state.showPopup=false
+						state.disabled = true
 						errorLog(datas.cmd,JSON.stringify(err),datas.stepNo)
 						showModals('在线激活异常')
 					});
@@ -270,6 +275,7 @@
 				console.log(err);
 				tools.hideLoadingAlert();
 				state.showPopup=false
+				state.disabled = true
 			});
 	}