dengzhiguo 6 years ago
parent
commit
343f587f98
42 changed files with 3175 additions and 279 deletions
  1. BIN
      img/Logo11.png
  2. BIN
      img/Logo111.png
  3. BIN
      img/Logo1111.png
  4. BIN
      img/newMenu/adviserBanner.png
  5. BIN
      img/newMenu/adviserHeart.jpg
  6. BIN
      img/newMenu/adviserMid.jpg
  7. BIN
      img/newMenu/serves_14.jpg
  8. BIN
      img/newMenu/service_27.jpg
  9. BIN
      img/newMenu/service_28.png
  10. BIN
      img/newMenu/service_jung.jpg
  11. BIN
      img/patent/tradingIndexPg.jpg
  12. 267 0
      src/css/newMenu/adviser.css
  13. 274 0
      src/css/newMenu/adviserDetail.css
  14. 211 0
      src/css/newMenu/adviserList.css
  15. 5 4
      src/css/newMenu/header.css
  16. 1 1
      src/css/newMenu/highTech.css
  17. 20 17
      src/css/newMenu/patent.css
  18. 4 1
      src/css/newMenu/patentList.css
  19. 3 7
      src/css/newMenu/public.css
  20. 5 2
      src/css/newMenu/serviceList.css
  21. 54 1
      src/css/newMenu/services.css
  22. 32 0
      src/css/newMenu/tradingIndex.css
  23. 1 1
      src/js/newMenu/achievement.js
  24. 142 0
      src/js/newMenu/adviser.js
  25. 247 0
      src/js/newMenu/adviserDetail.js
  26. 269 0
      src/js/newMenu/adviserList.js
  27. 0 57
      src/js/newMenu/evaluate.js
  28. 25 1
      src/js/newMenu/patent.js
  29. 22 12
      src/js/newMenu/serviceDetails.js
  30. 45 23
      src/js/newMenu/serviceList.js
  31. 1 58
      src/js/newMenu/shopList.js
  32. 15 3
      src/js/newMenu/tradingIndex.js
  33. 24 24
      src/js/public.js
  34. 1 1
      src/js/thinkTank/thinkerDetail.js
  35. 503 0
      template/newMenu/adviser.html
  36. 569 0
      template/newMenu/adviserDetail.html
  37. 418 0
      template/newMenu/adviserList.html
  38. 1 1
      template/newMenu/evaluate.html
  39. 8 53
      template/newMenu/services.html
  40. 7 0
      template/newMenu/tradingIndex.html
  41. 1 7
      webpack.config.js
  42. 0 5
      webpack/entry.config.js

BIN
img/Logo11.png


BIN
img/Logo111.png


BIN
img/Logo1111.png


BIN
img/newMenu/adviserBanner.png


BIN
img/newMenu/adviserHeart.jpg


BIN
img/newMenu/adviserMid.jpg


BIN
img/newMenu/serves_14.jpg


BIN
img/newMenu/service_27.jpg


BIN
img/newMenu/service_28.png


BIN
img/newMenu/service_jung.jpg


BIN
img/patent/tradingIndexPg.jpg


+ 267 - 0
src/css/newMenu/adviser.css

