Merge branch 'dev'

This commit is contained in:
daihh
2022-06-14 21:08:15 +08:00
2 changed files with 6 additions and 9 deletions

View File

@@ -26,12 +26,9 @@
@link-clicked="currentPage = $event"> @link-clicked="currentPage = $event">
</pdf> --> </pdf> -->
</div> </div>
<div v-if="totalPages>initNum" class="pdf-footer pagination-div" > <div v-if="totalPages>initNum && moreState == 1" class="pagination-div" style="margin-bottom: 20px;">
<!-- <el-button icon="el-icon-arrow-left" @click="prePage('footer')" :disabled="loadedRatio !== 1"></el-button> <!-- <el-button type="primary" @click="clickMore()" >加载更多</el-button> -->
<span v-if="loadedRatio !== 1" style="margin:0 10px;">0 / 0</span> <span class="pag-text" @click="clickMore()" style="cursor: pointer;">加载更多</span>
<span v-else style="margin:0 10px;">{{ currentPage }} / {{ pageCount }}</span>
<el-button @click="nextPage('footer')" :disabled="loadedRatio !== 1" icon="el-icon-arrow-right"></el-button> -->
<el-button type="primary" @click="clickMore()" v-if="moreState == 1">加载更多</el-button>
</div> </div>
<!-- <div v-if="likeBox" class="xcontent postfixt-bot"> <!-- <div v-if="likeBox" class="xcontent postfixt-bot">
<div class="postfixt-bot-box"> <div class="postfixt-bot-box">
@@ -254,7 +251,7 @@ export default {
//border: 1px solid #dfdfdf; //border: 1px solid #dfdfdf;
//background: #dfdfdf; //background: #dfdfdf;
text-align: center; text-align: center;
line-height: 40px;
} }
/* ------------------- 进度条 ------------------- */ /* ------------------- 进度条 ------------------- */
//类名:隐藏到显示过程所需要的时间 //类名:隐藏到显示过程所需要的时间

View File

@@ -419,7 +419,7 @@ export default {
} }
.postfixt-bot{ .postfixt-bot{
height: 60px; height: 60px;
margin-top: 10px; //margin-top: 10px;
line-height: 60px; line-height: 60px;
// background-color: #fff; // background-color: #fff;
// border: 1px solid #eee; // border: 1px solid #eee;
@@ -542,7 +542,7 @@ export default {
// margin: 15px 0; // margin: 15px 0;
background-color: #f5f7fa; background-color: #f5f7fa;
min-height: 300px; min-height: 300px;
padding: 0px 0px 10px 0px; padding: 0px 0px 0px 0px;
.content { .content {
padding: 10px 0; padding: 10px 0;
line-height: 25px; line-height: 25px;