dengzhiguo 6 years ago
parent
commit
848b120e08

BIN
img/initPic/newsInit.jpg


BIN
img/newMenu/adviserBanner.png


BIN
img/newMenu/policyBanner.png


+ 1 - 5
src/css/newMenu/adviser.css

@@ -143,10 +143,6 @@ footer{
     box-shadow: 0 0 20px #ccc;
     transition: all .2 ease-in;
 }
-.listHead ul li:hover .bjImg img{
-    transform: scale(1.1);
-    transition: all .5 ease-in;
-}
 .listHead ul li .bjImg{
     width: 100%;
     height: 100%;
@@ -161,7 +157,7 @@ footer{
     width: 100%;
     display: inline-block;
     height: 100%;
-    transition: all .2 ease-in-out;
+    border: 0;
 }
 .listHead ul li .collectionNumber{
     position: absolute;

+ 9 - 7
src/css/newMenu/adviserDetail.css

@@ -1,11 +1,11 @@
 .componyLogo{
-    width:800px;
+    width:100%;
     height: 80px;
     z-index: 50;
     position: relative;
     margin-bottom: 10px;
 }
-.componyLogo div{
+.componyLogo div:first-child{
     width: 120px;
     height: 120px;
     background: #ffffff;
@@ -81,20 +81,22 @@
 }
 .adviser_consultation{
     clear: both;
+    position: absolute;
+    right: 20px;
+    top: 20px;
 }
 .adviser_consultation a{
     cursor: pointer;
     float: right;
     display: inline-block;
-    width: 140px;
-    line-height: 53px;
-    height: 55px;
+    width: 120px;
+    line-height: 38px;
+    height: 40px;
     border: 1px solid #ff580e;
     color: #ff580e;
     background: #ffeee6;
     text-align: center;
-    font-size: 18px;
-    margin-bottom: 90px;
+    font-size: 16px;
 }
 .adviser_consultation a:hover{
     border-color:#fff;

+ 10 - 9
src/css/newMenu/index.css

@@ -132,7 +132,7 @@
     font-size: 26px;
     text-align: center;
     color: #323131;
-    margin-top: 70px;
+    margin-top: 40px;
 }
 .handle{
     padding-top: 34px;
@@ -210,7 +210,7 @@
 .handle ul li:hover{
     box-shadow: 0 4px 15px #ccc;
 }
-.handle .more{
+.more{
     clear: both;
     overflow: hidden;
     float:right;
@@ -252,16 +252,16 @@
     -webkit-box-orient: vertical;       
     -webkit-line-clamp:3;
 }
-.handle .more:hover{
+.more:hover{
     color: #1697e9;
 }
-.handle .more:hover span{
+.more:hover span{
     background: #1697e9;
 }
-.handle .more:hover span::after{
+.more:hover span::after{
     background: #1697e9;
 }
-.handle .more span{
+.more span{
     display: inline-block;
     width: 22px;
     height: 1px;
@@ -270,7 +270,7 @@
     background: #323131;
     vertical-align: middle;
 }
-.handle .more span:after{
+.more span:after{
     content: '';
     width: 6px;
     height: 1px;
@@ -696,7 +696,7 @@
     display: flex;
     display: -webkit-flex;
     justify-content: space-between;
-    margin-bottom: 10px;
+    margin-bottom: 20px;
 }
 .publicNumber .video{
     width: 565px;
@@ -772,10 +772,11 @@
     margin-bottom: 20px;
 }
 @media screen and (max-width:1200px){
-    .bannerList{
+    .bannerList,.brand{
         width: 1200px!important;
         margin: 0 auto;
     }
+
 }
 
 

+ 7 - 0
src/css/newMenu/patent.css

@@ -549,6 +549,7 @@
     display: -webkit-flex;
     justify-content: space-between;
     margin-bottom: 20px;
+    margin-top: 15px;
 }
 .copyright ul li{
     width: 360px;
@@ -665,7 +666,13 @@
     display: inline-block;
 }
 
+@media screen and (max-width:1200px){
+    .patentService{
+        width: 1200px!important;
+        margin: 0 auto;
+    }
 
+}
 
 
 

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

@@ -21,6 +21,8 @@ th, td  {
 }
 img{
 	border: none;
+	image-rendering: optimizeQuality;  
+    -ms-interpolation-mode: bicubic;
 }
 body,
 button, input, select, textarea  {

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

@@ -119,7 +119,6 @@
 .serviceDetailsTxt a{
     cursor: pointer;
     width: 150px;
-    /*float: right;*/
     display: inline-block;
     height: 54px;
     line-height: 54px;
@@ -128,6 +127,7 @@
     color: #ffffff;
     background: #1697ea;
     margin-top: 16px;
+    border: 1px solid transparent;
 }
 .serviceDetailsTxt a:hover{
     background: #ffff;

+ 0 - 3
src/css/newMenu/tradingIndex.css

@@ -185,9 +185,6 @@
     text-overflow:ellipsis; 
     -o-text-overflow:ellipsis;
 }
-.patentAchievementList ul li a{
-    display: inline-block;
-}
 .patentAchievementListBj{
     background: #f9f9f9;
     height: 350px;

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

@@ -221,6 +221,7 @@ $(function () {
                 $('.totalCount').html(`共${data.data.totalCount}条数据 ${thePageLength}页`)
                 var pageArr = [],
                     firstNo = 1,
+                    thePageNo=pageNo||1,
                     endNo = 5;
                 if (thePageNo > 3) {
                     firstNo = thePageNo - 2;

+ 11 - 0
src/js/newMenu/adviser.js

@@ -17,6 +17,17 @@ $(function () {
     function init() {
         search();
         loadDate();
+        navTop();
+    }
+    function navTop() {
+        $(window).scroll(function(){
+            var scrolltop=$(document).scrollTop();
+                if(scrolltop>0){
+                    $('.topNav').addClass('navFix')
+                }else{
+                    $('.topNav').removeClass('navFix');
+                }
+        });
     }
     function loadDate(pageNo) {
         $.ajax({

+ 10 - 4
src/js/newMenu/adviserList.js

@@ -135,6 +135,7 @@ $(function () {
                 $('.pagePre').after(pageArr.join(''));
                 $('footer').show();
                 colFun();
+               
             }
         });
     }
@@ -252,25 +253,30 @@ $(function () {
             if($(this).hasClass('active')){
                 $(this).removeClass('active');
                 dataList.sortType='';
-                loadDate(1);
+                thePageNo=1
+                loadDate(thePageNo);
             }else{
                 $('.colNumber').removeClass('active')
                 $(this).addClass('active');
                 dataList.sortType=0;
-                loadDate(1);
+                thePageNo=1;
+                loadDate(thePageNo);
             }
         })
         $('.sort .colNumber').click(function(){
             if($(this).hasClass('active')){
                 $(this).removeClass('active');
                 dataList.sortType='';
-                loadDate(1)
+                thePageNo=1;
+                loadDate(thePageNo);
             }else{
                 $('.relTime').removeClass('active')
                 $(this).addClass('active');
                 dataList.sortType=1;
-                loadDate(1)
+                thePageNo=1;
+                loadDate(thePageNo);
             }
         })
+        
     }
 })

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

@@ -220,6 +220,7 @@ $(function () {
                 $('.totalCount').html(`共${data.data.totalCount}条数据 ${thePageLength}页`)
                 var pageArr = [],
                     firstNo = 1,
+                    thePageNo=pageNo||1,
                     endNo = 5;
                 if (thePageNo > 3) {
                     firstNo = thePageNo - 2;

+ 1 - 0
src/js/newMenu/patentList.js

@@ -240,6 +240,7 @@ $(function () {
                 $('.totalCount').html(`共${data.data.totalCount}条数据 ${thePageLength}页`)
                 var pageArr = [],
                     firstNo = 1,
+                    thePageNo=pageNo||1,
                     endNo = 5;
                 if (thePageNo > 3) {
                     firstNo = thePageNo - 2;

+ 2 - 3
src/js/newMenu/publicComment.js

@@ -102,7 +102,6 @@
                  thePageLength = data.data.comments.totalCount ? Math.ceil(data.data.comments.totalCount / pageSize) : 1;
                  $('.totalCount').html(`共${data.data.comments.totalCount}条数据 ${thePageLength}页`)
                  var pageArr = [],
-                     thePageNo=pageNo||1,
                      firstNo = 1,
                      endNo = 5;
                  if (thePageNo > 3) {
@@ -211,8 +210,8 @@
                  msg('评论成功,感谢您的评论。');
                  $('#commentArea').val('');
                  $('.ulStar span').removeClass('glyphicon-star').addClass('glyphicon-star-empty');
-                
-                 loadDate(1);
+                 thePageNo=1;
+                 loadDate(thePageNo);
                 
              })
          })

+ 3 - 2
src/js/newMenu/serviceDetails.js

@@ -20,6 +20,7 @@ $(function () {
         add();
     }
     $('.collection p').eq(0).click(function () {
+        window.location.hash='jump';
         let heart = $('.heart');
         if (heart.hasClass('active')) {
             collectionApi(0) //取消收藏
@@ -180,7 +181,6 @@ $(function () {
                 $('.totalCount').html(`共${data.data.comments.totalCount}条数据 ${thePageLength}页`)
                 var pageArr = [],
                     firstNo = 1,
-                    thePageNo=pageNo||1,
                     endNo = 5;
                 if (thePageNo > 3) {
                     firstNo = thePageNo - 2;
@@ -283,7 +283,8 @@ $(function () {
                 msg('评论成功,感谢您的评论。');
                 $('#commentArea').val('');
                 $('.ulStar span').removeClass('glyphicon-star').addClass('glyphicon-star-empty');
-                loadDate(1);
+                thePageNo=1;
+                loadDate(thePageNo);
             })
         })
     }

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

@@ -225,6 +225,7 @@ $(function () {
                 $('.totalCount').html(`共${data.data.totalCount}条数据 ${thePageLength}页`)
                 var pageArr = [],
                     firstNo = 1,
+                    thePageNo=pageNo||1,
                     endNo = 5;
                 if (thePageNo > 3) {
                     firstNo = thePageNo - 2;

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

@@ -104,10 +104,10 @@ $(function () {
 							day = timeAll.getDate()>9?timeAll.getDate():'0'+timeAll.getDate(), //号
 							month =timeAll.getMonth()+1>9?timeAll.getMonth()+1:'0'+(timeAll.getMonth()+1), //年、月
 							year =timeAll.getFullYear(),
-						 	summary = thisdata.summary; //简介
+						 	summary = (thisdata.summary).length>90?(thisdata.summary).substr(0,90)+'...':thisdata.summary; //简介
 						if (summary == null) {
 							summary == '暂无内容'
-						};
+						}
 						var srctt = globalConfig.context + '/portal/news/newsDetail.html?id=' + id+'&type='+thisdata.type;
 						theArr.push([
 							'<li>',

+ 1 - 1
template/newMenu/patent.html

@@ -595,7 +595,7 @@
                 <li>
                     <a href="#">
                         <div class="EncyclopediasImg">
-                            <img src="../../img/initPic/achievementInit.jpg" alt="">
+                            <img src="../../img/initPic/newsInit.jpg" alt="">
                         </div>
                         <div class="EncyclopediasTxt">
                             <h4>加奖金哦违法爱按金额if啊积分经...</h4>