dengzhiguo 6 years ago
parent
commit
024249312b

BIN
img/Logo111.png


BIN
img/newMenu/search-icon.jpg


BIN
img/newMenu/searchImg.png


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

@@ -1,6 +1,6 @@
 /* 搜索 */
 .indexSearch{
-    width: 800px;
+    width: 770px;
     height: 36px;
     margin: 37px auto 74px;
 }
@@ -16,35 +16,37 @@ footer{
 .indexSearch>span{
     width: 140px;
     display: inline-block;
-    height: 36px;
+    height: 44px;
     text-align: center;
     color: #fff;
     background: #5cb85c;
     font-size: 16px;
-    line-height: 36px;
+    line-height: 44px;
     float: right;
     border-radius: 5px;
     cursor: pointer;
+    margin-left:-20px;
 }
 .searchBtn{
-    width: 104px;
+    width: 60px;
     font-size: 18px;
+    padding-top:3px;
 }
 .indexSearch .demandSearch{
     width: 530px;
-    height: 36px;
+    height: 44px;
     line-height: 34px;
     border-color: #bbd5e5;
 }
 .indexSearch .searchBtn{
-    height: 36px;
+    height: 44px;
     line-height: 22px;
     background: #1697e9;
     border: 1px solid #1697e9;
     color: #ffffff;
 }
 .indexSearch .searchBtn img{
-    width: 25px;height: 24px;
+    width: 35px;height: 35px;
     vertical-align: top
 }
 .indexSearch .search-inp .input-group{

+ 5 - 5
src/css/newMenu/adviserList.css

@@ -21,24 +21,24 @@ footer{
     border-radius: 0
 }
 .searchBtn{
-    width: 104px;
+    width: 60px;
     font-size: 18px;
 }
 .indexSearch .demandSearch{
     width: 530px;
-    height: 36px;
-    line-height: 34px;
+    height: 44px;
+    line-height: 42px;
     border-color: #bbd5e5;
 }
 .indexSearch .searchBtn{
-    height: 36px;
+    height: 44px;
     line-height: 22px;
     background: #1697e9;
     border: 1px solid #1697e9;
     color: #ffffff;
 }
 .indexSearch .searchBtn img{
-    width: 25px;height: 24px;
+    width: 35px;height: 35px;
     vertical-align: top
 }
 

+ 7 - 6
src/css/newMenu/header.css

@@ -298,7 +298,7 @@ div.APP:hover{background-color: #fff;}
 .search .search-inp {
     font-size: 16px;
     height: 55px;
-    line-height: 55px;
+    line-height:40px;
 }
 
 .search-inp .input-group {
@@ -311,20 +311,21 @@ div.APP:hover{background-color: #fff;}
 
 .search .search-inp input {
     font-size: 16px;
-    height: 55px;
-    line-height: 55px;
+    height: 44px;
+    line-height: 44px;
     border-color: #1797e9;
     border-right: none;
 }
 .search .search-inp button {
-    height: 55px;
-    line-height: 45px;
+    height: 44px;
+    /*line-height: 45px;*/
     background-color: #1797e9;
     color: #fff;
     font-size: 18px;
-    width: 150px;
+    width: 60px;
     border: none;
     border-radius: 0 5px 5px 0;
+    padding-top: 3px;
 }
 input:focus{
     outline: none;

+ 5 - 5
src/css/newMenu/patent.css

@@ -122,7 +122,7 @@
     transition: all .3s ease-in-out;
 }
 .secondMenu.active{
-    width: 960px;
+    width: 660px;
     transition: all .3s ease-in
 }
 .secondMenu ul li{
@@ -190,18 +190,18 @@
 
 .indexSearch .demandSearch{
     width: 530px;
-    height: 36px;
+    height: 44px;
     line-height: 34px;
 }
 .indexSearch .searchBtn{
-    height: 36px;
+    height: 44px;
     line-height: 22px;
     background: #1697e9;
     border: 1px solid #1697e9;
     color: #ffffff;
 }
 .indexSearch .searchBtn img{
-    width: 25px;height: 24px;
+    width: 35px;height: 34px;
     vertical-align: top
 }
 .indexSearch .search-inp{
@@ -222,7 +222,7 @@
     width: 104px;
 }
 .indexSearch .search-inp .input-group .input-group-btn button{
-    width: 104px;;
+    width: 60px;;
     font-size: 18px;
 }
 .indexSearch .apply{

+ 9 - 8
src/css/newMenu/safeguarding.css

@@ -7,7 +7,7 @@
 }
 /* 搜索 */
 .indexSearch{
-    width: 840px;
+    width: 820px;
     height: 36px;
     margin: 72px auto 84px;
 }
@@ -49,35 +49,36 @@ footer{
 .indexSearch>span{
     width: 180px;
     display: inline-block;
-    height: 36px;
+    height: 44px;
     text-align: center;
     color: #fff;
     background: #ffb108;
     font-size: 16px;
-    line-height: 36px;
+    line-height: 44px;
     float: right;
     border-radius: 5px;
     cursor: pointer;
 }
 .searchBtn{
-    width: 104px;
+    width: 60px;
     font-size: 18px;
+    padding-top: 3px;
 }
 .indexSearch .demandSearch{
     width: 530px;
-    height: 36px;
-    line-height: 34px;
+    height: 44px;
+    line-height: 44px;
     border-color: #bbd5e5;
 }
 .indexSearch .searchBtn{
-    height: 36px;
+    height: 44px;
     line-height: 22px;
     background: #1697e9;
     border: 1px solid #1697e9;
     color: #ffffff;
 }
 .indexSearch .searchBtn img{
-    width: 25px;height: 24px;
+    width: 35px;height: 35px;
     vertical-align: top
 }
 .indexSearch .search-inp .input-group{

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

@@ -21,11 +21,11 @@
     line-height: 50px;
     text-align: center;
     float: left;
-    font-size: 19px;
+    font-size: 16px;
    
 }
 .applicationMenu ul li a{
-    color: #545454;
+    color: #747474;
 }
 .applicationMenu ul>li:first-child{
     width: 200px;
@@ -43,7 +43,9 @@
     font-size: 19px;
     height: 50px;
     line-height:50px;
-    display: inline-block;    
+    display: inline-block;
+    /*font-weight: bold; */   
+    color:#1797e9;
 }
 .applicationMenu ol{
     position: absolute;
@@ -111,6 +113,10 @@
     float: left;
     margin-left: 30px;
 }
+.search .searchLeft ul li:hover{
+	padding: 3px;
+	box-shadow:0 0 2px 2px #efefef;
+}
 .search .searchLeft ul li img{
     margin-right: 16px;
 }
@@ -126,7 +132,7 @@
     width:512px;
 }
 .search .search-inp div{
-    width: 510px;
+    width: 465px;
 }
 .search .search-inp input{
     width: 406px;
@@ -136,6 +142,11 @@
 .applicationTitle {
     clear: both;
     text-align: center;
+    position: relative;
+}
+.dingwei{
+	position: absolute;
+	top:-130px
 }
 .applicationTitle h4{
     font-weight: normal;

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

@@ -91,7 +91,7 @@ $(function () {
                                             <h4>${thisdata.username}</h4>
                                             <p><span>好评率 ( ${thisdata.favorableRate} )</span><span class="nubCollect">${thisdata.countInterest}</span>${thisdata.interested?'<span class="heart active"></span>':'<span class="heart"></span>'}</p>
                                         </div> 
-                                        <p class="address">${thisdata.workUnit}</p>
+                                        <p class="address"></p>
                                         <p>${thisdata.introduction?(thisdata.introduction).length>140?(thisdata.introduction).substr(0,140)+'...':thisdata.introduction:'暂无描述'}</p>
                                     </div>
                                 </a>

+ 2 - 2
webpack.config.js

@@ -515,7 +515,7 @@ module.exports = (function () {
         }));
     }
 
-    let staticHost = 'http://192.168.0.188:80';
+    let staticHost = 'http://192.168.0.190:80';
     switch (argv.env.deploy) {
         case 'test':
             staticHost = 'http://statics.jishutao.com';
@@ -547,7 +547,7 @@ module.exports = (function () {
         plugins: plugins,
         devServer: {
             disableHostCheck: true,
-            host: '192.168.0.188',
+            host: '192.168.0.190',
             port: 80,
             allowedHosts: ['192.168.0.190', '192.168.0.99', '192.168.0.20','192.168.0.17'],
             headers: {

+ 48 - 48
webpack/entry.config.js

@@ -54,197 +54,197 @@ module.exports = {
         'newMenu/specialDetail': './src/js/newMenu/specialDetail.js',
     },
     watch: {
-        'index': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'index': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/index.js'
         ],
-        'search': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        '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.188', // WebpackDevServer host and port
+         'aboutUs': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/aboutUs.js'
         ],
-        'contactUs': ['webpack-dev-server/client?http://192.168.0.188',
+        'contactUs': ['webpack-dev-server/client?http://192.168.0.190',
             'webpack/hot/only-dev-server',
             './src/js/contactUs.js'
         ],
-        'register': ['webpack-dev-server/client?http://192.168.0.188',
+        'register': ['webpack-dev-server/client?http://192.168.0.190',
             'webpack/hot/only-dev-server',
             './src/js/register.js'
         ],
-        'thinkTank': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'thinkTank': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/thinkTank.js'
         ],
-        'technologyTrading/achievementDetail': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'technologyTrading/achievementDetail': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/technologyTrading/achievementDetail.js'
         ],
-        'technologyTrading/demandDetail': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'technologyTrading/demandDetail': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/technologyTrading/demandDetail.js'
         ],
-        'thinkTank/policyDetail': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'thinkTank/policyDetail': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/thinkTank/policyDetail.js'
         ],
-        'thinkTank/thinkerDetail': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'thinkTank/thinkerDetail': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/thinkTank/thinkerDetail.js'
         ],
-        'thinkTank/policyList': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'thinkTank/policyList': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/thinkTank/policyList.js'
         ],
         // newsApp 
-        'news/newsDetailApp': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'news/newsDetailApp': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/news/newsDetailApp.js'
         ],
-        'news/appCognizance': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'news/appCognizance': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/news/appCognizance.js'
         ],
-        'news/agreement': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'news/agreement': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/news/agreement.js'
         ],
         /* 2018-06 新版科技需求 */
-        'newMenu/demand': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/demand': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/demand.js'
         ],
-        'newMenu/achievement': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/achievement': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/achievement.js'
         ],
-        'newMenu/achievementList': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/achievementList': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/achievementList.js'
         ],
-        'newMenu/demandList': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/demandList': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/demandList.js'
         ],
-        'newMenu/services': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/services': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/services.js'
         ],
