2 Commits c4da4f4436 ... d3d381e882

Author SHA1 Message Date
  wenjie d3d381e882 Merge branch 'wj' 1 week ago
  Sheep 6224d532c0 fix(order): 优化售后订单及退款记录展示逻辑 1 month ago

+ 0 - 5
src/router/elegant/routes.ts

@@ -1,8 +1,3 @@
-/* eslint-disable */
-/* prettier-ignore */
-// Generated by elegant-router
-// Read more: https://github.com/soybeanjs/elegant-router
-
 import type { GeneratedRoute } from '@elegant-router/types';
 
 export const generatedRoutes: GeneratedRoute[] = [

+ 7 - 7
src/views/order-manage/after-sales-order/index.vue

@@ -20,8 +20,8 @@ import {
 } from '../normal-order/normal-order';
 
 const route = useRoute();
-
 const router = useRouter();
+const queryOrderNumber = Array.isArray(route.query.orderNumber) ? route.query.orderNumber[0] : route.query.orderNumber;
 // const ShipmentModal = useTemplateRef('Shipment');
 const columns: NaiveUI.TableColumn<Api.delivery.deliveryOrder>[] = [
   {
@@ -160,17 +160,17 @@ function handleAfterSalesOrderDetail(row: Api.delivery.deliveryOrder) {
   });
 }
 
-onMounted(() => {
-  setTimeout(async () => {
-    await setFieldsValue({ orderNumber: route.query.orderNumber });
-    refresh();
-  }, 1000);
+onMounted(async () => {
+  if (queryOrderNumber) {
+    await setFieldsValue({ orderNumber: queryOrderNumber });
+  }
+  refresh();
 });
 </script>
 
 <template>
   <LayoutTable>
-    <ZTable :columns="columns" :api="fetchGetAfterSalesOrderList" @register="registerTable">
+    <ZTable :columns="columns" :api="fetchGetAfterSalesOrderList" :immediate="false" @register="registerTable">
       <template #op="{ row }">
         <NButton size="small" type="primary" ghost @click="handleAfterSalesOrderDetail(row)">售后详情</NButton>
         <NButton size="small" type="primary" ghost @click="handleOrderDetail(row)">订单详情</NButton>

+ 13 - 7
src/views/order-manage/order-detail/index.vue

@@ -309,13 +309,18 @@ onMounted(async () => {
     handleShip();
   }
 });
-function getRefundRecordText() {
+function getRefundRecordCount() {
   const info = orderInfo.value as any;
-  if (!info) return '暂无';
-  const count =
+  if (!info) return 0;
+  return (
     Number(info.backendOrderRefundLogCount) ||
     (Array.isArray(info.refundOrderList) ? info.refundOrderList.length : 0) ||
-    0;
+    0
+  );
+}
+
+function getRefundRecordText() {
+  const count = getRefundRecordCount();
   return count > 0 ? `${count}条` : '暂无';
 }
 </script>
@@ -399,8 +404,9 @@ function getRefundRecordText() {
             </NButton>
           </div>
 -->
-          <div>
-            退款记录:{{ getRefundRecordText() }}
+          <div class="flex items-center">
+            <span>退款记录:{{ getRefundRecordText() }}</span>
+            <!-- v-if="getRefundRecordCount() > 0" -->
             <NButton
               v-if="
                 Number(orderInfo.backendOrderRefundLogCount) ||
@@ -411,7 +417,7 @@ function getRefundRecordText() {
               type="primary"
               @click="handleSaleOrder(orderInfo)"
             >
-              查看
+              查看详情
             </NButton>
           </div>
         </NCard>