Explorar el Código

Merge branch 'master' of ssh://git.jishutao.com:55555/jishutao/jitao-portal

liting2017 hace 6 años
padre
commit
a835cdca11

BIN
img/resiger_photo300.jpg


+ 2 - 2
src/css/inded.css

@@ -88,10 +88,10 @@ width:120px;overflow: hidden;
 .hotProject_cont>div{width:285px;height:335px;background-color: #fff;}
 .hotProject_cont>div>img{width:285px;height:165px;}
 .hotProject_cont>div>h3{margin:10px 0 10px 20px;letter-spacing: 2px;}
-.hotProject_cont>div>p{margin-left:20px;letter-spacing: 1px;
+.hotProject_cont>div>p{margin-left:20px;letter-spacing: 1px;height:60px;
 text-align: justify;text-overflow: ellipsis;overflow: hidden;display: -webkit-box;-webkit-box-orient: vertical; -webkit-line-clamp: 3;}
 .hotProject_cont>div>a{display:block;width:110px;height:33px;line-height: 30px;border: 2px solid #1596E8;margin-right: 15px;
-border-radius: 5px;margin-top:15px;float: right;text-align: center;color:#1596E8;letter-spacing: 1px;cursor: pointer;}
+border-radius: 5px;margin-top:15px;/*float: right;*/margin-left:78px;text-align: center;color:#1596E8;letter-spacing: 1px;cursor: pointer;}
 
 .RecommendTitle>h2{font-weight: 500;}
 .view{padding-left: 620px;margin-top:30px;}

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

@@ -725,7 +725,7 @@ a:active{text-decoration:none;}/* 指正在点的链接*/
 }
 
 .text_top>a {
-	color: #fff;
+	/*color: #fff;*/
 	line-height: 25px;
 }
 

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

@@ -3,6 +3,7 @@
 *{
     font-family: siyuan;
 }
+/*body{padding-top: 250px!important;}*/
 .applicationMenu{
     clear: both;
     width: 1200px;

+ 3 - 2
src/css/public.css

@@ -394,11 +394,12 @@ header .nav_right .head_login {
 	top: 140px;
 	left: 0;
 	text-align: center;
-	color: #fff;
+	/*color: #fff;*/
 }
 
 .text_top>a {
-	color: #fff;
+	/*color: #fff;*/
+	color:##337ab7!important;
 	line-height: 25px;
 }
 

+ 2 - 1
src/css/register.css

@@ -33,6 +33,7 @@ margin-bottom:10px;line-height:50px;background: #eeeeee}
 .zhuce_input>select{border:none;width:200px;height:36px;color:#707070; background: transparent;
     outline: none;}
 .zhuce_input>input{border:none;width: 200px;}
+.zhuce_input>img{width:40px;height:30px;}
 .log_del{margin-left:15px;}
 .yanzheng{width:255px;height:40px;position: relative;margin-bottom:10px;}
 .yanzhengma{width:165px;height:40px;border:1px solid #E5E5E5;
@@ -41,7 +42,7 @@ margin-bottom:10px;line-height:50px;background: #eeeeee}
 .yanzhengma_cont{display:inline-block;width:80px;height:40px;line-height: 38px;
     position: absolute;top:0;right:0;}
 .yanzhengma_cont>img{width:100%;height:100%;border: none;}
-.cellcode{width:255px;height:40px;position: relative;}
+.cellcode{width:255px;height:40px;position: relative;margin-bottom:10px;}
 .cellcode>div{width:165px;height:40px;border:1px solid #E5E5E5;
     line-height: 38px;display:inline-block;margin-right:10px;}
 input{padding-left:10px;}

+ 2 - 1
src/js/search.js

@@ -15,6 +15,7 @@ $(function(){
      	if(r!=null)return  unescape(r[2]); return null;
 	}
 	var name=sessionStorage.getItem("name");
+	$(".demandSearch").attr("placeholder",name);
 	sessionStorage.removeItem("name");
 	var pageSize = 5,
     thePageNo = 1,
@@ -93,7 +94,7 @@ $(function(){
                                             <p>${dataList[a].summary?dataList[a].summary:'暂无'}</p>
                                             <div>
                                                 <span>类型:${getSearchType(dataList[a].fromTable)}</span>
-                                                <span>关键字:${dataList[a].keyword?dataList[a].keyword:''}</span>
+                                                <span>关键字:${dataList[a].keyword?dataList[a].keyword:'暂无'}</span>
                                             </div>
                                             <input type="hidden" dataType="${dataList[a].fromTable}" dataId="${dataList[a].rowId}"/>
                                         </li>`            

+ 4 - 0
template/register.html

@@ -82,6 +82,10 @@
 						<img src="../img/indedImg/enroll9.png" alt=""/>
 						<input type="text" name="beInviteCode" placeholder="请输入邀请码" id="beInviteCode" autocomplete="off">
 					</div>
+					<div class="zhuce_input">
+						<img src="../img/resiger_photo300.jpg" alt=""/>
+						<input type="text" name="beInviteCode" value="请输入邀请码" id="beInviteCode" autocomplete="off"/>
+					</div>
 					<div class="protocol">
 						<label for="protocol" class="cheackeds_no">
 							<input type="checkbox" name="pro" id="protocol"/>

+ 2 - 2
webpack.config.js

@@ -497,7 +497,7 @@ module.exports = (function () {
         }));
     }
 
-    let staticHost = 'http://192.168.0.188';
+    let staticHost = 'http://192.168.0.190:80';
     switch (argv.env.deploy) {
         case 'test':
             staticHost = 'http://statics.jishutao.com';
@@ -529,7 +529,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'],
             headers: {

+ 36 - 42
webpack/entry.config.js

@@ -2,7 +2,6 @@ module.exports = {
     prod: {
         'index': './src/js/newMenu/index.js',
         'search': './src/js/search.js',
-        'facilitator': './src/js/facilitator/facilitator.js',
         'aboutUs': './src/js/aboutUs.js',
         'contactUs': './src/js/contactUs.js',
         'register': './src/js/register.js',
@@ -33,14 +32,13 @@ module.exports = {
         'newMenu/practicalPatent': './src/js/newMenu/continueHigh.js',
         'newMenu/militaryProject': './src/js/newMenu/continueHigh.js',
         'newMenu/safeguarding': './src/js/newMenu/safeguarding.js',
-        'newMenu/safeguardingList': './src/js/newMenu/safeguardingList.js',
-        'newMenu/safeguardingDetail': './src/js/newMenu/safeguardingDetail.js',
         //app
         'evaluation/evaluate': './src/js/newMenu/evaluate.js',
         'newMenu/adviserList': './src/js/newMenu/adviserList.js',
         'newMenu/adviserDetail': './src/js/newMenu/adviserDetail.js',
         'newMenu/adviser': './src/js/newMenu/adviser.js',
-
+        'newMenu/safeguardingList': './src/js/newMenu/safeguardingList.js',
+        'newMenu/safeguardingDetail': './src/js/newMenu/safeguardingDetail.js',
         'newMenu/brandBuild': './src/js/newMenu/loading/brandBuild.js',
         'newMenu/marketOpen': './src/js/newMenu/loading/marketOpen.js',
         'newMenu/taxFinance': './src/js/newMenu/loading/taxFinance.js',
@@ -51,145 +49,141 @@ module.exports = {
         'newMenu/video': './src/js/video.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'
         ],
-        'facilitator': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
-            'webpack/hot/only-dev-server',
-            './src/js/facilitator/facilitator.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'
         ],