@@ -0,0 +1,267 @@
+/* 搜索 */
+.indexSearch{
+    width: 635px;
+    height: 36px;
+    margin: 37px auto 74px;
+}
+footer{
+    /* display: none; */
+}
+.indexSearch .search-inp{
+    clear: both;
+    width:635px;
+    height: 36px;
+}
+.searchBtn{
+    width: 104px;
+    font-size: 18px;
+}
+.indexSearch .demandSearch{
+    width: 530px;
+    height: 36px;
+    line-height: 34px;
+    border-color: #bbd5e5;
+}
+.indexSearch .searchBtn{
+    height: 36px;
+    line-height: 22px;
+    background: #1697e9;
+    border: 1px solid #1697e9;
+    color: #ffffff;
+}
+.indexSearch .searchBtn img{
+    width: 25px;height: 24px;
+    vertical-align: top
+}
+.indexSearch .search-inp{
+    float: left;
+}
+.indexSearch .search-inp .input-group{
+    width: 530px;
+}
+/* 列表 */
+.pagination_box {
+    width: 100%;
+    line-height: 74px
+}
+
+.pagination_box nav {
+    float: right;
+    clear: both;
+}
+
+.pagination_box ul li a {
+    color: #333
+}
+
+.pagination_box .pagination {
+    float: right;
+    margin-right: 20px;
+}
+
+.pagination_box .totalCount {
+    float: right;
+    line-height:84px;
+    display: inline-block;
+    margin-right: 15px;
+}
+.inp{
+    float: right;
+}
+.pagination_box{
+    display: none;
+}
+.list_none {
+    width: 550px;
+    height: 150px;
+    background: url("../../../img/all_null.png") no-repeat;
+    margin: 50px auto;
+}
+.inp{
+    display: none;
+}
+.inp input{
+    vertical-align:middle;
+    width:40px;
+    height: 32px;
+    text-align: center;
+    border-radius: 5px;
+    border:1px solid #ccc;
+}
+.inp button{
+    margin: 0 10px;
+    width: 50px;
+}
+
+.search{
+    width: 100%;
+    height: 52px;
+    line-height: 52px;
+    background: #f9f9f9;
+}
+.pagination_box .pagePre a{
+    margin-right: 10px
+}
+.pagination_box .pageNext a{
+    margin-left: 10px;
+}
+
+/* 首页 */
+.adviserIndexList{
+    margin-top: 80px;
+    text-align: center;
+}
+.listHead{
+    margin-bottom: 58px;
+}
+.listHead ul{
+    display: flex;
+    display: -webkit-flex;
+    justify-content: space-between;
+}
+.listHead ul li{
+    width: 262px;
+    height: 386px;
+    position: relative;
+    z-index: 10;
+    border-radius: 15px;
+    overflow: hidden;
+    transition: all .2 ease-in-out;
+}
+.listHead ul li:hover {
+    box-shadow: 0 0 20px #ccc;
+    transition: all .2 ease-in;
+}
+.listHead ul li:hover .bjImg img{
+    transform: scale(1.1);
+    transition: all .2 ease-in;
+}
+.listHead ul li .bjImg{
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    z-index: 11;
+    top: 0;
+    left: 0;
+    border-radius: 15px;
+}
+.listHead ul li .bjImg img{
+    width: 100%;
+    display: inline-block;
+    height: 100%;
+    overflow: hidden;
+    transition: all .2 ease-in-out;
+}
+.listHead ul li .collectionNumber{
+    position: absolute;
+    width: 78px;
+    height: 40px;
+    background: #f5a07a;
+    color:#ffffff;
+    line-height: 40px;
+    text-align: center;
+    font-size: 16px;
+    right:0;
+    top: 23px;
+    z-index: 12;
+    border-radius: 20px 0 0 20px
+}
+.banner{
+    width: 100%;
+}
+.banner img{
+    width: 100%
+}
+.listHead ul li .collectionNumber img{
+    margin-left:8px;
+    display: inline-block;
+}
+.listHead ul li .mode{
+    overflow: hidden;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    z-index: 12;
+    width: 100%;
+    height: 172px;
+}
+.listHead ul li .mode>span{
+    display: inline-block;
+    width: 100%;
+    height: 400px;
+    opacity: .2;
+    background: #000;
+    transform: rotate(113deg);
+    margin-top: 20px;
+
+}
+.listHead ul li .mode p{
+    position: absolute;
+    bottom: 24px;
+    left: 22px;
+    font-size: 24px;
+    color: #ffffff;
+    
+}
+.listHead ul li .mode p>span{
+    display: inline-block;
+    font-size:16px;
+    color: #ffffff;
+    margin-left: 12px; 
+}
+/* mid */
+
+.listMid{
+   overflow: hidden;
+}
+.listMid .listMidLeft{
+    cursor: pointer;
+    float: left;
+    width: 575px;
+    height: 386px;
+    background: url('../../../img/newMenu/adviserMid.jpg') no-repeat;
+    background-size:100% 100%; 
+}
+.listMid .listMidRight{
+    width: 575px;
+    height: 386px;
+    float: right;
+}
+.adviserIndexList>a{
+    display: inline-block;
+    width: 196px;
+    height: 50px;
+    line-height: 46px;
+    border: 2px solid #1697e9;
+    text-align: center;
+    font-size: 24px;
+    color: #40acff;
+    border-radius: 8px;
+    margin: 40px auto 26px;
+}
+.adviserIndexList>a:hover{
+    background: #1697e9;
+    color: #ffffff;
+}
+
+
+@media screen and (max-width:1200px){
+    .banner{ 
+         width: 1200px!important;
+         margin: 0 auto;
+     }
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+ 274 - 0
src/css/newMenu/adviserDetail.css

@@ -0,0 +1,274 @@
+.componyLogo{
+    width:800px;
+    height: 80px;
+    z-index: 50;
+    position: relative;
+    margin-bottom: 10px;
+}
+.componyLogo div{
+    width: 120px;
+    height: 120px;
+    background: #ffffff;
+    padding: 4px;
+    box-shadow: 0 2px 10px #ccc;
+    position: absolute;
+    bottom: 0px;
+    z-index: 60;
+    overflow: hidden;
+    border-radius: 50%;
+}
+.componyLogo div img{
+    width: 100%;
+    height: 100%;
+    display: inline-block;
+    border-radius: 50%;
+}
+.componyLogo p{
+    position: absolute;
+    left:138px;
+    top: 0;
+    height: 80px;
+    line-height: 80px;
+    font-size: 22px;
+    color: #1f1f1f;
+}
+.componyLogo p .name{
+    display: inline-block;
+    font-size: 22px;
+    margin-right: 18px;
+}
+.componyLogo p .position{
+    font-size: 18px;
+    color: #1797e9;
+}
+.collectionN .heart{
+    cursor: pointer;
+    vertical-align: top;
+    margin-right: 10px;
+    margin-top: 5px;
+    width: 19px;
+    height: 18px;
+    display: inline-block;
+    background: url(../../../img/newMenu/serviceDetal_03.jpg) no-repeat;
+    background-size: 100% 100%;
+}
+.collectionN .heart.active{
+    background: url(../../../img/newMenu/serviceDetal_Ok.jpg) no-repeat;
+}
+.collectionN{
+    margin-left: 16px;
+    line-height: 30px;
+    height: 30px;
+}
+.collectionN span{
+    display: inline-block;
+    height: 30px;
+    line-height: 30px;
+}
+.collectionN.active{
+    color: #ff6b26;
+}
+.adviserContent{
+    width: 100%;
+    margin-top: 30px;
+    margin-bottom: 16px;
+}
+.adviserContent p{
+    text-align: justify;
+    font-size: 16px;
+    color: #7a7878;
+    line-height: 30px;
+}
+.adviser_consultation{
+    clear: both;
+}
+.adviser_consultation a{
+    cursor: pointer;
+    float: right;
+    display: inline-block;
+    width: 140px;
+    line-height: 53px;
+    height: 55px;
+    border: 1px solid #ff580e;
+    color: #ff580e;
+    background: #ffeee6;
+    text-align: center;
+    font-size: 18px;
+    margin-bottom: 90px;
+}
+.adviser_consultation a:hover{
+    border-color:#fff;
+    color: #fff;
+    background: #ff580e;
+}
+/* 评论 */
+.adviser_list {
+    clear: both;
+    height: 40px;
+    line-height: 40px;
+    background: #fcfcfc;
+    border: 1px solid #efefef;
+    margin-bottom: 20px;
+}
+.adviser_list p{
+    width: 120px;
+   text-align: center;
+   font-size: 16px;
+   background: #1797e9;
+   color: #ffffff;
+}
+.pagination_box{
+    /* display: none; */
+}
+.evaluateList .list_none{
+    padding-top: 20px;
+    text-align: center;
+    padding-bottom: 100px;
+}
+.evaluateList{
+    /* display: none; */
+    clear: both;
+}
+.evaluateList>ul>li {
+    border-bottom: 1px dotted #c6c2c2;
+    padding-left: 26px;
+    overflow: hidden;
+} 
+.evaluateList>ul>li p{
+    font-size: 14px;
+    color: #1f1f1f;
+    float: left;
+}  
+.evaluateList>ul>li>div.stasf{
+    width: 370px;
+    overflow: hidden;
+    padding: 25px 0 10px;;
+}
+.evaluateList>ul>li>div.stasf>p{
+    margin-right: 50px;
+}
+.evaluateList ul>li .satisfied{
+    float: left;
+}
+.evaluateList .uName{
+    margin-left: 10px;
+}
+.commentDetails{
+    padding-left: 26px;
+}
+.commentDetails span{
+    display: inline-block;
+    margin-left: 10px;
+}
+.satisfied ol li {
+    float: left;
+}
+.satisfied ol li span{
+    color: #ff580e;
+}
+.satisfied ol{
+    float: right;
+    margin-left: 8px;
+    font-size: 16px;
+}
+.satisfiedContent {
+    clear: both;
+    overflow: hidden;
+    margin-top: 8px;
+    padding-bottom: 27px;
+}
+.satisfiedContent p{
+    padding-right:20px;
+    font-size: 12px;
+   color: #707070!important;
+}
+.satisfiedContent time{
+    font-size: 12px;
+    color: #707070!important;
+    float: right;
+}
+.pagination{
+    float: right;
+}
+.pagination a span,.pagination li a{
+    color: #7a7878;
+}
+.totalCount {
+    float: right;
+    margin-top: 28px;
+    margin-right: 15px;
+}
+.pagination_box{
+margin-bottom: 100px;
+}
+.pagination_box .pagePre a{
+    margin-right: 10px
+}
+.pagination_box .pageNext a{
+    margin-left: 10px;
+}
+
+#commentArea{
+    width: 1000px;
+    height: 80px;
+    outline: none;
+    margin-left: 26px;
+    resize: none;
+    margin-top: 10px;
+    text-indent:1em;
+    line-height: 20px;
+    padding-top: 5px;
+}
+#commentArea:focus{
+    border-color:transparent; 
+    box-shadow: 0 0 10px #1697ea ;
+}
+.CommentSend button{
+    width: 150px;
+    height: 34px;
+    margin-left: 26px;
+    margin-top: 6px;
+}
+.commentStar{
+    overflow: hidden;
+    margin-left: 26px;
+    margin-top: 10px;
+    line-height: 20px;
+}
+.commentStar>span{
+    display: inline-block;
+    float: left;
+    color: #ff570c
+}
+.commentStar .ulStar{
+    float: left;
+    margin-left: 6px;
+}
+.commentStar .ulStar span{
+    display: inline-block;
+    cursor: pointer;
+    margin-right: 4px;
+    font-size: 20px;
+    float: left;
+    color: #ff570c
+}
+
+
+@media screen and (max-width:1200px){
+   .carousel{ 
+        width: 1200px!important;
+        margin: 0 auto;
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+

+ 211 - 0
src/css/newMenu/adviserList.css

@@ -0,0 +1,211 @@
+/* 搜索 */
+.indexSearch{
+    width: 100%;
+    height: 53px;
+    background: #f9f9f9;
+    padding: 8px 0 ;
+    margin: 22px auto 34px;
+}
+footer{
+    display: none;
+}
+.indexSearch .search-inp{
+    clear: both;
+    width:635px;
+    height: 36px;
+    float: right;
+    margin-right: 8px;
+}
+.form-control,.btn{
+    border-radius: 0
+}
+.searchBtn{
+    width: 104px;
+    font-size: 18px;
+}
+.indexSearch .demandSearch{
+    width: 530px;
+    height: 36px;
+    line-height: 34px;
+    border-color: #bbd5e5;
+}
+.indexSearch .searchBtn{
+    height: 36px;
+    line-height: 22px;
+    background: #1697e9;
+    border: 1px solid #1697e9;
+    color: #ffffff;
+}
+.indexSearch .searchBtn img{
+    width: 25px;height: 24px;
+    vertical-align: top
+}
+
+.indexSearch .search-inp .input-group{
+    width: 530px;
+}
+/* 列表 */
+.pagination_box {
+    width: 100%;
+    line-height: 74px
+}
+
+.pagination_box nav {
+    float: right;
+    clear: both;
+}
+
+.pagination_box ul li a {
+    color: #333
+}
+
+.pagination_box .pagination {
+    float: right;
+    margin-right: 20px;
+}
+
+.pagination_box .totalCount {
+    float: right;
+    line-height:84px;
+    display: inline-block;
+    margin-right: 15px;
+}
+.inp{
+    float: right;
+}
+.pagination_box{
+    display: none;
+}
+.list_none {
+    width: 550px;
+    height: 150px;
+    background: url("../../../img/all_null.png") no-repeat;
+    margin: 50px auto;
+}
+.inp{
+    display: none;
+}
+.inp input{
+    vertical-align:middle;
+    width:40px;
+    height: 32px;
+    text-align: center;
+    border-radius: 5px;
+    border:1px solid #ccc;
+}
+.inp button{
+    margin: 0 10px;
+    width: 50px;
+}
+
+.search{
+    width: 100%;
+    height: 52px;
+    line-height: 52px;
+    background: #f9f9f9;
+}
+.pagination_box .pagePre a{
+    margin-right: 10px
+}
+.pagination_box .pageNext a{
+    margin-left: 10px;
+}
+.sort a{
+    display: inline-block;
+    padding: 0 16px 0;
+    text-align: center;
+    font-size: 16px;
+    color: #40acff;
+    border: 1px solid #40acff;
+    height: 34px;
+    line-height: 32px;
+    margin-right: 17px;
+    border-radius: 20px;
+    cursor: pointer;
+}
+.sort a.active{
+    background: #1697e9;
+    color: #ffffff;
+}
+.adviserList{
+    margin-top: 10px;
+    width: 100%;
+}
+.adviserList ul li{
+    margin-bottom: 35px;
+    height: 192px;
+    padding-top: 30px;
+    border: 1px solid #eaeaea;
+    background: #fbfbfb;
+    border-radius: 15px;
+}
+.adviserList ul li:hover{
+    box-shadow: 0 0 20px #ccc;
+}
+.adviserList ul li div a{
+    width: 100%;
+    display: inline-block;
+}
+.adviserList ul li div a img{
+    width:118px;
+    height: 118px;
+    border-radius: 50%;
+    float: left;
+    margin-left: 23px;
+    border-radius: 50%;
+}
+.adviserList ul li div .txt{
+    width: 1000px;
+    margin-right: 27px;
+    float: right;
+}
+.adviserList ul li div .txt>div{
+    height: 50px;
+    line-height: 50px;
+    overflow: hidden;
+}
+.adviserList ul li div .txt>div h4{
+    float: left;
+    line-height: 50px;
+    color: #1f1f1f;
+    font-size: 22px;
+}
+.adviserList ul li div .txt>div h4 span{
+    display: inline-block;
+    margin-left: 18px;
+    color: #1797e9;
+    font-size: 18px;
+}
+.adviserList ul li div .txt>div p{
+    float: right;
+}
+
+.adviserList ul li div .txt>div p{
+    color: #ff6b26;
+    font-size: 12px;
+}
+.adviserList ul li div .txt>div p .heart{
+    display: inline-block;
+    width: 20px;
+    height: 16px;
+    margin-left: 8px;
+    vertical-align: top;
+    margin-top: 16px;
+    background: url(../../../img/newMenu/serviceDetal_03.jpg)no-repeat;
+    background-size:100% 100%; 
+}
+.adviserList ul li div .txt>div p .heart.active{
+    background: url(../../../img/newMenu/serviceDetal_Ok.jpg)no-repeat;
+    background-size:100% 100%;
+}
+.adviserList ul li div .txt>p{
+    font-size: 14px;
+    color: #707070;
+    overflow: hidden;
+    display: -webkit-box;              
+    text-overflow: ellipsis;            
+    -webkit-box-orient: vertical;       
+    -webkit-line-clamp:3;
+    text-align: justify;
+}
+

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

@@ -100,21 +100,21 @@
     bottom: 30px!important;
 }
 .navHeader .logo_right {
-	/* margin-top: 15px;
+	margin-top: 15px;
 	float: left;
 	padding-left: 20px;
 	width: 150px;
 	height: 70px;
 	background: url("../../../img/index/index_xuan.png") no-repeat center center;
     margin-left: 10px;
-    background-size:100% 100%;  */
+    background-size:100% 100%; 
 }
 
 .navHeader .nav {
     float: left;
     vertical-align: top;
     margin-top: 16px;
-	padding-left: 110px;
+	padding-left: 16px;
 }
 
 .navHeader .nav>ul>li {
@@ -159,8 +159,9 @@
     color: #323131;
 }
 .navHeader .nav ul li .subnavigation {
-	top: 76px;
+	top: 60px;
     z-index: 9999;
+    position: absolute;
     width: 100%;
 	background: #ffffff;
     display: none;

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

@@ -7,7 +7,7 @@
 .title p{
     margin-top: 10px;
 }
-.basic_nav{margin-bottom: 50px; overflow: auto;cursor:pointer}   
+.basic_nav{margin-bottom: 50px; overflow: auto;}   
 .basic_nav li{width: 200px; height: 35px; line-height: 35px; text-align: center; margin-right: 66px;color: #647fc8; background: #f0f7ff;  border-radius: 20px; float: left;}
 .basic_nav li:last-child{margin-right: 0;}
 .basic_nav li.active{background: #58a3ff;color: #fff; }

+ 20 - 17
src/css/newMenu/patent.css

@@ -5,24 +5,24 @@
 
 .menuPosition {
     width: 100%;
-    height: 500px;
     position: relative;
     z-index: 10;
 }
 .menuPosition .carousel{
     width: 100%;
-    height: 500px;
+}
+.carousel-inner{
+    height: 100%!important;
 }
 .menuPosition .carousel img{
     width: 100%;
-    height: 100%;
     display: inline-block;
     position: absolute;
     top: 0;
     left: 0;
 }
 .patentMenu{
-     width: 1164px; 
+    width: 1164px; 
     position: absolute;
     top: 0;
     left: 50%; 
@@ -35,20 +35,17 @@
     overflow: hidden;
     width: 198px;
     height: 452px;
-    top: -12px;
+    top: 0px;
     left: 15px; 
     background: #fff;
-    border-radius: 10px 10px 0 0 ;
-    border-left: 1px solid #e0e0e0;
-    border-bottom: 1px solid #e0e0e0;
 }
 .patentMenu .firstMenu a{
+    display: inline-block;
     color: #7a7878;
 }
 .patentMenu .firstMenu>p{
     width: 100%;
     height: 72px;
-    border-radius: 10px 10px 0 0 ;
     text-align: center;
     background: url(../../../img/patent/patent_menu1.png)no-repeat;
     background-size:100% 100%; 
@@ -57,11 +54,12 @@
     width: 100%;
     height: 127px;
     text-align: center;
-    border-right: 1px solid #e0e0e0;
-    border-bottom: 1px solid #e0e0e0; 
+    padding: 0 20px;
+    transition: all .3s ease-in;
 }
-.firstMenu ul li.active{
-    border-right: 1px solid transparent;
+.firstMenu ul li.active {
+    margin-left: 15px;
+    transition: all .3s ease-in-out;
 }
 .firstMenu ul li.active  a{
     color: #1797e9;
@@ -78,6 +76,7 @@
     font-size: 18px;
     color: #7a7878;
     line-height: 126px;
+    border-bottom: 1px solid #e0e0e0;
 }
 .firstMenu ul li>p span:nth-child(1){
     display: inline-block;
@@ -102,14 +101,15 @@
 }
 .firstMenu ul li .direction{
      float: right;
-     margin-right: 34px;
-     line-height: 127px;
+     margin-right: 16px;
      width: 10px;
      font-size: 10px;
      height: 10px;
      display: inline-block;
 }
-
+.firstMenu ul li:nth-child(3)>p{
+    border: none
+}
 .secondMenu{
     overflow: hidden;
     position: absolute;
@@ -660,7 +660,10 @@
     color: #1697e9;
 }
 
-
+/* 测试 */
+#myCarousel img{
+    display: inline-block;
+}
 
 
 

+ 4 - 1
src/css/newMenu/patentList.css

@@ -202,7 +202,10 @@
 
 }
 .achievementHot ul li:hover{
-    box-shadow: 0 0 20px #ccc;
+    transform: scale(1.005);
+    box-shadow: 1px 1px 0 #f5f5f5, 2px 2px 0 #c9c9c9, 3px 3px 0 #bbb, 4px 4px 0 #b9b9b9, 5px 5px 0 #aaa,
+    6px 6px 1px rgba(0, 0, 0, .1), 0 0 5px rgba(0, 0, 0, .1), 1px 1px 3px rgba(0, 0, 0, .3), 3px 3px 5px rgba(0, 0, 0, .2),
+    5px 5px 10px rgba(0, 0, 0, .25), 10px 10px 10px rgba(0, 0, 0, .2), 20px 20px 20px rgba(0, 0, 0, .15);
     transition: all .2s ease-in;
 }
 .achievementHot ul li:hover .txts h5{

+ 3 - 7
src/css/newMenu/public.css

@@ -554,12 +554,8 @@ a:link{text-decoration:none; }  /* 指正常的未被访问过的链接*/
 a:visited{text-decoration:none; }/*指已经访问过的链接*/
 a:hover{text-decoration:none;}/*指鼠标在链接*/
 a:active{text-decoration:none;}/* 指正在点的链接*/ 
-
 /*弹出消息提示*/
-
-
-/*弹出消息提示*/
-.smg{width: 260px;height: 40px;text-align: center;transform: scale(0);
+.smg{height: 40px;text-align: center;transform: scale(0);padding: 0 10px;
     line-height:40px;background:#17a2b8;border-radius: 10px;
     position: fixed;top: -200px; left: 50%;margin-left: -130px;color:#ffffff;
     transition: all .3s ease-in-out;z-index: 9999999;
@@ -886,8 +882,8 @@ input:-webkit-autofill {
 	display: inline-block;
 }
 .bannerList .carousel .left, .bannerList .carousel .right,.carousel-control.left,.carousel-control.right {
-    line-height: 475px;
-    font-size: 60px;
+	font-size: 60px;
+	overflow: hidden;
 }
 .carousel img{
 	width: 100%;

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

@@ -217,7 +217,11 @@
     padding: 10px 2px 0;
 }
 .achievementHot ul li:hover{
-    box-shadow: 0 0 20px #ccc;
+    /* box-shadow: 0 0 20px #ccc; */
+    transform: scale(1.005);
+    box-shadow: 1px 1px 0 #f5f5f5, 2px 2px 0 #c9c9c9, 3px 3px 0 #bbb, 4px 4px 0 #b9b9b9, 5px 5px 0 #aaa,
+    6px 6px 1px rgba(0, 0, 0, .1), 0 0 5px rgba(0, 0, 0, .1), 1px 1px 3px rgba(0, 0, 0, .3), 3px 3px 5px rgba(0, 0, 0, .2),
+    5px 5px 10px rgba(0, 0, 0, .25), 10px 10px 10px rgba(0, 0, 0, .2), 20px 20px 20px rgba(0, 0, 0, .15);
     transition: all .2s ease-in;
 }
 .achievementHot ul li:hover .txts h5{
@@ -288,7 +292,6 @@
 .achievementHot ul li .txtIntroduce {
     width: 100%;
     border: 1px solid #efefef;
-    height: 130px;
     padding: 0px 10px 12px;
 }
 .txtIntroduce .btnTxt p{

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

@@ -141,7 +141,9 @@
     width:100%;
 }
 .subsidy .subsidyTxt ul li div h4{
-    font-size: 14px;
+    font-size: 16px;
+    line-height: 46px;
+    margin-left: 10px;
    font-weight: normal;
    color: #393838;
    padding: 12px 0;
@@ -1365,6 +1367,57 @@
     background: url(../../../img/newMenu/service_131.jpg) no-repeat;
     background-size:100% 100%; 
 }
+/* 军工认证 */
+.militaryCont{
+    width: 100%;
+    margin-top: 22px;
+    margin-bottom: 12px;
+}
+.militaryCont>img{
+    width: 100%;
+}
+.militaryCont .subsidyTxt{
+    margin-bottom: 58px;
+    border-bottom: 1px solid #f3f3f3;
+    padding-bottom: 10px;
+    padding-top: 10px;
+}
+.militaryCont .subsidyTxt ul{
+    display: flex;
+    display: -webkit-flex;
+    justify-content: space-around;
+}
+.militaryCont .subsidyTxt ul li{
+    width: 300px;
+    height: 100px;
+    text-align: center;
+    background: #f7f7f7;
+}
+.militaryCont .subsidyTxt ul li p{
+    float: left;
+    line-height: 100px;
+    text-align: center;
+    width: 200px;
+    color: #393838;
+    font-size: 18px;
+    overflow: hidden;
+}
+.militaryCont .subsidyTxt ul li div{
+    display: inline-block;
+    width: 100px;
+    height: 100px;
+    overflow: hidden;
+    float: right
+}
+.militaryCont .subsidyTxt ul li div img{
+    display: inline-block;
+    width: 100%;
+    transform: scale(.7);
+}
+.militaryCont .subsidyTxt ul li:hover{
+    background: #ccc;
+    opacity: .7;
+}
 
 
 

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

@@ -501,6 +501,38 @@
     transition: all .2s ease-in-out;
     border-bottom: 4px solid #1697e9;
 }
+.trandPg{
+    width: 1200px;
+    margin: 50px auto 40px;
+    height: 390px;
+    background: url(../../../img/patent/tradingIndexPg.jpg)no-repeat;
+    background-size:100% 100%;
+    position: relative; 
+}
+.trandPg span{
+    display: inline-block;
+    width: 110px;
+    height: 34px;
+    border-radius: 5px;
+    background: #1697e9;
+    color: #FFF;
+    font-size:  18px;
+    text-align: center;
+    line-height: 34px;
+    position: absolute;
+    bottom: 104px;
+    left: 30px;
+    cursor: pointer;
+}
+.trandPg:hover span{
+    animation:myBig .5s infinite;
+    -webkit-animation:myBig .5s infinite; /* Safari 和 Chrome */
+}
+@keyframes myBig{
+    0%{transform: scale(1);box-shadow:0 0px 2px #ccc; }
+    50%{transform: scale(1.2);box-shadow:0 6px 20px #606363;}
+    100%{transform: scale(1);box-shadow:0 0px 2px #ccc;}
+}
 @media screen and (max-width:1200px){
     body{
         width: 1200px;

+ 1 - 1
src/js/newMenu/achievement.js

@@ -1,4 +1,4 @@
-// import 'css/bootstrap.less';
+import 'css/bootstrap.less';
 import 'bootstrap/dist/js/bootstrap.js';
 import 'css/newMenu/public.css';
 import 'css/newMenu/header.css'

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

@@ -0,0 +1,142 @@
+/*
+ *	@author:liting
+ * 	@update:2018/09/07
+ * 
+ */
+import 'css/bootstrap.less';
+import 'bootstrap/dist/js/bootstrap.js';
+import 'css/newMenu/public.css';
+import 'css/newMenu/header.css'
+import 'css/newMenu/adviser.css';
+import 'js/public.js';
+
+"use strict";
+$(function () {
+    var dataList = {};
+    init();
+    function init() {
+        search();
+        loadDate();
+    }
+    function loadDate(pageNo) {
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            url: globalConfig.context + "/api/portal/identity/consultantList",
+            data: {
+                pageNo: pageNo || 1,
+                pageSize: 10,
+            },
+            success: function (data) {
+                var theArrs = [],theArrsMid=[],theArrsBot=[];
+                if (data && data.error.length) {
+                    msg(data.error[0].message)
+                };
+                if (data.data && data.data.list.length) {
+                    //前4个
+                    for (let i = 0; i < 4; i++) {
+                        let thisdata = data.data.list[i],txtCont;
+                        if(thisdata){
+                            txtCont=txtData(thisdata.consultantType||0)
+                            theArrs.push(`
+                                <li>
+                                    <a href="${globalConfig.context}/portal/adviser/adviserDetail?id=${thisdata.uid}">
+                                        <div class="bjImg">
+                                            ${thisdata.personPortraitUrl&&thisdata.personPortraitUrl!=null?'<img src="'+globalConfig.avatarHost+'/upload'+thisdata.personPortraitUrl+'"/>':''}
+                                        </div>
+                                        <div class="mode">
+                                            <span></span>
+                                            <p>${thisdata.username}<span>${txtCont}</span></p>
+                                        </div>
+                                    </a>
+                                </li>
+                            `);
+                        }
+                    }
+                    //中两个
+                    for (let m = 4; m < 6; m++) {
+                        let thisdataMid = data.data.list[m],txtCont='';
+                           if(thisdataMid){
+                            txtCont=txtData(thisdataMid.consultantType||0)
+                            theArrsMid.push(`
+                                    <li>
+                                        <a href="${globalConfig.context}/portal/adviser/adviserDetail?id=${thisdataMid.uid}">
+                                            <div class="bjImg">
+                                                ${thisdataMid.personPortraitUrl&&thisdataMid.personPortraitUrl!=null?'<img src="'+globalConfig.avatarHost+'/upload'+thisdataMid.personPortraitUrl+'"/>':''}
+                                            </div>
+                                            <div class="mode">
+                                                <span></span>
+                                                <p>${thisdataMid.username}<span>${txtCont}</span></p>
+                                            </div>
+                                        </a>
+                                    </li>
+                                `);
+                            }
+                    }
+                    //下4个
+                    for (let n = 6; n< 10; n++) {
+                    let thisdataBot = data.data.list[n],txtCont='';
+                        if(thisdataBot){
+                            txtCont=txtData(thisdataBot.consultantType||0)
+                            theArrsBot.push(`
+                                <li>
+                                    <a href="${globalConfig.context}/portal/adviser/adviserDetail?id=${thisdataBot.uid}">
+                                        <div class="bjImg">
+                                            ${thisdataBot.personPortraitUrl&&thisdataBot.personPortraitUrl!=null?'<img src="'+globalConfig.avatarHost+'/upload'+thisdataBot.personPortraitUrl+'"/>':''}
+                                        </div>
+                                        <div class="mode">
+                                            <span></span>
+                                            <p>${thisdataBot.username}<span>${txtCont}</span></p>
+                                        </div>
+                                    </a>
+                                </li>
+                            `)
+                        }
+                    }
+                };
+                $('.listOne ul').html(theArrs.join())
+                $('.listMidRight ul').html(theArrsMid.join())
+                $('.listBottom ul').html(theArrsBot.join())
+                $('footer').show();
+            }
+        });
+    }
+    function txtData(nub){
+        switch(nub){
+            case 0:
+               return '专利代理人';
+                break;
+            case 1:
+                return '专利顾问';
+                break;
+            case 2:
+                return '版权顾问';
+                break;
+            case 3:
+                return '商标顾问';
+                break;
+            default:
+                return "暂无";
+        }
+    }
+    //搜索
+    function search() {
+        $('.searchBtn').click(function () {
+            let val = $('.demandSearch').val();
+            window.location.href=`${globalConfig.context}/portal/adviser/adviserList?name=${val}`;
+        })
+    }
+    /* 提示 */
+    //提示框渐隐函数    
+    function msg(txt) {
+        if ($('.smg').hasClass('active')) {
+            return;
+        }
+        $('.smg').addClass('active');
+        var lit = $('#msg').val(txt);
+        setTimeout(function () {
+            $('.smg').removeClass('active')
+            $('#msg').val('');
+        }, 2000)
+    }
+})

+ 247 - 0
src/js/newMenu/adviserDetail.js

@@ -0,0 +1,247 @@
+/*
+ *	@author:liting
+ * 	@update:2018/06/20
+ * 
+ */
+import 'css/bootstrap.less';
+import 'bootstrap/dist/js/bootstrap.js';
+import 'css/newMenu/public.css';
+import 'css/newMenu/header.css'
+import 'css/newMenu/adviserDetail.css';
+import 'js/public.js';
+
+"use strict";
+$(function () {
+    init();
+    function init(){
+        pages();
+    }
+    $('.collectionN .heart').click(function () {
+        let heart = $('.heart');
+        if (heart.hasClass('active')) {
+            collectionApi(0) //取消关注
+        } else {
+            collectionApi(1) //关注
+        }
+    })
+    let hash = window.location.search,
+        hashArr =hash.split('='),
+        ids =hashArr[1];
+    function collectionApi(index) {
+        let nub=parseInt($('.nubCollect').text());
+        let url = index?'/api/user/portal/expertInterest':'/api/user/portal/expertCancelInterest';
+        $.ajax({
+            method: "post",
+            dataType: "json",
+            url: globalConfig.context + url,
+            data: {
+                id:ids
+            },
+            success: function (data) {
+                if (data.error && data.error.length) {
+		            msg(data.error[0].message);
+                }else{
+                    if(!index){
+                        $('.heart').removeClass('active');
+                        $('.collectionN').removeClass('active');
+                        $('.nubCollect').text((nub-1))
+                        $('#msg').val('取消关注')
+                    }else{
+                        $('.heart').addClass('active');
+                        $('.collectionN').addClass('active');
+                        $('.nubCollect').text((nub+1));
+                        $('#msg').val('关注成功,请至个人中心-我的关注查看.');
+                    }
+		            msg(index?'关注成功,请至个人中心-我的关注查看.':'取消关注');
+                }
+            }
+        })
+    }
+    //评论列表
+    loadDate();
+    var thePageNo = 1,
+        thePageLength = 1,
+        pageSize = 4;
+    function loadDate(pageNo) {
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            url: globalConfig.context + "/open/unlanded/comment/list",
+            data: {
+                pageNo: pageNo || 1,
+                pageSize:4,
+                commodityId:ids
+            },
+            success: function (data) {
+                var theArrs = [];
+                if(data&&data.error.length){
+                    msg(data.error[0].message)
+                };
+                if(data.data.totalCommentCount>0){
+                    let good = (((data.data.positiveCommentCount)/(data.data.totalCommentCount))*100).toFixed(1),
+                    middle = (((data.data.ordinaryCommentCount)/(data.data.totalCommentCount))*100).toFixed(1),
+                    bad = (100-good-middle).toFixed(1);
+                    $('.commentDetails').html(`
+                        评价 :<span>好评(${good+'%'})</span><span>中评(${middle+'%'})</span><span>差评(${bad+'%'})</span>
+                        `)
+                }else{
+                    $('.commentDetails').html(`
+                        评价 :<span>好评(100%)</span><span>中评(0%)</span><span>差评(0%)</span>
+                    `)
+                }
+                if (data.data && data.data.comments.list.length) {
+                    let nub = data.data.comments.list.length;
+                    for (let i = 0; i < nub; i++) {
+                        let thisdata = data.data.comments.list[i],name;
+                        let times =thisdata.createTime?new Date(thisdata.createTime).toLocaleString():'',
+                            star=thisdata.star;
+                            if(thisdata.uname.indexOf('游客')>-1){
+                                name='匿名'
+                            }else{
+                                name=thisdata.uname
+                            };
+                        theArrs.push(`
+                        <li>
+                        <div class="stasf">
+                            <p>用户名 :<span class="uName">${name}</span></p>
+                            <div class="satisfied">
+                                <span>满意度:</span>
+                                <ol>
+                                    <li><span class="glyphicon ${star>=1?'glyphicon-star':'glyphicon-star-empty'} "></span></li>
+                                    <li><span class="glyphicon ${star>=2?'glyphicon-star':'glyphicon-star-empty'}"></span></li>
+                                    <li><span class="glyphicon ${star>=3?'glyphicon-star':'glyphicon-star-empty'}"></span></li>
+                                    <li><span class="glyphicon ${star>=4?'glyphicon-star':'glyphicon-star-empty'}"></span></li>
+                                    <li><span class="glyphicon ${star>=5?'glyphicon-star':'glyphicon-star-empty'}"></span></li>
+                                </ol>
+                            </div>
+                        </div>
+                        <div><time>${times}</time></div>
+                        <div class="satisfiedContent">
+                            <p>${thisdata.content}</p> 
+                        </div>
+                    </li>`);
+                    };
+                    
+                };
+               
+                $('.numberBars').html(data.data.totalCommentCount>10?'10+':data.data.totalCommentCount)
+                $('.evaluateList>ul').empty();
+                $('.evaluateList>ul').append(theArrs.join(''));
+                
+                if (!(data.data.comments.list.length)) {
+                    $('.evaluateList>ul').html("<div class='list_none'>暂无评论</div>");
+                    $('.pagination_box').css('display', 'none')
+                }else{
+                    $('.pagination_box').css('display', 'block');
+                }
+                thePageLength = data.data.comments.totalCount ? Math.ceil(data.data.comments.totalCount / pageSize) : 1;
+                $('.totalCount').html(`共${data.data.comments.totalCount}条数据 ${thePageLength}页`)
+                var pageArr = [],
+                    firstNo = 1,
+                    endNo = 5;
+                if (thePageNo > 3) {
+                    firstNo = thePageNo - 2;
+                    endNo = Math.min((Number(thePageNo) + 2), thePageLength);
+                } else {
+                    endNo = Math.min(thePageLength, 5);
+                };
+                for (let i = firstNo; i <= endNo; i++) {
+                    if (i == thePageNo) {
+                        pageArr.push(
+                            '<li class="pageNumber active"><a href="#" value=' + i + ' >' + i + '</a></li>'
+                        );
+                    } else {
+                        pageArr.push(
+                            '<li class="pageNumber"><a href="#" value=' + i + ' >' + i + '</a></li>'
+                        );
+                    }
+                };
+                $('.pageNumber').remove();
+                $('.pagePre').after(pageArr.join(''));
+            }
+        });
+    }
+    //f分页
+    function pages() {
+        $('.pagination').on('click', 'li', function (e) {
+            e.preventDefault();
+            if (this.className === 'pagePre') {
+                if (thePageNo > 1) {
+                    thePageNo = 1;
+                    loadDate(thePageNo);
+                }
+            } else if (this.className === 'pageNext') {
+                if (thePageNo < thePageLength) {
+                    thePageNo = thePageLength;
+                    loadDate(thePageNo);
+                }
+            } else {
+                var nextPageNo = $(this).children()[0].text;
+                if (thePageNo != nextPageNo) {
+                    $(this).siblings("li").removeClass("active");
+                    $(this).addClass("active");
+                    thePageNo = nextPageNo;
+                    loadDate(thePageNo);
+                };
+            };
+        });
+    }
+     //提示框渐隐函数    
+     function msg(txt) {
+        if($('.smg').hasClass('active')){
+			return ;
+        }
+        txt?$('#msg').val(txt):'';
+        $('.smg').addClass('active');
+        var lit = $('#msg').val(txt);
+        setTimeout(function () {
+            $('.smg').removeClass('active');
+            $('#msg').val('');
+        }, 2000)
+    }
+    //评论星星
+    star();
+    function star(){
+        $('.commentStar .ulStar span').hover(function(){
+            $(this).addClass('glyphicon-star').removeClass('glyphicon-star-empty').prevAll().addClass('glyphicon-star').removeClass('glyphicon-star-empty');
+            $(this).nextAll().removeClass('glyphicon-star').addClass('glyphicon-star-empty').stop(true);
+        })
+    }
+    //新建评论
+    addComment();
+    function addComment(){
+        $('.CommentSend .btn').click(function(e){
+            e.preventDefault();
+            let starNum = $('.commentStar .ulStar span.glyphicon-star').length,
+                textVal = $('#commentArea').val();
+            if(!starNum){
+                msg('请您选择星级!');
+                return;
+            }
+            if(!textVal){
+                msg('请您填写评论内容!');
+                return;
+            }
+            $.ajax({
+                method:'post',
+                url: globalConfig.context + "/open/addComment",
+                dataType:'json',
+                data:{
+                    commodityId:ids,
+					content:textVal,
+                    star:starNum,
+                    commodityType:4
+                }
+            }).done(function(data){
+                if(data&&data.error.length){
+                    msg(data.error[0].message);
+                    return;
+                }  
+                msg('评论成功,感谢您的评论。');
+                $('#commentArea').val('');
+                $('.ulStar span').removeClass('glyphicon-star').addClass('glyphicon-star-empty');
+                loadDate();
+            })
+        })
+    }
+})

+ 269 - 0
src/js/newMenu/adviserList.js

@@ -0,0 +1,269 @@
+/*
+ *	@author:liting
+ * 	@update:2018/09/07
+ * 
+ */
+import 'css/bootstrap.less';
+import 'bootstrap/dist/js/bootstrap.js';
+import 'css/newMenu/public.css';
+import 'css/newMenu/header.css'
+import 'css/newMenu/adviserList.css';
+import 'js/public.js';
+
+
+"use strict";
+$(function () {
+    var thePageNo = 1,
+        thePageLength = 1,
+        dataList = {},
+        pageSize = 15;
+    init();
+
+    function init() {
+        pages();
+        inpFun();
+        search();
+        jump();
+    };
+    //一级界面跳转此页面
+
+    function jump() {
+        let hash = window.location.search;
+        if (hash) {
+            if (hash.indexOf('name') > -1 || hash.indexOf('topId') > -1 || hash.indexOf('secondId') > -1) {
+                let newHash = hash.substr(1, hash.length)
+                    if (newHash.indexOf('name') > -1) {
+                        let names = newHash.split('=')
+                        dataList.name = decodeURIComponent(names[1])
+                        $('.demandSearch').val(dataList.name);
+                    }
+                loadDate()
+            }
+        } else {
+                dataList.name = "",
+            loadDate();
+        }
+    }
+    function loadDate(pageNo) {
+        $('.loading').show();
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            url: globalConfig.context + "/api/portal/identity/consultantList",
+            data: {
+                pageNo: pageNo || 1,
+                pageSize: 6,
+                name: dataList.name,
+                sortType:dataList.sortType
+            },
+            success: function (data) {
+                var theArrs = [];
+                if (data && data.error.length) {
+                    msg(data.error[0].message)
+                };
+                if (data.data && data.data.list.length) {
+                    let nub = data.data.list.length;
+                    for (let i = 0; i < nub; i++) {
+                        let thisdata = data.data.list[i],txtCont='';
+                            switch(thisdata.consultantType){
+                                case 0:
+                                    txtCont='专利代理人';
+                                    break;
+                                case 1:
+                                    txtCont='专利顾问';
+                                    break;
+                                case 2:
+                                    txtCont='版权顾问';
+                                    break;
+                                case 3:
+                                    txtCont='商标顾问';
+                                    break;
+                                default:
+                                    txtCont="暂无";
+                            }
+                        theArrs.push(`
+                        <li>
+                            <div>
+                                <a href="${globalConfig.context}/portal/adviser/adviserDetail?id=${thisdata.uid}">
+                                    ${thisdata.personPortraitUrl&&thisdata.personPortraitUrl!=null?'<img src="'+globalConfig.avatarHost+'/upload'+thisdata.personPortraitUrl+'"/>':''}
+                                    <div class="txt" data-id=${thisdata.uid}>
+                                        <div>
+                                            <h4>${thisdata.username}<span>${txtCont}</span></h4>
+                                            <p><span class="nubCollect">${thisdata.countInterest}</span>${thisdata.interested?'<span class="heart active"></span>':'<span class="heart"></span>'}</p>
+                                        </div> 
+                                        <p>${thisdata.introduction?thisdata.introduction:'暂无描述'}</p>
+                                    </div>
+                                </a>
+                            </div>
+                        </li>
+                        `);
+                    };
+                };
+                $('.loading').hide().stop(true, true);
+                $('.adviserList ul').empty();
+                $('.adviserList ul').append(theArrs.join(''));
+                $('.pagination_box').css('display', 'block');
+                $('.inp').css('display', 'block');
+                if (data.data.list.length === 0) {
+                    $('.adviserList ul').html("<div class='list_none'></div>");
+                    $('.pagination_box').css('display', 'none');
+                    $('.inp').css('display', 'none');
+                };
+                thePageLength = data.data.totalCount ? Math.ceil(data.data.totalCount / pageSize) : 1;
+                $('.totalCount').html(`共${data.data.totalCount}条数据 ${thePageLength}页`)
+                var pageArr = [],
+                    firstNo = 1,
+                    endNo = 5;
+                if (thePageNo > 3) {
+                    firstNo = thePageNo - 2;
+                    endNo = Math.min((Number(thePageNo) + 2), thePageLength);
+                } else {
+                    endNo = Math.min(thePageLength, 5);
+                };
+                for (let i = firstNo; i <= endNo; i++) {
+                    if (i == thePageNo) {
+                        pageArr.push(
+                            '<li class="pageNumber active"><a href="#" value=' + i + ' >' + i + '</a></li>'
+                        );
+                    } else {
+                        pageArr.push(
+                            '<li class="pageNumber"><a href="#" value=' + i + ' >' + i + '</a></li>'
+                        );
+                    }
+                };
+                $('.pageNumber').remove();
+                $('.pagePre').after(pageArr.join(''));
+                $('footer').show();
+                colFun();
+            }
+        });
+    }
+    //f分页
+    function pages() {
+        $('.pagination').on('click', 'li', function (e) {
+            e.preventDefault();
+            if (this.className === 'pagePre') {
+                if (thePageNo > 1) {
+                    thePageNo = 1;
+                    loadDate(thePageNo);
+                }
+            } else if (this.className === 'pageNext') {
+                if (thePageNo < thePageLength) {
+                    thePageNo = thePageLength;
+                    loadDate(thePageNo);
+                }
+            } else {
+                var nextPageNo = $(this).children()[0].text;
+                if (thePageNo != nextPageNo) {
+                    $(this).siblings("li").removeClass("active");
+                    $(this).addClass("active");
+                    thePageNo = nextPageNo;
+                    loadDate(thePageNo);
+                };
+            };
+        });
+    }
+    //输入跳转
+    function inpFun() {
+        $('.inp .btn').on('click', function () {
+            let val = $(this).siblings().val();
+            if (!isNaN(val) && val <= thePageLength && val > 0) {
+                thePageNo = val;
+                loadDate(thePageNo);
+            } else {
+                msg('请输入正确页码')
+            }
+        })
+    }
+    //搜索
+    function search() {
+        $('.searchBtn').click(function () {
+            let val = $('.demandSearch').val();
+            dataList.name = val;
+            loadDate();
+        })
+    }
+    /* 提示 */
+    //提示框渐隐函数    
+    function msg(txt) {
+        if ($('.smg').hasClass('active')) {
+            return;
+        }
+        $('.smg').addClass('active');
+        var lit = $('#msg').val(txt);
+        setTimeout(function () {
+            $('.smg').removeClass('active')
+            $('#msg').val('');
+        }, 2000)
+    }
+    //收藏
+    function colFun(){
+        $('.txt .heart').click(function (e) {
+            e.preventDefault();
+            e.stopPropagation();
+            let nub=parseInt($(this).siblings().text()),
+                heart = $(this),
+                id=$(this).parents('.txt').attr('data-id')
+             if (heart.hasClass('active')) {
+                 $(this).removeClass('active')
+                 $(this).siblings().text(nub-1);
+                 collectionApi(0,id,nub) //取消关注
+             } else {
+                 $(this).addClass('active');
+                 $(this).siblings().text(nub+1);
+                 collectionApi(1,id,nub) //关注
+             }
+         })
+    }
+    function collectionApi(index,ids,nub) {
+        let url = index?'/api/user/portal/expertInterest':'/api/user/portal/expertCancelInterest';
+        $.ajax({
+            method: "post",
+            dataType: "json",
+            url: globalConfig.context + url,
+            data: {
+                id:ids
+            },
+            success: function (data) {
+                if (data.error && data.error.length) {
+		            msg(data.error[0].message);
+                }else{
+                    if(!index){
+                        $('#msg').val('取消关注')
+                    }else{
+                        $('#msg').val('关注成功,请至个人中心-我的关注查看.');
+                    }
+		            msg(index?'关注成功,请至个人中心-我的关注查看.':'取消关注');
+                }
+            }
+        })
+    }
+    //排序调用接口
+    sortFun();
+    function sortFun(){
+        $('.sort .relTime').click(function(){
+            if($(this).hasClass('active')){
+                $(this).removeClass('active');
+                dataList.sortType='';
+                loadDate();
+            }else{
+                $('.colNumber').removeClass('active')
+                $(this).addClass('active');
+                dataList.sortType=0;
+                loadDate();
+            }
+        })
+        $('.sort .colNumber').click(function(){
+            if($(this).hasClass('active')){
+                $(this).removeClass('active');
+                dataList.sortType='';
+                loadDate()
+            }else{
+                $('.relTime').removeClass('active')
+                $(this).addClass('active');
+                dataList.sortType=1;
+                loadDate()
+            }
+        })
+    }
+})

+ 0 - 57
src/js/newMenu/evaluate.js

@@ -199,61 +199,4 @@ $(function () {
             $('#msg').val('');
         }, 2000)
     }
-    //登录
-    $('#form_login').submit(function(e){
-		e.preventDefault();
-		var Suser=$('#Lo_user').val();
-		var Spass=$('#Lo_pass').val();	
-		var type=$(".login_pass>#customerType").val();
-		var check_experts=$('#checks').prop('checked');		
-		if(Suser==''||Spass==''){	
-			msg('请填写用户名/密码.');
-			return false;
-		}else{	
-			$('.loading').show();		
-			let txt = "登录中,请稍后...",htmls=[],i=0,
-			txtArr = txt.split('');
-			txtArr.map(item=>{
-				htmls.push(`
-					<span>${item}</span>
-				`)
-			});
-			$('.loading div p').html(htmls);
-			$.ajax({
-              method: "POST",
-              dataType: "json",
-              url: globalConfig.context + "/signin",
-              data: {
-                      "mobile": Suser,
-					  "password": Spass,
-					  'type':type
-              },
-              success: function (rest) {
-				    $('.loading').hide();				
-					if (rest.error && rest.error.length) {					
-		                 msg(rest.error[0].message);	
-					} else {						
-						var  data = rest.data;
-                        if (data && data.requestURI) {
-                            var path = globalConfig.context + data.requestURI;
-                            if (data.queryString) {
-                                path += '?' + data.queryString;
-                            }
-                            if (window.location.hash) {
-                                path += window.location.hash;
-                            }
-                            window.location.href = path;
-                        } else {
-                            msg('登录成功');
-                            setTimeout(()=>{
-                                window.location.reload();
-                            },500)
-                        }                       
-					}
-			   }
-          })
-                
-		}			
-	})
-    
 })

+ 25 - 1
src/js/newMenu/patent.js

@@ -43,12 +43,36 @@ $(function(){
             $('.secondMenu ul li').removeClass('active')
             $('.secondMenu').removeClass('active');
         })
-    }
+    };
     function searchFun(){
         $('.searchBtn').on('click',function(){
             let sVal = $('.search-inp .demandSearch').val();
             window.location.href = globalConfig.context + `/portal/service/patentList?name=${sVal}`
         });
        
+    };
+    //菜单高度处理
+    menuH();
+    function menuH(){
+        let imgH = $('#myCarousel img').height();
+        $('.menuPosition').css({
+            'height':imgH+'px'
+        });
+        $('#myCarousel').css({
+            'height':imgH+'px'
+        });
+
+        $('.firstMenu').css('height',imgH+'px');
+        let liH = imgH - $('.firstMenu>p').height();
+        $('.firstMenu ul li').css({
+            'height':(liH/3)+'px'
+        });
+        $('.firstMenu ul li .direction').css({
+            'line-height':(liH/3)+'px'
+        });
+        $('.firstMenu ul li>p').css({
+            'height':(liH/3)+'px',
+            'line-height':(liH/3)+'px'
+        });
     }
 })

