Browse Source

关于公司,知识产权申请首页完成

liting2017 6 years ago
parent
commit
4eb6a05566

BIN
img/patent/company_Banner.jpg


BIN
img/patent/patentServesBj.jpg


+ 272 - 0
src/css/newMenu/companyProfile.css

@@ -0,0 +1,272 @@
+.topNav{
+    border-bottom:3px solid #eaeaea;
+}
+.componyLogo{
+    width: 353px;
+    height: 80px;
+    z-index: 50;
+    position: relative;
+    margin-bottom: 60px;
+}
+.componyLogo div{
+    width: 102px;
+    height: 102px;
+    background: #ffffff;
+    padding: 4px;
+    box-shadow: 0 2px 10px #ccc;
+    position: absolute;
+    bottom: 0px;
+    z-index: 60;
+    border-radius: 5px;
+}
+.componyLogo div img{
+    width: 100%;
+    height: 100%;
+    display: inline-block;
+    border-radius: 5px;
+}
+.componyLogo p{
+    position: absolute;
+    right: 0;
+    top: 0;
+    height: 80px;
+    line-height: 80px;
+    font-size: 24px;
+    color: #1f1f1f;
+}
+/* 热门推荐 */
+.RecommendTitle{
+    clear: both;
+    text-align: center;
+}
+.RecommendTitle h2{
+    font-size: 26px;
+    color: #323131;
+}
+.RecommendTitle span{
+    display: inline-block;
+    width: 54px;
+    height: 4px;
+    background: #1697e9;
+    transition: all .2s ease-in;
+}
+
+/* 服务项目 */
+.componyService {
+    margin-top: 32px;
+    margin-bottom: 52px;
+}
+.componyService ul{
+    display: flex;
+    display: -webkit-flex;
+    justify-content: space-between;
+}
+.componyService ul li{
+    width: 273px;
+    background: #ffffff;
+    height: 366px;
+    transition: all .2s ease-in;
+}
+.componyService .componyServiceImg{
+    width: 100%;
+    height: 273px;
+}
+.componyService .componyServiceImg img{
+    width: 100%;
+    height: 100%;
+    display: inline-block;
+}
+.componyService .btnTxt .companyImg {
+    display: inline-block;
+    width: 23px;
+    height: 23px;
+    background: url(../../../img/shopList/shop_com.jpg) no-repeat;
+    background-size: 100% 100%;
+    margin-right: 8px;
+    vertical-align: top;
+    margin-top: 2px;
+}
+.componyService ul li .txtIntroduce {
+    width: 100%;
+    border: 1px solid #efefef;
+    padding: 0px 10px 22px;
+}
+.componyService ul li:hover .txtIntroduce{
+    border-color: transparent
+}
+.txtIntroduce .btnTxt p{
+    color:#787878;
+    overflow: hidden;
+    display: -webkit-box;              
+    text-overflow: ellipsis;            
+    -webkit-box-orient: vertical;       
+    -webkit-line-clamp:3;
+}
+.txtIntroduce  .txts p {
+    font-size: 20px;
+    color: #ff580e;
+    height: 50px;
+    line-height: 50px;
+}
+.txtIntroduce .btnTxt p{
+    height: 28px;
+    line-height: 28px;
+}
+.txtIntroduce  .txts p .componyName{
+    font-size: 16px;
+    color: #1f1f1f;
+    margin-left: 12px;
+    width: 140px;
+    vertical-align: top;
+    overflow: hidden;
+}
+.txtIntroduce .btnTxt .number{
+    float: right;
+}
+.txtIntroduce .btnTxt .companyName{
+    vertical-align: top
+}
+.componyService ul li:hover{
+    box-shadow: 0 4px 10px #ccc;
+    margin-top: -4px;
+    transition: all .2s ease-in-out;
+}
+.componyService ul li:hover .txtIntroduce .txts p .componyName{
+    color: #1697e9;
+}
+.introducue{
+    margin-bottom: 36px;
+}
+.introducue h3{
+    font-weight: normal;
+    font-size: 22px;
+    color: #1f1f1f;
+    margin-bottom: 30px;
+}
+.introducue p{
+    text-indent: 2em;;
+    text-align:justify; 
+    font-size: 16px;
+    color: #7a7878;
+    line-height: 28px;
+}
+.business{
+    margin-bottom: 67px;
+}
+/*荣誉资质*/
+.cooperationPeople{
+    margin-top: 20px;
+    padding:50px 20px 35px;
+    background: #f4f4f4;
+    margin-bottom: 40px;
+}
+.customerList {
+    width: 1160px;
+    overflow: hidden;
+}
+.customerList ul{
+    width: 9999999999px;
+    overflow: hidden;
+    padding: 1px;
+}
+.customerList ul li{
+    width: 282px;
+    float: left;
+    margin-right: 9px;
+    background: #ffffff;
+    height: 200px;
+    box-shadow: 0 0 10px #ccc;
+}
+.customerList ul li div{
+    width: 100%;
+    height: 100%;
+    padding:10px;
+}
+.customerList ul li p{
+    font-size: 14px;
+    text-align: center;
+    padding: 0 10px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    -o-text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 42px
+}
+.customerList ul li div img{
+    width: 100%;
+    height: 100%;
+    display: inline-block;
+}
+.btnDirection{
+    clear: both;
+    margin-top: 17px;
+    text-align: center;
+}
+.btnDirection .listPre{
+    width: 20px;
+    height: 20px;
+    border-left: 2px solid #cdcdcd;
+    border-top: 2px solid #cdcdcd;
+    transform: rotate(-45deg);
+    display: inline-block;
+    margin-top: 20px;
+    margin-right: 40px;
+}
+.btnDirection .listNext{
+    width: 20px;
+    height: 20px;
+    border-right: 2px solid #cdcdcd;
+    border-bottom: 2px solid #cdcdcd;
+    transform: rotate(-45deg);
+    display: inline-block;
+    margin-left: 40px;
+}
+.btnDirection span:hover{
+    cursor: pointer;
+    border-color: #1697e9;
+}
+.contantUs{
+    margin-top: 33px;
+    height: 130px;
+    display: flex;
+    display: -webkit-flex;
+    justify-content: space-between;
+    margin-bottom: 100px;
+}
+.contantUs li{
+    width: 372px;
+    background: #f4f4f4;
+    height: 130px;
+    display: -webkit-flex;
+    display: flex;
+    padding: 36px 0px 0 40px ;
+}
+.contantUs li .glyphicon{
+    font-size: 48px;
+    display: inline-block;
+    margin-right: 28px;
+    font-weight: normal;
+    margin-top: 4px;
+    
+}
+.contantUs li p:nth-child(1){
+    margin-bottom: 14px;
+}
+.contantUs li p span{
+    font-size: 14px;
+    color: #7a7878;
+}
+.contantUs li p{
+    font-size: 16px;
+    color: #1f1f1f;
+}
+.contantUs li p .pho{
+    margin-left: 10px;
+}
+.contantUs li:hover{
+    background: #1697e9;
+}
+.contantUs li:hover .glyphicon,.contantUs li:hover p,.contantUs li:hover span{
+    color: #ffffff;
+}

