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

pages/index/index.vue

@@ -178,9 +178,9 @@
         graphicLstApi(this.where).then(res => {
           this.cateGoods.push(...res.data.list)
           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
         })
       },
       /*获取分类列表*/

pages/short_video/nvueSwiper/index.nvue

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