Merge remote-tracking branch 'origin/master'

apps/exams/Tpl/default/Index/pay_w3g.html

@@ -73,6 +73,7 @@
 				    });
 				    });
 				}
 				}
 				if(that.agree) {
 				if(that.agree) {
+					var s = 0;
 					$.ajax({
 					$.ajax({
 					    url: "{:U('course/PayVideo/payLibraryExams')}",
 					    url: "{:U('course/PayVideo/payLibraryExams')}",
 					    data: {
 					    data: {
@@ -85,9 +86,38 @@
 					    async:false,
 					    async:false,
 					    type:'post',
 					    type:'post',
 					    success: function(data){
 					    success: function(data){
-							let res = JSON.parse(data)
-							if(res.status == 1) {
-
+							let res2 = JSON.parse(data);
+							clearInterval(s);
+							if(res2.status == 1) {
+								var pay_pass_num = res2.data.pay_pass_num;
+								WeixinJSBridge.invoke(
+										'getBrandWCPayRequest',JSON.parse(res2.data.html),
+										function(res){
+											if(res.err_msg == "get_brand_wcpay_request:ok" ){
+												s = setInterval(function(){
+													$.ajax({
+														url: "{:U('course/PayVideo/getPayStatus')}",
+														data:{pay_pass_num:pay_pass_num},
+														type:'post',
+														success: function(res){
+															try{
+																res = JSON.parse(res);
+																if(res.status == 1){
+																	clearInterval(s);
+																	ui.success('购买成功');
+																	setTimeout(function(){
+																		window.location.href = res.data;
+																	},1500);
+																}
+															}catch(e){
+																return;
+															}
+														}
+													});
+												},1800);
+											}
+										}
+								);
 							} else {
 							} else {
 								ui.error(res.data)
 								ui.error(res.data)
 							}
 							}

apps/mall/Tpl/default/Goods/pay_w3g.html

@@ -127,6 +127,7 @@
 					ui.error("购买必须同意《{$site['site_keyword']}购买协议》")
 					ui.error("购买必须同意《{$site['site_keyword']}购买协议》")
 					return
 					return
 				}
 				}
+				var s = 0;
 				$.ajax({
 				$.ajax({
 				    url: "{:U('classroom/Pay/buyGoods')}",
 				    url: "{:U('classroom/Pay/buyGoods')}",
 				    data: {
 				    data: {
@@ -138,12 +139,40 @@
 					},
 					},
 				    async:false,
 				    async:false,
 				    type:'post',
 				    type:'post',
-					success: function(res) {
-						console.log(res)
-						if(res.status == 1) {
-
+					success: function(data) {
+						data = JSON.parse(data);
+						if(data.status == 1) {
+							var pay_pass_num = data.data.pay_pass_num;
+							WeixinJSBridge.invoke(
+									'getBrandWCPayRequest',JSON.parse(data.data.html),
+									function(res){
+										if(res.err_msg == "get_brand_wcpay_request:ok" ){
+											s = setInterval(function(){
+												$.ajax({
+													url: "{:U('classroom/Pay/getPayStatus')}",
+													data:{pay_pass_num:pay_pass_num},
+													type:'post',
+													success: function(res){
+														try{
+															res = JSON.parse(res);
+															if(res.status == 1){
+																clearInterval(s);
+																ui.success('购买成功');
+																setTimeout(function(){
+																	window.location.href = res.data;
+																},1500);
+															}
+														}catch(e){
+															return;
+														}
+													}
+												});
+											},1800);
+										}
+									}
+							);
 						} else {
 						} else {
-							ui.error(res.info ? res.info : res.data)
+							ui.error(data.info ? data.info : data.data)
 						}
 						}
 					}
 					}
 				})
 				})