+ 420 - 9
src/css/newMenu/patent.css

@@ -1,3 +1,8 @@
+/* 
+    updata:2018/7/25
+    author:liting
+*/
+
 .menuPosition {
     width: 100%;
     height: 500px;
@@ -29,12 +34,16 @@
 .patentMenu .firstMenu{
     position: absolute;
     z-index: 20;
+    overflow: hidden;
     width: 198px;
-    height: 455px;
+    height: 452px;
     top: -13px;
     left: 0;
     border-radius: 10px 10px 0 0 ;
 }
+.patentMenu .firstMenu a{
+    color: #7a7878;
+}
 .patentMenu .firstMenu>p{
     width: 100%;
     height: 72px;
@@ -53,7 +62,7 @@
 .firstMenu ul li.active{
     border-right: 1px solid transparent;
 }
-.firstMenu ul li.active p {
+.firstMenu ul li.active  a{
     color: #1797e9;
 }
 .firstMenu ul li.active span{
@@ -64,13 +73,14 @@
     height: 127px;
     font-size: 18px;
     color: #7a7878;
-    line-height: 127px;
+    line-height: 126px;
 }
 .firstMenu ul li>p span{
     display: inline-block;
     height: 20px;
     line-height: 18px;
     color:#7a7878;
+    vertical-align: middle;
 }
 .firstMenu ul li .circl{
     display: inline-block;
@@ -87,6 +97,9 @@
     cursor: pointer;
 }
 .firstMenu ul li .direction{
+     float: right;
+     margin-top: 58px;
+     margin-right: 14px;
      width: 10px ;
      height: 10px;
      display: inline-block;
@@ -107,19 +120,15 @@
     top: 0;
     left: 0;
     z-index: 50;
-    display: flex;
-    display: -webkit-flex;
-    justify-content: flex-start;
     display: none;
-    
 }
 .secondMenu ul li div{
     width: 180px;
+    float: left;
     height: 300px;
     margin-top:44px;
     border-left:  1px dotted #e0e0e0;
     text-align: center;
-   
 }
 .secondMenu ul li.active{
     display: block;
@@ -157,7 +166,7 @@
 .indexSearch{
     width: 743px;
     height: 36px;
-    margin: 10px auto 0;
+    margin: 10px auto 74px;;
 }
 
 .indexSearch .search-inp{
@@ -193,6 +202,9 @@
 .form-control,.btn{
     border-radius: 0;
 }
+.btn{
+    padding: 0;
+}
 .indexSearch .search-inp .input-group .input-group-btn{
     width: 104px;
 }
@@ -211,9 +223,408 @@
     color: #ffffff;
     background: #ffac2a;
 }
+/* 热门推荐 */
+.RecommendTitle{
+    clear: both;
+    text-align: center;
+}
+.RecommendTitle h2{
+    font-size: 26px;
+    color: #323131;
+}
+.RecommendTitle span{
+    display: inline-block;
+    width: 54px;
+    height: 4px;
+    background: #1697e9;
+    transition: all .2s ease-in;
+}
+/* 最新发布 */
+.newRelease{
+    margin-top: 30px;
+    display: flex;
+    display: -webkit-flex;
+    justify-content: space-between;
+    margin-bottom: 70px;
+}
+.newRelease li{
+    width: 25%;
+    height: 322px;
+    position: relative;
+    z-index: 20;
+}
+.newRelease li:first-child .txt{
+    border-left: 1px solid #e0e0e0;
+}
+.newRelease li:last-child .txt{
+    border-right: 1px solid #e0e0e0;
+}
+.newRelease li:nth-child(2n) .newReleaseImgs{
+    width: 100%;
+    height: 162px;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    z-index: 25;
+    overflow: hidden;
+    transition: all .2s ease-in
+}
+.newRelease li:nth-child(2n+1) .newReleaseImgs{
+    width: 100%;
+    height: 162px;
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: 25;
+    overflow: hidden;
+    transition: all .2s ease-in
+}
+.newRelease li:nth-child(2n+1) .txt{
+    width: 100%;
+    height: 162px;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    z-index: 26;
+    border-bottom: 1px solid #e0e0e0;
+}
+.newRelease li:nth-child(2n) .txt{
+    width: 100%;
+    height: 162px;
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: 26;
+    border-top: 1px solid #e0e0e0;
+}
+.newRelease li:nth-child(2n+1) .txt .triangle_border_up{
+    position: absolute;
+    top: -12px;
+    left: 42px;
+    z-index: 60;
 
+}
+.newRelease li:nth-child(2n) .txt .triangle_border_up{
+    position: absolute;
+    transform: rotate(180deg);
+    bottom: -12px;
+    left:42px;
+    z-index: 60;
 
+}
+.newRelease li div img{
+    width: 100%;
+    height: 100%;
+    display: inline-block;
+    transition: all .2s ease-in;
+}
+.triangle_border_up{
+    width:0;
+    height:0;
+    border-width:0 14px 14px;
+    border-style:solid;
+    border-color:transparent transparent #fff;/*透明 透明  灰*/
+}
+.newRelease li .txt .triangle{
+    width: 18px;height: 12px;
+    display: inline-block;
+} 
+.txt{
+    padding: 45px 30px;
+}
+.txt .wrapperTxt h4{
+    font-weight: normal;
+    font-size: 20px;
+    color: #1f1f1f;
+    margin-bottom: 16px;
+}
+.txt .wrapperTxt p{
+    font-size: 16px;
+    color: #40acff;
+}
+.txt .wrapperTxt p span{
+    display: inline-block;
+    width:0;
+    height:0;
+    margin-left: 14px;
+    border-width:6px 0 6px 6px;
+    border-style:solid;
+    border-color:transparent transparent transparent #40acff;/*透明 透明 透明 灰*/
+}
+.newRelease li:hover .newReleaseImgs img{
+    transform: scale(1.1);
+    transition: all .4s ease-in-out;
+}
+/* 专利服务 */
+.patentService{
+    width: 100%;
+    height: 388px;
+    background: url(../../../img/patent/patentServesBj.jpg)no-repeat;
+    background-size:100% 100%;
+    margin-top: 24px;
+    margin-bottom: 64px; 
+    padding-top: 46px;
+}
+
+.patentService .patentServiceList ul{
+    display: flex;
+    height: 280px;
+    display: -webkit-flex;
+    justify-content: space-between;
+}
+.patentService .patentServiceList ul li{
+    width: 370px;
+    height: 280px;
+    background: #ffffff;
+    transition: all .2s ease-in;
+}
+.patentServiceList ul li:hover p{
+    color: #1697e9!important;
+}
+.patentService .patentServiceList ul li div{
+    width: 100%;
+    height: 202px;
+    overflow: hidden;
+}
+.patentService .patentServiceList ul li p{
+    height: 78px;
+    line-height: 78px;
+    text-align: center;
+    padding:0 10px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    -o-text-overflow: ellipsis;
+    font-size: 22px;
+    color: #1f1f1f;
+}
+.patentService .patentServiceList ul{
+    margin-bottom: 20px;
+}
+.patentService .patentServiceList ul li div img{
+    width: 100%;
+    height: 100%;
+    display: inline-block;
+    transition: all .2s ease-in;
+}
+.patentService .patentServiceList ul li:hover{
+    box-shadow: 0 4px 10px #ccc;
+    transition: all .2s ease-in-out;
+    margin-top: -4px;
+}
+/* more */
+.more{
+    clear: both;
+    overflow: hidden;
+    float:right;
+    font-size: 14px;
+    color: #323131;
+}
+.more:hover{
+    color: #1697e9;
+}
+.more:hover span{
+    background: #1697e9;
+}
+.more:hover span::after{
+    background: #1697e9;
+}
+.more span{
+    display: inline-block;
+    width: 22px;
+    height: 1px;
+    margin-left: 10px;
+    margin-right: 8px;
+    background: #323131;
+    vertical-align: middle;
+}
+.more span:after{
+    content: '';
+    width: 6px;
+    height: 1px;
+    display: inline-block;
+    background:#323131;
+    transform: rotate(45deg);
+    vertical-align: top;
+    margin-left: 16px;
+    margin-top: -3px;
+}
+/* 商标服务 */
+.trademark{
+    margin-top: 20px;
+    background: #f4f4f4;
+    padding-top: 36px;
+    padding-bottom: 44px;
+    overflow: hidden;
+}
+.trademarkList{
+    height: 380px;
+    display: -webkit-flex;
+    display: flex;
+    justify-content: space-between;
+    padding: 0 14px;
+    margin-bottom: 16px;
+}
+.trademarkList li{
+    width: 284px;
+    height: 380px;
+    background: #ffffff;
+    transition: all .2s ease-in;
+}
+.trademarkList li div{
+    width: 100%;
+    height: 288px;
+    overflow: hidden;
+}
+.trademarkList li div img{
+    width: 100%;
+    height: 100%;
+    display: inline-block;
+}
+.trademarkList li  p{
+    height: 94px;
+    line-height: 94px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    -o-text-overflow: ellipsis;
+    white-space: nowrap;
+    font-size: 23px;
+    color: #1f1f1f;
+    text-align: center
+}
+.trademarkList li:hover{
+    margin-top: -4px;
+    box-shadow: 0 4px 10px #ccc;
+    transition: all .2s ease-in-out;
+}
+/* 版权服务 */
+.copyright {
+    height: 304px;
+    clear: both;
+    margin-top: 82px;
+    padding:0 14px;
+}
+.copyright h3{
+    font-weight: normal;
+    font-size: 26px;
+    color: #2f2f2f;
+    height: 32px;
+    padding-left: 14px;
+    border-left: 4px solid #1697e9;
+    margin-bottom: 12px;
+}
 
+.copyright ul{
+    height: 260px;
+    display: flex;
+    display: -webkit-flex;
+    justify-content: space-between;
+    margin-bottom: 20px;
+}
+.copyright ul li{
+    width: 360px;
+    height: 260px;
+    background: #ffffff;
+    transition: all .2s ease-in;
+}
+.copyright ul li div{
+    width: 100%;
+    height: 198px;
+    overflow: hidden;
+}
+.copyright ul li div img{
+    width: 100%;
+    height: 100%;
+    display: inline-block;
+}
+.copyright ul li:hover  p{
+    color: #1697e9
+}
+.copyright ul li  p{
+    height: 62px;
+    line-height: 62px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    -o-text-overflow: ellipsis;
+    white-space: nowrap;
+    font-size: 20px;
+    color: #484545;
+    text-align: center
+}
+.copyright ul li:hover{
+    margin-top: -4px;
+    box-shadow: 0 4px 10px #ccc;
+    transition: all .2s ease-in-out
+}
+.trademarkList li:hover{
+    margin-top: -4px;
+    box-shadow: 0 4px 10px #ccc;
+    transition: all .2s ease-in-out;
+}
+.trademarkList li:hover p{
+    color: #1697e9;
+}
+/* 知产百科 */
+.Encyclopedias {
+    clear: both;
+    padding-top: 52px
+}
+.Encyclopedias ul{
+    overflow: hidden;
+    margin-top: 26px;
+    width: 100%;
+    display: flex;
+    display: -webkit-flex;
+    justify-content: space-between;
+    flex-flow: row wrap;/*子元素溢出父容器时换行*/
+}
+.Encyclopedias ul li{
+    width:578px;
+    height: 157px;
+    margin-bottom: 30px;
+}
+.Encyclopedias ul li a{
+    display: inline-block;
+    display: flex;
+    display: -webkit-flex;
+    justify-content:space-between;
+}
+.Encyclopedias ul li .EncyclopediasImg{
+    width: 290px;
+    height: 157px;
+    overflow: hidden;
+}
+.Encyclopedias ul li .EncyclopediasImg img{
+    width: 100%;
+    height: 100%;
+    display: inline-block;
+    transition: all .4s ease-in-out;
+}
+.Encyclopedias ul li .EncyclopediasTxt{
+    width: 288px;
+    height: 157px;
+    padding: 22px 12px 0px;
+}
+.Encyclopedias ul li .EncyclopediasTxt h4{
+    font-weight: normal;
+    font-size: 16px;
+    color: #1f1f1f;
+    margin-bottom: 19px;
+}
+.Encyclopedias ul li .EncyclopediasTxt p{
+    font-size: 14px;
+    color: #7a7878;
+}
+.Encyclopedias .more{
+    margin-bottom: 50px;
+}
+.Encyclopedias ul li:hover .EncyclopediasImg img{
+    transform: scale(1.1);
+    transition: all .4s ease-in-out;
+}
+.Encyclopedias ul li:hover h4{
+    color: #1697e9;
+}
 
 
 

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

@@ -244,17 +244,22 @@
     float: right;
 }
 .achievementHot .btnTxt span{
+    color: #7a7878;
    height:23px;
    display: inline-block;
    line-height: 23px;
    vertical-align: top;
 }
 .btnTxt .companyName{
+    display: inline-block;
+    color: #7a7878;
+    font-size: 14px;
     width: 150px;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
     -o-text-overflow: ellipsis;
+    margin-top: 2px;
 }
 .achievementHot ul li .img {
     width: 100%;

+ 49 - 0
src/js/newMenu/companyProfile.js

@@ -0,0 +1,49 @@
+import 'css/bootstrap.less';
+import 'bootstrap/dist/js/bootstrap.js';
+import 'css/newMenu/public.css';
+import 'css/newMenu/header.css'
+import 'css/newMenu/companyProfile.css';
+import 'js/public.js';
+
+$(function(){
+     init();
+     function init(){
+        listFun();
+        navTop();
+     }
+     function navTop() {
+        $(window).scroll(function(){
+            var scrolltop=$(document).scrollTop();
+                if(scrolltop>60){
+                    $('.topNav').addClass('navFix')
+                }else{
+                    $('.topNav').removeClass('navFix');
+                }
+        });
+    }
+     /*合作客户切换  */
+     function listFun() {
+        let m = 0,
+            liW = $('.customerList ul li').width(),
+            rig =$('.customerList ul li').css('margin-right'),
+            len = $('.customerList ul li').length;
+        $('.listNext').on('click', function () {
+            m++;
+            if (m > len - 4) {
+                m = len - 4;
+            };
+            $('.customerList ul').animate({
+                marginLeft: -(liW+parseInt(rig)) * m + 'px'
+            })
+        });
+        $('.listPre').on('click', function () {
+            m--;
+            if (m <= 0) {
+                m = 0;
+            }
+            $('.customerList ul').animate({
+                marginLeft: -(liW+parseInt(rig)) * m + 'px'
+            })
+        });
+    }
+})

+ 31 - 7
src/js/newMenu/patent.js

@@ -1,12 +1,21 @@
-// import 'css/bootstrap.less';
-// import 'bootstrap/dist/js/bootstrap.js';
-// import 'css/newMenu/public.css';
-// import 'css/newMenu/header.css'
-// import 'css/newMenu/patent.css';
-// import 'js/public.js';
+import 'css/bootstrap.less';
+import 'bootstrap/dist/js/bootstrap.js';
+import 'css/newMenu/public.css';
+import 'css/newMenu/header.css'
+import 'css/newMenu/patent.css';
+import 'js/public.js';
 
 $(function(){
-    navTop();
+    init();
+    function init(){
+        navTop();
+        MenuFun();
+        searchFun();
+        $('.firstMenu ul li:eq(0)').addClass('active')
+        $('.firstMenu ul li:eq(0)').addClass('active')
+        $('.secondMenu ul li').eq(0).show()
+    }
+    //导航
     function navTop() {
         $(window).scroll(function(){
             var scrolltop=$(document).scrollTop();
@@ -17,4 +26,19 @@ $(function(){
                 }
         });
     }
+    //菜单切换
+    function MenuFun(){
+        $('.firstMenu ul li').click(function(){
+            let index =$(this).index();
+            $(this).addClass('active').siblings().removeClass('active');    
+            $('.secondMenu ul li').eq(index).show().siblings().hide();
+        });
+    }
+    function searchFun(){
+        $('.searchBtn').on('click',function(){
+            let sVal = $('.search-inp .demandSearch').val();
+            window.location.href = globalConfig.context + `/portal/service/patentList?name=${sVal}`
+        });
+       
+    }
 })

+ 63 - 18
src/js/newMenu/patentList.js

@@ -48,12 +48,30 @@ $(function () {
                             dataList.data.map((item,index)=>{
                                 if(dataList.topId==item.topLevelId){
                                    $('.serviceList .industry').eq(index).find('.industryList ul li:eq(0)').addClass('active');
+                                   $('.onSelect .preFirst').css('display', 'block').html(`
+                                         <span>不限</span>
+                                    `)
                                 }
                             })
                         }
                         if (item.indexOf('secondId') > -1) {
                             let secondIds = item.split('=')
                             dataList.secondId = decodeURIComponent(secondIds[1])
+                            (dataList.data).map((item,index)=>{
+                                if((item.children).length){
+                                    (item.children).map((atem,indexT)=>{
+                                        if(dataList.secondId==atem.id){
+                                            if(indexT>=7){
+                                                heigFun(index)
+                                            };
+                                            $('.onSelect .preFirst').css('display', 'block').html(`
+                                                <span>${atem.name}</span>
+                                            `)
+                                            $('.serviceList .industry').eq(index).find('.industryList ul li').eq(indexT+1).addClass('active');
+                                        }
+                                    })
+                                }
+                            })
                         }
                     })
                 } else {
@@ -69,11 +87,29 @@ $(function () {
                             if(dataList.topId==item.topLevelId){
                                $('.serviceList .industry').eq(index).find('.industryList ul li:eq(0)').addClass('active');
                             }
+                            $('.onSelect .preFirst').css('display', 'block').html(`
+                                <span>不限</span>
+                            `)
                         })
                     }
                     if (newHash.indexOf('secondId') > -1) {
                         let secondIds = newHash.split('=')
-                        dataList.secondId = decodeURIComponent(secondIds[1])
+                        dataList.secondId = decodeURIComponent(secondIds[1]);
+                        (dataList.data).map((item,index)=>{
+                            if((item.children).length){
+                                (item.children).map((atem,indexT)=>{
+                                    if(dataList.secondId==atem.id){
+                                        if(indexT>=7){
+                                            heigFun(index)
+                                        };
+                                        $('.onSelect .preFirst').css('display', 'block').html(`
+                                            <span>${atem.name}</span>
+                                        `)
+                                        $('.serviceList .industry').eq(index).find('.industryList ul li').eq(indexT+1).addClass('active');
+                                     }
+                                })
+                            }
+                        })
                     }
                 }
                 loadDate()
@@ -97,7 +133,6 @@ $(function () {
                 module: 1
             },
             success: function (data) {
-                console.log(data)
                 var theArrs = [];
                 if (data.data && data.data.length) {
                     let thisdata = data.data;
@@ -160,7 +195,7 @@ $(function () {
                             news = formatDuring(times) - formatDuring(thisdata.releaseDate);
                         theArrs.push(`
                         <li>
-                            <a href="${globalConfig.context}/portal/service/serviceDetail?id=${thisdata.id?thisdata.id:''}">
+                            <a href="${globalConfig.context}/portal/service/serviceDetail?id=${thisdata.id}">
                                 <div class="img serviceImg">
 									${thisdata.maxImgUrl&&thisdata.maxImgUrl!=null?'<img src="'+globalConfig.avatarHost+'/upload'+thisdata.maxImgUrl+'"/>':''}
                                 </div>
@@ -169,7 +204,11 @@ $(function () {
                                         <h5>${thisdata.name}</h5>
                                     </div>
                                     <div class="btnTxt">
-                                         <p><span class="companyImg"></span><span class="companyName">${thisdata.companyName}</span><span class="number">销量 : ${thisdata.dealCount?thisdata.dealCount:0}</span></p>
+                                         <p>
+                                            <span class="companyImg"></span>
+                                            <a href="${globalConfig.context}/portal/companyProfile?uid=${thisdata.companyId}" class="companyName">${thisdata.companyName}</a>
+                                            <span class="number">销量 : ${thisdata.dealCount?thisdata.dealCount:0}</span>
+                                         </p>
                                     </div>
                                 </div>
                             </a>
@@ -184,7 +223,7 @@ $(function () {
                 $('.inp').css('display', 'block');
                 if (data.data.list.length === 0) {
                     $('.achievementHot .hotList').html("<div class='list_none'></div>");
-                    $('.pagination_box').css('display', 'none')
+                    $('.pagination_box').css('display', 'none');
                     $('.inp').css('display', 'none');
                 };
                 thePageLength = data.data.totalCount ? Math.ceil(data.data.totalCount / pageSize) : 1;
@@ -269,26 +308,32 @@ $(function () {
             dataList.name = '';
             let txt = $(this).text();
             $('.onSelect .preFirst').css('display', 'block').html(`
-                    <span>${txt}</span>
+                <span>${txt}</span>
             `)
             loadDate();
         });
+
         //更多
+
         $('.industryList .more').click(function () {
-            let ulH = $('.industryList ul').height();
-            if ($(this).parents('.industry').hasClass('activeH')) {
-                $(this).parents('.industry').removeClass('activeH');
-                $(this).parents('.industry').height(52);
-                $(this).text('更多+')
-                $(this).parents('.industry').find('p').css({'height':'52px','line-height':'52px'})
-            }else{
-                $(this).text('收起')
-                $(this).parents('.industry').addClass('activeH');
-                $(this).parents('.industry').height(ulH);
-                $(this).parents('.industry').find('p').css({'height':ulH+'px','line-height':ulH+'px'})
-            }
+            let index = $(this).parents('.industry').index();
+            heigFun(index);
         })
     }
+    function heigFun(index){
+        let ulH = $('.industryList ul').height();
+        if ($('.industry').eq(index).hasClass('activeH')) {
+            $('.industry').eq(index).removeClass('activeH');
+            $('.industry').eq(index).height(52);
+            $('.industry').eq(index).find('.more').text('更多+')
+            $('.industry').eq(index).find('p').css({'height':'52px','line-height':'52px'})
+        }else{
+            $('.industry').eq(index).find('.more').text('收起')
+            $('.industry').eq(index).addClass('activeH');
+            $('.industry').eq(index).height(ulH);
+            $('.industry').eq(index).find('p').css({'height':ulH+'px','line-height':ulH+'px'})
+        }
+    }
     //搜索
     function search() {
         $('.hot ul li span').click(function(){

+ 0 - 3
src/js/newMenu/services.js

@@ -7,10 +7,7 @@ import 'js/public.js';
 import 'js/newMenu/map.js';
 
 $(function () {
-
-
     init();
-
     function init() {
         listFun();
         search();

File diff suppressed because it is too large
+ 656 - 0
template/newMenu/companyProfile.html


+ 235 - 3
template/newMenu/patent.html

@@ -6,10 +6,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>知识产权交易首页</title>
-    <link rel="stylesheet" href="../../src/css/bootstrap.css">
+    <!-- <link rel="stylesheet" href="../../src/css/bootstrap.css">
     <link rel="stylesheet" href="../../src/css/newMenu/patent.css">
     <link rel="stylesheet" href="../../src/css/newMenu/public.css">
-    <link rel="stylesheet" href="../../src/css/newMenu/header.css">
+    <link rel="stylesheet" href="../../src/css/newMenu/header.css"> -->
 </head>
 
 <body>
@@ -321,7 +321,239 @@
 				</div>
 			</div>
 			<span class="apply head_login">申请会员</span>
-		</div>
+        </div>
+        <div class="RecommendTitle">
+            <h2>最新发布</h2>
+            <span></span>
+        </div>
+        <ul class="newRelease">
+            <li>
+                <a href="#">
+                    <div class="newReleaseImgs">
+                        <img src="../../img/patent/patent_top.jpg" alt="">
+                    </div>
+                    <div class="txt">
+                        <div class="triangle_border_up"></div>
+                        <div class="wrapperTxt">
+                            <h4>版权转让</h4>
+                            <p>湖南阿凡提有限公司<span></span> </p>
+                        </div>
+                    </div>
+                </a>
+            </li>
+            <li>
+                <a href="#">
+                    <div class="newReleaseImgs">
+                        <img src="../../img/patent/patent_top.jpg" alt="">
+                    </div>
+                    <div class="txt">
+                        <div class="triangle_border_up"></div>
+                        <div class="wrapperTxt">
+                            <h4>版权转让</h4>
+                            <p>湖南阿凡提有限公司<span></span> </p>
+                        </div>
+                    </div>
+                </a>
+            </li>
+            <li>
+                <a href="">
+                    <div class="newReleaseImgs">
+                        <img src="../../img/patent/patent_top.jpg" alt="">
+                    </div>
+                    <div class="txt">
+                        <div class="triangle_border_up"></div>
+                        <div class="wrapperTxt">
+                            <h4>版权转让</h4>
+                            <p>湖南阿凡提有限公司<span></span> </p>
+                        </div>
+                    </div>
+                </a>
+            </li>
+            <li>
+                <a href="">
+                    <div class="newReleaseImgs">
+                        <img src="../../img/patent/patent_top.jpg" alt="">
+                    </div>
+                    <div class="txt">
+                        <div class="triangle_border_up"></div>
+                        <div class="wrapperTxt">
+                            <h4>版权转让</h4>
+                            <p>湖南阿凡提有限公司<span></span> </p>
+                        </div>
+                    </div>
+                </a>
+            </li>
+        </ul>
+        <div class="RecommendTitle">
+            <h2>专利服务</h2>
+            <span></span>
+        </div>
+    </div>
+    <div class="patentService">
+        <div class="container patentServiceList">
+            <ul>
+                <li>
+                    <a href="#">
+                        <p>发明专利</p>
+                        <div>
+                                <img src="../../img/initPic/achievementInit.jpg" alt="">
+                        </div>
+                    </a>
+                </li>
+                <li>
+                    <a href="#">
+                        <p>发明专利</p>
+                        <div>
+                                <img src="../../img/initPic/achievementInit.jpg" alt="">
+                        </div>
+                    </a>
+                </li>
+                <li>
+                    <a href="#">
+                        <p>发明专利</p>
+                        <div>
+                                <img src="../../img/initPic/achievementInit.jpg" alt="">
+                        </div>
+                    </a>
+                </li>
+            </ul>
+            <a href="#" class="more">MORE
+                    <span></span>
+            </a>
+        </div>
+    </div>
+    <div class="RecommendTitle">
+        <h2>商标服务</h2>
+        <span></span>
+    </div>
+    <div class="container">
+        <div class="trademark">
+            <ul class="trademarkList">
+                <li>
+                    <a href="#">
+                        <div>
+                            <img src="../../img/initPic/achievementInit.jpg" alt="">
+                        </div>
+                        <p>发明专利</p>
+                    </a>
+                </li>
+                <li>
+                    <a href="#">
+                        <div>
+                            <img src="../../img/initPic/achievementInit.jpg" alt="">
+                        </div>
+                        <p>发明专利</p>
+                    </a>
+                </li>
+                <li>
+                    <a href="#">
+                        <div>
+                            <img src="../../img/initPic/achievementInit.jpg" alt="">
+                        </div>
+                        <p>发明专利</p>
+                    </a>
+                </li>
+                <li>
+                    <a href="#">
+                        <div>
+                            <img src="../../img/initPic/achievementInit.jpg" alt="">
+                        </div>
+                        <p>发明专利</p>
+                    </a>
+                </li>
+            </ul> 
+            <a href="#" class="more">MORE
+                <span></span>
+            </a>
+            <div class="copyright">
+                <h3 >版权服务</h3>
+                <ul>
+                    <li>
+                        <a href="#">
+                            <div>
+                                <img src="../../img/initPic/achievementInit.jpg" alt="">
+                            </div>
+                            <p>发明专利</p>
+                        </a>
+                    </li>
+                    <li>
+                        <a href="#">
+                            <div>
+                                <img src="../../img/initPic/achievementInit.jpg" alt="">
+                            </div>
+                            <p>发明专利</p>
+                        </a>
+                    </li>
+                    <li>
+                        <a href="#">
+                            <div>
+                                <img src="../../img/initPic/achievementInit.jpg" alt="">
+                            </div>
+                            <p>发明专利</p>
+                        </a>
+                    </li>
+                </ul>
+                <a href="#" class="more">MORE
+                    <span></span>
+                </a>
+            </div>
+        </div>
+        <div class="Encyclopedias">
+            <div class="RecommendTitle">
+                <h2>知产百科</h2>
+                <span></span>
+            </div>
+            <ul>
+                <li>
+                    <a href="#">
+                        <div class="EncyclopediasImg">
+                            <img src="../../img/initPic/achievementInit.jpg" alt="">
+                        </div>
+                        <div class="EncyclopediasTxt">
+                            <h4>加奖金哦违法爱按金额if啊积分经...</h4>
+                            <p>哈哈哈哈海鸥科技打飞机附近的啊我的㘝酒店设计大姐姐 但是大家觉得结算单基督教圣诞节ajd...</p>
+                        </div>
+                    </a>
+                </li>
+                <li>
+                    <a href="#">
+                        <div class="EncyclopediasImg">
+                            <img src="../../img/initPic/achievementInit.jpg" alt="">
+                        </div>
+                        <div class="EncyclopediasTxt">
+                            <h4>加奖金哦违法爱按金额if啊积分经...</h4>
+                            <p>哈哈哈哈海鸥科技打飞机附近的啊我的㘝酒店设计大姐姐 但是大家觉得结算单基督教圣诞节ajd...</p>
+                        </div>
+                    </a>
+                </li>
+                <li>
+                     <a href="#">
+                        <div class="EncyclopediasImg">
+                            <img src="../../img/initPic/achievementInit.jpg" alt="">
+                        </div>
+                        <div class="EncyclopediasTxt">
+                            <h4>加奖金哦违法爱按金额if啊积分经...</h4>
+                            <p>哈哈哈哈海鸥科技打飞机附近的啊我的㘝酒店设计大姐姐 但是大家觉得结算单基督教圣诞节ajd...</p>
+                        </div>
+                    </a>
+                </li>
+                <li>
+                    <a href="#">
+                        <div class="EncyclopediasImg">
+                            <img src="../../img/initPic/achievementInit.jpg" alt="">
+                        </div>
+                        <div class="EncyclopediasTxt">
+                            <h4>加奖金哦违法爱按金额if啊积分经...</h4>
+                            <p>哈哈哈哈海鸥科技打飞机附近的啊我的㘝酒店设计大姐姐 但是大家觉得结算单基督教圣诞节ajd...</p>
+                        </div>
+                    </a>
+                </li>
+            </ul>
+            <a href="#" class="more">MORE
+                <span></span>
+            </a>
+        </div>
+        
     </div>
     <footer>
         <div id="bottom">

+ 6 - 0
webpack.config.js

@@ -276,6 +276,12 @@ module.exports = (function () {
             filename: 'html/newMenu/patent.html',
             template: './template/newMenu/patent.html',
             chunks: ['newMenu/patent', 'vendors']
+        }),
+        new HtmlWebpackPlugin({
+            title: '公司简介',
+            filename: 'html/newMenu/companyProfile.html',
+            template: './template/newMenu/companyProfile.html',
+            chunks: ['newMenu/companyProfile', 'vendors']
         })
     ];
     if (!isDev) {

+ 6 - 2
webpack/entry.config.js

@@ -42,7 +42,8 @@ module.exports = {
         'newMenu/shopList': './src/js/newMenu/shopList.js',
         'newMenu/patentList': './src/js/newMenu/patentList.js',
         'newMenu/tradingIndex': './src/js/newMenu/tradingIndex.js',
-        'newMenu/patent': './src/js/newMenu/patent.js'
+        'newMenu/patent': './src/js/newMenu/patent.js',
+        'newMenu/companyProfile': './src/js/newMenu/companyProfile.js'
     },
     watch: {
         'index': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
@@ -210,7 +211,10 @@ module.exports = {
         'newMenu/patent': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
         'webpack/hot/only-dev-server',
         './src/js/newMenu/patent.js'
+        ],
+        'newMenu/companyProfile': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'webpack/hot/only-dev-server',
+        './src/js/newMenu/companyProfile.js'
         ]
-
     }
 };