From f85bb63bb0b9a7a7dde7c34fb87f1da34f3316ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E7=A3=8A?= <hanlei001@wondertek.com.cn>
Date: Wed, 28 Jul 2021 14:12:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95->=E6=89=80=E6=9C=89=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 调整大量vif标签写法
2. 更改目录结构，调整类型文件，组件文件位置
3. 更改组件名
4. 调整接口类型
---
 src/api/order/order.ts                        | 13 +++--
 .../OrderTable/index.vue}                     |  2 +-
 .../allOrder.ts => model/order/AllOrder.ts}   |  0
 .../AllOrderTable.vue}                        | 51 +++++++++++--------
 .../{ => compontents}/FilterForm.vue          |  2 +-
 src/views/order/all-order/index.vue           |  8 +--
 6 files changed, 46 insertions(+), 30 deletions(-)
 rename src/{views/order/all-order/Table.vue => components/OrderTable/index.vue} (98%)
 rename src/{views/order/all-order/allOrder.ts => model/order/AllOrder.ts} (100%)
 rename src/views/order/all-order/{OrderTable.vue => compontents/AllOrderTable.vue} (80%)
 rename src/views/order/all-order/{ => compontents}/FilterForm.vue (99%)

diff --git a/src/api/order/order.ts b/src/api/order/order.ts
index e6c21ea..4d27aac 100644
--- a/src/api/order/order.ts
+++ b/src/api/order/order.ts
@@ -1,9 +1,16 @@
 import request from '@/utils/request'
+import { ParamsData, orderTableRes } from '@/model/order/AllOrder'
+
+// 枚举接口地址
 
 enum Api {
   ORDER_TABLE = '/api/order/page',
 }
 
-// 获取订单表格数据
-
-export const getOrderTableData = (data: any) => request.get(Api.ORDER_TABLE, data)
+/**
+ * @description: 获取订单表格数据
+ * @param {ParamsData} data
+ * @return {orderTableRes}
+ */
+export const getOrderTableData = (data: ParamsData) =>
+  request.get<orderTableRes>(Api.ORDER_TABLE, data)
diff --git a/src/views/order/all-order/Table.vue b/src/components/OrderTable/index.vue
similarity index 98%
rename from src/views/order/all-order/Table.vue
rename to src/components/OrderTable/index.vue
index b8fbf66..f85301f 100644
--- a/src/views/order/all-order/Table.vue
+++ b/src/components/OrderTable/index.vue
@@ -32,7 +32,7 @@
         </li>
       </div>
     </ul>
-    <div v-if="tableData?.length == 0" class="table-nodata">
+    <div v-if="!tableData.length" class="table-nodata">
       <img class="nodata-img" src="../../../assets/icons/table-nodata.svg" alt="" />
       <span class="nodata-text">暂无数据</span>
     </div>
diff --git a/src/views/order/all-order/allOrder.ts b/src/model/order/AllOrder.ts
similarity index 100%
rename from src/views/order/all-order/allOrder.ts
rename to src/model/order/AllOrder.ts
diff --git a/src/views/order/all-order/OrderTable.vue b/src/views/order/all-order/compontents/AllOrderTable.vue
similarity index 80%
rename from src/views/order/all-order/OrderTable.vue
rename to src/views/order/all-order/compontents/AllOrderTable.vue
index 516c235..4644bdf 100644
--- a/src/views/order/all-order/OrderTable.vue
+++ b/src/views/order/all-order/compontents/AllOrderTable.vue
@@ -12,12 +12,12 @@
       </div>
     </div>
     <div class="table-contain">
-      <Table :columns="columns" :row-top="rowTop" :table-data="tableData">
+      <OrderTable :columns="columns" :row-top="rowTop" :table-data="tableData">
         <template #payMethod="{ data }">
-          <span v-if="data === 1" class="alipay-color"> <SafetyOutlined />支付宝支付</span>
-          <span v-else-if="data === 2" class="wechat-color"> <SafetyOutlined />微信支付</span>
-          <span v-else-if="data === 3" class="bank-color"> <SafetyOutlined />银联支付</span>
-          <span v-else>其他</span>
+          <span :style="{ color: orderPayMethod[data || 0].color }">
+            <SafetyOutlined />
+            {{ orderPayMethod[data || 0].text }}
+          </span>
         </template>
         <template #productName="{ data }">
           <div class="frist-td">
@@ -30,25 +30,15 @@
           </div>
         </template>
         <template #rightsProtectionStatus="{ data }">
