Merge branch 'dev2.8.5' of ssh://192.168.3.207:10022/qmx/jy into dev2.8.5

src/jfw/modules/app/src/web/templates/vipsubscribe/renew_pay.html

@@ -757,16 +757,15 @@
 	    		"time": $('.choose_item.select_cycle .info').val(),
 	    		"payWay":payType,
 	    		"pay_source": "Renew",
-	    		"endtime": ends,
 	    	}
-	    	console.log(param)
 	    	$DoPost("/subscribepay/renewUpgrade/renewUpgradeCreateOrder", param, function (r) {
                 if (r.success) {
+                	$(".save_renew").removeAttr("disabled");
                     //唤起app支付
                     try {
-                        if (pay_way == "wx_app") {
+                        if (payType == "wx_app") {
                             JyObj.wxPay(r.data.res);
-                        } else if(pay_way === "ali_app"){
+                        } else {
                             JyObj.aliPay(r.data.res)
                         }
                         //校验是否支付完成
@@ -774,10 +773,8 @@
                     } catch (e) {
                         alert(e)
                     }
-                    clearSessionStorage();
-                    $(".save_renew").removeAttr("disabled");
                 } else {
-                    $(".save_renew").removeAttr("disabled");
+                    $(".save_renew").removeAttr("disabled")
                 }
             });
 	    });
@@ -803,6 +800,8 @@
 	                if (r.success) {
 	                    clearInterval(interval);
 	                    clearSessionStorage();
+	                    sessionStorage.To_introducePage=2;
+						sessionStorage.removeItem("historypushDataCache");
 	                    window.location.replace("/jyapp/vipsubscribe/toPaySuccessPage?orderCode=" + orderid);
 	                }
 	            });

src/jfw/modules/app/src/web/templates/vipsubscribe/vip_purchase.html

@@ -766,6 +766,8 @@
         sessionStorage.removeItem("vipSubSelectTime");
         sessionStorage.removeItem("vipSub_read");
         sessionStorage.removeItem("vipSubPayWay");
+        sessionStorage.removeItem("historypushDataCache");
+        sessionStorage.To_introducePage=2;
     }
 
 </script>

src/jfw/modules/app/src/web/templates/vipsubscribe/vip_upgrade.html

