样式 修改

src/jfw/modules/subscribepay/src/service/afterPay.go

@@ -113,10 +113,10 @@ func (a *AfterPay) SetUserInfo() error {
 					var _key = make(map[string]interface{})
 					var a_key = make([]map[string]interface{}, 1)
 					var o_kws = make(map[string]interface{})
-					if kws_name == "" {
-						kws_name = "未分类"
+					if classify_name == "" {
+						classify_name = "未分类"
 					}
-					o_kws["s_item"] = kws_name
+					o_kws["s_item"] = classify_name
 					_key["key"] = _kws
 					_key["appendkey"] = addtion_kws
 					_key["notkey"] = not_kws

src/web/staticres/vipsubscribe/css/vip_index.css

@@ -557,7 +557,7 @@
 }
 
 .vip_index .content .subscribe_info .s_info_top .s_i_item label {
-  width: 1.56rem;
+  width: 1.6rem;
 }
 
 .vip_index .content .subscribe_info .s_info_top .s_i_item span {
@@ -723,6 +723,6 @@
 i.icon-wenhao{
 	font-size: .32rem;
     color: #2CB7CA;
-    padding-top: .05rem;
+/*    padding-top: .05rem;*/
     margin-left: .2rem;
 }

src/web/staticres/vipsubscribe/js/keyWord.js

@@ -41,6 +41,14 @@ $(function () {
     // 添加 确认按钮的点击事件
     $('.content .addkeyWord .btn button').on('click', function () {
         var keyWord = $('.addkeyWord input.enterOne').val();
+		if($.inArray(keyWord, kws_arr)>-1){
+            weui.toast('您设置的关键词已存在，请调整后再添加。', {
+                duration: 2000,
+                className: 'custom-toast',
+                callback: function () { console.log('close') }
+            });
+			return
+		}
         kws_name = keyWord;
         kws_index = $(".showKeyWord li").length;
         if(kws_index==0){
@@ -51,7 +59,11 @@ $(function () {
         //保存关键词
         kws_count = parseInt(kws_count) + 1;
         if(kws_count>300){
-            alert("您设置的关键词已超出最高上限，请调整后再添加。")
+            weui.toast('您设置的关键词已超出最高上限，请调整后再添加。', {
+                duration: 2000,
+                className: 'custom-toast',
+                callback: function () { console.log('close') }
+            });
         }else if (saveData("SK")){
             $(".add-keyword-container .addNewKeyword").show();
             //点击保存关键词，查看缓存中存的附加词 和排除词。
@@ -173,7 +185,11 @@ $(function () {
                         $('.addKeyWord').show();
                         doSessionData('DK');
                     }else{
-                        alert("无法删除")
+			            weui.toast('无法删除', {
+			                duration: 2000,
+			                className: 'custom-toast',
+			                callback: function () { console.log('close') }
+			            });
                     }
                 }
             }]
@@ -246,7 +262,11 @@ $(function () {
         }
         //分类名称是否已存在
         if($.inArray(classify_name, classify_arr)>-1){
-            alert("此分类名称已存在！")
+            weui.toast('此分类名称已存在', {
+                duration: 2000,
+                className: 'custom-toast',
+                callback: function () { console.log('close') }
+            });
             return
         }
         $(this).removeClass("opacity6");

src/web/templates/weixin/historypush.html

@@ -478,16 +478,6 @@
 			newredirect(zbadd,h,eid,"subkey_"+sds,index);
 		}
 		//
-		function tointroducepage(){
-			setSessionStorage();
-			window.location.href = "/front/vipsubscribe/introducePage";
-		}
-		//
-		function tosetkeyspage(){
-			setSessionStorage();
-			window.location.href="/front/vipsubscribe/toSetPage";
-		}
-		//
 		function ajaxFun(time,area){
 			$.ajax({
 				type: 'post',
@@ -604,6 +594,21 @@
 	    	$(obj).parent().prev().css("border-bottom","1px solid #e5e6e9");
 			$(obj).parent().remove();
 	  	}
+		//介绍页
+		function tointroducepage(){
+			setSessionStorage();
+			window.location.href = "/front/vipsubscribe/introducePage";
+		}
+		//vip设置
+		function tosetkeyspage(){
+			setSessionStorage();
+			window.location.href="/front/vipsubscribe/toSetPage";
+		}
+		//续费
+		function torepay(){
+			setSessionStorage();
+			window.location.href="/weixin/pay/renewPayPage";
+		}
 	</script>
 	<style type="text/css">
 		.findnull{
@@ -763,7 +768,7 @@
 					<img src="/vipsubscribe/image/v.png" alt="v">
 					<h4>剑鱼标讯 VIP订阅</h4>
 				</div>
-				<a onclick="tointroducepage()" class="right">了解详情 > </a>
+				<a onclick="tointroducepage()" class="right" style="text-decoration: none;">了解详情 > </a>
 			</div>
 		</div>
 		<!-- 筛选条件 -->
@@ -788,7 +793,7 @@
                   	</div>
               	</div>
               	<div class="vip_set" style="display: none;">
-              		<a onclick="tosetkeyspage()" class="vip_set_box">
+              		<a onclick="tosetkeyspage()" class="vip_set_box"  style="text-decoration: none;">
               			<span class="free7days_pic"></span>
               			<span style="text-decoration: none;">VIP订阅设置</span>
               		</a>
@@ -831,7 +836,7 @@
       			<div class="remind_text">
       				本次推送已达50条信息上限！开通VIP订阅，支持每天最多推送2000条信息
       			</div>
-      			<a href="vip_introduce.html" class="remind_btn">了解详情</a>
+      			<a  onclick="tointroducepage()" class="remind_btn"  style="text-decoration: none;">了解详情</a>
       		</div>
       	</div>
       	<!-- 推送 -->
@@ -841,7 +846,7 @@
       		<div>
       			<i class="icon iconfont" id="close_renew">&#xe61a;</i>
       			<span>VIP订阅服务还有 <span class="isExpire"></span> 天到期，请及时续费！</span>
-      			<a href="vip_renew.html">去续费</a>
+      			<a onclick="torepay()">去续费</a>
       		</div>
       	</div>
       	<!-- 设置关键词 -->
@@ -849,7 +854,7 @@
       		<div>
       			<i class="icon iconfont" id="close_set">&#xe61a;</i>
       			<span>您未设置关键词，设置后接收信息更精准！</span>
-      			<a href="#">去设置</a>
+      			<a onclick="tosetkeyspage()"  style="text-decoration: none;">去设置</a>
       		</div>
       	</div>
       </div>
@@ -936,6 +941,7 @@
 		        	type: 'primary',
 		        	onClick: function () {
 		        		console.log('确定')
+						tosetkeyspage();
 		        	}
 		        },
 		        {
@@ -976,7 +982,6 @@
             // 点击选择时间
             $('#showDatePicker').on('click', function () {
             	var that = this
-
             	$(that).find('.time_result').addClass('current')
             	weui.datePicker({
             		id: '1',
@@ -999,6 +1004,7 @@
                 // 修改标题
                 // $('.jymobile-datePicker .weui-picker__hd a[data-action=cancel]')
                 $('.jymobile-datePicker .weui-picker__hd a:first').removeClass('weui-picker__action').addClass('jymobile-picker__action').text('选择时间')
+				$("#weui-picker-confirm").css("text-decoration","none");
                 // 如果没有选择，不会出现 '查看全部时间'
                 var timeResultBox = $(that).find('.time_result')
                 var timeResult = timeResultBox.text()

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

@@ -251,6 +251,7 @@
         var addition_kws = []; //附加词
         var not_kws = []; //排除词
         var classify_arr = [];//分类对象
+        var kws_arr = [];//所有关键词对象
         var kws_tips = 0;
         // 页面状态
         var pageState = {
@@ -365,6 +366,7 @@
                         keystr += "、"
                     }
                     keystr += a_key[j]["key"].join('、');
+					kws_arr = kws_arr.concat(a_key[j]["key"])
                 } 
                 classifyHtml +='<li class="classify-item">'
                             +'<div><span class="classify-item-l">'+s_item+'</span>'
@@ -565,6 +567,14 @@
         function saveK(th,i){
             var $this = $(th);
             kws_name = $(th).siblings('textarea').val();
+			if($.inArray(kws_name, kws_arr)>-1){
+                weui.toast('您设置的关键词已存在，请调整后再添加。', {
+                    duration: 2000,
+                    className: 'custom-toast',
+                    callback: function () { console.log('close') }
+                });
+				return
+			}
             if(kws_name.length > 20){
                 weui.toast('关键词不能超过20字', {
                     duration: 2000,
@@ -579,7 +589,11 @@
                     //
                     doSessionData();
                 }else{
-                    alert("保存出错，稍后再试")
+		            weui.toast('保存出错，稍后再试', {
+		                duration: 2000,
+		                className: 'custom-toast',
+		                callback: function () { console.log('close') }
+		            });
                 }
             }
         }
@@ -647,7 +661,7 @@
             not_kws = [];
         }
     </script>
-    <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/keyWord.js?v={{Msg "seo" "version"}}"></script>
+    <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/keyWord.js?v={{Msg "seo" "version"}}1"></script>
     <script>
         // 设置一条空记录，用户第一次进入添加关键词点击确定时候调用
         function setEmptyHistory() {

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

@@ -18,7 +18,7 @@
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/vip_index.css?v={{Msg "seo" "version"}}">
 </head>
 
-<body>
+<body style="visibility:hidden;">
     <div class="vip_index">
         <div class="header" style="display: none;">
             <img class="header_left" src="/vipsubscribe/image/left.png?v={{Msg "seo" "version"}}" alt="" onclick="javascript:history.back(-1);">
@@ -150,9 +150,63 @@
 		initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}});
 		var checkedflag = true;
         $(function () {
+			var isinitpage = false;
+			$(window).bind("pageshow", function(event){
+				if(event.originalEvent.persisted){
+					getuserinfo();
+					isinitpage = true;
+				}
+			});
 			//
-			let isChecked = false; //默认是否开通自动续费
-            //获取用户信息
+			let isChecked = false; //是否开通项目匹配
+			if(!isinitpage){
+            	getuserinfo();
+			}
+            //
+			$("i.icon-wenhao").on("click",function(){
+                $('.custom-dialog').show()
+                $('.weui-dialog__btn_primary').on('click', function () {
+                    $('.custom-dialog').hide()
+                })
+			})
+            if (isChecked === true) {
+                $('.switch').addClass('checked')
+            } else {
+                $('.switch').removeClass('checked')
+            }
+            $('.switch').on('click', function (e) {
+                console.log($(this).hasClass('checked'))
+                let that = this;
+                let hasChecked = $(this).hasClass('checked');
+                if (hasChecked == false) {
+                    isChecked = true;
+                    $(that).addClass('checked');
+                    weui.toast('项目匹配已开启',{
+                        duration: 3000,
+                        className: 'custom-toast',
+                    })
+					setprojectmatch(1);
+                } else {
+                    isChecked = false;
+                    $(that).removeClass('checked');
+                    $('.custom-dialog').hide()
+                    // $('#auto_renew').hide(500);
+                    weui.toast('项目匹配已关闭',{
+                        duration: 3000,
+                        className: 'custom-toast',
+                    })
+					setprojectmatch(0);
+                }
+            })
+            
+            $('#close_renew').on('click', () => {
+                $('.renew_toast').hide()
+            })
+        })
+		//
+		function getuserinfo(){
+			weui.loading();
+			//获取用户信息
 			$.ajax({  
              	type: "POST",  
              	url: "/subscribepay/afterPay/getUserInfo",   
@@ -209,51 +263,13 @@
 	                            }
 	                        }
 	                        $("#keywords").text(s_items);
-                   }
-                	}
+                   		}
+						$("body").css("visibility","");
+		            	weui.loading().hide();
+					}
 				}
            })
-            //
-			$("i.icon-wenhao").on("click",function(){
-                $('.custom-dialog').show()
-                $('.weui-dialog__btn_primary').on('click', function () {
-                    $('.custom-dialog').hide()
-                })
-			})
-            if (isChecked === true) {
-                $('.switch').addClass('checked')
-            } else {
-                $('.switch').removeClass('checked')
-            }
-            $('.switch').on('click', function (e) {
-                console.log($(this).hasClass('checked'))
-                let that = this;
-                let hasChecked = $(this).hasClass('checked');
-                if (hasChecked == false) {
-                    isChecked = true;
-                    $(that).addClass('checked');
-                    weui.toast('项目匹配已开启',{
-                        duration: 3000,
-                        className: 'custom-toast',
-                    })
-					setprojectmatch(1);
-                } else {
-                    isChecked = false;
-                    $(that).removeClass('checked');
-                    $('.custom-dialog').hide()
-                    // $('#auto_renew').hide(500);
-                    weui.toast('项目匹配已关闭',{
-                        duration: 3000,
-                        className: 'custom-toast',
-                    })
-					setprojectmatch(0);
-                }
-            })
-            
-            $('#close_renew').on('click', () => {
-                $('.renew_toast').hide()
-            })
-        })
+		}
 		//
 		function setprojectmatch(index){
 			if(checkedflag){

src/web/templates/weixin/wxkeyset/index.html

@@ -288,6 +288,10 @@ $(function(){
 			$(".keyWordGroup:eq("+focusinputindex+") .keyword").blur();
         }
     }
+	//
+	if(isIOS){
+		$("#ten").css("margin-bottom","1rem");
+	}
 });
 //
 function dissurp(){
@@ -679,7 +683,6 @@ function saveSeniorset(r){
 }
 //
 function tointroducepage(){
-	setSessionStorage();
 	window.location.href = "/front/vipsubscribe/introducePage";
 }
 
@@ -811,7 +814,7 @@ function tointroducepage(){
 				<img src="{{Msg "seo" "cdn"}}/images/wxkeyset/set3.png" class="set3">
 			</span>
 		</div>
-		<div class="keyWordGroup">
+		<div class="keyWordGroup" id="ten">
 			<lable>10</lable>
 			<div class="keyWordDiv">
 				<input type="text" maxlength="100" class="keyword" placeholder="请输入关键词">