激活修改

subpackage/after-sale/activation/activate.vue

@@ -240,16 +240,18 @@
 					state.disabled = true
 					tools.hideLoadingAlert();
 					state.progressNum=100
-					// msg("激活成功", {
-					// 	'icon': 'success',
-					// 	'duration': 3000
-					// })
 					setTimeout(() => {
 						state.showPopup=false
+					},1000)
+					msg("激活成功", {
+						'icon': 'success',
+						'duration': 3000
+					})
+					setTimeout(() => {
 						uni.navigateTo({
 							url: "/subpackage/after-sale/deviceInfo/deviceInfo",
 						});
-					},2000)
+					},4000)
 				} else {
 					console.log("datas.stepNo", datas.stepNo)
 					bluetoothUtil.transCmd(datas.cmd.split(','), datas.cmdType == 'CARD' ? '10' : '20', function(res) {

subpackage/orders/order_payment.vue

@@ -411,7 +411,7 @@
 											appId: state.qdSignAppId,
 											path: state.qdSignUrl,
 											extraData: {},
-											envVersion:'release',
+											envVersion:'trial',
 											success(res) {
 												state.payOK=true
 												console.log(res);
@@ -532,7 +532,7 @@
 							appId: state.qdSignAppId,
 							path: state.qdSignUrl,
 							extraData: {},
-							envVersion:'release',
+							envVersion:'trial',
 							success(res) {
 								state.payOK=true
 								console.log(res);

subpackage/orders/transfer-page-sign.vue

@@ -431,7 +431,7 @@
 
 		view {
 			border-bottom: 1rpx solid #ccc;
-			// height: 62rpx;
+			padding: 6rpx 0;
 			line-height: 62rpx;
 			display: flex;
 			justify-content: space-between;

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'