@@ -1162,9 +1162,10 @@
 	    	console.log(param)
 	    	$DoPost("/subscribepay/renewUpgrade/renewUpgradeCreateOrder", param, function (r) {
                 if (r.success) {
+                    $(".save_upgrade").removeAttr("disabled");
                     //唤起app支付
                     try {
-                        if (pay_way == "wx_app") {
+                        if (payType === "wx_app") {
                             JyObj.wxPay(r.data.res);
                         } else {
                             JyObj.aliPay(r.data.res)
@@ -1175,7 +1176,6 @@
                         alert(e)
                     }
                     clearSessionStorage();
-                    $(".save_upgrade").removeAttr("disabled")
                 } else {
                     $(".save_upgrade").removeAttr("disabled")
                 }
@@ -1209,6 +1209,8 @@
 	                if (r.success) {
 	                    clearInterval(interval);
 	                    clearSessionStorage();
+	                    sessionStorage.To_introducePage=2;
+						sessionStorage.removeItem("historypushDataCache");
 	                    window.location.replace("/jyapp/vipsubscribe/toPaySuccessPage?orderCode=" + orderid);
 	                }
 	            });

src/jfw/modules/subscribepay/src/service/vipRenewUpgrade.go

@@ -180,10 +180,9 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 		}
 		filter := entity.VipSimpleMsg{}
 		if pay_source == "Renew" {
-			vipjy := (*res)["o_vipjy"].(map[string]interface{})
 			filter = entity.VipSimpleMsg{
-				qutil.ObjToMap(vipjy["o_area"]),
-				qutil.ObjArrToStringArr(vipjy["a_buyerclass"].([]interface{})),
+				areas,
+				industrys,
 				nil,
 				nil,
 				nil,
@@ -216,8 +215,6 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 			totalfee = entity.JyVipSubStruct.GetSubVipPrice(area, industry, date_count, date_unit)
 		} else if pay_source == "Upgrade" {
 			upgradeYear, upgradeMonth := MaxUpgradeMonth(end) //获取最大升级月数
-			log.Println(upgradeYear)
-			log.Println(upgradeMonth)
 			vipjy := (*res)["o_vipjy"].(map[string]interface{})
 			addIndustry := qutil.ObjArrToStringArr(vipjy["a_buyerclass"].([]interface{}))
 			buyerclasscount := vipjy["o_buyset"].(map[string]interface{})["buyerclasscount"]
@@ -306,7 +303,6 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 			}
 			prepayid = qutil.ObjToString((*ret)["prepayid"])
 			payStr = pay.WxStruct.GetAppWxPayStr(prepayid)
-			log.Println("tradeno", tradeno)
 		} else { //支付宝支付
 			var err error
 			payStr, tradeno, err = pay.Alipay.GetOrderPayParam((qutil.Float64All(totalfee)), "", pay.ALI_SUBVIP_APP)

src/web/staticres/vipsubscribe/css/subscribe_list.css

@@ -149,6 +149,7 @@
 .vip_banner .box .left h4 {
   font-size: .32rem;
   color: #FFDAB1;
+font-weight: bold;
 }
 
 .vip_banner .box .right {

src/web/staticres/vipsubscribe/js/updateArea.js

@@ -660,7 +660,7 @@ $(function () {
 	function showCityTips(dom){
 		let isAll = $(".area-list").attr("data-buy-province-count");
 		if(Number(isAll)===-1){
-			return	
+			return
 		}
 		let activeCityLength = $(dom).parent().find('.city.active').length;
 		let selectedCityLength = $(dom).parent().find('.city.active:not([disabled])').length;

src/web/templates/weixin/vipsubscribe/choose_area_upgrade.html

@@ -393,7 +393,7 @@
     <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
     <script src="/vipsubscribe/js/mapJSON.js?v={{Msg "seo" "version"}}"></script>
     <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/vipsubscribe/js/updateArea.js?v={{Msg "seo" "version"}}14"></script>
+    <script src="/vipsubscribe/js/updateArea.js?v={{Msg "seo" "version"}}16"></script>
 </body>
 
 </html>

src/web/templates/weixin/vipsubscribe/renew_pay.html

@@ -254,29 +254,33 @@
   				},
   				function(r){
 				    if(r.err_msg == "get_brand_wcpay_request:ok"){
-						setTimeout(function(){
-							window.location.replace("/front/vipsubscribe/toPaySuccessPage?orderCode="+ordercode);
-						},500)
-					}	
-//					}else if(r.err_msg == "get_brand_wcpay_request:cancel"){               
-////	                	alert("开发环境【支付跳转完成】")
-//		                try{
-////		  					window.location.replace("/front/vipsubscribe/toPaySuccessPage?orderCode="+ordercode);
-////		                    window.location.reload();
-//		                }catch(e){
-//		                  alert(e)
-//		                }
-//	  				}else{
-//	                	weui.toast("系统异常，请稍微再试",{
-//	                  		duration: 2000,
-//	                  		className: 'custom-toast',
-//	                	});
-//	  				}
+						clearSessionStorage();
+						sessionStorage.To_introducePage=2;
+						sessionStorage.removeItem("historypushDataCache");
+						checkPaySuccess(ordercode);
+					}
   				});
   			}   
 		}catch(e){
 		  console.log(e)
 		}
+		var interval
+        //支付完成跳转
+        function checkPaySuccess(orderCode){
+        	if(interval){
+            	clearInterval(interval);
+    		}
+        	interval=setInterval(function() {
+            	$.post("/jypay/vipPaySuccess", {
+							code: orderCode
+						}, function(r) {
+							if (r.success) {
+								window.location.replace("/front/vipsubscribe/toPaySuccessPage?orderCode="+orderCode);
+								clearInterval(interval);
+							}
+						})
+         	},3000)
+        }
     </script>
     <script>
     	$(function () {    

src/web/templates/weixin/vipsubscribe/vip_purchase.html

@@ -763,6 +763,7 @@
             sessionStorage.removeItem("vipSubSelectTime");
             sessionStorage.removeItem("vipSub_read");
             sessionStorage.removeItem("historypushDataCache");
+            sessionStorage.To_introducePage=2;
         }
 
         /******* 获取url参数（正则）********/

src/web/templates/weixin/vipsubscribe/vip_upgrade.html

@@ -245,7 +245,6 @@
         </div>
     </div>
     <script src="/vipsubscribe/js/jquery-2.1.4.js"></script>
-    <!--<script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>-->
     <script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
     <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}3"></script>
     <script type="text/javascript">
@@ -289,10 +288,8 @@
 				    if(r.err_msg == "get_brand_wcpay_request:ok"){
 				    	//
                     	clearSessionStorage();
-						
-						/*setTimeout(function(){
-							window.location.replace("/front/vipsubscribe/toPaySuccessPage?orderCode="+ordercode);
-						},500)*/
+						sessionStorage.To_introducePage=2;
+						sessionStorage.removeItem("historypushDataCache");
 						checkPaySuccess(ordercode);
 					}
 				});
