瀏覽代碼

Merge branch 'master' of http://git.jishutao.com/jishutao/portal

yee 7 年之前
父節點
當前提交
2246d537df
共有 51 個文件被更改,包括 603 次插入316 次删除
  1. 二進制
      img/erweima.jpg
  2. 二進制
      img/erweima_android.jpg
  3. 二進制
      img/erweima_iphone.png
  4. 二進制
      img/fund_begin1.png
  5. 二進制
      img/index_banner03.jpg
  6. 二進制
      img/index_bannerbj.png
  7. 二進制
      img/investmentDetail_banner01.jpg
  8. 二進制
      img/property_090.jpg
  9. 二進制
      img/property_091.jpg
  10. 二進制
      img/property_092.jpg
  11. 二進制
      img/property_10.jpg
  12. 二進制
      img/tech_th.png
  13. 二進制
      img/tech_tr.png
  14. 二進制
      img/tech_trbs.png
  15. 二進制
      img/tech_tss.png
  16. 二進制
      img/tech_ty.png
  17. 二進制
      img/tech_tyhs.png
  18. 二進制
      img/thinkerDetail_banner01.jpg
  19. 1 1
      package.json
  20. 10 7
      src/css/Technologytrading.css
  21. 2 2
      src/css/financial/investmentDetail.css
  22. 17 14
      src/css/financialIndex.css
  23. 44 24
      src/css/index_home.css
  24. 6 1
      src/css/main_banner.css
  25. 7 3
      src/css/member.css
  26. 11 9
      src/css/public.css
  27. 37 24
      src/css/service.css
  28. 15 14
      src/css/service/highTechCognizance.css
  29. 29 19
      src/css/service/propertyRight.css
  30. 1 1
      src/css/technologyFinancial.css
  31. 4 2
      src/css/technologyTrading/achievement.css
  32. 10 8
      src/css/technologyTrading/achievementDetail.css
  33. 4 3
      src/css/technologyTrading/demandDetail.css
  34. 2 2
      src/css/thinkTank/policyDetail.css
  35. 1 1
      src/css/thinkTank/policyList.css
  36. 3 2
      src/css/thinkTank/thinkerDetail.css
  37. 16 12
      src/css/thinktank.css
  38. 46 31
      src/js/Technologytrading.js
  39. 4 8
      src/js/financialIndex.js
  40. 16 2
      src/js/index.js
  41. 25 5
      src/js/service/propertyRight.js
  42. 95 20
      src/js/technologyTrading/achievement.js
  43. 88 3
      src/js/technologyTrading/demand.js
  44. 29 77
      src/js/thinktank.js
  45. 5 5
      template/financial/investmentDetail.html
  46. 1 1
      template/financialIndex.html
  47. 47 3
      template/index.html
  48. 5 0
      template/member.html
  49. 5 1
      template/service.html
  50. 15 9
      template/service/propertyRight.html
  51. 2 2
      webpack.config.js

二進制
img/erweima.jpg


二進制
img/erweima_android.jpg


二進制
img/erweima_iphone.png


二進制
img/fund_begin1.png


二進制
img/index_banner03.jpg


二進制
img/index_bannerbj.png


二進制
img/investmentDetail_banner01.jpg


二進制
img/property_090.jpg


二進制
img/property_091.jpg


二進制
img/property_092.jpg


二進制
img/property_10.jpg


二進制
img/tech_th.png


二進制
img/tech_tr.png


二進制
img/tech_trbs.png


二進制
img/tech_tss.png


二進制
img/tech_ty.png


二進制
img/tech_tyhs.png


二進制
img/thinkerDetail_banner01.jpg


