Commit 456723bd authored by zhangyanni's avatar zhangyanni

样式

parent b746997a
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
<span></span> <span></span>
</div> </div>
</div> </div>
<span class="more" @click="isShowFlag=true"><i class="iconfont icon-gengduo-2" v-if="channelList.length>1&&!$route.query.id"></i></span> <span class="more" @click="isShowFlag=true" v-if="channelList.length>1&&!$route.query.id"><i class="iconfont icon-gengduo-2"></i></span>
<div class="content_data" ref="overfolowWrapper" :style="{height:channelList.length>1&&!$route.query.id?'calc(100vh - 2.3rem)':'calc(100vh - 1.3rem)'}"> <!--v-if="tableData.length!= 0"--> <div class="content_data" ref="overfolowWrapper" :style="{height:channelList.length>1&&!$route.query.id?'calc(100vh - 1.1rem)':'100vh',paddingTop:channelList.length>1&&!$route.query.id?'1rem':'0'}"> <!--v-if="tableData.length!= 0"-->
<mt-loadmore :top-method="loadTop" :bottom-method="loadBottom" :auto-fill="false" :bottom-all-loaded="allLoaded" ref="loadmore"> <mt-loadmore :top-method="loadTop" :bottom-method="loadBottom" :auto-fill="false" :bottom-all-loaded="allLoaded" ref="loadmore">
<div class="articleContent"> <div class="articleContent">
<ul> <ul>
...@@ -429,7 +429,7 @@ ...@@ -429,7 +429,7 @@
.content_data { .content_data {
width: 95%; width: 95%;
height: calc(100vh - 2.3rem); height: calc(100vh - 1rem);
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
overflow: auto; overflow: auto;
margin: 0 auto; margin: 0 auto;
......
...@@ -47,9 +47,9 @@ ...@@ -47,9 +47,9 @@
</div> </div>
</div> </div>
</div> </div>
<div class="searchContentHasDataWrap" v-if="canSearch" :style="{overflow:hasData?'auto':currentIndex==3&&totalArticleData==0||totalPage==page?'auto':'hidden'}"> <div class="searchContentHasDataWrap" v-if="canSearch" :style="{overflow:hasData?'auto':'hidden'}">
<div :class="currentIndex==3?'noPositionList':'newcontentList'" ref="newcontentList" :style="{paddingBottom:currentIndex==3&&totalArticleData==0||totalPage==page?'.5rem':'2.2rem'}" <div :class="currentIndex==3?'noPositionList':'newcontentList'" ref="newcontentList"
v-if="tableData" v-if="tableData"
> >
<div class="searchResultCount" v-if="!hasData"> <div class="searchResultCount" v-if="!hasData">
...@@ -225,7 +225,7 @@ ...@@ -225,7 +225,7 @@
<div :style="{marginTop: hasData?'1rem':'unset'}"> <div :style="{marginTop: hasData?'1rem':'unset'}">
<noData v-if="hasData" :keyword="keyword" :showTab="currentIndex" :nodata="true"></noData> <noData v-if="hasData" :keyword="keyword" :showTab="currentIndex" :nodata="true"></noData>
<div class="heightContent" :class="totalActivityData==0?'contentInfo':'contentPageInfo'" <div class="heightContent" :class="totalActivityData==0?'contentInfo':'contentPageInfo'"
v-if="currentIndex==3&&(totalActivityData== 0||totalPage==page)"> v-if="totalActivityData== 0">
<p class="activityIntro"><span class="leftTab"></span><span>为您推荐</span></p> <p class="activityIntro"><span class="leftTab"></span><span>为您推荐</span></p>
<div class="content_data" style="height:unset;" v-if="recommendedData.length>0"> <div class="content_data" style="height:unset;" v-if="recommendedData.length>0">
<ul> <ul>
...@@ -783,7 +783,7 @@ ...@@ -783,7 +783,7 @@
this.totalActivityData = response.result.total; this.totalActivityData = response.result.total;
let flags = (this.page >= response.result.pages) ? false : true; let flags = (this.page >= response.result.pages) ? false : true;
this.isHaveMore(flags); this.isHaveMore(flags);
if (response.result.total == 0 || response.result.pages == this.page) { if (response.result.total == 0) {
this.recommendedFunc(); this.recommendedFunc();
} }
} else { } else {
...@@ -1226,7 +1226,7 @@ ...@@ -1226,7 +1226,7 @@
.noPositionList { .noPositionList {
width: 100%; width: 100%;
height: 100%; height: calc(100% - 1rem);
padding-bottom: 2.2rem; padding-bottom: 2.2rem;
overflow: auto; overflow: auto;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment