From 694d5fcb5aaccaf96a6c5818b7f89ff65c31eb49 Mon Sep 17 00:00:00 2001
From: tamguo <tamguo@Lenovo>
Date: Sat, 8 Sep 2018 16:03:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../test/java/com/tamguo/PaperCrawler.java    | 12 +++----
 .../java/com/tamguo/PaperQuestionCrawler.java |  4 +--
 .../resources/static/mobile/css/index.css     | 10 ------
 .../resources/templates/mobile/chapter.html   | 35 +++++++++---------
 .../resources/templates/mobile/index.html     | 36 ++++++++++---------
 .../templates/mobile/questionList.html        |  7 +---
 .../resources/templates/mobile/subject.html   | 36 ++++++++++---------
 7 files changed, 66 insertions(+), 74 deletions(-)

diff --git a/tamguo-crawler/src/test/java/com/tamguo/PaperCrawler.java b/tamguo-crawler/src/test/java/com/tamguo/PaperCrawler.java
index 7364208..243906a 100644
--- a/tamguo-crawler/src/test/java/com/tamguo/PaperCrawler.java
+++ b/tamguo-crawler/src/test/java/com/tamguo/PaperCrawler.java
@@ -29,18 +29,18 @@ public class PaperCrawler {
 	// 高考
 	private final String SUBJECT_ID = "gaokao";
 	// 科目
-	private final String COURSE_ID = "likeshuxue";
+	private final String COURSE_ID = "wenkeshuxue";
 	// 110000 北京 | 310000 上海 | 500000 重庆 | 120100 天津 | 370000 山东 | 410000 河南 | 420000 湖北 | 320000 江苏 | 330000 浙江
 	// 140000 山西 | 350000 福建 | 340000 安徽 | 220000 吉林 | 150000 内蒙古 | 640000 宁夏 | 650000 新疆 | 广西 450000 | 210000 辽宁
 	// 230000 黑龙江 | 610000 陕西 | 360000 江西 | 440000 广东 | 430000 湖南 | 460000 海南 | 530000 云南 | 510000 四川 | 630000 青海
-	// 620000 甘肃
-	private final String AREA_ID = "620000";
+	// 620000 甘肃  | 130000 河北 | 540000 西藏 | 贵州 520000
+	private final String AREA_ID = "110000";
 	// 年份
-	private final String YEAR = "2015";
+	private final String YEAR = "2016";
 	// 真题试卷             类型(1:真题试卷,2:模拟试卷,3:押题预测,4:名校精品)
-	private final String PAPER_TYPE = "3";
+	private final String PAPER_TYPE = "4";
 	// 开始采集的URL
-	private final String START_URL = "https://tiku.baidu.com/tikupc/paperlist/1bfd700abb68a98271fefa04-16-2-2015-1757-1-download";
+	private final String START_URL = "https://tiku.baidu.com/tikupc/paperlist/1bfd700abb68a98271fefa04-17-7-2016-37-1-download";
 	
 	private RunData runData;
 	
diff --git a/tamguo-crawler/src/test/java/com/tamguo/PaperQuestionCrawler.java b/tamguo-crawler/src/test/java/com/tamguo/PaperQuestionCrawler.java
index 3778863..900c57f 100644
--- a/tamguo-crawler/src/test/java/com/tamguo/PaperQuestionCrawler.java
+++ b/tamguo-crawler/src/test/java/com/tamguo/PaperQuestionCrawler.java
@@ -63,8 +63,8 @@ public class PaperQuestionCrawler {
 	@Autowired
 	CacheService cacheService;
 	private static final String FILES_NO_FORMAT = "000000000";
-	private static final String FILES_PREFIX = "likeshuxue";
-	private static final String COURSE_ID = "likeshuxue";
+	private static final String FILES_PREFIX = "wenkeshuxue";
+	private static final String COURSE_ID = "wenkeshuxue";
 	
 	private RunData runData;
 
diff --git a/tamguo-tms/src/main/resources/static/mobile/css/index.css b/tamguo-tms/src/main/resources/static/mobile/css/index.css
index ff99fd9..f5b72f3 100644
--- a/tamguo-tms/src/main/resources/static/mobile/css/index.css
+++ b/tamguo-tms/src/main/resources/static/mobile/css/index.css
@@ -100,15 +100,6 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav,
     -moz-box-sizing: border-box;
     box-sizing: border-box;
 }
-.header .header_back:after, .header .icon_pull, .header .icon_user, .header .logo, .home_header .icon_user {
-    font-size: 0;
-    display: inline-block;
-    background-image: url(../images/sprite_new.svg);
-    background-repeat: no-repeat;
-    background-position: 0 0;
-    -webkit-transform: none;
-    transform: none;
-}
 .home_header .icon_user {
     width: 1.8rem;
     height: 1.8rem;
@@ -384,7 +375,6 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav,
 }
 .channel_nav {
     padding: .3125rem .625rem 1.25rem;
-    margin-top: 0;
 }
 .page_home .icon_b_jingjiren {
     background-position: 0 -63rem;
diff --git a/tamguo-tms/src/main/resources/templates/mobile/chapter.html b/tamguo-tms/src/main/resources/templates/mobile/chapter.html
index 1b55409..908378d 100644
--- a/tamguo-tms/src/main/resources/templates/mobile/chapter.html
+++ b/tamguo-tms/src/main/resources/templates/mobile/chapter.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html style="font-size: 32px;">
+<html style="font-size: 42px;">
 <head>
 <meta charset="UTF-8">
 <meta name="apple-mobile-web-app-title" content="掌上探果网">
@@ -22,26 +22,29 @@
 			<!--页面-->
 			<!--TODO here-->
 			<section class="page page_home">
-				<header class="home_header">
-					<div class="top">
-						<div class="box_col">
-							<a th:href="${domainName}"><span class="switch_city"><em class="city">上海</em><i class="icon_pull"></i></span></a>
-						</div>
-						<a th:href="${domainName}" class="my" rel="nofollow"><i
-							class="icon_user"></i></a>
-					</div>
-					<div class="content">
-						<a th:href="${domainName}">
-							<div class="search_box">
-								<i class="icon_search_gray"></i><input type="text" class="input"
-									disabled="" placeholder="输入学校或老师开始找题目咯~">
-							</div>
-						</a>
+				<header class="header header_white">
+					<div class="flexbox left">
+						<a href="javascript:history.back();" class="header_back"></a> 
 					</div>
+					<a th:href="${domainName}" class=""><span style="font-weight: 600; font-size: 38px; color: #00ae66;">探果网</span></a>
+					<a th:href="${domainName}" class="my right"><i class="icon_user"></i></a>
 				</header>
 
 				<!--/头部-->
 				<div class="content_area">
+					
+					<div class="dynamic_search_box">
+						<div class="input_wrap">
+							<a th:href="${domainName}" class="post_ulog" data-evtid="10523"
+								data-ulog="">
+								<div class="search_box search_center">
+									<i class="icon_search_gray"></i><input type="text"
+										class="input" placeholder="请输入学校或老师名~">
+								</div>
+							</a>
+						</div>
+					</div>
+					
 					<!--频道导航-->
 					<div class="mod_box channel_nav">
 						<div class="gridbox col_4">
diff --git a/tamguo-tms/src/main/resources/templates/mobile/index.html b/tamguo-tms/src/main/resources/templates/mobile/index.html
index c74c9ed..fa56778 100644
--- a/tamguo-tms/src/main/resources/templates/mobile/index.html
+++ b/tamguo-tms/src/main/resources/templates/mobile/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html style="font-size: 32px;">
+<html style="font-size: 42px;">
 <head>
 <meta charset="UTF-8">
 <meta name="apple-mobile-web-app-title" content="掌上探果网">
@@ -23,26 +23,28 @@
 			<!--页面-->
 			<!--TODO here-->
 			<section class="page page_home">
-				<header class="home_header">
-					<div class="top">
-						<div class="box_col">
-							<a th:href="${domainName}"><span class="switch_city"><em class="city">上海</em><i class="icon_pull"></i></span></a>
-						</div>
-						<a th:href="${domainName}" class="my" rel="nofollow"><i
-							class="icon_user"></i></a>
-					</div>
-					<div class="content">
-						<a th:href="${domainName}">
-							<div class="search_box">
-								<i class="icon_search_gray"></i><input type="text" class="input"
-									disabled="" placeholder="输入学校或老师开始找题目咯~">
-							</div>
-						</a>
+				<header class="header header_white">
+					<div class="flexbox left">
+						<a th:href="${domainName}" class="header_back"></a> 
 					</div>
+					<a th:href="${domainName}" class=""><span style="font-weight: 600; font-size: 38px; color: #00ae66;">探果网</span></a>
+					<a th:href="${domainName}" class="my right"><i class="icon_user"></i></a>
 				</header>
 
 				<!--/头部-->
 				<div class="content_area">
+					<div class="dynamic_search_box">
+						<div class="input_wrap">
+							<a th:href="${domainName}" class="post_ulog" data-evtid="10523"
+								data-ulog="">
+								<div class="search_box search_center">
+									<i class="icon_search_gray"></i><input type="text"
+										class="input" placeholder="请输入学校或老师名~">
+								</div>
+							</a>
+						</div>
+					</div>
+					
 					<!--学历类型-->
 					<div class="mod_box data_channel tool_list" th:each="m,mStat:${menuList}">
 						<dl class="channel_box">
@@ -50,7 +52,7 @@
 								<a href="javascript:;" th:text="${m.name}">学历类型</a>
 							</dt>
 							<dd class="tool_list_wrap gridbox col_5">
-								<a th:href="${domainName + c.url}" class="link box_col" th:each="c,cmStat:${m.childSubjects}">
+								<a th:href="${domainName + c.url}" th:title="${c.name}" class="link box_col" th:each="c,cmStat:${m.childSubjects}">
 									<span th:class="${'li-icon iconfont ' + c.pinyin}"></span>
 									<div th:text="${c.name}">去估分</div>
 								</a> 
diff --git a/tamguo-tms/src/main/resources/templates/mobile/questionList.html b/tamguo-tms/src/main/resources/templates/mobile/questionList.html
index 7cb1391..b852549 100644
--- a/tamguo-tms/src/main/resources/templates/mobile/questionList.html
+++ b/tamguo-tms/src/main/resources/templates/mobile/questionList.html
@@ -356,11 +356,6 @@ body.filter_show {
 				<header class="header header_white">
 					<div class="flexbox left">
 						<a href="javascript:history.back();" class="header_back"></a> 
-							<a th:href="${domainName}" class="city_wrap"> 
-								<span class="switch_city">
-									<em class="city">北京</em><i class="icon_pull"></i>
-								</span>
-							</a>
 					</div>
 					<a th:href="${domainName}" class=""><span
 						style="font-weight: 600; font-size: 38px; color: #00ae66;">探果网</span></a>
@@ -381,7 +376,7 @@ body.filter_show {
 						</div>
 					</div>
 
-					<!--房源列表-->
+					<!--题目列表-->
 					<div class="mod_box house_lists">
 						<!--筛选条-->
 						<div class="tab_bar flexbox" data-mark="booth">
diff --git a/tamguo-tms/src/main/resources/templates/mobile/subject.html b/tamguo-tms/src/main/resources/templates/mobile/subject.html
index da45326..429d0e7 100644
--- a/tamguo-tms/src/main/resources/templates/mobile/subject.html
+++ b/tamguo-tms/src/main/resources/templates/mobile/subject.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html style="font-size: 32px;">
+<html style="font-size: 42px;">
 <head>
 <meta charset="UTF-8">
 <meta name="apple-mobile-web-app-title" content="掌上探果网">
@@ -21,27 +21,29 @@
 			<!--页面-->
 			<!--TODO here-->
 			<section class="page page_home">
-				<header class="home_header">
-					<div class="top">
-						<div class="box_col">
-							<a th:href="${domainName}"><span class="switch_city"><em class="city">上海</em><i class="icon_pull"></i></span></a>
-						</div>
-						<a th:href="${domainName}" class="my" rel="nofollow"><i
-							class="icon_user"></i></a>
-					</div>
-					<div class="content">
-						<a th:href="${domainName}">
-							<div class="search_box">
-								<i class="icon_search_gray"></i><input type="text" class="input"
-									disabled="" placeholder="输入学校或老师开始找题目咯~">
-							</div>
-						</a>
+				<header class="header header_white">
+					<div class="flexbox left">
+						<a href="javascript:history.back();" class="header_back"></a> 
 					</div>
+					<a th:href="${domainName}" class=""><span style="font-weight: 600; font-size: 38px; color: #00ae66;">探果网</span></a>
+					<a th:href="${domainName}" class="my right"><i class="icon_user"></i></a>
 				</header>
 
 				<!--/头部-->
 				<div class="content_area">
-					<!--频道导航-->
+					<div class="dynamic_search_box">
+						<div class="input_wrap">
+							<a th:href="${domainName}" class="post_ulog" data-evtid="10523"
+								data-ulog="">
+								<div class="search_box search_center">
+									<i class="icon_search_gray"></i><input type="text"
+										class="input" placeholder="请输入学校或老师名~">
+								</div>
+							</a>
+						</div>
+					</div>
+					
+					<!--科目导航-->
 					<div class="mod_box channel_nav">
 						<div class="gridbox col_4">
 							<h2 class="box_col" th:title="${c.name}" th:each="c,cStat:${courseList}">