-          <span v-if="data.rightsProtectionStatus === 1">未维权</span>
-          <span v-else-if="data.rightsProtectionStatus === 2">维权中</span>
-          <span v-else-if="data.rightsProtectionStatus === 3">维权结束</span>
-          <span v-else>无售后数据</span>
+          <span>{{ orderRights[data.rightsProtectionStatus || 0] }}</span>
         </template>
         <template #status="{ data }">
-          <span v-if="data.status === 1">待付款</span>
-          <span v-else-if="data.status === 2">待发货</span>
-          <span v-else-if="data.status === 3">已发货</span>
-          <span v-else-if="data.status === 4">已完成</span>
-          <span v-else-if="data.status === 5">已关闭</span>
-          <span v-else-if="data.status === 6">售后中</span>
-          <span v-else-if="data.status === 7">退款中</span>
-          <span v-else-if="data.status === 8">订单关闭</span>
+          <span>{{ orderStatus[data.status || 0] }}</span>
         </template>
         <template #paidAmount="{ data }">
           <span>￥{{ data.paidAmount }}</span>
         </template>
-      </Table>
+      </OrderTable>
       <div class="table-bottom">
         <a-pagination
           v-model:current="pageParams.current"
@@ -69,13 +59,13 @@
 
 <script lang="ts">
 import { defineComponent, reactive, inject, watch, toRefs } from 'vue'
-import { ParamsData, tableColumns } from './allOrder.js'
+import { ParamsData, tableColumns } from '../allOrder.js'
 import { SafetyOutlined } from '@ant-design/icons-vue'
-import Table from './Table.vue'
+import OrderTable from '../../../../components/OrderTable/index.vue'
 
 export default defineComponent({
   components: {
-    Table,
+    OrderTable,
     SafetyOutlined,
   },
   props: {
@@ -98,6 +88,25 @@ export default defineComponent({
         { label: '售后中', key: 6 },
         { label: '退款中', key: 7 },
       ],
+      orderPayMethod: [
+        { text: '未查询到支付信息', color: 'red' },
+        { text: '支付宝支付', color: '#3a78f6' },
+        { text: '微信支付', color: '#63c742' },
+        { text: '银联支付', color: '#ce4646' },
+        { text: '其他', color: '#efefef' },
+      ],
+      orderStatus: [
+        '未获取到订单状态',
+        '待付款',
+        '待发货',
+        '已发货',
+        '已完成',
+        '已关闭',
+        '售后中',
+        '退款中',
+        '订单关闭',
+      ],
+      orderRights: ['未获取到售后信息', '未维权', '维权中', '维权结束'],
       activeKey: undefined,
       tableData: [],
       total: 0,
diff --git a/src/views/order/all-order/FilterForm.vue b/src/views/order/all-order/compontents/FilterForm.vue
similarity index 99%
rename from src/views/order/all-order/FilterForm.vue
rename to src/views/order/all-order/compontents/FilterForm.vue
index bc06214..29bc982 100644
--- a/src/views/order/all-order/FilterForm.vue
+++ b/src/views/order/all-order/compontents/FilterForm.vue
@@ -84,7 +84,7 @@
 <script lang="ts">
 import { Moment } from 'moment'
 import { defineComponent, inject, ref, watch } from 'vue'
-import { ParamsData } from './allOrder'
+import { ParamsData } from '../allOrder'
 
 export default defineComponent({
   emits: ['searchTable'],
diff --git a/src/views/order/all-order/index.vue b/src/views/order/all-order/index.vue
index 3ff9ecd..854a680 100644
--- a/src/views/order/all-order/index.vue
+++ b/src/views/order/all-order/index.vue
@@ -1,20 +1,20 @@
 <template>
   <div class="app-all-order">
     <FilterForm @searchTable="getOrderTable" />
-    <OrderTable :table-res="orderTableRes" @getTable="getOrderTable" />
+    <AllOrderTable :table-res="orderTableRes" @getTable="getOrderTable" />
   </div>
 </template>
 
 <script lang="ts">
 import { defineComponent, reactive, provide, onMounted, toRefs } from 'vue'
 import { getOrderTableData } from '../../../api/order/order'
-import FilterForm from './FilterForm.vue'
-import OrderTable from './OrderTable.vue'
+import FilterForm from './compontents/FilterForm.vue'
+import AllOrderTable from './compontents/AllOrderTable.vue'
 
 export default defineComponent({
   components: {
     FilterForm,
-    OrderTable,
+    AllOrderTable,
   },
   setup() {
     const state = reactive({
-- 
Gitee