แก้ไข กล่องข้อความ

src/modules/01_dashboard/views/Dashboard.vue

@@ -87,35 +87,36 @@ onMounted(async () => {
 });
 const fetchlistInbox = async (index: number) => {
   index === 1 && showLoader();
-  await http
+  index != 0 &&
-    .get(config.API.msgInbox + `?page=${index}&pageSize=${10}`)
+    (await http
-    .then((res) => {
+      .get(config.API.msgInbox + `?page=${index}&pageSize=${10}`)
-      let data = res.data.result.data;
+      .then((res) => {
-      totalInbox.value = res.data.result.total;
+        let data = res.data.result.data;
-      let listItem: any = [];
+        totalInbox.value = res.data.result.total;
-      data.map((e: any) => {
+        let listItem: any = [];
-        listItem.push({
+        data.map((e: any) => {
-          no: e.id ?? "",
+          listItem.push({
-          sender:
+            no: e.id ?? "",
-            e.createdFullName == "" || e.createdFullName == null
+            sender:
-              ? "เจ้าหน้าที่"
+              e.createdFullName == "" || e.createdFullName == null
-              : e.createdFullName,
+                ? "เจ้าหน้าที่"
-          subject: e.subject ?? "",
+                : e.createdFullName,
-          timereceive: date2Thai(e.createdAt),
+            subject: e.subject ?? "",
-          body: e.body ?? "-",
+            timereceive: date2Thai(e.createdAt),
-          ratingModel: 0,
+            body: e.body ?? "-",
-          receiveDate: date2Thai(e.receiveDate),
+            ratingModel: 0,
-          payload: e.payload,
+            receiveDate: date2Thai(e.receiveDate),
+            payload: e.payload,
+          });
         });
-      });
+        inboxList.value.push(...listItem);
-      inboxList.value.push(...listItem);
+      })
-    })
+      .catch((err) => {
-    .catch((err) => {
+        console.log(err);
-      console.log(err);
+      })
-    })
+      .finally(() => {
-    .finally(() => {
+        hideLoader();
-      hideLoader();
+      }));
-    });
 };
 
 const transferToPage = (path?: string) => {
@@ -149,23 +150,16 @@ function updateModalDetail(val: boolean) {
 
 const scrollTargetRef = ref<any>(null);
 const totalInbox = ref<number>(0);
-function onLoad(index: number, done: any) {
+async function onLoad(index: number, done: any) {
+  const num = index === 1 ? 0 : index++;
+
   if (inboxList.value.length < totalInbox.value) {
     setTimeout(() => {
-      fetchlistInbox(index + 1);
+      fetchlistInbox(num);
       done();
     }, 2000);
   }
 }
-
-// function onLoadRef(index: number, done: any) {
-//   if (inboxList.value.length < totalInbox.value) {
-//     setTimeout(() => {
-//       fetchlistInbox(index + 1);
-//       done();
-//     }, 2000);
-//   }
-// }
 </script>
 
 <template>
@@ -294,8 +288,11 @@ function onLoad(index: number, done: any) {
                 </q-item-section>
               </q-item>
             </div>
-            <template v-slot:loading v-if="inboxList.length < totalInbox">
+            <template v-slot:loading>
-              <div class="row justify-center q-my-md">
+              <div
+                class="row justify-center q-my-md"
+                v-if="inboxList.length < totalInbox"
+              >
                 <q-spinner-dots color="primary" size="40px" />
               </div>
             </template>