Sfoglia il codice sorgente

fix: 修复问题

chenjj 4 mesi fa
parent
commit
8c024c5c26

+ 17 - 2
pages/classify.vue

@@ -107,13 +107,17 @@ const column = computed(() => {
 const pages = ref({
 	current: 1,
 	pageSize: 10,
-	total: 0,
+	total: null,
 })
 async function getList(type) {
+	console.log("TCL: getList -> type", type)
   try {
   
     console.log(data.value.length, pages.value.total);
-    
+    if(type === 'top'){
+      data.value = [];
+      pages.value.total = 0;
+    }
     if(type ==='bottom'  ){
       if(data.value.length < pages.value.total){
         listRef.value && listRef.value.handleBottom(true);
@@ -128,6 +132,7 @@ async function getList(type) {
       })
     }
   
+    
     const listApi = userType === 1 ? userMainOrderList : getVolunteerOrderList
     const res = await listApi({
       orderStatus: tab.value,
@@ -138,6 +143,8 @@ async function getList(type) {
     pages.value.total = res.total;
 
     type ==='bottom'&& listRef.value && listRef.value.handleBottom(false);
+
+ 
   } catch (error) {
     console.log('error', error)
     uni.showToast({
@@ -148,6 +155,14 @@ async function getList(type) {
     if(listRef.value && listRef.value.handleRefreshing && type ==='top'){
       listRef.value.handleRefreshing(false)
     }
+
+
+    setTimeout(() => {
+      if (data.value.length === pages.value.total && pages.value.total > 0) {
+        listRef.value && listRef.value.handleBottom(false)
+      }
+    }, 500)
+  
     type !=='bottom' && uni.hideLoading()
   }
 }

+ 3 - 1
pages_classify/pages/handle/index.vue

@@ -85,7 +85,9 @@ const getOrderDetail = async () => {
         // const ad_res = await getAddress(res.data.addressId);
 
         let data = res.data.secondOrder;
-        detaile.value = { ...res.data.secondOrder, address:res.data.address.address,serveTimes:res.data.secondOrder.updateTime }
+        // detaile.value = { ...res.data.secondOrder, address:res.data.address.address,serveTimes:res.data.secondOrder.updateTime }
+        detaile.value = { ...res.data }
+
         if (data.orderStatus === '3') {
 
             orderStatus.value = true;

+ 2 - 1
pages_classify/pages/order/index.vue

@@ -141,7 +141,8 @@ const getOrderDetail = async () => {
 		const res = await getVolunteerOrderInfo({ orderId: orderId.value });
 		// const ad_res = await getAddress(res.data.addressId);
 		// detaile.value = {...res.data.secondOrder,...res.data.address}
-		detaile.value = { ...res.data.secondOrder, address:res.data.address.address,serveTimes:res.data.secondOrder.updateTime }
+		// detaile.value = { ...res.data.secondOrder, address:res.data.address.address,serveTimes:res.data.secondOrder.updateTime }
+		detaile.value = { ...res.data }
 		// if (data.volunteerPicture) {
 		// 	fileList.value = data.volunteerPicture.split(',').map(item => {
 		// 		return { url: item }