修复bug

App.vue

@@ -58,7 +58,7 @@
 				}
 			})
 			this.refresh()
-			this.$store.dispatch('setActivityFn',true)
+			// this.$store.dispatch('setActivityFn',true)
 		},
 		methods:{
 			refresh(){

components/cm-module/cm-seller/home.vue

@@ -6,7 +6,7 @@
 		<view class="container-home tui-skeleton">
 			<view class="swiper-banner-box" >
 				<swiper class="tui-banner-swiper tui-banner tui-skeleton-fillet" :autoplay="true" :interval="5000" :duration="500"  @change="swiperChange" :circular="true">
-					<swiper-item v-for="(item,index) in bannerImageList" :key="index" @click.stop="handleBannerActivity(item,index)">
+					<swiper-item v-for="(item,index) in bannerImageList" :key="index">
 						<image :src="item" class="tui-slide-image" mode="scaleToFill"/>
 					</swiper-item>
 				</swiper>
@@ -120,7 +120,7 @@
 			</view>	
 		</view>
 		<!-- 活动弹窗 -->
-		<activityAlert :show="isActivity" @click="handleClick" @cancel="handleCancelClick"></activityAlert>
+		<!-- <activityAlert :show="isActivity" @click="handleClick" @cancel="handleCancelClick"></activityAlert> -->
 		<!-- 透明模态层 -->
 		<modal-layer v-if='modallayer'></modal-layer>
 	</view>

components/cm-module/listTemplate/classifyProductList.vue

@@ -106,9 +106,6 @@
 				this.clubStatus = resolve.clubStatus
 				this.userID = resolve.userID ? resolve.userID : '';
 				this.userIdentity = resolve.userIdentity
-				console.log(this.clubStatus)
-				console.log(this.userID)
-				console.log(this.userIdentity)
 				this.getListFromServer();
 			}).catch(error =>{
 				this.getListFromServer();
@@ -119,7 +116,7 @@
 		},
 		methods:{
 			toLower() {
-				if(this.totalPage>this.listData.length && this.pullFlag) {
+				if(this.hasNextPage && this.pullFlag) {
 					this.getListFromServer(true);
 				}
 			},
@@ -163,6 +160,7 @@
 						} else {
 							this.showLoading = true;
 							this.loadingNow = false;
+							this.loadingText = '已至底部';
 						}
 					} else {
 						if(!loadMore) { this.showEmpty = true; }

pages/tabBar/home/home.vue

@@ -6,7 +6,7 @@
 		<view class="container-home tui-skeleton">
 			<view class="swiper-banner-box" >
 				<swiper class="tui-banner-swiper tui-banner tui-skeleton-fillet" :autoplay="true" :interval="5000" :duration="500"  @change="swiperChange" :circular="true">
-					<swiper-item v-for="(item,index) in bannerImageList" :key="index" @click.stop="handleBannerActivity(item,index)">
+					<swiper-item v-for="(item,index) in bannerImageList" :key="index">
 						<image :src="item" class="tui-slide-image" mode="scaleToFill"/>
 					</swiper-item>
 				</swiper>
@@ -138,7 +138,7 @@
 			</view>	
 		</view>
 		<!-- 活动弹窗 -->
-		<activityAlert :show="isActivity" @click="handleClick" @cancel="handleCancelClick"></activityAlert>
+		<!-- <activityAlert :show="isActivity" @click="handleClick" @cancel="handleCancelClick"></activityAlert> -->
 		<!-- 透明模态层 -->
 		<modal-layer v-if='modallayer'></modal-layer>
 	</view>