wangshan 5 years ago
parent
commit
2c1fe00d72

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

@@ -413,7 +413,7 @@ var reloadFunc = function(){
     })
 
     // 关键词分类 - 取消按钮点击事件
-    $('.classify-edit-pop .dialog__btn_cancel').on('tap', function() {
+    $('.classify-edit-pop .dialog__btn_cancel').on('click', function() {
         $('.classify-edit-pop').hide()
         $('input.classify-keyword').val('')
     })

+ 1 - 1
src/jfw/modules/app/src/web/templates/vipsubscribe/keyWord.html

@@ -867,7 +867,7 @@
 		    $('.classify-fast-pop').show();
 		}
     </script>
-    <script src="{{Msg "seo" "cdn"}}/jyapp/vipsubscribe/js/keyWord.js?v={{Msg "seo" "version"}}2311"></script>
+    <script src="{{Msg "seo" "cdn"}}/jyapp/vipsubscribe/js/keyWord.js?v={{Msg "seo" "version"}}12"></script>
     <script>
 		window.onunload = function() {//离开页面保存关键词修改
 			if(items_str(a_items_m)!=a_items_str){

+ 1 - 4
src/jfw/modules/app/src/web/templates/weixin/historypush.html

@@ -66,9 +66,6 @@ var words = ""
 var isInTSguide=false;//订阅向导
 var isVipSub=false;//是不是VIP
 var firstTime = {{.T.selectTime}};
-if (firstTime!=""){
-	firstTime = firstTime+"000";
-}
 var isPassCount = false; //提示信息
 var haskey = false;//是否有关键词
 var isOnTail = false;//是否在试用
@@ -135,7 +132,7 @@ function initpage(){
 		showPage();
 	}else{
 		userId = sessionStorage.userId;
-		if(sessionStorage.getItem(userId+"_searchTime")!=null&&sessionStorage.getItem(userId+"_searchTime")!=""){
+		if(window.location.href.indexOf("selectTime")<0&&sessionStorage.getItem(userId+"_searchTime")!=null&&sessionStorage.getItem(userId+"_searchTime")!=""){
 			firstTime = sessionStorage.getItem(userId+"_searchTime");
 		}
 		if(sessionStorage.getItem(userId+"_selectCity")!=null&&sessionStorage.getItem(userId+"_selectCity")!=""){

+ 10 - 8
src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -45,14 +45,6 @@
 		$('.app-layout-content-b').css({"overflow":"auto"});
     }
 	$(function(){
-		//dev2.8.5
-        var swiper1 = new Swiper('#swiper1',{
-            autoplay: 3000,
-            effect: 'fade',
-            pagination: '.swiper-pagination',
-            paginationClickable: true,
-            loop: true,
-        });
         // 搜索选择的显示隐藏
         $('.selected-export .options').on('tap', 'span',function(e){
             var index = $(this).attr('index')  // index可以表示当前点击的是哪个按钮
@@ -239,6 +231,16 @@
 					$(".home_banner .swiper-wrapper").html(adhtml);
 				}
 			}
+			$(function(){
+				//dev2.8.5
+		        var swiper1 = new Swiper('#swiper1',{
+		            autoplay: 3000,
+		            effect: 'fade',
+		            pagination: '.swiper-pagination',
+		            paginationClickable: true,
+		            loop: true,
+		        });
+			})
 		</script>
         <!-- 导航菜单 -->
         <div class="home_tab">