mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.excellentkk.cn/C.C/nk-shop2.0

Browse Source
This commit is contained in:
THK3121 2023-06-02 16:51:38 +08:00
commit 4460de9be4
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pages/index/index.vue
View File

@ -178,9 +178,9 @@
graphicLstApi(this.where).then(res => { graphicLstApi(this.where).then(res => {
this.cateGoods.push(...res.data.list) this.cateGoods.push(...res.data.list)
if (res.data.list.length < this.where.limit) { if (res.data.list.length < this.where.limit) {
this.status == 'nomore' this.status = 'nomore'
} }
res.data.list.length <= 0 ? this.emptyShow = true : this.emptyShow = false if (this.where.page == 1 && res.data.list.length <= 0) this.emptyShow = true
}) })
}, },
/*获取分类列表*/ /*获取分类列表*/

8
pages/short_video/nvueSwiper/index.nvue
View File

@ -415,9 +415,11 @@
this.dataList[new_k].state = 'play' this.dataList[new_k].state = 'play'
this.dataList[new_k].isplay = false this.dataList[new_k].isplay = false
this.dataList[new_k].playIng = true this.dataList[new_k].playIng = true
if (this.currentNav !== 3) {
setTimeout(() => { setTimeout(() => {
uni.createVideoContext(this.dataList[new_k].community_id + '' + new_k, this).play() uni.createVideoContext(this.dataList[new_k].community_id + '' + new_k, this).play()
}, 250) }, 250)
}
this.videoShare(this.dataList[new_k]) this.videoShare(this.dataList[new_k])
// #endif // #endif
} }
@ -693,11 +695,9 @@
}, 200) }, 200)
}, },
change(event) { change(event) {
console.log('eeeee', event.detail.current);
this.k = event.detail.current; this.k = event.detail.current;
this.posterImage = false; this.posterImage = false;
this.communityId = this.dataList[this.k]['community_id']; this.communityId = this.dataList[this.k]['community_id'];
}, },
animationfinish(event) { animationfinish(event) {
// 1.这里进行判断，如果是最后一个视频就进入 get() 方法加载视频进入列表 // 1.这里进行判断，如果是最后一个视频就进入 get() 方法加载视频进入列表
@ -968,10 +968,6 @@
* 生成海报 * 生成海报
*/ */
async goPoster() { async goPoster() {
// if (!this.isLogin) {
// console.log(this.downloadFilePromotionCode(this.dataList[this.k]['community_id']));
// // this.downloadFilePromotionCode(this.videoID);
// }
let that = this; let that = this;
if (!that.isLogin) {} if (!that.isLogin) {}
let type; let type;