5月小需求 BUG 修复

src/main/resources/static/css/article/article.css

@@ -90,7 +90,7 @@ dl,dd,dt{zoom:1}
 	.classify.biaoqian{border-bottom:solid 1px #ededed}
 	.content{width:1190px;margin:0 auto;position:relative}
 	.content .mainData{float:left;width:860px}
-	.content .new-list{width:100%;background:#fff}
+	.content .new-list{width:100%;background:#ffffff;}
 	.content .row:nth-last-child(1){border-bottom:0}
 	.new-list .row{position:relative;display:table;width:800px;height:150px;margin:0 30px;padding:30px 0;border-bottom:solid 1px #ededed}
 	.row .new-img{position:absolute;width:210px;height:150px;margin-right:20px;background:#FFF url(/img/base/placeholder.png) no-repeat center center;}
@@ -170,7 +170,9 @@ dl,dd,dt{zoom:1}
 	.article .like:hover{background: #ffe6dc}
 
 }
-@media screen and (max-width:768px){.header .logo,.header .home{display:none}
+@media screen and (max-width:768px){
+	body{height: 100vh;overflow-y: scroll;}
+	.header .logo,.header .home{display:none}
 	.mIcon:before{content:'';display:inline-block;font-size:0;background:url(/img/base/icon_m.png) no-repeat;background-size:100vw auto;transition:all .5s}
 	#scrollTop{display:none;position:fixed;right:0;;z-index:9999;bottom:4vw;}
 	#scrollTop .item{width:12vw;background-color:rgba(190,194,201,.3);box-sizing:border-box;text-align:center;margin-bottom:2.5vw;font-size:3vw;position:relative}
@@ -201,7 +203,7 @@ dl,dd,dt{zoom:1}
 	.bar,.classify{height:8vw;line-height:8vw;font-size:3.1vw;overflow:hidden;color:#93979F;padding:0 2vw}
 	.classify em{color:#E15616;font-weight:bold;margin-right:1vw;font-size:3.7vw}
 	.mainData{min-height:68vh}
-	.new-list{background:#FFF}
+	.new-list{background:#FFF;}
 	.dataRousce{width:100%;background:#FFF;overflow:hidden}
 	.dataRousce .row{width:100%;height:34.8vw;border-top:1px solid #F5F5F5;background:#FFF;overflow:hidden;box-sizing:border-box;padding:2vw 3.3vw 2vw 37vw;position:relative;color:#93979F;line-height:3.5vw;font-size:2.6vw}
 	.dataRousce .row img{position:absolute;left:3.3vw;top:2.3vw;width:30.4vw;height:30.4vw}

src/main/resources/static/js/article/list.js

@@ -71,7 +71,6 @@ var articleList = new Vue({
                     var result = JSON.parse(r.data);
                     _self.listRecord = result.total;
                     var resultData = [];
-                    console.log('文章列表',result.items);
                     result.items.map(function (item) {
                         resultData.push({
                             id: item.articleId,
@@ -148,11 +147,11 @@ var articleList = new Vue({
         if(!isPC){
             $('footer').addClass("noneImportant");
             //移动端上垃加载更多
-            $(window).on('scroll', function(){
-                var scrollTop =  $(document).scrollTop();
+            $('body').on('scroll', function(){
+                var scrollTop =  $(this).scrollTop();
                 var documentHeight = $(document).height();
-                var windowHeight = $(window).height() ;
-                if( scrollTop >=documentHeight - windowHeight ){
+                var windowHeight = $(this).height() ;
+                if( scrollTop + windowHeight == documentHeight ){
                     console.log("到底部了！");
                     //此处是滚动条到底部时候触发的事件，在这里写要加载的数据，或者是拉动滚动条的操作
                     var totalPage = Math.ceil(_self.listRecord / _self.params.size)?Math.ceil(_self.listRecord / _self.params.size):1;

src/main/resources/static/js/common/serviceapi/utils.service.js

@@ -238,16 +238,6 @@ var PublicApi = {
                 callback(res);
             });
         },
-        updateCompanyInfo : function (params,callback) {//提交机构修改申请信息
-            Http.AjaxService({
-                url:'/user/club/updateCompanyInfo',
-                type:'post',
-                data:params, json:true
-            })
-            .then(function(res){
-                callback(res);
-            });
-        },
         modifiedData : function (params,callback) {//提交个人中心修改机构信息
             Http.AjaxService({
                 url:'/operation/modifiedData',

src/main/resources/templates/article/list.html

@@ -15,7 +15,7 @@
     <a href="/" target="_blank">首页</a>&gt; <a  th:each="type: ${articleType}" th:if="${typeId}==${type.id}" th:text="${type.name}" href="javascript:void(0);" class="title newTitle"></a>
 </div>
 <!--主体内容-->
-<div class="content clearfix">
+<div class="content clearfix" id="ArticleContent">
     <div class="mainData">
         <div class="new-list" id="articleList" v-cloak>
             <div v-if="params.keyword" class="search">