diff --git a/README.md b/README.md
index f5619e8bc4a71d1c00e86e3dd61aea0127dc4841..4a0de6ae53b2342296890bbd7ddb55e5c5e4ea4d 100644
--- a/README.md
+++ b/README.md
@@ -38,14 +38,14 @@
 
 | 框架                                                                   | 说明               | 版本     |
 |----------------------------------------------------------------------|------------------|--------|
-| [Vue](https://staging-cn.vuejs.org/)                                 | Vue 框架           | 3.2.47 |
-| [Vite](https://cn.vitejs.dev//)                                      | 开发与构建工具          | 4.3.1  |
-| [Element Plus](https://element-plus.org/zh-CN/)                      | Element Plus     | 2.3.3 |
+| [Vue](https://staging-cn.vuejs.org/)                                 | Vue 框架           | 3.3.4 |
+| [Vite](https://cn.vitejs.dev//)                                      | 开发与构建工具          | 4.3.8  |
+| [Element Plus](https://element-plus.org/zh-CN/)                      | Element Plus     | 2.3.4 |
 | [TypeScript](https://www.typescriptlang.org/docs/)                   | JavaScript 的超集   | 5.0.4  |
-| [pinia](https://pinia.vuejs.org/)                                    | Vue 存储库 替代 vuex5 | 2.0.35 |
-| [vueuse](https://vueuse.org/)                                        | 常用工具集            | 10.1.0 |
+| [pinia](https://pinia.vuejs.org/)                                    | Vue 存储库 替代 vuex5 | 2.1.3 |
+| [vueuse](https://vueuse.org/)                                        | 常用工具集            | 10.1.2 |
 | [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化              | 9.2.2  |
-| [vue-router](https://router.vuejs.org/)                              | Vue 路由           | 4.1.6  |
+| [vue-router](https://router.vuejs.org/)                              | Vue 路由           | 4.2.1  |
 | [windicss](https://cn.windicss.org/)                                 | 下一代工具优先的 CSS 框架  | 3.5.6  |
 | [iconify](https://icon-sets.iconify.design/)                         | 在线图标库            | 3.1.0  |
 | [wangeditor](https://www.wangeditor.com/)                            | 富文本编辑器           | 5.1.23 |
diff --git a/package.json b/package.json
index 8cdf9380e5e9bbf122910238e3a41d721de4a9fa..d5a7ad01a3cd4e473b2fe84f0be77dd5b5ead423 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "serve:pro": "vite preview --mode pro",
     "serve:dev": "vite preview --mode dev",
     "serve:test": "vite preview --mode test",
+    "preview": "pnpm build && vite preview",
     "npm:check": "npx npm-check-updates",
     "clean": "npx rimraf node_modules",
     "clean:cache": "npx rimraf node_modules/.cache",
@@ -33,12 +34,12 @@
     "@form-create/element-ui": "^3.1.17",
     "@iconify/iconify": "^3.1.0",
     "@videojs-player/vue": "^1.0.0",
-    "@vueuse/core": "^10.1.0",
+    "@vueuse/core": "^10.1.2",
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "^5.1.10",
-    "@zxcvbn-ts/core": "^2.2.1",
+    "@zxcvbn-ts/core": "^3.0.1",
     "animate.css": "^4.1.1",
-    "axios": "^1.3.6",
+    "axios": "^1.4.0",
     "benz-amr-recorder": "^1.1.5",
     "bpmn-js-token-simulation": "^0.10.0",
     "camunda-bpmn-moddle": "^7.0.1",
@@ -48,35 +49,35 @@
     "diagram-js": "^11.6.0",
     "echarts": "^5.4.2",
     "echarts-wordcloud": "^2.1.0",
-    "element-plus": "2.3.3",
+    "element-plus": "2.3.4",
     "fast-xml-parser": "^4.2.2",
-    "highlight.js": "^11.7.0",
+    "highlight.js": "^11.8.0",
     "intro.js": "^7.0.1",
     "jsencrypt": "^3.3.2",
     "lodash-es": "^4.17.21",
-    "min-dash": "^4.1.0",
+    "min-dash": "^4.1.1",
     "mitt": "^3.0.0",
     "nprogress": "^0.2.0",
-    "pinia": "^2.0.35",
+    "pinia": "^2.1.3",
     "qrcode": "^1.5.3",
-    "qs": "^6.11.1",
+    "qs": "^6.11.2",
     "steady-xml": "^0.1.0",
     "url": "^0.11.0",
     "video.js": "^8.3.0",
     "vue": "3.3.4",
     "vue-dompurify-html": "^4.1.4",
     "vue-i18n": "9.2.2",
-    "vue-router": "^4.1.6",
-    "vue-types": "^5.0.2",
+    "vue-router": "^4.2.1",
+    "vue-types": "^5.0.3",
     "vuedraggable": "^4.1.0",
     "web-storage-cache": "^1.1.1",
     "xe-utils": "^3.5.7",
     "xml-js": "^1.6.11"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.6.1",
-    "@commitlint/config-conventional": "^17.6.1",
-    "@iconify/json": "^2.2.54",
+    "@commitlint/cli": "^17.6.3",
+    "@commitlint/config-conventional": "^17.6.3",
+    "@iconify/json": "^2.2.67",
     "@intlify/unplugin-vue-i18n": "^0.10.0",
     "@purge-icons/generated": "^0.9.0",
     "@types/intro.js": "^5.1.1",
@@ -85,39 +86,39 @@
     "@types/nprogress": "^0.2.0",
     "@types/qrcode": "^1.5.0",
     "@types/qs": "^6.9.7",
-    "@typescript-eslint/eslint-plugin": "^5.59.0",
-    "@typescript-eslint/parser": "^5.59.0",
-    "@vitejs/plugin-legacy": "^4.0.2",
-    "@vitejs/plugin-vue": "^4.1.0",
+    "@typescript-eslint/eslint-plugin": "^5.59.6",
+    "@typescript-eslint/parser": "^5.59.6",
+    "@vitejs/plugin-legacy": "^4.0.3",
+    "@vitejs/plugin-vue": "^4.2.3",
     "@vitejs/plugin-vue-jsx": "^3.0.1",
     "autoprefixer": "^10.4.14",
     "bpmn-js": "^8.9.0",
     "bpmn-js-properties-panel": "^0.46.0",
     "consola": "^3.1.0",
-    "eslint": "^8.39.0",
+    "eslint": "^8.40.0",
     "eslint-config-prettier": "^8.8.0",
-    "eslint-define-config": "^1.18.0",
+    "eslint-define-config": "^1.20.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-vue": "^9.11.0",
-    "lint-staged": "^13.2.1",
+    "eslint-plugin-vue": "^9.13.0",
+    "lint-staged": "^13.2.2",
     "postcss": "^8.4.23",
     "postcss-html": "^1.5.0",
     "postcss-scss": "^4.0.6",
     "prettier": "^2.8.8",
-    "rimraf": "^5.0.0",
-    "rollup": "^3.20.7",
-    "sass": "^1.62.0",
-    "stylelint": "^15.6.0",
+    "rimraf": "^5.0.1",
+    "rollup": "^3.22.0",
+    "sass": "^1.62.1",
+    "stylelint": "^15.6.2",
     "stylelint-config-html": "^1.1.0",
     "stylelint-config-recommended": "^12.0.0",
     "stylelint-config-standard": "^33.0.0",
     "stylelint-order": "^6.0.3",
-    "terser": "^5.17.1",
+    "terser": "^5.17.4",
     "typescript": "5.0.4",
-    "unplugin-auto-import": "^0.15.3",
+    "unplugin-auto-import": "^0.16.0",
     "unplugin-element-plus": "^0.7.1",
     "unplugin-vue-components": "^0.24.1",
-    "vite": "4.3.1",
+    "vite": "4.3.8",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-ejs": "^1.6.4",
     "vite-plugin-eslint": "^1.8.1",
@@ -126,8 +127,8 @@
     "vite-plugin-svg-icons": "^2.0.1",
     "vite-plugin-top-level-await": "^1.3.0",
     "vite-plugin-vue-setup-extend-plus": "^0.1.0",
-    "vite-plugin-windicss": "^1.8.10",
-    "vue-tsc": "^1.4.4",
+    "vite-plugin-windicss": "^1.9.0",
+    "vue-tsc": "^1.6.5",
     "windicss": "^3.5.6"
   },
   "engines": {
diff --git a/src/api/mall/trade/order/index.ts b/src/api/mall/trade/order/index.ts
new file mode 100644
index 0000000000000000000000000000000000000000..5a401030a93c83809ac7e79eebaf227eba8ce3ed
--- /dev/null
+++ b/src/api/mall/trade/order/index.ts
@@ -0,0 +1,11 @@
+import request from '@/config/axios'
+
+// 获得交易订单分页
+export const getOrderList = (params: PageParam) => {
+  return request.get({ url: '/trade/order/page', params })
+}
+
+// 获得交易订单详情
+export const getOrderDetail = (id: number) => {
+  return request.get({ url: '/trade/order/get-detail?id=' + id })
+}
diff --git a/src/api/mall/trade/order/type/orderType.ts b/src/api/mall/trade/order/type/orderType.ts
new file mode 100644
index 0000000000000000000000000000000000000000..cba4fbfff8cadf8c4d1de12fc60b4df58a8a5f51
--- /dev/null
+++ b/src/api/mall/trade/order/type/orderType.ts
@@ -0,0 +1,183 @@
+export interface TradeOrderPageItemRespVO {
+  // 订单编号
+  id: number
+  // 订单流水号
+  no: string
+  // 下单时间
+  createTime: Date
+  // 订单类型
+  type: number
+  // 订单来源
+  terminal: number
+  // 用户编号
+  userId: number
+  // 用户 IP
+  userIp: string
+  // 用户备注
+  userRemark: string
+  // 订单状态
+  status: number
+  // 购买的商品数量
+  productCount: number
+  // 订单完成时间
+  finishTime?: Date
+  // 订单取消时间
+  cancelTime?: Date
+  // 取消类型
+  cancelType?: number
+  // 商家备注
+  remark?: string
+  // 支付订单编号
+  payOrderId: number
+  // 是否已支付
+  payed: boolean
+  // 付款时间
+  payTime?: Date
+  // 支付渠道
+  payChannelCode: string
+  // 商品原价（总）
+  originalPrice: number
+  // 订单原价（总）
+  orderPrice: number
+  // 订单优惠（总）
+  discountPrice: number
+  // 运费金额
+  deliveryPrice: number
+  // 订单调价（总）
+  adjustPrice: number
+  // 应付金额（总）
+  payPrice: number
+  // 配送模板编号
+  deliveryTemplateId?: number
+  // 发货物流公司编号
+  logisticsId?: number
+  // 发货物流单号
+  logisticsNo?: string
+  // 发货状态
+  deliveryStatus: number
+  // 发货时间
+  deliveryTime?: Date
+  // 收货时间
+  receiveTime?: Date
+  // 收件人名称
+  receiverName: string
+  // 收件人手机
+  receiverMobile: string
+  // 收件人地区编号
+  receiverAreaId: number
+  // 收件人邮编
+  receiverPostCode: number
+  // 收件人详细地址
+  receiverDetailAddress: string
+  // 售后状态
+  afterSaleStatus?: number
+  // 退款金额
+  refundPrice: number
+  // 优惠劵编号
+  couponId?: number
+  // 优惠劵减免金额
+  couponPrice: number
+  // 积分抵扣的金额
+  pointPrice: number
+  //收件人地区名字
+  receiverAreaName: string
+  // 订单项列表
+  items: TradeOrderItemBaseVO[]
+}
+
+/**
+ * 交易订单项 Base VO，提供给添加、修改、详细的子 VO 使用
+ * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+ */
+export interface TradeOrderItemBaseVO {
+  // ========== 订单项基本信息 ==========
+  /**
+   * 编号
+   */
+  id: number
+  /**
+   * 用户编号
+   */
+  userId: number
+  /**
+   * 订单编号
+   */
+  orderId: number
+  // ========== 商品基本信息 ==========
+  /**
+   * 商品 SPU 编号
+   */
+  spuId: number
+  /**
+   * 商品 SPU 名称
+   */
+  spuName: string
+  /**
+   * 商品 SKU 编号
+   */
+  skuId: number
+  /**
+   * 商品图片
+   */
+  picUrl: string
+  /**
+   * 购买数量
+   */
+  count: number
+  // ========== 价格 + 支付基本信息 ==========
+  /**
+   * 商品原价（总）
+   */
+  originalPrice: number
+  /**
+   * 商品原价（单）
+   */
+  originalUnitPrice: number
+  /**
+   * 商品优惠（总）
+   */
+  discountPrice: number
+  /**
+   * 商品实付金额（总）
+   */
+  payPrice: number
+  /**
+   * 子订单分摊金额（总）
+   */
+  orderPartPrice: number
+  /**
+   * 分摊后子订单实付金额（总）
+   */
+  orderDividePrice: number
+  // ========== 营销基本信息 ==========
+  // TODO 芋艿：在捉摸一下
+  // ========== 售后基本信息 ==========
+  /**
+   * 售后状态
+   */
+  afterSaleStatus: number
+  //属性数组
+  properties: ProductPropertyValueDetailRespVO[]
+}
+
+/**
+ * 管理后台 - 商品属性值的明细 Response VO
+ */
+export interface ProductPropertyValueDetailRespVO {
+  /**
+   * 属性的编号
+   */
+  propertyId: number
+  /**
+   * 属性的名称
+   */
+  propertyName: string
+  /**
+   * 属性值的编号
+   */
+  valueId: number
+  /**
+   * 属性值的名称
+   */
+  valueName: string
+}
diff --git a/src/plugins/echarts/index.ts b/src/plugins/echarts/index.ts
index 34f756f64c56b7ac1d8b6b13688cac7f5deb1f1d..bfccbb481b9d9ab0d66b95833e45021b62fc5e1a 100644
--- a/src/plugins/echarts/index.ts
+++ b/src/plugins/echarts/index.ts
@@ -6,7 +6,8 @@ import {
   PieChart,
   MapChart,
   PictorialBarChart,
-  RadarChart
+  RadarChart,
+  GaugeChart
 } from 'echarts/charts'
 
 import {
@@ -16,7 +17,8 @@ import {
   PolarComponent,
   AriaComponent,
   ParallelComponent,
-  LegendComponent
+  LegendComponent,
+  ToolboxComponent
 } from 'echarts/components'
 
 import { CanvasRenderer } from 'echarts/renderers'
@@ -25,6 +27,7 @@ echarts.use([
   LegendComponent,
   TitleComponent,
   TooltipComponent,
+  ToolboxComponent,
   GridComponent,
   PolarComponent,
   AriaComponent,
@@ -35,7 +38,8 @@ echarts.use([
   MapChart,
   CanvasRenderer,
   PictorialBarChart,
-  RadarChart
+  RadarChart,
+  GaugeChart
 ])
 
 export default echarts
diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts
index f7e56fd0b181b290031cb897ecb6b368a6db6926..be027cbcb6ed15699d0cc121550c4da8e3193f19 100644
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -195,6 +195,22 @@ const remainingRouter: AppRouteRecordRaw[] = [
       noTagsView: true
     }
   },
+  {
+    path: '/trade/order',
+    component: Layout,
+    name: 'order',
+    meta: {
+      hidden: true
+    },
+    children: [
+      {
+        path: 'detail',
+        name: 'TradeOrderDetail',
+        component: () => import('@/views/mall/trade/order/tradeOrderDetail.vue'),
+        meta: { title: '订单详情', hidden: true }
+      }
+    ]
+  },
   {
     path: '/403',
     component: () => import('@/views/Error/403.vue'),
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 73913b911ac8c3b24fe9c6c560dbcdb89799deed..1faaa65f16bd9a8920e39bac972fbc4243b0bb82 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -33,7 +33,6 @@ export const getIntDictOptions = (dictType: string) => {
       value: parseInt(dict.value + '')
     })
   })
-
   return dictOption
 }
 
@@ -153,5 +152,16 @@ export enum DICT_TYPE {
   PROMOTION_COUPON_STATUS = 'promotion_coupon_status', // 优惠劵的状态
   PROMOTION_COUPON_TAKE_TYPE = 'promotion_coupon_take_type', // 优惠劵的领取方式
   PROMOTION_ACTIVITY_STATUS = 'promotion_activity_status', // 优惠活动的状态
-  PROMOTION_CONDITION_TYPE = 'promotion_condition_type' // 营销的条件类型枚举
+  PROMOTION_CONDITION_TYPE = 'promotion_condition_type', // 营销的条件类型枚举
+
+  //===add by 20230530====
+  // ========== MALL - ORDER 模块 ==========
+  TRADE_AFTER_SALE_STATUS = 'trade_after_sale_status', // 售后 - 状态
+  TRADE_AFTER_SALE_WAY = 'trade_after_sale_way', // 售后 - 方式
+  TRADE_AFTER_SALE_TYPE = 'trade_after_sale_type', // 售后 - 类型
+  TRADE_ORDER_TYPE = 'trade_order_type', // 订单 - 类型
+  TRADE_ORDER_STATUS = 'trade_order_status', // 订单 - 状态
+  TRADE_ORDER_ITEM_AFTER_SALE_STATUS = 'trade_order_item_after_sale_status', // 订单项 - 售后状态
+
+  TERMINAL = 'terminal'
 }
diff --git a/src/views/infra/redis/index.vue b/src/views/infra/redis/index.vue
index 011f8e590681a96c66d053b7e47f01e8e4af731c..f98f2f30928ccba86bc3a7ba35135b7f666767f2 100644
--- a/src/views/infra/redis/index.vue
+++ b/src/views/infra/redis/index.vue
@@ -63,9 +63,6 @@
   </el-scrollbar>
 </template>
 <script setup lang="ts">
-import echarts from '@/plugins/echarts'
-import { GaugeChart } from 'echarts/charts'
-import { ToolboxComponent } from 'echarts/components'
 import * as RedisApi from '@/api/infra/redis'
 import { RedisMonitorInfoVO } from '@/api/infra/redis/types'
 const cache = ref<RedisMonitorInfoVO>()
@@ -77,7 +74,7 @@ const readRedisInfo = async () => {
 }
 
 // 内存使用情况
-const usedmemoryEchartChika = reactive({
+const usedmemoryEchartChika = reactive<any>({
   title: {
     // 仪表盘标题。
     text: '内存使用情况',
@@ -263,8 +260,6 @@ const usedMemoryInstance = async () => {
 
 /** 初始化 **/
 onMounted(() => {
-  echarts.use([ToolboxComponent])
-  echarts.use([GaugeChart])
   // 读取 redis 信息
   readRedisInfo()
   // 加载数据
diff --git a/src/views/mall/trade/order/index.vue b/src/views/mall/trade/order/index.vue
new file mode 100644
index 0000000000000000000000000000000000000000..61b22856cafe8a93359e092996100e2f533f06bc
--- /dev/null
+++ b/src/views/mall/trade/order/index.vue
@@ -0,0 +1,517 @@
+<template>
+  <!-- 搜索 -->
+  <ContentWrap>
+    <el-form
+      ref="queryFormRef"
+      :model="queryParams"
+      class="-mb-15px"
+      label-width="68px"
+      :inline="true"
+    >
+      <el-form-item label="订单状态" prop="status">
+        <el-select class="!w-280px" v-model="queryParams.status" clearable placeholder="全部">
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.TRADE_ORDER_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="支付方式" prop="payChannelCode">
+        <el-select
+          v-model="queryParams.payChannelCode"
+          class="!w-280px"
+          clearable
+          placeholder="全部"
+        >
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.PAY_CHANNEL_CODE_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-280px"
+          start-placeholder="自定义时间"
+          end-placeholder="自定义时间"
+          type="daterange"
+          value-format="YYYY-MM-DD HH:mm:ss"
+        />
+      </el-form-item>
+      <el-form-item label="订单来源" prop="terminal">
+        <el-select class="!w-280px" v-model="queryParams.terminal" clearable placeholder="全部TODO">
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.TERMINAL)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="订单类型" prop="type">
+        <el-select class="!w-280px" v-model="queryParams.type" clearable placeholder="全部">
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.TRADE_ORDER_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="订单搜索" prop="searchValue">
+        <!-- 双item绑定2个变量用于reset时没法重置 -->
+        <el-form-item class="!w-280px" prop="searchType">
+          <el-input
+            class="!w-280px"
+            v-model="queryParams.searchValue"
+            clearable
+            placeholder="请输入TODO"
+          >
+            <template #prepend>
+              <el-select
+                style="width: 100px"
+                v-model="queryParams.searchType"
+                clearable
+                placeholder="全部"
+              >
+                <el-option
+                  v-for="dict in searchList"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </template>
+          </el-input>
+        </el-form-item>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery">
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
+        </el-button>
+        <!-- v-hasPermi="['trade:order:export']"
+           需要将选中的数据存入orderSelect.multipleSelection中 
+          需要考虑全选时数据如何处理-->
+        <el-button type="success" plain @click="handleExport" :loading="exportLoading">
+          <Icon icon="ep:download" class="mr-5px" /> 导出TODO
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+  <!-- 表格 -->
+  <ContentWrap>
+    <!-- 表单 -->
+    <el-table v-loading="loading" :data="list">
+      <el-table-column type="expand" fixed="left">
+        <template #default="scope">
+          <el-descriptions class="mx-40">
+            <el-descriptions-item label="商品原价(总): ">{{
+              '￥ ' + parseFloat(scope.row.originalPrice / 100).toFixed(2) + ' 元'
+            }}</el-descriptions-item>
+            <el-descriptions-item label="下单时间: ">
+              {{ formatDate(scope.row.createTime) }}</el-descriptions-item
+            >
+            <el-descriptions-item label="推广人: ">TODO</el-descriptions-item>
+            <el-descriptions-item label="用户备注: ">{{
+              scope.row.userRemark
+            }}</el-descriptions-item>
+            <el-descriptions-item label="商家备注: ">{{ scope.row.remark }}</el-descriptions-item>
+          </el-descriptions>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="全选" type="selection" width="55" fixed="left">x</el-table-column> -->
+      <el-table-column width="100" fixed="left">
+        <template #header>
+          <el-dropdown icon="eq:search" @command="handleDropType">
+            <el-button link type="primary">全选({{ orderSelect.checkTotal }}) </el-button>
+
+            <template #dropdown>
+              <el-dropdown-menu>
+                <el-dropdown-item command="1">当前页</el-dropdown-item>
+                <el-dropdown-item command="2">所有页</el-dropdown-item>
+              </el-dropdown-menu>
+            </template>
+          </el-dropdown>
+        </template>
+        <template #default="scope">
+          <el-checkbox v-model="scope.row.itemSelect" @change="handcheckclick(scope.row)" />
+        </template>
+      </el-table-column>
+
+      <el-table-column label="订单号" align="center" min-width="110">
+        <template #default="scope">
+          <el-button link type="primary" @click="showOrderDetail(scope.row)">{{
+            scope.row.no
+          }}</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="订单类型" align="center" min-width="100">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.TRADE_ORDER_TYPE" :value="scope.row.type" />
+        </template>
+      </el-table-column>
+
+      <el-table-column label="订单来源" align="center" min-width="100">
+        <template #default="scope">
+          <dict-tag
+            v-if="scope.row.terminal"
+            :type="DICT_TYPE.TERMINAL"
+            :value="scope.row.terminal"
+          />
+          <span v-else>{{ scope.terminal }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="用户信息(id)" align="center" min-width="100">
+        <template #default="scope">
+          <el-button link type="primary" @click="goUserDetail(scope.row)">{{
+            scope.row.userId
+          }}</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="商品信息" align="left" min-width="200" prop="items">
+        <template #default="scope">
+          <el-popover
+            ref="popover"
+            placement="bottom"
+            :title="'订单:' + scope.row.no"
+            :width="400"
+            trigger="hover"
+          >
+            <template #reference>
+              <div>
+                <div v-for="item in scope.row.items" :key="item">
+                  <el-image
+                    style="width: 36px; height: 36px"
+                    :src="item.picUrl"
+                    :preview-src-list="[item.picUrl]"
+                    fit="cover"
+                    @click="imagePreview(item.picUrl)"
+                  />
+                  <span class="m-2">{{ item.spuName }}</span>
+                </div>
+              </div>
+            </template>
+            <div v-for="item in scope.row.items" :key="item">
+              <div>
+                <p>{{ item.spuName }}</p>
+                <p>{{
+                  '￥ ' + parseFloat(item.payPrice / 100).toFixed(2) + '元 x ' + item.count
+                }}</p>
+              </div>
+            </div>
+          </el-popover>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="实际支付(元)" align="center" prop="payPrice" min-width="100">
+        <template #default="scope">
+          {{ '￥ ' + parseFloat(scope.row.payPrice / 100).toFixed(2) }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        :formatter="dateFormatter"
+        align="center"
+        label="支付时间"
+        prop="payTime"
+        min-width="180"
+      />
+      <el-table-column label="支付类型" align="center" min-width="100" prop="payChannelCode">
+        <template #default="scope">
+          <dict-tag
+            v-if="scope.row.payChannelCode"
+            :type="DICT_TYPE.PAY_CHANNEL_CODE_TYPE"
+            :value="scope.row.payChannelCode"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="订单状态" align="center" prop="status" min-width="100">
+        <template #default="scope">
+          <dict-tag
+            v-if="scope.row.status == ''"
+            :type="DICT_TYPE.TRADE_ORDER_STATUS"
+            :value="scope.row.status"
+          />
+          <span v-else>{{ scope.status }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" fixed="right" min-width="150">
+        <template #default="scope">
+          <el-button v-if="scope.row.status == '0'" link type="primary" @click="sendXX(scope.row)"
+            >待支付</el-button
+          >
+          <el-button v-if="scope.row.status == '10'" link type="primary" @click="sendXX(scope.row)"
+            >发货</el-button
+          >
+          <el-button link type="primary" @click="showOrderDetail(scope.row)">详情</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页 -->
+    <Pagination
+      v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
+      @pagination="getList"
+    />
+  </ContentWrap>
+  <el-image-viewer
+    v-if="imgViewVisible"
+    :url-list="imageViewerList"
+    @close="imgViewVisible = false"
+  />
+</template>
+<script setup lang="ts" name="OrderList">
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import * as TradeOrderApi from '@/api/mall/trade/order'
+import { dateFormatter, formatDate } from '@/utils/formatTime'
+import download from '@/utils/download'
+// import TradeOrderDetail from './tradeOrderDetail.vue'
+interface CurrentType {
+  checkTotal: number //选中的数量
+  currentType: string //页面选中类型, 0-noPage无选中页面 1-currentPage 当前页面 2-allPage所有页面
+  selectAll: boolean //全选标识
+  multipleSelection: [] // 选中的数据  暂未记录,需考虑全选时数据应该如何处理 ,部分选中可以使用该数据,需要登记
+  pageNoList: [] //当前页面选中的页号 如果再次选中当前页将取消本页面的选中数据 全选时 将所有的页面list 都放进去 再次全选时 全部清空
+}
+const orderSelect: CurrentType = reactive({
+  checkTotal: 0,
+  currentType: '0',
+  selectAll: false,
+  multipleSelection: [],
+  pageNoList: []
+})
+
+const message = useMessage()
+
+const { push } = useRouter()
+const queryFormRef = ref() //表单搜索
+const queryParams = ref({
+  pageNo: 1, //首页
+  pageSize: 10, //页面大小
+  tabIndex: 0 //详情页面数据
+})
+
+const loading = ref(false)
+const exportLoading = ref(false)
+// 总记录数
+const total = ref(0)
+
+//表数据
+const list = ref<any>([])
+//订单搜索
+const searchList = ref([
+  {
+    value: 'orderNo',
+    label: '订单号'
+  },
+  {
+    value: 'userId',
+    label: '用户UID'
+  },
+  {
+    value: 'userName',
+    label: '用户姓名'
+  },
+  {
+    value: 'userTel',
+    label: '用户电话'
+  },
+  {
+    value: 'itemName',
+    label: '商品名称'
+  },
+  {
+    value: 'itemCount',
+    label: '商品件数'
+  }
+])
+
+const imgViewVisible = ref(false) // 商品图预览
+
+const imageViewerList = ref<string[]>([]) // 商品图预览列表
+
+/**当前页 所有页  暂不考虑数据本地化 会导致选中当前页 从后台重新拉取数据时出现数据不一致*/
+const handleDropType = (command: string) => {
+  orderSelect.currentType = command
+  let i = 0
+  if (command === '1') {
+    // pageNoList 当前页面选中的页号 如果再次选中当前页将取消本页面的选中数据
+    //取消本页面记录
+    var index = orderSelect.pageNoList.indexOf(queryParams.value.pageNo)
+    if (index > -1) {
+      for (i; i < list.value.length; i++) {
+        if (list.value[i]['itemSelect'] === true) {
+          list.value[i]['itemSelect'] = false
+          orderSelect.checkTotal = orderSelect.checkTotal - 1
+        }
+      }
+      orderSelect.pageNoList.splice(index, 1)
+    } else {
+      for (i; i < list.value.length; i++) {
+        if (list.value[i]['itemSelect'] === false) {
+          list.value[i]['itemSelect'] = true
+          orderSelect.checkTotal = orderSelect.checkTotal + 1
+        }
+      }
+      orderSelect.pageNoList.splice(0, 0, queryParams.value.pageNo)
+    }
+  }
+  if (command === '2') {
+    orderSelect.selectAll = !orderSelect.selectAll
+    //全选时 将所有的页面list 都放进去 再次全选时 全部清空
+    if (orderSelect.selectAll) {
+      //打勾勾
+      for (i; i < list.value.length; i++) {
+        list.value[i]['itemSelect'] = true
+      }
+      // 初始化页面数组
+      const array1: [] = Array.from(
+        { length: total.value / queryParams.value.pageSize + 1 },
+        (item, idx) => idx + 1
+      )
+      orderSelect.pageNoList = [] //清空原有的
+      orderSelect.pageNoList = [].concat(array1)
+      orderSelect.checkTotal = total.value
+    } else {
+      //取消勾勾
+      for (i; i < list.value.length; i++) {
+        list.value[i]['itemSelect'] = false
+      }
+      orderSelect.pageNoList = [] //清空
+      orderSelect.checkTotal = 0
+    }
+  }
+}
+/***复选框选中 */
+const handcheckclick = (row: any) => {
+  //选中增加1
+  if (!row.itemSelect) {
+    // 取消 -1
+    orderSelect.checkTotal = orderSelect.checkTotal - 1
+    //
+  } else {
+    //选中 +1
+    orderSelect.checkTotal = orderSelect.checkTotal + 1
+  }
+}
+/**
+ * 导出数据
+ */
+
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    //TODO导出的数据是后台导出还是从前端中获取数据(全选时数据怎么打印?)
+    download.excel(orderSelect.multipleSelection as any, '订单信息.xls') //
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+  //TODO
+  exportLoading.value = false
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  //选中状态初始化
+  orderSelect.checkTotal = 0
+  orderSelect.currentType = '0'
+  orderSelect.multipleSelection = []
+  orderSelect.pageNoList = []
+  orderSelect.selectAll = false
+
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  //选中状态初始化
+  orderSelect.checkTotal = 0
+  orderSelect.currentType = '0'
+  orderSelect.multipleSelection = []
+  orderSelect.pageNoList = []
+  orderSelect.selectAll = false
+
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await TradeOrderApi.getOrderList(queryParams.value)
+    list.value = data.list
+    total.value = data.total
+
+    let i = 0
+    //给数组添加选中属性 itemSelect 默认为false 当前状态如果时全选 则新加载的页面都为选中状态
+    if (
+      orderSelect.currentType === '2' || //全选状态加载状态设置为选中
+      orderSelect.pageNoList.indexOf(queryParams.value.pageNo) > -1 //已选择页面加载状态设置为默认选中，会存在选中当前页面后手动取消该页面部分数据，再重新加载该页面时设置为选中状态，但是没有增加选中的数量
+    ) {
+      for (i; i < list.value.length; i++) {
+        list.value[i]['itemSelect'] = true
+      }
+    } else {
+      //还需要判断当前页面是否已经选中了? 而且还要出来选中的数据是否后来手动一行行取消了处理
+      for (i; i < list.value.length; i++) {
+        list.value[i]['itemSelect'] = false //暂定为未选中状态, 实际情况需要考虑已选中状态,后期优化
+      }
+    }
+  } finally {
+    loading.value = false
+  }
+}
+
+/**
+ * 跳转订单详情
+ */
+const showOrderDetail = (row: any) => {
+  console.log('TODO Order Detail: ' + row.id)
+  push({ name: 'TradeOrderDetail', query: { id: row.id } })
+}
+
+/**
+ * 跳转用户详情
+ */
+const goUserDetail = (row: any) => {
+  console.log('TODO User Detail: ' + row.userId)
+}
+/**
+ * 发货
+ */
+const sendXX = (row: any) => {
+  console.log('TODO Send XX: ' + row.no)
+}
+
+/**
+ * 商品图预览
+ * @param imgUrl
+ */
+const imagePreview = (imgUrl: string) => {
+  imageViewerList.value = [imgUrl]
+  imgViewVisible.value = true
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/mall/trade/order/tradeOrderDetail-crmeb.vue b/src/views/mall/trade/order/tradeOrderDetail-crmeb.vue
new file mode 100644
index 0000000000000000000000000000000000000000..ae4fe01c1e760f6387d2c77755b5b4577ae8d08b
--- /dev/null
+++ b/src/views/mall/trade/order/tradeOrderDetail-crmeb.vue
@@ -0,0 +1,141 @@
+<template>
+  <el-drawer v-model="drawerVisiable" width="50%">
+    <el-form inline="true">
+      <el-form-item>
+        <div>
+          <span text="普通订单:">普通订单:</span>
+          <span text="订单号: ">1111112546</span>
+        </div>
+      </el-form-item>
+      <el-form-item> <el-button type="primary" icon="search">发送货</el-button></el-form-item>
+      <el-form-item><el-button type="success" icon="search">小票打印</el-button> </el-form-item>
+      <el-form-item>
+        <el-dropdown @command="handleCommand">
+          <el-button> ... </el-button>
+          <template #dropdown>
+            <el-dropdown-menu>
+              <el-dropdown-item command="remark">订单备注</el-dropdown-item>
+              <el-dropdown-item command="b">立即退款</el-dropdown-item>
+              <el-dropdown-item command="print">打印配货单</el-dropdown-item>
+            </el-dropdown-menu>
+          </template>
+        </el-dropdown>
+      </el-form-item>
+    </el-form>
+
+    <el-descriptions class="m-10" direction="vertical" column="4">
+      <el-descriptions-item label="订单状态">未发货TODO</el-descriptions-item>
+      <el-descriptions-item label="实际支付">1000 元 TODO</el-descriptions-item>
+      <el-descriptions-item label="支付方式">手机支付</el-descriptions-item>
+      <el-descriptions-item label="支付时间"> {{ formatDate(Date()) }}</el-descriptions-item>
+    </el-descriptions>
+    <el-tabs @tab-click="handleClick">
+      <el-tab-pane label="订单信息">
+        <el-descriptions title="订单信息">
+          <el-descriptions-item label="用户UID: ">kooriookami</el-descriptions-item>
+          <el-descriptions-item label="用户昵称: ">18100000000</el-descriptions-item>
+          <el-descriptions-item label="绑定电话: ">Suzhou</el-descriptions-item>
+        </el-descriptions>
+        <el-divider border-style="dashed" />
+        <el-descriptions title="收货信息" column="1">
+          <el-descriptions-item label="收货人: ">kooriookami</el-descriptions-item>
+          <el-descriptions-item label="收货电话: ">18100000000</el-descriptions-item>
+          <el-descriptions-item label="收货地址: ">{{ detailData }}</el-descriptions-item>
+        </el-descriptions>
+        <el-divider border-style="dashed" />
+        <el-descriptions title="供应商信息">
+          <el-descriptions-item label="供应商: ">kooriookami</el-descriptions-item>
+          <el-descriptions-item label="供应商姓名: ">18100000000</el-descriptions-item>
+          <el-descriptions-item label="联系方式: ">Suzhou</el-descriptions-item>
+          <el-descriptions-item label="供应商邮箱: ">Suzhou</el-descriptions-item>
+        </el-descriptions>
+        <el-divider border-style="dashed" />
+        <el-descriptions title="订单信息">
+          <el-descriptions-item label="创建时间: "> {{ formatDate(Date()) }} </el-descriptions-item>
+          <el-descriptions-item label="商品总数: ">18100000000</el-descriptions-item>
+          <el-descriptions-item label="商品总价: ￥">200.00 元</el-descriptions-item>
+          <el-descriptions-item label="优惠券金额: ￥">200.00 元</el-descriptions-item>
+          <el-descriptions-item label="积分抵扣: ">200.00</el-descriptions-item>
+          <el-descriptions-item label="支付邮费: ￥">200.00 元</el-descriptions-item>
+          <el-descriptions-item label="会员商品优惠: ￥">200.00 元</el-descriptions-item>
+          <el-descriptions-item label="推广人: ￥">200.00 元</el-descriptions-item>
+          <el-descriptions-item label="支付时间: "> {{ formatDate(Date()) }} </el-descriptions-item>
+          <el-descriptions-item label="支付方式: ￥">200.00 元</el-descriptions-item>
+        </el-descriptions>
+        <el-divider v-if="true" border-style="dashed" />
+        <el-descriptions v-if="true" title="订单备注">
+          <el-descriptions-item label="备注: ">TODO</el-descriptions-item>
+        </el-descriptions>
+      </el-tab-pane>
+      <el-tab-pane label="商品信息">
+        <el-descriptions title="商品信息">
+          <el-descriptions-item label="用户UID: ">kooriookami</el-descriptions-item>
+          <el-descriptions-item label="用户昵称: ">18100000000</el-descriptions-item>
+          <el-descriptions-item label="绑定电话: ">Suzhou</el-descriptions-item>
+        </el-descriptions>
+      </el-tab-pane>
+      <el-tab-pane label="订单记录">
+        <el-descriptions title="订单记录">
+          <el-descriptions-item label="用户UID: ">kooriookami</el-descriptions-item>
+          <el-descriptions-item label="用户昵称: ">18100000000</el-descriptions-item>
+          <el-descriptions-item label="绑定电话: ">Suzhou</el-descriptions-item>
+        </el-descriptions>
+      </el-tab-pane>
+      <el-tab-pane label="发货记录">
+        <el-descriptions title="发货记录">
+          <el-descriptions-item label="用户UID: ">kooriookami</el-descriptions-item>
+          <el-descriptions-item label="用户昵称: ">18100000000</el-descriptions-item>
+          <el-descriptions-item label="绑定电话: ">Suzhou</el-descriptions-item>
+        </el-descriptions>
+      </el-tab-pane>
+    </el-tabs>
+  </el-drawer>
+</template>
+<script lang="ts" name="tradeOrderDetail-crmeb" setup>
+import { formatDate } from '@/utils/formatTime'
+import * as TradeOrderApi from '@/api/mall/trade/order'
+const message = useMessage() // 消息弹窗
+
+const drawerVisiable = ref(false)
+let detailData = reactive<any>({
+  items: [],
+  user: {}
+}) //详情数据
+
+const handleClick = () => {}
+
+const handleCommand = (command: string) => {
+  console.log(command)
+}
+//暂考虑一次性加载详情页面所有数据
+const queryDetail = async (no: string) => {
+  try {
+    const res = await TradeOrderApi.getOrderDetail(no)
+    console.log(res)
+    detailData.value = res
+    console.log(detailData.value)
+  } catch {
+    message.error('获取详情数据失败')
+  }
+}
+
+//显示详情
+const show = async (no: string) => {
+  drawerVisiable.value = true
+  try {
+    queryDetail(no)
+  } finally {
+  }
+}
+
+defineExpose({ show }) //显示详情方法
+</script>
+<style>
+.el-dropdown-link {
+  cursor: pointer;
+  color: #409eff;
+}
+.el-icon-arrow-down {
+  font-size: 12px;
+}
+</style>
diff --git a/src/views/mall/trade/order/tradeOrderDetail.vue b/src/views/mall/trade/order/tradeOrderDetail.vue
new file mode 100644
index 0000000000000000000000000000000000000000..3e261550d29f812348bd6df68545c184c6795d3e
--- /dev/null
+++ b/src/views/mall/trade/order/tradeOrderDetail.vue
@@ -0,0 +1,355 @@
+<template>
+  <ContentWrap>
+    <!-- 订单信息 -->
+    <el-descriptions title="订单信息">
+      <el-descriptions-item label="订单号: ">{{ order.no }}</el-descriptions-item>
+      <el-descriptions-item label="配送方式: ">物流配送</el-descriptions-item>
+      <!-- TODO 芋艿：待实现 -->
+      <el-descriptions-item label="营销活动: ">物流配送</el-descriptions-item>
+      <!-- TODO 芋艿：待实现 -->
+      <el-descriptions-item label="订单类型: ">
+        <dict-tag :type="DICT_TYPE.TRADE_ORDER_TYPE" :value="order.type" />
+      </el-descriptions-item>
+      <el-descriptions-item label="收货人: ">{{ order.receiverName }}</el-descriptions-item>
+      <el-descriptions-item label="买家留言: ">{{ order.userRemark }}</el-descriptions-item>
+      <el-descriptions-item label="订单来源: ">
+        <dict-tag :type="DICT_TYPE.TERMINAL" :value="order.terminal" />
+      </el-descriptions-item>
+      <el-descriptions-item label="联系电话: ">{{ order.receiverMobile }}</el-descriptions-item>
+      <el-descriptions-item label="商家备注: ">{{ order.remark }}</el-descriptions-item>
+      <el-descriptions-item label="支付单号: ">{{ order.payOrderId }}</el-descriptions-item>
+      <el-descriptions-item label="付款方式: ">
+        <dict-tag :type="DICT_TYPE.PAY_CHANNEL_CODE_TYPE" :value="order.payChannelCode" />
+      </el-descriptions-item>
+      <el-descriptions-item label="买家: ">{{ order.user.nickname }}</el-descriptions-item>
+      <!-- TODO 芋艿：待实现：跳转会员 -->
+      <el-descriptions-item label="收货地址: ">
+        {{ order.receiverAreaName }} " "{{ order.receiverDetailAddress }} " "
+        <el-link
+          v-clipboard:copy="order.receiverAreaName + ' ' + order.receiverDetailAddress"
+          v-clipboard:success="clipboardSuccess"
+          icon="ep:document-copy"
+          type="primary"
+        />
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <!-- 订单状态 -->
+    <el-descriptions title="订单状态" :column="1">
+      <el-descriptions-item label="订单状态: ">
+        <dict-tag :type="DICT_TYPE.TRADE_ORDER_STATUS" :value="order.status" />
+      </el-descriptions-item>
+      <el-descriptions-item label-class-name="no-colon">
+        <el-button type="primary" size="small">调整价格</el-button>
+        <!-- TODO 芋艿：待实现 -->
+        <el-button type="primary" size="small">备注</el-button>
+        <!-- TODO 芋艿：待实现 -->
+        <el-button type="primary" size="small">发货</el-button>
+        <!-- TODO 芋艿：待实现 -->
+        <el-button type="primary" size="small">关闭订单</el-button>
+        <!-- TODO 芋艿：待实现 -->
+        <el-button type="primary" size="small">修改地址</el-button>
+        <!-- TODO 芋艿：待实现 -->
+        <el-button type="primary" size="small">打印电子面单</el-button>
+        <!-- TODO 芋艿：待实现 -->
+        <el-button type="primary" size="small">打印发货单</el-button>
+        <!-- TODO 芋艿：待实现 -->
+        <el-button type="primary" size="small">确认收货</el-button>
+        <!-- TODO 芋艿：待实现 -->
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template #label><span style="color: red">提醒: </span></template>
+        买家付款成功后，货款将直接进入您的商户号（微信、支付宝）<br />
+        请及时关注你发出的包裹状态，确保可以配送至买家手中 <br />
+        如果买家表示没收到货或货物有问题，请及时联系买家处理，友好协商
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <!-- 物流信息 TODO -->
+
+    <!-- 商品信息 -->
+    <el-descriptions title="商品信息" column="6">
+      <el-descriptions-item labelClassName="no-colon">
+        <el-row :gutter="20">
+          <el-col :span="10">
+            <el-table :data="order.items" border>
+              <el-table-column prop="spuName" label="商品" width="400">
+                <template #default="{ row }">
+                  {{ row.spuName }}
+                  <el-tag
+                    size="medium"
+                    v-for="property in row.properties"
+                    :key="property.propertyId"
+                  >
+                    {{ property.propertyName }}：{{ property.valueName }}</el-tag
+                  >
+                </template>
+              </el-table-column>
+              <el-table-column prop="originalUnitPrice" label="单价(元)" width="180">
+                <template #default="{ row }">
+                  ￥{{ (row.originalUnitPrice / 100.0).toFixed(2) }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="count" label="数量" width="100" />
+              <el-table-column prop="originalPrice" label="小计（元）" width="100">
+                <template #default="{ row }">
+                  ￥{{ (row.originalPrice / 100.0).toFixed(2) }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="afterSaleStatus" label="退款状态">
+                <template #default="{ row }">
+                  <dict-tag
+                    :type="DICT_TYPE.TRADE_ORDER_ITEM_AFTER_SALE_STATUS"
+                    :value="row.afterSaleStatus"
+                  />
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-col>
+          <el-col :span="10" />
+        </el-row>
+      </el-descriptions-item>
+      <!-- 占位 -->
+      <!-- <el-descriptions-item v-for="item in 5" label-class-name="no-colon" :key="item" /> -->
+    </el-descriptions>
+    <el-descriptions column="6">
+      <el-descriptions-item label="商品总额: "
+        >￥{{ (order.originalPrice / 100.0).toFixed(2) }}</el-descriptions-item
+      >
+      <el-descriptions-item label="运费金额: "
+        >￥{{ (order.deliveryPrice / 100.0).toFixed(2) }}</el-descriptions-item
+      >
+      <el-descriptions-item label="订单调价: "
+        >￥{{ (order.adjustPrice / 100.0).toFixed(2) }}</el-descriptions-item
+      >
+      <el-descriptions-item>
+        <template #label><span style="color: red">商品优惠: </span></template>
+        ￥{{ ((order.originalPrice - order.originalPrice) / 100.0).toFixed(2) }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template #label><span style="color: red">订单优惠: </span></template>
+        ￥{{ (order.discountPrice / 100.0).toFixed(2) }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template #label><span style="color: red">积分抵扣: </span></template>
+        ￥{{ (order.pointPrice / 100.0).toFixed(2) }}
+      </el-descriptions-item>
+
+      <el-descriptions-item v-for="item in 5" label-class-name="no-colon" :key="item" />
+      <!-- 占位 -->
+      <el-descriptions-item label="应付金额: ">
+        ￥{{ (order.payPrice / 100.0).toFixed(2) }}
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <div v-for="group in detailGroups" :key="group.title">
+      <el-descriptions v-bind="group.groupProps" :title="group.title">
+        <!-- 订单操作日志 -->
+        <el-descriptions-item v-if="group.key === 'orderLog'" labelClassName="no-colon">
+          <el-timeline>
+            <el-timeline-item
+              v-for="activity in detailInfo[group.key]"
+              :key="activity.timestamp"
+              :timestamp="activity.timestamp"
+            >
+              {{ activity.content }}
+            </el-timeline-item>
+          </el-timeline>
+        </el-descriptions-item>
+
+        <!-- 物流信息 -->
+        <el-descriptions-item v-if="group.key === 'expressInfo'" labelClassName="no-colon">
+          <el-tabs type="card">
+            <!-- 循环包裹物流信息 -->
+            <el-tab-pane
+              v-for="pkgInfo in detailInfo[group.key]"
+              :key="pkgInfo.label"
+              :label="pkgInfo.label"
+            >
+              <!-- 包裹详情 -->
+              <el-descriptions>
+                <el-descriptions-item
+                  v-for="(pkgChild, pkgCIdx) in group.children"
+                  v-bind="pkgChild.childProps"
+                  :key="`pkgChild_${pkgCIdx}`"
+                  :label="pkgChild.label"
+                >
+                  <!-- 包裹商品列表 -->
+                  <template v-if="pkgChild.valueKey === 'goodsList' && pkgInfo[pkgChild.valueKey]">
+                    <div
+                      v-for="(goodInfo, goodInfoIdx) in pkgInfo[pkgChild.valueKey]"
+                      :key="`goodInfo_${goodInfoIdx}`"
+                      style="display: flex"
+                    >
+                      <el-image
+                        style="width: 100px; height: 100px; flex: none"
+                        :src="goodInfo.imgUrl"
+                      />
+                      <el-descriptions :column="1">
+                        <el-descriptions-item labelClassName="no-colon">{{
+                          goodInfo.name
+                        }}</el-descriptions-item>
+                        <el-descriptions-item label="数量">{{
+                          goodInfo.count
+                        }}</el-descriptions-item>
+                      </el-descriptions>
+                    </div>
+                  </template>
+
+                  <!-- 包裹物流详情 -->
+                  <template v-else-if="pkgChild.valueKey === 'wlxq'">
+                    <el-row :gutter="10">
+                      <el-col :span="6" :offset="1">
+                        <el-timeline>
+                          <el-timeline-item
+                            v-for="(activity, index) in pkgInfo[pkgChild.valueKey]"
+                            :key="index"
+                            :timestamp="activity.timestamp"
+                          >
+                            {{ activity.content }}
+                          </el-timeline-item>
+                        </el-timeline>
+                      </el-col>
+                    </el-row>
+                  </template>
+                  <template v-else>
+                    {{ pkgInfo[pkgChild.valueKey] }}
+                  </template>
+                </el-descriptions-item>
+              </el-descriptions>
+            </el-tab-pane>
+          </el-tabs>
+        </el-descriptions-item>
+      </el-descriptions>
+    </div>
+  </ContentWrap>
+</template>
+<script lang="ts" name="TradeOrderDetail" setup>
+import { DICT_TYPE } from '@/utils/dict'
+import * as TradeOrderApi from '@/api/mall/trade/order'
+const message = useMessage() // 消息弹窗
+
+const { query } = useRoute()
+const queryParams = reactive({
+  id: query.id
+})
+const dialogVisible = ref(false)
+const loading = ref(false)
+const order = ref<any>({
+  items: [],
+  user: {}
+}) //详情数据
+
+const detailGroups = ref([
+  {
+    title: '物流信息',
+    key: 'expressInfo',
+    children: [
+      { label: '发货时间: ', valueKey: 'fhsj' },
+      { label: '物流公司: ', valueKey: 'wlgs' },
+      { label: '运单号: ', valueKey: 'ydh' },
+      { label: '物流状态: ', valueKey: 'wlzt', childProps: { span: 3 } },
+      { label: '物流详情: ', valueKey: 'wlxq' }
+    ]
+  },
+  {
+    title: '订单操作日志',
+    key: 'orderLog'
+  }
+])
+
+const detailInfo = ref({
+  expressInfo: [
+    // 物流信息
+    {
+      label: '包裹1',
+      name: 'bg1',
+      fhsj: '2022-11-03 16:50:45',
+      wlgs: '极兔',
+      ydh: '2132123',
+      wlzt: '不支持此快递公司',
+      wlxq: [
+        {
+          content: '正在派送途中,请您准备签收(派件人:王涛,电话:13854563814)',
+          timestamp: '2018-04-15 15:00:16'
+        },
+        {
+          content: '快件到达 【烟台龙口东江村委营业点】',
+          timestamp: '2018-04-13 14:54:19'
+        },
+        {
+          content: '快件已发车',
+          timestamp: '2018-04-11 12:55:52'
+        },
+        {
+          content: '快件已发车',
+          timestamp: '2018-04-11 12:55:52'
+        },
+        {
+          content: '快件已发车',
+          timestamp: '2018-04-11 12:55:52'
+        }
+      ]
+    }
+  ],
+  orderLog: [
+    // 订单操作日志
+    {
+      content: '买家【乌鸦】关闭了订单',
+      timestamp: '2018-04-15 15:00:16'
+    },
+    {
+      content: '买家【乌鸦】下单了',
+      timestamp: '2018-04-15 15:00:16'
+    }
+  ],
+  goodsInfo: [] // 商品详情tableData
+})
+//暂考虑一次性加载详情页面所有数据
+const getlist = async () => {
+  dialogVisible.value = true
+  loading.value = true
+  try {
+    const res = await TradeOrderApi.getOrderDetail(queryParams.id)
+    order.value = res
+  } catch {
+    message.error('获取详情数据失败')
+  } finally {
+    loading.value = false
+  }
+}
+onMounted(async () => {
+  await getlist()
+})
+const clipboardSuccess = () => {
+  message.success('复制成功')
+}
+</script>
+<style lang="scss" scoped>
+:deep(.el-descriptions) {
+  &:not(:nth-child(1)) {
+    margin-top: 20px;
+  }
+  .el-descriptions__title {
+    display: flex;
+    align-items: center;
+    &::before {
+      content: '';
+      display: inline-block;
+      margin-right: 10px;
+      width: 3px;
+      height: 20px;
+      background-color: #409eff;
+    }
+  }
+  .el-descriptions-item__container {
+    margin: 0 10px;
+    .no-colon {
+      margin: 0;
+      &::after {
+        content: '';
+      }
+    }
+  }
+}
+</style>