liting2017 6 years ago
parent
commit
a1a982aace

BIN
img/initPic/achievementInit.png


BIN
img/initPic/demandInit.jpg


BIN
img/initPic/serviceInit.png


BIN
img/newMenu/achievement_jishu.jpg


+ 41 - 23
src/css/indexNew.css

@@ -80,9 +80,26 @@ background:#FBFBFB url(../../img/indexNew7.png) no-repeat;padding:45px 0 0 15px;
 .indexServe_bots .wrapper{
     float: left;
     width: 230px;
+    height: 180px;
+    
+}
+.indexServe_bots .wrapper h3{
+    overflow: hidden;
+    white-space:nowrap; 
+    text-overflow:ellipsis; 
+    -o-text-overflow:ellipsis;
+    margin: 10px 0;
+}
+.indexServe_bots .wrapper p{
+    overflow: hidden;
+    display: -webkit-box;              
+    text-overflow: ellipsis;            
+    -webkit-box-orient: vertical;       
+    -webkit-line-clamp:7;
 }
 .indexServe_bots>img{
     float: left;
+    margin-top: 40px;
     width: 140px;
     height: 130px;
 }
@@ -103,7 +120,14 @@ text-align: justify;text-overflow: ellipsis;overflow: hidden;display: -webkit-bo
     clear: both;
 }
 .indexServe_bot>div{color:#fff;width:100%;height:18px;background:url(../../img/indexNew9.png) no-repeat;padding-left: 17px;line-height: 18px;}
-.indexServe_cont>div>div.indexServe_bot>p{width:340px;letter-spacing: 1px;margin-top:10px;color:#4E4E4E;line-height: 20px;
+.indexServe_cont div>div .indexServe_bot>p{padding-top:20px;color:#4E4E4E;
+    line-height: 20px;
+    overflow: hidden;
+    display: -webkit-box;              
+    text-overflow: ellipsis;            
+    -webkit-box-orient: vertical;       
+    -webkit-line-clamp:6;
+    width:100%;
 }
 .indexServe_cont>div>div.indexServe_img{position: absolute;bottom: 10px;overflow: hidden;}
 .indexServe_img p{
@@ -142,22 +166,26 @@ text-align: justify;text-overflow: ellipsis;overflow: hidden;display: -webkit-bo
 }
 .indexServe_cont>div.indexServe_long{width:795px;height:188px;margin-right:0px;display: inline-block;margin-top: 25px;
 background:#FBFBFB;padding: 0 0 0 215px;text-align: left;position:relative;}
-.indexServe_long>img{display: inline-block;position: absolute;top:0;left:0;width: 150px;height: 140px;}
+.indexServe_long>img{display: inline-block;position: absolute;top:0;left:0;width: 200px;height: 190px;}
 .indexServe_long>div.indexServe_bots{display: inline-block;width:235px;height:188px;padding-top: 10px;}
 .indexServe_long>div.indexServe_bot{width:340px;height:140px;position: absolute;top:22px;right:10px;border-left:1px dashed #DEDEDE;padding-left:10px;}
 .indexServe_long>div.indexServe_bots>p{width:220px;height:120px;display: inline-block;text-align: left;letter-spacing: 1px;
 margin-top:10px;color:#4E4E4E;line-height: 22px;
-text-align: justify;text-overflow: ellipsis;overflow: hidden;display: -webkit-box;-webkit-box-orient: vertical; -webkit-line-clamp: 5;}
-.indexServe_bot>p{width:100%;letter-spacing: 1px;;color:#4E4E4E;line-height: 20px;padding: 30px 10px 10px;;
-}
+text-align: justify;text-overflow: ellipsis;overflow: hidden;display: -webkit-box;-webkit-box-orient: vertical; -webkit-line-clamp: 4;}
 .indexServe_long>div.indexServe_bot>div{width:320px;}
 .indexServe_long>div.indexServe_img{width:350px;height:40px;background:url(../../img/indexNew10.png) top right no-repeat;margin-top:10px;
 text-align:right;padding-right:50px;font-size:16px;line-height:40px;color:#FF580D;cursor:pointer;position: absolute;bottom:10px;right:25px;}
-.indexServe_right{width:390px;height:401px;position: absolute;right:0;bottom:170px;}
-.indexServe_bottom{position: absolute;left:0;bottom: 50px;}
-
+.indexServe_right{width:390px;height:401px;position: absolute;right:0;bottom:133px;}
+.indexServe_bottom{position: absolute;left:0;bottom: 0px;}
+.indexServe_long .indexServe_bots p,.indexServe_long .indexServe_bots p{
+    overflow: hidden;
+    display: -webkit-box;              
+    text-overflow: ellipsis;            
+    -webkit-box-orient: vertical;       
+    -webkit-line-clamp:3!important;
+}
 
-#indexPolicy{width:1200px;height:500px;margin:0 auto;position: relative;}
+#indexPolicy{width:1200px;height:500px;margin:0 auto;position: relative;padding-top: 60px;}
 #indexPolicy>div>a{float: right;width:190px;height:50px;color:#fff;line-height: 50px;font-size:16px;
 text-align: center;background:#2F83CE;margin-top: 15px;position: relative;padding-left:10px;}
 #indexPolicy>div>a span{font-size:25px;line-height: 40px;position: absolute;top:5px;left:40px;}
@@ -228,36 +256,26 @@ text-align: center;line-height: 24px;font-size: 16px;}
     background: #ffffff;
     color: #000;
     text-align: center;
-    transition: all .4s ease-in
+    transition: all .2s ease-in
 }
 .indexExpert_cont>a>div:hover{
     box-shadow: 0 4px 10px #ccc;
-    transform: scale(1.05);
-    transition: all .4s ease-in
+    transition: all .2s ease-in
 }
 .indexSeach_two>div:hover .seachTitle>div{
     background: #1697E9;
     color: #fff;
     box-shadow: 0 6px 10px #ccc;
-    transform: scale(1.2);
-    transition: all .3s ease-in;
-}
-.indexSeach_two>div:hover .seachMore{
-   
-    
+    transition: all .2s ease-in;
 }
 .indexSeach_two>div:hover .seachMore a{
-    transition: all .3s ease-in;
+    transition: all .2s ease-in;
     margin-right:-4px;
     color: #1697E9;
 }
 .wit:hover p,.wih:hover p{
-    /* height: 60px;
-    line-height: 60px;
-    background: rgba(0, 0, 0, .5); */
     transition: all .4s ease-in;
     color: #1697E9
-
 }
 .wit:hover img,.wih:hover img{
     transform: rotateY(360deg);

+ 21 - 1
src/css/newMenu/achievement.css

@@ -239,6 +239,7 @@ hr{
 }
 .patentList .col-sm-4 div>img{
     height: 114px;
+    display: inline-block;
 }
 .patentList>.row>.col-sm-4 img:first-child{
     margin-bottom: 14px;
@@ -246,6 +247,10 @@ hr{
 .patentList ul li img{
     width: 100%;
 }
+.patentList ul li div{
+    width: 242px;
+    height: 144px
+}
 .patentList ul li div p{
     overflow: hidden;
     white-space:nowrap; 
@@ -396,7 +401,11 @@ hr{
 }
 .practical .practicalRight{
     float: right;
-    width: 190px;
+    margin-top: 0px;
+    width: 230px;
+    height: 390px;
+    background: url(../../../img/newMenu/achievement_jishu.jpg)no-repeat;
+    background-size:100% 100%; 
 }
 .practicalGrounp {
     padding-top: 16px;
@@ -410,6 +419,9 @@ hr{
     cursor: pointer;
 }
 .practicalGrounp ol li img{
+    width: 146px;
+    height: 136px;
+    display: inline-block;
     float: left;
 }
 .practicalGrounp ol li:first-child{
@@ -653,6 +665,14 @@ hr{
     transition: all .2s ease-out;
     cursor: pointer;
 }
+.patentList ul li p{
+    color: #333333;
+    padding: 0 10px;
+    overflow: hidden;
+    white-space:nowrap; 
+    text-overflow:ellipsis; 
+    -o-text-overflow:ellipsis;
+}
 .patentList ul li:hover p{
     color: #ff6600;
 }

+ 9 - 0
src/css/newMenu/achievementList.css

@@ -391,4 +391,13 @@
 .inp button{
     margin: 0 10px;
     width: 50px;
+}
+/* 默认图片 */
+.noImg{
+    background: url(../../../img/initPic/demandInit.jpg) no-repeat;
+    background-size:100% 100%; 
+}
+.achievemrntImg {
+    background: url(../../../img/initPic/achievementInit.png) no-repeat;
+    background-size:100% 100%; 
 }

+ 1 - 1
src/css/newMenu/header.css

@@ -334,7 +334,7 @@ input:focus{
     top: 55px;
     padding: 20px 20px 40px;
     left: 0;
-    z-index: 99999;
+    z-index: 999;
     background: #3b3b3b;
     color: #ffffff;
     font-size: 14px;

+ 8 - 4
src/css/newMenu/serviceDetails.css

@@ -184,20 +184,24 @@
     border: 1px solid #eeeeee;
 }
 .serviceDetailsList .value h4{
+    height: 100%;
     width: 170px;
-    height: 72px;
-    line-height: 72px;
+    vertical-align: middle;
     font-size: 14px;
     text-align: center;
     float: left;
     background: #f8f8f8;
 }
 .serviceDetailsList .value div{
+    padding-top: 10px;
+    padding-bottom: 10px;
+    padding-right: 10px;
+    width: 1028px;
     display: inline-block;
     float: left;
-    line-height: 72px;
-    height: 72px;
+    line-height: 24px;
     padding-left: 20px;
     font-size: 12px;
     color: #707070;
+    word-wrap:break-word
 }

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

@@ -369,7 +369,12 @@
 .search .hot ul li.active{
     color: #fa2902
 }
+/* 默认图片 */
 
+.serviceImg{
+    background: url(../../../img/initPic/serviceInit.png) no-repeat;
+    background-size:100% 100%; 
+}
 
 
 

+ 2 - 1
src/css/newMenu/services.css

@@ -307,6 +307,7 @@
     -o-text-overflow: ellipsis;
 }
 .patent .patentList ul li {
+    width: 93px;
     float: left;
     text-align: center;
     height: 55px;
@@ -578,7 +579,7 @@
     line-height: 24px;
 }
 .newFlash ul li:hover{
-    margin-left: -4px;
+    margin-left: -2px;
     transition: all .2s ease-in;
 }
 .newFlash ul li a:hover{

+ 1 - 1
src/css/technologyTrading.css

@@ -79,7 +79,7 @@ body{background: #f5f5f5;}
 .title_details ol li{cursor: pointer;float: left;padding-left: 12px;padding-right: 20px;font-size: 24px;color: #333333;border-bottom: 1px solid transparent;line-height: 50px;position: relative;}
   
 .act{color:#074d88 !important;border-bottom: 1px solid #074d88!important;}
-.main_details ul li img{;width: 260px;height:211px;}
+.main_details ul li img{width: 260px;height:211px;}
 .main_details ul li .details_fix{position: absolute;top: 140px;background: rgba(0,0,0,0.5);z-index: 12;width: 260px;height: 70px;
     text-align: left;color: #FFFFFF;padding-left: 10px;}
 

+ 5 - 1
src/js/newMenu/achievementList.js

@@ -180,7 +180,11 @@ $(function () {
                         theArrs.push(`
                         <li>
                             <a href="${globalConfig.context}/portal/technologyTrading/achievementDetail?id=${thisdata.id}&type=${thisdata.dataCategory}">
-                                <div class="img">
+                                <div class="img" style="display:${thisdata.pictureUrl!=null?'block':'none'}">
+                                    <img src="${globalConfig.avatarHost + '/upload'+thisdata.pictureUrl}" alt="">
+                                    <span style="display:${news>7?'none':'block'}"></span>
+                                </div>
+                                <div class="img achievemrntImg" style="display:${thisdata.pictureUrl!=null?'none':'block'}">
                                     <img src="${thisdata.pictureUrl}" alt="">
                                     <span style="display:${news>7?'none':'block'}"></span>
                                 </div>

+ 6 - 4
src/js/newMenu/demandList.js

@@ -9,9 +9,6 @@ import 'css/newMenu/public.css';
 import 'css/newMenu/header.css'
 import 'css/newMenu/achievementList.css';
 import 'js/public.js';
-const globalConfig={
-    context:''
-} 
 "use strict";
 $(function () {
     var thePageNo = 1,
@@ -174,6 +171,7 @@ $(function () {
                 if(data.data&&data.data.error){
                     msg(data.data.error[0])
                 };
+                
                 let times = new Date().getTime();
                 if (data.data && data.data.list.length) {
                     let nub = data.data.list.length;
@@ -183,7 +181,11 @@ $(function () {
                         theArrs.push(`
                         <li>
                             <a href="${globalConfig.context}/portal/technologyTrading/demandDetail?id=${thisdata.id}&type=${thisdata.dataCategory}">
-                                <div class="img">
+                                <div class="img" style="display:${thisdata.pictureUrl!=null?'block':'none'}">
+                                    <img src="${globalConfig.avatarHost + '/upload'+thisdata.pictureUrl}" alt="">
+                                    <span style="display:${news>7?'none':'block'}"></span>
+                                </div>
+                                <div class="img noImg" style="display:${thisdata.pictureUrl!=null?'none':'block'}">
                                     <img src="${thisdata.pictureUrl}" alt="">
                                     <span style="display:${news>7?'none':'block'}"></span>
                                 </div>

+ 13 - 0
src/js/newMenu/serviceDetails.js

@@ -12,6 +12,10 @@ import 'js/public.js';
 
 "use strict";
 $(function () {
+    init();
+    function init(){
+        heightF();
+    }
     $('.collection p').eq(0).click(function () {
         let heart = $('.heart');
         if (heart.hasClass('active')) {
@@ -46,6 +50,15 @@ $(function () {
             }
         })
     }
+    //价值
+    function heightF(){
+        let het = $('.serviceDetailsList .value div').height();
+        console.log(het);
+        $('.serviceDetailsList .value h4').css({
+            height:(het+20)+'px',
+            lineHeight:(het+20)+'px'
+        })
+    }
     //提示框渐隐函数    
 	function msg() {
         $('.smg').addClass('active')

+ 6 - 2
src/js/newMenu/serviceList.js

@@ -145,7 +145,11 @@ $(function () {
                         theArrs.push(`
                         <li>
                             <a href="${globalConfig.context}/portal/service/serviceDetail?id=${thisdata.id?thisdata.id:''}">
-                                <div class="img">
+                                <div class="img" style="display:${thisdata.maxImgUrl!=null?'block':'none'}">
+                                    <img src="${globalConfig.avatarHost + '/upload'+thisdata.maxImgUrl}" alt="">
+                                    <span style="display:${news>7?'none':'block'}"></span>
+                                </div>
+                                <div class="img serviceImg" style="display:${thisdata.maxImgUrl!=null?'none':'block'}">
                                     <img src="${thisdata.maxImgUrl}" alt="">
                                     <span style="display:${news>7?'none':'block'}"></span>
                                 </div>
@@ -155,7 +159,7 @@ $(function () {
                                     </div>
                                     <div class="hr"></div>
                                     <div class="btnTxt">
-                                        <p>${thisdata.introduce}</p>
+                                        <p>${thisdata.introduce!=null?thisdata.introduce:'暂无介绍'}</p>
                                     </div>
                                 </div>
                             </a>

+ 1 - 32
template/newMenu/achievement.html

@@ -681,38 +681,7 @@
                 </div>
             </div>
             <div class="practicalRight">
-                <h4>技淘百科</h4>
-                <ul>
-                    <li>
-                        <img src="../../img/newMenu/achievement_21.jpg" alt="">
-                        <div>
-                            <p>高新服务流程如何</p>
-                            <hr />
-                        </div>
-                    </li>
-                    <li>
-                        <img src="../../img/newMenu/achievement_22.jpg" alt="">
-                        <div>
-                            <p>高新服务流程如何</p>
-                            <hr />
-                        </div>
-                    </li>
-                    <li>
-                        <img src="../../img/newMenu/achievement_23.jpg" alt="">
-                        <div>
-                            <p>高新服务流程如何</p>
-                            <hr />
-                        </div>
-                    </li>
-                    <li>
-                        <img src="../../img/newMenu/achievement_24.jpg" alt="">
-                        <div>
-                            <p>高新服务流程如何</p>
-                            <hr />
-                        </div>
-                    </li>
-                </ul>
-                <a href="#" class="float-right">查看更多 > </a>
+                
             </div>
         </div>
         <div class="studyT" id="transactionTitle">

+ 2 - 1
webpack.config.js

@@ -294,7 +294,8 @@ module.exports = (function () {
             extensions: ['.js', '.jsx'],
             alias:{
                 'js':__dirname+'/src/js',
-                'css':__dirname+'/src/css'
+                'css':__dirname+'/src/css',
+                'imgs':__dirname+'/img'
             }
         },
         plugins: plugins,