接口联调

components/pages/activityCalendar/index.vue

@@ -26,7 +26,9 @@ import { ref, onMounted } from 'vue';
 
 const weeks = ['日', '一', '二', '三', '四', '五', '六'];
 const calendars = ref([]);
-const calendarsCopy = ref([]);
+const calendarsCopy = ref([]);
+const startDay = ref('')
+const endDay = ref('')
 
 const createCalendar = (months) => {
 	return new Promise((resolve,reject)=>{
@@ -94,16 +96,21 @@ const createCalendar = (months) => {
 const setStartEndDay = type => {//type 0：全部时间 1：一周内 2：一月内 3：本周末
 	let d = new Date();
 	let s = new Date().Format('yyyy-MM-dd');
+	startDay.value = s;
 	let e = null;
 	switch(type){
 		case 0:
 			s = e = '';
+			startDay.value = '';
+			endDay.value = '';
 			break;
 		case 1:
 			e = new Date(d.setDate(d.getDate(s)+6)).Format('yyyy-MM-dd');
+			endDay.value = e;
 			break;
 		case 2:
 			e = new Date(d.setDate(d.getDate(s)+30)).Format('yyyy-MM-dd');
+			endDay.value = e;
 			break;
 		case 3:
 			let sw = new Date(s).getDay();
@@ -114,6 +121,8 @@ const setStartEndDay = type => {//type 0：全部时间 1：一周内 2：一月
 				s = new Date(d.setDate(d.getDate(s)+(6-sw))).Format('yyyy-MM-dd');
 				e = new Date(d.setDate(d.getDate(s)+1)).Format('yyyy-MM-dd');
 			}
+			startDay.value = s;
+			endDay.value = e;
 			break;
 	}
 	calendarsCopy.value = JSON.parse(JSON.stringify(calendars.value));
@@ -138,7 +147,9 @@ onMounted(async () => {
 });
 
 defineExpose({
-	setStartEndDay
+	setStartEndDay,
+	startDay,
+	endDay
 })
 </script>
 

pages/home.vue

@@ -47,7 +47,7 @@
 				<page-empty text="暂无公益活动"></page-empty>
 			</view>
 		</view>
-		<login-register></login-register>
+		<login-register @loginSucc="loginSucc"></login-register>
 		<CusTabbar :tabbarIndex="0"></CusTabbar>
 	</view>
 </template>
@@ -56,8 +56,10 @@
 	import CusTabbar from '@/components/CusTabbar/index.vue'
 	import NonprofitActivety from '@/components/pages/nonprofitActivety/index.vue'
 	import PageEmpty from '@/components/pageEmpty/index.vue'
-	import { ref, getCurrentInstance, onMounted } from 'vue'
+	import { ref, getCurrentInstance, onMounted, watch } from 'vue'
 	const { proxy } = getCurrentInstance()
+	import { useUserStore } from '@/common/stores/user';
+	const userStore = useUserStore();
 	
 	const bannarList = ref([])
 	const bannarOrigin = ref([])
@@ -130,6 +132,10 @@
 		  };
 	}
 	
+	watch(()=>userStore.token,newVal=>{
+		getActivityList('')
+	})
+	
 	onMounted(()=>{
 		getSwiperList()
 		getTypeList()

pages/my.vue

@@ -92,7 +92,7 @@
 			</view>
 		</view>
 		<CusTabbar :tabbarIndex="2"></CusTabbar>
-		<login-register @loginSucc="loginSucc"></login-register>
+		<login-register></login-register>
 	</view>
 </template>
 

pagesHome/allActivity.vue

@@ -94,6 +94,8 @@
 		limit:10,
 		userId:'',
 		activityName:'',
+		beginTime:'',
+		endTime:'',
 		categoryId:'',
 		districtId:''
 	})
@@ -185,6 +187,10 @@
 	const timeConfirm = () => {
 		time.value = timeText.value;
 		timeShow.value = false;
+		queryParams.value.beginTime = proxy.$refs.acRef.startDay;
+		queryParams.value.endTime = proxy.$refs.acRef.endDay;
+		initList()
+		getActivityList()
 	}
 	
 	const areaConfirm = (data) => {
@@ -227,7 +233,7 @@
 			if(res.code!==0) return proxy.$showToast(res.msg)
 			list.value = [...list.value,...res.data.list];
 			queryParams.value.page++;
-			if(list.value>=res.data.total) isOver.value = true
+			if(res.data.list.length===0) isOver.value = true
 		})
 	}
 	

pagesMy/familyMember.vue

@@ -70,7 +70,7 @@
 				l.idCardCopy = l.idCard.replace(/^(\d{6})(\d{8})(\d{3}[\dX])$/i,'$1********$3')
 			})
 			queryParams.value.page++;
-			if(list.value.length>=res.data.total) isOver.value = true;
+			if(res.data.list.length===0) isOver.value = true
 		})
 	}