wangshan 5 年之前
父节点
当前提交
091281c98c

+ 1 - 0
src/web/staticres/vipsubscribe/css/keyWord.css

@@ -145,6 +145,7 @@
     -webkit-line-clamp: 1;
     -webkit-box-orient: vertical;
     width: 4rem;
+	text-align:right;
 }
 
 .keyWord .all-classify-column .classify-list .classify-item .classify-item-r {

+ 1 - 1
src/web/staticres/vipsubscribe/css/subscribe_list.css

@@ -342,7 +342,7 @@ text-decoration: none;
   top: 0.88rem;
   bottom: 0;
   width: 100%;
-  height: calc(100vh - 1.82rem);
+  height: calc(100vh - 0.82rem);
   margin-left: -0.3rem;
   background: #000;
   opacity: 0.5;

+ 2 - 15
src/web/staticres/vipsubscribe/js/keyWord.js

@@ -255,20 +255,7 @@ var reloadFunc = function(){
 
     // 显示关键词分类弹框
     $('.classify-r').on('click', function(){
-        // 如果是苹果手机,打开时候要设置top
-        var agent = navigator.userAgent.toLowerCase();
-        var dialog = $('.classify-edit-pop .weui-dialog')
-        if( /iphone|ipod|ipad|ios/.test(agent) ){
-            dialog.css({ 'top': '30%' })
-        } else {
-            dialog.css({ 'top': '50%' })
-        }
-        $('.classify-edit-pop').show()
-        var currentClassifyName = $(this).find('.classify-detail').text()
-        if(currentClassifyName=="未分类"){
-            currentClassifyName = ""
-        }
-        $('input.classify-keyword').val(currentClassifyName).focus()
+		modalOne();
     })
     //
 
@@ -318,4 +305,4 @@ var reloadFunc = function(){
         $('.classify-edit-pop').hide()
         $('input.classify-keyword').val('')
     })
-}
+}

+ 14 - 5
src/web/templates/weixin/historypush.html

@@ -606,10 +606,15 @@
 			window.location.href = "/front/vipsubscribe/introducePage";
 		}
 		//vip设置
-		function tosetkeyspage(){
+		function tosetpage(){
 			setSessionStorage();
 			window.location.href="/front/vipsubscribe/toSetPage";
 		}
+		//vip关键词设置
+		function tosetkeyspage(){
+			setSessionStorage();
+			window.location.href="/front/vipsubscribe/toSetKeyWordPage";
+		}
 		//续费
 		function torepay(){
 			setSessionStorage();
@@ -747,9 +752,6 @@
 		.overClass{
 			overflow: hidden;
 		}
-		.filter_tab .screen{
-			top:1.88rem;
-		}
 		.buyerclass {
 		    border: 1px solid #CFAD89;
 		    background: #CFAD89;
@@ -804,7 +806,7 @@
                   	</div>
               	</div>
               	<div class="vip_set" style="display: none;">
-              		<a onclick="tosetkeyspage()" class="vip_set_box"  style="text-decoration: none;">
+              		<a onclick="tosetpage()" class="vip_set_box"  style="text-decoration: none;">
               			<span class="free7days_pic"></span>
               			<span style="text-decoration: none;">VIP订阅设置</span>
               		</a>
@@ -993,8 +995,15 @@
         		ajaxFun("",selectCity);
         	}
         }
+		//禁止默认行为方法
+		function stopScroll(e) {
+		    e.preventDefault()
+		}
         //
         $(function () { 
+			document.querySelector('.screen').addEventListener('touchmove', stopScroll, false);
+			document.querySelector('.tab_left').addEventListener('touchmove', stopScroll, false);
+			document.querySelector('.tab_right').addEventListener('touchmove', stopScroll, false);
 			if(firstTime!=""){
 				date = formatDate(firstTime/1000,"1");
         	}

+ 21 - 9
src/web/templates/weixin/vipsubscribe/keyWord.html

@@ -311,15 +311,7 @@
             $('.classify-show-pop .dialog__btn_confirm').on('click', function() {
                 $('.classify-show-pop').hide();
                 setTimeout(function(){
-                    // 如果是苹果手机,打开时候要设置top
-                    var agent = navigator.userAgent.toLowerCase();
-                    var dialog = $('.classify-edit-pop .weui-dialog')
-                    if( /iphone|ipod|ipad|ios/.test(agent) ){
-                        dialog.css({ 'top': '30%' })
-                    } else {
-                        dialog.css({ 'top': '50%' })
-                    }
-                    $('.classify-edit-pop').show();
+                    modalOne();
                 },200)
             })
             // 关键词分类 - 取消按钮点击事件
@@ -728,6 +720,23 @@
                 }
             }
         }
+		//
+		function modalOne(){
+		    // 如果是苹果手机,打开时候要设置top
+		    var agent = navigator.userAgent.toLowerCase();
+		    var dialog = $('.classify-edit-pop .weui-dialog')
+		    if( /iphone|ipod|ipad|ios/.test(agent) ){
+		        dialog.css({ 'top': '30%' })
+		    } else {
+		        dialog.css({ 'top': '50%' })
+		    }
+		    $('.classify-edit-pop').show()
+		    var currentClassifyName = $(".classify").find('.classify-detail').text()
+		    if(currentClassifyName.indexOf("未分类")>-1){
+		        currentClassifyName = ""
+		    }
+		    $('input.classify-keyword').val(currentClassifyName).focus()
+		}
     </script>
     <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/keyWord.js?v={{Msg "seo" "version"}}21"></script>
     <script>
@@ -770,6 +779,9 @@
                 $(".enter.addkeyWord").find("input").val("");
                 $(".enter.addkeyWord").show();
                 $(".add-keyword-container .addNewKeyword").hide();
+                setTimeout(function(){
+                    modalOne();
+                },200)
             })
             // 通过判断是那个隐藏来判断是添加关键词还是添加新分类
             $(".addNewKeyword i").on('click', function () {