dev01 2 роки тому
батько
коміт
3216abf5de
53 змінених файлів з 6400 додано та 4713 видалено
  1. 5 0
      .idea/.gitignore
  2. 12 0
      .idea/jitao-portal.iml
  3. 6 0
      .idea/misc.xml
  4. 8 0
      .idea/modules.xml
  5. 6 0
      .idea/vcs.xml
  6. BIN
      img/Logo111.png
  7. BIN
      img/ico_logo.png
  8. BIN
      img/indedImg/inded1.png
  9. BIN
      img/indedImg/inded10.png
  10. BIN
      img/indedImg/inded11.png
  11. BIN
      img/indedImg/inded12.png
  12. BIN
      img/indedImg/inded13.png
  13. BIN
      img/indedImg/inded14.png
  14. BIN
      img/indedImg/inded15.jpg
  15. BIN
      img/indedImg/inded15.png
  16. BIN
      img/indedImg/inded2.png
  17. BIN
      img/indedImg/inded20.png
  18. BIN
      img/indedImg/inded3.png
  19. BIN
      img/indedImg/inded4.png
  20. BIN
      img/indedImg/inded42.png
  21. BIN
      img/indedImg/inded5.png
  22. BIN
      img/indedImg/inded6.png
  23. BIN
      img/indedImg/inded7.png
  24. BIN
      img/indedImg/inded8.png
  25. BIN
      img/indedImg/inded9.png
  26. BIN
      img/indedImg/service_130.png
  27. BIN
      img/indedImg/service_131.png
  28. BIN
      img/index/icon-ck.png
  29. BIN
      img/index/index_transition.png
  30. BIN
      img/index/service_130.png
  31. BIN
      img/patent/service_130.png
  32. 1910 1886
      package-lock.json
  33. 2 2
      package.json
  34. 483 89
      src/css/aboutUs.css
  35. 512 194
      src/css/inded.css
  36. 476 369
      src/css/newMenu/header.css
  37. 983 735
      src/css/newMenu/index.css
  38. 45 8
      src/css/newMenu/public.css
  39. 509 421
      src/css/newMenu/serviceDetails.css
  40. 1 0
      src/css/newMenu/serviceList.css
  41. 4 1
      src/css/newMenu/shopList.css
  42. 778 588
      src/css/newMenu/tradingIndex.css
  43. 206 58
      src/css/thinkTank/policyDetail.css
  44. 350 270
      src/css/thinkTank/policyList.css
  45. 1 1
      src/js/newMenu/index.js
  46. 19 19
      src/js/public.js
  47. 4 4
      src/js/thinkTank/policyList.js
  48. 21 10
      template/index.html
  49. 1 0
      template/newMenu/tradingIndex.html
  50. 4 4
      template/thinkTank/policyList.html
  51. 2 2
      webpack-dll.config.js
  52. 4 4
      webpack.config.js
  53. 48 48
      webpack/entry.config.js

+ 5 - 0
.idea/.gitignore

@@ -0,0 +1,5 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/

+ 12 - 0
.idea/jitao-portal.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

+ 6 - 0
.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="WebPackConfiguration">
+    <option name="mode" value="DISABLED" />
+  </component>
+</project>

+ 8 - 0
.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/jitao-portal.iml" filepath="$PROJECT_DIR$/.idea/jitao-portal.iml" />
+    </modules>
+  </component>
+</project>

+ 6 - 0
.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

BIN
img/Logo111.png


BIN
img/ico_logo.png


BIN
img/indedImg/inded1.png


BIN
img/indedImg/inded10.png


BIN
img/indedImg/inded11.png


BIN
img/indedImg/inded12.png


BIN
img/indedImg/inded13.png


BIN
img/indedImg/inded14.png


BIN
img/indedImg/inded15.jpg


BIN
img/indedImg/inded15.png


BIN
img/indedImg/inded2.png


BIN
img/indedImg/inded20.png


BIN
img/indedImg/inded3.png


BIN
img/indedImg/inded4.png


BIN
img/indedImg/inded42.png


BIN
img/indedImg/inded5.png


BIN
img/indedImg/inded6.png


BIN
img/indedImg/inded7.png


BIN
img/indedImg/inded8.png


BIN
img/indedImg/inded9.png


BIN
img/indedImg/service_130.png


BIN
img/indedImg/service_131.png


BIN
img/index/icon-ck.png


BIN
img/index/index_transition.png


BIN
img/index/service_130.png


BIN
img/patent/service_130.png


Різницю між файлами не показано, бо вона завелика
+ 1910 - 1886
package-lock.json


+ 2 - 2
package.json

