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

src/jfw/modules/app/src/web/staticres/jyapp/js/wxSupersearch.js

@@ -559,10 +559,10 @@ var SuperSearch = {
 		var thisClass = this;
 		if(flag){
 			if(mySysIsIos()){
-				setTimeout(function(){
+				//setTimeout(function(){
 				$("#supersearchPage input[name=super_searchinput]").focus();
 				thisClass.afterFocus();
-				},300);
+				//},300);
 			}else{
 				setTimeout(function(){
 					$("#supersearchPage input[name=super_searchinput]").focus();

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/keyWord.js

@@ -189,9 +189,10 @@ var reloadFunc = function(){
 
     // 编辑删除
     $('.showKeyWord').on('click', '.deleteKey', function (e) {
-		var _index = Number($(this).next(".ascertainKey").attr("dataindex"));
-        var jQueryDOM = $(this).parents('li')
-        weui.confirm('确定要删除关键词？', {
+		setTimeout(function(){
+			var _index = Number($(this).next(".ascertainKey").attr("dataindex"));
+        	var jQueryDOM = $(this).parents('li')
+        	weui.confirm('确定要删除关键词？', {
             buttons: [{
                 label: '取消',
                 type: 'default',
@@ -231,8 +232,8 @@ var reloadFunc = function(){
                 }
             }]
         });
-        console.log('删除关键词:', $(this).parent().find('textarea').val())
-
+       	 	console.log('删除关键词:', $(this).parent().find('textarea').val())
+		},300)
     })
     // 编辑确定
     // $('.showKeyWord').on('click', '.ascertainKey', function (e) {

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

@@ -263,6 +263,7 @@
                 }
                 
                 //软键盘弹起 
+				/*
 				var oHeight = $(document).height(); //浏览器当前的高度
 				var mainHeight=$("form").height();
 				
@@ -273,6 +274,7 @@
 					    $("#bottombox").css("position","fixed");
 					}
 			   	});
+				*/
             })
             $(document).on("click", ".fp", function() {
                 $.actions({

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

@@ -715,7 +715,7 @@
 					                }
 									canpay=true;
 					                $('.pay_way').hide(200)
-					                checkPaySuccess_vip(data.order);
+					                checkPaySuccess_vip(orderCode);
 			            	}
 	            		})
 						$(".loading_").hide();
@@ -783,12 +783,15 @@
 					}
 					$(".loading_").show();
 					interval_vip=setInterval(function(){
-						$.post("jyapp/isPaySuccess",{code:order_vipcode},function(r){
+						$.post("/jypay/isPaySuccess",{code:order_vipcode},function(r){
 							if(r.success){
-								clearInterval(interval_vip);
-								$(".loading_").hide();
-								setSessionStorage();	
-								window.location.href="/jyapp/vipsubscribe/toPaySuccessPage?orderCode="+order_vipcode;
+								$(".loading_").show();
+								setTimeout(function(){
+									$(".loading_").hide();
+									setSessionStorage();	
+									window.location.href="/jyapp/vipsubscribe/toPaySuccessPage?orderCode="+order_vipcode;
+									clearInterval(interval_vip);
+								})
 							}
 						})
 					},3000)

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

@@ -109,6 +109,9 @@
             position: relative;
             padding-bottom: 1rem;
       }
+	.weui-mask{
+		height: 100vh;
+	}
     </style>
 </head>
 
@@ -316,7 +319,7 @@
 				reloadFunc();
 			}
 			window.addEventListener('popstate', function(event){
-				if(!isinitpage){
+				if(!isinitpage&&!sessionStorage.kwspage){
 					if(a_items.length==0){
 		                window.history.go(-1)
 		            }
@@ -341,6 +344,7 @@
 		                }
 		            }, 500)
 				}
+            	sessionStorage.removeItem("kwspage");
 				isinitpage = false
 			})
             // 关键词分类 - 去设置按钮点击事件
@@ -509,13 +513,22 @@
         //是否有关键词
         function hasWords() {
             var showKeyWordLength = $(".showKeyWord ul").find('li').length;
+			var modifyShow = false
+			$(".showKeyWord li").each(function(){
+				if(!$(this).find(".modify").is(":hidden")){
+					modifyShow = true
+					return false;
+				}
+			})
             if (showKeyWordLength === 0) {
                 $(".content .addkeyWord").show();
 				$(".add-keyword-container .addNewKeyword i").hide();
             } else {
                 $(".content .addkeyWord").hide();
 				setTimeout(function(){
-                	$(".add-keyword-container .addNewKeyword i").show();
+					if(!modifyShow){
+                		$(".add-keyword-container .addNewKeyword i").show();
+					}
 				},300)
             }
         }
@@ -654,7 +667,7 @@
                }
                 kws_name = $.trim($(th).parent(".modify").find("textarea").val());
             }
-			history.replaceState("","","/jyapp/vipsubscribe/toSetKeyWordPage?page=243")
+			history.replaceState("","","/jyapp/vipsubscribe/toSetKeyWordPage?page=123")
             setSesstion();
             window.location.href="/jyapp/vipsubscribe/toSetadditionPage";
         }
@@ -672,7 +685,7 @@
                }
                 kws_name = $.trim($(th).parent(".modify").find("textarea").val());
             }
-			history.replaceState("","","/jyapp/vipsubscribe/toSetKeyWordPage?page=243")
+			history.replaceState("","","/jyapp/vipsubscribe/toSetKeyWordPage?page=234")
             setSesstion();
             window.location.href='/jyapp/vipsubscribe/toSetexclusivePage';
         }