-        'newMenu/serviceList': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/serviceList': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/serviceList.js'
         ],
-        'newMenu/serviceDetails': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/serviceDetails': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/serviceDetails.js'
         ],
-        'newMenu/shopList': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/shopList': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/shopList.js'
         ],
-        'newMenu/patentList': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/patentList': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/patentList.js'
         ],
-        'newMenu/tradingIndex': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/tradingIndex': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/tradingIndex.js'
         ],
-        'newMenu/patent': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/patent': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/patent.js'
         ],
-        'newMenu/companyProfile': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/companyProfile': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/companyProfile.js'
         ],
-        'newMenu/continueHigh': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/continueHigh': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/continueHigh.js'
         ],
-        'newMenu/practicalPatent': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/practicalPatent': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/continueHigh.js'
         ],
-        'newMenu/militaryProject': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/militaryProject': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/continueHigh.js'
         ],
-        'newMenu/safeguarding': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/safeguarding': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/safeguarding.js'
         ],
-        'evaluation/evaluate': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'evaluation/evaluate': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/evaluate.js'
         ],
-        'newMenu/adviserList': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/adviserList': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/adviserList.js'
         ],
-        'newMenu/adviserDetail': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/adviserDetail': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/adviserDetail.js'
         ],
-        'newMenu/adviser': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/adviser': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/adviser.js'
         ],