@@ -1,13 +1,13 @@
 {
   "name": "aft-portal",
-  "version": "1.0.1",
+  "version": "1.0.4.01",
   "description": "",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "dlldev": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy dev --env.host 'http://192.168.1.106'",
     "dlltest": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy test --env.host 'http://static.jishutao.com'",
-    "dllpro": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy prod --env.host 'http://ss.jishutao.com'",
+    "dllpro": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy prod --env.host 'http://js.junbangjishu.com'",
     "build": "node bin/clean.js && webpack --progress --colors --env.deploy dev",
     "buildtest": "node bin/clean.js && webpack --progress --colors --env.deploy test",
     "buildstage": "node bin/clean.js && webpack --progress --colors --env.deploy stage",

+ 483 - 89
src/css/aboutUs.css

@@ -1,94 +1,488 @@
-.about{position: relative;height: 180px;}
-.line{width: 100%;height: 1px;border-bottom: 1px solid #bfbfbf;display: inline-block;z-index: 10;position:absolute;top: 66px;z-index: 10;}
-.aboutHeader{width: 592px;margin: 0 auto;background: #FFFFFF;z-index:20 ;position: absolute;top: 32px;left: 50%;margin-left: -291px;}
-.aboutHeader ul li{float: left;width: 130px;height: 44px;text-align: center;border-radius: 10px;line-height: 44px;font-size: 16px;color: #2b2b2b;border: 1px solid #bfbfbf;margin: 12px;cursor: pointer;}
-.aboutHeader ul li:first-child{margin-left: 0;}
-.aboutHeader ul li:last-child{margin-right: 0;}
-.aboutHeader ul li.on{background: #f68705;color: #FFFFFF;border: none;}
+.about {
+	position: relative;
+	height: 180px;
+}
+
+.line {
+	width: 100%;
+	height: 1px;
+	border-bottom: 1px solid #bfbfbf;
+	display: inline-block;
+	z-index: 10;
+	position: absolute;
+	top: 66px;
+	z-index: 10;
+}
+
+.aboutHeader {
+	width: 592px;
+	margin: 0 auto;
+	background: #FFFFFF;
+	z-index: 20;
+	position: absolute;
+	top: 32px;
+	left: 50%;
+	margin-left: -291px;
+}
+.aboutHeader ul{
+	margin: auto;
+    width: 284px;
+}
+
+.aboutHeader ul li {
+	float: left;
+	width: 130px;
+	height: 44px;
+	text-align: center;
+	border-radius: 10px;
+	line-height: 44px;
+	font-size: 16px;
+	color: #2b2b2b;
+	border: 1px solid #bfbfbf;
+	margin: 12px;
+	cursor: pointer;
+}
+
+.aboutHeader ul li:first-child {
+	margin-left: 0;
+}
+
+.aboutHeader ul li:last-child {
+	margin-right: 0;
+}
+
+.aboutHeader ul li.on {
+	background: #f68705;
+	color: #FFFFFF;
+	border: none;
+}
 
 /*公司简介*/
-.profile>img{float: left;width: 433px;height: 338px;margin-right: 60px;}
-.profile div{float: left;width: 672px;text-align: justify;}
-.profile div h4{font-weight: normal;font-size: 24px;color: #1a1a1a;margin-bottom: 20px;}
-.profile div h4 img{margin-right: 5px;vertical-align: middle;margin-top: -2px;}
-.profile div h4 span{font-size: 16px;color: #605f5f;}
-.profile div p{font-size:14px ;color: #7a7878;margin-bottom: 15px;line-height: 22px;text-indent: 2em;}
-
-/*业务范围*/  
-.business{padding-top: 120px;clear: both;}
-.business>img{float: right;width: 599px;height: 387px}
-.business_txt{width: 540px;height: 270px;background: #f6f6f6;padding-top: 35px;padding-left: 20px;padding-right: 20px;}
-.business div{float: left;width: 540px;text-align: justify;}
-.business div h4{font-weight: normal;font-size: 24px;color: #1a1a1a;margin-bottom: 40px;}
-.business div h4 img{margin-right: 5px;vertical-align: middle;margin-top: -2px;}
-.business div h4 span{font-size: 16px;color: #605f5f;}
-.business div p{font-size:14px ;color: #7a7878;margin-bottom: 30px;line-height: 22px;}
-
-/*资质荣誉*/  
-.honor{clear: both;padding-top: 70px;}
-.honor div h4{font-weight: normal;font-size: 24px;color: #1a1a1a;margin-bottom: 40px;}
-.honor div h4 img{margin-right: 5px;vertical-align: middle;margin-top: -2px;}
-.honor div h4 span{font-size: 16px;color: #605f5f;}
-.honor div p{font-size:14px ;color: #7a7878;margin-bottom: 30px;line-height: 30px;height: 30px;}
-
-.honor div>ul{position: relative;height: 190px;}
-.honor div>ul>li{position: absolute;top: 0;left: 0;width: 1170px;}
-.honor div>ul>li>ol>li{float: left;width:218px;margin-left: 20px;text-align: center;}
-.honor div>ul>li>ol>li P{width: 218px;text-overflow: ellipsis;white-space: nowrap;overflow: hidden;}
-.honor div>ul>li>ol>li img{width: 218px;height: 162px;overflow: hidden;}
-.honor div>ul>li>ol>li:first-child{margin-left: 0;}
-
-.spot{width:96px ;margin: 30px auto 0px;}
-.spot span{width: 16px;height: 16px;border-radius: 50%;background: #d5d6d8;display: inline-block;margin: 0 3px;cursor: pointer;}
-.spot span.this{background: #000000;}
+.profile>img {
+	float: left;
+	width: 433px;
+	height: 338px;
+	margin-right: 60px;
+}
+
+.profile div {
+	float: left;
+	width: 672px;
+	text-align: justify;
+}
+
+.profile div h4 {
+	font-weight: normal;
+	font-size: 24px;
+	color: #1a1a1a;
+	margin-bottom: 20px;
+}
+
+.profile div h4 img {
+	margin-right: 5px;
+	vertical-align: middle;
+	margin-top: -2px;
+}
+
+.profile div h4 span {
+	font-size: 16px;
+	color: #605f5f;
+}
+
+.profile div p {
+	font-size: 14px;
+	color: #7a7878;
+	margin-bottom: 15px;
+	line-height: 22px;
+	text-indent: 2em;
+}
+
+/*业务范围*/
+.business {
+	padding-top: 120px;
+	clear: both;
+}
+
+.business>img {
+	float: right;
+	width: 599px;
+	height: 387px
+}
+
+.business_txt {
+	width: 540px;
+	height: 270px;
+	background: #f6f6f6;
+	padding-top: 35px;
+	padding-left: 20px;
+	padding-right: 20px;
+}
+
+.business div {
+	float: left;
+	width: 540px;
+	text-align: justify;
+}
+
+.business div h4 {
+	font-weight: normal;
+	font-size: 24px;
+	color: #1a1a1a;
+	margin-bottom: 40px;
+}
+
+.business div h4 img {
+	margin-right: 5px;
+	vertical-align: middle;
+	margin-top: -2px;
+}
+
+.business div h4 span {
+	font-size: 16px;
+	color: #605f5f;
+}
+
+.business div p {
+	font-size: 14px;
+	color: #7a7878;
+	margin-bottom: 30px;
+	line-height: 22px;
+}
+
+/*资质荣誉*/
+.honor {
+	clear: both;
+	padding-top: 70px;
+}
+
+.honor div h4 {
+	font-weight: normal;
+	font-size: 24px;
+	color: #1a1a1a;
+	margin-bottom: 40px;
+}
+
+.honor div h4 img {
+	margin-right: 5px;
+	vertical-align: middle;
+	margin-top: -2px;
+}
+
+.honor div h4 span {
+	font-size: 16px;
+	color: #605f5f;
+}
+
+.honor div p {
+	font-size: 14px;
+	color: #7a7878;
+	margin-bottom: 30px;
+	line-height: 30px;
+	height: 30px;
+}
+
+.honor div>ul {
+	position: relative;
+	height: 190px;
+}
+
+.honor div>ul>li {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 1170px;
+}
+
+.honor div>ul>li>ol>li {
+	float: left;
+	width: 218px;
+	margin-left: 20px;
+	text-align: center;
+}
+
+.honor div>ul>li>ol>li P {
+	width: 218px;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	overflow: hidden;
+}
+
+.honor div>ul>li>ol>li img {
+	width: 218px;
+	height: 162px;
+	overflow: hidden;
+}
+
+.honor div>ul>li>ol>li:first-child {
+	margin-left: 0;
+}
+
+.spot {
+	width: 96px;
+	margin: 30px auto 0px;
+}
+
+.spot span {
+	width: 16px;
+	height: 16px;
+	border-radius: 50%;
+	background: #d5d6d8;
+	display: inline-block;
+	margin: 0 3px;
+	cursor: pointer;
+}
+
+.spot span.this {
+	background: #000000;
+}
 
 /*发展历程*/
-.history{clear: both;padding-top: 70px;position: relative;}
-.history h4{font-weight: normal;font-size: 24px;color: #1a1a1a;}
-.history h4 img{margin-right: 5px;vertical-align: middle;margin-top: -2px;margin-right: 5px;}
-.history h4 span{font-size: 16px;color: #605f5f;}
-
-.historyBanner{width: 1100px;clear: both;overflow: hidden;height: 350px;margin-left: 50px;}
-.historyBanner ul{width: 1000000px;overflow: hidden;padding-top: 50px;transition: all .5s;}
-.historyBanner>ul>li{float: left;height: 300px;width: 1100px;}
-.historyBanner>ul>li>ol>li{float: left;text-align: center;width: 88px;vertical-align: top;} 
-.historyBanner>ul>li>ol>li p{width: 100px;font-size: 14px;color: #8d8d8d;visibility: hidden;margin-bottom: 5px;}
-.historyBanner>ul>li:first-child{background: url(../../img/aboutUs011.png) no-repeat center;background-size:98% 80% ;background-position-x: -11px;}
-.historyBanner>ul>li>ol>li span:hover{color: #ff7302;}
-.historyBanner>ul>li:first-child+li{background: url(../../img/aboutUs012.png) no-repeat center;background-size:98% 80% ;background-position-x: -11px;margin-left: -26px;}
-.historyBanner>ul>li:first-child>ol>li:nth-child(1){margin-top: 17px;margin-left: 2px;}
-.historyBanner>ul>li:first-child>ol>li:nth-child(2){margin-top: -13px;margin-left: 0px;}
-.historyBanner>ul>li:first-child>ol>li:nth-child(3){margin-top: -37px;margin-left: 0px;}
-.historyBanner>ul>li:first-child>ol>li:nth-child(4){margin-top: -50px;margin-left: 7px;}
-.historyBanner>ul>li:first-child>ol>li:nth-child(5){margin-top: -50px;margin-left: 10px;}
-.historyBanner>ul>li:first-child>ol>li:nth-child(6){margin-top: -30px;margin-left: 3px;}
-.historyBanner>ul>li:first-child>ol>li:nth-child(7){margin-top: -45px;margin-left: 8px;}
-.historyBanner>ul>li:first-child>ol>li:nth-child(8){margin-top: 14px;margin-left: 3px;}
-.historyBanner>ul>li:first-child>ol>li:nth-child(9){margin-top: 25px;margin-left: 6px;}
-.historyBanner>ul>li:first-child>ol>li:nth-child(10){margin-top: -25px;margin-left: 4px;}
-.historyBanner>ul>li:first-child>ol>li:nth-child(11){margin-top:0px;margin-left: -1px;}
-.historyBanner>ul>li:first-child>ol>li:nth-child(12){margin-top: -17px;margin-left:-12px;}
-
-.direction{width: 1200px;margin: 0 auto;margin-top: -150px;margin-bottom: 150px;}
-.direction span{width: 28px;height: 28px;background: #ff7302;display: inline-block;color: #FFFFFF;font-size: 18px;line-height: 28px;text-align: center;border-radius: 50%;cursor: pointer;}
-.direction span:first-child{float: left;}
-.direction span:first-child+span{float:right;}
-
-.historyBanner>ul>li:first-child+li>ol>li:nth-child(1){margin-top: -37px;margin-left: 44px;}
-.historyBanner>ul>li:first-child+li>ol>li:nth-child(2){margin-top: -5px;margin-left: 3px;}
-.historyBanner>ul>li:first-child+li>ol>li:nth-child(3){margin-top: -52px;margin-left: 5px;}
-.historyBanner>ul>li:first-child+li>ol>li:nth-child(4){margin-top: -45px;margin-left: 7px;}
-.historyBanner>ul>li:first-child+li>ol>li:nth-child(5){margin-top: -45px;margin-left:4px;}
-.historyBanner>ul>li:first-child+li>ol>li:nth-child(5) p{width:120px;margin-left:-10px;}
-.historyBanner>ul>li:first-child+li>ol>li:nth-child(6){margin-top: -50px;margin-left: 3px;}
-.historyBanner>ul>li:first-child+li>ol>li:nth-child(6) p{width:165px;margin-left:-40px;}
-.historyBanner>ul>li:first-child+li>ol>li:nth-child(7){margin-top: -50px;margin-left: 7px;}
-.historyBanner>ul>li:first-child+li>ol>li:nth-child(8){margin-top: -50px;margin-left: 8px;}
-.historyBanner>ul>li:first-child+li>ol>li:nth-child(8) p{width:165px;margin-left:-40px;}
-.historyBanner>ul>li:first-child+li>ol>li:nth-child(9){margin-top: -54px;margin-left: 8px;}
-.historyBanner>ul>li:first-child+li>ol>li:nth-child(9) p{width:165px;margin-left:-40px;}
-.historyBanner>ul>li:first-child+li>ol>li:nth-child(10){margin-top: -30px;margin-left:5px;}
-.historyBanner>ul>li:first-child+li>ol>li:nth-child(10) p{width:165px;margin-left:-40px;}
-.historyBanner>ul>li:first-child+li>ol>li:nth-child(11){margin-top:-20px;margin-left: 8px;}
-.historyBanner>ul>li:first-child+li>ol>li:nth-child(11) p{width:112px;margin-left:-15px;}
+.history {
+	clear: both;
+	padding-top: 70px;
+	position: relative;
+}
+
+.history h4 {
+	font-weight: normal;
+	font-size: 24px;
+	color: #1a1a1a;
+}
+
+.history h4 img {
+	margin-right: 5px;
+	vertical-align: middle;
+	margin-top: -2px;
+	margin-right: 5px;
+}
+
+.history h4 span {
+	font-size: 16px;
+	color: #605f5f;
+}
+
+.historyBanner {
+	width: 1100px;
+	clear: both;
+	overflow: hidden;
+	height: 350px;
+	margin-left: 50px;
+}
+
+.historyBanner ul {
+	width: 1000000px;
+	overflow: hidden;
+	padding-top: 50px;
+	transition: all .5s;
+}
+
+.historyBanner>ul>li {
+	float: left;
+	height: 300px;
+	width: 1100px;
+}
+
+.historyBanner>ul>li>ol>li {
+	float: left;
+	text-align: center;
+	width: 88px;
+	vertical-align: top;
+}
+
+.historyBanner>ul>li>ol>li p {
+	width: 100px;
+	font-size: 14px;
+	color: #8d8d8d;
+	visibility: hidden;
+	margin-bottom: 5px;
+}
+
+.historyBanner>ul>li:first-child {
+	background: url(../../img/aboutUs011.png) no-repeat center;
+	background-size: 98% 80%;
+	background-position-x: -11px;
+}
+
+.historyBanner>ul>li>ol>li span:hover {
+	color: #ff7302;
+}
+
+.historyBanner>ul>li:first-child+li {
+	background: url(../../img/aboutUs012.png) no-repeat center;
+	background-size: 98% 80%;
+	background-position-x: -11px;
+	margin-left: -26px;
+}
+
+.historyBanner>ul>li:first-child>ol>li:nth-child(1) {
+	margin-top: 17px;
+	margin-left: 2px;
+}
+
+.historyBanner>ul>li:first-child>ol>li:nth-child(2) {
+	margin-top: -13px;
+	margin-left: 0px;
+}
+
+.historyBanner>ul>li:first-child>ol>li:nth-child(3) {
+	margin-top: -37px;
+	margin-left: 0px;
+}
+
+.historyBanner>ul>li:first-child>ol>li:nth-child(4) {
+	margin-top: -50px;
+	margin-left: 7px;
+}
+
+.historyBanner>ul>li:first-child>ol>li:nth-child(5) {
+	margin-top: -50px;
+	margin-left: 10px;
+}
+
+.historyBanner>ul>li:first-child>ol>li:nth-child(6) {
+	margin-top: -30px;
+	margin-left: 3px;
+}
+
+.historyBanner>ul>li:first-child>ol>li:nth-child(7) {
+	margin-top: -45px;
+	margin-left: 8px;
+}
+
+.historyBanner>ul>li:first-child>ol>li:nth-child(8) {
+	margin-top: 14px;
+	margin-left: 3px;
+}
+
+.historyBanner>ul>li:first-child>ol>li:nth-child(9) {
+	margin-top: 25px;
+	margin-left: 6px;
+}
+
+.historyBanner>ul>li:first-child>ol>li:nth-child(10) {
+	margin-top: -25px;
+	margin-left: 4px;
+}
+
+.historyBanner>ul>li:first-child>ol>li:nth-child(11) {
+	margin-top: 0px;
+	margin-left: -1px;
+}
+
+.historyBanner>ul>li:first-child>ol>li:nth-child(12) {
+	margin-top: -17px;
+	margin-left: -12px;
+}
+
+.direction {
+	width: 1200px;
+	margin: 0 auto;
+	margin-top: -150px;
+	margin-bottom: 150px;
+}
+
+.direction span {
+	width: 28px;
+	height: 28px;
+	background: #ff7302;
+	display: inline-block;
+	color: #FFFFFF;
+	font-size: 18px;
+	line-height: 28px;
+	text-align: center;
+	border-radius: 50%;
+	cursor: pointer;
+}
+
+.direction span:first-child {
+	float: left;
+}
+
+.direction span:first-child+span {
+	float: right;
+}
+
+.historyBanner>ul>li:first-child+li>ol>li:nth-child(1) {
+	margin-top: -37px;
+	margin-left: 44px;
+}
+
+.historyBanner>ul>li:first-child+li>ol>li:nth-child(2) {
+	margin-top: -5px;
+	margin-left: 3px;
+}
+
+.historyBanner>ul>li:first-child+li>ol>li:nth-child(3) {
+	margin-top: -52px;
+	margin-left: 5px;
+}
+
+.historyBanner>ul>li:first-child+li>ol>li:nth-child(4) {
+	margin-top: -45px;
+	margin-left: 7px;
+}
+
+.historyBanner>ul>li:first-child+li>ol>li:nth-child(5) {
+	margin-top: -45px;
+	margin-left: 4px;
+}
+
+.historyBanner>ul>li:first-child+li>ol>li:nth-child(5) p {
+	width: 120px;
+	margin-left: -10px;
+}
+
+.historyBanner>ul>li:first-child+li>ol>li:nth-child(6) {
+	margin-top: -50px;
+	margin-left: 3px;
+}
+
+.historyBanner>ul>li:first-child+li>ol>li:nth-child(6) p {
+	width: 165px;
+	margin-left: -40px;
+}
+
+.historyBanner>ul>li:first-child+li>ol>li:nth-child(7) {
+	margin-top: -50px;
+	margin-left: 7px;
+}
+
+.historyBanner>ul>li:first-child+li>ol>li:nth-child(8) {
+	margin-top: -50px;
+	margin-left: 8px;
+}
+
+.historyBanner>ul>li:first-child+li>ol>li:nth-child(8) p {
+	width: 165px;
+	margin-left: -40px;
+}
+
+.historyBanner>ul>li:first-child+li>ol>li:nth-child(9) {
+	margin-top: -54px;
+	margin-left: 8px;
+}
+
+.historyBanner>ul>li:first-child+li>ol>li:nth-child(9) p {
+	width: 165px;
+	margin-left: -40px;
+}
+
+.historyBanner>ul>li:first-child+li>ol>li:nth-child(10) {
+	margin-top: -30px;
+	margin-left: 5px;
+}
+
+.historyBanner>ul>li:first-child+li>ol>li:nth-child(10) p {
+	width: 165px;
+	margin-left: -40px;
+}
+
+.historyBanner>ul>li:first-child+li>ol>li:nth-child(11) {
+	margin-top: -20px;
+	margin-left: 8px;
+}
 
+.historyBanner>ul>li:first-child+li>ol>li:nth-child(11) p {
+	width: 112px;
+	margin-left: -15px;
+}

+ 512 - 194
src/css/inded.css

@@ -4,209 +4,527 @@ display:none;justify-content: space-between;background-color: #fff;}
 div.APP:hover>div.xialaewm{display:flex;}
 div.APP:hover{background-color: #fff;}*/
 
-.search-inp a.zaixian{right:150px;background-color: #1797E9;}
-.searchImg{position: absolute;top:7px;right:20px;z-index: 10;cursor: pointer;}
-.webkitDown{
-    width: 12px;
-    height: 8px;
-    display: inline-block;
-    background: url(../../img/index/index_down.jpg) no-repeat;
-    background-size:100% 100%; 
-    margin-left: 6px;
-}
-.jump{clear: both;list-style: none;}
-.jump>li{display: inline-block;font-size: 16px;line-height: 30px;margin-right:10px;}
-.jump>li>a{color:#757575;}
-.jump>li>a:hover{color:#1797E9}
-#terrace{width:100%;margin: 20px 0;}
-.terrace_title{width:1200px;height:50px;margin: 20px auto;text-align: center;}
-.terrace_cont{width:1200px;height:75px;margin: 0 auto;display: flex;justify-content: space-around;}
-.terrace_cont>div{width:400px;height:75px;display: flex;justify-content: flex-start;}
-.terraceH{margin-left: 15px;padding-top: 10px;}
-.terraceH>h4{margin-bottom: 10px;font-size: 17px;letter-spacing: 2px;font-weight: bold;}
-
-
-#apply{width:100%;margin-top: 40px;}
-.apply{width:1200px;height:300px;margin: 0 auto;display: flex;justify-content: space-between;}
-.apply_left{width:260px;height:300px;}
-.apply_right{width:915px;height:300px;display: flex;justify-content: flex-start;flex-wrap: wrap;}
-.apply_right>div>a{background-color:#F0F9FF;width:295px;height:145px;margin-left: 10px;
-display: flex;justify-content: space-around;padding: 35px 40px;}
-.apply_right>div>a>img{width:70px;height:75px;}
-.apply_right>div>a>h4{line-height: 70px;letter-spacing: 2px;font-size: 17px;font-weight: normal;color:#3C3E3E;
-width:120px;overflow: hidden;
-    white-space:nowrap; 
-    text-overflow:ellipsis; 
-    -o-text-overflow:ellipsis;}
-
-#wield{width:100%;margin-top: 40px;}
-.wield_cont{width:1200px;height:400px;margin: 20px auto;text-align: center;position: relative;z-index: 22;}
-.wield_cont .video{
-    position: absolute;
-    width: 600px;
-    height: 400px;
-    z-index: 30;
-    background: #000;
-    box-shadow: 0 0 3px  #000;
-}
-.wield_cont .video video{
-    width: 100%;
-    height: 100%;
-    display: inline-block;
-}  
+.search-inp a.zaixian {
+	right: 150px;
+	background-color: #1797E9;
+}
+
+.searchImg {
+	position: absolute;
+	top: 7px;
+	right: 20px;
+	z-index: 10;
+	cursor: pointer;
+}
+
+.webkitDown {
+	width: 12px;
+	height: 8px;
+	display: inline-block;
+	background: url(../../img/index/index_down.jpg) no-repeat;
+	background-size: 100% 100%;
+	margin-left: 6px;
+}
+
+.jump {
+	clear: both;
+	list-style: none;
+}
+
+.jump>li {
+	display: inline-block;
+	font-size: 16px;
+	line-height: 30px;
+	margin-right: 10px;
+}
+
+.jump>li>a {
+	color: #757575;
+}
+
+.jump>li>a:hover {
+	color: #1797E9
+}
+
+#con {
+	width: 1400px;
+	margin: auto;
+	background: rgba(250,248,246,.5);
+	margin-bottom: 40px;
+	margin-top: 40px;
+	box-shadow: 0 0 10px 1px rgba(0, 0, 0, .1);
+}
+
+#terrace {
+	width: 1200px;
+	margin: auto;
+}
+
+.terrace_title {
+	width: 1200px;
+	height: 50px;
+	margin: 20px auto;
+	text-align: center;
+}
+
+.terrace_cont {
+	width: 1200px;
+	height: 75px;
+	margin: 0 auto;
+	display: flex;
+	justify-content: space-around;
+}
+
+.terrace_cont>div {
+	width: 400px;
+	height: 75px;
+	display: flex;
+	justify-content: flex-start;
+}
+
+.terraceH {
+	margin-left: 15px;
+	padding-top: 10px;
+}
+
+.terraceH>h4 {
+	margin-bottom: 10px;
+	font-size: 17px;
+	letter-spacing: 2px;
+	font-weight: bold;
+}
+
+#backg {
+	margin-top: -44px;
+	width: 100%;
+	height: 760px;
+	background: url(http://sportal.jishutao.com/portal/1.0.2/img/indedImg/inded10.png);
+	background-position: center;
+}
+
+#backg>#terrace {
+	padding-top: 80px;
+}
+
+#apply {
+	width: 100%;
+	margin-top: 40px;
+	height: 512px;
+}
+
+.apply {
+	width: 1200px;
+	height: 300px;
+	margin: 0 auto;
+	display: flex;
+	justify-content: space-between;
+}
+
+.apply_left {
+	position: relative;
+	width: 380px;
+	height: 512px;
+	display: flex;
+	/* background: rgba(244,244,244,.55); */
+	/* border-radius:.8em; */
+	box-shadow: 0 0 0 1px hsla(0, 0%, 100%, .3) inset, 0 .5em 1em rgba(0, 0, 0, 0.3);
+	text-shadow: 0 1px 1px hsla(0, 0%, 100%, .3);
+}
+
+.apply_left::before {
+	content: '';
+	position: absolute;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	margin: -30px;
+	z-index: -1;
+	-webkit-filter: blur(20px);
+	filter: blur(20px);
+}
+
+#apply_left_in {
+	height: 252px;
+	width: 162px;
+	margin: auto;
+}
+
+#apply_left_in p {
+	font-size: 36px;
+	color: #4079b9;
+	margin-top: 52px;
+}
+
+.apply_right {
+	width: 915px;
+	height: 512px;
+	display: flex;
+
+	flex-wrap: wrap;
+}
+
+.apply_right>div>a {
+	width: 260px;
+	height: 250px;
+	margin-left: 10px;
+	display: block;
+	padding: 35px 40px;
+	transition: all 0.2s ease-in;
+	box-shadow: 0 0 2px #ccc;
+}
+
+.apply_right>div>a:hover {
+	transform: scale(1.001);
+	box-shadow: 1px 1px 0 #f5f5f5, 2px 2px 0 #c9c9c9, 3px 3px 0 #bbb, 4px 4px 0 #b9b9b9, 5px 5px 0 #aaa, 6px 6px 1px rgba(0, 0, 0, 0.1), 0 0 5px rgba(0, 0, 0, 0.1), 1px 1px 3px rgba(0, 0, 0, 0.3), 3px 3px 5px rgba(0, 0, 0, 0.2), 5px 5px 10px rgba(0, 0, 0, 0.15);
+}
+
+.apply_right>div>a>img {
+	display: block;
+	margin: auto;
+	height: 100px;
+}
+
+.apply_right>div>a>span {
+	color: black;
+	display: inline-block;
+	text-align: center;
+	padding-top: 25px;
+	font-size: 16px;
+	width: 100%;
+}
+
+.apply_right>div>a>h4 {
+	line-height: 100px;
+	letter-spacing: 2px;
+	font-size: 30px;
+	font-weight: normal;
+	color: #3C3E3E;
+	/* width: 120px; */
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	-o-text-overflow: ellipsis;
+	text-align: center;
+}
+
+#wield {
+	width: 100%;
+	margin-top: 40px;
+}
+
+.wield_cont {
+	width: 1200px;
+	height: 400px;
+	margin: 20px auto;
+	text-align: center;
+	position: relative;
+	z-index: 22;
+}
+
+.wield_cont .video {
+	position: absolute;
+	width: 600px;
+	height: 400px;
+	z-index: 30;
+	background: #000;
+	box-shadow: 0 0 3px #000;
+}
+
+.wield_cont .video video {
+	width: 100%;
+	height: 100%;
+	display: inline-block;
+}
+
 .moreVideo {
-    width: 1200px;
-    margin: 0 auto;
-    text-align: right;
-    height: 60px;
-} 
-.moreVideo a{
-    font-size: 16px;
-    color: #383838
-}
-.moreVideo a:hover{
-    color: #1596E8;
-}
-.wield_cont>img{
-    width: 600px;
-    position: absolute;
-    right: 0;
-    top: 0;
-    height: 100%;
-    z-index: 25;
-}
-#wield>a{
-    color: #383838;
-}
-   
-.brands{width:100%;margin-top:-4px;position: relative;}
-.brands img{width:100%;}
-
-
-#hotProject{width:100%;padding-top: 30px;background:url("../../img/indedImg/inded40.png")no-repeat;}
-.hotProject_cont{width: 1200px;height:700px;margin:30px auto;display: flex;justify-content: space-between;flex-wrap: wrap;}
-.hotProject_cont>div{width:285px;height:335px;background-color: #fff;}
-.hotProject_cont>div>img{width:285px;height:165px;}
-.hotProject_cont>div>h3{margin:10px 0 10px 20px;letter-spacing: 2px;}
-.hotProject_cont>div>p{margin-left:20px;letter-spacing: 1px;height:60px;
-text-align: justify;text-overflow: ellipsis;overflow: hidden;display: -webkit-box;-webkit-box-orient: vertical; -webkit-line-clamp: 3;}
-.hotProject_cont>div>a{display:block;width:110px;height:33px;line-height: 30px;border: 2px solid #1596E8;margin-right: 15px;
-border-radius: 5px;margin-top:15px;/*float: right;*/margin-left:78px;text-align: center;color:#1596E8;letter-spacing: 1px;cursor: pointer;}
-
-.RecommendTitle>h2{font-weight: 500;}
-.view{padding-left: 620px;margin-top:30px;}
-.view>h4{font-size: 18px;color: #323131;font-weight: normal;margin-bottom: 24px;}
-.view>h4 a{
-    float: right;
-    
-}
-.view>h4 a span:nth-child(2){
-    width: 22px;
-    height: 22px;
-    border: 1px solid #cecece;
-    text-align: center;
-    line-height: 18px;
-    display: inline-block;
-    float: right;
-    color: #cecece
-}
-.view>h4 a:hover .line{
-    background: #1697e9;
-}
-.view>h4 a:hover span{
-    border-color:#1697e9;
-    color:#1697e9;
-}
-.view>h4 .line{
-    vertical-align: middle;
-    width: 470px;
-    height: 1px;
-    background: #cecece;
-    display: inline-block;
-}
-
-.brands>div{width:16%;height:90%;position: absolute;top:2.5%;right:20%;background-color: #fff;overflow: hidden;}
-.brands>div.brandsDiv{top:4.5%;}
-.brands>div>img{width:100%;height:100%;position:absolute;opacity: 0;}
-.brands>div>img:nth-child(1){opacity: 1;}
+	width: 1200px;
+	margin: 0 auto;
+	text-align: right;
+	height: 60px;
+}
+
+.moreVideo a {
+	font-size: 16px;
+	color: #383838
+}
+
+.moreVideo a:hover {
+	color: #1596E8;
+}
+
+.wield_cont>img {
+	width: 600px;
+	position: absolute;
+	right: 0;
+	top: 0;
+	height: 100%;
+	z-index: 25;
+}
+
+#wield>a {
+	color: #383838;
+}
+
+.brands {
+	width: 100%;
+	margin-top: -4px;
+	position: relative;
+}
+
+.brands img {
+	width: 100%;
+}
+
+
+#hotProject {
+	width: 100%;
+	padding-top: 30px;
+	background: url("../../img/indedImg/inded40.png")no-repeat;
+}
+
+.hotProject_cont {
+	width: 1200px;
+	height: 700px;
+	margin: 30px auto;
+	display: flex;
+	justify-content: space-between;
+	flex-wrap: wrap;
+}
+
+.hotProject_cont>div {
+	width: 285px;
+	height: 335px;
+	background-color: #fff;
+	margin-left: 20px;
+}
+
+.hotProject_cont>div>img {
+	width: 285px;
+	height: 165px;
+}
+
+.hotProject_cont>div>h3 {
+	/* margin: 10px 0 10px 20px; */
+	letter-spacing: 2px;
+	font-size: 23px;
+	text-align: center;
+	margin-top: 12px;
+}
+
+.hotProject_cont>div>p {
+	/* margin-left: 20px; */
+	/* letter-spacing: 1px; */
+	margin-top: 12px;
+	height: 60px;
+	text-align: center;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	display: -webkit-box;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 3;
+}
+
+.hotProject_cont>div>a {
+	display: block;
+	width: 110px;
+	height: 33px;
+	line-height: 30px;
+	border: 2px solid #1596E8;
+	border-radius: 5px;
+	margin: auto;
+	text-align: center;
+	color: #1596E8;
+	letter-spacing: 1px;
+	cursor: pointer;
+}
+
+
+.RecommendTitle>h2 {
+	/* font-weight: 500; */
+}
+
+.view {
+	padding-left: 620px;
+	margin-top: 30px;
+}
+
+.view>h4 {
+	font-size: 18px;
+	color: #323131;
+	font-weight: normal;
+	margin-bottom: 24px;
+}
+
+.view>h4 a {
+	float: right;
+
+}
+
+.view>h4 a span:nth-child(2) {
+	width: 22px;
+	height: 22px;
+	border: 1px solid #cecece;
+	text-align: center;
+	line-height: 18px;
+	display: inline-block;
+	float: right;
+	color: #cecece
+}
+
+.view>h4 a:hover .line {
+	background: #1697e9;
+}
+
+.view>h4 a:hover span {
+	border-color: #1697e9;
+	color: #1697e9;
+}
+
+.view>h4 .line {
+	vertical-align: middle;
+	width: 470px;
+	height: 1px;
+	background: #cecece;
+	display: inline-block;
+}
+
+.brands>div {
+	width: 16%;
+	height: 90%;
+	position: absolute;
+	top: 2.5%;
+	right: 20%;
+	background-color: #fff;
+	overflow: hidden;
+}
+
+.brands>div.brandsDiv {
+	top: 4.5%;
+}
+
+.brands>div>img {
+	width: 100%;
+	height: 100%;
+	position: absolute;
+	opacity: 0;
+}
+
+.brands>div>img:nth-child(1) {
+	opacity: 1;
+}
+
 /*.brands>div>img:nth-child(1){transition:opacity 2s linear }*/
-@keyframes imgani{
-	from{opacity: 0;}
-	to{opacity: 1;}
-}
-@keyframes imgbni{
-	from{opacity: 1;}
-	to{opacity: 0;}
-}
-.brands>div>img.ani{animation: imgani 4s linear  1 normal;animation-fill-mode: forwards;}
-.brands>div>img.bni{animation: imgbni 4s linear  1 normal;animation-fill-mode: forwards;}
-.carousel-control{top:38%;background-image: none!important;}
-
-.initModel{
-    position: fixed;
-    width: 100%;
-    height: 0;
-    background: rgba(0, 0, 0, .2);
-    top: 0;
-    left: 0;
-    z-index: 9999999999;
-    overflow: hidden;
-}
-.initModel div{
-    position: fixed;
-    left: 0;
-    top:10%;
-    width: 100%;
-    height: 0px;
-    background: url(../../img/index/initModelBj.png) no-repeat;
-    background-size:100% 100%;
-    overflow: hidden;
-    transition: all .2s ease-in; 
-    z-index:99999999991 ; 
-}
-.initModel.active div{
-    height:80%;
-    transition: all .2s ease-in-out;
+@keyframes imgani {
+	from {
+		opacity: 0;
+	}
+
+	to {
+		opacity: 1;
+	}
+}
+
+@keyframes imgbni {
+	from {
+		opacity: 1;
+	}
+
+	to {
+		opacity: 0;
+	}
+}
+
+.brands>div>img.ani {
+	animation: imgani 4s linear 1 normal;
+	animation-fill-mode: forwards;
+}
+
+.brands>div>img.bni {
+	animation: imgbni 4s linear 1 normal;
+	animation-fill-mode: forwards;
 }
+
+.carousel-control {
+	top: 38%;
+	background-image: none !important;
+}
+
+.initModel {
+	position: fixed;
+	width: 100%;
+	height: 0;
+	background: rgba(0, 0, 0, .2);
+	top: 0;
+	left: 0;
+	z-index: 9999999999;
+	overflow: hidden;
+}
+
+.initModel div {
+	position: fixed;
+	left: 0;
+	top: 10%;
+	width: 100%;
+	height: 0px;
+	background: url(../../img/index/initModelBj.png) no-repeat;
+	background-size: 100% 100%;
+	overflow: hidden;
+	transition: all .2s ease-in;
+	z-index: 99999999991;
+}
+
+.initModel.active div {
+	height: 80%;
+	transition: all .2s ease-in-out;
+}
+
 .initModel.active {
-    height:100%;
+	height: 100%;
 }
-.initModel .glyphicon-remove{
-    position: absolute;
-    font-size: 30px;
-    color: #fff;
-    right: 20px;
-    top: 20px;
-    cursor: pointer;
+
+.initModel .glyphicon-remove {
+	position: absolute;
+	font-size: 30px;
+	color: #fff;
+	right: 20px;
+	top: 20px;
+	cursor: pointer;
 }
-.initModel .glyphicon-remove:hover{
-    color: #f00;
+
+.initModel .glyphicon-remove:hover {
+	color: #f00;
 }
-.initModel a:hover{
-    color: #1596E8;
+
+.initModel a:hover {
+	color: #1596E8;
 }
+
 .initModel .moreActive {
-    position: absolute;
-    color: #fff;
-    font-size: 16px;
-    left: 52%;
-    transform: translateX(-50%);
-    bottom: 20%;
+	position: absolute;
+	color: #fff;
+	font-size: 16px;
+	left: 52%;
+	transform: translateX(-50%);
+	bottom: 20%;
 }
+
 .initModel .ljZhuCe {
-    position: absolute;
-    color: #fff;
-    font-size: 40px;
-    right:7%;
-    top: 45%;
-    transform: translateY(-50%);
-}
-.pub_fix{
-    z-index: 999999;
-}
-@media screen and (max-width:1600px){
-    .initModel .ljZhuCe{
-        font-size: 26px!important;
-        right:8.5%;
-    }
+	position: absolute;
+	color: #fff;
+	font-size: 40px;
+	right: 7%;
+	top: 45%;
+	transform: translateY(-50%);
+}
+
+.pub_fix {
+	z-index: 999999;
+}
+
+@media screen and (max-width:1600px) {
+	.initModel .ljZhuCe {
+		font-size: 26px !important;
+		right: 8.5%;
+	}
 }

Різницю між файлами не показано, бо вона завелика
+ 476 - 369
src/css/newMenu/header.css


Різницю між файлами не показано, бо вона завелика
+ 983 - 735
src/css/newMenu/index.css


+ 45 - 8
src/css/newMenu/public.css

@@ -692,18 +692,21 @@ a:active{text-decoration:none;}/* 指正在点的链接*/
 
 #bottom {
 	width: 100%;
-	height: 386px;
+	height: 150px;
 	margin: 20px auto 0;
 	position: relative;
-	background: url(../../../img/bottom_bg.png) no-repeat center center;
-	background-size: 120% 100%;
+	background: #8dbcf0;
+	/* background: url(../../../img/bottom_bg.png) no-repeat center center; */
+	/* background-size: 120% 100%; */
 }
 
 .bottom {
 	width: 1200px;
-	height: 386px;
+	height: inherit;
+	/* height: 386px; */
 	margin: 20px auto 0;
 	position: relative;
+	display: flex;
 }
 
 .bottom_text {
@@ -729,7 +732,7 @@ a:active{text-decoration:none;}/* 指正在点的链接*/
 	line-height: 25px;
 }
 
-.text_center {
+/* .text_center {
 	width: 100%;
 	height: 90px;
 	position: absolute;
@@ -737,17 +740,40 @@ a:active{text-decoration:none;}/* 指正在点的链接*/
 	left: 0;
 	color: #fff;
 	margin-top: 10px;
+} */
+.text_center {
+    width: 100%;
+    height: 120px;
+    margin: auto;
+    display: flex;
+    justify-content: space-between;
+    color: #fff;
 }
 
-.cont_left {
+.text_center .logo{
+	margin: auto 24px;
+    height: 100%;
+}
+
+/* .cont_left {
 	vertical-align: top;
 	width: 350px;
 	height: 90px;
 	display: inline-block;
 	margin-left: 45px;
+} */
+.cont_left {
+    vertical-align: top;
+    width: 27%;
+    height: inherit;
+    display: inline-block;
+}
+.cont_left>a{
+	color: #F5F6F9;
+    font-weight: bold;
 }
 .cont_left>p{
-	margin-top: 15px;
+	/* margin-top: 15px; */
 }
 .cont_left>img {
 	margin-left: 85px;
@@ -775,18 +801,26 @@ a:active{text-decoration:none;}/* 指正在点的链接*/
 	text-align: center;
 }
 
-.cont_right,
+/* .cont_right,
 .cont_rightapp {
 	width: 82px;
 	height: 90px;
 	display: inline-block;
 	text-align: center;
 	vertical-align: top;
+} */
+.cont_right, .cont_rightapp {
+    width: 27%;
+    height: inherit;
+    display: inline-block;
+    text-align: center;
+    vertical-align: top;
 }
 
 .text_center p {
 	color: #F5F6F9;
 	font-weight: bold;
+	margin-top: 16px;
 }
 
 .cont_rightapp {
@@ -803,6 +837,9 @@ a:active{text-decoration:none;}/* 指正在点的链接*/
 	width: 80px;
 	text-align: center;
 }
+.cont_right img{
+	height: 100%;
+}
 
 .text_bottom {
 	width: 100%;

+ 509 - 421
src/css/newMenu/serviceDetails.css

@@ -4,469 +4,557 @@
 */
 
 /* 面包削导航 */
-.navigation{
-    width: 100%;
-    height: 34px;
-    line-height: 34px;
-    background: #f9f9f9;
-    overflow: hidden;
-    margin-top: 10px;
-    margin-bottom: 22px;
-  
-}
-.navigation p{
-    float: left;
-    font-size: 14px;
-    margin-right: 12px;
-    color: #393939;
+.navigation {
+	margin: auto;
+	width: 1200px;
+	height: 34px;
+	line-height: 34px;
+	background: #f9f9f9;
+	overflow: hidden;
+	margin-top: 10px;
+	margin-bottom: 22px;
+
+}
+
+.navigation p {
+	float: left;
+	font-size: 14px;
+	margin-right: 12px;
+	color: #393939;
 }
+
 .navigation ol li {
-    float: left;
-    margin-right: 15px;
+	float: left;
+	margin-right: 15px;
 }
-.navigation ol li a{
-    font-size: 12px;
-    color: #797979;
+
+.navigation ol li a {
+	font-size: 12px;
+	color: #797979;
 }
-.navigation ol li a:hover{
-    color: #1697ea;
+
+.navigation ol li a:hover {
+	color: #1697ea;
 }
-.navigation ol li.active a{
-    color: #1697ea;
+
+.navigation ol li.active a {
+	color: #1697ea;
 }
-.commentDetails{
-    padding-left: 26px;
-    padding-top: 15px;
-    color: #707070;
+
+.commentDetails {
+	padding-left: 26px;
+	padding-top: 15px;
+	color: #707070;
 }
-.commentDetails span{
-    display: inline-block;
-    margin-right: 20px;
-    margin-left: 10px;
-    color: #707070;
+
+.commentDetails span {
+	display: inline-block;
+	margin-right: 20px;
+	margin-left: 10px;
+	color: #707070;
 }
+
 /* 主体内容 */
-.serviceDetailsImg{
-    float: left;
-    width: 370px;
-    height: 330px;
-    position: relative;
-    padding: 18px;
-    border: 1px solid #efefef;    
-}
-.serviceDetailsImg:hover img{
-    transform: scale(1.05);
-    transition: all .2s ease-in;
-}
-.serviceDetailsImg img{
-    width:100%;
-    height: 100%;
-    display: inline-block;
-    transition: all .2s ease-in-out;
-}
-.serviceDetailsImg>span{
-    width: 46px;
-    height: 40px;
-    display: inline-block;
-    background: url(../../../img/newMenu/achievement_26.png) no-repeat;
-    background-size: 100% 100%;
-    position: absolute;
-    top: 0;
-    left: 0
-}
-.serviceDetailsTxt{
-    float: right;
-    width: 777px;
-    margin-bottom: 30px;
-}
-.serviceDetailsTxt .serviceDetailsTitle{
-    padding-bottom: 20px;
-}
-.serviceDetailsTxt .serviceDetailsTitle h4{
-    font-size: 18px;
-    line-height: 50px;
-    height: 50px;
-    width: 100%;
-    color: #1f1f1f;
-    font-weight: 400;
-}
-
-.serviceDetailsTxt .serviceDetailsTitle p.advertisement{
-    font-size: 14px;
-    color: #9d9d9d;
-    display: inline-block;
-    width: 550px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    -o-text-overflow: ellipsis;
-    white-space: nowrap;
-}
-.serviceDetailsTxt .serviceDetailsTitle p{
-    height: 36px;
-    line-height: 36px;
-    font-size: 12px;
-}
-.serviceDetailsTxt .serviceDetailsTitle p strong{
-    font-weight: normal;
-    color: #707070;
-    width: 110px;
-    display: inline-block;
-}
-.serviceDetailsTxt .serviceDetailsTitle p span{
-    color: #9d9d9d;
-    font-size: 12px;
-}
-.serviceDetailsTxt>a{
-    cursor: pointer;
-    width: 150px;
-    display: inline-block;
-    height: 54px;
-    line-height: 54px;
-    text-align: center;
-    font-size: 18px;
-    color: #ffffff;
-    background: #1697ea;
-    margin-top: 16px;
-    border: 1px solid transparent;
-}
-.serviceDetailsTxt>a:hover{
-    background: #ffff;
-    border: 1px dashed #1697ea;
-    color: #1697ea;
-}
-.serviceDetailsTxt>p>a:hover span{
-    color: #1697ea;
-}
-.collection{
-    position: absolute;
-    bottom: -30px;
-    left: 0;
-    overflow: hidden;
-    clear: both;
-    padding-left: 18px;
-    padding-top: 18px;
-}
-.collection p span{
-    vertical-align: top;
-   color: #ff6a25
-}
-.collection p img{
-    margin-right: 12px;
-}
-.collection .heart{
-    width: 19px;
-    height: 18px;
-    display: inline-block;
-    background: url(../../../img/newMenu/serviceDetal_03.jpg) no-repeat;
-    background-size:100% 100%;
-    margin-right: 12px; 
-}
-.collection p{
-    cursor: pointer;
-    float: left;
-    height: 18px;
-    line-height: 18px;
-    font-size: 14px;
-    margin-right: 40px;
-}
-.collection .heart.active{
-    background: url(../../../img/newMenu/serviceDetal_Ok.jpg) no-repeat;
+.serviceDetailsImg {
+	float: left;
+	width: 500px;
+	height: 418px;
+	position: relative;
+	padding: 18px;
+	border: 1px solid #efefef;
+	margin-left: 50px;
+}
+
+.serviceDetailsImg:hover img {
+	transform: scale(1.05);
+	transition: all .2s ease-in;
+}
+
+.serviceDetailsImg img {
+	width: 100%;
+	height: 100%;
+	display: inline-block;
+	transition: all .2s ease-in-out;
+}
+
+.serviceDetailsImg>span {
+	width: 46px;
+	height: 40px;
+	display: inline-block;
+	background: url(../../../img/newMenu/achievement_26.png) no-repeat;
+	background-size: 100% 100%;
+	position: absolute;
+	top: 0;
+	left: 0
+}
+
+.serviceDetailsTxt {
+	float: right;
+	width: auto;
+	/* margin-bottom: 30px; */
+	margin-top: 56px;
+}
+
+.serviceDetailsTxt .serviceDetailsTitle {
+	padding-bottom: 20px;
+}
+
+.serviceDetailsTxt .serviceDetailsTitle h4 {
+	font-size: 30px;
+	line-height: 50px;
+	height: 50px;
+	width: 100%;
+	color: #333;
+	font-weight: 400;
+}
+
+.serviceDetailsTxt .serviceDetailsTitle p.advertisement {
+	font-size: 14px;
+	color: #9d9d9d;
+	display: inline-block;
+	width: 550px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	-o-text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.serviceDetailsTxt .serviceDetailsTitle p {
+	height: 36px;
+	line-height: 36px;
+	color: #666;
+	font-size: 24px;
+}
+
+.serviceDetailsTxt .serviceDetailsTitle p strong {
+	font-weight: normal;
+	color: #707070;
+	width: 110px;
+	display: inline-block;
+}
+
+.serviceDetailsTxt .serviceDetailsTitle p:first-of-type>span{
+	color:rgb(249,61,61);
+    font-size: 24px;
+}
+
+.serviceDetailsTxt>a {
+	cursor: pointer;
+	width: 150px;
+	display: inline-block;
+	height: 54px;
+	line-height: 54px;
+	text-align: center;
+	font-size: 18px;
+	color: #ffffff;
+	background: #1697ea;
+	margin-top: 16px;
+	border: 1px solid transparent;
+}
+
+.serviceDetailsTxt>a:hover {
+	background: #ffff;
+	border: 1px dashed #1697ea;
+	color: #1697ea;
+}
+
+.serviceDetailsTxt>p>a:hover span {
+	color: #1697ea;
+}
+
+.collection {
+	position: absolute;
+	bottom: -30px;
+	left: 0;
+	overflow: hidden;
+	clear: both;
+	padding-left: 18px;
+	padding-top: 18px;
+}
+
+.collection p span {
+	vertical-align: top;
+	color: #ff6a25
+}
+
+.collection p img {
+	margin-right: 12px;
 }
+
+.collection .heart {
+	width: 19px;
+	height: 18px;
+	display: inline-block;
+	background: url(../../../img/newMenu/serviceDetal_03.jpg) no-repeat;
+	background-size: 100% 100%;
+	margin-right: 12px;
+}
+
+.collection p {
+	cursor: pointer;
+	float: left;
+	height: 18px;
+	line-height: 18px;
+	font-size: 14px;
+	margin-right: 40px;
+}
+
+.collection .heart.active {
+	background: url(../../../img/newMenu/serviceDetal_Ok.jpg) no-repeat;
+}
+
 /* 
     详情
 */
-.serviceDetailsList{
-    padding-top: 40px;
-    width: 100%;
-    clear: both;
+.serviceDetailsList {
+	padding-top: 40px;
+	width: 100%;
+	clear: both;
 }
-.serviceDetailsList .introduction,.serviceDetailsList .requirement{
-    background: #ffffff;
-    padding-bottom: 28px;
+
+.serviceDetailsList .introduction,
+.serviceDetailsList .requirement {
+	background: #ffffff;
+	padding-bottom: 28px;
+	margin: auto;
+	width: 1200px;
 }
-.serviceDetailsList>div{
-    margin-bottom: 38px;
+
+.serviceDetailsList>div {
+	margin-bottom: 38px;
 }
 
-.serviceDetailsTxt .shopCar{
-    margin-left: 10px;
-    margin-right: 15px;
+.serviceDetailsTxt .shopCar {
+	/* margin-left: 10px; */
+	margin-right: 15px;
 }
-.serviceDetailsList img{
-    width: 100%;
-    display: inline-block;
+
+.serviceDetailsList img {
+	width: 100%;
+	display: inline-block;
 }
+
 /* 购物车 */
-.shopImg{
-    position: absolute;
-    top: 20px;
-    left: 20px;
-    z-index: -11;
-    width: 300px;
-    height:200px;
-    transition: all .3s ease-in-out;
-    opacity: 1;
-}
-.shopImg.active{
-    position: fixed;
-    top: 20px;
-    right: 500px;
-    width:0px;
-    height: 0px;
-    z-index: 99988;
-    transition: all .3s ease-in;
-    opacity: 0;
-}
-.serviceDetailsTitle p{
-    clear: both;
-}
-.numberDiv .input-group{
-    vertical-align: top;
+.shopImg {
+	position: absolute;
+	top: 20px;
+	left: 20px;
+	z-index: -11;
+	width: 300px;
+	height: 200px;
+	transition: all .3s ease-in-out;
+	opacity: 1;
+}
+
+.shopImg.active {
+	position: fixed;
+	top: 20px;
+	right: 500px;
+	width: 0px;
+	height: 0px;
+	z-index: 99988;
+	transition: all .3s ease-in;
+	opacity: 0;
+}
+
+.serviceDetailsTitle p {
+	clear: both;
+}
+
+.numberDiv .input-group {
+	vertical-align: top;
     margin-top: 5px;
     width: 130px;
-    margin-left: 85px;
+    margin-left: 60px;
 }
-.numberDiv{
-    overflow: hidden;
+
+.numberDiv {
+	overflow: hidden;
+	margin-top: 16px;
 }
-.numberDiv div{
-    height: 36px;
-    line-height: 36px;
-    font-size: 12px;
-    color: #707070;
-    float: left;
+
+.numberDiv div {
+	height: 36px;
+	line-height: 36px;
+	font-size: 24px;
+	color: #666;
+	float: left;
 }
-.shopCar span{
-    display: inline-block;
-    margin-right: 5px;
+
+.shopCar span {
+	display: inline-block;
+	margin-right: 5px;
 }
+
 .numberGrounp {
-    width: 66px;
-    height: 30px!important;
-    position: relative;
-}
-.numberGrounp #number{
-    width: 42px;
-    height: 30px;
-    border: 2px solid #dadade;
-    font-size: 14px;
-    position: absolute;
-    top: 0;
-    left: 0;
-    text-align: center
-}
-.numberDiv  .input-group>span{
-    height: 30px;
-    line-height: 30px;
-    margin-left: 5px;
-    color: #7a7878;
-    font-size: 14px;
-    display: inline-block;
-}
-.serviceDetailsTitle h4 .companyImg{
-    display: inline-block;
-    width: 23px;
-    height: 23px;
-    background: url(../../../img/shopList/shop_com.jpg) no-repeat;
-    background-size: 100% 100%;
-    margin-right: 12px;
-    vertical-align: middle;
-    margin-top: -3px;
-}
-.pagination a span{
-    color: #333;
-}
-.numberGrounp .up{
-    text-align: center;
-    color: #dadadd;
-    width:18px;
-    height: 14px;
-    display: inline-block;
-    position: absolute;
-    top: 0;
-    right: 0;
-    background: url(../../../img/patent/serviceUp.jpg)no-repeat;
-    background-size:100% 100%; 
-}
-.input-group .numberGrounp span:hover{
-    cursor: pointer;
-    box-shadow: inset 0px 0px 6px #ccc; 
-}
-.serviceDetailsTitle .moneyBj{
-    width: 530px;
-    height: 55px;
-    line-height: 55px;
-    /*background: url(../../../img/patent/serviceDetais_moneyBj.jpg)no-repeat;*/
-    background-size:100% 100%; 
-    padding-left: 8px;
-    font-size: 20px;
-    color: #ff580e;
-    margin-bottom: 10px;
-}
-.numberGrounp .down{
-    text-align: center;
-    color: #dadadd;
-    width:18px;
-    height: 14px;
-    display: inline-block;
-    position: absolute;
-    margin-top: 16px;
-    bottom: 0;
-    right: 0;
-    background: url(../../../img/patent/serviceDown.jpg)no-repeat;
-    background-size:100% 100%; 
-}
-.tabEvaluate{
-    clear: both;
-    margin-top: 40px;
-    width: 100%;
-    height: 42px;
-    line-height: 42px;
-    border: 1px solid #efefef;
-    background: #fcfcfc;
-}
-.tabEvaluate li{
-    cursor: pointer;
-    float: left;
-    width: 120px;
-    text-align: center;
-    font-size: 16px;
-    color: #1f1f1f;
-    border-right: 1px solid #efefef
-}
-.tabEvaluate li.active{
-    background: #1697ea;
-    color: #ffffff;
+	width: 66px;
+	height: 30px !important;
+	position: relative;
+}
+
+.numberGrounp #number {
+	width: 42px;
+	height: 30px;
+	border: 2px solid #dadade;
+	font-size: 14px;
+	position: absolute;
+	top: 0;
+	left: 0;
+	text-align: center
 }
+
+.numberDiv .input-group>span {
+	height: 30px;
+	line-height: 30px;
+	margin-left: 5px;
+	color: #7a7878;
+	font-size: 14px;
+	display: inline-block;
+}
+
+.serviceDetailsTitle h4 .companyImg {
+	display: inline-block;
+	width: 23px;
+	height: 23px;
+	background: url(../../../img/shopList/shop_com.jpg) no-repeat;
+	background-size: 100% 100%;
+	margin-right: 12px;
+	vertical-align: middle;
+	margin-top: -3px;
+}
+
+.pagination a span {
+	color: #333;
+}
+
+.numberGrounp .up {
+	text-align: center;
+	color: #dadadd;
+	width: 18px;
+	height: 14px;
+	display: inline-block;
+	position: absolute;
+	top: 0;
+	right: 0;
+	background: url(../../../img/patent/serviceUp.jpg)no-repeat;
+	background-size: 100% 100%;
+}
+
+.input-group .numberGrounp span:hover {
+	cursor: pointer;
+	box-shadow: inset 0px 0px 6px #ccc;
+}
+
+.serviceDetailsTitle .moneyBj {
+	width: 530px;
+	/* height: 55px;
+    line-height: 55px; */
+	/*background: url(../../../img/patent/serviceDetais_moneyBj.jpg)no-repeat;*/
+	/* background-size:100% 100%; */
+	/* padding-left: 8px; */
+	font-size: 24px;
+	color: red;
+	margin-bottom: 16px;
+	margin-top: 16px;
+}
+
+.numberGrounp .down {
+	text-align: center;
+	color: #dadadd;
+	width: 18px;
+	height: 14px;
+	display: inline-block;
+	position: absolute;
+	margin-top: 16px;
+	bottom: 0;
+	right: 0;
+	background: url(../../../img/patent/serviceDown.jpg)no-repeat;
+	background-size: 100% 100%;
+}
+
+.tabEvaluate {
+	clear: both;
+	margin: auto;
+	margin-top: 40px;
+	width: 1200px;
+	height: 42px;
+	line-height: 42px;
+	border: 1px solid #efefef;
+	background: #fcfcfc;
+}
+
+.tabEvaluate li {
+	cursor: pointer;
+	float: left;
+	width: 120px;
+	text-align: center;
+	font-size: 16px;
+	color: #1f1f1f;
+	border-right: 1px solid #efefef
+}
+
+.tabEvaluate li.active {
+	background: #1697ea;
+	color: #ffffff;
+}
+
 /* 评论 */
-.pagination_box{
-    display: none;
+.pagination_box {
+	display: none;
 }
-.evaluateList .list_none{
-    padding-top: 20px;
-    text-align: center;
-    padding-bottom: 100px;
+
+.evaluateList .list_none {
+	padding-top: 20px;
+	text-align: center;
+	padding-bottom: 100px;
 }
-.evaluateList{
-    display: none;
-    clear: both;
+
+.evaluateList {
+	display: none;
+	clear: both;
 }
+
 .evaluateList>ul>li {
-    border-bottom: 1px dotted #c6c2c2;
-    padding-left: 26px;
-    overflow: hidden;
-} 
-.evaluateList>ul>li p{
-    font-size: 14px;
-    color: #1f1f1f;
-    float: left;
-}  
-.evaluateList>ul>li>div.stasf{
-    width: 370px;
-    overflow: hidden;
-    padding: 25px 0 10px;;
-}
-.evaluateList>ul>li>div.stasf>p{
-    margin-right: 50px;
-}
-.evaluateList ul>li .satisfied{
-    float: left;
-}
-.evaluateList .uName{
-    margin-left: 10px;
+	border-bottom: 1px dotted #c6c2c2;
+	padding-left: 26px;
+	overflow: hidden;
+}
+
+.evaluateList>ul>li p {
+	font-size: 14px;
+	color: #1f1f1f;
+	float: left;
+}
+
+.evaluateList>ul>li>div.stasf {
+	width: 370px;
+	overflow: hidden;
+	padding: 25px 0 10px;
+	;
+}
+
+.evaluateList>ul>li>div.stasf>p {
+	margin-right: 50px;
+}
+
+.evaluateList ul>li .satisfied {
+	float: left;
+}
+
+.evaluateList .uName {
+	margin-left: 10px;
 }
+
 .satisfied ol li {
-    float: left;
+	float: left;
 }
-.satisfied ol li span{
-    color: #ff580e;
+
+.satisfied ol li span {
+	color: #ff580e;
 }
-.satisfied ol{
-    float: right;
-    margin-left: 8px;
-    font-size: 16px;
+
+.satisfied ol {
+	float: right;
+	margin-left: 8px;
+	font-size: 16px;
 }
+
 .satisfiedContent {
-    clear: both;
-    overflow: hidden;
-    margin-top: 8px;
-    padding-bottom: 27px;
+	clear: both;
+	overflow: hidden;
+	margin-top: 8px;
+	padding-bottom: 27px;
 }
-.satisfiedContent p{
-    padding-right:20px;
-    font-size: 12px;
-   color: #707070!important;
+
+.satisfiedContent p {
+	padding-right: 20px;
+	font-size: 12px;
+	color: #707070 !important;
 }
-.satisfiedContent time{
-    font-size: 12px;
-    color: #707070!important;
-    float: right;
+
+.satisfiedContent time {
+	font-size: 12px;
+	color: #707070 !important;
+	float: right;
 }
-.pagination{
-    float: right;
+
+.pagination {
+	float: right;
 }
+
 .totalCount {
-    float: right;
-    margin-top: 28px;
-    margin-right: 15px;
-}
-.pagination_box{
-margin-bottom: 100px;
-}
-.pagination_box .pagePre a{
-    margin-right: 10px
-}
-.pagination_box .pageNext a{
-    margin-left: 10px;
-}
-
-#commentArea{
-    width: 1000px;
-    height: 80px;
-    outline: none;
-    margin-left: 26px;
-    resize: none;
-    margin-top: 10px;
-    text-indent:1em;
-    line-height: 20px;
-    padding-top: 5px;
-}
-#commentArea:focus{
-    border-color:transparent; 
-    box-shadow: 0 0 10px #1697ea ;
-}
-.CommentSend{
-    height: 34px;
-}
-.CommentSend button{
-    width: 150px;
-    height: 34px;
-    margin-left: 26px;
-    margin-top: 6px;
-}
-.commentStar{
-    overflow: hidden;
-    margin-left: 26px;
-    margin-top: 10px;
-    line-height: 20px;
-}
-.commentStar>span{
-    display: inline-block;
-    float: left;
-    color: #ff570c
-}
-.commentStar .ulStar{
-    float: left;
-    margin-left: 6px;
-}
-.commentStar .ulStar span{
-    display: inline-block;
-    cursor: pointer;
-    margin-right: 4px;
-    font-size: 20px;
-    float: left;
-    color: #ff570c
-}
-.pagination li a{
-    color: #333;
+	float: right;
+	margin-top: 28px;
+	margin-right: 15px;
+}
+
+.pagination_box {
+	margin-bottom: 100px;
+}
+
+.pagination_box .pagePre a {
+	margin-right: 10px
+}
+
+.pagination_box .pageNext a {
+	margin-left: 10px;
+}
+
+#commentArea {
+	width: 1000px;
+	height: 80px;
+	outline: none;
+	margin-left: 26px;
+	resize: none;
+	margin-top: 10px;
+	text-indent: 1em;
+	line-height: 20px;
+	padding-top: 5px;
+}
+
+#commentArea:focus {
+	border-color: transparent;
+	box-shadow: 0 0 10px #1697ea;
+}
+
+.CommentSend {
+	height: 34px;
+}
+
+.CommentSend button {
+	width: 150px;
+	height: 34px;
+	margin-left: 26px;
+	margin-top: 6px;
+}
+
+.commentStar {
+	overflow: hidden;
+	margin-left: 26px;
+	margin-top: 10px;
+	line-height: 20px;
+}
+
+.commentStar>span {
+	display: inline-block;
+	float: left;
+	color: #ff570c
+}
+
+.commentStar .ulStar {
+	float: left;
+	margin-left: 6px;
+}
+
+.commentStar .ulStar span {
+	display: inline-block;
+	cursor: pointer;
+	margin-right: 4px;
+	font-size: 20px;
+	float: left;
+	color: #ff570c
+}
+
+.pagination li a {
+	color: #333;
 }

+ 1 - 0
src/css/newMenu/serviceList.css

@@ -21,6 +21,7 @@
 .industry .industryList {
     width: 1082px;
     float: left;
+	margin-top: 30px;
 }
 
 .industry .industryList ul li {

+ 4 - 1
src/css/newMenu/shopList.css

@@ -15,6 +15,9 @@
     margin-left: 14px;
     display: inline-block;
 }
+.navigationShop container{
+	height: 613px;
+}
 
 .tabShop {
     margin-top: 19px;
@@ -310,7 +313,7 @@
     display: none;
     width: 550px;
     height: 150px;
-    margin: 100px auto;
+    margin: 200px 375px;
     background: url(../../../img/shopList/shop_null.png) no-repeat;
     background-size: 100% 100%;
 }

Різницю між файлами не показано, бо вона завелика
+ 778 - 588
src/css/newMenu/tradingIndex.css


+ 206 - 58
src/css/thinkTank/policyDetail.css

@@ -1,74 +1,222 @@
-#policyDetail{padding-top: 50px;width:100%;background: #F5F5F5;border-top:6px solid #2C6597; padding-bottom: 100px; }
-#title_top{width:100%;height:45px;background: #fff;padding-top: 15px;border-bottom: 1px solid #EDEDED;}
-
-.title_top{width:1100px;height:30px;padding-left: 25px;line-height: 24px;margin: 0 auto;
-    background: url("../../../img/detail_home.jpg") no-repeat;}
-.title_top>a{color:#787878;}
-.title_top>a.a_detail{color:#3C3B3B;}
-
-#policy_content{width:1200px;margin: 0 auto;background: #fff;padding:40px 40px 0 50px;margin-bottom: 50px;
-position: relative;}
-.content_left{width:780px;display: inline-block;margin-bottom: 150px;}
-.contetn_right{width:250px;height:800px;display: inline-block;position: absolute;
-top:40px;right:50px;}
-.content_left p{text-align: justify;text-indent: 14px;}
-.content_left h1{
-    font-size: 20px;
-}
-.content_left>h3{text-align: center;color:#2D6697;}
-.small_title{width:700px;height:50px;border-bottom: 1px solid #eee;padding-top: 25px;
-margin-bottom: 15px;}
-.small_title>span{float: right;margin-left: 20px;color:#ACACAC;}
-.small_title>p{color:#626161;}
-.small_title>h1{
-    font-size: 24px;
-}
-.contetn_right h5 a{
-    color: #333333;
-}
-
-.content_img{width:700px;height:350px;text-align: center;margin-top:15px;border-bottom: none; }
-.content_img>img{width:515px;height:340px;margin: 0 auto;}
-.content_left>h4{font-weight: bold;font-size: 16px;margin-bottom: 15px;}
-.content_left h5{display: inline-block;color:#222222;margin-bottom: 0;}
-.content_left>p{line-height: 26px; width:780px;font-family: "simsun";}
-.content_left>hr{margin: 0;display: inline-block;width: 780px;}
-.text_end{margin-top: 50px;}
-.next_div{width:780px;height:30px;}
-.contetn_right>div{width:250px;height:60px;border-bottom:1px solid #F1F1F1;}
-.contetn_right>div.right_title{width:250px;height:40px;}
-.contetn_right>div:hover h5 a{
-    color: #3185D0
-}
-.content_left a:hover{
-    color: #0C79FF;
+#policyDetail {
+	padding-top: 2px;
+	width: 100%;
+	background: #F5F5F5;
+	/* border-top: 6px solid #2C6597; */
+	padding-bottom: 100px;
 }
-.content_left a {
-    color :#333333;
+#policyDetail>div:first-of-type{
+	height: 58px;
+    width: 1200px;
+    margin: 12px auto;
+    position: relative;
+    background: white;
+    box-shadow: 0 0 10px 1px rgba(0,0,0,.1);
+}
+#policyDetail>div:first-of-type>p{
+	position: absolute;
+    bottom: 16px;
+    font-size: 16px;
+    margin-left: 50px;
+}
+#title_top {
+	width: 100%;
+	height: 45px;
+	background: #fff;
+	padding-top: 15px;
+	border-bottom: 1px solid #EDEDED;
+}
+
+.title_top {
+	width: 1100px;
+	height: 30px;
+	padding-left: 25px;
+	line-height: 24px;
+	margin: 0 auto;
+	background: url("../../../img/detail_home.jpg") no-repeat;
+}
+
+.title_top>a {
+	color: #787878;
+}
+
+.title_top>a.a_detail {
+	color: #3C3B3B;
+}
+
+#policy_content {
+	width: 1200px;
+	margin: 0 auto;
+	background: #fff;
+	padding: 40px 40px 0 50px;
+	margin-bottom: 50px;
+	position: relative;
+	box-shadow: 0 0 10px 1px rgba(0,0,0,.1);
+}
+
+.content_left {
+	width: 780px;
+	display: inline-block;
+	margin-bottom: 150px;
+}
+
+.contetn_right {
+	width: 250px;
+	height: 800px;
+	display: inline-block;
+	position: absolute;
+	top: 40px;
+	right: 50px;
+}
+
+.content_left p {
+	text-align: justify;
+	text-indent: 14px;
+}
+
+.content_left h1 {
+	font-size: 20px;
+}
+
+.content_left>h3 {
+	text-align: center;
+	color: #2D6697;
+}
+
+.small_title {
+	width: 700px;
+	height: 50px;
+	border-bottom: 1px solid #eee;
+	padding-top: 25px;
+	margin-bottom: 15px;
+}
+
+.small_title>span {
+	float: right;
+	margin-left: 20px;
+	color: #ACACAC;
+}
+
+.small_title>p {
+	color: #626161;
+}
+
+.small_title>h1 {
+	font-size: 24px;
 }
-.contetn_right>div.right_title>div{width:90px;height:40px;background: #3185D0;line-height: 40px;
-text-align: center;color:#F2F7FC;font-weight: bold;}
-.contetn_right>div>h5{margin: 0;font-weight: bold;padding-top: 10px;margin-bottom: 10px;width: 240px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;}
-.next_div span a:hover{color:#0C79FF;}
 
-#bottom{margin-top: -144px;}
+.contetn_right h5 a {
+	color: #333333;
+}
 
-.carousel{
-    width: 100%;
+.content_img {
+	width: 700px;
+	height: 350px;
+	text-align: center;
+	margin-top: 15px;
+	border-bottom: none;
 }
-.carousel img{
-    width: 100%;
-    height: 100%;
+
+.content_img>img {
+	width: 515px;
+	height: 340px;
+	margin: 0 auto;
 }
-.content_left p img{
-    width: 100%;
+
+.content_left>h4 {
+	font-weight: bold;
+	font-size: 16px;
+	margin-bottom: 15px;
 }
 
+.content_left h5 {
+	display: inline-block;
+	color: #222222;
+	margin-bottom: 0;
+}
 
+.content_left>p {
+	line-height: 26px;
+	width: 780px;
+	font-family: "simsun";
+}
 
+.content_left>hr {
+	margin: 0;
+	display: inline-block;
+	width: 780px;
+}
 
+.text_end {
+	margin-top: 50px;
+}
 
+.next_div {
+	width: 780px;
+	height: 30px;
+}
 
+.contetn_right>div {
+	width: 250px;
+	height: 60px;
+	border-bottom: 1px solid #F1F1F1;
+}
 
+.contetn_right>div.right_title {
+	width: 250px;
+	height: 40px;
+}
 
+.contetn_right>div:hover h5 a {
+	color: #3185D0
+}
 
+.content_left a:hover {
+	color: #0C79FF;
+}
+
+.content_left a {
+	color: #333333;
+}
+
+.contetn_right>div.right_title>div {
+	width: 90px;
+	height: 40px;
+	background: #3185D0;
+	line-height: 40px;
+	text-align: center;
+	color: #F2F7FC;
+	font-weight: bold;
+}
+
+.contetn_right>div>h5 {
+	margin: 0;
+	font-weight: bold;
+	padding-top: 10px;
+	margin-bottom: 10px;
+	width: 240px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.next_div span a:hover {
+	color: #0C79FF;
+}
+
+#bottom {
+	margin-top: -144px;
+}
+
+.carousel {
+	width: 100%;
+}
+
+.carousel img {
+	width: 100%;
+	height: 100%;
+}
+
+.content_left p img {
+	width: 100%;
+}

+ 350 - 270
src/css/thinkTank/policyList.css

@@ -1,348 +1,428 @@
 /* 搜索 */
-.banner{
-    width: 100%;
+.banner {
+	width: 100%;
 }
-.banner img{
-    width: 100%;
+
+.banner img {
+	width: 100%;
 }
-@media screen and(max-width:1200px){
-    .banner{
-        width:1200px;
-    }
+
+@media screen and(max-width:1200px) {
+	.banner {
+		width: 1200px;
+	}
 }
-.indexSearch{
-    width: 630px;
-    height: 36px;
-    margin: 37px auto ;
+
+.indexSearch {
+	width: 630px;
+	height: 36px;
+	margin: 37px auto;
 }
+
 /* footer{
     display: none;
 } */
 .form-control {
-    border-radius: 0;
-}
-.indexSearch .search-inp{
-    clear: both;
-    width:630px;
-    height: 36px;
-    float: left;
-}
-.indexSearch>span{
-    width: 140px;
-    display: inline-block;
-    height: 36px;
-    text-align: center;
-    color: #fff;
-    background: #5cb85c;
-    font-size: 16px;
-    line-height: 36px;
-    float: right;
-    border-radius: 5px;
-    cursor: pointer;
+	border-radius: 0;
 }
-.searchBtn{
-    width: 104px;
-    font-size: 18px;
+
+.indexSearch .search-inp {
+	clear: both;
+	width: 630px;
+	height: 36px;
+	float: left;
+}
+
+.indexSearch>span {
+	width: 140px;
+	display: inline-block;
+	height: 36px;
+	text-align: center;
+	color: #fff;
+	background: #5cb85c;
+	font-size: 16px;
+	line-height: 36px;
+	float: right;
+	border-radius: 5px;
+	cursor: pointer;
+}
+
+.searchBtn {
+	width: 104px;
+	font-size: 18px;
 }
-.indexSearch .demandSearch{
-    width: 530px;
-    height: 36px;
-    line-height: 34px;
-    border-color: #bbd5e5;
+
+.indexSearch .demandSearch {
+	width: 530px;
+	height: 36px;
+	line-height: 34px;
+	border-color: #bbd5e5;
 }
-.indexSearch .searchBtn{
-    height: 36px;
-    line-height: 22px;
-    background: #1697e9;
-    border: 1px solid #1697e9;
-    color: #ffffff;
+
+.indexSearch .searchBtn {
+	height: 36px;
+	line-height: 22px;
+	background: #1697e9;
+	border: 1px solid #1697e9;
+	color: #ffffff;
 }
-.indexSearch .searchBtn img{
-    width: 25px;height: 24px;
-    vertical-align: top
+
+.indexSearch .searchBtn img {
+	width: 25px;
+	height: 24px;
+	vertical-align: top
 }
-.indexSearch .search-inp .input-group{
-    width: 530px;
+
+.indexSearch .search-inp .input-group {
+	width: 530px;
 }
+
 /* 分页 */
 .pagination_box {
-    width: 100%;
-    line-height: 74px
+	width: 100%;
+	line-height: 74px
 }
 
 .pagination_box nav {
-    float: right;
-    clear: both;
+	float: right;
+	clear: both;
 }
 
 .pagination_box ul li a {
-    color: #333
+	color: #333
 }
 
 .pagination_box .pagination {
-    float: right;
-    margin-right: 20px;
-    margin-top: 25px;
+	float: right;
+	margin-right: 20px;
+	margin-top: 25px;
 }
 
 .pagination_box .totalCount {
-    float: right;
-    line-height:84px;
-    display: inline-block;
-    margin-right: 15px;
+	float: right;
+	line-height: 84px;
+	display: inline-block;
+	margin-right: 15px;
 }
-.inp{
-    float: right;
+
+.inp {
+	float: right;
 }
-.pagination_box{
-    display: none;
+
+.pagination_box {
+	display: none;
 }
+
 .list_none {
-    width: 550px;
-    height: 150px;
-    background: url("../../../img/all_null.png") no-repeat;
-    margin: 50px auto;
+	width: 550px;
+	height: 150px;
+	background: url("../../../img/all_null.png") no-repeat;
+	margin: 50px auto;
 }
-.inp{
-    display: none;
+
+.inp {
+	display: none;
 }
-.inp input{
-    vertical-align:middle;
-    width:40px;
-    height: 32px;
-    text-align: center;
-    border-radius: 5px;
-    border:1px solid #ccc;
+
+.inp input {
+	vertical-align: middle;
+	width: 40px;
+	height: 32px;
+	text-align: center;
+	border-radius: 5px;
+	border: 1px solid #ccc;
 }
-.inp button{
-    margin: 0 10px;
-    width: 50px;
+
+.inp button {
+	margin: 0 10px;
+	width: 50px;
 }
 
-.search{
-    width: 100%;
-    height: 52px;
-    line-height: 52px;
-    background: #f9f9f9;
+.search {
+	width: 100%;
+	height: 52px;
+	line-height: 52px;
+	background: #f9f9f9;
 }
-.pagination_box .pagePre a{
-    margin-right: 10px
+
+.pagination_box .pagePre a {
+	margin-right: 10px
 }
-.pagination_box .pageNext a{
-    margin-left: 10px;
+
+.pagination_box .pageNext a {
+	margin-left: 10px;
 }
+
 /* 主体内容 */
-.policyContent{
-    clear: both;
-    overflow: hidden;
-    border: 1px solid #eeeeee;
-    margin-bottom: 52px;
-}
-.policyContent div{
-    display: flex;
-    display: -webkit-flex;
-}
-.policyContent div p{
-    width: 115px;
-    background: #f9f9f9;
-    font-size: 18px;
-    color: #1f1f1f;
-    text-align: center;
-}
-.policyContent .type p{
-    line-height: 54px;
-    border-bottom: 1px dotted #dedede;
-}
-.policyContent .type ol{
-    overflow: hidden;
-    border-bottom: 1px dotted #dedede;
-}
-.policyContent .type ol li{
-    width: 130px;
-    text-align: center;
-}
-.policyContent .area p{
-    line-height: 108px;
-    transition: all .2s ease-in;
+.policyContent {
+	clear: both;
+	overflow: hidden;
+	border: 1px solid #eeeeee;
+	margin-bottom: 52px;
+	box-shadow: 0 0 10px 1px rgba(0, 0, 0, .1);
+}
+
+.policyContent div {
+	display: flex;
+	display: -webkit-flex;
+}
+
+.policyContent div p {
+	width: 115px;
+	background: #f9f9f9;
+	font-size: 18px;
+	color: #1f1f1f;
+	text-align: center;
+}
+
+.policyContent .type p {
+	line-height: 54px;
+	border-bottom: 1px dotted #dedede;
+}
+
+.policyContent .type ol {
+	overflow: hidden;
+	border-bottom: 1px dotted #dedede;
+}
+
+.policyContent .type ol li {
+	width: 130px;
+	text-align: center;
+}
+
+.policyContent .area p {
+	line-height: 108px;
+	transition: all .2s ease-in;
 }
+
 .policyContent .area ol {
-    width: 950px;
+	width: 950px;
 }
-.policyContent .area .more{
-    width: 80px;
-    display: inline-block;
-    line-height:34px;
-    height: 34px;
-    float: right;
-    text-align: center;
-    background: #1697e9;
-    color: #fff;
-    margin-top: 10px;
-    cursor: pointer;
-    margin-left: 20px;
-}
-.policyContent .area{
-    height: 108px;
-    overflow: hidden;
-    transition: all .2s ease-in;
-}
-.policyContent .area.active{
-    height: 275px;
-    transition: all .2s ease-in-out
-}
-.imgbg{width: 550px!important;height: 150px;background: url(../../../img/all_null.png) no-repeat;margin: 0px auto;}
-.policyContent .area.active p{
-    line-height: 275px;
-    transition: all .2s ease-in-out
-}
-.policyContent div ol{
-    width: 1085px;
-    padding: 0 15px;
-}
-
-.policyContent div ol li{
-    float: left;
-    padding: 0 15px;
-    line-height: 54px;
-    cursor: pointer;
-}
-.policyContent .area ol li{
-    border-bottom: 1px dotted #dedede;
-}
-.policyContent .area ol li span{
-    width: 100px;
-    text-align: center;
-    height: 34px;
-    line-height: 34px;
-    display: inline-block;
-    padding: 0 15px;
-}
-.policyContent .area ol li.active span{
-    background: #1697e9;
-    color: #fff;
-}
-.listContent{
-    clear: both;
-    overflow: hidden;
-}
-.listContent .newLsit{
-    width: 780px;
-    float: left;
-}
-.listContent .newLsit ul li a{
-    display: flex;
-    display: -webkit-flex;
-    justify-content: space-around
-}
-.listContent .hotNew{
-    width: 240px;
-    float: right;
+
+.policyContent .area .more {
+	width: 80px;
+	display: inline-block;
+	line-height: 34px;
+	height: 34px;
+	float: right;
+	text-align: center;
+	background: #1697e9;
+	color: #fff;
+	margin-top: 10px;
+	cursor: pointer;
+	margin-left: 20px;
 }
-.listContent .newLsit ul li a .yearTime{
-    width: 74px;
-    height: 74px;
-    padding: 13px 0;
-    background: #f4f4f4;
+
+.policyContent .area {
+	height: 108px;
+	overflow: hidden;
+	transition: all .2s ease-in;
 }
-.listContent .newLsit ul li a .yearTime p{
-    font-size: 16px;
-    color: #000;
-    text-align: center;
-    line-height: 24px;
+
+.policyContent .area.active {
+	height: 275px;
+	transition: all .2s ease-in-out
 }
-.listContent .newLsit ul li a .txt{
-    width:665px;
+
+.imgbg {
+	width: 550px !important;
+	height: 150px;
+	background: url(../../../img/all_null.png) no-repeat;
+	margin: 0px auto;
 }
-.listContent .newLsit ul li a .txt h4{
-    width: 470px;
-    overflow: hidden;
-    white-space:nowrap; 
-    text-overflow:ellipsis; 
-    -o-text-overflow:ellipsis;
-    font-weight: normal;
-    color: #1f1f1f;
-    font-size: 16px;
-    margin-bottom: 10px;
-    margin-top: 5px;
+
+.policyContent .area.active p {
+	line-height: 275px;
+	transition: all .2s ease-in-out
 }
-.listContent .newLsit ul li a .txt p{
-    font-size: 14px;
-    font-family: "宋体";
-    color: #7a7878;
-    overflow: hidden;
-    display: -webkit-box;              
-    text-overflow: ellipsis;            
-    -webkit-box-orient: vertical;       
-    -webkit-line-clamp:2;
+
+.policyContent div ol {
+	width: 1085px;
+	padding: 0 15px;
 }
-.listContent .newLsit ul li{
-    margin-bottom: 42px;
+
+.policyContent div ol li {
+	float: left;
+	padding: 0 15px;
+	line-height: 54px;
+	cursor: pointer;
 }
-.listContent .hotNew>p{
-    border-bottom: 1px solid #ededed;
-    height: 38px;
+
+.policyContent .area ol li {
+	border-bottom: 1px dotted #dedede;
 }
-.listContent .hotNew>p span{
-    display: inline-block;
-    width: 86px;
-    line-height: 38px;
-    text-align: center;
-    background: #1797e9;
-    color: #fff;
+
+.policyContent .area ol li span {
+	width: 100px;
+	text-align: center;
+	height: 34px;
+	line-height: 34px;
+	display: inline-block;
+	padding: 0 15px;
 }
-.listContent .hotNew  ul{
-    overflow: hidden;
+
+.policyContent .area ol li.active span {
+	background: #1697e9;
+	color: #fff;
 }
-.listContent .hotNew  ul li{
-    height: 70px;
-    border-bottom: 1px solid #ededed;
-    overflow: hidden;
+
+.listContent {
+	clear: both;
+	overflow: hidden;
+	box-shadow: 0 0 10px 1px rgba(0, 0, 0, .1);
 }
-.listContent .hotNew  ul li p{
-    width: 100%;
-    font-size: 14px;
-    color: #7a7878;
-    margin-top: 12px;
-    margin-bottom: 6px;
-    overflow: hidden;
-    white-space:nowrap; 
-    text-overflow:ellipsis; 
-    -o-text-overflow:ellipsis;
+
+.listContent .newLsit {
+	width: 780px;
+	float: left;
 }
-.listContent .hotNew  ul li time{
-    font-size:14px; 
-    color: #a0a0a0;
+
+.listContent .newLsit>div:first-of-type {
+	width: 96%;
+	height: 80px;
+	margin-left: 22px;
+	border-bottom: 6px solid #cccecd;
+	position: relative;
+}
+.listContent .newLsit>div>p{
+	font-size: 17px;
+    position: absolute;
+    bottom: 14px;
+    margin-left: 4px;
+}
+.listContent .newLsit>ul{
+	margin-top: 20px;
+    margin-left: 16px;
 }
-.policyContent .type ol li:hover{
-    color: #1797e9;
+
+.listContent .newLsit ul li a {
+	display: flex;
+	display: -webkit-flex;
+	justify-content: space-around
 }
-.policyContent .type ol li.active{
-    color: #1797e9;
-    font-weight: bold;
+
+.listContent .hotNew {
+	width: 350px;
+    float: right;
+    margin-right: 40px;
+    border-left: 1px solid rgb(230,230,230);
 }
-.hotNew ul li:hover p{
-    color: #1697e9;
+
+.listContent .newLsit ul li a .yearTime {
+	width: 74px;
+	height: 74px;
+	padding: 13px 0;
+	background: #f4f4f4;
 }
-.newLsit>ul>li:hover a .yearTime{
-    background: #1697e9;
+
+.listContent .newLsit ul li a .yearTime p {
+	font-size: 16px;
+	color: #000;
+	text-align: center;
+	line-height: 24px;
 }
-.newLsit>ul>li:hover a .yearTime p{
-    color: #fff;
+
+.listContent .newLsit ul li a .txt {
+	width: 665px;
 }
-.newLsit>ul>li:hover a .txt h4{
-    color: #1697e9;
+
+.listContent .newLsit ul li a .txt h4 {
+	width: 470px;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	-o-text-overflow: ellipsis;
+	font-weight: normal;
+	color: #1f1f1f;
+	font-size: 16px;
+	margin-bottom: 10px;
+	margin-top: 5px;
 }
 
+.listContent .newLsit ul li a .txt p {
+	font-size: 14px;
+	font-family: "宋体";
+	color: #7a7878;
+	overflow: hidden;
+	display: -webkit-box;
+	text-overflow: ellipsis;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 2;
+}
 
+.listContent .newLsit ul li {
+	margin-bottom: 42px;
+}
 
+.listContent .hotNew>p {
+	border-bottom: 3px solid #cccecd;
+    height: 80px;
+    position: relative;
+    margin-left: 40px;
+}
 
+.listContent .hotNew>p span {
+	display: block;
+    /* width: 86px; */
+    /* line-height: 38px; */
+    /* text-align: center; */
+    /* background: #1797e9; */
+    /* color: #fff; */
+    position: absolute;
+    bottom: 13px;
+    font-size: 17px;
+    margin-left: 4px;
+}
 
+.listContent .hotNew ul {
+	overflow: hidden;
+	margin-left: 40px;
+}
 
+.listContent .hotNew ul li {
+	height: 70px;
+	border-bottom: 1px solid #ededed;
+	overflow: hidden;
+}
 
+.listContent .hotNew ul li p {
+	width: 100%;
+	font-size: 14px;
+	color: #7a7878;
+	margin-top: 12px;
+	margin-bottom: 6px;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	-o-text-overflow: ellipsis;
+}
 
+.listContent .hotNew ul li time {
+	font-size: 14px;
+	color: #a0a0a0;
+}
 
+.policyContent .type ol li:hover {
+	color: #1797e9;
+}
 
+.policyContent .type ol li.active {
+	color: #1797e9;
+	font-weight: bold;
+}
 
+.hotNew ul li:hover p {
+	color: #1697e9;
+}
 
+.newLsit>ul>li:hover a .yearTime {
+	background: #1697e9;
+}
 
+.newLsit>ul>li:hover a .yearTime p {
+	color: #fff;
+}
 
+.newLsit>ul>li:hover a .txt h4 {
+	color: #1697e9;
+}

+ 1 - 1
src/js/newMenu/index.js

@@ -16,7 +16,7 @@ import 'js/public.js';
         $(window).scroll(function(){
             var scrolltop=$(document).scrollTop();
 			$('.topNav')[scrolltop>0?'addClass':'removeClass']('navFix');
-			videoAuto();
+			// videoAuto();
         });
 	}
 	 //轮播

+ 19 - 19
src/js/public.js

@@ -562,25 +562,25 @@ window.onload=function(){
 			localStorage.setItem('shopList',setData);
 		};
 		//title处理
-		titleLen();
-		function titleLen(){
-			$('.RecommendTitle h2,.patentTitle h2').mouseenter(function(){
-				let h2Len = $(this).text(),
-					lenW =   (h2Len.length)*30;
-				$(this).siblings().css({
-					width:lenW+'px',
-					transition: 'all .5s ease-in-out'
-				})
-			})
-			$('.RecommendTitle h2,.patentTitle h2').mouseout(function(){
-				let h2Len = $(this).text(),
-					lenW =   (h2Len.length)*30;
-				
-				$(this).siblings().css({
-					width:'54px'
-				})
-			})
-		}
+		// titleLen();
+// 		function titleLen(){
+// 			$('.RecommendTitle h2,.patentTitle h2').mouseenter(function(){
+// 				let h2Len = $(this).text(),
+// 					lenW =   (h2Len.length)*30;
+// 				$(this).siblings().css({
+// 					width:lenW+'px',
+// 					transition: 'all .5s ease-in-out'
+// 				})
+// 			})
+// 			$('.RecommendTitle h2,.patentTitle h2').mouseout(function(){
+// 				let h2Len = $(this).text(),
+// 					lenW =   (h2Len.length)*30;
+// 				
+// 				$(this).siblings().css({
+// 					width:'54px'
+// 				})
+// 			})
+// 		}
 	}
 	//banner 箭头高度处理
 	

+ 4 - 4
src/js/thinkTank/policyList.js

@@ -52,16 +52,16 @@ $(function () {
 							case '':
 								$('.type ol li').eq(0).addClass('active').siblings().removeClass('active');
 								break;
-							case '1':
+							case '0':
 								$('.type ol li').eq(1).addClass('active').siblings().removeClass('active');
 								break;
-							case '0':
+							case '1':
 								$('.type ol li').eq(2).addClass('active').siblings().removeClass('active');
 								break;
-							case '99':
+							case '2':
 								$('.type ol li').eq(3).addClass('active').siblings().removeClass('active');
 								break;	
-							case '98':
+							case '3':
 								$('.type ol li').eq(4).addClass('active').siblings().removeClass('active');
 								break;	
 							default:

+ 21 - 10
template/index.html

@@ -106,6 +106,14 @@
 					<div>知识产权交易</div>
 					<span>
 						<img src="../img/index/index_webkit3.png" alt="">
+						<img src="../img/indedImg/inded15.png" alt="">
+						<img src="../img/indedImg/inded20.png" alt="">
+						<img src="../img/indedImg/inded13.png" alt="">
+						<img src="../img/indedImg/inded14.png" alt="">
+						<img src="../img/indedImg/inded15.jpg" alt="">
+						<img src="../img/patent/service_130.png" alt="">
+						<img src="../img/indedImg/service_131.png" alt="">
+						<img src="../img/indedImg/inded42.png" alt="">
 					</span>
 					<p>
 						<a href="#">热门关注</a>
@@ -257,20 +265,20 @@
 			</div>
 			<div class="terrace_cont">
 				<div>
-					<img src="../img/indedImg/inded1.png" alt="" />
+					<!-- <img src="../img/indedImg/inded1.png" alt="" /> -->
 					<div class="terraceH">
 						<h4>智慧</h4>
 						<p>海量智力成果认知您的需求</p>
 					</div>
 				</div>
 				<div>
-					<img src="../img/indedImg/inded1.png" alt="" />
+					<!-- <img src="../img/indedImg/inded1.png" alt="" /> -->
 					<div class="terraceH">
 						<h4>合伙</h4>
 						<p>秉承十七载荣赢数万客户</p>
 					</div>
 				</div><div>
-					<img src="../img/indedImg/inded1.png" alt="" />
+					<!-- <img src="../img/indedImg/inded1.png" alt="" /> -->
 					<div class="terraceH">
 						<h4>社区</h4>
 						<p>严选数千位专家顾问答疑解惑</p>
@@ -282,7 +290,7 @@
 			<div class="apply">
 				<div class="apply_left">
 					<a href="">
-						<img src="../img/indedImg/inded15.jpg" alt="" />
+						<!-- <img src="../img/indedImg/inded15.jpg" alt="" /> -->
 					</a>
 				</div>
 				<div class="apply_right">
@@ -341,7 +349,7 @@
 				<img src="../img/indedImg/inded5.png" alt="" />
 			</div>
 			<div class="moreVideo">
-				<a href="">查看更多视频 >></a>
+				<a href="">查看更多视频 </a>
 			</div>
 		</div>
 		<div class="brands">
@@ -431,7 +439,7 @@
 		<div class="news">
 			<div class="policy">
 				<h4>政策
-					<a href="#"><span class="line"></span><span>></span></a>
+					<a href="#"><span class="line"></span><span></span></a>
 				</h4>
 				<img src="../img/index/index_new2.jpg" alt="">
 				<ul>
@@ -451,7 +459,7 @@
 			</div>
 			<div class="consultation">
 				<h4>资讯
-					<a href="#"><span class="line"></span><span>></span></a>	
+					<a href="#"><span class="line"></span><span></span></a>	
 				</h4>
 				<ul>
 					<li>
@@ -543,7 +551,10 @@
 		</div>
 		<div class="view">
 			<h4>观点
-				<a href="#"><span class="line"></span><span>></span></a>
+				<a href="#">
+					<span class="line"></span>
+					<span></span>
+				</a>
 			</h4>
 		</div>
 	</div>
@@ -795,8 +806,8 @@
 		<div class="initModel">
 			<div>
 				<span class="glyphicon glyphicon-remove"></span>
-				<a href="#" class="moreActive">了解活动规则详情 >></a>
-				<a href="#" class="ljZhuCe">立即注册 >></a>
+				<a href="#" class="moreActive">了解活动规则详情 </a>
+				<a href="#" class="ljZhuCe">立即注册 </a>
 			</div>
 		</div>
 	</footer>

+ 1 - 0
template/newMenu/tradingIndex.html

@@ -93,6 +93,7 @@
 					<div>知识产权交易</div>
 					<span>
 						<img src="../../img/index/index_webkit3.png" alt="">
+						<img src="../../img/patent/service_130.png" alt="">
 					</span>
 					<p>
 						<a href="#trandingIndexAchievement">转换技术成果</a>

+ 4 - 4
template/thinkTank/policyList.html

@@ -144,10 +144,10 @@
 				<p>类型</p>
 				<ol>
 					<li value="">不限</li>
-					<li value="1">政策</li>
-					<li value="0">资讯</li>
-					<li value='99'>技淘观点</li>
-					<li value='98'>知产百科</li>
+					<li value="0">政策</li>
+					<li value="1">资讯</li>
+					<li value='2'>技淘观点</li>
+					<li value='3'>知产百科</li>
 				</ol>
 			</div>	
 			<div class="area">

+ 2 - 2
webpack-dll.config.js

@@ -10,13 +10,13 @@ let theme = {
   '@link-color': '#58a3ff'
 };
 module.exports = (function () {
-	let staticHost = 'http://192.168.0.188:8088';    
+	let staticHost = 'http://172.16.1.187';    
     switch (argv.env.deploy) {
         case 'test':
             staticHost = 'http://statics.jishutao.com';
             break;
         case 'prod':
-            staticHost = 'http://ss.jishutao.com';
+            staticHost = 'http://js.junbangjishu.com';
             break;
         default:
             break;

+ 4 - 4
webpack.config.js

@@ -515,13 +515,13 @@ module.exports = (function () {
         }));
     }
 
-    let staticHost = 'http://192.168.0.188:80';
+    let staticHost = 'http://172.16.1.187';
     switch (argv.env.deploy) {
         case 'test':
             staticHost = 'http://statics.jishutao.com';
             break;
         case 'prod':
-            staticHost = 'http://ss.jishutao.com';
+            staticHost = 'http://js.junbangjishu.com';
             break;
         default:
             break;
@@ -547,9 +547,9 @@ module.exports = (function () {
         plugins: plugins,
         devServer: {
             disableHostCheck: true,
-            host: '192.168.0.188',
+            host: '172.16.1.187',
             port: 80,
-            allowedHosts: ['192.168.0.190', '192.168.0.99', '192.168.0.20','192.168.0.17'],
+            allowedHosts: ['192.168.0.222', '192.168.0.99', '192.168.0.20','192.168.0.17'],
             headers: {
                 "Access-Control-Allow-Origin": "*"
             }

+ 48 - 48
webpack/entry.config.js

@@ -54,197 +54,197 @@ module.exports = {
         'newMenu/specialDetail': './src/js/newMenu/specialDetail.js',
     },
     watch: {
-        'index': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'index': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/index.js'
         ],
-        'search': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'search': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/search.js'
         ],
-        'aboutUs': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'aboutUs': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/aboutUs.js'
         ],
-        'contactUs': ['webpack-dev-server/client?http://192.168.0.188',
+        'contactUs': ['webpack-dev-server/client?http://192.168.1.190',
             'webpack/hot/only-dev-server',
             './src/js/contactUs.js'
         ],
-        'register': ['webpack-dev-server/client?http://192.168.0.188',
+        'register': ['webpack-dev-server/client?http://192.168.1.190',
             'webpack/hot/only-dev-server',
             './src/js/register.js'
         ],
-        'thinkTank': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'thinkTank': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/thinkTank.js'
         ],
-        'technologyTrading/achievementDetail': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'technologyTrading/achievementDetail': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/technologyTrading/achievementDetail.js'
         ],
-        'technologyTrading/demandDetail': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'technologyTrading/demandDetail': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/technologyTrading/demandDetail.js'
         ],
-        'thinkTank/policyDetail': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'thinkTank/policyDetail': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/thinkTank/policyDetail.js'
         ],
-        'thinkTank/thinkerDetail': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'thinkTank/thinkerDetail': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/thinkTank/thinkerDetail.js'
         ],
-        'thinkTank/policyList': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'thinkTank/policyList': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/thinkTank/policyList.js'
         ],
         // newsApp 
-        'news/newsDetailApp': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'news/newsDetailApp': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/news/newsDetailApp.js'
         ],
-        'news/appCognizance': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'news/appCognizance': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/news/appCognizance.js'
         ],
-        'news/agreement': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'news/agreement': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/news/agreement.js'
         ],
         /* 2018-06 新版科技需求 */
-        'newMenu/demand': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/demand': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/demand.js'
         ],
-        'newMenu/achievement': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/achievement': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/achievement.js'
         ],
-        'newMenu/achievementList': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/achievementList': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/achievementList.js'
         ],
-        'newMenu/demandList': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/demandList': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/demandList.js'
         ],
-        'newMenu/services': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/services': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/services.js'
         ],
-        'newMenu/serviceList': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/serviceList': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/serviceList.js'
         ],
-        'newMenu/serviceDetails': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/serviceDetails': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/serviceDetails.js'
         ],
-        'newMenu/shopList': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/shopList': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/shopList.js'
         ],
-        'newMenu/patentList': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/patentList': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/patentList.js'
         ],
-        'newMenu/tradingIndex': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/tradingIndex': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/tradingIndex.js'
         ],
-        'newMenu/patent': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/patent': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/patent.js'
         ],
-        'newMenu/companyProfile': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/companyProfile': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/companyProfile.js'
         ],
-        'newMenu/continueHigh': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/continueHigh': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/continueHigh.js'
         ],
-        'newMenu/practicalPatent': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/practicalPatent': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/continueHigh.js'
         ],
-        'newMenu/militaryProject': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/militaryProject': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/continueHigh.js'
         ],
-        'newMenu/safeguarding': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/safeguarding': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/safeguarding.js'
         ],
-        'evaluation/evaluate': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'evaluation/evaluate': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/evaluate.js'
         ],
-        'newMenu/adviserList': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/adviserList': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/adviserList.js'
         ],
-        'newMenu/adviserDetail': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/adviserDetail': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/adviserDetail.js'
         ],
-        'newMenu/adviser': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/adviser': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/adviser.js'
         ],
-        'newMenu/safeguardingList': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/safeguardingList': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/safeguardingList.js'
         ],
-        'newMenu/safeguardingDetail': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/safeguardingDetail': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/safeguardingDetail.js'
         ],
-        'newMenu/brandBuild': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/brandBuild': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/loading/brandBuild.js'
         ],
-        'newMenu/marketOpen': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/marketOpen': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/loading/marketOpen.js'
         ],
-        'newMenu/taxFinance': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/taxFinance': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/loading/taxFinance.js'
         ],
-        'newMenu/governmentSupport': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/governmentSupport': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/loading/governmentSupport.js'
         ],
-        'newMenu/assessment': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/assessment': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/loading/assessment.js'
         ],
-        'newMenu/Invitation': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/Invitation': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/loading/Invitation.js'
         ],
-        'newMenu/invRegister': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/invRegister': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/loading/invRegister.js'
         ],
-        'newMenu/video': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/video': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/video.js'
         ],
-        'newMenu/videoDetail': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/videoDetail': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/videoDetail.js'
         ],
-        'facilitator': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'facilitator': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/facilitator/facilitator.js'
         ],
-        'newMenu/special': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/special': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/special.js'
         ],
-        'newMenu/specialDetail': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/specialDetail': ['webpack-dev-server/client?http://192.168.1.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/specialDetail.js'
         ],