@@ -695,7 +708,6 @@
             if(!sessionStorage){
                 return;
             }
-            sessionStorage.removeItem("kwspage");
             sessionStorage.removeItem("kws_name");
             sessionStorage.removeItem("classify_name");
             sessionStorage.removeItem("kws_index");
@@ -867,7 +879,7 @@
 		    $('.classify-fast-pop').show();
 		}
     </script>
-    <script src="{{Msg "seo" "cdn"}}/jyapp/vipsubscribe/js/keyWord.js?v={{Msg "seo" "version"}}12"></script>
+    <script src="{{Msg "seo" "cdn"}}/jyapp/vipsubscribe/js/keyWord.js?v={{Msg "seo" "version"}}121"></script>
     <script>
 		window.onunload = function() {//离开页面保存关键词修改
 			if(items_str(a_items_m)!=a_items_str){

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

@@ -524,19 +524,14 @@
 	        $(".button.align").css("display","").on("click",function(){//显示去支付按钮
 	         	$("#pay_way").show();
 				if(localStorage.getItem(orderCode)=="wx"){
-							  $(".line_payway").css("display","");
-							  $(".payWay").text("微信支付");
-							  pay_way="wx_app"
-							  $("#wx").prop("checked",true);
-							  $("#zfb").prop("checked",false);
+				  pay_way="wx_app"
+				  $("#wx").prop("checked",true);
+				  $("#zfb").prop("checked",false);
 				}else if (localStorage.getItem(orderCode)=="ali"){
-							  $(".payWay").text("支付宝支付");
-							  $(".line_payway").css("display","");
-							  $("#wx").prop("checked",false);
-							  $("#zfb").prop("checked",true);
-							  pay_way="ali_app"
-				}else{
-					}
+				  $("#wx").prop("checked",false);
+				  $("#zfb").prop("checked",true);
+				  pay_way="ali_app"
+				}
 	        })
         }else if (r.data.order.order_status==1){
           $("#pageTitle").text("已完成");

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

@@ -19,7 +19,7 @@
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/vipsubscribe/iconfont/iconfont.css" />
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}" />
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/vipsubscribe/css/public.css?v={{Msg "seo" "version"}}">
-<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/vipsubscribe/css/subscribe_list.css?v={{Msg "seo" "version"}}11">
+<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/vipsubscribe/css/subscribe_list.css?v={{Msg "seo" "version"}}113">
 <script>
 //
 
@@ -419,8 +419,8 @@ function structureHtml(object,showAd){
 		var	industryname = "";
 		var industryListname ="";
 		if(ca_isvip){
-			if(obj.ca_buyerclass!=null&&obj.ca_buyerclass!=""){
-				industryname=obj.ca_buyerclass
+			if(obj.buyerclass!=null&&obj.buyerclass!=""){
+				industryname=obj.buyerclass
 				industryListname='<span class="buyerclass">'+industryname+'</span>';
 			}
 		}else{
@@ -927,7 +927,7 @@ html,body{
 			             	</div>
 			        </div>
 			        <div class="screen"></div>
-			        <div class="area_container">
+			        <div class="area_container"  style="clear:both;padding: 0px 10px;flex: 1;overflow-y: scroll;">
 			          	<section class="area_wrap">
 			          		<div class="area_data">
 			          			<!-- 这里省份的顺序，和下面省份的顺序对应 -->
@@ -1394,4 +1394,4 @@ function AdClick(e,isExternal,link,title){
            
     })
    </script>
-</html>
+</html>

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

@@ -14,7 +14,7 @@
 <script src="/jyapp/mobiscroll/mobiscroll.min.js"></script>
 <script src="/jyapp/js/dropload.js?v={{Msg "seo" "version"}}12223"></script>
 <script type="text/javascript" src="/jyapp/js/wxEntsesearch.js?v={{Msg "seo" "version"}}"></script>
-<script type="text/javascript" src="/jyapp/js/wxSupersearch.js?v={{Msg "seo" "version"}}32"></script>
+<script type="text/javascript" src="/jyapp/js/wxSupersearch.js?v={{Msg "seo" "version"}}1"></script>
 <script type="text/javascript" src="/jyapp/js/bootstrap.min.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript" src="/jyapp/js/popup/tap.js?v={{Msg "seo" "version"}}1"></script>
 <!--2.8-->
@@ -948,7 +948,7 @@
 	    });
 		//查询是否开通超级搜索和中标企业搜索
 	    $.post("/jyapp/jylab/supsearch/getstatus?t="+new Date().getTime(),function(result){
-			$("#searchIndex .inp-search").unbind("touchend").on("touchend",function () {
+			$("#searchIndex .inp-search").unbind("click").on("click",function () {
 		        SuperSearch.init(true,true,true);
 		    });
 			userId = result.userId;

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

@@ -409,12 +409,21 @@
         //是否有关键词
         function hasWords() {
             var showKeyWordLength = $(".showKeyWord ul").find('li').length;
+			var modifyShow = false
+			$(".showKeyWord li").each(function(){
+				if(!$(this).find(".modify").is(":hidden")){
+					modifyShow = true
+					return false;
+				}
+			})
             if (showKeyWordLength === 0) {
                 $(".content .addkeyWord").show();
 				$(".add-keyword-container .addNewKeyword i").hide();
             } else {
                 $(".content .addkeyWord").hide();
-				$(".add-keyword-container .addNewKeyword i").show();
+				if(!modifyShow){
+					$(".add-keyword-container .addNewKeyword i").show();
+				}
             }
         }
         //修改关键词内容