From 566f9fb9efa7b2a6592df4cd9d4dfed88dc6e1cb Mon Sep 17 00:00:00 2001
From: zc <2064281269@qq.com>
Date: Wed, 12 Nov 2025 21:23:32 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/buyer.ts                              | 11 +++
 src/api/index.ts                              |  4 +-
 src/api/order.ts                              |  4 +-
 src/config/menuList.ts                        | 54 +++++++-------
 .../goods/commodity/detail-dialog/index.vue   |  2 +-
 .../commodity/detail-dialog/submit-method.ts  |  4 +-
 src/views/order/detail/index.vue              |  0
 src/views/test/demo/config.ts                 | 36 ++++++++++
 src/views/test/demo/index.vue                 | 72 +++++++++++++++++++
 9 files changed, 154 insertions(+), 33 deletions(-)
 create mode 100644 src/api/buyer.ts
 create mode 100644 src/views/order/detail/index.vue
 create mode 100644 src/views/test/demo/config.ts
 create mode 100644 src/views/test/demo/index.vue

diff --git a/src/api/buyer.ts b/src/api/buyer.ts
new file mode 100644
index 0000000..4f4634f
--- /dev/null
+++ b/src/api/buyer.ts
@@ -0,0 +1,11 @@
+const buyer = {
+  /**
+   * 买家管理
+   */
+  getBuyerList: ['/buyer/list'], // 买家列表
+  packOrder: ['/promoter/list'], // 买家推荐的所有用户
+  unpackOrder: ['/order/unpack'], // 取消打包
+  finishDeliver: ['/order/delivered'] // 妥投
+}
+
+export default buyer
diff --git a/src/api/index.ts b/src/api/index.ts
index 04b74cf..a9652ea 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -2,11 +2,13 @@ import request from '@/utils/request'
 import login from './login'
 import commodity from './commodity'
 import resource from './resource'