-        'newMenu/safeguardingList': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/safeguardingList': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/safeguardingList.js'
         ],
-        'newMenu/safeguardingDetail': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/safeguardingDetail': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/safeguardingDetail.js'
         ],
-        'newMenu/brandBuild': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/brandBuild': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/loading/brandBuild.js'
         ],
-        'newMenu/marketOpen': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/marketOpen': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/loading/marketOpen.js'
         ],
-        'newMenu/taxFinance': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/taxFinance': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/loading/taxFinance.js'
         ],
-        'newMenu/governmentSupport': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/governmentSupport': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/loading/governmentSupport.js'
         ],
-        'newMenu/assessment': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/assessment': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/loading/assessment.js'
         ],
-        'newMenu/Invitation': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/Invitation': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/loading/Invitation.js'
         ],
-        'newMenu/invRegister': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/invRegister': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/loading/invRegister.js'
         ],
-        'newMenu/video': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/video': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/video.js'
         ],
-        'newMenu/videoDetail': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/videoDetail': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/videoDetail.js'
         ],
-        'facilitator': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'facilitator': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/facilitator/facilitator.js'
         ],
-        'newMenu/special': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/special': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/special.js'
         ],
-        'newMenu/specialDetail': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+        'newMenu/specialDetail': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/specialDetail.js'
         ],