Web code updated

rc-busness/ajax/util.js

@@ -35,20 +35,45 @@ let util = {
 		}
 	},
 	checkPaytypeValidated($paytype) {
-		if(isWx && $paytype == 1) {
-			//return 3;
-			return true;
-		} else if(isWx && $paytype!=1) {
-			return false;
+		let isMobile = this.isMobile();
+		let isWx = this.isWX();
+		//Dictionary : 1:WX native pay, 2:Alipay, 3:WX H5 pay
+		if((isWx || !isMobile) && $paytype == 1) {
+			return {'result':true};
 		}
-		
-		if(!isMobile && $paytype == 1) {
-			//Desktop, use native pay
-			return true;
-		} else if(isMobile && $paytype == 2) {
-			return true;
+		if(isMobile && $paytype == 3) {
+			return {'result':true};
 		}
-		return false;
+		if($paytype == 2) {
+			return {'result':true};
+		}
+		let message='';
+		switch($paytype) {
+			case "1":
+				message = '请返回电脑端继续当前订单的支付';
+				break;
+			case "2":
+				message = '请返回支付宝继续当前订单的支付';
+				break;
+			case "3":
+				message = '请返回手机端继续当前订单的支付';
+				break;
+			default:
+				message = '订单已过期，请重新下单';
+				break;
+		}
+		return {'result':false,'message':message};
+	},
+	getTextByPaytype(paytype){
+		//Dictionary : 1:WX native pay, 2:Alipay, 3:WX H5 pay
+		let mapping = {
+			"1":"微信扫码支付",
+			"2":"支付宝支付",
+			"3":"手机网页支付",
+		};
+		if(mapping.hasOwnProperty(paytype))
+			return mapping[paytype];
+		return '';
 	}
 }
 export default util;