liting2017 6 years ago
parent
commit
e68c294692

BIN
img/newMenu/achievement_1.jpg


BIN
img/newMenu/achievement_7.jpg


BIN
img/newMenu/achievement_dotted.jpg


+ 11 - 5
src/css/newMenu/achievement.css

@@ -125,7 +125,7 @@
     width: 273px;
     height: 112px;
     float: left;
-    border: 1px solid #ccc;
+    border: 1px solid #ededed;
     border-left: none;
 }
 .achievementHot-list ul li div div h4{
@@ -530,6 +530,7 @@ hr{
 .transaction .transactionImg div address{
     color: #8c8c8c;
     font-size: 16px;
+    margin-bottom: 22px;
 }
 .introduce address{
     margin-bottom: 10px!important;
@@ -549,7 +550,7 @@ hr{
     font-weight: normal;
     font-size: 16px;
     color: #191919;
-    padding-bottom: 20px;
+    padding-bottom: 21px;
 }
 .transaction .transactionImg div p{
     font-size: 14px;
@@ -580,12 +581,17 @@ hr{
     color: #1f1f1f;
 }
 .transaction ul li .time span,.transactionList ol li .time span{
-    font-size: 12px;
+    font-size: 14px;
     color: #8c8c8c;
 }
 .transaction ul li .time hr,.transactionList ol li .time hr{
-    border: 0.5px solid #e7e7e7;
-    margin: 8px 0px ;
+    height: 1px;
+    width: 65px;
+    border: none;
+    display: inline-block;
+    background: url(../../../img/newMenu/achievement_dotted.jpg)no-repeat;
+    background-size:100% 100%; 
+    margin: 11px 0px ;
 }
 .transaction ul li .introduce,.transactionList ol li .introduce{
     float: left;

+ 12 - 7
src/css/newMenu/demand.css

@@ -498,20 +498,24 @@
     border: 1px solid transparent;
 }
 .studyTxt ul li img {
-   width: 100%;
-   height: 100%;
+   width: 132px;
+   height: 110px;
+   border: none
 }
 .studyTxt ul li .imgLeft{
     vertical-align: top;
-    width: 40%;
+    width: 132px;
+    height: 110px;
     float: left;
+    border: none;
     overflow: hidden;
 }
 .studyTxt ul li:hover img {
-    opacity: 0.7;
+    opacity: 0.6;
+    transition: all .1s ease-in
 }
 .studyTxt ul li:hover .imgRight h5{
-    color:#ff5910;
+    color:#0a7dd4;
 }
 .studyTxt ul li .imgRight{
     box-sizing: border-box;
@@ -543,6 +547,8 @@
 .studyTxt ul li .imgRight span{
     display: inline-block;
     text-align: right;
+    height: 22px;
+    line-height: 22px;
     border: 1px solid #ff570c;
     color: #ff570c;
     padding:0 5px;
@@ -567,7 +573,6 @@
 }
 .capitalMain{
     height: 322px;
-    overflow: hidden;
 }
 .capitalMain div ol{
     display: -webkit-flex;
@@ -582,7 +587,7 @@
     background: url(../../../img/newMenu/demand-20.jpg) no-repeat;
 }
 .capitalMain div ol li:hover{
-    margin-top: -15px;
+    margin-top: -4px;
     box-shadow: 0 5px 5px #ccc;
     transition: all .2s ease-in
 }

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

@@ -871,5 +871,6 @@ input:-webkit-autofill {
 }
 .carousel img{
 	width: 100%;
+	height: 468px;
 }
 

+ 5 - 4
src/css/newMenu/services.css

@@ -97,11 +97,11 @@
 }
 .subsidy>img{
     float: left;
-    width: 180px;
+    width: 184px;
     height: 226px;
 }
 .subsidy .subsidyTxt{
-    width: 763px;
+    width: 759px;
     float: left;
     border: 1px solid #efefef;
     border-left: none;
@@ -117,11 +117,10 @@
     padding-bottom: 15px;
     padding-left: 12px;
     transition: all .2s ease-in-out;
-    border: 1px solid transparent;
     
 }
 .subsidyTxt ul li:hover{
-    border-color:#0a7dd4; 
+    box-shadow: 0 4px 12px #ccc;
     transition: all .2s ease-in;
 }
 .subsidyTxt ul li:hover div h4{
@@ -745,6 +744,7 @@
     margin-bottom: 8px;
     transition: all .2s ease-in;
 }
+
 .brandList li:hover div span{
     box-shadow: 0 8px 15px #ec9c7c;
     
@@ -1096,6 +1096,7 @@
     color: #ff5a0e;
 }
 .projectRight li p{
+    line-height: 30px;
     color: #444444;
 }
 .projectRight li span{

+ 1 - 1
src/css/register.css

@@ -85,7 +85,7 @@ position: absolute;top:0;left:0;}
 .login_close_{position: absolute;top:21%;right: 576px;width: 24px;
     height: 22px;z-index: 2000;cursor: pointer;}
 .login_main_{width:800px;height:60%;background-color: #fff;position: absolute;top: 20%;left: 50%;margin-left: -400px;
-padding: 20px 50px;overflow-y: auto;box-shadow: 0 10px 10px 0 #777;}
+padding: 20px 50px;overflow-y: auto;box-shadow: 0 4px 10px 0 #777;}
 .title_{line-height: 50px;}
 .longin_foot{line-height: 50px;}
 #userpassword{width: 190px;}

+ 1 - 1
src/css/thinkTank.css

@@ -129,7 +129,7 @@ text-align: justify;text-overflow: ellipsis;overflow: hidden;display: -webkit-bo
 .search-select  ul li:hover,.search-select ul li.active{cursor: pointer; border: 1px solid #58a3ff; }
 .search-select  ul li:hover span {color: #58a3ff;}                      
 
-.detail_interest_sub  li{float: left;width: 270px;position: relative;z-index: 15;margin-left: 30px;border: 1px solid #cccccc;overflow: hidden;height: 440px;margin-bottom: 20px;}                                      
+.detail_interest_sub  li{float: left;width: 270px;position: relative;z-index: 15;margin-left: 30px;border: 1px solid #cccccc;overflow: hidden;height: 450px;padding-bottom: 10px;margin-bottom: 20px;}                                      
 .detail_interest_sub  li>img{width: 270px;height: 280px;}                    
 .detail_interest_sub  li:nth-child(4n+1){margin-left: 0;}                   
 .shadow_text{position: absolute;top: 0;left: 0;width: 270px;height: 440px;text-align: center;background: rgba(0,0,0,.7);display: none;}

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

@@ -57,12 +57,12 @@ text-align: center;line-height: 45px;margin-right: 20px;cursor:pointer;}
 .think_about{width:1200px;height:350px;margin:30px auto 0;}
 .think_about>h3{text-align: left;color:#2F6698;font-weight: normal;letter-spacing: 3px;font-size: 22px;}
 .think_about>div{width:1200px;height:300px;padding-top:30px;}
-.think_about>div>div{width:200px;height:270px;margin-left:45px;position:relative;display:inline-block;transition: all .2s ease-in-out;vertical-align: top}
+.think_about>div>div{border: 1px solid #ccc;width:200px;height:270px;margin-left:45px;position:relative;display:inline-block;transition: all .2s ease-in-out;vertical-align: top}
 .think_about>div>div:nth-child(1){margin-left:0px;}
 .think_about>div>div>a{text-decoration:none;}
 .think_about>div>div img{width:200px;height:190px;display: block;}
 .about_name{width:200px;height:35px;position:absolute;left:0;top:155px;background:#FFB200;line-height: 35px;}
-.about_p{width:200px;height:65px;color:#5F5E5E;padding:0 10px;font-size:14px;line-height:22px;
+.about_p{margin-top: 10px;width:200px;height:65px;color:#5F5E5E;padding:0 10px;font-size:14px;line-height:22px;
 text-align: justify;text-overflow: ellipsis;overflow: hidden;display: -webkit-box;-webkit-box-orient: vertical; -webkit-line-clamp: 3;}
 .about_man{width:50px;color:#7D5F2F;margin-left:10px;display:inline-block;
 text-overflow: ellipsis;overflow: hidden;white-space: nowrap;}

+ 2 - 0
src/js/newMenu/achievementList.js

@@ -71,6 +71,8 @@ $(function () {
     //热搜
     function hotSearch() {
         $('.searchMain ol li').click(function () {
+            let ind = $(this).index();
+            if(!ind) return;
             $(this).addClass('active').siblings().removeClass('active');
             $('.searchMain ol li').eq(0).addClass('active');
             dataList.name = $(this).text().trim();

+ 2 - 0
src/js/newMenu/demandList.js

@@ -71,6 +71,8 @@ $(function () {
     //热搜
     function hotSearch() {
         $('.searchMain ol li').click(function () {
+            let ind = $(this).index();
+            if(!ind) return;
             $(this).addClass('active').siblings().removeClass('active');
             $('.searchMain ol li').eq(0).addClass('active');
             dataList.name = $(this).text().trim();

+ 9 - 1
src/js/register.js

@@ -199,7 +199,15 @@ $(function () {
             })
         }
     })
-    
+    agreement();
+    function agreement(){
+        $('.head_login_').click(function(){
+            $('.login_').show();
+        })
+        $('.login_close_').click(function(){
+            $('.login_').hide();
+        })
+    }
     var tt = 30;
     $('#photo').click(function () {
         var ophoto = $('#usePhoto').val().trim();

+ 0 - 1
src/js/thinkTank.js

@@ -198,7 +198,6 @@ $(function() {
             },
             success: function (data) {
 				var theArr = [];
-				console.log(data)
 				if(data&&data.error.length){
 					msg(data.error[0].message)
 					$('.pagination_box').hide();