+ 22 - 12
src/js/newMenu/serviceDetails.js

@@ -119,16 +119,33 @@ $(function () {
                 if(data&&data.error.length){
                     msg(data.error[0].message)
                 };
+                if(data.data.totalCommentCount>0){
+                    let good = (((data.data.positiveCommentCount)/(data.data.totalCommentCount))*100).toFixed(1),
+                    middle = (((data.data.ordinaryCommentCount)/(data.data.totalCommentCount))*100).toFixed(1),
+                    bad = (100-good-middle).toFixed(1);
+                    $('.commentDetails').html(`
+                        评价 :<span>好评(${good+'%'})</span><span>中评(${middle+'%'})</span><span>差评(${bad+'%'})</span>
+                        `)
+                }else{
+                    $('.commentDetails').html(`
+                        评价 :<span>好评(100%)</span><span>中评(0%)</span><span>差评(0%)</span>
+                    `)
+                }
                 if (data.data && data.data.comments.list.length) {
                     let nub = data.data.comments.list.length;
                     for (let i = 0; i < nub; i++) {
-                        let thisdata = data.data.comments.list[i];
+                        let thisdata = data.data.comments.list[i],name;
                         let times =thisdata.createTime?new Date(thisdata.createTime).toLocaleString():'',
                             star=thisdata.star;
+                            if(thisdata.uname.indexOf('游客')>-1){
+                                name='匿名'
+                            }else{
+                                name=thisdata.uname
+                            };
                         theArrs.push(`
                         <li>
                         <div class="stasf">
-                            <p>用户名 :<span class="uName">${thisdata.uname}</span></p>
+                            <p>用户名 :<span class="uName">${name}</span></p>
                             <div class="satisfied">
                                 <span>满意度:</span>
                                 <ol>
@@ -146,14 +163,7 @@ $(function () {
                         </div>
                     </li>`);
                     };
-                    if(data.data.totalCommentCount>0){
-                        let good = (((data.data.positiveCommentCount)/(data.data.totalCommentCount))*100).toFixed(1),
-                        middle = (((data.data.ordinaryCommentCount)/(data.data.totalCommentCount))*100).toFixed(1),
-                        bad = (100-good-middle).toFixed(1);
-                        $('.commentDetails').html(`
-                            评价 :<span>好评(${good+'%'})</span><span>中评(${middle+'%'})</span><span>差评(${bad+'%'})</span>
-                            `)
-                    }
+                    
                 };
                
                 $('.numberBars').html(data.data.totalCommentCount>10?'10+':data.data.totalCommentCount)
@@ -246,7 +256,6 @@ $(function () {
             e.preventDefault();
             let starNum = $('.commentStar .ulStar span.glyphicon-star').length,
                 textVal = $('#commentArea').val();
-                console.log(starNum,textVal)
             if(!starNum){
                 msg('请您选择星级!');
                 return;
@@ -262,7 +271,8 @@ $(function () {
                 data:{
                     commodityId:ids,
 					content:textVal,
-					star:starNum,
+                    star:starNum,
+                    commodityType:0
                 }
             }).done(function(data){
                 if(data&&data.error.length){

+ 45 - 23
src/js/newMenu/serviceList.js

@@ -52,6 +52,7 @@ $(function () {
                         if (item.indexOf('secondId') > -1) {
                             let secondIds = item.split('=')
                             dataList.secondId = decodeURIComponent(secondIds[1])
+                            menuInit(theData,secondIds[1])
                         }
                     })
                 } else {
@@ -69,6 +70,7 @@ $(function () {
                     if (newHash.indexOf('secondId') > -1) {
                         let secondIds = newHash.split('=')
                         dataList.secondId = decodeURIComponent(secondIds[1])
+                        menuInit(theData,secondIds[1])
                     }
                     
                 }
@@ -83,10 +85,10 @@ $(function () {
         }
     }
     //跳转渲染菜单
-    function menuInit(data,id=''){
-        var theArrs = '',htmls='';
-            htmls+='<div class="objList">'
-            let thisdata=data,m,n;
+    function menuInit(data,id='',state){
+        var theArrs = '',htmls='',htmlSec='';
+            htmls+='<div class="objList">';
+            let thisdata=data,m,n,l;
             thisdata.unshift({
                     module: '',
                     name: '不限',
@@ -104,12 +106,27 @@ $(function () {
                             m=index;n=ind;
                             htmls+='<span class="active" data-id='+atem.topLevelId+'>'+atem.topLevel+'</span>'
                             return;
+                        }else{
+                            atem.children&&(atem.children).map((otem,nub)=>{
+                                if(otem.id==id){
+                                    m=index;n=ind,l=nub;
+                                }
+                            })
                         }
                         htmls+='<span data-id="'+atem.topLevelId+'">'+atem.topLevel+'</span>'
                     })
                 }
                 htmls+='</div>'
             })
+            if(l>=0){
+                let listSec = thisdata[m].list[n].children;
+                listSec.map(ttm=>{
+                    htmlSec+=`<li data-id=${ttm.id}>${ttm.name}</li>`
+                })
+            }else{
+                l=0;
+                htmlSec='<li data-id="" class="active">不限</li>';
+            }
             htmls+='</div>';
             if(!id){
                 $('.industryList').append(htmls);
@@ -118,14 +135,14 @@ $(function () {
                 $('.objList div').eq(0).addClass('active');
                 $('.objList div').eq(0).find('span').addClass('active');
                 $('.productionType ol').html(`<li data-id='' class="active">不限</li>`);
-                $('.productionType ol li').eq(0).addClass = "active";
             }else{
                 $('.industryList').append(htmls);
                 $('.industryList ul').html(theArrs);
                 $('.industryList ul li').eq(m).addClass('active');
                 $('.objList>div').eq(m).addClass('active');
-                $('.productionType ol').html(`<li data-id='' class="active">不限</li>`);
-                $('.productionType ol li').eq(0).addClass = "active";
+                $('.objList>div').eq(m).find('span').eq(n).addClass('active');
+                $('.productionType ol').html(htmlSec);
+                $('.productionType ol li').eq(l).addClass('active');
             }
             onSelect(thisdata);
     }
@@ -183,13 +200,14 @@ $(function () {
                                     <div class="txts">
                                         <h5>${thisdata.name}</h5>
                                     </div>
-                                    <div class="hr"></div>
-                                    <div class="btnTxt">
-                                        <p>${thisdata.introduce!=null?introd:'暂无介绍'}</p>
-                                    </div>
+                                    
                                 </div>
                             </a>
                         </li>`);
+                        /*  <div class="hr"></div>
+                            <div class="btnTxt">
+                                <p>${thisdata.introduce!=null?introd:'暂无介绍'}</p>
+                            </div> */
                     };
                 };
                 $('.loading').hide().stop(true,true);
@@ -342,19 +360,23 @@ $(function () {
                     <span>${txt}</span>
             `)
             loadDate();
-            $('.productionType ol li').on('click', function () {
-                dataList.name = '';
-                dataList.topId = $('.industryList ul li.active').attr('data-id');
-                $(this).addClass('active').siblings().removeClass('active');
-                dataList.secondId = $(this).attr('data-id');
-                if (!dataList.secondId) return;
-                let txt = $(this).text();
-                $('.onSelect .next').css('display', 'block').html(`
-                        <span>${txt}</span>
-                        `)
-                loadDate();
-            })
+            secSelect();
         });
+        secSelect();
+    }
+    function secSelect(){
+        $('.productionType ol li').on('click', function () {
+            dataList.name = '';
+            dataList.topId = $('.industryList ul li.active').attr('data-id');
+            $(this).addClass('active').siblings().removeClass('active');
+            dataList.secondId = $(this).attr('data-id');
+            if (!dataList.secondId) return;
+            let txt = $(this).text();
+            $('.onSelect .next').css('display', 'block').html(`
+                    <span>${txt}</span>
+                    `)
+            loadDate();
+        })
     }
     //搜索
     function search() {

+ 1 - 58
src/js/newMenu/shopList.js

@@ -226,7 +226,7 @@ $(function(){
               list.push({
                 commodityId:id,
                 commodityQuantity:number,
-                commodityType:type=='1'?1:0,
+                commodityType:type,
                 orderChannel:1
               })  
           };
@@ -290,61 +290,4 @@ $(function(){
             $('#msg').val('');
         }, 2000)
     }
-    //登录
-     //登录
-     $('#form_login').submit(function(e){
-		e.preventDefault();
-		var Suser=$('#Lo_user').val();
-		var Spass=$('#Lo_pass').val();	
-		var type=$(".login_pass>#customerType").val();
-		var check_experts=$('#checks').prop('checked');		
-		if(Suser==''||Spass==''){	
-			msg('请填写用户名/密码.');
-			return false;
-		}else{	
-			$('.loading').show();		
-			let txt = "登录中,请稍后...",htmls=[],i=0,
-			txtArr = txt.split('');
-			txtArr.map(item=>{
-				htmls.push(`
-					<span>${item}</span>
-				`)
-			});
-			$('.loading div p').html(htmls);
-			$.ajax({
-              method: "POST",
-              dataType: "json",
-              url: globalConfig.context + "/signin",
-              data: {
-                      "mobile": Suser,
-					  "password": Spass,
-					  'type':type
-              },
-              success: function (rest) {
-				    $('.loading').hide();				
-					if (rest.error && rest.error.length) {					
-		                 msg(rest.error[0].message);	
-					} else {						
-						var  data = rest.data;
-                        if (data && data.requestURI) {
-                            var path = globalConfig.context + data.requestURI;
-                            if (data.queryString) {
-                                path += '?' + data.queryString;
-                            }
-                            if (window.location.hash) {
-                                path += window.location.hash;
-                            }
-                            window.location.href = path;
-                        } else {
-                            msg('登录成功');
-                            setTimeout(()=>{
-                                window.location.reload();
-                            },500)
-                        }                       
-					}
-			   }
-          })
-                
-		}			
-	})
 })

+ 15 - 3
src/js/newMenu/tradingIndex.js

@@ -3,13 +3,12 @@ import 'bootstrap/dist/js/bootstrap.js';
 import 'css/newMenu/public.css';
 import 'css/newMenu/header.css'
 import 'css/newMenu/tradingIndex.css';
-// import 'js/banner.js';
 import 'js/public.js';
 
-
 $(function(){
     navTop();
     banner();
+    jump();
     function navTop() {
         $(window).scroll(function(){
             var scrolltop=$(document).scrollTop();
@@ -24,5 +23,18 @@ $(function(){
         $('#myCarousel').carousel({
            interval: 4000
        })
-   };
+    };
+    //在线评估跳转
+    function jump(){
+        $('.trandPg span').click(function(){
+            let loginTxt=$('.head_login')[0];
+            if(loginTxt&&($(loginTxt).text())=='登录'){
+                $('.head_login').click();
+                window.location.hash='jump';
+                return false;
+            }else{
+                window.location.href= globalConfig.context+'/user/account/index.html#/evaluate';
+            }
+        })
+    }
 })

+ 24 - 24
src/js/public.js

@@ -57,12 +57,12 @@ $(function(){
 		$('.login').fadeOut(800)
 		$('#form_register').fadeIn(800)
 	})
-
 	$('#form_login').submit(function(e){
-		let hrefs=window.location.href,
+		let hrefs=window.location.href,jump=window.location.hash,jumpState=false,
 			urls = hrefs.split('/').pop();
-		if(urls=='evaluate'||urls=='shopList'){
-			return;
+			
+		if(urls=='evaluate'||urls=='shopList'||jump=='#jump'){
+			jumpState=true;
 		}
 		e.preventDefault();
 		var Suser=$('#Lo_user').val();
@@ -107,10 +107,17 @@ $(function(){
                             }
                             window.location.href = path;
                         } else {
-							msg('登录成功,2秒后跳转个人中心');
-							setTimeout(()=>{
-								window.location.href = globalConfig.context + "/user/account/index.html";
-							},2000)
+							if(!jumpState){
+								msg('登录成功,2秒后跳转个人中心');
+									setTimeout(()=>{
+										window.location.href = globalConfig.context + "/user/account/index.html";
+									},2000)
+								}else{
+									msg('登录成功');
+									setTimeout(()=>{
+										window.location.reload();
+									},1000)
+								}
                         }                       
 					}
 			   }
@@ -130,21 +137,6 @@ $(function(){
             $('#msg').val('');
         }, 2000)
     } 	  
-    
-    // //在线客服
-		    //   (function(m, ei, q, i, a, j, s) {
-		    //     m[i] = m[i] || function() {
-		    //         (m[i].a = m[i].a || []).push(arguments)
-		    //     };
-		    //     j = ei.createElement(q),
-		    //         s = ei.getElementsByTagName(q)[0];
-		    //     j.async = true;
-		    //     j.charset = 'UTF-8';
-		    //     j.src = 'https://static.meiqia.com/dist/meiqia.js?_=t';
-		    //     s.parentNode.insertBefore(j, s);
-		    // })(window, document, 'script', '_MEIQIA');
-		    // _MEIQIA('entId', 77931);		   		   
-			// _MEIQIA('withoutBtn');	
 	//点击登录界面的忘记密码 ,将会弹出忘记密码界面
 	$('.login_check a').click(function(e){
 		e.preventDefault();
@@ -494,7 +486,15 @@ $(function(){
 				})
 			})
 		}
-		
+	}
+	//banner 箭头高度处理
+	bannerFun();
+	function bannerFun(){
+		let imgH = $('.carousel-inner div').eq(0).find('img').innerHeight();
+		$('.carousel-control').css({
+			'height':imgH+'px',
+			'line-height':(imgH)+'px'
+		})
 	}
 });
 

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

@@ -103,7 +103,7 @@ $(function () {
                     if (data.error && data.error.length) {
                         msg(data.error[0].message);
                     }else if(data.error==""){
-                        window.open(globalConfig.context+ '/user/account/index.html#consultList');
+                        window.open(globalConfig.context+ '/user/account/index.html#/consultList');
                     }else{
                         return;
                     }

+ 503 - 0
template/newMenu/adviser.html

@@ -0,0 +1,503 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <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/newMenu/public.css">
+    <link rel="stylesheet" href="../../src/css/newMenu/adviserList.css">
+    <link rel="stylesheet" href="../../src/css/newMenu/header.css">
+</head>
+<body>
+        <div class="topFixHeight">
+                <div class="topNav">
+                    <div class="header">
+                        <div class="container">
+                            <div>
+                                <a href="#">网站导航</a>
+                            </div>
+                            <div>
+                                <ul>
+                                    <li>
+                                        <a href="javascript:void(0)" class="head_login">登录</a>
+                                    </li>
+                                    <li>
+                                        <a href="#">注册</a>
+                                    </li>
+                                    <li>
+                                        <a href="#">我的订单</a>
+                                    </li>
+                                    <li>
+                                        <a href="#">我的关注</a>
+                                    </li>
+                                    <li>
+                                        <a href="#">我的消息</a>
+                                    </li>
+                                </ul>
+                            </div>
+                            <div class="colorRed">
+                                全国统一服务热线:400-8800-962
+                            </div>
+                        </div>
+                    </div>
+                    <!-- search -->
+                    <div class="topHeader">
+                        <div class="container">
+                            <div class="navHeader">
+                                <div class="logo">
+                                    <a href="#">
+                                        <img src="../../img/Logo111.png" alt="" title="技淘">
+                                    </a>
+                                </div>
+                                <div class="logo_right"></div>
+                                <div class="nav">
+                                    <ul>
+                                        <li>
+                                            <div>
+                                                <a href="#">科技服务</a>
+                                                <ol class="subnavigation">
+                                                    <li>
+                                                        <a href="#">高企认定</a>
+                                                    </li>
+                                                    <li>
+                                                        <a href="#">知识产权</a>
+                                                    </li>
+                                                </ol>
+                                            </div>
+                                        </li>
+                                        <li>
+                                            <div>
+                                                <a href="#">技术交易</a>
+                                                <ol class="subnavigation">
+                                                    <li>
+                                                        <a href="#">专利产品</a>
+                                                    </li>
+                                                    <li>
+                                                        <a href="#">技术成果</a>
+                                                    </li>
+                                                    <li>
+                                                        <a href="#">技术需求</a>
+                                                    </li>
+                                                    <li>
+                                                        <a href="#">技术评估</a>
+                                                    </li>
+                                                </ol>
+                                            </div>
+                                        </li>
+                                        <li>
+                                            <div>
+                                                <a href="#">智库咨询</a>
+                                                <ol class="subnavigation">
+                                                    <li>
+                                                        <a href="#">智政</a>
+                                                    </li>
+                                                    <li>
+                                                        <a href="/portal/thinkTank/index.html#zizone">智者</a>
+                                                    </li>
+                                                </ol>
+                                            </div>
+                                        </li>
+        
+                                        <li>
+                                            <div>
+                                                <a href="/portal/aboutUs.html">关于公司</a>
+                                                <ol class="subnavigation" style="display: none;">
+                                                    <li>
+                                                        <a href="#">联系我们</a>
+                                                    </li>
+                                                </ol>
+                                            </div>
+                                        </li>
+                                    </ul>
+                                </div>
+                                <div class="nav_right">
+                                    <img src="../../img/newMenu/navImg.jpg" alt="">
+                                    <span>国家技术转移示范机构</span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+    <!-- 公共头部  省略 -->
+    <div class="banner">
+        <img src="../../img/newMenu/adviserBanner.png" alt="">
+    </div>
+    <!-- 中间内容开始 -->
+    <div class="container">
+        <div class="indexSearch">
+            <div class="search-inp">
+                <div class="input-group">
+                    <input type="text" class="form-control demandSearch" placeholder="搜索您要找的顾问。。">
+                    <span class="input-group-btn">
+                        <button class="btn btn-default searchBtn" type="button">
+                            <img src="../../img/newMenu/search-icon.jpg" alt=""> 搜索
+                        </button>
+                    </span>
+                </div>
+            </div>
+        </div>
+        <div class="adviserIndexList">
+            <div class="listHead listOne">
+                <ul>
+                    <li>
+                        <a href="">
+                            <div class="bjImg">
+                                <img src="../../img/newMenu/achievmentDetail_5.jpg" alt="">
+                            </div>
+                            <p class="collectionNumber">53<img src="../../img/newMenu/adviserHeart.jpg" alt=""></p>
+                            <div class="mode">
+                                <span></span>
+                                <p>小伙子<span>搬运工</span></p>
+                            </div>
+                        </a>
+                    </li>
+                    <li>
+                        <a href="">
+                            <div class="bjImg">
+                                <img src="../../img/newMenu/achievmentDetail_5.jpg" alt="">
+                            </div>
+                            <p class="collectionNumber">53<img src="../../img/newMenu/adviserHeart.jpg" alt=""></p>
+                            <div class="mode">
+                                <span></span>
+                                <p>小伙子<span>搬运工</span></p>
+                            </div>
+                        </a>
+                    </li>
+                    <li>
+                        <a href="">
+                            <div class="bjImg">
+                                <img src="../../img/newMenu/achievmentDetail_5.jpg" alt="">
+                            </div>
+                            <p class="collectionNumber">53<img src="../../img/newMenu/adviserHeart.jpg" alt=""></p>
+                            <div class="mode">
+                                <span></span>
+                                <p>小伙子<span>搬运工</span></p>
+                            </div>
+                        </a>
+                    </li>
+                    <li>
+                        <a href="">
+                            <div class="bjImg">
+                                <img src="../../img/newMenu/achievmentDetail_5.jpg" alt="">
+                            </div>
+                            <p class="collectionNumber">53<img src="../../img/newMenu/adviserHeart.jpg" alt=""></p>
+                            <div class="mode">
+                                <span></span>
+                                <p>小伙子<span>搬运工</span></p>
+                            </div>
+                        </a>
+                    </li>
+                </ul>
+            </div>
+            <div class="listMid">
+                <div class="listMidLeft" onclick="openZoosUrl('chatwin');"></div>
+                <div class="listHead listMidRight">
+                    <ul>
+                        <li>
+                            <a href="">
+                                <div class="bjImg">
+                                    <img src="../../img/newMenu/achievmentDetail_5.jpg" alt="">
+                                </div>
+                                <p class="collectionNumber">53<img src="../../img/newMenu/adviserHeart.jpg" alt=""></p>
+                                <div class="mode">
+                                    <span></span>
+                                    <p>小伙子<span>搬运工</span></p>
+                                </div>
+                            </a>
+                        </li>
+                        <li>
+                            <a href="">
+                                <div class="bjImg">
+                                    <img src="../../img/newMenu/achievmentDetail_5.jpg" alt="">
+                                </div>
+                                <p class="collectionNumber">53<img src="../../img/newMenu/adviserHeart.jpg" alt=""></p>
+                                <div class="mode">
+                                    <span></span>
+                                    <p>小伙子<span>搬运工</span></p>
+                                </div>
+                            </a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+            <div class="listHead listBottom">
+                <ul>
+                    <li>
+                        <a href="">
+                            <div class="bjImg">
+                                <img src="../../img/newMenu/achievmentDetail_5.jpg" alt="">
+                            </div>
+                            <p class="collectionNumber">53<img src="../../img/newMenu/adviserHeart.jpg" alt=""></p>
+                            <div class="mode">
+                                <span></span>
+                                <p>小伙子<span>搬运工</span></p>
+                            </div>
+                        </a>
+                    </li>
+                    <li>
+                        <a href="">
+                            <div class="bjImg">
+                                <img src="../../img/newMenu/achievmentDetail_5.jpg" alt="">
+                            </div>
+                            <p class="collectionNumber">53<img src="../../img/newMenu/adviserHeart.jpg" alt=""></p>
+                            <div class="mode">
+                                <span></span>
+                                <p>小伙子<span>搬运工</span></p>
+                            </div>
+                        </a>
+                    </li>
+                    <li>
+                        <a href="">
+                            <div class="bjImg">
+                                <img src="../../img/newMenu/achievmentDetail_5.jpg" alt="">
+                            </div>
+                            <p class="collectionNumber">53<img src="../../img/newMenu/adviserHeart.jpg" alt=""></p>
+                            <div class="mode">
+                                <span></span>
+                                <p>小伙子<span>搬运工</span></p>
+                            </div>
+                        </a>
+                    </li>
+                    <li>
+                        <a href="">
+                            <div class="bjImg">
+                                <img src="../../img/newMenu/achievmentDetail_5.jpg" alt="">
+                            </div>
+                            <p class="collectionNumber">53<img src="../../img/newMenu/adviserHeart.jpg" alt=""></p>
+                            <div class="mode">
+                                <span></span>
+                                <p>小伙子<span>搬运工</span></p>
+                            </div>
+                        </a>
+                    </li>
+                </ul>
+            </div>
+            <a href="#">查看更多</a>
+        </div>
+    </div>
+    <!-- 中间内容结束 -->
+    <!-- 公共底部  省略 -->
+    <footer>
+            <div id="bottom">
+                <div class="bottom">
+                    <div class="bottom_text">
+                        <div class="text_top">
+                            <a href="/portal/aboutUs.html">关于公司</a>
+                            <a href="/portal/contactUs.html">联系我们</a>
+                            <p>Copyright © 2016-2017 科德 版权所有 湘ICP备15019731号 -2 技术支持:湖南阿凡提科技有限公司
+                            </p>
+                        </div>
+                        <div class="text_center" id="qrCode">
+                            <div class="cont_left">
+                                <img src="../../img/dizhi.jpg" alt="">
+                                <p>湖南省长沙市营盘东路19号金山大厦八楼</p>
+                            </div>
+                            <div class="cont_center">
+                                <img src="../../img/dianhua.jpg" alt="">
+                                <p>合作电话:400-8800-962</p>
+                            </div>
+                            <div class="cont_guanli">
+                                <a href="/admin/login">
+                                    <img src="../../img/guanli.png" alt="">
+                                    <p>管理员入口</p>
+                                </a>
+                            </div>
+                            <div class="cont_rightapp">
+                                <img src="../../img/erweima_iphone.png" alt="">
+                                <p>iPhone版</p>
+                            </div>
+                            <div class="cont_right android">
+                                <img src="../../img/erweima_android.jpg" alt="">
+                                <p>Android版</p>
+                            </div>
+                            <div class="cont_right">
+                                <img src="../../img/erweima.jpg" alt="">
+                                <p>微信公众号</p>
+                            </div>
+                        </div>
+                        <div class="text_bottom">
+                            <p>友情链接</p>
+                            <a href="http://www.hnst.gov.cn/" target="_blank">湖南省科技厅/</a>
+                            <a href="http://www.cssti.cn/" target="_blank">长沙市科技局/</a>
+                            <a href="http://www.cast.org.cn/" target="_blank">中国科学技术协会/</a>
+                            <a href="http://www.chinatorch.gov.cn/" target="_blank">科技部火炬中心/</a>
+                            <a href="http://www.nosta.gov.cn/web/index.aspx" target="_blank">国家科技成果奖励办/</a>
+                            <a href="http://www.nast.org.cn/" target="_blank">国家科技成果网/</a>
+                            <a href="http://www.hnast.org.cn/portal/comm/index.action" target="_blank">湖南省科学技术协会/</a>
+                            <a href="http://www.hncgw.gov.cn/" target="_blank">湖南省科技成果转化公共服务平台/</a>
+                            <a href="http://www.hnjxw.gov.cn/" target="_blank">湖南省经济信息化委员会/</a>
+                            <a href="http://kyy.hnu.cn/" target="_blank">湖南大学科学技术研究院/</a>
+                            <a href="http://www.gxst.gov.cn/gxkjt/" target="_blank">广西省科技厅/</a>
+                            <a href="http://www.nmkjt.gov.cn/" target="_blank">内蒙古自治区科技厅/</a>
+                            <a href="http://www.cshtz.gov.cn/" target="_blank">长沙市高新区管委会/</a>
+                            <a href="http://www.jxas.ac.cn/" target="_blank">江西省科学院/</a>
+                            <a href="http://www.cnic.cn/front/index.html#/cnicSite/home" target="_blank">中科院计算机网络信息中心/</a>
+                            <a href="http://kxyjb.csu.edu.cn/" target="_blank">中南大学科学研究部/</a>
+                            <a href="http://www.cast.org.cn/" target="_blank">中国科协创新创业服务中心/</a>
+                            <a href="http://www.hbstd.gov.cn/" target="_blank">湖北省科技厅/</a>
+                            <a href="http://www.gdstc.gov.cn/" target="_blank">广东省科技厅/</a>
+                            <a href="http://www.hnkjt.gov.cn/" target="_blank">河南省科技厅/</a>
+                            <a href="http://www.cbtm.gov.cn/" target="_blank">技术合同登记官网</a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div onclick="_MEIQIA('showPanel')" id="lxkf" style="display:none"></div>
+            <div class="pub_fix">
+                <span class="index_blur"></span>
+                <ul class="ret_top">
+                    <li class="head_login">
+                        <a href="javascript:;">
+                            <img src="../../img/index_fix0.png" alt="">
+                            <p>申请会员</p>
+                        </a>
+                    </li>
+                    <li>
+                        <a onclick="_MEIQIA('showPanel')">
+                            <img src="../../img/index_fix3.png" alt="">
+                            <p>联系客服</p>
+                        </a>
+                    </li>
+                    <li>
+                        <a href="" class="pendent_box">
+                            <img src="../../img/index_fix4.png" alt="">
+                            <p>返回顶部</p>
+                        </a>
+                    </li>
+                </ul>
+                <span class="index_orange"></span>
+            </div>
+            <div class="message">
+                <span></span>
+            </div>
+            <div class="login">
+                <div class="login_mian">
+                    <div class="login_left">
+                        <div class="login_ewm">
+                            <img src="../../img/Android.jpg" alt="二维码" />
+                            <p>Android版</p>
+                            <p>客户端</p>
+                        </div>
+                        <div class="login_ewm">
+                            <img src="../../img/iPhone.jpg" alt="二维码" />
+                            <p>iPhone版</p>
+                            <p>客户端</p>
+                        </div>
+                    </div>
+                    <div class="login_right">
+                        <h5>用户登陆
+                            <a href="">免费注册有好礼呦!!</a>
+                        </h5>
+                        <form id="form_login">
+                            <div class="login_uesr">
+                                <label for="uesname">
+                                    <img src="../../img/login_use.png" />
+                                </label>
+                                <input type="text" name="uesname" id="Lo_user" placeholder="用户名" />
+                                <img src="../../img/login_del.png" class="log_del" />
+                            </div>
+                            <div class="login_pass">
+                                <label for="pass">
+                                    <img src="../../img/login_password.png" />
+                                </label>
+                                <input type="password" name="pass" id="Lo_pass" placeholder="请输入密码" />
+                            </div>
+                            <div class="login_check">
+                                <a href="">忘记密码?</a>
+                            </div>
+                            <input type="submit" value="登 陆" class="login_submit" />
+                        </form>
+                        <img src="../../img/login_hua.png" alt="" class="login_hua" />
+                        <img src="../../img/login_shadow.png" alt="阴影效果" class="login_shadow" />
+                        <img src="../../img/login_close.png" alt="" class="login_close" />
+                    </div>
+                </div>
+            </div>
+            <div id="forget">
+                <div class="forget">
+                    <form id="forget_form">
+                        <div class="forget_top">
+                            <a href="">忘记密码?</a>
+                            <div class="login_check">
+                                <label for="forget_checks" class="lab_check">
+                                    <input type="checkbox" name="type" id="forget_checks" />专家登录
+                                </label>
+                                <label for="forget_checkst" class="lab_checkno">
+                                    <input type="checkbox" name="type" id="forget_checkst" />企业登录
+                                </label>
+                            </div>
+                        </div>
+                        <div class="forget_center">
+                            <div class="phone">
+                                <label for="forget_phone">
+                                    手机号码:
+                                    <input type="text" name="type" id="forget_phone" placeholder="请输入您的手机号码..." />
+                                </label>
+                            </div>
+                            <div class="yanzheng">
+                                <label for="forget_yanzheng">
+                                    图形验证码:
+                                    <input type="text" name="type" id="forget_yanzheng" />
+                                </label>
+                                <div class="yanzhengma_cont_">
+                                    <img th:src="${basePath+'/open/getVCode'}" />
+                                </div>
+                            </div>
+                            <div class="cellcode_">
+                                <div>
+                                    验证码:
+                                    <input type="text" name="cellCode" placeholder="手机验证码" id="photo_n" />
+                                </div>
+                                <input type="button" id="photo_m" value="获取验证码" disabled/>
+                            </div>
+                            <div class="fastener">
+                                <input type="submit" class="forget_sub" value="确认" />
+                                <div class="fastener_right">
+                                    取消
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                    <img src="../../img/login_close.png" alt="" class="login_close" />
+                </div>
+            </div>
+            <div id="new_password">
+                <div class="new_password">
+                    <form id="new_password_form">
+                        <div class="password_top">
+                            <h4>设置新密码</h4>
+                            <span>密码长度为6-20个字符,区分大小写</span>
+                        </div>
+                        <div class="password_center">
+                            <div>
+                                <label for="new_pass">
+                                    新密码:
+                                    <input type="text" name="type" id="new_pass" placeholder="请输入您的新密码..." />
+                                </label>
+                            </div>
+                            <div>
+                                <label for="new_pass_again">
+                                    确认密码:
+                                    <input type="text" name="type" id="new_pass_again" placeholder="请确认您的密码..." />
+                                </label>
+                            </div>
+                            <div class="fastener">
+                                <input type="submit" class="new_password_sub" value="确认" />
+                                <div class="fastener_right">
+                                    取消
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                    <img src="../../img/login_close.png" alt="" class="login_close" />
+                </div>
+            </div>
+            <div class="smg">
+                <input type="text" name="msg" value="111" id="msg" />
+            </div>
+        </footer>
+</body>
+</html>

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


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


+ 1 - 1
template/newMenu/evaluate.html

@@ -16,7 +16,7 @@
 		<div class="container ">
 			<div class="row clearfix">
 				<div class="col-md-3 logo">
-					<img src="../../img/Logo11.png" />
+					<img src="../../img/Logo111.png" />
 				</div>
 				<div class="col-md-8">
 					<ul class="nav_content">

+ 8 - 53
template/newMenu/services.html

@@ -158,6 +158,7 @@
         </div>
         <div class="serviceItems">
             <h3></h3>
+            <img src="../../img/newMenu/serves_6.jpg" alt="" style="width: 1px;height:1px">
             <div class="wrapper">
                 <div class="wrapperLeft">
                     <div class="title" id="serviceHigh">
@@ -167,63 +168,17 @@
                         <span>也是高新</span>
                         <a href="#" class="seeMore">查看更多 > </a>
                     </div>
-                    <div class="subsidy">
-                        <img src="../../img/newMenu/serves_6.jpg" alt="">
+                    <div class="militaryCont">
+                        <img src="../../img/newMenu/service_jung.jpg" alt="">
                         <div class="subsidyTxt">
                             <ul>
                                 <li>
-                                    <div>
-                                        <img src="../../img/newMenu/serves_7.png" alt="">
-                                    </div>
-                                    <div>
-                                        <h4>高企诊断</h4>
-                                        <p>早测早知道&nbsp; 早知早收益</p>
-                                    </div>
-                                </li>
-                                <li>
-                                    <div>
-                                        <img src="../../img/newMenu/serves_8.png" alt="">
-                                    </div>
-                                    <div>
-                                        <h4>高企认定</h4>
+                                    <a href="">
                                         <p>税收减免&nbsp; 政府补贴</p>
-                                    </div>
-                                </li>
-                                <li>
-                                    <div>
-                                        <img src="../../img/newMenu/serves_9.png" alt="">
-                                    </div>
-                                    <div>
-                                        <h4>加计扣除</h4>
-                                        <p>落实政策 研发除税</p>
-                                    </div>
-                                </li>
-                                <li>
-                                    <div>
-                                        <img src="../../img/newMenu/serves_10.png" alt="">
-                                    </div>
-                                    <div>
-                                        <h4>高企培育</h4>
-                                        <p>谋世大格局 谋时小布局</p>
-                                    </div>
-                                </li>
-                                <li>
-                                    <div>
-                                        <img src="../../img/newMenu/serves_11.png" alt="">
-                                    </div>
-                                    <div>
-                                        <h4>自助高新</h4>
-                                        <p>高新达人 我的高新我做主</p>
-                                    </div>
-                                </li>
-                                <li>
-                                    <div>
-                                        <img src="../../img/newMenu/serves_12.png" alt="">
-                                    </div>
-                                    <div>
-                                        <h4>高企培训</h4>
-                                        <p>培训一天 轻松一年</p>
-                                    </div>
+                                        <div>
+                                            <img src="../../img/newMenu/serves_8.png" alt="">
+                                        </div>
+                                    </a>
                                 </li>
                             </ul>
                         </div>

+ 7 - 0
template/newMenu/tradingIndex.html

@@ -315,6 +315,13 @@
             <a href="#">查看更多需求</a>
         </div>
     </div>
+    <div class="patentTitle">
+        <h2 id="">在线评估</h2>
+        <span></span>
+    </div>
+    <div class="trandPg">
+        <span>开始评估</span>
+    </div>
     <div class="container">
         <div class="patentTitle">
             <h2 id="trandingIndexPolicy">知识产权交易政策</h2>

+ 1 - 7
webpack.config.js

@@ -35,12 +35,6 @@ module.exports = (function () {
             template: './template/index.html',
             chunks: ['index', 'vendors']
         }),
-        new HtmlWebpackPlugin({
-            title: '搜索页',
-            filename: 'html/search.html',
-            template: './template/search.html',
-            chunks: ['search', 'vendors']
-        }),
         // new HtmlWebpackPlugin({
         //     title: '支付跳转页面',
         //     filename: 'html/toPayment.html',
@@ -400,7 +394,7 @@ module.exports = (function () {
             disableHostCheck: true,
             host: '192.168.0.190',
             port: 80,
-            allowedHosts: ['192.168.0.190','192.168.0.99'],
+            allowedHosts: ['127.0.0.1','192.168.0.99'],
             headers: {
                 "Access-Control-Allow-Origin": "*"
             }

+ 0 - 5
webpack/entry.config.js

@@ -1,7 +1,6 @@
 module.exports = {
     prod: {
         'index': './src/js/newMenu/index.js',
-        'search': './src/js/search.js',
         'aboutUs': './src/js/aboutUs.js',
         // 'APPaboutUs': './src/js/APPaboutUs.js',
         'contactUs': './src/js/contactUs.js',
@@ -62,10 +61,6 @@ module.exports = {
             'webpack/hot/only-dev-server',
             './src/js/newMenu/index.js'
         ],
-        'search': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
-            'webpack/hot/only-dev-server',
-            './src/js/search.js'
-        ],
          'aboutUs': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/aboutUs.js'