Эхлэл Бүгдийг харах Тусламж
Нэвтрэх
qmx
/
jy
14
0
Салаа 0
Файлууд Асуудлууд 2 Хуулах хүсэлтүүд 0 Мэдлэгийн сан
Эх сурвалжийг харах

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

zhangxinlei1996 5 жил өмнө
parent
ebd6d06427 0113c6cddf
commit
8bb243acd9
7 өөрчлөгдсөн 26 нэмэгдсэн , 24 устгасан
Өөрчлөллтийг нэгтгэж харах Өөрчлөлтийн статистик харах
  1. 1 1
      src/jfw/modules/app/src/web/staticres/jyapp/js/wxSupersearch.js
  2. 1 1
      src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/keyWord.js
  3. 1 1
      src/jfw/modules/app/src/web/templates/vipsubscribe/keyWord.html
  4. 6 6
      src/jfw/modules/app/src/web/templates/vipsubscribe/renew_notice.html
  5. 1 1
      src/jfw/modules/app/src/web/templates/weixin/about.html
  6. 3 6
      src/jfw/modules/app/src/web/templates/weixin/historypush.html
  7. 13 8
      src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

+ 1 - 1
src/jfw/modules/app/src/web/staticres/jyapp/js/wxSupersearch.js
Файл харах 

@@ -222,7 +222,7 @@ var SuperSearch = {
 
 				});
 
 				});
 
 				if(rFlag){
 
 				if(rFlag){
 
 					SuperSearch.setSessionStorage();
 
 					SuperSearch.setSessionStorage();
 
-					window.location.href = "/front/vipsubscribe/toSetKeyWordPage";
 
+					window.location.href = "/jyapp/vipsubscribe/toSetKeyWordPage";
 
 				}
 
 				}
 
 			}else{
 
 			}else{
 
 				$.ajax({
 
 				$.ajax({

+ 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()
 
         $('.classify-edit-pop').hide()
 
         $('input.classify-keyword').val('')
 
         $('input.classify-keyword').val('')
 
     })
 
     })

+ 1 - 1
src/jfw/modules/app/src/web/templates/vipsubscribe/keyWord.html
Файл харах 

@@ -867,7 +867,7 @@
 
 		    $('.classify-fast-pop').show();
 
 		    $('.classify-fast-pop').show();
 
 		}
 
 		}
 
     </script>
 
     </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>
 
     <script>
 
 		window.onunload = function() {//离开页面保存关键词修改
 
 		window.onunload = function() {//离开页面保存关键词修改
 
 			if(items_str(a_items_m)!=a_items_str){
 
 			if(items_str(a_items_m)!=a_items_str){

+ 6 - 6
src/jfw/modules/app/src/web/templates/vipsubscribe/renew_notice.html
Файл харах 

@@ -26,7 +26,7 @@
 
 	</style>
 
 	</style>
 
 	<body>
 
 	<body>
 
 		<div class="app-layout-header">
 
 		<div class="app-layout-header">
 
-	        <!-- <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span> -->
 
+	        <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
 
 	        VIP订阅
 
 	        VIP订阅
 
 	    </div>
 
 	    </div>
 
 	    <div class="app-layout-content-b">
 
 	    <div class="app-layout-content-b">
 
@@ -77,11 +77,11 @@
 
 			// 	window.addEventListener('popstate', function(event){
 
 			// 	window.addEventListener('popstate', function(event){
 
 			// 		window.location.replace('/jyapp/swordfish/historypush');
 
 			// 		window.location.replace('/jyapp/swordfish/historypush');
 
 			// 	});
 
 			// 	});
 
-				try{
 
-					JyObj.hiddenBottom("1");
 
-				}catch(e){
 
-					//TODO handle the exception
 
-				}
 
+				// try{
 
+				// 	JyObj.hiddenBottom("1");
 
+				// }catch(e){
 
+				// 	//TODO handle the exception
 
+				// }
 
 			});
 
 			});
 
 			//
 
 			//
 
 			var orderId = {{.T.orderId}};
 
 			var orderId = {{.T.orderId}};

+ 1 - 1
src/jfw/modules/app/src/web/templates/weixin/about.html
Файл харах 

