Merge branch 'dev2.8.5' of http://192.168.3.207:10080/qmx/jy into dev2.8.5

src/jfw/modules/app/src/web/templates/dataExport/dataExport_toMyOrder.html

@@ -673,12 +673,22 @@
 				$('input:radio[name="way"]').click(function() {
 					var checkValue = $('input:radio[name="way"]:checked').val();
 		        	if(checkValue=="微信支付"){
-		        		localStorage.setItem($(".param_id").text(),"wx");
+						if ($(".param_id").text()=="" && $(".order_code_vip").text()!=""){
+							localStorage.setItem($(".order_code_vip").text(),"wx");
+						}
+						if($(".param_id").text()!=""){
+							localStorage.setItem($(".param_id").text(),"wx");
+						}
 		        		$("#wx").prop("checked",true);
 						$("#zfb").prop("checked",false);
 		            	pay_way="wx_app";
 		        	}else{
-		        		localStorage.setItem($(".param_id").text(),"ali");
+						if ($(".param_id").text()=="" && $(".order_code_vip").text()!=""){
+							localStorage.setItem($(".order_code_vip").text(),"ali");
+						}
+						if($(".param_id").text()!=""){
+							localStorage.setItem($(".param_id").text(),"ali");
+						}
 		        		$("#wx").prop("checked",false);
 						$("#zfb").prop("checked",true);
 		        		pay_way="ali_app";
@@ -698,7 +708,6 @@
 			            $.post("/subscribepay/vipsubscribe/orderToPay",{"orderCode":orderCode,"pay_way":pay_way},function(r){
 			            	if(r.success){
 			            		  if(pay_way=="wx_app"){
-									 // TransformationParameters(r.data.res);
 					                  JyObj.wxPay(r.data.res);
 					                }else{
 					                  JyObj.aliPay(r.data.res);
@@ -952,14 +961,31 @@
 				this_e=e;
 			}
 			//vip付款 弹窗
-			function choosePayWay_vip(orderMoney,orderCode,e){
+			function choosePayWay_vip(orderMoney,orderCode,e,way){
 				$(".pay_way").show();
 				$(".money_pay").text("￥"+orderMoney);
 				$(".order_code_vip").text(orderCode);
+				if(localStorage.getItem(orderCode)=="wx"){
+					$("#wx").prop("checked",true);
+					$("#zfb").prop("checked",false);
+					pay_way="wx_app";
+				}else if(localStorage.getItem(orderCode)=="ali"){
+					pay_way="ali_app";
+					$("#zfb").prop("checked",true);
+					$("#wx").prop("checked",false);
+				}else{
+					//没有缓存取 生成订单时的购买方式
+					if(way.indexOf("wx")!=-1){
+						$("#wx").prop("checked",true);
+						$("#zfb").prop("checked",false);
+						pay_way="wx_app";
+					}else{
+						$("#wx").prop("checked",false);
+						$("#zfb").prop("checked",true);
+						pay_way="ali_app";
+					}
+				}
 				
-				$("#wx").prop("checked",true);
-				$("#zfb").prop("checked",false);
-				pay_way="wx_app";
 				this_e=e;
 			}
 		
@@ -1376,6 +1402,7 @@
 								}else{
 									orderMoney_vip=orderMoney_vip1;
 								}
+								var way=obj.pay_way;
 								if(orderStatus_vip==0){
 									orderStatus_vip="待付款"
 									orderHtml=""
@@ -1384,7 +1411,7 @@
 									iconHtml=""
 									iconHtml+='<div class="card-footer">'
 												+'<a  class="btn cancle" onclick="cancelOrder('+id_vip+',this)">取消订单</a>'
-												+'<a href="javascript:void(0)" onclick="choosePayWay_vip(\''+orderMoney_vip+'\',&quot;'+orderCode_vip+'&quot;,this)"  class="gopay_btn pay" filterid="'+obj.filter_id+'" token="'+token_vip+'" id="'+id_vip+'" orderCode='+orderCode_vip+'>去支付</a>'
+												+'<a href="javascript:void(0)" onclick="choosePayWay_vip(\''+orderMoney_vip+'\',&quot;'+orderCode_vip+'&quot;,this,&quot;'+way+'&quot;)"  class="gopay_btn pay" filterid="'+obj.filter_id+'" token="'+token_vip+'" id="'+id_vip+'" orderCode='+orderCode_vip+'>去支付</a>'
 											+'</div>'
 								}else if(orderStatus_vip==1){
 									orderStatus_vip="已完成";

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

@@ -62,7 +62,7 @@
 			<div class="renew_box">
                 <button style="display: none;" class="renew_service">续费</button>
                 <button style="display: none;" class="aginBuy">再次购买</button>
-                <button style="display: none;" class="free_service" onclick="window.location.replace('/jyapp/swordfish/historypush')">使用免费订阅</button>
+                <button style="display: none;" class="free_service" onclick="history.back()">使用免费订阅</button>
             </div>
 		</div>
 		</div>
@@ -72,6 +72,17 @@
     	<script src="/jyapp/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
 		<script src="/jyapp/js/common.js?v={{Msg "seo" "version"}}"></script>
 		<script type="text/javascript">
+			$(function(){ 
+			// 	history.pushState({},"","");
+			// 	window.addEventListener('popstate', function(event){
+			// 		window.location.replace('/jyapp/swordfish/historypush');
+			// 	});
+				// try{
+				// 	JyObj.hiddenBottom("1");
+				// }catch(e){
+				// 	//TODO handle the exception
+				// }
+			});
 			//
 			var orderId = {{.T.orderId}};
 			var starts = {{.T.startTime}};

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

@@ -316,7 +316,7 @@
 	        </div>
 	        <!-- 当状态为待付款时显示去支付按钮 -->
 	        <!--当状态为已取消时显示再次购买按钮-->
-	        <a href="#" class="button align" style="display:none">去支付<span class="cancel_time"></span></a>
+	        <a class="button align" style="display:none">去支付<span class="cancel_time"></span></a>
 	    </div>
 	</div>
 </body>
@@ -338,6 +338,7 @@
 	    });
     }
     $(".orderCode").text(orderCode);
+	$(".order_code_vip").text(orderCode);
     $DoPost("/subscribepay/orderListDetails/getOrderPayAllMsg",{"orderCode":orderCode},function(r){
       if(r.success){
         //下单时间
@@ -545,19 +546,28 @@
           }
           
           //支付方式
-          if(r.data.order.pay_way.indexOf("wx")>-1){
-            $(".line_payway").css("display","");
-            $(".payWay").text("微信支付");
-			pay_way="wx_app"
-          }else if(r.data.order.pay_way.indexOf("ali")>-1){
-            $(".payWay").text("支付宝支付");
-            $(".line_payway").css("display","");
-			pay_way="ali_app"
-          }else{//试用用户
-            $(".invoice").css("display","none");
-            return
-          }
-
+		  if(localStorage.getItem(orderCode)=="wx"){
+			  $(".line_payway").css("display","");
+			  $(".payWay").text("微信支付");
+			  pay_way="wx_app"
+		  }else if (localStorage.getItem(orderCode)=="ali"){
+			  $(".payWay").text("支付宝支付");
+			  $(".line_payway").css("display","");
+			  pay_way="ali_app"
+		  }else{
+			  if(r.data.order.pay_way.indexOf("wx")>-1){
+				$(".line_payway").css("display","");
+				$(".payWay").text("微信支付");
+				pay_way="wx_app"
+			  }else if(r.data.order.pay_way.indexOf("ali")>-1){
+				$(".payWay").text("支付宝支付");
+				$(".line_payway").css("display","");
+				pay_way="ali_app"
+			  }else{//试用用户
+				$(".invoice").css("display","none");
+				return
+			  }
+			}
 		//支付完成跳转 VIP订单
 		function checkPaySuccess_vip(order_vipcode){
 			if(interval_vip){
@@ -644,12 +654,12 @@
 		$('input:radio[name="way"]').click(function() {
 			var checkValue = $('input:radio[name="way"]:checked').val();
 			if(checkValue=="微信支付"){
-				localStorage.setItem($(".param_id").text(),"wx");
+				localStorage.setItem($(".order_code_vip").text(),"wx");
 				$("#wx").prop("checked",true);
 				$("#zfb").prop("checked",false);
 		    	pay_way="wx_app";
 			}else{
-				localStorage.setItem($(".param_id").text(),"ali");
+				localStorage.setItem($(".order_code_vip").text(),"ali");
 				$("#wx").prop("checked",false);
 				$("#zfb").prop("checked",true);
 				pay_way="ali_app";

src/jfw/modules/app/src/web/templates/weixin/about.html

@@ -324,7 +324,7 @@ $(function(){
 				window.location.href = "/jyapp/swordfish/feedback";
 				break;
 			case 1:
-				JyObj.openExternalLink('http://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=1&sn=f9e98da1975f85011ee138a4ee5cfbe8#wechat_redirect','使用帮助');
+				JyObj.openExternalLink('https://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=1&sn=f9e98da1975f85011ee138a4ee5cfbe8#wechat_redirect','使用帮助');
 				break;
 			case 2:
 				$(".share").show();

src/jfw/modules/app/src/web/templates/weixin/historypush.html

@@ -45,7 +45,7 @@ $(function(){
 	if(Number(vipSubtips) === 0&&sessionStorage.vipSubtips==undefined) {
 		history.pushState({},"","");
 		sessionStorage.vipSubtips = "t";
-		window.location.href = "/jyapp/vipsubscribe/renewPage/exprie";
+		window.location.replace("/jyapp/vipsubscribe/renewPage/exprie");
 		return
 	}
   	//===================
@@ -864,6 +864,9 @@ body .loading_ p span {
     overflow: hidden;
     height: 100%;
 }
+html,body{
+	background: #fff;
+}
 </style>
 </head>
 <body>

src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -182,6 +182,9 @@
 	#dqbtn{
 		width: 5.5em !important;
 	}
+	html,body{
+		background: #fff;
+	}
 </style>
 <!--主题内容-->
 <section id="searchIndex" class="hidden">