Home Explore Help
Register Sign In
jiapeng
/
portal-front
Watch 3
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Commits 1260 Releases 0 Wiki
Browse Source

搜索，检索。为空是默认搜索条件为上次关键词

luyanan 7 years ago
parent
3f6f93ac9f
commit
06cd94e6fa
14 changed files with 94 additions and 57 deletions
Split View Show Diff Stats
  1. 3 1
      css/share.css
  2. 1 1
      e/I.html
  3. 7 2
      e/index.html
  4. 7 4
      e/search.html
  5. 2 1
      ekexiu/Invitation.html
  6. 2 1
      ekexiu/InviteResult.html
  7. 2 1
      ekexiu/reg_h5.html
  8. 1 12
      js/invite-friends.js
  9. 1 12
      js/inviteAuthor.js
  10. 26 0
      js/public/baseUtil.js
  11. 13 0
      js/public/shareCom.js
  12. 0 10
      js/reg_h5.js
  13. 16 6
      js/searchNew.js
  14. 13 6
      js/search_h5.js

+ 3 - 1
css/share.css
View File 

@ -1,6 +1,9 @@
1 1 
@charset "utf-8";
2 2 
/* CSS Document */
3 3 
html,body {outline: 0;margin:0;padding:0px;background: #F4F6F8;-webkit-text-size-adjust: 100%;-webkit-tap-highlight-color: rgba(0, 0, 0, 0);}
4
5 
.bomb-box{display: none;background-color:rgba(000,000,000,0.5); padding:6px 15px; border-radius:50px; font-size: 12px; color: #fff; text-align:center; position: absolute;left:50%; top:25%;z-index: 10;}
6
4 7 
.contentBody2{max-width:640px;margin:auto;overflow: hidden;}
5 8 
.bannerA {width: 100%;height:auto; position: relative;overflow: hidden;background:#FF9900;}
6 9 
.logoA{width:24%; height: auto;position: absolute;left:50%;margin-left:-12%;top:6%;z-index: 2}
 
@ -55,7 +58,6 @@ html,body {outline: 0;margin:0;padding:0px;background: #F4F6F8;-webkit-text-size
55 58 
.invitebody .logoimg{ width: 100%; margin: auto; text-align:center;}
56 59 
.invitebody .inviteTit{text-align: center; font-size: 18px;line-height: 30px;margin:20px 0;color:#FFFFFF;}
57 60 
.invitebody .inviteTit span{font-size:18px;line-height: 44px; padding:0 6px;}
58 
.invitebody .bomb-box{background-color:rgba(000,000,000,0.5); padding:5px 15px; border-radius:50px; font-size: 12px; color: #fff; text-align:center; position: absolute; display: inline; left:50%; top:25%}
59 61 
.invitebody .inforbox{padding:20px 0 10px;}
60 62 
.invitebody .inforbox ul{padding:10px 0;}
61 63 
.invitebody .inforbox ul li{position: relative;margin:12px 0;}

+ 1 - 1
e/I.html
View File 

@ -44,7 +44,7 @@
44 44 
	</form>
45 45 
</div>
46 46
47 
<div class="bomb-box" style="display: none;"></div>
47 
<div class="bomb-box"></div>
48 48 
<script type="text/javascript" src="../js/jquery-1.11.1.js" ></script>
49 49 
<script type="text/javascript" src="../js/jquery.cookie.js" ></script>
50 50 
<script type="text/javascript" src="../js/public/baseUtil.js" ></script>

+ 7 - 2
e/index.html
View File 

@ -16,6 +16,7 @@
16 16 
</head>
17 17
18 18 
<body>
19 
<div class="bomb-box" style="top: 15%"></div>
19 20 
<div class="contentBody2">
20 21 
	<div class="bannerA">
21 22 
	    <img class="logoA" src="../images/banner/bglogo.png" />

@ -172,8 +173,12 @@ $(document).ready(function() {
172 173 
	$(".search-input").keydown(function(e) {//search Enter
173 174 
		if(e.which == 13) {
174 175 
			var searchContent = $.trim($(".search-input").val());
175 
			if(searchContent)
176 
			location.href = "search.html?key=" + encodeURI(searchContent);
176 
			if(searchContent){
177 
				location.href = "search.html?key=" + encodeURI(searchContent);
178 
			}else{
179 
				bombox("请输入关键词");
180 
				return;
181 
			}
177 182 
		}
178 183
179 184 
	})

+ 7 - 4
e/search.html
View File 

@ -13,10 +13,6 @@
13 13 
<link rel="stylesheet" href="../css/share.css" />
14 14 
<script type="text/javascript" src="../js/jquery-1.11.1.js"></script>
15 15 
<script type="text/javascript" src="../js/public/swiper.min.js"></script>
16 
<script type="text/javascript" src="../js/public/baseUtil.js"></script>
17 
<script type="text/javascript" src="../js/public/shareCom.js"></script>
18 
<script type="text/javascript" src="../js/public/cacheUtil.js"></script>
19 
<script type="text/javascript" src="../js/public/iscroll.js"></script>
20 16 
<script type="text/javascript" src="../js/public/jquery.mmenu.js"></script>
21 17 
<script type="text/javascript">
22 18 
	$(function() {

@ -42,6 +38,7 @@
42 38 
</head>
43 39
44 40 
<body>
41 
<div class="bomb-box"></div>
45 42 
<div class="contentBody2" id="page">
46 43 
	<div class="fixedBlock">
47 44 
		<div class="searchBox">

@ -147,6 +144,12 @@
147 144 
		</div>
148 145 
	</nav>
149 146 
</div>
147
148
149 
<script type="text/javascript" src="../js/public/baseUtil.js"></script>
150 
<script type="text/javascript" src="../js/public/shareCom.js"></script>
151 
<script type="text/javascript" src="../js/public/cacheUtil.js"></script>
152 
<script type="text/javascript" src="../js/public/iscroll.js"></script>
150 153 
<script src="../js/search_h5.js" type="text/javascript" charset="utf-8"></script>
151 154
152 155 
</body>

+ 2 - 1
ekexiu/Invitation.html
View File 

@ -91,11 +91,12 @@
91 91 
	</form>
92 92 
</div>
93 93
94 
<div class="bomb-box" style="display: none;"></div>
94 
<div class="bomb-box"></div>
95 95 
<script type="text/javascript" src="../js/jquery-1.11.1.js" ></script>
96 96 
<script type="text/javascript" src="../js/jquery.cookie.js" ></script>
97 97 
<script type="text/javascript" src="../js/public/baseUtil.js"></script>
98 98 
<script type="text/javascript" src="../js/public/genCom.js"></script>
99 
<script type="text/javascript" src="../js/public/shareCom.js"></script>
99 100 
<script type="text/javascript" src="../js/invite-friends.js" ></script>
100 101
101 102 
</body>

+ 2 - 1
ekexiu/InviteResult.html
View File 

@ -60,11 +60,12 @@
60 60 
	</form>
61 61 
</div>
62 62
63 
<div class="bomb-box" style="display: none;"></div>
63 
<div class="bomb-box"></div>
64 64 
<script type="text/javascript" src="../js/jquery-1.11.1.js" ></script>
65 65 
<script type="text/javascript" src="../js/jquery.cookie.js" ></script>
66 66 
<script type="text/javascript" src="../js/public/baseUtil.js"></script>
67 67 
<script type="text/javascript" src="../js/public/genCom.js"></script>
68 
<script type="text/javascript" src="../js/public/shareCom.js"></script>
68 69 
<script>
69 70 
	$(document).ready(function(){
70 71 
		var flag=GetQueryString("flag");

+ 2 - 1
ekexiu/reg_h5.html
View File 

@ -60,8 +60,9 @@
60 60 
	</form>
61 61 
</div>
62 62
63 
<div class="bomb-box" style="display: none;"></div>
63 
<div class="bomb-box"></div>
64 64 
<script type="text/javascript" src="../js/jquery-1.11.1.js" ></script>
65 
<script type="text/javascript" src="../js/public/shareCom.js"></script>
65 66 
<script type="text/javascript" src="../js/reg_h5.js" ></script>
66 67
67 68 
</body>

+ 1 - 12
js/invite-friends.js
View File 

@ -7,20 +7,9 @@ $(function(){
7 7 
	var state;
8 8 
	var inviterId = GetQueryString("professorId");
9 9 
	var username = GetQueryString("professorName");
10 
	//var inviterId="6E199CFA7B034D69A7029731B6E77D4A";
11 
	//var username="特朗普";
12 10
13 11 
	$(".inviteTit span").text(username);
14 
	/*控制提示框样式*/
15 
	function bombox(textt){
16 
		$(".bomb-box").fadeIn("slow");
17 
		$(".bomb-box").text(textt);
18 
		var bombwidth = $(".bomb-box").width();
19 
	    $(".bomb-box").css({"marginLeft": -(bombwidth+25)/2 + "px"});
20 
		setTimeout(function(){
21 
			$(".bomb-box").fadeOut("slow");
22 
		},4000);
23 
	}
12
24 13 
	$("#changImage").on("click",function(){
25 14 
		$(this).attr("src","/ajax/PictureVC?"+new Date().getTime());
26 15 
	})

+ 1 - 12
js/inviteAuthor.js
View File 

@ -182,18 +182,7 @@
182 182 
			});
183 183
184 184 
		}
185 
		/*控制提示框样式*/
186 
		function bombox(textt) {
187 
			$(".bomb-box").fadeIn("slow");
188 
			$(".bomb-box").text(textt);
189 
			var bombwidth = $(".bomb-box").width();
190 
			$(".bomb-box").css({
191 
				"marginLeft": -(bombwidth + 25) / 2 + "px"
192 
			});
193 
			setTimeout(function() {
194 
				$(".bomb-box").fadeOut("slow");
195 
			}, 4000);
196 
		}
185
197 186 
		/*30s后重新获取验证码*/
198 187 
	function doClick() {
199 188 
		$("#obtain-code").attr("disabled",true);

+ 26 - 0
js/public/baseUtil.js
View File 

@ -56,7 +56,26 @@ function autho() {
56 56 
		}
57 57 
	}
58 58 
}
59 
//转换格式
60 
function changeTime(dealtime) {
61 
	var s = dealtime;
62 
	if(dealtime.length == 8) {
63 
		var y = s.substr(0, 4);
64 
		var m = s.substr(4, 2);
65 
		var d = s.substr(6, 2);
66 
		var formatTime = y + "-" + m + "-" + d;
67 
		return formatTime;
68 
	} else {
69 
		var y = s.substr(0, 4);
70 
		var m = s.substr(4, 2);
71 
		var d = s.substr(6, 2);
72 
		var h = s.substr(8, 2);
73 
		var minute = s.substr(10, 2);
74 
		var formatTime = y + "-" + m + "-" + d + " " + h + ":" + minute;
75 
		return formatTime;
76 
	}
59 77
78 
}
60 79 
//时间显示规则
61 80 
function commenTime(startTime) {
62 81 
	var nowTimg = new Date();

@ -349,6 +368,13 @@ function limitObj(obj,maxNum){
349 368 
				$(obj).siblings().find("em").text($(obj).val().length);
350 369 
			}, 1);
351 370 
		},
371 
		focus: function(e) {
372 
			$(obj).parents("li").find(".frmconmsg").show();
373 
			$(obj).siblings().find("em").text($(obj).val().length);
374 
		},
375 
		blur: function(e) {
376 
			$(obj).parents("li").find(".frmconmsg").hide();
377 
		},
352 378 
		keyup: function(e) {
353 379 
			if($(this).val().length==""){
354 380 
				$(this).parent().siblings(".btnModel").attr("disabled", true);

+ 13 - 0
js/public/shareCom.js
View File 

@ -7,3 +7,16 @@ $(document).ready(function(){
7 7 
		return true;
8 8 
	})
9 9 
})
10
11 
/*控制提示框样式*/
12 
function bombox(textt) {
13 
	$(".bomb-box").fadeIn("slow");
14 
	$(".bomb-box").text(textt);
15 
	var bombwidth = $(".bomb-box").width();
16 
	$(".bomb-box").css({
17 
		"marginLeft": -(bombwidth + 25) / 2 + "px"
18 
	});
19 
	setTimeout(function() {
20 
		$(".bomb-box").fadeOut("slow");
21 
	}, 4000);
22 
}

+ 0 - 10
js/reg_h5.js
View File 

@ -1,15 +1,5 @@
1 1 
/*邀请好友*/
2 2 
$(function(){
3 
	/*控制提示框样式*/
4 
	function bombox(textt){
5 
		$(".bomb-box").fadeIn("slow");
6 
		$(".bomb-box").text(textt);
7 
		var bombwidth = $(".bomb-box").width();
8 
	    $(".bomb-box").css({"marginLeft": -(bombwidth+25)/2 + "px"});
9 
		setTimeout(function(){
10 
			$(".bomb-box").fadeOut("slow");
11 
		},4000);
12 
	}
13 3 
	/*校验提交按钮显示状态*/
14 4 
	$('.form-group').on('keyup', "#username,#userphone,#usermail,#userorg", function() {
15 5 
		if($("#username").val() == "" || $("#userphone").val() == "" || $("#usermail").val() == "" || $("#userorg").val() == "") {

+ 16 - 6
js/searchNew.js
View File 

@ -1,13 +1,15 @@
1 1 
$(function() {
2 
	if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){
3 
	 	location.href="http://" + window.location.host + "/e/search.html";
4 
	}
5 2 
	$("#feedback").hide();
6 3 
	loginStatus();//判断个人是否登录
7 4 
	var userid = $.cookie("userid");
8 
	var searchContent = $.trim(GetQueryString("searchContent")),
5 
	var searchTmp,
6 
		searchContent = $.trim(GetQueryString("searchContent")),
9 7 
	    subjectText = $.trim(GetQueryString("subject")),
10 8 
	    tagnum = $.trim(GetQueryString("tagflag"));
9
10 
	if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){
11 
	 	location.href="http://" + window.location.host + "/e/search.html?key="+searchContent;
12 
	}
11 13 
	var keyt,subject,industry,address,authType = 1;
12 14 
	var rows = 20,
13 15 
		dataO = {
 
@ -766,8 +768,12 @@ $(function() {
766 768 
			})
767 769 
		},
768 770 
		searchToFun=function(){
769 
			var sortN = $(".filterdiv .liactive").attr("data-id");
770 
			keyt =$.trim($(".searchsome").val());
771 
			var sortN = $(".filterdiv .liactive").attr("data-id");
772 
			var sC=$.trim($(".searchsome").val());
773 
			if(sC){
774 
				keyt =sC
775 
				searchTmp=keyt
776 
			}
771 777 
			dataO = {
772 778 
				proSortFirst:"",
773 779 
				proStarLevel: "",
 
@ -805,6 +811,8 @@ $(function() {
805 811 
			$(objSort[item].conbox).show().siblings().hide()
806 812 
			$(objSort[item].conbox).find("ul.listitemdiv").html("")
807 813 
			$(".searchsome").attr("placeholder",objSort[item].holder)
814 
			$(".searchsome").val(searchTmp)
815 
			$(".search-txt").val(searchTmp)
808 816 
			$(".js-load-more").show()
809 817 
			if(item==1){
810 818 
				expertBox();
 
@ -904,11 +912,13 @@ $(function() {
904 912 
		keyt="";
905 913 
	}else{
906 914 
		keyt=searchContent;
915 
		searchTmp=keyt;
907 916 
		$(".searchsome").val(searchContent);
908 917 
		$(".search-txt").val(searchContent)
909 918 
	}
910 919 
	if(tagnum){
911 920 
		keyt=searchContent;
921 
		searchTmp=keyt;
912 922 
		tabToFun(tagnum)
913 923 
	}
914 924

+ 13 - 6
js/search_h5.js
View File 

@ -1,9 +1,11 @@
1 1 
$(function() {
2 
	var searchContent = $.trim(GetQueryString("key")),
2 
	var searchTmp,
3 
		searchContent = $.trim(GetQueryString("key")),
3 4 
	    tagnum = $.trim(GetQueryString("flag"));
4 5 
	var keyt,subject,industry,address,authType = 1;
5 6 
	if(searchContent!=""){
6 7 
		keyt=searchContent;
8 
		searchTmp=searchContent;
7 9 
		document.getElementById("searchval").value=searchContent;
8 10 
	}
9 11 
	var rows = 20,

@ -780,14 +782,15 @@ $(function() {
780 782 
				serTime: "",
781 783 
				serId: "",
782 784 
			};
785
783 786 
			tabToFun(sortN)
784 787 
		},
785 788 
		tabToFun=function(item){
786 
			keyt= $.trim($("#searchval").val())
787 789 
			if(!item){ item=1 }
788 790 
			var tabLoad=objSort[item].loadFlag
789 791 
			//console.log(item+"*****"+tabLoad)
790
792 
			$("#searchval").val(searchTmp)
793
791 794 
			if(item==1 && tabLoad){
792 795 
				expertBox();
793 796 
				$(".loadtip").html('上拉加载更多');

@ -896,13 +899,17 @@ $(function() {
896 899 
					var e = event || window.event;
897 900 
					if(e.keyCode == 13) {
898 901 
				 		e.preventDefault();
899 
						var searchval = $.trim($("#searchval").val());
902 
						var sC=$.trim($("#searchval").val());
900 903 
						var item=$('.swiper-slide-tab.active-tab').attr("data-tab")
901 
						keyt=searchval;
902 904 
						tagnum=item
903 
						if(keyt){
905 
						if(sC){
906 
							keyt =sC
907 
							searchTmp=keyt
904 908 
							wlog("kw", keyt);
905 909 
							clearToFun(tagnum)
910 
						}else{
911 
							bombox("请输入关键词");
912 
							return;
906 913 
						}
907 914 
				    }
908 915 
				});