Przeglądaj źródła

fix: 请求loading

刘秀芳 2 dni temu
rodzic
commit
0b24e21ad1

+ 2 - 3
src/views/old_mini/modify_work/reviewWork.vue

@@ -3,7 +3,6 @@
         <custom-header name="农事详情" isGoBack @goback="handleClose"></custom-header>
         <div
             class="work-content recheck-title"
-            :class="{ 'no-bottom': curRole == '0' && (!workItem.reviewImage || !workItem.reviewImage.length) }"
             v-loading="loading"
         >
             <div class="tabs-content-item">
@@ -57,13 +56,13 @@
                 <div class="info-box subject-content">
                     <div class="subject-box">
                         <div class="subject-item cost-l">
-                            <img class="subject-img" :src="workItem.agriculturalIcon" alt="" />
+                            <img class="subject-img" :src="workItem.agriculturalIcon || 'https://birdseye-img.sysuimars.com/dinggou-mini/defalut-icon.png'" alt="" />
                             <div class="subject-tag">
                                 {{ workItem.serviceMain }}
                             </div>
                         </div>
                         <div class="subject-item">
-                            <img class="subject-img" :src="workItem.executorIcon" alt="" />
+                            <img class="subject-img" :src="workItem.executorIcon || 'https://birdseye-img.sysuimars.com/dinggou-mini/defalut-icon.png'" alt="" />
                             <div class="subject-tag">
                                 {{ workItem.executeName }}
                             </div>

+ 8 - 7
src/views/old_mini/task_condition/components/interact.vue

@@ -138,7 +138,7 @@ const taskCounts = ref([0, 0, 0]);
 // 当前选中的筛选索引
 const activeIndex = ref(2);
 const noData = ref(false);
-const loading = ref(false);
+const loading = ref(true);
 // 分页相关
 const page = ref(0);
 const limit = ref(10);
@@ -236,12 +236,6 @@ async function getSimpleList(isLoadMore = false) {
 
     try {
         const { data } = await VE_API.home.listUnansweredFarms(params);
-        
-        if (!isLoadMore) {
-            loading.value = false;
-        } else {
-            loadingMore.value = false;
-        }
 
         if (data && data.length > 0) {
             // 为每个item初始化timelineList
@@ -287,6 +281,13 @@ async function getSimpleList(isLoadMore = false) {
                 noData.value = true;
             }
         }
+
+        // 数据处理完成后再设置loading为false
+        if (!isLoadMore) {
+            loading.value = false;
+        } else {
+            loadingMore.value = false;
+        }
     } catch (error) {
         console.error("获取任务列表失败:", error);
         if (!isLoadMore) {