adv 7.30

components/mine/address-active/index.vue

@@ -118,19 +118,11 @@ export default {
 				// latitude,
 			}).then((res)=>{
 				if (res.errCode == 0) {
-					uni.redirectTo({
-						url: '/pageE/more/Address'
-					});
-					// this.$refs.uToast.show({
-					// 	title: res.message,
-					// 	type: 'success',
-					// 	// url: '/pageE/more/Address',
-					// 	callback() {
-					// 		uni.redirectTo({
-					// 			url: '/pageE/more/Address'
-					// 		});
-					// 	}
-					// })
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'success',
+						back: true,
+					})
 				} else {
 					this.showToast(res.message, 'warning');
 				}

components/shop/list/index.vue

@@ -13,7 +13,7 @@
 			</swiper-item>
 		</swiper>
 		<!-- 加载更多 -->
-		<u-loadmore :status="loadStatus" bgColor="#FFF" margin-top="20" margin-bottom="20"></u-loadmore>
+		<u-loadmore :status="loadStatus" bgColor="#FFF" margin-top="20" margin-bottom="20" @loadmore="loadMore" v-if="goodsList.length>=pageSize"></u-loadmore>
     </view>
 </template>
 <script>
@@ -22,6 +22,7 @@ export default {
 	name:"list",
 	data() {
 		return {
+			pageSize: 12,
 			current: -1,
 			swiperCurrent: 0,
 			goodsList: [],
@@ -60,7 +61,7 @@ export default {
 					this.page--;
 					this.loadStatus = 'nomore';
 				} else {
-					this.loadStatus = 'loading';
+					this.loadStatus = 'loadmore';
 				}
 			}).catch(() => {
 				this.loadStatus = "nomore";
@@ -82,6 +83,7 @@ export default {
 				gc_id: gc_id,
 			})
 			if (res.errCode == 0) {
+				this.timer = true;
 				if(reload) this.goodsList = res.data.goodsList;
 				else this.goodsList.push(...res.data.goodsList);
 				// console.log(this.goodsList);