+import order from './order'
 
 const totalApiConfig = {
   login,
   commodity,
-  resource
+  resource,
+  order
 }
 
 Object.values(totalApiConfig).forEach((apiConfig) => {
diff --git a/src/api/order.ts b/src/api/order.ts
index b6f59ce..6210683 100644
--- a/src/api/order.ts
+++ b/src/api/order.ts
@@ -3,9 +3,9 @@ const order = {
    * 订单管理
    */
   getOrderList: ['/order/list'], // 获取订单管理
-  packOrder: ['/order/topack'], // 打包
+  packOrder: ['/order/pack'], // 打包
   unpackOrder: ['/order/unpack'], // 取消打包
-  unpackOrder: ['/order/delivered'] // 妥投
+  finishDeliver: ['/order/delivered'] // 妥投
 }
 
 export default order
diff --git a/src/config/menuList.ts b/src/config/menuList.ts
index b3e290c..f5a7fa0 100644
--- a/src/config/menuList.ts
+++ b/src/config/menuList.ts
@@ -16,24 +16,6 @@ export default [
     modifyTime: '2024-07-15 15:45:58',
     tag: null,
     childList: [
-      /*  {
-        id: 38,
-        resourceName: '首页商品',
-        resourceType: 1,
-        resourceCode: null,
-        path: '/goods/home-goods/index',
-        pid: 37,
-        resourceDesc: null,
-        tenantId: 2,
-        icon: '',
-        isCache: 1,
-        visible: 0,
-        sort: '1',
-        createTime: '2024-06-19 17:33:29',
-        modifyTime: '2024-06-19 17:56:01',
-        tag: null,
-        childList: []
-      }, */
       {
         id: 39,
         resourceName: '商品管理',
@@ -143,7 +125,7 @@ export default [
         tag: null,
         childList: []
       }
-      /*  {
+      /* {
         id: 42,
         resourceName: '协议模板',
         resourceType: 1,
@@ -160,15 +142,15 @@ export default [
         modifyTime: '2024-06-20 10:47:03',
         tag: null,
         childList: []
-      }
+      } */
     ]
   },
   {
     id: 43,
-    resourceName: '客户管理',
+    resourceName: '订单管理',
     resourceType: 0,
     resourceCode: null,
-    path: '/customer',
+    path: '/order',
     pid: 0,
     resourceDesc: null,
     tenantId: 2,
@@ -182,10 +164,10 @@ export default [
     childList: [
       {
         id: 44,
-        resourceName: '客户信息查询',
+        resourceName: '订单列表',
         resourceType: 1,
         resourceCode: null,
-        path: '/customer/userInfo/index',
+        path: '/order/list/index',
         pid: 43,
         resourceDesc: null,
         tenantId: 2,
@@ -197,8 +179,26 @@ export default [
         modifyTime: '2024-09-10 16:17:41',
         tag: null,
         childList: []
-      },
-      {
+      }
+      /*
+       {
+        id: 38,
+        resourceName: '首页商品',
+        resourceType: 1,
+        resourceCode: null,
+        path: '/goods/home-goods/index',
+        pid: 43,
+        resourceDesc: null,
+        tenantId: 2,
+        icon: '',
+        isCache: 1,
+        visible: 0,
+        sort: '1',
+        createTime: '2024-06-19 17:33:29',
+        modifyTime: '2024-06-19 17:56:01',
+        tag: null,
+        childList: []
+      }, {
         id: 45,
         resourceName: '客户详情',
         resourceType: 1,
@@ -449,7 +449,7 @@ export default [
         modifyTime: '2025-06-12 18:54:01',
         tag: null,
         childList: []
-      }*/
+      } */
     ]
   }
   /* {
diff --git a/src/views/goods/commodity/detail-dialog/index.vue b/src/views/goods/commodity/detail-dialog/index.vue
index cb47df9..1a3f06f 100644
--- a/src/views/goods/commodity/detail-dialog/index.vue
+++ b/src/views/goods/commodity/detail-dialog/index.vue
@@ -399,7 +399,7 @@ const onSubmit = () => {
     adminCategoryData.value,
     skuList.value
   )
-  //   if (msg) return ElMessage.error(msg)
+  if (msg) return ElMessage.error(msg)
   const params = handleGetSubmitParams(
     route.query.type === 'add',
     $dialog.value.data,
diff --git a/src/views/goods/commodity/detail-dialog/submit-method.ts b/src/views/goods/commodity/detail-dialog/submit-method.ts
index 4805b4b..35ca77f 100644
--- a/src/views/goods/commodity/detail-dialog/submit-method.ts
+++ b/src/views/goods/commodity/detail-dialog/submit-method.ts
@@ -72,7 +72,7 @@ export const handleValidFormData = (
   if (adminCategoryData.length === 0) {
     return '请添加商品属性'
   }
-  let msg = ''
+  /*  let msg = ''
   skuList.some((item) => {
     const nameMap = {
       stock: '库存',
@@ -94,7 +94,7 @@ export const handleValidFormData = (
     }
     return msg
   })
-  if (msg) return msg
+  if (msg) return msg */
   return ''
 }
 
diff --git a/src/views/order/detail/index.vue b/src/views/order/detail/index.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/views/test/demo/config.ts b/src/views/test/demo/config.ts
new file mode 100644
index 0000000..bc38106
--- /dev/null
+++ b/src/views/test/demo/config.ts
@@ -0,0 +1,36 @@
+export const orderStatusOptions = [
+  { label: '待支付', value: 'wait_pay' },
+  { label: '待发货', value: 'wait_shipping' },
+  { label: '已经发货', value: 'shipping' },
+  { label: '已接收', value: 'delivered' },
+  { label: '全部退款', value: 'all_refund' },
+  { label: '部分退款', value: 'part_refund' }
+]
+
+const configData = ref()
+export const initConfig = () => {
+  configData.value = pageConfig({
+    search: {
+      tradeorderIds: { label: '订单号' },
+      status: { label: '状态', el: 'select', options: orderStatusOptions }
+    },
+    table: {
+      index: { label: '序号' },
+      id: { label: '订单ID' },
+      tradeorderIds: { label: '订单号' },
+      productName: { label: '商品名称' },
+      buyerId: { label: '买家ID' },
+      status: {
+        label: '状态',
+        formatter: (row: any) => orderStatusOptions.find((item) => item.value === row.status)?.label
+      },
+      reverseStatus: { label: '逆向状态' },
+      btn: {
+        types: ['primary', 'warning', 'danger', 'success'],
+        names: ['详情', '打包并发货', '取消打包', '妥投'],
+        width: 230
+      }
+    }
+  })
+  return configData
+}
diff --git a/src/views/test/demo/index.vue b/src/views/test/demo/index.vue
new file mode 100644
index 0000000..a6d9976
--- /dev/null
+++ b/src/views/test/demo/index.vue
@@ -0,0 +1,72 @@
+<template>
+  <div>
+    <div id="order-list">
+      <search-module :search="search" :table="table" />
+      <table-module :table="table">
+        <template #status="{ row }">
+          <el-switch
+            v-model="row.status"
+            :active-value="'online'"
+            :inactive-value="'down'"
+            size="small"
+          />
+        </template>
+      </table-module>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { initConfig } from './config'
+
+/** 打包 */
+const onPack = async (row: any) => {
+  handleMessageBox({
+    msg: `是否确认打包?`,
+    success: api.order.packOrder.post!,
+    data: { id: row.id }
+  }).then(() => {
+    table.value.$onGetData(table.value, 1)
+  })
+}
+
+// 取消打包
+const onCancelPack = (row: any) => {
+  handleMessageBox({
+    msg: `是否确认取消打包?`,
+    success: api.order.unpackOrder.post!,
+    data: { id: row.id }
+  }).then(() => {
+    table.value.$onGetData(table.value, 1)
+  })
+}
+
+// 妥投
+const onFinishDeliver = (row: any) => {
+  handleMessageBox({
+    msg: `是否确认妥投?`,
+    success: api.order.finishDeliver.post!,
+    data: { id: row.id }
+  }).then(() => {
+    table.value.$onGetData(table.value, 1)
+  })
+}
+
+const router = useRouter()
+const onGoDetail = (row: any) => {
+  router.push({ path: '/order/detail/index', query: { id: row.id } })
+}
+
+/** 初始化页面 */
+const ConfigData = initConfig()
+const { search, table } = handleInit(ConfigData, api.order.getOrderList.post, [
+  onGoDetail,
+  onPack,
+  onCancelPack,
+  onFinishDeliver
+])
+table.value.$onGetData(table.value, 1)
+
+/** 页面缓存 */
+defineOptions({ name: 'OrderList' })
+</script>