Merge branch 'master' of ssh://8.134.10.79:222/Leadfyy.co/ec.uniapp-master

pages/shop/shopdetail.vue

@@ -89,8 +89,7 @@
 			<swiper :style="{height: '800rpx', width: '750rpx'}" :current="current" @change="swiperChange">
 				<swiper-item v-for="(tabItem, tabIndex) in tab_list" :key="tabIndex">
 					<scroll-view class="com" :scroll-y="true" :refresher-enabled="true" :refresher-triggered="tabItem.isRefresher" @scrolltolower="onScrolltolower" @refresherrefresh="onRefresherrefresh">
-						<view class="lf-m-t-20"></view>
-						<lf-waterfall :ifsale="false" :list="tabItem.list" :listlength="tab_list.length" :tabindex='tabIndex' ref="uWaterfallFather"></lf-waterfall>
+						<shop-list :list="tabItem.list"></shop-list>
 						<view class="loading-more lf-m-b-10">
 							<text :class="{'loading-more-text': tabItem.loadingClass}" v-if="tabItem.list.length">{{tabItem.loadingText}}</text>
 							<lf-nocontent src="/static/images/empty.png" v-else></lf-nocontent>
@@ -106,10 +105,10 @@
 </template>
 
 <script>
-	import lfWaterfall from '@/components/lf-waterfall-shopdetails/lf-waterfall.vue';
+	import shopList from '@/components/shopList/shopList.vue';
 	export default {
 		components: {
-			lfWaterfall
+			shopList
 		},
 		data() {
 			return {
@@ -138,6 +137,8 @@
 				}else {
 					this.sort = 'desc';
 				}
+				let tab_item = this.tab_list[this.current];
+				tab_item.list = [];
 				this.getData();
 			},
 			// 切换商品收藏
@@ -262,7 +263,9 @@
 						}
 					})
 					if(tab_item.page == 1){
+						console.log('当前页数',tab_item.page);
 						tab_item.list = list;
+						console.log(tab_item.list)
 					}else{
 						tab_item.list.push(...list);
 					}
@@ -303,7 +306,6 @@
 				tab_item.loadingText = '正在加载中';
 				tab_item.list = [];
 				this.$set(this.tab_list, this.current, tab_item);
-				this.$refs.uWaterfallFather[this.current].clear();
 			}
 		},
 		onShareAppMessage(){
@@ -368,7 +370,7 @@
 		width: 100%;
 		height: 100%;
 		box-sizing: border-box;
-		padding: 0rpx 28rpx;
+		// padding: 0rpx 28rpx;
 	}
 	.shop-head {
 		width: 100%;

pages/user/my/myEventRegistrationList.vue

@@ -125,6 +125,7 @@
 			},
 			getMyActivity(options = {}) {
 				let tab_item = this.tab_list[this.tab_current];
+				console.log(tab_item.state)
 				this.$http
 				    .get({
 				        api: 'api/activity/my',