Merge branch 'master' of http://192.168.40.220/dmc/jz_applet into master

pages/recharge/recharge-weixin.vue

@@ -215,6 +215,7 @@
 	function go(money) {
 		let content = ""
 		if (money) {
+			state.fee = money * 100
 			content = '待消费订单' + money + '元'
 		} else {
 			content = '待消费订单'

pages/recharge/recharge.vue

@@ -172,11 +172,6 @@
 		money: undefined,
 		v_userType: "",
 	});
-	// const getParams = (val: any) => {
-	// 	console.log("val蓝牙完毕传过来的参数", val)
-	// 	state.cardId = val.cardId;
-	// 	state.connectSuccess = val.connectSuccess;
-	// }
 	onLoad((option) => {
 		/*获取openId 用途:（用户支付）*/
 		// #ifdef MP-WEIXIN
@@ -200,7 +195,7 @@
 			/*读卡*/
 			getCardId();
 		} else {
-			quanCheckAction().then((val : any) => {
+			quanCheckActionTrue().then((val : any) => {
 				console.log("圈层检测val", val)
 				//如果 圈层检测正常
 				if (val.chargeStatus === 1) {
@@ -281,7 +276,7 @@
 				if (res.confirm) {
 					/*进行圈层检测，此处检测仅为校验圈层状态来决定去哪里*/
 					console.log("进行圈层检测");
-					quanCheckAction().then((val : any) => {
+					quanCheckActionTrue().then((val : any) => {
 						console.log("圈存检测接口返回", val)
 						//如果 圈层检测正常
 						if (val.chargeStatus === 1) {