|
|
@@ -96,14 +96,13 @@
|
|
|
{{ item.title }}
|
|
|
</div>
|
|
|
</div>
|
|
|
- <el-empty v-if="goodsList.length == 0" :image-size="200"></el-empty>
|
|
|
+ <el-empty v-if="giftList.length == 0" :image-size="200"></el-empty>
|
|
|
<div v-else class="list-container">
|
|
|
<div class="prize-list">
|
|
|
- <div v-for="(item, index) in goodsList" :key="index" class="prize-card prize-item">
|
|
|
+ <div v-for="(item, index) in giftList" :key="index" class="prize-card prize-item">
|
|
|
<div class="img-container">
|
|
|
<el-image :src="item.imgUrl" :preview-src-list="[item.imgUrl]"
|
|
|
class="prize-img"></el-image>
|
|
|
- <!-- <img :src="item.imgUrl" alt="prize" class="prize-img"> -->
|
|
|
</div>
|
|
|
<div class="content">
|
|
|
<h3 :title="item.name" class="title">{{ item.name }}</h3>
|
|
|
@@ -201,7 +200,8 @@ export default {
|
|
|
curChosed: '',
|
|
|
activeName: 'goodsNotice',
|
|
|
noticeContent: '',
|
|
|
- goodsList: []
|
|
|
+ goodsList: [],
|
|
|
+ giftList:[],
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
@@ -221,7 +221,11 @@ export default {
|
|
|
},
|
|
|
// 保存滚动值，这是兼容的写法
|
|
|
handleScroll () {
|
|
|
- if((document.documentElement.scrollTop + window.innerHeight) == document.body.offsetHeight){
|
|
|
+ const bottomHight = document.documentElement.scrollTop + window.innerHeight;
|
|
|
+ const offsetHeight = document.body.offsetHeight;
|
|
|
+ console.log(bottomHight,'-----11');
|
|
|
+ console.log(offsetHeight,'-----22');
|
|
|
+ if(bottomHight == offsetHeight){
|
|
|
if(this.page > this.pages){
|
|
|
return
|
|
|
}else{
|
|
|
@@ -344,7 +348,7 @@ export default {
|
|
|
|
|
|
festivalList({ welfareId: this.curChosed }).then(response => {
|
|
|
console.log(response.data.data);
|
|
|
- this.goodsList = response.data.data;
|
|
|
+ this.giftList = response.data.data;
|
|
|
|
|
|
})
|
|
|
}
|
