xiugai

src/jfw/modules/app/src/web/staticres/jyapp/css/layout.css

@@ -11,6 +11,7 @@
     left: 0;
     right: 0;
     top: 0;
+	color: #444444;
 }
 .app-layout-header>.app-back{
 	position: absolute;
@@ -22,6 +23,7 @@
     padding-right: 0.36rem;
     top: 5px;
     bottom: 0px;
+	color: #444444;
 }
 .app-layout-content-a,.app-layout-content-b{
     margin-top: 1.1rem;

src/jfw/modules/app/src/web/staticres/jyapp/css/wxkeyset.css

@@ -148,7 +148,7 @@ html.hidden,body.hidden,.keysetpage .keyWordContent.adjustment{
 	background-color: #fff;
 }
 .keysetpage{
-	height: 100%;
+	/*height: 100%;*/
 }
 .keysetpage .brace{
 	height: 150px;

src/jfw/modules/app/src/web/staticres/jyapp/me/css/forgetPwd.css

@@ -4,13 +4,13 @@ body {
 }
 
 .register {
-  border-top: 1px solid #E6E6E6;
   margin-top: 0.35rem;
 }
 
 .register .registerMain {
   background: #fff;
   border-bottom: 1px solid #E6E6E6;
+  border-top: 1px solid #E6E6E6;
 }
 .register .registerMain .code>span{
 	font-size: 0.32rem;
@@ -33,10 +33,17 @@ body {
 	height: 30px;
 }
 .register .registerMain .code>div:nth-child(1){
-   width: 3%;
+   width: 5%;
 }
 .register .registerMain .code>div:nth-child(2){
-   width: 62%;
+   width: 60%;
+   border-bottom: 1px solid #E6E6E6;
+}
+.register .registerMain .captcha{
+	border-bottom: 1px solid #E6E6E6;
+}
+.register .registerMain .code:nth-child(3)>div{
+	border-bottom: none;
 }
 .register .registerMain .code input{
 	border: none;
@@ -45,9 +52,9 @@ body {
     font-size: 0.32rem;
 }
 .register .registerMain .code {
-  border-top: 1px solid #E6E6E6;
   position: relative;
   height: 1rem;
+  line-height: 1rem;
   display: table;
   width: 100%;
 }

src/jfw/modules/app/src/web/staticres/jyapp/me/css/register.css

@@ -7,6 +7,8 @@
 	padding: 0rem 0.5rem;
 }
 .register .code {
+  height: 1rem;
+  line-height: 1rem;
   display: table;
   width: 100%;
   border-bottom: 1px solid #E6E6E6;

src/jfw/modules/app/src/web/staticres/jyapp/wxtsguide/main.js

@@ -783,8 +783,9 @@ $(function(){
 	}
 	$("body").removeClass("hide");
 	//帮助按钮
-	$(".jy_help").click(function(){	window.open("http://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=3&sn=badf2d7da08654c58b58169e773f58f0#wechat_redirect");
-	})
+	$(".jy_help").click(function(){	
+		JyObj.openExternalLink("http://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=3&sn=badf2d7da08654c58b58169e773f58f0#wechat_redirect");
+	});
 	if(!isiOS){
 		$("#adjustment").height($(window).height() / 2);
 	}

src/jfw/modules/app/src/web/templates/me/forgetPwd.html

@@ -52,96 +52,94 @@
 
 		<script type="text/javascript">
 			var dcsOne = false;
-			var phone = null;
+			var phone = $.trim($("#tel").val());
+			//
 			var wait = 60;
-			$(function() {
-
-				//点击返回上一页
-				$("#header a").click(function() {
-					history.go(-1);
-				})
-
-				//获取用户输入的电话号码
-				 $("#tel,#code,#identCode").on("input propertychange blur",function(){
-					var userPone = $.trim($("#tel").val());
-					var code = $.trim($("#code").val());
-					if(userPone.length >= 11 && code.length >= 4){
-						dcsOne = true;
-						if(wait == 60){
-				     		$("#btn").css("color","#2cb7ca");
-						}
-					}else{
-						dcsOne = false;
-			     		$("#btn").css("color","#888888")
-					}
-					if(phone != null && dcsOne && $.trim($("#identCode").val()).length == 6){
-						$("#nextStep").removeClass("disabled");
-					}else{
-						$("#nextStep").addClass("disabled");
-					}
-			     });
-				//验证码倒计时
+			commonMethod();
+			//点击返回上一页
+			$("#header a").click(function() {
+				history.go(-1);
+			})
+			//获取用户输入的电话号码
+			 $("#tel,#code,#identCode").on("input propertychange blur",function(){
+				commonMethod();
+		     });
+			//验证码倒计时
 
-				function time(o) {
-					if(wait == 0) {
-						o.innerHTML="获取验证码"; 
-		            	o.style.color = "#2cb7ca";
-						wait = 60;
-					} else {
-						o.style.color = "#888888";
-		            	o.innerHTML="<font>重新</font>(" + wait + "s)";
-						wait--;
-						setTimeout(function() {
-							time(o)
-						},
-						1000)
-					}
+			function time(o) {
+				if(wait == 0) {
+					o.innerHTML="获取验证码"; 
+	            	o.style.color = "#2cb7ca";
+					wait = 60;
+				} else {
+					o.style.color = "#888888";
+	            	o.innerHTML="<font>重新</font>(" + wait + "s)";
+					wait--;
+					setTimeout(function() {
+						time(o)
+					},
+					1000)
 				}
-				$("#btn").click(function() {
-					if(!dcsOne){
-						return
-					}
-					if(!Verification.isPhone($("#tel").val())){
+			}
+			$("#btn").click(function() {
+				if(!dcsOne){
+					return
+				}
+				if(!Verification.isPhone($("#tel").val())){
+					EasyAlert.show("手机号格式错误");
+					return
+				}
+				phone = $.trim($("#tel").val());
+				var thisClass = this;
+				$.post("/jyapp/free/forgetPwd",{reqType:"sendIdentCode",phone: phone,code:$.trim($("#code").val())},function(r){
+					if(r.status=="phoneError"){
 						EasyAlert.show("手机号格式错误");
-						return
+					}else if(r.status=="codeError"){
+						EasyAlert.show("图形验证码错误");
+					}else if(r.status=="phoneNotExists"){
+						EasyAlert.show("手机号不存在");
+					}else if(r.status=="y"){
+						time(thisClass);
 					}
-					phone = $.trim($("#tel").val());
-					var thisClass = this;
-					$.post("/jyapp/free/forgetPwd",{reqType:"sendIdentCode",phone: phone,code:$.trim($("#code").val())},function(r){
-						if(r.status=="phoneError"){
-							EasyAlert.show("手机号格式错误");
-						}else if(r.status=="codeError"){
-							EasyAlert.show("图形验证码错误");
-							reLoadCaptcha();
-						}else if(r.status=="phoneNotExists"){
-							EasyAlert.show("手机号不存在");
-						}else if(r.status=="y"){
-							time(thisClass);
-							reLoadCaptcha();
-						}
-					});
-				})
-				$("#nextStep").click(function(){
-					if($(this).hasClass("disabled")){
-						return
-					}
-					if($("#tel").val() != phone){
-						EasyAlert.show("请重新获取手机验证码");
-						return;
-					}
-					$.post("/jyapp/free/forgetPwd",{reqType:"nextStep",phone: phone,identCode:$.trim($("#identCode").val())},function(r){
-						if(r.status=="identCodeError"){
-							EasyAlert.show("手机验证码错误");
-							reLoadCaptcha();
-						}else if(r.status=="y"){
-							window.location.href = "/jyapp/free/forgetPwd?step=2";
-						}
-					});
 				});
 			})
+			$("#nextStep").click(function(){
+				if($(this).hasClass("disabled")){
+					return
+				}
+				if($("#tel").val() != phone){
+					EasyAlert.show("请重新获取手机验证码");
+					return;
+				}
+				$.post("/jyapp/free/forgetPwd",{reqType:"nextStep",phone: phone,identCode:$.trim($("#identCode").val())},function(r){
+					if(r.status=="identCodeError"){
+						EasyAlert.show("手机验证码错误");
+					}else if(r.status=="y"){
+						window.location.href = "/jyapp/free/forgetPwd?step=2";
+					}
+				});
+			});
 			function reLoadCaptcha(){
 				$(".captcha>img").attr("src","/jyapp/free/captcha?rnd="+Math.random());
 			}
+			function commonMethod(){
+				var userPone = $.trim($("#tel").val());
+				var code = $.trim($("#code").val());
+				if(userPone.length >= 11 && code.length >= 4){
+					dcsOne = true;
+					if(wait == 60){
+			     		$("#btn").css("color","#2cb7ca");
+					}
+				}else{
+					dcsOne = false;
+		     		$("#btn").css("color","#888888")
+				}
+				if(phone != "" && dcsOne && $.trim($("#identCode").val()).length == 6){
+					$("#nextStep").removeClass("disabled");
+				}else{
+					$("#nextStep").addClass("disabled");
+				}
+			}
 		</script>
 
 	</body>

src/jfw/modules/app/src/web/templates/me/forgetPwdTwo.html

@@ -31,7 +31,7 @@
 					<input type="password" placeholder="确认密码"/>
 					<span class="jyapp-icon jyapp-icon-biyan"></span>
 				</div>
-				<input type="button" id="btn" value="完成" class="disabled btn"/>
+				<button type="button" id="btn" class="disabled btn">完成</button>
 			</div>
 		</div>
 		

src/jfw/modules/app/src/web/templates/me/index.html

@@ -32,7 +32,7 @@
 					{{if session "s_m_openid"}}
 						{{session "s_nickname"}}
 					{{else}}
-						<a href="/jyapp/free/login">登陆/注册</a>
+						<a href="/jyapp/free/login">登录/注册</a>
 					{{end}}
 					</div>
 					<div class="clearfix"></div>

src/jfw/modules/app/src/web/templates/me/login.html

@@ -11,7 +11,7 @@
 	<script src="/jyapp/js/jquery.js?v={{Msg "seo" "version"}}" type="text/javascript" charset="utf-8"></script>
 	{{include "/common/js.html"}}
 
-	<title>登陆</title>
+	<title>登录</title>
 </head>
 <body>
 	
@@ -40,7 +40,7 @@
 					<i>微信登录</i>
 				</span>
 			</div>
-			<!--微信登陆end-->
+			<!--微信登录end-->
 	</div>
 	<script type="text/javascript">
 		$(function(){
@@ -81,7 +81,7 @@
 				}
 				
 			})
-			//点击登陆显示报错弹窗
+			//点击登录显示报错弹窗
 			$("#btn").click(function(){
 				if($(this).hasClass("disabled")){
 					return

src/jfw/modules/app/src/web/templates/me/register.html

@@ -46,73 +46,56 @@
 		</div>
 		<script type="text/javascript">
 			var dcsOne = false;
-			var phone = null;
-			var wait=60; 
-			$(function(){
-				//点击返回上一页
-				$("#header a").click(function(){
-					history.go(-1);
-				})
-				
-			     //获取用户输入的电话号码
-			     $("#tel,#code,#identCode").on("input propertychange blur",function(){
-					var userPone = $.trim($("#tel").val());
-					var code = $.trim($("#code").val());
-					if(userPone.length >= 11 && code.length >= 4){
-						dcsOne = true;
-			     		if(wait == 60){
-				     		$("#btn").css("color","#2cb7ca");
-						}
-					}else{
-						dcsOne = false;
-			     		$("#btn").css("color","#888888")
-					}
-					if(phone != null && dcsOne && $.trim($("#identCode").val()).length > 0 && $("#identCode").val().length == 6){
-						$("#nextStep").removeClass("disabled");
-					}else{
-						$("#nextStep").addClass("disabled");
-					}
-			     });
+			var phone = $.trim($("#tel").val());
+			var wait=60;
+			commonMethod();
+			//点击返回上一页
+			$("#header a").click(function(){
+				history.go(-1);
+			})
 			
-				$("#btn").click(function(){
-					if(!dcsOne){
-						return
-					}
-					if(!Verification.isPhone($("#tel").val())){
+		     //获取用户输入的电话号码
+		     $("#tel,#code,#identCode").on("input propertychange blur",function(){
+				commonMethod();
+		     });
+		
+			$("#btn").click(function(){
+				if(!dcsOne){
+					return
+				}
+				if(!Verification.isPhone($("#tel").val())){
+					EasyAlert.show("手机号格式错误");
+					return
+				}
+				phone = $.trim($("#tel").val());
+				var thisClass = this;
+				$.post("/jyapp/free/register",{reqType:"sendIdentCode",phone: phone,code:$.trim($("#code").val())},function(r){
+					if(r.status=="phoneError"){
 						EasyAlert.show("手机号格式错误");
-						return
+						return;
+					}else if(r.status=="codeError"){
+						EasyAlert.show("图形验证码错误");
+					}else if(r.status=="phoneExists"){
+						EasyAlert.show("手机号已被注册");
+					}else if(r.status=="y"){
+						time(thisClass);
 					}
-					phone = $.trim($("#tel").val());
-					var thisClass = this;
-					$.post("/jyapp/free/register",{reqType:"sendIdentCode",phone: phone,code:$.trim($("#code").val())},function(r){
-						if(r.status=="phoneError"){
-							EasyAlert.show("手机号格式错误");
-							return;
-						}else if(r.status=="codeError"){
-							EasyAlert.show("图形验证码错误");
-						}else if(r.status=="phoneExists"){
-							EasyAlert.show("手机号已被注册");
-						}else if(r.status=="y"){
-							time(thisClass);
-						}
-						reLoadCaptcha();
-					});
 				});
-				$("#nextStep").click(function(){
-					if($(this).hasClass("disabled")){
-						return
-					}
-					if($("#tel").val() != phone){
-						EasyAlert.show("请重新获取手机验证码");
-						return;
+			});
+			$("#nextStep").click(function(){
+				if($(this).hasClass("disabled")){
+					return
+				}
+				if($("#tel").val() != phone){
+					EasyAlert.show("请重新获取手机验证码");
+					return;
+				}
+				$.post("/jyapp/free/register",{reqType:"nextStep",phone: phone,identCode:$.trim($("#identCode").val())},function(r){
+					if(r.status=="identCodeError"){
+						EasyAlert.show("手机验证码错误");
+					}else if(r.status=="y"){
+						window.location.href = "/jyapp/free/register?step=2";
 					}
-					$.post("/jyapp/free/register",{reqType:"nextStep",phone: phone,identCode:$.trim($("#identCode").val())},function(r){
-						if(r.status=="identCodeError"){
-							EasyAlert.show("手机验证码错误");
-						}else if(r.status=="y"){
-							window.location.href = "/jyapp/free/register?step=2";
-						}
-					});
 				});
 			});
 			//验证码倒计时
@@ -133,6 +116,24 @@
 			function reLoadCaptcha(){
 				$(".captcha>img").attr("src","/jyapp/free/captcha?rnd="+Math.random());
 			}
+			function commonMethod(){
+				var userPone = $.trim($("#tel").val());
+				var code = $.trim($("#code").val());
+				if(userPone.length >= 11 && code.length >= 4){
+					dcsOne = true;
+		     		if(wait == 60){
+			     		$("#btn").css("color","#2cb7ca");
+					}
+				}else{
+					dcsOne = false;
+		     		$("#btn").css("color","#888888")
+				}
+				if(phone != null && dcsOne && $.trim($("#identCode").val()).length > 0 && $("#identCode").val().length == 6){
+					$("#nextStep").removeClass("disabled");
+				}else{
+					$("#nextStep").addClass("disabled");
+				}
+			}
 	</script>
 
 	</body>

src/jfw/modules/app/src/web/templates/me/set.html

@@ -71,11 +71,11 @@
 			</div>
 			
 			
-			<!--退出登陆start-->
+			<!--退出登录start-->
 			<div class="quit">
 				<a href="javascript:;">退出登录</a>
 			</div>
-		    <!--退出登陆end-->
+		    <!--退出登录end-->
 			
 			<!--分享好友弹窗-->
 			<div class="share">

src/jfw/modules/app/src/web/templates/me/setpwd.html

@@ -33,7 +33,7 @@
 				<input type="password" placeholder="确认密码"/>
 				<span class="jyapp-icon jyapp-icon-biyan"></span>
 			</div>
-			<input type="button" name="btn" id="btn" value="完成" class="disabled btn" />
+			<button type="button" name="btn" id="btn" class="disabled btn">完成</button>
 
 			<!--两次密码不一样提示-->
 			<div class="doubleDiff hint">

src/jfw/modules/app/src/web/templates/me/updatepwd.html

@@ -33,7 +33,7 @@
 				<input type="password" id="newpwdAgain" placeholder="确认密码"/>
 				<span class="jyapp-icon jyapp-icon-biyan"></span>
 			</div>	
-			<input type="button" class="btn disabled" id="btn" value="完成" />
+			<button type="button" class="btn disabled" id="btn">完成</button>
 		</div>
 	</div>
 	<script type="text/javascript">

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

@@ -40,6 +40,7 @@ pre {
 .abs{
 	font-size:16px;
 	position:relative;
+	margin-top: 20px;
 }
 .abs .original{
 	color: #0987ff;
@@ -465,7 +466,7 @@ pre {
 				{{end}}
 			</ul>
 		</div>
-		<pre id="h_content">{{.T.obj.detail}}</pre>
+		<pre id="h_content">{{Html (Regexp (Regexp .T.obj.detail "(\\n|\\\\n)\\s+" "\n") "(\\n|\\\\n)+" "<br/>")}}</pre>
 		{{if .T.obj.projectinfo.attachments}}
 			<div class="pre-enclosure hidden"><img src="/jyapp/images/wx/enclosure.png"/>附件(1个)</div>
 			<div class="pre-dow hidden">
@@ -878,7 +879,9 @@ $(function(){
 	if(s_winner){
         winner_con = s_winner;
 	}
-	var content = $("#h_content").text().replace(/[^\{\u4e00-\u9fa5]{1,90}{[^\}\u4e00-\u9fa5]+?}/g,"");
+	var content = $("#h_content").html();
+	content = content.replace(/^(<br\/?>)/,"");
+	content = content.replace(/[^\{\u4e00-\u9fa5]{1,90}{[^\}\u4e00-\u9fa5]+?}/g,"");
 	if(projectname != "" && content.toLowerCase().indexOf(projectname.toLowerCase()) > -1){
 		content = keyWordHighlight(content,projectname,"<span class='keyword myfollow'>$1</span>");
 	}

src/jfw/modules/app/src/web/templates/weixin/wxkeyset/seniorset.html

@@ -191,7 +191,7 @@ function retainOneWay(thisId){
 			offCount++;
 		}
 	}
-	if(offCount==2){
+	if(offCount==1){
 		return false;
 	}
 	return true;

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

@@ -27,85 +27,90 @@ if(localStorage && localStorage.tsGuide_status == "1"){
 			</div>
 	  </div>
 	</div>
-	<div class="step-1">
-		<center>
-		    <span>欢迎使用招标订阅向导!<img class="jy_help" src="/jyapp/images/help-b.png"/></span>
-			<span>请选择您的行业，可多选</span>
-		</center>
-		<ul id="industry" class="industry clear-both-a"></ul>
-		<div>
-			<button bype="button" class="btn" onclick="Guide.skip()">跳过向导</button>
-			<button bype="button" class="btn" onclick="Guide.nextStep(1)">下一步</button>
-		</div>
+	<div class="app-layout-header">
+		订阅向导
 	</div>
-	<div class="step-2">
-		<div class="com-top-one">
-			<div class="t-desc">
-				“剑鱼招标订阅”囊括了全国范围内、全行业的招标信息。您设置了订阅关键词之后，剑鱼会第一时间向您推送匹配关键词的最新招标信息。<img class="jy_help" src="/jyapp/images/help-b.png"/>
-			</div>
-			<input type="text" placeholder="在这里输入关键词" id="input-keyword-1">
-			<div class="b-desc">
-				比如您输入“绿化工程”以后，当某招标人发布了《某某县中心敬老院一期观景<font class="keyword">绿化工程</font>施工》，剑鱼就会把这条信息推送给您。
-			</div>
-			<div class="btnarea">
-				<button type="button" class="btn" onclick="Guide.skip()">跳过向导</button>
-				<span>
-					<button type="button" class="btn btn-normal prevStep" onclick="Guide.prevStep(2)">上一步</button>
-					<button type="button" class="btn nextStep" onclick="Guide.nextStep(2)">下一步</button>
-				</span>
+	<div class="app-layout-content-b">
+		<div class="step-1">
+			<center>
+			    <span>欢迎使用招标订阅向导!<img class="jy_help" src="/jyapp/images/help-b.png"/></span>
+				<span>请选择您的行业，可多选</span>
+			</center>
+			<ul id="industry" class="industry clear-both-a"></ul>
+			<div>
+				<button bype="button" class="btn" onclick="Guide.skip()">跳过向导</button>
+				<button bype="button" class="btn" onclick="Guide.nextStep(1)">下一步</button>
 			</div>
 		</div>
-		<div class="com-top-two">
-			<div class="haskeywords">
-				<span>已成功添加关键词：<img class="jy_help" src="/jyapp/images/help-b.png"/></span>
-				<ul class="clear-both-a" id="haskeywords"></ul>
+		<div class="step-2">
+			<div class="com-top-one">
+				<div class="t-desc">
+					“剑鱼招标订阅”囊括了全国范围内、全行业的招标信息。您设置了订阅关键词之后，剑鱼会第一时间向您推送匹配关键词的最新招标信息。<img class="jy_help" src="/jyapp/images/help-b.png"/>
+				</div>
+				<input type="text" placeholder="在这里输入关键词" id="input-keyword-1">
+				<div class="b-desc">
+					比如您输入“绿化工程”以后，当某招标人发布了《某某县中心敬老院一期观景<font class="keyword">绿化工程</font>施工》，剑鱼就会把这条信息推送给您。
+				</div>
+				<div class="btnarea">
+					<button type="button" class="btn" onclick="Guide.skip()">跳过向导</button>
+					<span>
+						<button type="button" class="btn btn-normal prevStep" onclick="Guide.prevStep(2)">上一步</button>
+						<button type="button" class="btn nextStep" onclick="Guide.nextStep(2)">下一步</button>
+					</span>
+				</div>
 			</div>
-			<div class="com-top-two-b">
-				<div class="com-division"></div>
-				<div class="com-top-two-d">
-					您还可以继续添加更多关键词。如果您订阅了多个关键词，新的招标信息只要匹配了其中任意一个，剑鱼都会将其推送给您。
-					<div class="margin-t-10">如果您不需要更多关键词，可以直接点击“下一步”按钮。</div>
-					<div class="input-icon">
-						<input type="text" id="input-keyword-2">
-						<img src="/jyapp/images/icon-right-bg.png" id="input-complate">
+			<div class="com-top-two">
+				<div class="haskeywords">
+					<span>已成功添加关键词：<img class="jy_help" src="/jyapp/images/help-b.png"/></span>
+					<ul class="clear-both-a" id="haskeywords"></ul>
+				</div>
+				<div class="com-top-two-b">
+					<div class="com-division"></div>
+					<div class="com-top-two-d">
+						您还可以继续添加更多关键词。如果您订阅了多个关键词，新的招标信息只要匹配了其中任意一个，剑鱼都会将其推送给您。
+						<div class="margin-t-10">如果您不需要更多关键词，可以直接点击“下一步”按钮。</div>
+						<div class="input-icon">
+							<input type="text" id="input-keyword-2">
+							<img src="/jyapp/images/icon-right-bg.png" id="input-complate">
+						</div>
 					</div>
 				</div>
+				<div class="btnarea">
+					<button type="button" class="btn" onclick="Guide.skip()">跳过向导</button>
+					<span>
+						<button type="button" class="btn btn-normal prevStep" onclick="Guide.prevStep(3)">上一步</button>
+						<button type="button" class="btn nextStep" onclick="Guide.nextStep(3)">下一步</button>
+					</span>
+				</div>
+			</div>
+			<div class="relRecom">
+				<div class="com-division"></div>
+				<center class="loading">
+					<img src="/jyapp/images/loading.gif"/>加载中...
+				</center>
+				<center class="relrecomtip">
+					<img src="/jyapp/images/icon-like.png">您可能还需要以下关键词，点击即可订阅
+				</center>
+			</div>
+		</div>
+		<div class="step-3">
+			<div class="com-title">
+				您订阅了关键词：<span class="keyword"></span>，以下是最近30天的信息，点击标题可查看详细内容。
 			</div>
+			<div class="com-list clear-both-a"></div>
 			<div class="btnarea">
-				<button type="button" class="btn" onclick="Guide.skip()">跳过向导</button>
 				<span>
-					<button type="button" class="btn btn-normal prevStep" onclick="Guide.prevStep(3)">上一步</button>
-					<button type="button" class="btn nextStep" onclick="Guide.nextStep(3)">下一步</button>
+					<button type="button" class="btn btn-normal prevStep" onclick="Guide.prevStep(4)">上一步</button>
+					<button type="button" class="btn nextStep" onclick="Guide.skip()">开始使用</button>
 				</span>
 			</div>
-		</div>
-		<div class="relRecom">
-			<div class="com-division"></div>
-			<center class="loading">
-				<img src="/jyapp/images/loading.gif"/>加载中...
-			</center>
-			<center class="relrecomtip">
-				<img src="/jyapp/images/icon-like.png">您可能还需要以下关键词，点击即可订阅
+			<center class="findnull">
+				<img src="/jyapp/images/wx/jysorry.png">
+				<br>没有找到和你订阅关键词匹配的信息
 			</center>
 		</div>
+		<div id="adjustment"></div>
 	</div>
-	<div class="step-3">
-		<div class="com-title">
-			您订阅了关键词：<span class="keyword"></span>，以下是最近30天的信息，点击标题可查看详细内容。
-		</div>
-		<div class="com-list clear-both-a"></div>
-		<div class="btnarea">
-			<span>
-				<button type="button" class="btn btn-normal prevStep" onclick="Guide.prevStep(4)">上一步</button>
-				<button type="button" class="btn nextStep" onclick="Guide.skip()">开始使用</button>
-			</span>
-		</div>
-		<center class="findnull">
-			<img src="/jyapp/images/wx/jysorry.png">
-			<br>没有找到和你订阅关键词匹配的信息
-		</center>
-	</div>
-	<div id="adjustment"></div>
 <script type="text/javascript">
 </script>
 {{include "/common/baiducc.html"}}