Browse Source

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

liting2017 6 years ago
parent
commit
a3214bec02

BIN
img/fac/fac.jpg


BIN
img/fac/fac5.jpg


BIN
img/fac/fac6.jpg


+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "aft-portal",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "",
   "main": "index.js",
   "scripts": {

+ 140 - 16
src/css/facilitator/facilitator.css

@@ -9,22 +9,146 @@ border-radius: 5px;margin-right:30px;}
 .facTab>span{font-size: 18px;line-height: 26px;padding:0 15px;border:1px solid #2EA1EA;margin-right: 20px;
 border-radius: 13px;color:#2EA1EA;cursor: pointer;}
 .facTab>span.facActive{background-color: #2EA1EA;color:#fff;}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+.facFirst{min-height:500px;padding:30px 0;display: none;}
+.jianjie>h4{letter-spacing: 2px;margin-bottom: 20px;}
+.jianjie>p{letter-spacing: 1px;margin-bottom: 50px;line-height: 22px;}
+.rongyuImg{text-align: center;}
+
+.rongyuCont{padding: 30px 15px;background-color: #F4F4F4;display: flex;
+justify-content: space-between;flex-wrap: wrap;margin-bottom: 50px;}
+.rongyuCont>div{width:280px;height:200px;background-color: #fff;padding: 10px;margin-bottom:20px;}
+.rongyuCont>div>img{width:260px;height:145px;}
+.rongyuCont>div>p{margin-top:10px;text-align: center;overflow: hidden;
+    white-space:nowrap;text-overflow:ellipsis;-o-text-overflow:ellipsis;}
+
+.lianxiCont{display: flex;justify-content: space-between;}
+.lianxiCont>div{width:370px;height:135px;background-color: ;}
+
+#facAll{display: block;}
+.facAll{width:1200px;min-height: 320px;padding: 20px 0;display: flex;
+justify-content: flex-start;flex-wrap: wrap;}
+.facAll>div{width:225px;height:270px;background-color: #fff;margin-right: 15px;}
+.facAll>div>img{width:225px;height:225px;}
+.facAll>div>p{margin-top:10px;text-align: center;overflow: hidden;
+    white-space:nowrap;text-overflow:ellipsis;-o-text-overflow:ellipsis;}
+
+
+
+
+
+
+
+
+
+
+
+
+/* 热门推荐 */
+.RecommendTitle{
+    clear: both;
+    text-align: center;
+}
+.RecommendTitle h2{
+    font-size: 26px;
+    color: #323131;
+}
+.RecommendTitle span{
+    display: inline-block;
+    width: 54px;
+    height: 4px;
+    background: #1697e9;
+    transition: all .2s ease-in;
+}
+.contantUs{
+    margin-top: 33px;
+    height: 130px;
+    display: flex;
+    display: -webkit-flex;
+    justify-content: space-between;
+    margin-bottom: 100px;
+}
+.contantUs li{
+    width: 372px;
+    background: #f4f4f4;
+    height: 130px;
+    display: -webkit-flex;
+    display: flex;
+    padding: 36px 0px 0 40px ;
+}
+.contantUs li .glyphicon{
+    color: #757474;
+    font-size: 48px;
+    display: inline-block;
+    margin-right: 28px;
+    font-weight: normal;
+    margin-top: 4px;
+    
+}
+.contantUs li p:nth-child(1){
+    margin-bottom: 14px;
+}
+.contantUs li p span{
+    font-size: 14px;
+    color: #7a7878;
+}
+.contantUs li p{
+    font-size: 16px;
+    color: #1f1f1f;
+}
+.contantUs li p .pho{
+    margin-left: 10px;
+}
+.contantUs li:hover{
+    background: #1697e9;
+}
+.contantUs li:hover .glyphicon,.contantUs li:hover p,.contantUs li:hover span{
+    color: #ffffff;
+}
+
+.pagination_box{clear: both;overflow: hidden; width: 1200px;
+margin: 0 auto;line-height: 74px;display: none;}
+.clearfix{clear: both;}
+.pagination_box nav {
+    float: right;
+}
+.inp{
+    float: right; display: none;
+}
+.pagination_box .inp button{
+	margin-top:-5px;line-height: 22px;
+}
+.list_none {
+    width: 550px;
+    height: 150px;
+    background: url("../../../img/all_null.png") no-repeat;
+    margin: 50px auto;
+}
+.inp input{
+    width:40px;
+    height: 35px;
+    text-align: center;
+    border-radius: 5px;
+    border:1px solid #ccc;
+}
+.inp button{
+    margin: 0 10px;
+    margin-top:-5px;
+    width: 50px;
+}
+.pagination_box ul li a {
+    color: #333
+}
+
+.pagination_box .pagination {
+    float: right;
+    margin-right: 20px;
+}
+
+.pagination_box .totalCount {
+    float: right;
+    display: inline-block;
+    margin-right: 15px;
+}
 
 
 

+ 213 - 0
src/js/facilitator/facilitator.js

@@ -0,0 +1,213 @@
+import 'css/bootstrap.less';
+import 'bootstrap/dist/js/bootstrap.js';
+import 'css/newMenu/public.css';
+import 'css/newMenu/header.css'
+import 'css/facilitator/facilitator.css';
+import 'js/public.js';
+
+$(function(){
+	$(".facTab>span").click(function(){
+		$(".facTab>span").removeClass("facActive");
+		$(this).addClass("facActive");
+		var facIndex=$(".facTab>span.facActive").index();
+		$("div.facFirst").css("display","none");
+		$("#facAll").css("display","none");
+		if(facIndex==1){
+			$("div.facFirst").css("display","block");
+		}else{
+			$("#facAll").css("display","block");
+		}
+		
+	})
+	function GetQueryString(name){
+     	var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)");
+     	var r = window.location.search.substr(1).match(reg);
+     	if(r!=null)return  unescape(r[2]); return null;
+	}
+	var UID=GetQueryString("uid");
+	var pageSize = 15,
+		thePageNo = 1,
+		thePageLength = 1;
+		init();
+    function init() {
+        pages();
+        inpFun();
+        loadDate();
+        $('.onSelect .preFirst').css('display', 'none')
+        $('.onSelect .next').css('display', 'none')
+    };
+	function loadDate(pageNo) {
+		$.ajax({
+            method: "get",
+            dataType: "json",
+            url: globalConfig.context + "/open/user/projectList",
+            data: {
+            	pageNo: pageNo || 1,
+            	pageSize: 15,
+                uid:UID
+            },
+            success: function (data) {
+                if (data.error && data.error.length) {
+                    msg(data.error[0].message);
+                }else if(data.error==""){
+                    var contHtml="";
+                    var dataList=data.data.list;
+                    if(dataList.length){
+                     	for(var a=0;a<dataList.length;a++){
+                     		var name=dataList[a].name?dataList[a].name:"";
+                    		var imgUrl=dataList[a].maxImgUrl?globalConfig.avatarUploadHost+dataList[a].maxImgUrl:globalConfig.portalHost+"/img/initPic/serviceInit.jpg"
+                     		contHtml+=`<div>
+						    				<img src="${imgUrl}" alt="" />
+						    				<p>${name}</p>
+						    				<input type="hidden" dates="${dataList[a].id}" datee="${dataList[a].module}"/>
+						    			</div>`;
+                     	}
+                     }
+                  	$(".facAll").html(contHtml);
+                    
+                }else{
+                    return;
+                }
+           
+            //分页部分的处理
+            $('.pagination_box').css('display', 'block');
+                $('.inp').css('display', 'block');
+                if (data.data.list&&data.data.list.length === 0) {
+                    $('.achievementHot .hotList').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(''));
+            }
+         });
+	}
+	//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 msg(txt) {
+        if($('.smg').hasClass('active')){
+			return ;
+		}
+        $('.smg').addClass('active');
+        var lit = $('#msg').val(txt);
+        setTimeout(function () {
+            $('.smg').removeClass('active');
+            $('#msg').val('');
+        }, 2000)
+    }
+	$(".facAll").on("click","div",function(){
+		var id=$(this).children("input").attr("dates");
+		var module=$(this).children("input").attr("datee");
+		if(module==1){
+			window.open(globalConfig.context+"/portal/service/patentDetail?id="+id);
+		}else{
+			window.open(globalConfig.context+"/portal/service/serviceDetail?id="+id);
+		}
+	})
+})
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+ 117 - 10
template/newMenu/facilitator/facilitator.html

@@ -258,7 +258,7 @@
         </div>
     </div>
     <!--主体部分-->
-    <div id="facili">
+    <div id="facili" class="container">
     	<div class="facImg">
     		<div>
     			<img src="../../../img/fac/fea1.png" alt="" />
@@ -271,16 +271,121 @@
     		<span class="facActive">首页</span>
     		<span>所有项目</span>
     	</div>
-    	<div calss="facFirst">
-    		<div></div>
-    		<div></div>
-    		<div></div>
-    		<div></div>
-    		<div></div>
-    		<div></div>
+    	<div class="facFirst isX">
+    		<div class="jianjie">
+    			<h4>公司简介</h4>
+    			<p>&nbsp;&nbsp;&nbsp;&nbsp;近日,多部门召开发布会,对未来房价能否继续平稳、猪肉价格会否大涨等民众关切问题,给予回应。近日,多部门召开发布会,
+    			近日,多部门召开发布会,对未来房价能否继续平稳、猪肉价格会否大涨等民众关切问题,给予回应。近日,多部门召开发布会,
+    			近日,多部门召开发布会,对未来房价能否继续平稳、猪肉价格会否大涨等民众关切问题,给予回应。近日,多部门召开发布会,
+    			近日,多部门召开发布会,对未来房价能否继续平稳、猪肉价格会否大涨等民众关切问题,给予回应。近日,多部门召开发布会,
+    			近日,多部门召开发布会,对未来房价能否继续平稳、猪肉价格会否大涨等民众关切问题,给予回应。近日,多部门召开发布会,</p>
+    		</div>
+    		<div class="jianjie">
+    			<h4>业务范围</h4>
+    			<p>&nbsp;&nbsp;&nbsp;&nbsp;近日,多部门召开发布会,对未来房价能否继续平稳、猪肉价格会否大涨等民众关切问题,给予回应。近日,多部门召开发布会,
+    			近日,多部门召开发布会,对未来房价能否继续平稳、猪肉价格会否大涨等民众关切问题,给予回应。近日,多部门召开发布会,
+    			近日,多部门召开发布会,对未来房价能否继续平稳、猪肉价格会否大涨等民众关切问题,给予回应。近日,多部门召开发布会,
+    			近日,多部门召开发布会,对未来房价能否继续平稳、猪肉价格会否大涨等民众关切问题,给予回应。近日,多部门召开发布会,
+    			近日,多部门召开发布会,对未来房价能否继续平稳、猪肉价格会否大涨等民众关切问题,给予回应。近日,多部门召开发布会,</p>
+    		</div>
+    		<div class="RecommendTitle">
+	            <h2>荣誉资质</h2>
+	            <span></span>
+	        </div>
+    		<div class="rongyuCont">
+    			<div>
+    				<img src="../../../img/fac/fea2.png" alt="" />
+    				<p>国家技术转移示范机构</p>
+    			</div>
+    			<div>
+    				<img src="../../../img/fac/fea2.png" alt="" />
+    				<p>国家技术转移示范机构</p>
+    			</div>
+    			<div>
+    				<img src="../../../img/fac/fea2.png" alt="" />
+    				<p>国家技术转移示范机构</p>
+    			</div>
+    			<div>
+    				<img src="../../../img/fac/fea2.png" alt="" />
+    				<p>国家技术转移示范机构</p>
+    			</div>
+    			<div>
+    				<img src="../../../img/fac/fea2.png" alt="" />
+    				<p>国家技术转移示范机构</p>
+    			</div>
+    		</div>
+    		<div class="RecommendTitle">
+	            <h2>联系我们</h2>
+	            <span></span>
+	        </div>
+	        <ol class="contantUs">
+	            <li>
+	                <span class="glyphicon glyphicon-earphone"></span>
+	                <div>
+	                    <p>联系方式<span class="pho">0731-73846252890</span></p>
+	                    <p>QQ号码<span class="pho">74637383930</span></p>
+	                </div>
+	            </li>
+	            <li>
+	                <span class="glyphicon glyphicon-envelope"></span>
+	                <div>
+	                    <p>公司邮箱</span></p>
+	                    <p><span>3846252890@qq.com</span> </p>
+	                </div>
+	            </li>
+	            <li>
+	                <span class="glyphicon glyphicon-map-marker"></span>
+	                <div>
+	                    <p>公司地址</span></p>
+	                    <p><span>湖南省长沙市营盘东路</span> </p>
+	                </div>
+	            </li>
+	        </ol>
     	</div>
-    	<div class="facAll">
-    		
+    	<div id="facAll" class="isX">
+    		<div class="facAll">
+    			<div>
+    				<img src="../../../img/fac/fac.jpg" alt="" />
+    				<p>专利驳回复审</p>
+    			</div>
+    			<div>
+    				<img src="../../../img/fac/fac.jpg" alt="" />
+    				<p>专利驳回复审</p>
+    			</div>
+    			<div>
+    				<img src="../../../img/fac/fac.jpg" alt="" />
+    				<p>专利驳回复审</p>
+    			</div>
+    			<div>
+    				<img src="../../../img/fac/fac.jpg" alt="" />
+    				<p>专利驳回复审</p>
+    			</div>
+    			<div>
+    				<img src="../../../img/fac/fac.jpg" alt="" />
+    				<p>专利驳回复审</p>
+    			</div>
+    		</div>
+    		<div class="pagination_box">
+	            <nav aria-label="Page navigation" class="clearfix">
+	                <ul class="pagination">
+	                    <li class="pagePre">
+	                        <a href="#" aria-label="Previous">
+	                            <span aria-hidden="true">&laquo;</span>
+	                        </a>
+	                    </li>
+	                    <li class="pageNumber"><a href="#" value="1">1</a></li>
+	                    <li class="pageNext">
+	                        <a href="#" aria-label="Next">
+	                            <span aria-hidden="true">&raquo;</span>
+	                        </a>
+	                    </li>
+	                </ul>
+	                <div class="inp">
+	                    <input type="text" class=""><button class="btn btn-default">跳转</button>
+	                </div>
+	                <span class="totalCount">共0条数据</span>
+	            </nav>
+	        </div>
     	</div>
     </div>
     
@@ -519,5 +624,7 @@
         </div>
     </footer>
 </body>
+	<script language="JavaScript" src="../../../src/js/jquery-2.1.0.js"></script>
+	<script language="JavaScript" src="../../../src/js/facilitator/facilitator.js"></script>
 <!-- <script language="javascript" src="https://put.zoosnet.net/JS/LsJS.aspx?siteid=PUT70876498&float=1&lng=cn"></script> -->
 </html>

+ 7 - 1
webpack.config.js

@@ -23,7 +23,7 @@ module.exports = (function () {
     let plugins = [
         new webpack.optimize.CommonsChunkPlugin({
             name: 'vendors',
-            minChunks: 10
+            minChunks: 20
         }),
         // new webpack.optimize.CommonsChunkPlugin({
         //     name: 'vendor',
@@ -83,6 +83,12 @@ module.exports = (function () {
             template: './template/search.html',
             chunks: ['vendors','search'],
         }),
+        new HtmlWebpackPlugin({
+            title: '服务商主页',
+            filename: 'html/facilitator.html',
+            template: './template/newMenu/facilitator/facilitator.html',
+            chunks: ['vendors','facilitator'],
+        }),
         // new HtmlWebpackPlugin({
         //     title: '支付跳转页面',
         //     filename: 'html/toPayment.html',

+ 10 - 5
webpack/entry.config.js

@@ -2,6 +2,7 @@ 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',
@@ -47,6 +48,10 @@ module.exports = {
             'webpack/hot/only-dev-server',
             './src/js/search.js'
         ],
+        'facilitator': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+            'webpack/hot/only-dev-server',
+            './src/js/facilitator/facilitator.js'
+        ],
          'aboutUs': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/aboutUs.js'
@@ -157,23 +162,23 @@ module.exports = {
             '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'
         ],