baibx hai 3 meses
pai
achega
b8156b5b4b

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 24 - 25
com.sharemao.web.xw3/src/main/java/com/sharemao/web/wx/ctrl/PayCtrl.java


+ 5 - 5
com.sharemao.web.xw3/src/main/webapp/consumer.jsp

@@ -231,11 +231,11 @@ document.querySelectorAll('.recharge-nav .item').forEach((item, index) => {
231
 function createOrder(){
231
 function createOrder(){
232
 
232
 
233
 
233
 
234
-var cursn = "${cursn}";
235
-if(cursn!="866162073362932"){
236
-	alert("亲,充值系统升级,可能导致无法充值,麻烦联系客服充值,联系客服有额外优惠。(服务时间:0:00-24:00)")
237
-    return;
238
-}
234
+//var cursn = "${cursn}";
235
+//if(cursn!="866162073362932"){
236
+//	alert("亲,充值系统升级,可能导致无法充值,麻烦联系客服充值,联系客服有额外优惠。(服务时间:0:00-24:00)")
237
+//    return;
238
+//}
239
 
239
 
240
     // 检查是否有选中的套餐
240
     // 检查是否有选中的套餐
241
     var selectedPackage = $(".recharge-list li.cur");
241
     var selectedPackage = $(".recharge-list li.cur");

+ 24 - 1
com.sharemao.web.xw3/src/main/webapp/pkgorderali.jsp

@@ -252,6 +252,15 @@
252
 	            <img src="/static/img/icon-pay-alipay.png" class="icon">
252
 	            <img src="/static/img/icon-pay-alipay.png" class="icon">
253
 	            <span>支付宝支付</span>
253
 	            <span>支付宝支付</span>
254
 	        </div>
254
 	        </div>
255
+	        <div class="select">
256
+	            <input type="radio" name="pay" value="alipay" class="redcheck" id="pay">
257
+	        </div>
258
+	    </div>
259
+	    <div class="form-item">
260
+	        <div class="form-text">
261
+	            <img src="/static/img/icon-pay-weixin.png" class="icon">
262
+	            <span>微信支付,请联系客服充值</span>
263
+	        </div>
255
 	        <div class="select">
264
 	        <div class="select">
256
 	            <input type="radio" name="pay" value="wx" class="redcheck" id="pay">
265
 	            <input type="radio" name="pay" value="wx" class="redcheck" id="pay">
257
 	        </div>
266
 	        </div>
@@ -263,6 +272,15 @@
263
 	            <img src="/static/img/icon-pay-alipay.png" class="icon">
272
 	            <img src="/static/img/icon-pay-alipay.png" class="icon">
264
 	            <span>支付宝支付</span>
273
 	            <span>支付宝支付</span>
265
 	        </div>
274
 	        </div>
275
+	        <div class="select">
276
+	            <input type="radio" name="pay" value="alipay" class="redcheck" id="pay">
277
+	        </div>
278
+	    </div>
279
+	    <div class="form-item">
280
+	        <div class="form-text">
281
+	            <img src="/static/img/icon-pay-weixin.png" class="icon">
282
+	            <span>微信支付,请联系客服充值</span>
283
+	        </div>
266
 	        <div class="select">
284
 	        <div class="select">
267
 	            <input type="radio" name="pay" value="wx" class="redcheck" id="pay">
285
 	            <input type="radio" name="pay" value="wx" class="redcheck" id="pay">
268
 	        </div>
286
 	        </div>
@@ -486,7 +504,7 @@
486
 				//alert(item);
504
 				//alert(item);
487
             });
505
             });
488
 			var paytype = $(".redcheck:checked").val();
506
 			var paytype = $(".redcheck:checked").val();
489
-			if(paytype == "wx") {
507
+			if(paytype == "alipay") {
490
 				if (!navigator.userAgent.match(/MicroMessenger/i)) {
508
 				if (!navigator.userAgent.match(/MicroMessenger/i)) {
491
 					alert("请使用微信访问!");
509
 					alert("请使用微信访问!");
492
 					$('.mask').hide();
510
 					$('.mask').hide();
@@ -563,6 +581,11 @@
563
 						});
581
 						});
564
 					}
582
 					}
565
 				}
583
 				}
584
+			} else if(paytype == "wx"){
585
+			    alert("请联系客服充值!");
586
+                $('.mask').hide();
587
+                isRequesting = false;
588
+                return;
566
 			} else {
589
 			} else {
567
                 alert("请选择支付方式!");
590
                 alert("请选择支付方式!");
568
                 $('.mask').hide();
591
                 $('.mask').hide();