Authored by ccbikai

Merge branch 'develop' of git.yoho.cn:fe/yohoblk-wap into develop

... ... @@ -19,6 +19,7 @@
</div>
</div>
</div>
<div v-if="!scrollDisabled" class="is-loading">loading...</div>
</template>
<style>
.editorial-box {
... ... @@ -76,6 +77,12 @@
}
}
}
.is-loading {
font-size: 32px;
text-align: center;
padding: 16px 0;
}
</style>
<script>
const util = require('common/util');
... ... @@ -116,7 +123,7 @@
channel: this.channel
}
}).done(result => {
if (result.code === 200) {
if (result.code === 200 && result.data.list.length > 0) {
if (this.editorialList.length > 0 && result.data.list.length > 0) {
this.$set('editorialList', this.editorialList.concat(result.data.list));
} else if (result.data.list.length > 0) {
... ...