liting2017 7 years ago
parent
commit
7d6f6cd1c1

BIN
img/index_bannerbj.png


BIN
img/investmentDetail_banner01.jpg


BIN
img/thinkerDetail_banner01.jpg


+ 4 - 7
src/css/index_home.css

@@ -55,7 +55,7 @@ html{font-size:62.5%;}
 #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;}
-#product .img img:first-child{position: absolute;top: -72px;left: 50%;margin-left: -32px;z-index: 222;}
+#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: 16px;height:60px;width:100%;line-height: 60px;overflow: hidden;/*text-overflow: ellipsis;white-space: nowrap;*/
@@ -64,19 +64,16 @@ text-align: center;color:#383838;font-weight: bold;padding: 0 10px;}
 #product .cont_bottom2 .text>h2{color:#fff;}
 #product .cont_bottom1 .text>p{color:#fff;}
 #product .cont_bottom2 .text>p{color:#fff;}
+#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;}
-<<<<<<< HEAD
-#policy .captions{width:100%;font-size: 2rem;color:#074F88;margin-left: 45px;margin-top: 120px;margin-bottom: 20px;}
 .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;}
->>>>>>> 9c20779cadb151670d36b591bd10cd65233b9be3
+
 .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;}
@@ -134,7 +131,7 @@ display:inline-block;position: absolute;top:0;left:0;}
 .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: 100;display: none;}
+ .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;}

+ 3 - 9
src/css/member.css

@@ -8,23 +8,17 @@
 .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;}
-<<<<<<< HEAD
+
 .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 ul{overflow: hidden;margin-left: 13px;margin-top: 23px;}
-.member_on ul li{float: left;width: 110px;height: 48px;border: 1px solid #CCCCCC;line-height: 48px;text-align: center;margin: 5px;}
-.member_on .member_left{margin-top: 60px;}
-=======
-.member_on{width: 386px;}
+.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;}
->>>>>>> 9c20779cadb151670d36b591bd10cd65233b9be3
+
 
 .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;}

+ 5 - 9
src/css/service.css

@@ -40,13 +40,10 @@ line-height: 120px;}
 
 
 
-<<<<<<< HEAD
+
 .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{width: 100%;background: url(../../img/service_04.png)no-repeat center;height: 640px;}
-.Intellectual .container>h3{font-size: 30px;color: #ffffff;width: 200px;margin: 0 auto;line-height: 150px;}
->>>>>>> 9c20779cadb151670d36b591bd10cd65233b9be3
+
 .Intellectual .container{width: 1200px;}
 .Intellectual ul li{float: left;width: 360px;height: 450px;margin-left: 44px;}
 .Intellectual ul li:first-child{margin-left: 0;}
@@ -68,11 +65,10 @@ line-height: 120px;}
 
 .customer_main{width: 400px;margin: 0 auto;}
 .customer hr{width: 1200px;margin: 0 auto;}
-<<<<<<< HEAD
+
 .customer_main span{font-size: 40px;color: #074d88;width: 180px;text-align: center;line-height: 120px;display: inline-block;margin-top: 50px;}
-=======
-.customer_main span{font-size: 30px;color: #074d88;width: 180px;text-align: center;line-height: 120px;display: inline-block;}
->>>>>>> 9c20779cadb151670d36b591bd10cd65233b9be3
+
+
 .that{border-bottom: 2px solid #074d88;}
 .customer_company{margin: 80px auto 0;display: none;}
 .customer_company:nth-child(1){display: block;}

+ 5 - 22
src/css/service/propertyRight.css

@@ -2,14 +2,9 @@
 .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;}
-<<<<<<< HEAD
 .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: linear-gradient(#2d83ce ,#5bb1fa);color: #ffffff;box-shadow: 0 0 20px #0C79FF;border: 1px solid transparent;}
-=======
-.propery_list ol li{width: 150px;background: #FFFFFF;margin-bottom: 40px;height: 80px;line-height: 80px;text-align: center;
-	font-size: 18px;border: 1px solid #cccccc;color:#074d88;}
-.propery_list ol li.that{background: #56acf5;color: #ffffff;box-shadow: 0 0 20px #0C79FF;border: 1px solid transparent;}
->>>>>>> 9c20779cadb151670d36b591bd10cd65233b9be3
+
 .propery_imgs{width: 710px;position: relative;height: 300px;}
 .propery_header{margin-bottom: 90px;margin-top: 44px;}
 .propery_header h5{font-size: 24px;color: #074d88;margin-top: 44px;margin-bottom: 40px;}
@@ -31,11 +26,7 @@
 .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;}
-<<<<<<< HEAD
-.propery_imgs ul li p{font-size: 14px;color: #393838;line-height: 24px;}
-=======
 .propery_imgs ul li p{font-size: 14px;color: #383838;line-height: 24px;font-family: "simsun";font-weight: bold;}
->>>>>>> 9c20779cadb151670d36b591bd10cd65233b9be3
 .propery_welfare{width: 236px;height: 260px;}
 
 
@@ -49,27 +40,19 @@
 .copyright_left{float: left;width: 380px;}
 .copyright_right{float: left;margin-left: 22px;}
 .copyright_left img{width: 380px;height: 164px;margin-bottom: 15px;}
-<<<<<<< HEAD
-.copyright_left p{padding-left:5px ;padding-right: 5px;font-size: 14px;color: #5f5e5e;line-height: 24px;margin-bottom: 50px;}
-.copyright_contant{float: left;}
-#slide1 li span,#slide2 li span{float: right;}
 
 
+#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: 12px;color:#5f5e5e;width: 350px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;height:40px;line-height: 40px;}
-.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: 40px;margin-bottom: 40px;}
-=======
+.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: 50px;font-weight: bold;}
-
 .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: 14px;color:#383838;width: 350px;overflow: hidden;
+
+.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;}
->>>>>>> 9c20779cadb151670d36b591bd10cd65233b9be3
 .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 .img_tate{position: absolute;top: 64px;right: 5px;z-index: 25; animation: rata 10s infinite linear;transition: all 10s;}

+ 1 - 1
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;}

+ 1 - 1
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;}

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

@@ -29,7 +29,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;}

+ 1 - 1
src/css/thinktank.css

@@ -111,7 +111,7 @@ width:600px;height:195px;}
 .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{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;}                      

+ 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=""/>