@@ -300,23 +297,23 @@
 		}catch(e){
 		  console.log(e)
 		}
-				var interval
-		        //支付完成跳转
-		        function checkPaySuccess(orderCode){
-		        	if(interval){
-		            	clearInterval(interval);
-	        		}
-		        	interval=setInterval(function() {
-		            	$.post("/jypay/vipPaySuccess", {
-									code: orderCode
-								}, function(r) {
-									if (r.success) {
-										window.location.replace("/front/vipsubscribe/toPaySuccessPage?orderCode="+orderCode);
-										clearInterval(interval);
-									}
-								})
-		         	},3000)
-		        }
+		var interval
+        //支付完成跳转
+        function checkPaySuccess(orderCode){
+        	if(interval){
+            	clearInterval(interval);
+    		}
+        	interval=setInterval(function() {
+            	$.post("/jypay/vipPaySuccess", {
+							code: orderCode
+						}, function(r) {
+							if (r.success) {
+								window.location.replace("/front/vipsubscribe/toPaySuccessPage?orderCode="+orderCode);
+								clearInterval(interval);
+							}
+						})
+         	},3000)
+        }
     </script>
     <script>
         $(function () {    

src/web/templates/weixin/wxkeyset/index.html

@@ -47,6 +47,7 @@
 .vip_banner .box .left h4 {
     font-size: .32rem;
     color: #FFDAB1;
+	font-weight: bold;
 }
 .msg_alert {
     position: fixed;
@@ -108,13 +109,18 @@ $(function(){
 		$(".keyWordContent").removeClass("_margin_b");
 	})
 	if(sessionStorage){
+		if(sessionStorage.To_introducePage==2){
+			sessionStorage.removeItem("To_introducePage");
+			history.go(-1);
+			return
+		}
 		if(sessionStorage.keysetindexToHistory=="2"){
 			sessionStorage.keysetindexToHistory="3"
 		}else{
 			sessionStorage.keysetindexToHistory="1"
 		}
 	}
-	$("body").css("background-color","FFF");
+	$("body").css({"visibility":"","background-color":"FFF"});
 
 	if(!isIOS){
 		$(".relRecom").addClass("isnotios");
@@ -703,13 +709,14 @@ function saveSeniorset(r){
 }
 //
 function tointroducepage(){
-	//sessionStorage.removeItem("keysetindexToHistory");
-	window.location.replace("/front/vipsubscribe/introducePage");
+	sessionStorage.To_introducePage=1;
+	$("body").css({"visibility":"hidden"});
+	window.location.href="/front/vipsubscribe/introducePage";
 }
 
 </script>
 </head>
-<body class="keysetpage">
+<body class="keysetpage" style="visibility:hidden;">
 	<div class="vip_banner" style="">
 		<div class="box">
 			<div class="left">