+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "aft-portal",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "",
   "main": "index.js",
   "scripts": {

+ 10 - 7
src/css/Technologytrading.css

@@ -1,7 +1,7 @@
 body{background:red;}
 *{box-sizing: border-box;}
 .clear_line{width:100%;height:1px;}
-#technology{width:100%;height:420px;box-shadow: 0 8px 8px 0 #E4E4E4;}
+#technology{width:100%;height:420px;box-shadow: 0 8px 8px 0 #E4E4E4;background: #fff;}
 .technolo{width:1200px;height:420px;padding-top:40px;margin:0 auto;
     position: relative;}
 .technolo_left{width:390px;height:340px;display:inline-block;
@@ -12,25 +12,28 @@ body{background:red;}
 .technolo>div>h3{color:#256195;}
 .technolo>div>div:hover{background: url("../../img/technology_bg.png") center center;
 background-size: 390px 235px;}
-.technolo_text{width:365px;height:190px;border:1px solid #F4F4F4;overflow: hidden;
+.technolo_text{width:365px;height:209px;border:1px solid #F4F4F4;overflow: hidden;
     margin:12px auto;border-radius: 10px;padding: 50px 10px 0 30px;}
 .technolo_text>div{margin-bottom: 12px;line-height: 33px;height:35px;}
-.technolo_text h5{color:#FF951D;margin:0;font-size: 1.5rem;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;}
+.technolo_text h5{color:#666;margin:0;font-size: 1.5rem;overflow: hidden;text-overflow: ellipsis;
+    white-space: nowrap;width:220px;line-height: 35px;display: inline-block;}
 .technolo_text p{display: inline-block;color:#666;font-size: 1.5rem;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;}
-.technolo_text a{display: inline-block;color:#666;float:right;cursor: text;font-size: 1.5rem;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;}
+.technolo_text a{display: inline-block;color:#FF951D;float:right;font-size: 1.5rem;overflow: hidden;
+    text-overflow: ellipsis;white-space: nowrap;display: inline-block;cursor: pointer;}
 .technolo>div>div>img{position: absolute;top:-40px;left:20px;}
 .technolo>div>div>span{width:75px;height:35px;background: #FFB200;
     border-radius: 10px;position: absolute;left:40px;bottom:0;text-align: center;
     line-height: 35px;color:#fff;}
 .technolo_center{width:390px;height:340px;display:inline-block;
     position: absolute;top:40px;left:400px;}
-.technolo_center .technolo_text>div{cursor: pointer;}
+.technolo_center .technolo_text h5{overflow: hidden;text-overflow: ellipsis;white-space: nowrap;}
+.technolo_center .technolo_text a{line-height: 35px;cursor: pointer;}
 .technolo_right{width:390px;height:340px;display:inline-block;
     position: absolute;top:40px;right:0;}
 .technolo_right .technolo_text p{display: none;position: absolute;top:-30px;left:-295px;z-index: 100;background: #fff;width:300px;height:270px;overflow: auto;
 color:#333;}
 .technolo_right .technolo_text a{cursor: pointer;}
-.technolo_right .technolo_text h5{color:#FF951D;margin:0;line-height: 24px;}
+.technolo_right .technolo_text h5{margin:0;line-height: 35px;}
 /*search*/
 #search{width:100%;height:270px;background: #F5F5F5;padding-top: 25px;margin-top: 10px;}
 .search{width:1200px;height:215px;background: url("../../img/search_bg.png") center center;
@@ -153,7 +156,7 @@ body{background: #f5f5f5;}
 
 .answer{width:100%;height:100%;position: fixed;top:0;left:0;background-color: rgba(100,100,100,0.5);z-index: 1000;display: none;}
 .answer>p{width:400px;margin: 0 auto;margin-top: 100px;background-color: #fff;padding: 30px 50px;border-radius: 10px;
-box-shadow: 0 0 10px 0 #999;display: none;position: relative;}
+box-shadow: 0 0 10px 0 #999;display: none;position: relative;line-height: 22px;}
 .answer>p>span{position: absolute;top:5px;right:20px;font-size: 28px;cursor: pointer;}
 
 

+ 2 - 2
src/css/financial/investmentDetail.css

@@ -31,10 +31,10 @@
 .list_width{position: absolute;top:18px;left: 40px;overflow: hidden;width: 564px;}
 
 .detail_right{width: 450px;}
-.detail_right .institutions_love {position: relative;z-index: 10;height: 260px;}
+.detail_right .institutions_love {position: relative;z-index: 10;height: 260px;overflow: hidden;}
 .institutions_love>img{width: 450px;top: 0;height: 260px;}
 .institutions_love .love_text{position:absolute ;background: rgba(255,255,255, .5);width: 450px;height: 38px;line-height: 38px;bottom: 0;}
-.love_text p{float: left;margin-left:56px ;}
+.love_text p{float: left;margin-left:35px ;}
 .love_text p span{color: #ffb200;}
 .love_text p img{vertical-align: top;margin-top: 12px;}
 .institutions_top h4{font-weight: normal;font-size: 20px;color: #074d88;margin-top: 14px;margin-bottom: 14px;}

+ 17 - 14
src/css/financialIndex.css

@@ -20,7 +20,7 @@
 .pagination ul{float: left;}
 .pagination > li > a, .pagination > li > span{color: #333333;}
 .list_none{width:550px;height:150px;background:url("../../img/all_null.png") no-repeat;margin:50px auto;}
-.imgnull{width:260px;height:211px;background:url("../../img/zhuanliimg_null.png") no-repeat;background-size: 260px 211px;}
+.imgnull{width:285px;height:235px;background:url("../../img/zhuanliimg_null.png") no-repeat;background-size: 285px 235px;}
 
 
 
@@ -35,16 +35,15 @@
     padding: 15px 15px;}
 .classify>div:hover{background: #fff;box-shadow: 0 0 10px 0 #E5E5E5;}
 .begin{height:140px;text-align: center;padding-top: 20px;}
-.begin>button{width:220px;height:60px;background: #FF9A25;color: #fff;font-weight: bold;
-font-size: 24px;border: none;}
-.begin>button:focus{border: none;}
+.begin>a{width:220px;height:60px;background: #FF9A25;color: #fff;
+font-size: 24px;border: none;display: inline-block;line-height: 60px;}
+.begin>a:hover{background:#f9bb73 ;}
 .classify_cont{width:200px;height:270px;padding-top:50px;background: #fff;
     border: 1px solid #E9E8E7;text-align: center;}
 .classify_img{width:65px;height:65px;margin: 0 auto;}
 .classify_cont>h3{color: #F7972F;line-height: 40px;}
 .classify_cont>p{padding: 0 10px;color:#B2B1B1;line-height: 20px;
     text-align: left;}
-
 #member{width:100%;height:520px;background: #F2F2F2;}
 #member_two{width:100%;height:520px;background: #F2F2F2;}
 .member{width:1200px;height:520px;margin: 0 auto;position: relative;}
@@ -56,15 +55,16 @@ font-size: 24px;border: none;}
 .member_img4{top:280px;right:30px;}
 
 #info{width:100%;height:966px;background: url("../../img/bottom_top_bg.png") center center;
+.info a{color: #FFFFFF!important;}
 background-size: 100% 100%;}
 #bottom{margin-top: -386px;}
 .info{width:1200px;height:430px;margin: 0 auto;padding-top: 100px;}
-.info>div{width:390px;height:430px;display: inline-block;margin-right: 5px;
+.info>div{width:380px;height:430px;display: inline-block;margin-right: 16px;
 text-align: center;background: #fff;}
 .info>div>img{width:100%;}
 .info h3{color:#15588F;line-height: 40px;margin-top: 20px;}
-.info p{line-height: 20px;height:70px;padding: 0 10px;}
-.info>div>div{width:100px;height:30px;color:#fff;font-size: 16px;margin-left: 250px;
+.info p{line-height: 20px;height:62px;padding: 0 10px;text-align: left;overflow: hidden;margin-bottom: 15px;text-overflow: ellipsis; overflow: hidden;display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 3;text-align: justify;}
+.info>div>div{width:100px;height:30px;color:#fff;font-size: 16px;margin-left: 275px;
     font-weight: bold;background:#FFB200; line-height: 30px;text-align: center;}
 
 #allproduct{width:100%;height:1586px;background: #F2F2F2;
@@ -84,16 +84,16 @@ form>img{position: absolute;top:2px;right:10px;}
 
 .allproduct_cont ul li img{;width: 285px;height:235px;}
 .details_fix{position: absolute;top: 165px;background: rgba(131,146,145,0.5);z-index: 12;
-    width: 285px;height: 70px;text-align: left;color: #FFFFFF;padding-left: 10px;}
-.details_fix p{height:35px;width:100%;line-height: 35px;}
+    width: 285px;height: 70px;text-align: left;color: #FFFFFF;padding-left: 10px;padding-top: 10px;}
+.details_fix p{height:35px;width:100%;line-height: 35px;text-overflow:ellipsis;overflow: hidden;white-space: nowrap;margin-top: 10px;}
 .details_fix p:first-child{margin-top: 0;}
-.details_fix p span{color: #333333;margin-left: 5px;}
+.details_fix p span{color: #333333;margin-left: 5px;text-overflow: ellipsis;white-space: nowrap;overflow: hidden;}
 
-.details_text{width:280px;padding-top:10px ;position: absolute;left: 0;bottom:0px;}
+.details_text{width:280px;padding-top:10px ;position: absolute;left: 0;bottom:0;}
 .details_text p{width: 245px;margin:5px auto;color: #f68705;font-size: 16px;}
-.details_text p span{color: #333333;display: inline-block;width: 160px;overflow: hidden;height: 20px;vertical-align: top;
+.details_text p span{color: #787878;display: inline-block;width: 160px;overflow: hidden;height: 20px;vertical-align: top;
     text-overflow: ellipsis;white-space: nowrap;margin-left:5px; }
-.details_text p b{font-weight:normal;color: #333333;width:160px;height:40px ;display: inline-block;vertical-align: top; }
+.details_text p b{font-weight:normal;color: #787878;width:160px;height:40px ;display: inline-block;vertical-align: top; }
 .details_text a{width: 80px;height: 26px;display: inline-block;
     background: #ffb200;border-radius: 10px;float: right;
     line-height: 26px;text-align: center;color: #ffffff;
@@ -155,3 +155,6 @@ position: absolute;top:20px;left:20px;}
 
 
 
+
+
+

+ 44 - 24
src/css/index_home.css

@@ -1,9 +1,9 @@
 
 html{font-size:62.5%;}
-.index_activity{position: relative;z-index:110;background: url(../../img/index_bannerbj.png) no-repeat center center;margin-top:-144px;height: 270px;box-shadow: -5px 4px 10px #cccccc;}
+.index_activity{position: relative;z-index:110;background: url(../../img/index_bannerbj.png) no-repeat center center;margin-top:-144px;height: 270px;border-bottom: 1px solid #cccccc;}
 .index_activity ul li{float: left;width: 190px;height:90px ;text-align: center;background-position-y: 100px;}
 .index_activity ul li strong{font-size: 36px;color: #ffbc09;}
-.index_activity ul li p{font-size: 16px;color: #185487;}
+.index_activity ul li p{font-size: 16px;color: #074d88;font-weight: bold;}
 .index_activity ul{float: left;overflow: hidden;margin-top: 160px;}
 .index_activity form{float: right;position: relative;width: 270px;height: 44px;background: #FFFFFF;margin-top: 20px;box-shadow: 0 0 10px #CCCCCC;}
 .index_activity form .search{width: 20px;height: 20px;position: absolute;top: 12px;right:10px;}
@@ -27,7 +27,7 @@ html{font-size:62.5%;}
 /*active的css*/
 #active{width:1200px;height:240px;margin:0 auto;padding-top:50px;position: relative;}
 #active>.title{width:70px;height:160px;padding-top:12px; }
-#active>.title>p{width:25px;height:160px;font-size: 2rem;color:#074F88;
+#active>.title>p{width:25px;height:160px;font-size: 20px;color:#074d88;
     margin:0 0 50px 45px;font-weight: bold;line-height: 22px;}
 #active>.coupon{width:1130px;height:160px;padding:1px 0 0 40px; }
 #active .lf{background: url(../../img/coupon.jpg) no-repeat;}
@@ -43,9 +43,9 @@ html{font-size:62.5%;}
 /*product的css*/
 #product{width:1200px;height:450px;margin:0 auto;position: relative;margin-top:5px;}
 #product>.caption{margin-bottom: 74px;}
-.caption{width:100%;height:50px;font-size: 2rem;color:#074F88;
+.caption{width:100%;height:50px;font-size: 18px;color:#074d88;
     line-height: 50px;padding-left:30px;}
-#product>.content{width:1140px;height:400px;margin-left:30px;position: relative;  }
+#product>.content{width:1140px;height:400px;margin-left:30px;position: relative; }
 #product>.content>.cont{width:220px;height:350px;margin-right: 3px;
     display: inline-block;}
 #product>.content>.cont:last-child{margin-right: 0;}
@@ -54,49 +54,56 @@ html{font-size:62.5%;}
 .cont_top2{position: absolute;top:0;left:460px;background: #FFEED1;}
 #product .cont_bottom2{position: absolute;top:50px;left:690px;background: #5888B5;color:#fff;}
 .cont_top3{position: absolute;top:0;right:0;background: #FFEED1;}
-#product .img{width:220px;height:140px;position: relative;z-index: 10;}
-#product .img img:first-child{position: absolute;top: -72px;left: 50%;margin-left: -32px;}
+#product .img{width:220px;height:140px;position: relative;}
+#product .img img:first-child{position: absolute;top: -72px;left: 50%;margin-left: -32px;z-index: 56;}
 #product .img img:first-child+img{margin-top: -36px;}
 #product .text{width:220px;height:173px;}
-#product .text>h2{font-size: 1.8rem;height:60px;width:100%;line-height: 60px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;
-text-align: center;color:#3B3B3B;}
+#product .text>h2{font-size: 16px;height:60px;width:100%;line-height: 60px;overflow: hidden;/*text-overflow: ellipsis;white-space: nowrap;*/
+text-align: center;color:#383838;font-weight: bold;padding: 0 10px;}
 #product .cont_bottom1 .text>h2{color:#fff;}
 #product .cont_bottom2 .text>h2{color:#fff;}
 #product .cont_bottom1 .text>p{color:#fff;}
 #product .cont_bottom2 .text>p{color:#fff;}
-.text>p{width:180px;height:113px;margin-left:20px;color:#747474;line-height:20px;overflow: hidden;}
+#product .img img{z-index: 56;}
+.text>p{width:180px;height:113px;margin-left:20px;color:#616160;line-height:20px;overflow: hidden;font-size: 14px;font-family: "SimSun";}
 
 /*policy的css*/
 #policy{width:1200px;height:405px;margin:50px auto 0;position: relative;}
-#policy .captions{width:100%;font-size: 2rem;color:#074F88;margin-left: 45px;margin-top: 120px;margin-bottom: 20px;}
-.captions a,.caption a{font-size: 14px;color: #ffb200;margin-left: 12px;font-weight: both!important;height: 26px;line-height: 26px;display: inline-block;}
+.captions a,.caption a{font-size: 16px;color: #ffb200;margin-left: 12px;font-weight:700;height: 26px;line-height: 26px;display: inline-block;}
+#policy .captions{width:100%;font-size: 18px;color:#074d88;margin-left: 45px;margin-top: 120px;margin-bottom: 20px;}
+.captions a{font-size: 16px;color: #ffb200;margin-left: 12px;height: 26px;line-height: 26px;display: inline-block;}
+.captions a:hover{color:#ff8200;}
 
 .pol_cont{width:1110px;height:355px;margin-left:45px;position: relative; }
 .pol_left{width:525px;height:345px;box-shadow: 5px 5px 5px 0 #EaEaEa;
 display:inline-block;position: absolute;top:0;left:0;}
 .pol_left img {width: 100%;height: 200px;}
 .pol_left_cont{width:525px;height:145px;background: #F6F6F6;}
-.pol_left_cont h3{height:50px;width:515px;line-height: 50px;
-    color:#797979;font-size: 18px;padding-left:25px; overflow: hidden;text-overflow: ellipsis;white-space: nowrap;}
-.pol_left_cont p{line-height: 20px;padding:0 17px 0 25px;width:100%;height:62px;color:#616160;text-overflow: ellipsis;overflow: hidden;display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 3;}
+.pol_left_cont h3{height:50px;width:515px;line-height: 50px;font-weight: bold;
+    color:#383838 ;font-size: 16px;padding-left:25px; overflow: hidden;/*text-overflow: ellipsis;white-space: nowrap;*/}
+.pol_left_cont p{line-height: 20px;padding:0 17px 0 25px;width:100%;height:62px;color:#616160;font-size: 14px;
+    text-overflow: ellipsis;overflow: hidden;display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 3;font-family: "SimSun";}
 .pol_left_cont p a{color:#616160;font-size: 14px;}
 .pol_bottom{width:100%;height:30px;padding:0 12px 0 25px;}
-.more a{color:#FFBC08;font-weight: bold;font-size: 1.6rem;}
-.data{font-size: 1rem;color:#9B9A9A;line-height:20px;}
+.more a{color:#ffb200;font-size: 16px;}
+.more a:hover{color:#ff8400;}
+.data{font-size: 14px;color:#9b9a9a;line-height:20px;font-family: "SimSun";}
 
 .pol_right{width:560px;height:345px;margin-left:15px;
     display:inline-block;position: absolute;top:0;right:0;}
 .pol_right_big{width:560px;height:165px;box-shadow: 5px 5px 5px 0 #EaEaEa;border:1px solid #F1F1F1;
     border-radius: 2px;}
-.pol_right_big h3{height:50px;width:100%;line-height: 50px;
-    color:#797979;font-size: 18px;padding-left:25px; overflow: hidden;text-overflow: ellipsis;white-space: nowrap; }
-.pol_right_big p{line-height: 20px;padding:0 17px 0 25px;width:100%;height:82px;color:#616160;text-overflow: ellipsis;overflow: hidden;display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 4;}
+.pol_right_big h3{height:50px;width:100%;line-height: 50px;font-weight: bold;;
+   color:#383838;font-size: 16px;padding:0 15px 0 25px; overflow: hidden; /*text-overflow: ellipsis;white-space: nowrap;*/ }
+.pol_right_big p{line-height: 20px;padding:0 17px 0 25px;width:100%;height:82px;color:#616160;text-overflow: ellipsis;
+    overflow: hidden;display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 4;font-size: 14px;font-family: "SimSun";}
 .pol_right_big p a{color:#616160;}
 .pol_right_sm{width:275px;height:165px;display: inline-block;background: #F6F6F6;
     margin-top:15px;box-shadow: 5px 5px 5px 0 #EaEaEa;}
-.pol_right_sm h3{height:50px;width:275px;line-height: 50px;
-    color:#797979;font-size: 18px;padding-left:25px;  overflow: hidden;text-overflow: ellipsis;white-space: nowrap;}
-.pol_right_sm p{line-height: 20px;padding:0 17px 0 25px;width:100%;height:83px;color:#616160;text-overflow: ellipsis;overflow: hidden;display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 4;}
+.pol_right_sm h3{height:50px;width:275px;line-height: 50px;font-weight: bold;;
+    color:#383838;font-size: 16px;padding:0 10px 0 25px;  overflow: hidden;/*text-overflow: ellipsis;white-space: nowrap;*/}
+.pol_right_sm p{line-height: 20px;padding:0 17px 0 25px;width:100%;height:83px;color:#616160;font-family: "SimSun";font-size: 14px;
+    text-overflow: ellipsis;overflow: hidden;display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 4;}
 .pol_right_sm p a{color:#616160;}
 /*need的css*/
 .need_main{background: #f6f6f6;width: 100%;}
@@ -111,8 +118,21 @@ display:inline-block;position: absolute;top:0;left:0;}
 .carousel .need_prev{width: 30px;height: 34px;font-size: 24px;text-align: center;line-height: 34px;background: #686868;display: inline-block;color: #FFFFFF;position: absolute;top:90px;left:50px;box-shadow: 2px 2px 10px #333333;}
 .carousel ul{float: left;width: 100000px;}
 .carousel ul li{float: left;margin-left: 10px;margin-right: 10px;text-align: center;padding-bottom: 20px;}
-.carousel ul li p{font-size: 14px;color: #404040;line-height: 52px;background: #ffffff;box-shadow: 2px 2px 10px #333333;width: 320px;padding-left: 10px;padding-right: 10px;text-overflow: ellipsis;overflow: hidden;white-space: nowrap;}
+.carousel ul li p{font-size: 14px;color: #616160;line-height: 52px;background: #ffffff;box-shadow: 2px 2px 10px #333333;
+    width: 320px;padding-left: 10px;padding-right: 10px;text-overflow: ellipsis;overflow: hidden;white-space: nowrap;font-family: "Microsoft YaHei"}
+.carousel ul li p:hover{font-family: "Microsoft YaHei";color:#383838;}
 .carousel ul li img{width: 320px;height:160px;}
 .carousel .need_next{position: absolute;top:90px;right:30px;width: 30px;height: 34px;font-size: 24px;text-align: center;line-height: 34px;background: #686868;display: inline-block;color: #FFFFFF;box-shadow: 2px 2px 10px #333333;}
 .carousel .need_prev:hover,.carousel .need_next:hover{background: #003399;cursor: pointer;}
+.need_imgs ul li {position: relative;height: 216px;}
+.need_imgs ul li .need_black{position: absolute;top: 0 ;left: 0;width:320px ;height: 216px;background: rgba(0,0,0,.5);display: none;}
+.need_imgs ul li .need_black img{width: 29px;height: 24px;margin-top:78px;}
+.need_imgs ul li .need_black p{background: none;box-shadow: none;font-size: 14px;color: #FFFFFF;}
+.carousel ul li:hover .need_black{display: block;}
+
+/*精品成果鼠标经过*/
+ .con_hover{position: absolute;top: 0 ;left:0px;width:220px ;height: 385px;background: rgba(0,0,0,.4);text-align: center;z-index: 58;display: none;}
+ .con_hover img{width: 29px;height: 24px;margin-top:200px;margin-bottom: 10px;}
+ .con_hover p{font-size: 14px;color: #FFFFFF;}
+ .con_hover:hover{cursor: pointer;}
 

+ 6 - 1
src/css/main_banner.css

@@ -1,10 +1,15 @@
 .carouselt{ position:relative; overflow: hidden;width:100%;height:600px; }
 .ct-img-big{ position:absolute; }
 .ct-img-big li{ float: left; }
+.ct-img-big li img{height: 600px;}
+.btn{ position: absolute; display: block;}
+.btn-pre{top:220px;left:220px;display: none !important;}
+.btn-next{top:220px;right:220px;display: none !important;}
+.ct-img-small{height:30px;list-style: none;position: absolute;bottom:50px;left:45%;margin: 0 auto;}
 .btn{position: absolute; display: block;}
 .btn-pre{top:280px;left:220px;}
 .btn-next{top:280px;right:220px;}
-.ct-img-small{height:30px;list-style: none;position: absolute;bottom:50px;left:700px;margin: 0 auto;}
+.ct-img-small{height:30px;list-style: none;position: absolute;bottom:50px;left:45%;margin: 0 auto;}
 .ct-img-small li{width:20px;height:20px;border-radius: 50%;margin-left:20px; float: left;
 text-align: center;line-height: 20px;cursor: pointer;background: #fff;}
 .ct-img-small li.active{color:#fff;background: #DB192A;}

+ 7 - 3
src/css/member.css

@@ -8,19 +8,23 @@
 .member_on h5 img{margin-right: 10px;margin-left: -50px;}
 .member_on h5{font-weight: normal;font-size:16px ;color: #f18101;margin-left: 10px;}
 .member_on .blur{color: #0f72ba;}
-.member_on{width: 386px;}
+
+.member_on{width: 386px;margin-bottom: 100px;}
+.member_on>p{font-size: 14px;color: #5f5e5e;line-height: 36px;color: #5f5e5e;}
+.member_main .member_on:first-child{border-right: 1px solid #e5e5e5;}
+.member_on .member_left{margin-top: 20px;}
 .member_on .member_business_list { min-height: 320px}
 .member_on .member_business_list p{font-size: 14px;color: #5f5e5e;line-height: 36px;color: #5f5e5e;}
 
 .member_on ul{overflow: hidden;margin-left: 13px;margin-bottom: 100px;margin-top: 20px;}
 .member_on ul li{cursor: pointer;float: left;width: 110px;height: 48px;border: 1px solid #CCCCCC;line-height: 48px;text-align: center;margin: 5px;}
-.member_on .member_left{margin-top: 20px;}
+
 
 .member_on ul .then{border: 1px solid #f18101;}
 .member_on ul .then span{width: 70px;height: 20px;background: #ff6000;display: inline-block;color: #ffffff;line-height: 20px;font-size: 12px;margin-left: -38px;vertical-align: top;}
 .member_on ul .then time{width: 100px;height: 14px;font-size: 14px;line-height: 14px;display: inline-block;margin-top: -22px;vertical-align: top;color:#ff6000 ;}
 
-.partingline{width: 1px;height: 356px;border: 1px solid #e5e5e5;margin-top: 28px;}
+
 #bottom{margin-top: -150px;}
 .member_contant>a{width:150px ;height: 46px;display: inline-block;background: #ffb200;color: #FFFFFF;line-height: 46px;font-size: 16px;position: absolute;bottom: 32px;left: 50%;margin-left: -75px;}
 

+ 11 - 9
src/css/public.css

@@ -2,8 +2,9 @@
 *{padding: 0;margin: 0;box-sizing:border-box;font-family: "微软雅黑";}
 html{font-size:62.5%;}
 body{font:14px "simsun",Arial,Helvetica,sans-serif;width:100%;
-    background-color:#fff;
-    font-size:1.4rem;
+    background-color:#fff;-webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+    /*font-size:1.4rem;*/
     -webkit-user-select:none;
     -moz-user-select:none;
     -ms-user-select:none;
@@ -35,7 +36,7 @@ header .logo{float: left;padding-left: 20px;}
 
 header .nav{float: left;padding-left: 90px;}
 header .nav>ul>li{float: left;width: 120px;text-align: center;line-height: 76px;position: relative;}
-header .nav>ul>li>a{color: #333333;width: 120px;line-height: 76px;display: inline-block;font-size: 16px;}
+header .nav>ul>li>a{color: #074d88;width: 120px;line-height: 76px;display: inline-block;font-size: 16px;font-weight: bold;}
 header .nav>ul>li:hover a{color: #074F88;}
 .active a{color:#074F88!important;}
 /*2级导航*/
@@ -58,7 +59,7 @@ header .nav_right a{color: #333333;margin: 2px;}
 header .nav_right a:hover{color: #2a6597;}
 .nav ul li {position: relative;}
 .nav ul li img{width: 30px;height: 30px;position: absolute;right: 0px;top: 9px;}
-
+.nav_right a:first-child+a+a{display: none;}
 
 
 /*bottom的css*/
@@ -75,7 +76,7 @@ header .nav_right a:hover{color: #2a6597;}
 .cont_right,.cont_rightapp{width:82px;height:90px;display:inline-block;text-align: center;vertical-align:bottom;}
 .text_center p{color:#F5F6F9;line-height:50px;font-weight: bold;}
 .cont_center p{line-height:20px;}
-.cont_rightapp{margin-right: 18px;margin-left: 240px;}
+.cont_rightapp{margin-right: 5px;margin-left: 185px;}
 .cont_rightapp p{line-height: 30px;}
 .cont_right p{line-height: 30px;width: 80px;text-align: center;}
 .text_bottom{width:100%;height:75px;position: absolute;top:285px;left:0;color:#fff;
@@ -83,12 +84,12 @@ header .nav_right a:hover{color: #2a6597;}
 .text_bottom p{font-weight: bold;line-height: 25px;}
 .text_bottom a{color:#fff;font-size: 1.2rem;line-height: 18px;}
 .pol_act{margin-left: 5px;}
-
+.android{margin-right: 5px;}
 
 /*右侧挂件*/
 
 .pub_fix{width: 70px;position: fixed;right: 20px;bottom: 80px;border-radius: 10px;border: 1px solid #e0e0e0;overflow: hidden;
-    text-align: center;height: auto;background: #ffffff;z-index: 999;}
+    text-align: center;height:470px;background: #ffffff;z-index: 999;}
 
 .pub_fix .index_blur{width: 100%;height: 30px;line-height: 30px;background: #4c7fa9;display: inline-block;}
 .pub_fix .index_orange{width: 100%;height: 30px;line-height: 30px;background: #ffd68f;display: inline-block;}
@@ -103,11 +104,12 @@ header .nav_right a:hover{color: #2a6597;}
 /*登陆页面*/
 .login{width: 100%;background: rgba(6,6,6,.4);position: fixed;top: 0;left: 0;z-index: 999999;display: none;}
 .login_mian{width: 600px;background: #ffffff;position: absolute;top: 50%;margin-top: -200px;left: 50%;margin-left: -300px;padding-left: 60px;padding-top: 60px;padding-bottom: 96px;}
-.login_left{float: left;padding-bottom: 10px;;}
+.login_left{float: left;padding-bottom: 10px;width: 166px;}
 .login_left .login_ewm{width: 166px;padding-top: 34px;border-right: 1px solid #cccccc;padding-right: 30px;margin-bottom: 10px;}
 
 .login_left p{line-height: 26px;font-size: 14px;width: 138px;text-align: center;}
-.login_right{float: left;padding-left: 32px;}
+.login_right{float: left;padding-left: 32px;width:288px;}
+.login_check,.login_submit{width: 260px!important;}
 .login_right h5{font-size: 18px;color: #373739;font-weight: normal;}
 .login_right h5 a{font-size: 14px;color: #f81009;margin-left: 62px;}
 .login_right form .login_uesr,.login_pass{width: 256px;height: 40px;position: relative;border: 1px solid #cccccc;}

+ 37 - 24
src/css/service.css

@@ -3,21 +3,28 @@
 .serve{width:1200px;height:600px;margin:0 auto;}
 .serve_title{width:1200px;height:130px;text-align: center;}
 .clear_{width:100%;height:1px;}
-h2{color:#074F88;margin-top:90px;}
+h2{color:#074d88;margin-top:90px;font-size: 30px;}
 .serve_cont{width:1200px;height:470px;position: relative;}
 .serve_left{width:470px;height:470px;display: inline-block;}
 .serve_left>div{width:100%;height:110px;border-radius: 55px;
     position: relative;margin-bottom:20px;border: 2px solid transparent;
     }
+ 
+ .serve_left>div a{display: none;}
+    
+.serve_left>div span img:first-child+img{display: none;}   
 .serve_left>div:hover{border: 2px solid #BCBCBC;cursor: pointer;}
 .serve_left>div:hover span{background: #fff;}
-.serve_left>div:nth-child(1):hover span{background: #F8A346;}
+.serve_left>div:hover span img:first-child{display: none;}
+.serve_left>div:hover span img:first-child+img{display: block;}
+.serve_left>div:hover span{background: #F8A346;}
 .serve_left span{display: inline-block;width:108px;height:108px;text-align: center;line-height:100px;
-border-radius: 50%;border: 2px solid #F8A346;position: absolute;top:-1px;left:-2px;background: #eee;}
+border-radius: 50%;border: 2px solid #F8A346;position: absolute;top:-1px;left:-2px;background: #ffffff;}
+.serve_left>div span img{position: absolute;top: 21px;left: 23px;}
 .serve_left h3{display: inline-block;position: absolute;top:5px;left:120px;
-    color:#F8A346;}
+    color:#f68705;font-size: 16px;font-weight: bold;}
 .serve_left p{display: inline-block;position: absolute;top:35px;left:120px;
-    color:#A9A9A9;}
+    color:#7a7878;font-family: "simsun";width: 346px;height: 32px;text-overflow: ellipsis; overflow: hidden;display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 2;}
 .serve_left a{position:absolute;bottom:10px;right:20px;color:#F8A346;}
 
 .serve_right{width:710px;height:470px;display: inline-block;position: absolute;
@@ -27,7 +34,7 @@ right:0;bottom:0;padding-top: 50px;}
 .img_top{width:200px;height:123px;position: absolute;
 top:10px;left:14px; background: #fff;text-align: center;
 line-height: 120px}
-.img_top p{font-size: 3rem;color:#F8A346;}
+.img_top p{font-size: 20px;color:#F8A346;}
 .img_bottom{width:200px;height:128px;position: absolute;
     bottom:17px;left:14px;background:#fff;text-align: center;
 line-height: 120px;}
@@ -35,13 +42,15 @@ line-height: 120px;}
 
 
 
-.Intellectual{width: 100%;background: url(../../img/service_04.png)no-repeat center;height: 640px;}
+
+.Intellectual{width: 100%;background: url(../../img/service_04.png)no-repeat center;height: 640px;text-align: center;}
 .Intellectual .container>h3{font-size: 50px;color: #ffffff;width: 200px;margin: 0 auto;line-height: 150px;}
+
 .Intellectual .container{width: 1200px;}
 .Intellectual ul li{float: left;width: 360px;height: 450px;margin-left: 44px;}
 .Intellectual ul li:first-child{margin-left: 0;}
 .Intellectual_left{width: 360px;height: 145px;background: url(../../img/service_1.png);background-size: 100% 100%;}
-.Intellectual_left h4{font-weight: normal;height: 90px;font-size: 20px;color: #f68705;margin-left: 56px;padding-top: 32px;}
+.Intellectual_left h4{font-weight: normal;height: 90px;font-size: 20px;color: #f68705;margin-left: 56px;padding-top: 32px;text-align: left;}
 .Intellectual_left span{margin-top: 10px;font-size: 12px;color: #797979;text-align: left!important;line-height: 18px;display: inline-block;float: left;margin-left: 56px;}
 .Intellectual ul li:first-child+li{background: url(../../img/service_2.png) no-repeat;padding-top: 102px;}
 .Intellectual ul li:first-child+li+li{background: url(../../img/service_3.png) no-repeat;text-align: center;}
@@ -49,24 +58,28 @@ line-height: 120px;}
 .Intellectual ul li:first-child+li .time{font-size: 18px;color: #f68705;margin-top: 60px;}
 
 .number_ten{margin-top:16px;margin-bottom: 30px;}
-.Intellectual ul li:first-child+li+li p{font-size:36px ;color: #f68705;margin-top: 120px;margin-bottom: 90px;width: 332px;}
+.Intellectual ul li:first-child+li+li{padding-top: 100px;}
+.Intellectual ul li:first-child+li+li p{font-size:36px ;color: #f68705;;width: 332px;line-height: 56px;}
 .Intellectual ul li:first-child+li+li p span{font-size:60px;color: #f54c49;}
-.Intellectual ul li:first-child+li+li a{width: 216px;height: 70px;background: #ffb200;border-radius: 10px;text-align: center;display: inline-block;line-height: 70px;font-size: 24px;color: #ffffff;}
+.Intellectual ul li:first-child+li+li a{width: 216px;height: 70px;margin-top: 90px;background: #ffb200;border-radius: 10px;text-align: center;display: inline-block;line-height: 70px;font-size: 24px;color: #ffffff;}
 .Intellectual ul li:first-child+li+li a:hover{background: #fdce61;color: #000000;transition: all .5s;}
 
-
+.Intellectual>.container>a{width: 150px;height: 46px;display:inline-block;background: #ffb200;line-height: 46px;text-align: center;color:#FFFFFF;font-size: 16px; margin-top: 20px;}
 
 .customer_main{width: 400px;margin: 0 auto;}
 .customer hr{width: 1200px;margin: 0 auto;}
-.customer_main span{font-size: 40px;color: #074d88;width: 180px;text-align: center;line-height: 120px;display: inline-block;}
+
+.customer_main span{font-size: 40px;color: #074d88;width: 180px;text-align: center;line-height: 120px;display: inline-block;margin-top: 50px;}
+
+
 .that{border-bottom: 2px solid #074d88;}
 .customer_company{margin: 80px auto 0;display: none;}
 .customer_company:nth-child(1){display: block;}
 .customer_company li{float: left;width: 274px;margin-left: 14px;overflow: hidden;height:274px;}
 .customer_company li>img{width:274px;height:222px;border:none;}
 .customer_company li:first-child{margin-left:0 ;}
-.customer_company li p{width: 100%;line-height: 52px;text-align: center;font-size: 16px;color: #333333;background: #ffffff;border: 1px solid #cccccc;
-    margin-top: -2px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;padding: 0 5px;}
+.customer_company li p{width: 100%;line-height: 52px;text-align: center;font-size: 16px;color: #383838;background: #ffffff;border: 1px solid #cccccc;
+    margin-top: -2px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;padding: 0 5px;font-weight: bold;}
 .thon p{background: #ffb200!important;color: #FFFFFF!important;border: 1px solid transparent!important;}
 .customer_circle{clear: both;width: 85px;margin: 0 auto;overflow: hidden;padding-top: 58px;padding-bottom: 36px;}
 .customer_circle li{width: 15px;height: 15px;border-radius: 50%;background: #d5d6d8;float: left;margin-left: 5px;}
@@ -78,28 +91,28 @@ line-height: 120px;}
 #lawyer{display:none;}
 
 .technology{width: 100%;height:580px;background: url(../../img/service_10.png) no-repeat center;}
-.technology h3{margin-left: 700px;font-size: 50px;color: #ffffff;margin-top: 30px;font-weight: normal}
+.technology h3{margin-left: 700px;font-size: 30px;color: #ffffff;margin-top: 30px;font-weight: normal}
 .technology_box{width: 600px;margin-left: 500px;}
 .technology_left:first-child{margin-left: 0;}
 .technology_left{float: left;width: 290px;text-align: center;margin-left: 20px;}
-.technology_left p{font-size: 36px;color: #ffffff;margin-top: 260px;}
-.technology_left a{width: 136px;height:60px;text-align: center;font-size: 24px;color: #ffffff;display: inline-block;background: #fcab00;line-height: 60px;margin-top: 112px;float: right;}
+.technology_left p{font-size: 24px;color: #ffffff;margin-top: 260px;}
+.technology_left a{width: 136px;height:60px;text-align: center;font-size: 18px;color: #ffffff;display: inline-block;background: #fcab00;line-height: 60px;margin-top: 112px;float: right;}
 
 .cooperation{width: 100%;background: #f0f0f2;}
-.cooperation h4{font-size: 40px;color: #074d88;font-weight:normal;text-align: center;margin-top: 82px;margin-bottom: 22px;}
+.cooperation h4{font-size: 30px;color: #074d88;font-weight:normal;text-align: center;margin-top: 82px;margin-bottom: 22px;}
 .cooperation ol{width: 496px;margin: 0 auto;overflow: hidden;margin-bottom: 36px;}
 .cooperation ol li{float: left;width: 216px;height: 56px;border: 1px  solid #6a6a6a;text-align: center;
-    line-height: 56px;font-size: 24px;color: #6a6a6a;margin: 0 16px;cursor: pointer;}
+    line-height: 56px;font-size: 18px;color: #6a6a6a;margin: 0 16px;cursor: pointer;}
 .cooperation ol li.check_li{border-top:3px solid #EEA203; }
 .cooperation ul{clear: both;overflow: hidden;}
-.cooperation ul li{width: 270px;float: left;margin-left: 20px;overflow: hidden;position: relative;z-index: 10;height: 430px;overflow: hidden;}
+.cooperation ul li{width: 270px;float: left;margin-left: 20px;overflow: hidden;position: relative;z-index: 10;height: 430px;}
 .cooperation ul li:first-child{margin-left: 0;}
-.cooperation ul li>p{width: 100%;line-height: 100px;text-align: center;background: rgba(251,190,49,.8);font-size: 20px;color: #ffffff;}
+.cooperation ul li>p{width: 100%;line-height: 100px;text-align: center;background: rgba(251,190,49,.8);font-size: 16px;color: #ffffff;font-weight: bold;}
 
-.cooperation ul li .coop_text{position: absolute;top: 0;left: 0;width: 270px;height:430px;background:rgba(40,156,224,.7);z-index: 333;text-align: center;display: none;}
+.cooperation ul li .coop_text{position: absolute;top: 0;left: 0;width: 270px;height:430px;background:rgba(0,0,0,0.5);z-index: 333;text-align: center;display: none;}
 
-.coop_text h6{font-weight: normal;font-size: 20px;color: #ffffff;margin-top: 40px;margin-bottom: 25px;}
-.coop_text>p{font-size: 16px;color: #ffffff;padding-left: 20px;padding-right: 20px;text-align: left!important;}
+.coop_text h6{font-weight: normal;font-size: 16px;color: #ffffff;margin-top: 40px;margin-bottom: 25px;font-weight: bold;}
+.coop_text>p{font-size: 16px;color: #ffffff;padding-left: 20px;padding-right: 20px;text-align: left!important;font-family: "simsun";}
 
 .cooperation ul li:hover .coop_text{display: block; cursor: pointer;}
 .img_city{width: 100%;height: 300px;margin-top:-150px;background: url(../../img/service_15.png) no-repeat center center;background-size: 100% 100%}

+ 15 - 14
src/css/service/highTechCognizance.css

@@ -1,15 +1,15 @@
-h3{color:#356A9A;}
+h3{color:#074d88;}
 #first_title{width:1200px;height:110px;text-align: center;padding-top: 40px;margin: 0 auto; }
 #twotitle{width:1200px;height:110px;text-align: center;padding-top: 55px;margin: 0 auto;}
 #all_problem{width:100%;height:600px;background: #FCFAF9;}
 .problem{width:1200px;height:600px;position: relative;margin: 0 auto;overflow: hidden;}
 .problem_right{width:400px;height:600px;position: absolute;top:7px;right: 0;background: url("../../../img/hightech1.png")}
-.problem_left{width:560px;height:500px;position: absolute;top:0;left:0;overflow: hidden;padding-top: 50px;}
+.problem_left{width:580px;height:500px;position: absolute;top:0;left:0;overflow: hidden;padding-top: 50px;}
 .problem_left>div{position: absolute;left:0;display: none;}
 .problem_bottom{width:160px;height:50px;background: #FFB200;color:#fff;text-align: center;cursor: pointer;
-line-height: 50px;font-size: 18px;border-radius: 5px;position: absolute;bottom:40px;left:400px;}
+line-height: 50px;font-size: 18px;border-radius: 5px;position: absolute;bottom:40px;left:420px;}
 .problem_bottom a{color: #FFFFFF;}
-.leftdiv1{top:65px;font-size: 15px;}
+.leftdiv1{top:30px;font-size: 15px;line-height: 22px;}
 .leftdiv2{top:165px;font-size: 16px;line-height: 30px;}
 .leftdiv3{top:200px;font-size: 16px;line-height: 30px;}
 .leftdiv4{top:140px;font-size: 16px;line-height: 40px;}
@@ -46,8 +46,8 @@ line-height: 50px;font-size: 18px;border-radius: 5px;position: absolute;bottom:4
 .btn_div>div{height:160px;position: absolute;}
 .btn_div>a{padding: 0;}
 .btn_div>a>img{width:100%;}
-.leftdiv{background-image:linear-gradient(90deg,#e8e8e8,#fff,#fff);opacity: 0.6;}
-.rightdiv{background-image:linear-gradient(270deg,#e8e8e8,#fff,#fff);opacity: 0.6;}
+.leftdiv{background-image:linear-gradient(90deg,#e8e8e8,#fff,#fff);opacity: 0.4;}
+.rightdiv{background-image:linear-gradient(270deg,#e8e8e8,#fff,#fff);opacity: 0.4;}
 
 #all_policy{width:100%;height:400px;}
 #policy{width:1200px;height:400px;margin: 0 auto;padding-top: 40px;text-align: center;}
@@ -65,9 +65,9 @@ line-height: 50px;font-size: 18px;border-radius: 5px;position: absolute;bottom:4
 .field_7{top:200px;left:600px; }
 .field_8{top:170px;left:900px; }
 .field>div>div{width:250px;height:75px;border:1px solid #E3EAEF;background: #fff;position: absolute;
-top:30px;left:30px;line-height: 75px;text-align: center;color:#424141;font-size: 18px;
+top:30px;left:30px;line-height: 75px;text-align: center;color:#383838;font-size: 16px;
 box-shadow: 0 0 5px 0 #DCE4EC;z-index: 22;}
-.field>div>img{z-index: 222;width: 40px;height: 60px;position: absolute;left: 27px;}
+.field>div>img{z-index:56;width: 40px;height: 60px;position: absolute;left: 27px;}
 
 #all_goodness{width:100%;height:610px;}
 .goodness{width:1200px;height:610px;margin: 0 auto;padding-top: 30px;text-align: center;position: relative;}
@@ -77,15 +77,16 @@ box-shadow: 0 0 5px 0 #DCE4EC;z-index: 22;}
 .goodnesscenter{background: url("../../../img/hightech16.png");top:270px;left:140px;color: #FFFFFF;}
 .goodnessbottom{background: url("../../../img/hightech15.png");top:420px;left:280px;}
 .goodness>div>div{width:780px;height:100px;margin: 0 auto;text-align: left;padding-top: 25px;}
-.goodness>div>div>h4{display: inline-block;font-weight: bold;}
+.goodness>div>div>h4{display: inline-block;font-weight: bold;font-size: 16px;}
 .goodness>div>div>p{display: inline-block;}
+.goodness>div>div{font-size: 14px;font-family: "simsun";line-height: 22px;}
 .goodnesscenter h4{color: #FFFFFF;}
 
 #all_ensure{width:100%;height:360px;background: #FCFAF9;}
 .ensure{width:1200px;height:360px;margin: 0 auto;padding-top: 20px;text-align: center;position: relative;}
 .ensure>div{width:395px;height:270px;display: inline-block;padding-top: 130px;}
-.ensure>div>h4{color:#F6A322}
-.ensure>div>p{padding: 0 40px;margin-top: 15px;text-align: left;}
+.ensure>div>h4{color:#f68705;font-weight: bold;font-size: 20px;}
+.ensure>div>p{padding: 0 40px;margin-top: 15px;text-align: left;font-size: 14px;font-family: "simsun";color:#383838;line-height: 22px;}
 .ensureleft{background: url("../../../img/hightech21.jpg")}
 .ensurecenter{background: url("../../../img/hightech22.jpg")}
 .ensureright{background: url("../../../img/hightech23.png")}
@@ -95,8 +96,8 @@ box-shadow: 0 0 5px 0 #DCE4EC;z-index: 22;}
 .daturn>div{width:1030px;height:240px;background: url("../../../img/hightech19.png");
 margin: 20px auto 0;position: relative;}
 .daturn>div>div{width:290px;height:150px;position: absolute;text-align: center;}
-.daturn>div>div>h5{font-size: 15px;}
-.daturn>div>div>p{color:#807F7F;line-height: 30px;}
+.daturn>div>div>h5{font-size: 16px;color:#393838;}
+.daturn>div>div>p{line-height: 30px;color:#787878;font-family: "simsun";font-size: 14px;}
 .daturnleft{top:40px;left:25px;}
 .daturncenter{top:40px;left:370px;}
 .daturnright{top:40px;left:720px;}
@@ -106,6 +107,6 @@ margin: 20px auto 0;position: relative;}
 .flow{width:1200px;height:250px;margin: 0 auto;padding-top: 40px;text-align: center;position: relative;}
 .flow_bg{width:1100px;height:100px;margin: 0 auto;background: url("../../../img/hightech20.png");margin-top: 20px;}
 .flow_text{width:1200px;height:30px;margin: 0 auto}
-.flow_text>div{width:235px;height:30px;display: inline-block;}
+.flow_text>div{width:235px;height:30px;display: inline-block;font-size: 14px;font-weight: bold;}
 .begin{text-align: left;padding-left: 10px;}
 .end{text-align: right;padding-right: 10px;}

+ 29 - 19
src/css/service/propertyRight.css

@@ -1,12 +1,13 @@
 .container{width:1200px;}
-.container h4{font-size: 24px;color: #2a6597;font-weight: normal;margin-bottom: 22px;margin-top: -30px;}
+.container h4{font-size: 24px;color: #074d88;font-weight: normal;margin-bottom: 22px;margin-top: -30px;}
 .propery_main .propery_list,.propery_imgs,.propery_welfare{float: left;}
 .propery_list {width: 170px;margin-right: 20px;}
 .propery_list ol li{width: 150px;background: #FFFFFF;margin-bottom: 40px;height: 80px;line-height: 80px;text-align: center;font-size: 20px;border: 1px solid #cccccc;}
-.propery_list ol li.that{background: #56acf5;color: #ffffff;box-shadow: 0 0 20px #0C79FF;border: 1px solid transparent;}
+.propery_list ol li.that{background: linear-gradient(#2d83ce ,#5bb1fa);color: #ffffff;box-shadow: 0 0 20px #0C79FF;border: 1px solid transparent;}
+
 .propery_imgs{width: 710px;position: relative;height: 300px;}
 .propery_header{margin-bottom: 90px;margin-top: 44px;}
-.propery_header h5{font-size: 24px;color: #2a6597;margin-top: 44px;margin-bottom: 40px;}
+.propery_header h5{font-size: 24px;color: #074d88;margin-top: 44px;margin-bottom: 40px;}
 
 .carousesmall{ position:relative;width:100%;margin: 0 auto; overflow: hidden;}
 .ct_img_big{ position:absolute;top: -30px; }
@@ -19,13 +20,13 @@
 .btn_div>div{height:160px;position: absolute;}
 .btn_div>a{padding: 0;}
 .btn_div>a>img{width:100%;}
-.leftdiv{background-image:linear-gradient(90deg,#e8e8e8,#fff,#fff);opacity: 0.6;}
-.rightdiv{background-image:linear-gradient(270deg,#e8e8e8,#fff,#fff);opacity: 0.6;}
+.leftdiv{background-image:linear-gradient(90deg,#e8e8e8,#fff,#fff);opacity: 0.4;}
+.rightdiv{background-image:linear-gradient(270deg,#e8e8e8,#fff,#fff);opacity: 0.4;}
 
-.propery_list ol li:hover{background: #56acf5;color: #ffffff;box-shadow: 0 0 20px #0C79FF;border: 1px solid transparent;cursor: pointer;}
+.propery_list ol li:hover{background: linear-gradient(#2d83ce,#5bb1fa);color: #ffffff;box-shadow: 0 0 20px #0C79FF;border: 1px solid transparent;cursor: pointer;}
 .propery_imgs ul li img{width: 710px;height: 238px;margin-bottom: 28px;}
 .propery_imgs ul li{position: absolute;top: 0 ;left: 0;}
-.propery_imgs ul li p{font-size: 14px;color: #CCCCCC;line-height: 24px;}
+.propery_imgs ul li p{font-size: 14px;color: #383838;line-height: 24px;font-family: "simsun";font-weight: bold;}
 .propery_welfare{width: 236px;height: 260px;}
 
 
@@ -35,24 +36,29 @@
 
 .propery_star{width: 100%;height: 460px;background:url(../../../img/property_bj.jpg) no-repeat center center ;margin-top: 52px;position: relative;z-index: 10;}
 .copyright{width: 1168px;margin: 0px auto;position: relative;z-index: 14;margin-top: -370px;background: #ffffff;padding-left: 32px;overflow: hidden;box-shadow: 2px 2px 10px #CCCCCC;}
-.copyright h4{color: #2a6597;font-size: 24px;margin-bottom: 35px;margin-top: 35px;}
+.copyright h4{color: #074d88;font-size: 24px;margin-bottom: 35px;margin-top: 35px;}
 .copyright_left{float: left;width: 380px;}
-.copyright_right{float: left;margin-left: 22px;text-align: center;}
+.copyright_right{float: left;margin-left: 22px;}
 .copyright_left img{width: 380px;height: 164px;margin-bottom: 15px;}
-.copyright_left p{padding-left:5px ;padding-right: 5px;font-size: 14px;color: #5f5e5e;line-height: 24px;margin-bottom: 50px;}
 
+
+#slide1 li span,#slide2 li span{float: right;}
+.copyright_right li:hover{cursor: pointer;color: #f68705;}
+.copyright_right h6{font-size: 14px;color: #f68705;margin-bottom: 15px;text-align: left;}
+.copyright_right li{border-bottom: 1px solid #cccccc;font-size: 14px;color:#383838;width: 350px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;height:40px;line-height: 40px;}
+.copyright_left p{padding-left:5px ;padding-right: 5px;font-size: 14px;color: #383838;line-height: 24px;
+	margin-bottom: 15px;font-weight: bold;text-align: justify;}
 .copyright_contant{float: left;}
 
-.copyright_right ol li:hover{cursor: pointer;color: #f68705;}
-.copyright_right h6{font-size: 14px;color: #f68705;margin-bottom: 22px;text-align: left;}
-.copyright_right ol li{padding-bottom: 12px;border-bottom: 1px solid #cccccc;margin-bottom: 26px;font-size: 12px;color:#5f5e5e;width: 350px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;}
+.copyright_right ol li{padding-bottom: 12px;border-bottom: 1px solid #cccccc;font-size: 14px;color:#383838;width: 350px;overflow: hidden;
+	text-overflow: ellipsis;white-space: nowrap;font-family: "simsun";}
 .copyright_right>a{width: 150px;height: 46px;display: inline-block;color: #ffffff;font-size: 16px;line-height: 46px;text-align: center;background: #ffb200;margin-top: 30px;margin-bottom: 30px;}
 .outtime{position:absolute;height: 472px;z-index: 20;width: 380px;right: 0;background: url(../../../img/property_08.jpg) center center no-repeat;}
-.outtime time{font-size: 296px;color: #ff9019;position: absolute;top: 92px;left: 112px;z-index: 40;font-family: arial;}
+.outtime time{font-size: 170px;color: #ff9019;position: absolute;top: 150px;left: 150px;z-index: 40;font-family: arial;}
 .outtime .img_tate{position: absolute;top: 64px;right: 5px;z-index: 25; animation: rata 10s infinite linear;transition: all 10s;}
 .outtime .pro_yg{position: absolute;top: 83px;right:28px;opacity: 0.15;z-index: 30;}
 
-
+#slide{width:350px ;height: 200px;position: relative;overflow: hidden;}
 @-moz-keyframes rata{
 	from{transform: rotate(0deg)}
 	to{transform: rotate(360deg)}
@@ -68,18 +74,19 @@
 .intellectual{background: url(../../../img/property_09.png)no-repeat center center;height: 350px;width: 750px;position: relative;z-index: 10;display: inline-block;margin-top: 60px;}
 .intellectual a{width: 150px;height: 54px;background: url(../../../img/property_12.png) no-repeat;text-align: center;line-height: 44px;font-size: 16px ;color: #ffffff;bottom: 20px;right: -24px;position: absolute;display: inline-block;z-index: 11;}
 .intellectual_right{float: right;width: 366px;margin-top: 60px;}
-.intellectual_right h4{margin-top: 88px;font-size: 24px;color: #2a6597;margin-bottom: 32px;}
-.intellectual_right P{line-height: 24px;color: #5f5e5e;font-size: 14px;}
+.intellectual_right h4{margin-top: 88px;font-size: 24px;color: #074d88;margin-bottom: 32px;}
+.intellectual_right P{line-height: 24px;color: #383838;font-size: 14px;font-family: "simsun";}
 
 .process{background: #fcfaf9;text-align: center;margin-top: 44px;}
-.process h5{font-size: 24px;color: #2a6597;font-weight: normal;margin-top: 50px;margin-bottom: 28px;}
+.process h5{font-size: 24px;color: #074d88;font-weight: normal;margin-top: 50px;margin-bottom: 28px;}
 .process .container>img{width:1200px;height: 174px;margin-bottom: 140px;}
 
 .advantage ul{overflow: hidden;}
 .advantage ul li{width: 220px;height: 270px;background: url(../../../img/property_14.png) no-repeat center center;float: left;margin-left: 96px;}
 .advantage ul li:first-child{margin-left: 0;}
 .advantage ul li h6{font-size: 18px; color: #3b86c5;margin-top: 40px;margin-bottom: 16px;font-weight: 800;}
-.advantage ul li p{width: 180px;text-align: left;margin: 0 auto;padding-left: 6px;color: #393838;font-size: 14px;margin-bottom: 5px;height: 76px;}
+.advantage ul li p{width: 180px;text-align: left;margin: 0 auto;padding-left: 6px;color: #383838;font-size: 14px;
+	margin-bottom: 5px;height: 76px;font-family: "simsun";}
 .advantage ul li time span{font-size: 20px;color: #393838;display: inline-block;}
 .advantage ul li time{width: 76px;height: 30px;display: inline-block;line-height: 30px;}
 .advantage ul li:hover{ background: url(../../../img/property_122.png) no-repeat center center;}
@@ -87,3 +94,6 @@
 .advantage ul li:hover time {background: #ffffff;}
 .advantage ul li:hover time span{color: #000000;}
 .advantage {padding-bottom: 170px;}
+
+
+#bottom{margin-top: -144px;}

+ 1 - 1
src/css/technologyFinancial.css

@@ -1,6 +1,6 @@
 *{font-family: "微软雅黑";}
 .container{width: 1200px;}
-.zizone img{width: 116px;height: 124spx;float: left;margin-left: 104px;}
+.zizone img{width: 116px;height: 124px;float: left;margin-left: 104px;}
 .zizone .img_right{float: left;padding-left: 26px;}
 .zizone .col-md-6{padding: 0;margin: 0;border-bottom: 1px solid #cccccc;padding-top: 38px;padding-bottom: 28px;}
 .zizone .img_right h4{font-family: "微软雅黑";font-size: 48px;color: #3586cd;margin-top: 22px;margin-bottom: 16px;font-weight: normal;}

+ 4 - 2
src/css/technologyTrading/achievement.css

@@ -8,6 +8,7 @@
 .container{width: 1200px;}
 /*主体内容顶部*/
 #industryList li:hover{background: #ffb200;}
+#industryList li:first-child+li{display: none;}
 #industryList li:hover span{color: #ffffff;}
 #transferModeList li:hover{background: #ffb200;}
 #transferModeList li:hover span{color: #ffffff;}
@@ -31,7 +32,8 @@
 .search-select ul li{float: left;margin-right: 0px;margin-bottom: 10px; height: 30px; line-height: 30px; padding: 0 16px;font-size: 12px;border: 1px solid transparent;}
 .search-select  ul li.active{background: #ffb200;}
 .search-select  ul li.active span{color:#ffffff}
-.search-select  ul li span { font-size: 12px; line-height: 26px;color: #666; }        
+.search-select  ul li span { font-size: 14px; line-height: 26px;color: #666; }
+.search-select  ul li:nth-child(1) span{font-size: 16px;}
 .search-select  ul li:hover,.search-select ul li.active{cursor: pointer;}
 .search-title span{width: 88px;height: 38px;font-size:16px;background: #2f85d0;color: #ffffff;line-height: 38px;display: inline-block;text-align: center;}
 .search-select{margin-top: 4px;}
@@ -42,7 +44,7 @@
 .search-select ul li .demand{background: url(../../../img/achievement_checkno.jpg) no-repeat center right;background-size:34% 50%;}
 .search-select ul li label:hover{cursor: pointer;}
 /*内容详情列表区域*/
-
+#maxprice{margin-right: 10px;}
 .achievement_main{background: #f5f5f5;width: 100%;overflow: hidden;}
 .main-header .head-left{float: left;color: #4b4b4b;padding-top: 30px;}
 .main-header .head_right{float: right;color: #4b4b4b;}

+ 10 - 8
src/css/technologyTrading/achievementDetail.css

@@ -2,7 +2,7 @@
 #all_achievement{width:100%;height:1500px;border-top:5px solid #2C6698;}
 .detail{width:1200px;height:100px;margin: 0 auto;}
 .detail_top{width:1200px;height:50px;padding: 20px 70px 0 60px;}
-.detail_toptitle{width:500px;height:30px;padding-left: 25px;line-height: 24px;
+.detail_toptitle{width:100%;height:30px;padding-left: 25px;line-height: 24px;
     background: url("../../../img/detail_home.jpg") no-repeat;}
 .detail_toptitle>a{color:#787878;}
 .detail_toptitle>a.a_detail{color:#3C3B3B;}
@@ -11,13 +11,15 @@
 .detail_center{width:1200px;height:900px;margin: 0 auto;border: 1px solid #EFEFEF;}
 .detail_centerimg{width:1200px;height:660px;padding-top:45px;padding-left: 60px;
     border-bottom: 1px solid #EFEFEF;position: relative;}
-.small_img{width:200px;height:490px;display: inline-block;}
+.detail_centerimg>div:nth-child(1){width:1200px;height:490px;position: relative;}
+.detail_centerimg>div>div.big_img>img{width:430px;height:440px;}
+.small_img{width:200px;height:490px;display: inline-block;position: absolute;top:0;left:0;}
 .small_img>img{width:200px;height:155px;margin-bottom: 10px;}
-.big_img{width:470px;height:490px;display: inline-block;
-top:45px;left:310px;text-align: center; line-height: 490px;overflow: hidden;}
+.big_img{width:470px;height:490px;display: inline-block;position: absolute;
+top:0;left:230px;text-align: center; line-height: 490px;overflow: hidden;}
 .big_img img{width: 470px;height: 490px;}
 .detail_toptitle>a:hover{color: #000000;}
-
+.basic_center>p{text-overflow:ellipsis;overflow: hidden;white-space: nowrap;}
 
 .basic{width:720px;height:125px;position: relative;}
 .basic>div{width:220px;display: inline-block;height:70px;  }
@@ -36,13 +38,14 @@ line-height: 35px;color:#fff;border-radius: 5px;}
 .fine>div{width:240px;height:160px;margin-top: 10px;position: relative;}
 .fine>div>div>img{width:240px;height:160px;}
 .fine>div>p{width:240px;height:35px;position: absolute;left:0;bottom:0;background: #7A7572;
-color:#fff;text-align: center;line-height: 35px;}
+color:#fff;text-align: center;line-height: 35px;text-overflow:ellipsis;overflow: hidden;white-space: nowrap;
+padding: 0 10px;}
 
 .detail_centertext{width:1200px;height:240px;padding:30px 35px 0 35px;position: relative;}
 .detail_centertext>div{width:550px;height:240px;display: inline-block;
 padding: 0 30px;}
 .text_left>div{width:465px;height:40px;border-bottom:1px solid #F0F0F1;}
-.text_left>div>p{display: inline-block;font-size: 16px;}
+.text_left>div>p{display: inline-block;font-size: 14px;}
 .text_left>div>h5{display: inline-block;font-weight: bold;font-size: 15px;width:100px;}
 .left_p{margin-left: 0px;}
 .text_right>div{width:465px;height:40px;border-bottom:1px solid #F0F0F1;line-height: 40px;font-size: 16px;  }
@@ -53,7 +56,6 @@ padding: 0 30px;}
 text-align: center;font-size: 22px;line-height: 40px;color:#4E4E4E;}
 
 div.pointer{cursor: pointer;}
-.fine>div>p{text-overflow:ellipsis;overflow: hidden;}
 .fine>div>p.achievementId{display: none;}
 .fine>div>p.achievementTyp{display: none;}
 .main_introduce ul>li>div>p.likeId{display: none;}

+ 4 - 3
src/css/technologyTrading/demandDetail.css

@@ -2,7 +2,7 @@
 #all_achievement{width:100%;height:1500px;border-top:5px solid #2C6698;}
 .detail{width:1200px;height:100px;margin: 0 auto;}
 .detail_top{width:1200px;height:50px;padding: 20px 70px 0 60px;}
-.detail_toptitle{width:500px;height:30px;padding-left: 25px;line-height: 24px;
+.detail_toptitle{width:100%;height:30px;padding-left: 25px;line-height: 24px;
     background: url("../../../img/detail_home.jpg") no-repeat;}
 .detail_toptitle>a{color:#787878;}
 .detail_toptitle>a.a_detail{color:#3C3B3B;}
@@ -15,7 +15,8 @@
 .big_text>h3{color:#316899;}
 .big_img{width:470px;height:490px;display: inline-block;position: absolute;
     top:95px;left:50px;}
-.big_img>img{width:470px;}
+.big_img>div>img{width:430px;height:440px;}
+.big_img img{width:430px;height:440px;}
 .basic{width:300px;height:490px;position: absolute;top:95px;left:550px;}
 .basic>div{width:220px;height:55px;border-bottom: 1px solid #EFEFEF;}
 .basic>div>p{overflow: hidden;text-overflow: ellipsis;white-space: nowrap;}
@@ -46,7 +47,7 @@ div.pointer>p{overflow: hidden;text-overflow: ellipsis;white-space: nowrap;paddi
 .fine>div>p.achievementId{display: none;}
 .fine>div>p.achievementTyp{display: none;}
 .detail_centertext{width:1200px;height:240px;padding:30px 50px 0 50px;position: relative;}
-.detail_centertext>div{width:550px;height:240px;display: inline-block;}
+.detail_centertext>div{width:94%;height:240px;display: inline-block;}
 .text_right>div{width:1100px;border-bottom:1px solid #F0F0F1;line-height: 40px;font-size: 16px;  }
 .text_right{position: absolute;top:30px;left:50px;}
 .text_right>p{padding: 10px 25px 0 0;}

+ 2 - 2
src/css/thinkTank/policyDetail.css

@@ -6,7 +6,7 @@
 .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;
+#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;
@@ -32,7 +32,7 @@ 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;}
 
 
 

+ 1 - 1
src/css/thinkTank/policyList.css

@@ -52,7 +52,7 @@
 .policy_time p{font-size: 24px;color: #383838;margin-top: 16px;margin-bottom: 0px;}
 .policy_time time{font-size: 12px;color: #c6c6c6;}
 .policy_details{float: left;width:740px;padding-left: 24px;}
-.policy_details h4 a{font-size: 20px!important;color: #074d88!important;width:440px ;text-overflow: ellipsis;overflow: hidden;white-space: nowrap;}
+.policy_details h4 a{font-size: 20px!important;color: #074d88!important;width:620px ;text-overflow: ellipsis;overflow: hidden;white-space: nowrap;display: inline-block;}
 .policy_details p{font-size: 14px;font-family: "宋体";margin-top:16px;line-height: 22px;height: 44px;overflow: hidden;}
 .policy_details>a{color: #ffbc09;font-size: 14px;width: 95px;height: 30px;line-height: 29px;border: 1px solid #d2d2d2;text-align: center;margin-top: 20px;display: inline-block;}
 .policy_details>a:hover{color: #FFFFFF;background:#ffbc09 ;}

+ 3 - 2
src/css/thinkTank/thinkerDetail.css

@@ -17,6 +17,7 @@
 .people_name{width:140px;height:60px;text-align: center;line-height: 60px;font-weight: bold;
     font-size: 18px;background: #fff;margin:0 auto;}
 
+.detailcenter_{margin-top: 100px;}
 .thinkerdetail_center{width:1200px;height:950px;margin: 0 auto;padding-top: 40px;position: relative;}
 .detailcenter_left{width:650px;height:900px;position: absolute;top:40px;left:0;}
 .detailcenter_right{width:450px;height:900px;position: absolute;top:40px;right:0;}
@@ -29,7 +30,7 @@
 .fruit_bottom{width:100%;height:50px;border-top:1px solid #DDDDDD;padding-top: 10px;}
 .text_spanimg{float: right;margin-top: -7px;}
 .right_img{width:445px;height:265px;position: relative;}
-.right_img>img{width:445px;height:265px;}
+.right_img p>img{width:445px;height:265px;}
 .right_img>div{width:100%;height:40px;position: absolute;bottom:0;background: #eee;
     text-align: center;line-height: 40px;}
 .right_img>div>span{color:#FFB200;}
@@ -50,7 +51,7 @@
     border-bottom:1px solid #CCCCCC; padding-left: 50px;}
 .people_img{width:50px;height:50px;border-radius: 50%;
     background: #52de00;display: inline-block;position: absolute;top:30px;left: 0;}
-.people_img>img{width:50px;height:50px;}
+.people_img>img{width:50px;height:50px;border-radius: 50%;}
 .people_text{width:380px;height:70px;display: inline-block;margin-left: 10px;}
 .detailcenter_right>h3{margin-top:30px;}
 .thinkdetail_bottom{width:1200px;height:500px;margin: 0 auto;padding-top: 60px;}

+ 16 - 12
src/css/thinktank.css

@@ -3,10 +3,11 @@
 .container{width: 1200px;}
 .zizone img{width: 116px;height: 124px;float: left;margin-left: 104px;}
 .zizone .img_right{float: left;padding-left: 26px;}
-.zizone .col-md-6{padding: 0;margin: 0;border-bottom: 1px solid #cccccc;padding-top: 38px;padding-bottom: 28px;}
+.zizone .col-md-6{padding: 0;margin: 0;padding-top: 38px;padding-bottom: 28px;box-shadow: 0 0 10px 0 #E5E5E5 inset; box-sizing: border-box;
+width:600px;height:195px;}
 .zizone .img_right h4{font-family: "微软雅黑";font-size: 48px;color: #3586cd;margin-top: 22px;margin-bottom: 16px;font-weight: normal;}
 .zizone .img_right p{font-size: 24px;color: #3586cd;}
-.actives{border-bottom: 2px solid #333333!important;}
+.actives{border-top: 5px solid #FF9A25!important;}
 .zizone .col-md-6:hover{cursor: pointer;}
 
 .zizone_search{background: #efefef;margin-top: 50px;padding-top: 40px;padding-bottom: 40px;padding-left: 36px;overflow: hidden;}
@@ -15,7 +16,7 @@
 .search_left img{float: left; margin-right: 12px;}
 .search_left .img_txt{float: left;}
 .search_left h4{font-weight: normal;font-size: 20px;color: #f68705;margin-bottom:14px ;}
-.search_left p{font-size: 16px;color: #787878;}
+.search_left p{font-size: 16px;color: #787878;font-family: "simsun";}
 
 .searchs{width: 360px;position: relative;height: 40px;background: #ffffff;box-shadow: 2px 0px 5px #cccccc;border-radius: 20px;float: left;display: none;}
 .searchs .select select{-webkit-appearance: none;appearance:none;-moz-appearance:none;;position: absolute;width: 100px;height: 40px;line-height: 40px;color: #f18101;display: inline-block;border: none;font-size: 16px;left:10px;border-radius:10px;background: url(../../img/think_top.png) no-repeat center right;padding-left: 22px;}
@@ -28,9 +29,9 @@
 .searchs button{width: 64px;height: 40px;position: absolute;right: 5px;background: url(../../img/think_search.png) no-repeat center center;border: none;}
 .searchs button:focus{outline: none;}
 .list_text {font-size: 16px;}
-.list_text .orange{margin-bottom: 12px;color: #f18101;text-align: center;}
-.list_text .bulr{margin-top:12px ;margin-bottom: 0px;color: #074d88;text-align: center;}
-.list_text .text_on{width: 210px;margin: 0 auto;}
+.list_text .orange{margin-bottom: 12px;color: #f68705;text-align: center;font-weight: bold;}
+.list_text .bulr{margin-top:12px ;margin-bottom: 0px;color: #2a6597;text-align: center;font-weight: bold;line-height: 40px;}
+.list_text .text_on{width: 210px;margin: 0 auto;font-size: 14px;font-family: "simsun";color:#787878;line-height: 22px;}
 
 .shadow_text .orange {font-size: 16px;color: #f18101;margin-bottom: 12px;}
 .shadow_text .bulr {font-size: 16px;color: #ffffff;margin-top: 140px;margin-bottom: 12px;}
@@ -44,7 +45,8 @@
 .found a:hover{color: #0C79FF;}
 
 /*智政详情*/
-.zizone_list h3{width:220px ;height: 54px;margin: 0 auto;text-align: center;background: url(../../img/think_30.png) no-repeat center;line-height: 54px;margin-top: 56px;}
+.zizone_list h3{width:220px ;height: 54px;margin: 0 auto;text-align: center;color:#074d88;
+    background: url(../../img/think_30.png) no-repeat center;line-height: 54px;margin-top: 56px;}
 .main_zizone{margin-top: 20px;position: relative;}
 .main_zizone ul li {float: left;width: 560px;border: 1px solid #CCCCCC;height: 160px;overflow: hidden;margin-left:10px ;margin-right: 10px;margin-bottom: 24px;}
 .main_zizone ul li img{float: left;width: 205px;height: 160px;}
@@ -64,12 +66,14 @@
 .zizone_left:hover,.zizone_right:hover{cursor: pointer;background: #ffb200;color: #ffffff;border: none;}
 
 /*智政*/
-.place h3{width:220px ;height: 54px;margin: 0 auto;text-align: center;background: url(../../img/think_30.png) no-repeat center;line-height: 54px;margin-top: 90px;}
+.place h3{width:220px ;height: 54px;margin: 0 auto;text-align: center;color:#074d88;
+    background: url(../../img/think_30.png) no-repeat center;line-height: 54px;margin-top: 90px;}
 .place_city{padding-top: 40px;width: 960px;margin: 0 auto;}
 .place_city ul{float: left;overflow: hidden;}
 .place_city ul li{float: left;width: 160px;border: 1px solid #737373;font-size:16px ;height: 50px;line-height: 50px;text-align: center;border-left: none;background: #ffffff;color: #333333;}
 .place_city ul li:first-child{border-left: 1px solid #737373;}
-.place_city .more_city .inp{color: #f79624;width: 160px;height: 50px;text-align: center;line-height: 50px;float: left;border: 1px solid #737373;border-left: none;}
+.place_city .more_city .inp{color: #f79624;width: 160px;height: 50px;text-align: center;line-height: 50px;float: left;
+    border: 1px solid #737373;border-left: none;font-size: 16px;}
 .policy{clear: both;padding-top: 56px;position: relative;height: 400px;z-index: 22;}
 .place_city ul li:hover{cursor: pointer;}
 .policy ul {overflow: hidden;width: 1170px;}
@@ -107,8 +111,8 @@
 .pagination li{ float: left;}        
 .totalCount {float: right;line-height: 74px; margin-right: 20px; color: #999;} 
       
-.search-select ul li{float: left; border: 1px solid #ccc;margin-right: 10px;margin-bottom: 10px; height: 28px; line-height: 26px; padding: 0 16px;font-size: 12px;}
-.search-select  ul li span { font-size: 12px; line-height: 26px;color: #666; }        
+.search-select ul li{float: left; border: 1px solid #ccc;margin-right: 8px;margin-bottom: 10px; height: 28px; line-height: 26px; padding: 0 16px;font-size: 12px;}
+.search-select  ul li span { font-size: 14px; line-height: 26px;color: #787878; }
 .search-select  ul li:hover,.search-select ul li.active{cursor: pointer; border: 1px solid #58a3ff; }
 .search-select  ul li:hover span {color: #58a3ff;}                      
 
@@ -122,7 +126,7 @@
 .search-title{text-align: center;}                  
                    
 .imgbg{width: 550px!important;height: 150px;background: url(../../img/all_null.png) no-repeat;margin: 0px auto;}
-                   
+.pagination .active a{color:#fff !important;}
                         
                        
    

+ 46 - 31
src/js/Technologytrading.js

@@ -23,7 +23,18 @@ import {
         $(".answer").css({"display":"block"});
         $(".answer>p").eq(alength).fadeIn();
     });
-    //技术交易问题的点击出答案
+    //技术交易政策的点击跳转政策详情页面
+    $(".technolo_center .technolo_text").on('click', 'div', function () {
+        var theId = $(this).attr('val');
+        window.open(globalConfig.context + '/portal/news/newsDetail?id=' + theId );
+    });
+    //技术交易成功案例的点击跳转成果详情页面
+    $(".technolo_left .technolo_text").on('click', 'div', function () {
+        var theId = $(this).attr('val');
+        var thetype=$(this).attr('typ');
+        window.open(globalConfig.context + '/portal/technologyTrading/achievementDetail?id=' + theId+'&type='+thetype );
+    });
+    //技术交易问题的答案删除
     $(".answer").click(function(e){
         if(e.target.className=="answer"){
             $(".answer").css({"display":"none"});
@@ -37,20 +48,19 @@ import {
     });
     //点击搜索开始调用接口并跳转
     $(".searchs>button").click(function(e){
+        //localStorage.clear();
         var key=$("#search_on>input").val()?$("#search_on>input").val():"null";
         var typ=$("#selt>option:selected").attr("val");
-       window.open(globalConfig.context + '/portal/technologyTrading/achievement?pageType=' + typ+'&keyWord='+key );
-       // $.ajax({
-       //     method: "post",
-       //     dataType: "json",
-       //     url: globalConfig.context + "/portal/search/keyword",
-       //     data: {
-       //         pageType:typ,
-       //         keyWord:key
-       //     },
-       //     success: function (data) {
-       //     }
-       // })
+        if(typ==2){
+            window.open(globalConfig.context + '/portal/technologyTrading/demand.html');
+            localStorage.setItem("keyWord",key);
+            localStorage.setItem("pageType",typ);
+        }else{
+            window.open(globalConfig.context + '/portal/technologyTrading/achievement.html');
+            localStorage.setItem("keyWord",key);
+            localStorage.setItem("pageType",typ);
+        }
+
     });
     $("#demandList_patent").on('click', 'li', function () {
        var ol_index= $(".title_details ol>li.act").index();
@@ -63,10 +73,7 @@ import {
             window.open(globalConfig.context + '/portal/technologyTrading/achievementDetail?id=' + theId+'&type='+thetype );
         }
 });
-    $(".technolo_center .technolo_text").on('click', 'div', function () {
-        var theId = $(this).attr('val');
-        window.open(globalConfig.context + '/portal/news/newsDetail?id=' + theId );
-    });
+
 
 //处理data数据函数提取
     function manage(data){
@@ -87,7 +94,7 @@ import {
                 "</div>" +
                 "<div class='details_fix'>" +
                 "<p>专利名:<span>"+data.list[i].name+"</span></p>" +
-                "<p>所有人:<span>"+(data.list[i].personName?data.list[i].personName:"佚名")+"</span></p>" +
+                //"<p>所有人:<span>"+(data.list[i].personName?data.list[i].personName:"佚名")+"</span></p>" +
                 "</div></li>"
             }else{
                 demand_html+="<li val='"+data.list[i].id+"' typ='"+data.list[i].ownerType+"'>" +
@@ -100,7 +107,7 @@ import {
                 "</div>" +
                 "<div class='details_fix'>" +
                 "<p>专利名:<span>"+data.list[i].name+"</span></p>" +
-                "<p>所有人:<span>"+(data.list[i].personName?data.list[i].personName:"佚名")+"</span></p>" +
+               // "<p>所有人:<span>"+(data.list[i].personName?data.list[i].personName:"佚名")+"</span></p>" +
                 "</div></li>"
             }
         }
@@ -140,14 +147,14 @@ import {
     }
     $(".industry_ul").html(ul_html);
     $(".industry_ul li:first").addClass("action_li");
-    var left_val=$(".industry_ul li.action_li").val();
+    var left_val=$(".industry_ul li.action_li").attr("value");
     $.ajax({
         method: "post",
         dataType: "json",
         url: globalConfig.context + "/portal/search/boutiqueSearchList",
         data: {
             boutiqueType:0,
-            industryCatalog:left_val,
+            industryCatalog:"",
             pageNo:1,
             pageSize:6
         },
@@ -196,7 +203,7 @@ import {
                 "</div>" +
                 "<div class='details_fix'>" +
                 "<p>"+chagename+":<span>"+data.list[i].name+"</span></p>" +
-                "<p>所有人:<span>"+(data.list[i].personName?data.list[i].personName:"佚名")+"</span></p>" +
+               // "<p>所有人:<span>"+(data.list[i].personName?data.list[i].personName:"佚名")+"</span></p>" +
                 "</div></li>"
             }else{
                 demand_html+="<li val='"+data.list[i].id+"' typ='"+data.list[i].ownerType+"'>" +
@@ -209,7 +216,7 @@ import {
                 "</div>" +
                 "<div class='details_fix'>" +
                 "<p>专利名:<span>"+data.list[i].name+"</span></p>" +
-                "<p>所有人:<span>"+(data.list[i].personName?data.list[i].personName:"佚名")+"</span></p>" +
+               // "<p>所有人:<span>"+(data.list[i].personName?data.list[i].personName:"佚名")+"</span></p>" +
                 "</div></li>"
             }
         }
@@ -218,8 +225,11 @@ import {
     $(".title_details ol li").click(function(){
         $(".paging_box span:first").addClass("action_span").siblings().removeClass("action_span");
         $(this).addClass("act").siblings().removeClass("act");
-        var left_val=$(".industry_ul li.action_li").val();
-        var right_val = $(this).val();
+        var left_val=$(".industry_ul li.action_li").attr("value");
+        var right_val = $(this).attr("value");
+        if(left_val=="null"){
+            left_val="";
+        }
         $.ajax({
             method: "post",
             dataType: "json",
@@ -249,8 +259,12 @@ import {
         $(".paging_box span:first").addClass("action_span").siblings().removeClass("action_span");
         $(".title_details ol li").eq(0).addClass("act").siblings().removeClass("act");
         $(this).addClass("action_li").siblings().removeClass("action_li");
-        var left_val = $(this).val();
-        var right_val = $(".title_details ol li").eq(0).val();
+        var left_val = $(this).attr("value");      
+        var right_val = $(".title_details ol li").eq(0).attr("value");       
+        if(left_val=="null"){
+            left_val="";
+        }
+         console.log(left_val)
         $.ajax({
             method: "post",
             dataType: "json",
@@ -277,10 +291,11 @@ import {
 
     //右侧内容的分页功能,点击一次发送一个ajax的请求,只请求6组数据
     function loadDate(pageNo) {
-        //var page_length = $(this).attr("value");
-        var left_val = $(".industry_ul li.action_li").val();
-        var right_val = $(".title_details ol li.act").val();
-        //var right_check = $(".title_details ol li.act").index();
+        var left_val = $(".industry_ul li.action_li").attr("value");
+        var right_val = $(".title_details ol li.act").attr("value");
+        if(left_val=="null"){
+            left_val="";
+        }
         $.ajax({
             method: "post",
             dataType: "json",

+ 4 - 8
src/js/financialIndex.js

@@ -243,10 +243,10 @@ import {
                 pageNo:pageNo,
                 pageSize:8
             },
-            success: function (data) {
+            success: function (data) {             
                 if (data.data.totalCount == 0) {
                     $("#demandList_patent").html("<div class='list_none'></div>");
-                } else {
+                } else {                	
                     manage(data.data);
                     var data=data.data.totalCount;
                     var date=Math.ceil(data/8);
@@ -273,12 +273,10 @@ import {
                             );
                         }
                     };
-                    $('.pagePre').after(pageArr.join(''));
+                    $('.pagePre').after(pageArr.join(''));                
                 }
-                $(".pageNext").attr("all_length",Math.ceil(data.data.totalCount/8));
             }
-
-        });
+        })
     }
     $('.place_city ul li').click(function() {
         $(".pagination_box").css("display","block");
@@ -309,8 +307,6 @@ import {
             }
         })
     })
-
-
 })();
 
 

+ 16 - 2
src/js/index.js

@@ -24,8 +24,22 @@ $(function(){
 		}
 		$('.need_imgs ul').animate({'marginLeft':-(liwit+20)*k},500)
 	});
-	//首页轮播图
-	
+	//精品成果鼠标经过效果
+	$('.content .cont').hover(function(){
+		$('.con_hover').show();
+		var lent=$(this).index()-1;
+		var wid=$(this).width()+10;	
+		if(lent%2===0){
+			$('.con_hover').css({top:"-36px"})
+		}else{
+			$('.con_hover').css({top:"15px"})
+		}
+		$('.con_hover').animate({left:lent*wid},50)
+	})
+	$('.content').mouseleave(function(){
+		$('.con_hover').hide();
+		$('.content .cont').stop(true)
+	})
 });
 
 

+ 25 - 5
src/js/service/propertyRight.js

@@ -15,21 +15,42 @@ $(function(){
 	})
 	//倒计时		
 	 function GetRTime(){
-       var EndTime= new Date('2017/09/20 00:00:00');
+       var EndTime= new Date('2017/10/01 00:00:00');
        var NowTime = new Date();
        var t =EndTime.getTime() - NowTime.getTime();
        var d=Math.floor(t/1000/60/60/24);  
        var s=Math.floor(t/1000%60);       
-       document.getElementById("t_d").innerHTML = d + "天";  
+       document.getElementById("t_d").innerHTML = d;  
        //document.getElementById("t_d").innerHTML = s ;
-       var timet=$('#t_d').text();       
-	   if(timet<0){	   
+       var timet=$('#t_d').text();  
+       if(timet>=10){
+       		$('#t_d').css({"fontSize":"170px","top":"150px","left":"90px"})
+       }
+	   if(timet<0){	  	  
 	       	clearInterval(times);
 	       	$('#t_d').text('已结束');
 	       	$('#t_d').css({"fontSize":"50px","color":"#cccccc","top":"220px","left":"120px"})
 	   }
    }
    var times = setInterval(GetRTime,0);  
+   //软著动态上下滚动
+    var speed=40;
+    var slide=document.getElementById("slide");
+    var slide2=document.getElementById("slide2");
+    var slide1=document.getElementById("slide1");
+    console.log(slide2,slide1,slide)
+    slide2.innerHTML=slide1.innerHTML;
+    function Marquee(){
+        if(slide2.offsetTop-slide.scrollTop<=0)
+            slide.scrollTop-=slide1.offsetHeight;
+        else{
+            slide.scrollTop++;
+        }
+    }
+    var MyMar=setInterval(Marquee,speed)
+    slide.onmouseover=function(){clearInterval(MyMar)}
+    slide.onmouseout=function(){MyMar=setInterval(Marquee,speed)}
+ 	//logo轮播  
     var htmlwidth=$(document).width();
     $(".btn_div>div").width((htmlwidth-1200)/2);
     $(".leftdiv").css({"left":-(htmlwidth-1200)/2});
@@ -110,5 +131,4 @@ $(function(){
             .removeClass('active')
             .eq(pageIndex) .addClass('active')
     }
-
 })

+ 95 - 20
src/js/technologyTrading/achievement.js

@@ -15,14 +15,92 @@ import {
 
 
 $(function(){
-    //   console.log( window.location.search);
-    //console.log(window.location.search.substring(10,11));
-    //console.log(window.location.search.substring(20));
-    //window.location.href="http://192.168.1.101:8080/AFT/portal/technologyTrading/achievement";
-    //window.addEventListener("popstate", function() {
-    //    var currentState = history.state;
-    //    console.log(currentState);
-    //});
+    var valu=localStorage.getItem("keyWord");
+    var typ=localStorage.getItem("pageType");
+    localStorage.removeItem("keyWord");
+    localStorage.removeItem("pageType");
+    if(typ){        
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            url: globalConfig.context + "/portal/search/achievementList",
+            data: {
+                pageNo:  1,
+                pageSize: pageSize,
+                keyword: valu,
+                transferMode: theMode != 999 ? theMode : undefined,
+                fieldA: theFieldA != 999 ? theFieldA : undefined,
+                fieldB: theFieldB != 999 ? theFieldB : undefined,
+                dataCategory:typ != 999 ? typ : undefined,
+                category:category != 999 ? category : undefined,
+                dateSort:dateSort,
+                lowerPrice:lowerPrice,
+                upperPrice:upperPrice
+            },
+            success: function (data) {
+                var theArr = [];
+
+                if (data.data && data.data.list) {
+                    for (let i = 0; i < data.data.list.length; i++) {
+                        let thisdata = data.data.list[i];
+                        var  imgUrl=thisdata.technicalPictureUrl!==null?thisdata.technicalPictureUrl:"/img/timg.gif";
+                        var star='';
+                        for(var n=0;n<thisdata.maturity;n++){
+                            star+='<li></li>';
+                        }
+                        theArr.push([
+                            '<li val="'+thisdata.id+'" typ="'+thisdata.ownerType+'">',		//图片地址
+                            '<img src="' + globalConfig.avatarHost + '/upload' + imgUrl + '"/>',
+                            '<div class="list_text">',
+                            '<p>行业<span>' + (thisdata.fieldA?getIndustryCategory(thisdata.fieldA, thisdata.fieldB):"未知行业") + '</span></p>',
+                            '<p>名称<span title=' + thisdata.name + '>' + (thisdata.name?thisdata.name:"未知名称") + '</span></p>',
+                            '<p>类型<span>' + (thisdata.category ? categoryObj[thisdata.category] : '') + '</span></p>',
+                            '<p>交易方式<span>' + (thisdata.transferMode ? transferModeObj[thisdata.transferMode] : "当面交易") + '</span></p>',
+                            '<a href="#">了解详情</a>',
+                            '</div>',
+                            '<div class="star">',
+                            '<p>成熟度:<span>'+(thisdata.maturityS?thisdata.maturityS:"无")+'</span></p>',
+                            '</div>',
+                            '<input type="hidden" class="achievementId" value="' + thisdata.id + '">',
+                            '<input type="hidden" class="achievementType" value="' + thisdata.dataCategory + '">',
+                            '</li>',
+                        ].join(''));
+                    };
+                };
+                $('.main_introduce ul').empty();
+                $('.main_introduce ul').append(theArr.join(''));
+                if(data.data.list.length===0){
+                    $('.main_introduce ul').html("<div class='list_none'></div>")	;
+                };
+                // $('.totalCount').html("共" + data.data.totalCount + "条数据");
+                thePageLength = data.data.totalCount ? Math.ceil(data.data.totalCount / pageSize) : 1;
+                var pageArr = [],
+                    firstNo = 1,
+                    endNo = 5;
+                if (thePageNo > 3) {
+                    firstNo = thePageNo - 2;
+                    endNo = Math.min((Number(thePageNo) + 2), thePageLength);
+                } else {
+                    endNo = Math.min(thePageLength, 5);
+                };
+                for (let i = firstNo; i <= endNo; i++) {
+                    if (i == thePageNo) {
+                        pageArr.push(
+                            '<li class="pageNumber active"><a href="#" value=' + i + ' >' + i + '</a></li>'
+                        );
+                    } else {
+                        pageArr.push(
+                            '<li class="pageNumber"><a href="#" value=' + i + ' >' + i + '</a></li>'
+                        );
+                    }
+                };
+                $('.pageNumber').remove();
+                $('.pagePre').after(pageArr.join(''));
+            }
+        });
+    }else{
+        loadDate();
+    }
     //页面里面的详情链接
     $(".main_introduce ul").on('click', 'li', function () {
         var ol_index= $(".title_details ol>li.act").index();
@@ -50,6 +128,7 @@ var thePageNo = 1,
     "2": "技术入股",
     "3": "5年独占许可转让"
 };
+
 function loadDate(pageNo) {
     $.ajax({
         method: "get",
@@ -63,14 +142,14 @@ function loadDate(pageNo) {
             fieldA: theFieldA != 999 ? theFieldA : undefined,
             fieldB: theFieldB != 999 ? theFieldB : undefined,
             dataCategory:dataCategory != 999 ? dataCategory : undefined,
-            category:category != 999 ? category : undefined,  
+            category:category != 999 ? category : undefined,
             dateSort:dateSort,
             lowerPrice:lowerPrice,
 	        upperPrice:upperPrice
         },
-        success: function (data) {        	
+        success: function (data) {
             var theArr = [];
-           
+
             if (data.data && data.data.list) {
                 for (let i = 0; i < data.data.list.length; i++) {
                     let thisdata = data.data.list[i];                                    
@@ -81,8 +160,8 @@ function loadDate(pageNo) {
                     var star='';
                     for(var n=0;n<thisdata.maturity;n++){
                     	star+='<li></li>';
-                    }                     
-                    theArr.push([                                       
+                    }
+                    theArr.push([
                         '<li val="'+thisdata.id+'" typ="'+thisdata.ownerType+'">',		//图片地址
 						'<img src="'+ imgUrl+ '"/>',
 	 					'<div class="list_text">',
@@ -97,7 +176,7 @@ function loadDate(pageNo) {
 	 					'</div>',
 	 					'<input type="hidden" class="achievementId" value="' + thisdata.id + '">',
                         '<input type="hidden" class="achievementType" value="' + thisdata.dataCategory + '">',
-					    '</li>',                                             
+					    '</li>',
                     ].join(''));
                 };
             };
@@ -139,7 +218,7 @@ function loadDate(pageNo) {
         theKeyword = decodeURIComponent(theKeyword);
         $('#search_on input').val(theKeyword);
     };
-    loadDate();
+
     var industryListArr = [],
         industryChildrenArr = [];
     industryListArr.push(['<li value="999" class="active">',
@@ -233,11 +312,7 @@ function loadDate(pageNo) {
             };
         };
     });
-    $('.main_introduce ul').on('click', 'li', function () {
-        var theId = $(this).find(".achievementId")[0].value;
-        var theType = $(this).find(".achievementType")[0].value;
-        window.open(globalConfig.context + '/portal/detail/achievementDetail.html?id=' + theId + '&type=' + theType);
-    })    
+  
     $('#industryList li').click(function(){
 		$('.achievement_header ul li').eq(0).show();
 		var text_ind=$(this).find('span').text();		

+ 88 - 3
src/js/technologyTrading/demand.js

@@ -33,9 +33,93 @@ $(function(){
 	    "2": "技术方案型需求",
 	    "3": "技术攻关型需求",
 	    "4": "技术咨询型需求",
-	    "5": "技术人才型需求",
+	    "5": "技术人才型需求"
 	};
-	
+	var valu=localStorage.getItem("keyWord");
+	var typ=localStorage.getItem("pageType");
+	sessionStorage.removeItem("keyWord");
+	sessionStorage.removeItem("pageType");
+	if(typ){
+		$.ajax({
+			method: "get",
+			dataType: "json",
+			url: globalConfig.context + "/portal/search/achievementList",
+			data: {
+				pageNo:  1,
+				pageSize: pageSize,
+				keyword: valu,
+				transferMode: theMode != 999 ? theMode : undefined,
+				fieldA: theFieldA != 999 ? theFieldA : undefined,
+				fieldB: theFieldB != 999 ? theFieldB : undefined,
+				dataCategory:dataCategory != 999 ? dataCategory : undefined,
+				category:category != 999 ? category : undefined
+				//dateSort:dateSort,
+				//lowerPrice:lowerPrice,
+				//upperPrice:upperPrice
+			},
+			success: function (data) {
+				var theArr = [];
+				if (data.data && data.data.list) {
+					for (let i = 0; i < data.data.list.length; i++) {
+						let thisdata = data.data.list[i];
+						var imgUrl=thisdata.pictureUrl!==null?thisdata.pictureUrl:"/img/timg.gif";
+						var star='';
+						for(var n=0;n<thisdata.maturity;n++){
+							star+='<li></li>'
+						}
+						theArr.push([
+							'<li val="'+thisdata.id+'" typ="'+thisdata.dataCategory+'">',			//图片地址
+							'<img src="' + globalConfig.avatarHost + '/upload' + imgUrl + '"/>',
+							'<div class="list_text">',
+							'<p>行业<span>' + (thisdata.industryCategoryA?getIndustryCategory(thisdata.industryCategoryA, thisdata.industryCategoryB):"未知行业") + '</span></p>',
+							'<p>名称<span title=' + thisdata.name + '>' + (thisdata.name?thisdata.name:"未知名称") + '</span></p>',
+							'<p>类型<span>' + (thisdata.demandType ? categoryObj[thisdata.demandType] : '类型未知') + '</span></p>',
+							'<p class="money">预算<span>'+ (thisdata.budgetCost ? (thisdata.budgetCost + '万元') : '价格面议') + '</span></p>',
+							'<a href="#">了解详情</a>',
+							'</div>',
+							'<div class="star">',
+							'<p>成熟度:<ol><li></li><li></li><li></li><li></li><li></li></ol></p>',
+							'</div>',
+							'<input type="hidden" class="demandId" value="' + thisdata.id + '">',
+							'<input type="hidden" class="demandType" value="' + thisdata.dataCategory + '">',
+							'</li>',
+						].join(''));
+					};
+				};
+				$('.main_introduce ul').empty();
+				$('.main_introduce ul').append(theArr.join(''));
+				if(data.data.list.length===0){
+					$('.main_introduce ul').html("<div class='list_none'></div>")	;
+				};
+				// $('.totalCount').html("共" + data.data.totalCount + "条数据");
+				thePageLength = data.data.totalCount ? Math.ceil(data.data.totalCount / pageSize) : 1;
+				var pageArr = [],
+					firstNo = 1,
+					endNo = 5;
+				if (thePageNo > 3) {
+					firstNo = thePageNo - 2;
+					endNo = Math.min((Number(thePageNo) + 2), thePageLength);
+				} else {
+					endNo = Math.min(thePageLength, 5);
+				};
+				for (let i = firstNo; i <= endNo; i++) {
+					if (i == thePageNo) {
+						pageArr.push(
+							'<li class="pageNumber active"><a href="#" value=' + i + ' >' + i + '</a></li>'
+						);
+					} else {
+						pageArr.push(
+							'<li class="pageNumber"><a href="#" value=' + i + ' >' + i + '</a></li>'
+						);
+					}
+				};
+				$('.pageNumber').remove();
+				$('.pagePre').after(pageArr.join(''));
+			}
+		});
+	}else{
+		loadDate();
+	}
 
 	function loadDate(pageNo) {
 	    $.ajax({
@@ -115,9 +199,10 @@ $(function(){
 	            };
 	            $('.pageNumber').remove();
 	            $('.pagePre').after(pageArr.join(''));
-	        },
+	        }
 	    });
 	}
+
 	if (window.location.search) {
         let theUrl = window.location.search
         theKeyword = theUrl.substring(1, theUrl.length);

+ 29 - 77
src/js/thinktank.js

@@ -62,6 +62,9 @@ $(function(){
                     var totle=result.data.totalCount;
                     var pages=Math.ceil(totle/4);
                     var sol='';
+                     if(summary==null){
+                    	summary=''
+                    };
                    var srctt=globalConfig.context + '/portal/news/newsDetail.html?id=' + id;
                     policy_li+="<li value='"+id+"'>"
                         +"<div class='policy_time'><p>"
@@ -201,6 +204,7 @@ $(function(){
             success: function (result) {
                 thePageLengths = result.data.totalCount ? Math.ceil(result.data.totalCount / pageSizes) : 1;
                 var policy_img ='';
+                var totle=Math.ceil(result.data.totalCount/4);    
                 for(var i=0;i<result.data.list.length;i++){
                     var id=result.data.list[i].id;
                     var title = result.data.list[i].title; //标题
@@ -209,8 +213,17 @@ $(function(){
                     	titleImg=''
                     }
                     var summary = result.data.list[i].summary;//简介
+                    if(summary==null){
+                    	summary=''
+                    };
                     var  imgUrls=titleImg!=''?globalConfig.avatarHost + '/upload' +titleImg:globalConfig.avatarHost+ '/upload/default/news.jpg';                  
-                    policy_img+="<li value='"+id+"'>"+"<img src='"+imgUrls+"' alt=''/>"+"<div class='zizone_text'><h4><a href='#'>"+title+"</a></h3><p>"+summary+"</p><a href='#'>MORE+</a></div></li>"
+                    policy_img+=
+                    "<li value='"+id+"'>"
+                    +"<img src='"+imgUrls+"' alt=''/>"
+                    +"<div class='zizone_text'><h4><a href='#'>"
+                    +title+"</a></h3><p>"
+                    +summary+"</p><a href='#'>MORE+</a>"
+                    +"<input type='hidden' value='"+totle+"'/></div></li>"
                 }
                 $('.main_zizone ul').html(policy_img)
             }.bind(this)
@@ -218,86 +231,24 @@ $(function(){
     }
     mids(1,1)
     //点击时left
-    var t=1;
-    $('.zizone_left').click(function(){
+    var t=1; 
+    $('.zizone_left').click(function(){    	  		
         t--;
         if(t<=1){
             t=1
         }
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            url: globalConfig.context + "/portal/news/list",
-            data: {
-                provinceId:null,
-                hot: 1,
-                pageNo:t,
-                type:4,
-                pageSize:4
-            },
-            success: function (result) {
-                var totle=Math.ceil(result.data.totalCount/4);
-                var policy_img ='';
-                for(var i=0;i<result.data.list.length;i++){
-                    var id=result.data.list[i].id;
-                    var title = result.data.list[i].title; //标题
-                    var titleImg = result.data.list[i].titleImg; //图片
-                   if(titleImg==null){
-                    	titleImg=''
-                    }
-                    var summary = result.data.list[i].summary;//简介
-                    var  imgUrls=titleImg!=''?globalConfig.avatarHost + '/upload' +titleImg:globalConfig.avatarHost+ '/upload/default/news.jpg';
-                    policy_img+="<li value='"+id+"'>"+"<img src='"+imgUrls+"' alt='''/>"+"<div class='zizone_text'><h4><a href='#'>"+title+"</a></h3><p>"+summary+"</p><a href='#'>MORE+</a></div></li>"
-                }
-                if(result.data.list.length===0){
-                    return false
-                }{
-
-                    $('.main_zizone ul').html(policy_img)
-                }
-            }.bind(this)
-        })
-    })
-    //点击时right
-    var totle;
+        pageNos=t;
+        mids(1,pageNos);
+    })   
+    //点击时right  
     $('.zizone_right').click(function(){
-        t++;
-        if(t>totle){
-            t=totle
+    	var tot=$('.main_zizone ul').find('input').val()
+        t++; 
+        if(t>tot){
+        	t=tot
         }
-        if(totle=1){
-        	t=1
-        }
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            url: globalConfig.context + "/portal/news/list",
-            data: {
-                provinceId:null,
-                hot: 1,
-                pageNo:t,
-                type:4,
-                pageSize:4
-            },
-            success: function (result) {
-                totle=Math.ceil(result.data.totalCount/4);
-                var policy_img ='';            
-                for(var i=0;i<result.data.list.length;i++){
-                    var id=result.data.list[i].id;
-                    var title = result.data.list[i].title; //标题
-                    var titleImg = result.data.list[i].titleImg; //图片        
-                    if(titleImg==null){
-                    	titleImg=''
-                    }
-                    var summary = result.data.list[i].summary;//简介
-                    var  imgUrls=titleImg!=''?globalConfig.avatarHost + '/upload' +titleImg:globalConfig.avatarHost+ '/upload/default/news.jpg';
-                    policy_img+="<li value='"+id+"'>"+"<img src='"+imgUrls+"' alt='''/>"+"<div class='zizone_text'><h4><a href='#'>"+title+"</a></h3><p>"+summary+"</p><a href='#'>MORE+</a></div></li>"
-                }
-
-                $('.main_zizone ul').html(policy_img)
-
-            }.bind(this)
-        })
+        pageNos=t;
+        mids(1,pageNos);
     })
     //智者数据交互
     var theKeyword, theFieldA, theFieldB, theFieldC;
@@ -305,8 +256,6 @@ $(function(){
         thePageLength = 1,
         pageSize = 12,
         theType = 0;
-
-
     function loadDate(pageNo) {
         theFieldA = theFieldA != 999 ? theFieldA : undefined;
         theFieldB = theFieldB != 999 ? theFieldB : undefined;
@@ -328,6 +277,9 @@ $(function(){
                     for (let i = 0; i < data.data.list.length; i++) {
                         let thisdata = data.data.list[i];
                         let engagedField = thisdata.engagedField ? thisdata.engagedField.split(',') : [];
+                        if(thisdata.username==null||thisdata.username==''){
+                        	thisdata.username='佚名'
+                        }
                         var  imgUrl=thisdata.personPortraitUrl!=null?globalConfig.avatarHost + '/upload' +thisdata.personPortraitUrl:globalConfig.avatarHost+ '/upload/default/person.jpg';                       
                         theArr.push([
                             '<li value="'+thisdata.uid+'">',

+ 5 - 5
template/financial/investmentDetail.html

@@ -45,11 +45,11 @@
   	<!--banner-->
   	<div class="carouselt">
 		<ul class="ct-img-big clear">
-			<li data-index=0 ><a href=""><img src="../../img/highTech_slide_1.jpg" alt=""/></a></li>
-			<li data-index=1 ><a href=""><img src="../../img/highTech_slide_2.jpg" alt=""/></a></li>
-			<li data-index=2 ><a href=""><img src="../../img/highTech_slide_3.jpg" alt=""/></a></li>
-			<li data-index=3 ><a href=""><img src="../../img/highTech_slide_4.jpg" alt=""/></a></li>
-			<li data-index=4 ><a href=""><img src="../../img/highTech_slide_5.jpg" alt=""/></a></li>
+			<li data-index=0 ><a href=""><img src="../../img/investmentDetail_banner01.jpg" alt=""/></a></li>
+			<li data-index=1 ><a href=""><img src="../../img/investmentDetail_banner01.jpg" alt=""/></a></li>
+			<li data-index=2 ><a href=""><img src="../../img/investmentDetail_banner01.jpg" alt=""/></a></li>
+			<li data-index=3 ><a href=""><img src="../../img/investmentDetail_banner01.jpg" alt=""/></a></li>
+			<li data-index=4 ><a href=""><img src="../../img/investmentDetail_banner01.jpg" alt=""/></a></li>
 		</ul>
 		<a class="btn btn-next" href="">
 			<img src="../../img/index_next.png" alt=""/>

+ 1 - 1
template/financialIndex.html

@@ -120,7 +120,7 @@
 			</div>
 		</div>
 		<div class="begin">
-			<button>立即加入</button>
+			<a	href="#">立即加入</a>
 		</div>
 	</div>
 	<div id="member">

+ 47 - 3
template/index.html

@@ -113,6 +113,10 @@
 	<div id="product">
 		<div class="caption">精品成果<a href="../../portal/template/technologyTrading/achievement.html">MORE+</a></div>
 		<div class="content">
+			<div class="con_hover">
+				<img src="../img/search_txt.png" alt="" />
+				<p>详情</p>
+			</div>
 			<div class="cont cont_top1">
 				<a href="#">
 					<div class="img">
@@ -233,54 +237,90 @@
 							<a href="#">
 								<img src="../img/need_img1.jpg" alt="" />
 								<p><span href="#">哪些明星项目不为啥东西将上档次想</p>
+								<div class="need_black">
+									<img src="../img/search_txt.png" alt="" />
+									<p>详情</p>
+								</div>
 							</a>
 						</li>
 						<li>
 							<a href="#">
 								<img src="../img/need_img2.jpg" alt="" />
 								<p>哪些明星项目不为啥东西将上档次想</p>
+								<div class="need_black">
+									<img src="../img/search_txt.png" alt="" />
+									<p>详情</p>
+								</div>
 							</a>
 						</li>
 						<li>
 							<a href="#">
 								<img src="../img/need_img3.jpg" alt="" />
 								<p>哪些明星项目不为啥东西将上档次想</p>
+								<div class="need_black">
+									<img src="../img/search_txt.png" alt="" />
+									<p>详情</p>
+								</div>
 							</a>
 						</li>
 						<li>
 							<a href="#">
 								<img src="../img/need_img1.jpg" alt="" />
 								<p>哪些明星项目不为啥东西将上档次想</p>
+								<div class="need_black">
+									<img src="../img/search_txt.png" alt="" />
+									<p>详情</p>
+								</div>
 							</a>
 						</li>
 						<li>
 							<a href="#">
 								<img src="../img/need_img2.jpg" alt="" />
 								<p>哪些明星项目不为啥东西将上档次想</p>
+								<div class="need_black">
+									<img src="../img/search_txt.png" alt="" />
+									<p>详情</p>
+								</div>
 							</a>
 						</li>
 						<li>
 							<a href="#">
 								<img src="../img/need_img3.jpg" alt=""/>
 								<p>哪些明星项目不为啥东西将上档次想</p>
+								<div class="need_black">
+									<img src="../img/search_txt.png" alt="" />
+									<p>详情</p>
+								</div>
 							</a>
 						</li>
 						<li>
 							<a href="#">
 								<img src="../img/need_img1.jpg" alt=""/>
 								<p>哪些明星项目不为啥东西将上档次想</p>
+								<div class="need_black">
+									<img src="../img/search_txt.png" alt="" />
+									<p>详情</p>
+								</div>
 							</a>
 						</li>
 						<li>
 							<a href="#">
 								<img src="../img/need_img2.jpg" alt=""/>
 								<p>哪些明星项目不为啥东西将上档次想</p>
+								<div class="need_black">
+									<img src="../img/search_txt.png" alt="" />
+									<p>详情</p>
+								</div>
 							</a>
 						</li>
 						<li>
 							<a href="#">
 								<img src="../img/need_img2.jpg" alt=""/>
 								<p>哪些明星项目不为啥东西将上档次想</p>
+								<div class="need_black">
+									<img src="../img/search_txt.png" alt="" />
+									<p>详情</p>
+								</div>
 							</a>
 						</li>
 					</ul>
@@ -309,12 +349,16 @@
 						<p>400-8800-962八楼</p>
 					</div>
 					<div class="cont_rightapp">
-						<img src="../img/erweima_app.jpg" alt=""/>
-						<p>安卓APP</p>
+						<img src="../img/erweima_iphone.png" alt=""/>
+						<p>iPhone版</p>
+					</div>
+					<div class="cont_right android">
+						<img src="../img/erweima_android.jpg" alt=""/>
+						<p>Android版</p>
 					</div>
 					<div class="cont_right">
 						<img src="../img/erweima.jpg" alt=""/>
-						<p>科德公众号</p>
+						<p>微信公众号</p>
 					</div>					
 				</div>
 				<div class="text_bottom">

+ 5 - 0
template/member.html

@@ -56,9 +56,14 @@
 						</li>
 						<li>2000元/12个月</li>
 					</ul>
+<<<<<<< HEAD
+				</div>	
+				<div class="member_on">	
+=======
 				</div>
 				<div class="partingline"></div>
 				<div class="member_on">
+>>>>>>> 9c20779cadb151670d36b591bd10cd65233b9be3
 					<h5 class="blur"><img src="../img/member_2.jpg" alt="" />提供的专属服务</h5>
 					<div class="member_business_list" id="member2business">
 						<p>科技成果,专家信息定点推送</p>

+ 5 - 1
template/service.html

@@ -60,7 +60,8 @@
 		<div class="serve_cont">
 			<div class="serve_left">
 				<div class="serve_left-top">
-						<span>
+						<span>							
+							<img src="../img/tech_tyhs.png" alt="" />
 							<img src="../img/tech_ty.png" alt=""/>
 						</span>
 					<h3>高新是什么?</h3>
@@ -72,6 +73,7 @@
 				<div  class="serve_left-center">
 						<span>
 							<img src="../img/tech_tr.png" alt=""/>
+							<img src="../img/tech_trbs.png" alt="" />
 						</span>
 					<h3>高新是什么?</h3>
 					<p>高新技术是指那些对一个国家或一个地区的政治、
@@ -82,6 +84,7 @@
 				<div  class="serve_left-bottom">
 						<span>
 							<img src="../img/tech_th.png" alt=""/>
+							<img src="../img/tech_tss.png" alt="" />
 						</span>
 					<h3>高新是什么?</h3>
 					<p>高新技术是指那些对一个国家或一个地区的政治、
@@ -152,6 +155,7 @@
 				<a href="#">了解政策</a>
 			</li>
 		</ul>
+		<a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">立即咨询</a>
 	</div>
 </div>
 <div class="customer">

+ 15 - 9
template/service/propertyRight.html

@@ -144,10 +144,10 @@
 	  					<p>16年的专业科技咨询经验,拥有咨询业甲级资质,在全国拥有25家分(子)咨询机构。为各单位提供政策咨询、科技咨询、知识产权运营,企业上市服务等共22500项。</p>
 	  				</li>
 	  				<li>
-	  					<img src="../../img/property_090.jpg" alt="" />
+	  					<img src="../../img/property_091.jpg" alt="" />
 	  					<p>16年的专业科技咨询经验,拥有咨询业甲级资质,在全国拥有25家分(子)咨询机构。为各单位提供政策咨询、科技咨询、知识产权运营,企业上市服务等共22500项。</p>
 	  				<li>
-	  					<img src="../../img/property_090.jpg" alt="" />
+	  					<img src="../../img/property_092.jpg" alt="" />
 	  					<p>16年的专业科技咨询经验,拥有咨询业甲级资质,在全国拥有25家分(子)咨询机构。为各单位提供政策咨询、科技咨询、知识产权运营,企业上市服务等共22500项。</p>
 	  				</li>
   				</ul>
@@ -169,13 +169,19 @@
 	  			<p>智者简介:度F官方擦不是电话ZNX科媒那是八十多阿红说电话但是阿红说的哈就啊啊啊就爱就爱睡觉卡刷卡卡下面先教会的工业就大呼千万蝴蝶花千万赌并无</p>
 	  		</div>
 	  		<div class="copyright_right">
-	  			<h6>软著动态</h6>
-	  			<ol>
-	  				<li>T,无线电波,透视CT免息你对阿虎大坏蛋电弧好的hiU盾和的华文丢</li>
-	  				<li>T,无线电波,透视CT免息你对阿虎大坏蛋电弧好的hiU盾和的华文丢</li>
-	  				<li>T,无线电波,透视CT免息你对阿虎大坏蛋电弧好的hiU盾和的华文丢</li>
-	  				<li>T,无线电波,透视CT免息你对阿虎大坏蛋电弧好的hiU盾和的华文丢</li>
-	  			</ol>
+	  			<h6>软著动态</h6>	  			
+	  			<div id="slide">
+	  				<ol id="slide1">
+		  				<li>湖南永蓝检测技术股份有限公司  <span>2017/5/10</span></li>
+		  				<li>湖南永蓝检测技术股份有限公司  <span>2017/5/10</span></li>
+		  				<li>湖南永蓝检测技术股份有限公司  <span>2017/5/10</span></li>
+		  				<li>湖南永蓝检测技术股份有限公司  <span>2017/5/10</span></li>
+		  				<li>湖南永蓝检测技术股份有限公司  <span>2017/5/10</span></li>	  				
+	  				</ol>
+	  				<div id="slide2">
+	  					
+	  				</div>	  			  	
+	  			</div>
 	  			<a href="">立即申请</a>
 	  		</div>
   		</div>

+ 2 - 2
webpack.config.js

@@ -168,8 +168,8 @@ module.exports = (function () {
     }
 
     //let staticHost = 'http://aftts.hnzhiming.com';
-    let staticHost = 'http://afts.hnzhiming.com';
-    //let staticHost = 'http://127.0.0.1';
+    //let staticHost = 'http://afts.hnzhiming.com';
+    let staticHost = 'http://127.0.0.1';
     switch (argv.env.deploy) {
         case 'test':
             staticHost = 'http://static.jishutao.com';