@@ -324,7 +324,7 @@ $(function(){
 
 				window.location.href = "/jyapp/swordfish/feedback";
 
 				window.location.href = "/jyapp/swordfish/feedback";
 
 				break;
 
 				break;
 
 			case 1:
 
 			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;
 
 				break;
 
 			case 2:
 
 			case 2:
 
 				$(".share").show();
 
 				$(".share").show();

+ 3 - 6
src/jfw/modules/app/src/web/templates/weixin/historypush.html
Файл харах 

@@ -43,9 +43,9 @@ $(function(){
 
 	//到期提醒页面
 
 	//到期提醒页面
 
 	var vipSubtips = {{.T.vipSubtips}};
 
 	var vipSubtips = {{.T.vipSubtips}};
 
 	if(Number(vipSubtips) === 0&&sessionStorage.vipSubtips==undefined) {
 
 	if(Number(vipSubtips) === 0&&sessionStorage.vipSubtips==undefined) {
 
-		// history.pushState({},"","");
 
+		history.pushState({},"","");
 
 		sessionStorage.vipSubtips = "t";
 
 		sessionStorage.vipSubtips = "t";
 
-		window.location.href = "/jyapp/vipsubscribe/renewPage/exprie";
 
+		window.location.replace("/jyapp/vipsubscribe/renewPage/exprie");
 
 		return
 
 		return
 
 	}
 
 	}
 
   	//===================
 
   	//===================
 
@@ -66,9 +66,6 @@ var words = ""
 
 var isInTSguide=false;//订阅向导
 
 var isInTSguide=false;//订阅向导
 
 var isVipSub=false;//是不是VIP
 
 var isVipSub=false;//是不是VIP
 
 var firstTime = {{.T.selectTime}};
 
 var firstTime = {{.T.selectTime}};
 
-if (firstTime!=""){
 
-	firstTime = firstTime+"000";
 
-}
 
 var isPassCount = false; //提示信息
 
 var isPassCount = false; //提示信息
 
 var haskey = false;//是否有关键词
 
 var haskey = false;//是否有关键词
 
 var isOnTail = false;//是否在试用
 
 var isOnTail = false;//是否在试用
 
@@ -135,7 +132,7 @@ function initpage(){
 
 		showPage();
 
 		showPage();
 
 	}else{
 
 	}else{
 
 		userId = sessionStorage.userId;
 
 		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");
 
 			firstTime = sessionStorage.getItem(userId+"_searchTime");
 
 		}
 
 		}
 
 		if(sessionStorage.getItem(userId+"_selectCity")!=null&&sessionStorage.getItem(userId+"_selectCity")!=""){
 
 		if(sessionStorage.getItem(userId+"_selectCity")!=null&&sessionStorage.getItem(userId+"_selectCity")!=""){

+ 13 - 8
src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html
Файл харах 

@@ -45,14 +45,6 @@
 
 		$('.app-layout-content-b').css({"overflow":"auto"});
 
 		$('.app-layout-content-b').css({"overflow":"auto"});
 
     }
 
     }
 
 	$(function(){
 
 	$(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){
 
         $('.selected-export .options').on('tap', 'span',function(e){
 
             var index = $(this).attr('index')  // index可以表示当前点击的是哪个按钮
 
             var index = $(this).attr('index')  // index可以表示当前点击的是哪个按钮
 
@@ -190,6 +182,9 @@
 
 	#dqbtn{
 
 	#dqbtn{
 
 		width: 5.5em !important;
 
 		width: 5.5em !important;
 
 	}
 
 	}
 
+	html,body{
 
+		background: #fff;
 
+	}
 
 </style>
 
 </style>
 
 <!--主题内容-->
 
 <!--主题内容-->
 
 <section id="searchIndex" class="hidden">
 
 <section id="searchIndex" class="hidden">
 
@@ -239,6 +234,16 @@
 
 					$(".home_banner .swiper-wrapper").html(adhtml);
 
 					$(".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>
 
 		</script>
 
         <!-- 导航菜单 -->
 
         <!-- 导航菜单 -->
 
         <div class="home_tab">
 
         <div class="home_tab">