From 9538dfdce5186fbee67a0895926e102a136dac68 Mon Sep 17 00:00:00 2001
From: DanyangZhao <1909085973@qq.com>
Date: Mon, 26 Jun 2023 09:14:01 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E7=9B=B2=E7=9B=92=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E9=83=A8=E5=88=86=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/blindBox/blindBoxOeder.ts             |  69 ++++
 src/router/modules/blindBox.ts                |  12 +-
 src/views/blindBox/bindBoxOrder/index.vue     | 349 ++++++++++++++++++
 .../blindBox/bindBoxOrder/lib/columns.ts      |  90 +++++
 src/views/login/index.vue                     |  11 +-
 5 files changed, 528 insertions(+), 3 deletions(-)
 create mode 100644 src/api/blindBox/blindBoxOeder.ts
 create mode 100644 src/views/blindBox/bindBoxOrder/index.vue
 create mode 100644 src/views/blindBox/bindBoxOrder/lib/columns.ts

diff --git a/src/api/blindBox/blindBoxOeder.ts b/src/api/blindBox/blindBoxOeder.ts
new file mode 100644
index 0000000..3b68ed0
--- /dev/null
+++ b/src/api/blindBox/blindBoxOeder.ts
@@ -0,0 +1,69 @@
+import { http } from '@/utils/http/axios';
+
+export interface BasicResponseModel<T = any> {
+  code: number;
+  message: string;
+  result: T;
+}
+
+/**
+ * @description: 盲盒订单表列表
+ */
+export function getBlindBoxOrderPage(params?) {
+  return http.request({
+    url: '/blind-box/blind-box-order/page',
+    method: 'GET',
+    params,
+  });
+}
+//isTransformResponse true不进行任何处理直接返回， false会进行处理后返回 例如权限不够都会处理
+/**
+ * 保存盲盒订单表
+ * @param params
+ */
+export function saveBlindBoxOrder(params?) {
+  return http.request<BasicResponseModel>(
+    {
+      url: `/blind-box/blind-box-order`,
+      method: 'POST',
+      params,
+    },
+    {
+      isTransformResponse: false,
+    }
+  );
+}
+
+/**
+ * 编辑盲盒订单表
+ * @param params
+ */
+export function updateBlindBoxOrder(params?) {
+  return http.request<BasicResponseModel>(
+    {
+      url: `/blind-box/blind-box-order/${params.id}`,
+      method: 'PUT',
+      params,
+    },
+    {
+      isTransformResponse: false,
+    }
+  );
+}
+
+/**
+ * 删除盲盒订单表
+ * @param params
+ */
+export function deleteBlindBoxOrder(params?) {
+  return http.request<BasicResponseModel>(
+    {
+      url: `/blind-box/blind-box-order/${params.id}`,
+      method: 'DELETE',
+      params,
+    },
+    {
+      isTransformResponse: false,
+    }
+  );
+}
diff --git a/src/router/modules/blindBox.ts b/src/router/modules/blindBox.ts
index 38d53d2..f513d91 100755
--- a/src/router/modules/blindBox.ts
+++ b/src/router/modules/blindBox.ts
@@ -23,7 +23,7 @@ const routes: Array<RouteRecordRaw> = [
     meta: {
       title: '盲盒',
       icon: renderIcon(GiftOutlined),
-      permissions: ['blind_box_list'],
+      permissions: ['blind_box_list', 'blind_box_order'],
       sort: 4,
     },
     children: [
@@ -49,6 +49,16 @@ const routes: Array<RouteRecordRaw> = [
         },
         component: () => import('@/views/blindBox/blindBox/blindBoxCreate.vue'),
       },
+      {
+        path: 'blind-box-order',
+        name: 'blindBoxOrder',
+        meta: {
+          title: '盲盒订单',
+          permissions: ['blind_box_order'],
+          //keepAlive: true,
+        },
+        component: () => import('@/views/blindBox/bindBoxOrder/index.vue'),
+      },
     ],
   },
 ];
diff --git a/src/views/blindBox/bindBoxOrder/index.vue b/src/views/blindBox/bindBoxOrder/index.vue
new file mode 100644
index 0000000..db31f45
--- /dev/null
+++ b/src/views/blindBox/bindBoxOrder/index.vue
@@ -0,0 +1,349 @@
+<template>
+  <n-card :bordered="false" class="proCard">
+    <BasicForm @register="register" @submit="handleSubmit" @reset="handleReset">
+      <template #statusSlot="{ model, field }">
+        <n-input v-model:value="model[field]" />
+      </template>
+    </BasicForm>
+
+    <BasicTable
+      :columns="columns"
+      :request="loadDataTable"
+      :row-key="(row) => row.id"
+      ref="actionRef"
+      :actionColumn="actionColumn"
+      @update:checked-row-keys="onCheckedRow"
+      :scroll-x="1090"
+    >
+      <template #tableTitle>
+        <n-button type="primary" @click="addTable">
+          <template #icon>
+            <n-icon>
+              <PlusOutlined />
+            </n-icon>
+          </template>
+          新建
+        </n-button>
+      </template>
+
+      <template #toolbar>
+        <n-button type="primary" @click="reloadTable">刷新数据</n-button>
+      </template>
+    </BasicTable>
+
+    <n-modal v-model:show="showModal" :show-icon="false" preset="dialog" :title="editTitle">
+      <n-form
+        :model="formParams"
+        :rules="rules"
+        ref="formRef"
+        label-placement="left"
+        :label-width="80"
+        class="py-4"
+      >
+        <n-form-item label="订单编号" path="orderSn">
+          <n-input placeholder="请输入订单编号" v-model:value="formParams.orderSn" />
+        </n-form-item>
+        <n-form-item label="盲盒id" path="blindBoxId">
+          <n-input placeholder="请输入盲盒id" v-model:value="formParams.blindBoxId" />
+        </n-form-item>
+        <n-form-item label="会员id" path="memberId">
+          <n-input placeholder="请输入会员id" v-model:value="formParams.memberId" />
+        </n-form-item>
+        <n-form-item label="盲盒抽奖次数" path="blindBoxNum">
+          <n-input placeholder="请输入盲盒抽奖次数" v-model:value="formParams.blindBoxNum" />
+        </n-form-item>
+        <n-form-item label="订单总价" path="price">
+          <n-input placeholder="请输入订单总价" v-model:value="formParams.price" />
+        </n-form-item>
+        <n-form-item label="订单状态" path="status">
+          <n-input placeholder="请输入订单状态" v-model:value="formParams.status" />
+        </n-form-item>
+        <n-form-item label="第三方支付单号" path="paymentOrderNo">
+          <n-input placeholder="请输入第三方支付单号" v-model:value="formParams.paymentOrderNo" />
+        </n-form-item>
+        <n-form-item label="支付时间" path="payTime">
+          <n-input placeholder="请输入支付时间" v-model:value="formParams.payTime" />
+        </n-form-item>
+        <n-form-item label="创建时间" path="createTime">
+          <n-input placeholder="请输入创建时间" v-model:value="formParams.createTime" />
+        </n-form-item>
+      </n-form>
+
+      <template #action>
+        <n-space>
+          <n-button @click="() => (showModal = false)">取消</n-button>
+          <n-button type="info" :loading="formBtnLoading" @click="confirmForm">确定</n-button>
+        </n-space>
+      </template>
+    </n-modal>
+  </n-card>
+</template>
+
+<script lang="ts" setup>
+  import { h, reactive, ref } from 'vue';
+  import { useDialog, useMessage } from 'naive-ui';
+  import { BasicTable, TableAction } from '@/components/Table';
+  import { BasicForm, FormSchema, useForm } from '@/components/Form/index';
+  import {
+    getBlindBoxOrderPage,
+    saveBlindBoxOrder,
+    updateBlindBoxOrder,
+    deleteBlindBoxOrder,
+  } from '@/api/blindBox/blindBoxOeder';
+  import { columns } from './lib/columns';
+  import { PlusOutlined } from '@vicons/antd';
+  import { ResultEnum } from '@/enums/httpEnum';
+
+  const rules = {
+    orderSn: {
+      required: true,
+      trigger: ['blur', 'input'],
+      message: '请输入订单编号',
+    },
+    blindBoxId: {
+      required: true,
+      trigger: ['blur', 'input'],
+      message: '请输入盲盒id',
+    },
+    memberId: {
+      required: true,
+      trigger: ['blur', 'input'],
+      message: '请输入会员id',
+    },
+    blindBoxNum: {
+      required: true,
+      trigger: ['blur', 'input'],
+      message: '请输入盲盒抽奖次数',
+    },
+    price: {
+      required: true,
+      trigger: ['blur', 'input'],
+      message: '请输入订单总价',
+    },
+    status: {
+      required: true,
+      trigger: ['blur', 'input'],
+      message: '请输入订单状态',
+    },
+    paymentOrderNo: {
+      required: true,
+      trigger: ['blur', 'input'],
+      message: '请输入第三方支付单号',
+    },
+    payTime: {
+      required: true,
+      trigger: ['blur', 'input'],
+      message: '请输入支付时间',
+    },
+    createTime: {
+      required: true,
+      trigger: ['blur', 'input'],
+      message: '请输入创建时间',
+    },
+  };
+
+  const schemas: FormSchema[] = [
+    {
+      field: 'orderSn',
+      component: 'NInput',
+      label: '订单编号',
+      rules: [{ required: false }],
+    },
+    {
+      field: 'blindBoxId',
+      component: 'NInput',
+      label: '盲盒id',
+      rules: [{ required: false }],
+    },
+    {
+      field: 'memberId',
+      component: 'NInput',
+      label: '会员id',
+      rules: [{ required: false }],
+    },
+    {
+      field: 'blindBoxNum',
+      component: 'NInput',
+      label: '盲盒抽奖次数',
+      rules: [{ required: false }],
+    },
+    {
+      field: 'price',
+      component: 'NInput',
+      label: '订单总价',
+      rules: [{ required: false }],
+    },
+    {
+      field: 'status',
+      component: 'NInput',
+      label: '订单状态',
+      rules: [{ required: false }],
+    },
+    {
+      field: 'paymentOrderNo',
+      component: 'NInput',
+      label: '第三方支付单号',
+      rules: [{ required: false }],
+    },
+    {
+      field: 'payTime',
+      component: 'NInput',
+      label: '支付时间',
+      rules: [{ required: false }],
+    },
+    {
+      field: 'createTime',
+      component: 'NInput',
+      label: '创建时间',
+      rules: [{ required: false }],
+    },
+  ];
+
+  const formRef: any = ref(null);
+  const message = useMessage();
+  const actionRef = ref();
+
+  const showModal = ref(false);
+  const formBtnLoading = ref(false);
+  const checkedBlindBoxOrderId = ref(); //当前编辑id
+  const isEdit = ref(false); // 弹出框是否为编辑
+  const editTitle = ref('');
+  // const dialog = useDialog();
+  const formParams = reactive({
+    id: null,
+    orderSn: '',
+    blindBoxId: '',
+    memberId: '',
+    blindBoxNum: '',
+    price: '',
+    status: '',
+    paymentOrderNo: '',
+    payTime: '',
+    createTime: '',
+  });
+  const formParamsBak = { ...formParams };
+
+  const params = ref({});
+
+  const actionColumn = reactive({
+    width: 220,
+    title: '操作',
+    key: 'action',
+    fixed: 'right',
+    render(record) {
+      return h(TableAction as any, {
+        style: 'button',
+        actions: [
+          {
+            label: '查看',
+            onClick: handleEdit.bind(null, record),
+          },
+          // {
+          //   label: '删除',
+          //   icon: 'ic:outline-delete-outline',
+          //   onClick: handleDelete.bind(null, record),
+          // },
+        ],
+      });
+    },
+  });
+
+  const [register, {}] = useForm({
+    gridProps: { cols: '1 s:1 m:2 l:3 xl:4 2xl:4' },
+    labelWidth: 100,
+    schemas,
+  });
+
+  function addTable() {
+    // 新增清空表单
+    Object.assign(formParams, formParamsBak);
+    isEdit.value = false;
+    showModal.value = true;
+    editTitle.value = '新建';
+  }
+
+  const loadDataTable = async (res) => {
+    return await getBlindBoxOrderPage({ ...params.value, ...res });
+  };
+  function onCheckedRow(rowKeys) {
+    console.log(rowKeys);
+  }
+
+  function reloadTable() {
+    actionRef.value.reload();
+  }
+
+  function confirmForm(e) {
+    e.preventDefault();
+    formBtnLoading.value = true;
+    formRef.value.validate(async (errors) => {
+      if (!errors) {
+        let response;
+        // 如果是编辑
+        if (isEdit.value) {
+          formParams.id = checkedBlindBoxOrderId.value;
+          response = await updateBlindBoxOrder(formParams);
+        } else {
+          response = await saveBlindBoxOrder(formParams);
+        }
+        const { message: msg, code } = response;
+        if (code == ResultEnum.SUCCESS) {
+          message.success(msg);
+          Object.assign(formParams, formParamsBak);
+          showModal.value = false;
+          reloadTable();
+        } else {
+          message.error(msg);
+        }
+      } else {
+        message.error('请填写完整信息');
+      }
+      formBtnLoading.value = false;
+    });
+  }
+
+  function handleEdit(record: Recordable) {
+    console.log('点击了编辑', record);
+    checkedBlindBoxOrderId.value = record.id;
+    Object.assign(formParams, record);
+    editTitle.value = '查看';
+    showModal.value = true;
+    isEdit.value = true;
+  }
+
+  // function handleDelete(record: Recordable) {
+  //   console.log('点击了删除', record);
+  //   dialog.info({
+  //     title: '提示',
+  //     content: `您确定想删除吗?`,
+  //     positiveText: '确定',
+  //     negativeText: '取消',
+  //     onPositiveClick: async () => {
+  //       const params = { id: record.id };
+  //       const response = await deleteBlindBoxOrder(params);
+  //       const { message: msg, code } = response;
+  //       if (code == ResultEnum.SUCCESS) {
+  //         message.success(msg);
+  //         reloadTable();
+  //       } else {
+  //         message.error(msg);
+  //       }
+  //     },
+  //     onNegativeClick: () => {
+  //       message.error('已取消');
+  //     },
+  //   });
+  // }
+
+  function handleSubmit(values: Recordable) {
+    console.log(values);
+    params.value = values;
+    reloadTable();
+  }
+
+  function handleReset(values: Recordable) {
+    console.log(values);
+  }
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/blindBox/bindBoxOrder/lib/columns.ts b/src/views/blindBox/bindBoxOrder/lib/columns.ts
new file mode 100644
index 0000000..6ebd928
--- /dev/null
+++ b/src/views/blindBox/bindBoxOrder/lib/columns.ts
@@ -0,0 +1,90 @@
+import { formatToDateTime } from '@/utils/dateUtil';
+
+export const columns = [
+  {
+    title: 'ID',
+    key: 'id',
+    width: 100,
+  },
+  {
+    title: '订单编号',
+    key: 'orderSn',
+    width: 100,
+  },
+  {
+    title: '盲盒id',
+    key: 'blindBoxId',
+    width: 100,
+  },
+  {
+    title: '会员id',
+    key: 'memberId',
+    width: 100,
+  },
+  {
+    title: '抽奖次数',
+    key: 'blindBoxNum',
+    width: 100,
+  },
+  {
+    title: '订单总价',
+    key: 'price',
+    width: 100,
+  },
+  {
+    title: '订单状态',
+    key: 'status',
+    width: 100,
+    render: (data) => {
+      try {
+        // if (data.status === 0) {
+        //   return '待支付';
+        // } else if (data.status === 1) {
+        //   return '已支付';
+        // } else if (data.status === 2) {
+        //   return '已提货';
+        // } else if (data.status === 3) {
+        //   return '已完成';
+        // }
+        switch (data.status) {
+          case 0:
+            return '待支付';
+          case 1:
+            return '已支付';
+          case 2:
+            return '已提货';
+          case 3:
+            return '已完成';
+          default:
+            break;
+        }
+      } catch (error) {
+        console.log(error);
+      }
+    },
+  },
+  {
+    title: '第三方支付单号',
+    key: 'paymentOrderNo',
+    width: 100,
+  },
+  {
+    title: '支付时间',
+    key: 'payTime',
+    width: 100,
+  },
+  {
+    title: '创建时间',
+    key: 'createTime',
+    width: 100,
+    render: (data) => {
+      try {
+        const createTime = data.createTime * 1000;
+        return formatToDateTime(createTime);
+      } catch (error) {
+        console.log(error);
+        return data.createTime;
+      }
+    },
+  },
+];
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index dd9a065..f9006c6 100755
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -5,6 +5,7 @@
       <div class="view-account-top">
         <div class="view-account-top-logo">
           <img src="~@/assets/images/account-logo.png" alt="" />
+          {{ title }}
         </div>
         <!-- <div class="view-account-top-desc"> 后台管理框架解决方案</div> -->
       </div>
@@ -92,7 +93,7 @@
   import { ResultEnum } from '@/enums/httpEnum';
   import { PersonOutline, LockClosedOutline, LogoGithub, LogoFacebook } from '@vicons/ionicons5';
   import { PageEnum } from '@/enums/pageEnum';
-
+  import { getTitle } from '@/api/login';
   interface FormState {
     userName: string;
     password: string;
@@ -103,7 +104,7 @@
   const loading = ref(false);
   const autoLogin = ref(true);
   const LOGIN_NAME = PageEnum.BASE_LOGIN_NAME;
-
+  const title = ref<string>('雅尚轩后台管理页面');
   const formInline = reactive({
     // userName: 'admin',
     // password: '123456',
@@ -155,6 +156,12 @@
       }
     });
   };
+  // 获取登录标题
+  const getTitles = async () => {
+    const res = await getTitle();
+    console.log(res);
+  };
+  getTitles();
 </script>
 
 <style lang="less" scoped>
-- 
Gitee


From c16408793c926b83e6d1babe72da3de448af7293 Mon Sep 17 00:00:00 2001
From: DanyangZhao <1909085973@qq.com>
Date: Mon, 26 Jun 2023 16:13:03 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E7=9B=B2=E7=9B=92=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lib/components/OrderTable.vue             | 115 ++++++++++++++++++
 1 file changed, 115 insertions(+)
 create mode 100644 src/views/blindBox/bindBoxOrder/lib/components/OrderTable.vue

diff --git a/src/views/blindBox/bindBoxOrder/lib/components/OrderTable.vue b/src/views/blindBox/bindBoxOrder/lib/components/OrderTable.vue
new file mode 100644
index 0000000..852376c
--- /dev/null
+++ b/src/views/blindBox/bindBoxOrder/lib/components/OrderTable.vue
@@ -0,0 +1,115 @@
+<script setup lang="ts">
+import { S } from 'mockjs';
+
+  // import { defineProps } from 'vue';
+  // eslint-disable-next-line vue/no-setup-props-destructure
+  const { item } = defineProps<{
+    item: Item;
+  }>();
+  interface Item {
+    orderCode: string;
+    orderPrice: number;
+    payStatus: number;
+    shipmentsStatus: number;
+    orderStatus: number;
+    payPrice: number;
+    payManner: number;
+    deliveryMethod: number;
+    invoiceType: number;
+    invoiceContent: string;
+    taxCode: string;
+    invoiceOpen: string;
+    'order-price': number;
+    'shop-price': number;
+    'coupons-price': number;
+    'integral-price': number;
+    shopWeight: number;
+    shopPrice: number;
+    downOrderMan: string;
+    downOrderSource: string;
+    downOrderTime: string;
+    distributionPrice: number;
+    harvestStatus: number;
+  }
+  console.log(item);
+</script>
+
+<template>
+  <div class="message">
+    <div class="order-msg-title">
+      <div class="line"></div>
+      <div class="order-message">订单信息</div>
+    </div>
+    <div class="order-msg-content">
+      <table class="table" width="100%">
+        <tr>
+          <td>订单号: {{ item.orderCode }}</td>
+          <td>订单总金额: ￥{{ item.orderPrice.toFixed(2) }}元</td>
+          <td>支付状态: {{ item.payStatus === 0 ? '未付款' : '已付款' }}</td>
+        </tr>
+        <tr>
+          <td>发货状态: {{ item.shipmentsStatus === 0 ? '未发货' : '已发货' }}</td>
+          <td>订单状态: {{ item.orderStatus === 0 ? '正常' : '已超时' }}</td>
+          <td>已支付金额: ￥{{ item.payPrice.toFixed(2) }}元</td>
+        </tr>
+        <tr>
+          <td>支付方式: </td>
+          <td>配送方式: </td>
+          <td>发票类型: {{ item.invoiceType === 0 ? '不开发票' : '开发票' }}</td>
+        </tr>
+        <tr>
+          <td>发票内容: {{ item.invoiceContent }}</td>
+          <td>税号: {{ item.taxCode }}</td>
+          <td>发票抬头: {{ item.invoiceOpen }}</td>
+        </tr>
+        <tr>
+          <td>订单优惠金额: ￥{{ item['order-price'].toFixed(2) }}元</td>
+          <td>商品优惠金额: ￥{{ item['shop-price'].toFixed(2) }}元</td>
+          <td>优惠券优惠: ￥{{ item['coupons-price'].toFixed(2) }}元</td>
+        </tr>
+        <tr>
+          <td>积分优惠: ￥{{ item['integral-price'].toFixed(2) }}元</td>
+          <td>商品总重量: {{ item.shopWeight }}</td>
+          <td>商品总价: ￥{{ item.shopPrice.toFixed(2) }}元</td>
+        </tr>
+        <tr>
+          <td>下单人: {{ item.downOrderMan }}</td>
+          <td>下单来源: {{ item.downOrderSource }}</td>
+          <td>下单时间: {{ item.downOrderTime }}</td>
+        </tr>
+        <tr>
+          <td>配送费用: ￥{{ item.distributionPrice.toFixed(2) }}元</td>
+          <td>收货状态: {{ item.harvestStatus === 0 ? '未确认收货' : '已确认收获' }}</td>
+        </tr>
+      </table>
+    </div>
+  </div>
+</template>
+
+<style scoped lang="less">
+  .message {
+    margin-top: 15px;
+    position: relative;
+    padding-top: 10px;
+    .order-msg-title {
+      margin-bottom: 10px;
+      .line {
+        position: absolute;
+        top: 0;
+        color: #666;
+        background-color: #666;
+        width: 100%;
+        height: 1px;
+      }
+      .order-message {
+        position: absolute;
+        top: -10px;
+        left: 15px;
+        background-color: #fff;
+        color: #666;
+        text-align: center;
+        width: 70px;
+      }
+    }
+  }
+</style>
-- 
Gitee


From 2fac1f658b5e16e4ad7ab689987afd1b3527ef2d Mon Sep 17 00:00:00 2001
From: DanyangZhao <1909085973@qq.com>
Date: Mon, 26 Jun 2023 16:16:47 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/blindBox/bindBoxOrder/index.vue | 192 ++++++++++++----------
 1 file changed, 103 insertions(+), 89 deletions(-)

diff --git a/src/views/blindBox/bindBoxOrder/index.vue b/src/views/blindBox/bindBoxOrder/index.vue
index db31f45..ad767e1 100644
--- a/src/views/blindBox/bindBoxOrder/index.vue
+++ b/src/views/blindBox/bindBoxOrder/index.vue
@@ -31,44 +31,26 @@
       </template>
     </BasicTable>
 
-    <n-modal v-model:show="showModal" :show-icon="false" preset="dialog" :title="editTitle">
-      <n-form
-        :model="formParams"
-        :rules="rules"
-        ref="formRef"
-        label-placement="left"
-        :label-width="80"
-        class="py-4"
-      >
-        <n-form-item label="订单编号" path="orderSn">
-          <n-input placeholder="请输入订单编号" v-model:value="formParams.orderSn" />
-        </n-form-item>
-        <n-form-item label="盲盒id" path="blindBoxId">
-          <n-input placeholder="请输入盲盒id" v-model:value="formParams.blindBoxId" />
-        </n-form-item>
-        <n-form-item label="会员id" path="memberId">
-          <n-input placeholder="请输入会员id" v-model:value="formParams.memberId" />
-        </n-form-item>
-        <n-form-item label="盲盒抽奖次数" path="blindBoxNum">
-          <n-input placeholder="请输入盲盒抽奖次数" v-model:value="formParams.blindBoxNum" />
-        </n-form-item>
-        <n-form-item label="订单总价" path="price">
-          <n-input placeholder="请输入订单总价" v-model:value="formParams.price" />
-        </n-form-item>
-        <n-form-item label="订单状态" path="status">
-          <n-input placeholder="请输入订单状态" v-model:value="formParams.status" />
-        </n-form-item>
-        <n-form-item label="第三方支付单号" path="paymentOrderNo">
-          <n-input placeholder="请输入第三方支付单号" v-model:value="formParams.paymentOrderNo" />
-        </n-form-item>
-        <n-form-item label="支付时间" path="payTime">
-          <n-input placeholder="请输入支付时间" v-model:value="formParams.payTime" />
-        </n-form-item>
-        <n-form-item label="创建时间" path="createTime">
-          <n-input placeholder="请输入创建时间" v-model:value="formParams.createTime" />
-        </n-form-item>
-      </n-form>
-
+    <n-modal
+      v-model:show="showModal"
+      :show-icon="false"
+      preset="dialog"
+      :title="editTitle"
+      class="width"
+      style="width: 850px"
+    >
+      <n-card title="" style="margin-bottom: 14px">
+        <n-tabs type="line" animated>
+          <n-tab-pane name="message" tab="基本信息">
+            <order-table v-for="item in shopMessage" :key="item.id" :item="item.message" />
+          </n-tab-pane>
+          <n-tab-pane name="commodityMSG" tab="商品信息"> 商品信息 </n-tab-pane>
+          <n-tab-pane name="payOrder" tab="支付单/退款单"> 退款单 </n-tab-pane>
+          <n-tab-pane name="shipmentsOrder" tab="发货单/退货单"> 发货单 </n-tab-pane>
+          <n-tab-pane name="orderRecording" tab="订单记录"> 订单记录 </n-tab-pane>
+          <n-tab-pane name="orderRemark" tab="订单备注"> 订单备注 </n-tab-pane>
+        </n-tabs>
+      </n-card>
       <template #action>
         <n-space>
           <n-button @click="() => (showModal = false)">取消</n-button>
@@ -94,53 +76,53 @@
   import { PlusOutlined } from '@vicons/antd';
   import { ResultEnum } from '@/enums/httpEnum';
 
-  const rules = {
-    orderSn: {
-      required: true,
-      trigger: ['blur', 'input'],
-      message: '请输入订单编号',
-    },
-    blindBoxId: {
-      required: true,
-      trigger: ['blur', 'input'],
-      message: '请输入盲盒id',
-    },
-    memberId: {
-      required: true,
-      trigger: ['blur', 'input'],
-      message: '请输入会员id',
-    },
-    blindBoxNum: {
-      required: true,
-      trigger: ['blur', 'input'],
-      message: '请输入盲盒抽奖次数',
-    },
-    price: {
-      required: true,
-      trigger: ['blur', 'input'],
-      message: '请输入订单总价',
-    },
-    status: {
-      required: true,
-      trigger: ['blur', 'input'],
-      message: '请输入订单状态',
-    },
-    paymentOrderNo: {
-      required: true,
-      trigger: ['blur', 'input'],
-      message: '请输入第三方支付单号',
-    },
-    payTime: {
-      required: true,
-      trigger: ['blur', 'input'],
-      message: '请输入支付时间',
-    },
-    createTime: {
-      required: true,
-      trigger: ['blur', 'input'],
-      message: '请输入创建时间',
-    },
-  };
+  // const rules = {
+  //   orderSn: {
+  //     required: true,
+  //     trigger: ['blur', 'input'],
+  //     message: '请输入订单编号',
+  //   },
+  //   blindBoxId: {
+  //     required: true,
+  //     trigger: ['blur', 'input'],
+  //     message: '请输入盲盒id',
+  //   },
+  //   memberId: {
+  //     required: true,
+  //     trigger: ['blur', 'input'],
+  //     message: '请输入会员id',
+  //   },
+  //   blindBoxNum: {
+  //     required: true,
+  //     trigger: ['blur', 'input'],
+  //     message: '请输入盲盒抽奖次数',
+  //   },
+  //   price: {
+  //     required: true,
+  //     trigger: ['blur', 'input'],
+  //     message: '请输入订单总价',
+  //   },
+  //   status: {
+  //     required: true,
+  //     trigger: ['blur', 'input'],
+  //     message: '请输入订单状态',
+  //   },
+  //   paymentOrderNo: {
+  //     required: true,
+  //     trigger: ['blur', 'input'],
+  //     message: '请输入第三方支付单号',
+  //   },
+  //   payTime: {
+  //     required: true,
+  //     trigger: ['blur', 'input'],
+  //     message: '请输入支付时间',
+  //   },
+  //   createTime: {
+  //     required: true,
+  //     trigger: ['blur', 'input'],
+  //     message: '请输入创建时间',
+  //   },
+  // };
 
   const schemas: FormSchema[] = [
     {
@@ -202,12 +184,43 @@
   const formRef: any = ref(null);
   const message = useMessage();
   const actionRef = ref();
-
   const showModal = ref(false);
   const formBtnLoading = ref(false);
   const checkedBlindBoxOrderId = ref(); //当前编辑id
   const isEdit = ref(false); // 弹出框是否为编辑
   const editTitle = ref('');
+  import OrderTable from '@/views/blindBox/bindBoxOrder/lib/components/OrderTable.vue';
+  const shopMessage = ref([
+    {
+      id: 1,
+      title: '订单信息',
+      message: {
+        orderCode: '051210450286787',
+        orderPrice: 208,
+        payStatus: 0, //两种状态0代表未付款 1代表已付款
+        shipmentsStatus: 0, // 0代表未付款未发货 1代表已付款未发货 2已付款已发货
+        orderStatus: 0, // 0代表正常 1代表超时
+        payPrice: 0,
+        payManner: 0, // 0代表还未支付 1代表支付宝 2代表微信 3代表银行卡
+        deliveryMethod: 0, // 0代表还没选好配送方式
+        invoiceType: 0, //0不开发票 1电子发票 2纸质发票
+        invoiceContent: '',
+        taxCode: '',
+        invoiceOpen: '',
+        'order-price': 0,
+        'shop-price': 0,
+        'coupons-price': 0,
+        'integral-price': 0,
+        shopWeight: 0,
+        shopPrice: 208,
+        downOrderMan: '15033****46',
+        downOrderSource: 'H5页面',
+        downOrderTime: '2023-05-12 10:45:02',
+        distributionPrice: 0,
+        harvestStatus: 0, //0未确认收获 1已确认收货
+      },
+    },
+  ]);
   // const dialog = useDialog();
   const formParams = reactive({
     id: null,
@@ -235,14 +248,13 @@
         style: 'button',
         actions: [
           {
-            label: '查看',
+            label: '订单详情',
             onClick: handleEdit.bind(null, record),
           },
           // {
           //   label: '删除',
           //   icon: 'ic:outline-delete-outline',
           //   onClick: handleDelete.bind(null, record),
-          // },
         ],
       });
     },
@@ -304,9 +316,11 @@
 
   function handleEdit(record: Recordable) {
     console.log('点击了编辑', record);
+    // const time = record.createTime * 1000;
+    // record.createTime = formatToDateTime(time);
     checkedBlindBoxOrderId.value = record.id;
     Object.assign(formParams, record);
-    editTitle.value = '查看';
+    editTitle.value = '订单详情';
     showModal.value = true;
     isEdit.value = true;
   }
-- 
Gitee


From c3c07894e979d2f17aa2b1d1508d2e770765cb01 Mon Sep 17 00:00:00 2001
From: DanyangZhao <1909085973@qq.com>
Date: Tue, 27 Jun 2023 10:37:31 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2logo?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/index.vue | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index f9006c6..17c9f0f 100755
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -4,8 +4,8 @@
     <div class="view-account-container">
       <div class="view-account-top">
         <div class="view-account-top-logo">
-          <img src="~@/assets/images/account-logo.png" alt="" />
-          {{ title }}
+          <!-- <img src="~@/assets/images/account-logo.png" alt="" /> -->
+          {{ title ? title : '' }}管理平台
         </div>
         <!-- <div class="view-account-top-desc"> 后台管理框架解决方案</div> -->
       </div>
@@ -93,7 +93,8 @@
   import { ResultEnum } from '@/enums/httpEnum';
   import { PersonOutline, LockClosedOutline, LogoGithub, LogoFacebook } from '@vicons/ionicons5';
   import { PageEnum } from '@/enums/pageEnum';
-  import { getTitle } from '@/api/login';
+  import { getSetting } from '@/api/system/setting';
+
   interface FormState {
     userName: string;
     password: string;
@@ -104,7 +105,7 @@
   const loading = ref(false);
   const autoLogin = ref(true);
   const LOGIN_NAME = PageEnum.BASE_LOGIN_NAME;
-  const title = ref<string>('雅尚轩后台管理页面');
+  let title = ref('1111');
   const formInline = reactive({
     // userName: 'admin',
     // password: '123456',
@@ -122,7 +123,12 @@
 
   const router = useRouter();
   const route = useRoute();
-
+  const getTitle = async () => {
+    const res = await getSetting({ settingName: 'site' });
+    // console.log(res.settings.siteName);
+    title.value = res.settings.siteName;
+    // console.log(title.value);
+  };
   const handleSubmit = (e) => {
     e.preventDefault();
     formRef.value.validate(async (errors) => {
@@ -156,12 +162,7 @@
       }
     });
   };
-  // 获取登录标题
-  const getTitles = async () => {
-    const res = await getTitle();
-    console.log(res);
-  };
-  getTitles();
+  getTitle();
 </script>
 
 <style lang="less" scoped>
@@ -218,4 +219,9 @@
       padding: 32px 0 24px 0;
     }
   }
+  .view-account-top-logo {
+    margin-left: -69px;
+    font-size: 44px;
+    width: 500px;
+  }
 </style>
-- 
Gitee


From cc139662104c53b2b16beb6cd3c3e5a47283f67d Mon Sep 17 00:00:00 2001
From: DanyangZhao <1909085973@qq.com>
Date: Tue, 27 Jun 2023 10:40:11 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=95=B0=E5=80=BC=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 17c9f0f..18ba6a5 100755
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -105,7 +105,7 @@
   const loading = ref(false);
   const autoLogin = ref(true);
   const LOGIN_NAME = PageEnum.BASE_LOGIN_NAME;
-  let title = ref('1111');
+  let title = ref('');
   const formInline = reactive({
     // userName: 'admin',
     // password: '123456',
-- 
Gitee


From 4cfbf60ad84663a847ffbd62520254d858b39eda Mon Sep 17 00:00:00 2001
From: DanyangZhao <1909085973@qq.com>
Date: Tue, 27 Jun 2023 17:06:19 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E7=9B=B2=E7=9B=92=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=E9=A1=B5=E9=9D=A2=E9=83=A8=E5=88=86=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/blindBox/bindBoxOrder/index.vue     | 79 ++++------------
 .../blindBox/bindBoxOrder/lib/columns.ts      | 61 ++++++++-----
 .../lib/components/OrderTable.vue             | 90 +++++++------------
 3 files changed, 88 insertions(+), 142 deletions(-)

diff --git a/src/views/blindBox/bindBoxOrder/index.vue b/src/views/blindBox/bindBoxOrder/index.vue
index ad767e1..4e7483a 100644
--- a/src/views/blindBox/bindBoxOrder/index.vue
+++ b/src/views/blindBox/bindBoxOrder/index.vue
@@ -42,13 +42,9 @@
       <n-card title="" style="margin-bottom: 14px">
         <n-tabs type="line" animated>
           <n-tab-pane name="message" tab="基本信息">
-            <order-table v-for="item in shopMessage" :key="item.id" :item="item.message" />
+            <order-table :item="shopMessage" />
           </n-tab-pane>
           <n-tab-pane name="commodityMSG" tab="商品信息"> 商品信息 </n-tab-pane>
-          <n-tab-pane name="payOrder" tab="支付单/退款单"> 退款单 </n-tab-pane>
-          <n-tab-pane name="shipmentsOrder" tab="发货单/退货单"> 发货单 </n-tab-pane>
-          <n-tab-pane name="orderRecording" tab="订单记录"> 订单记录 </n-tab-pane>
-          <n-tab-pane name="orderRemark" tab="订单备注"> 订单备注 </n-tab-pane>
         </n-tabs>
       </n-card>
       <template #action>
@@ -75,7 +71,7 @@
   import { columns } from './lib/columns';
   import { PlusOutlined } from '@vicons/antd';
   import { ResultEnum } from '@/enums/httpEnum';
-
+  import { Item } from './lib/components/OrderTable.vue';
   // const rules = {
   //   orderSn: {
   //     required: true,
@@ -126,45 +122,33 @@
 
   const schemas: FormSchema[] = [
     {
-      field: 'orderSn',
-      component: 'NInput',
-      label: '订单编号',
-      rules: [{ required: false }],
-    },
-    {
-      field: 'blindBoxId',
+      field: 'blindBoxName',
       component: 'NInput',
-      label: '盲盒id',
+      label: '盲盒名称',
       rules: [{ required: false }],
     },
     {
-      field: 'memberId',
+      field: 'memberMobile',
       component: 'NInput',
-      label: '会员id',
+      label: '会员手机号',
       rules: [{ required: false }],
     },
     {
-      field: 'blindBoxNum',
+      field: 'memberName',
       component: 'NInput',
-      label: '盲盒抽奖次数',
+      label: '会员名称',
       rules: [{ required: false }],
     },
     {
-      field: 'price',
+      field: 'nickname',
       component: 'NInput',
-      label: '订单总价',
+      label: '会员昵称',
       rules: [{ required: false }],
     },
     {
-      field: 'status',
-      component: 'NInput',
-      label: '订单状态',
-      rules: [{ required: false }],
-    },
-    {
-      field: 'paymentOrderNo',
+      field: 'orderSn',
       component: 'NInput',
-      label: '第三方支付单号',
+      label: '订单编号',
       rules: [{ required: false }],
     },
     {
@@ -174,9 +158,9 @@
       rules: [{ required: false }],
     },
     {
-      field: 'createTime',
+      field: 'status',
       component: 'NInput',
-      label: '创建时间',
+      label: '订单状态',
       rules: [{ required: false }],
     },
   ];
@@ -190,37 +174,7 @@
   const isEdit = ref(false); // 弹出框是否为编辑
   const editTitle = ref('');
   import OrderTable from '@/views/blindBox/bindBoxOrder/lib/components/OrderTable.vue';
-  const shopMessage = ref([
-    {
-      id: 1,
-      title: '订单信息',
-      message: {
-        orderCode: '051210450286787',
-        orderPrice: 208,
-        payStatus: 0, //两种状态0代表未付款 1代表已付款
-        shipmentsStatus: 0, // 0代表未付款未发货 1代表已付款未发货 2已付款已发货
-        orderStatus: 0, // 0代表正常 1代表超时
-        payPrice: 0,
-        payManner: 0, // 0代表还未支付 1代表支付宝 2代表微信 3代表银行卡
-        deliveryMethod: 0, // 0代表还没选好配送方式
-        invoiceType: 0, //0不开发票 1电子发票 2纸质发票
-        invoiceContent: '',
-        taxCode: '',
-        invoiceOpen: '',
-        'order-price': 0,
-        'shop-price': 0,
-        'coupons-price': 0,
-        'integral-price': 0,
-        shopWeight: 0,
-        shopPrice: 208,
-        downOrderMan: '15033****46',
-        downOrderSource: 'H5页面',
-        downOrderTime: '2023-05-12 10:45:02',
-        distributionPrice: 0,
-        harvestStatus: 0, //0未确认收获 1已确认收货
-      },
-    },
-  ]);
+  const shopMessage = ref({} as Item);
   // const dialog = useDialog();
   const formParams = reactive({
     id: null,
@@ -261,7 +215,7 @@
   });
 
   const [register, {}] = useForm({
-    gridProps: { cols: '1 s:1 m:2 l:3 xl:4 2xl:4' },
+    gridProps: { cols: '2 s:1 m:2 l:2 xl:4 2xl:6' },
     labelWidth: 100,
     schemas,
   });
@@ -318,6 +272,7 @@
     console.log('点击了编辑', record);
     // const time = record.createTime * 1000;
     // record.createTime = formatToDateTime(time);
+    shopMessage.value = record;
     checkedBlindBoxOrderId.value = record.id;
     Object.assign(formParams, record);
     editTitle.value = '订单详情';
diff --git a/src/views/blindBox/bindBoxOrder/lib/columns.ts b/src/views/blindBox/bindBoxOrder/lib/columns.ts
index 6ebd928..aabc1e2 100644
--- a/src/views/blindBox/bindBoxOrder/lib/columns.ts
+++ b/src/views/blindBox/bindBoxOrder/lib/columns.ts
@@ -4,35 +4,50 @@ export const columns = [
   {
     title: 'ID',
     key: 'id',
-    width: 100,
+    width: 50,
   },
   {
     title: '订单编号',
     key: 'orderSn',
-    width: 100,
+    width: 150,
   },
   {
-    title: '盲盒id',
-    key: 'blindBoxId',
+    title: '商品名称',
+    key: 'blindBoxName',
     width: 100,
   },
+  // {
+  //   title: '盲盒id',
+  //   key: 'blindBoxId',
+  //   width: 75,
+  // },
   {
-    title: '会员id',
-    key: 'memberId',
+    title: '会员昵称',
+    key: 'nickname',
     width: 100,
   },
+  // {
+  //   title: '会员id',
+  //   key: 'memberId',
+  //   width: 100,
+  // },
   {
-    title: '抽奖次数',
-    key: 'blindBoxNum',
-    width: 100,
+    title: '会员手机号',
+    key: 'memberMobile',
+    width: 150,
   },
+  // {
+  //   title: '抽奖次数',
+  //   key: 'blindBoxNum',
+  //   width: 100,
+  // },
   {
-    title: '订单总价',
+    title: '价格',
     key: 'price',
     width: 100,
   },
   {
-    title: '订单状态',
+    title: '状态',
     key: 'status',
     width: 100,
     render: (data) => {
@@ -63,20 +78,20 @@ export const columns = [
       }
     },
   },
+  // {
+  //   title: '第三方支付单号',
+  //   key: 'paymentOrderNo',
+  //   width: 100,
+  // },
+  // {
+  //   title: '支付时间',
+  //   key: 'payTime',
+  //   width: 100,
+  // },
   {
-    title: '第三方支付单号',
-    key: 'paymentOrderNo',
-    width: 100,
-  },
-  {
-    title: '支付时间',
-    key: 'payTime',
-    width: 100,
-  },
-  {
-    title: '创建时间',
+    title: '下单时间',
     key: 'createTime',
-    width: 100,
+    width: 150,
     render: (data) => {
       try {
         const createTime = data.createTime * 1000;
diff --git a/src/views/blindBox/bindBoxOrder/lib/components/OrderTable.vue b/src/views/blindBox/bindBoxOrder/lib/components/OrderTable.vue
index 852376c..dde5d2c 100644
--- a/src/views/blindBox/bindBoxOrder/lib/components/OrderTable.vue
+++ b/src/views/blindBox/bindBoxOrder/lib/components/OrderTable.vue
@@ -1,35 +1,27 @@
 <script setup lang="ts">
-import { S } from 'mockjs';
+  // import { S } from 'mockjs';
 
   // import { defineProps } from 'vue';
   // eslint-disable-next-line vue/no-setup-props-destructure
   const { item } = defineProps<{
     item: Item;
   }>();
-  interface Item {
-    orderCode: string;
-    orderPrice: number;
-    payStatus: number;
-    shipmentsStatus: number;
-    orderStatus: number;
-    payPrice: number;
-    payManner: number;
-    deliveryMethod: number;
-    invoiceType: number;
-    invoiceContent: string;
-    taxCode: string;
-    invoiceOpen: string;
-    'order-price': number;
-    'shop-price': number;
-    'coupons-price': number;
-    'integral-price': number;
-    shopWeight: number;
-    shopPrice: number;
-    downOrderMan: string;
-    downOrderSource: string;
-    downOrderTime: string;
-    distributionPrice: number;
-    harvestStatus: number;
+  export interface Item {
+    blindBoxId: number;
+    blindBoxName: string;
+    blindBoxNum: number;
+    createTime: number;
+    id: number;
+    memberId: number;
+    memberMobile: string;
+    memberName: string;
+    nickname: string;
+    orderSn: string;
+    payTime: number;
+    paymentOrderNo: string;
+    price: number;
+    priceRule: object;
+    status: number;
   }
   console.log(item);
 </script>
@@ -43,43 +35,23 @@ import { S } from 'mockjs';
     <div class="order-msg-content">
       <table class="table" width="100%">
         <tr>
-          <td>订单号: {{ item.orderCode }}</td>
-          <td>订单总金额: ￥{{ item.orderPrice.toFixed(2) }}元</td>
-          <td>支付状态: {{ item.payStatus === 0 ? '未付款' : '已付款' }}</td>
+          <td>盲盒名称: {{ item.blindBoxName }}</td>
+          <td>盲盒抽奖次数: {{ item.blindBoxNum }}</td>
+          <td>创建时间: {{ item.createTime }}</td>
         </tr>
         <tr>
-          <td>发货状态: {{ item.shipmentsStatus === 0 ? '未发货' : '已发货' }}</td>
-          <td>订单状态: {{ item.orderStatus === 0 ? '正常' : '已超时' }}</td>
-          <td>已支付金额: ￥{{ item.payPrice.toFixed(2) }}元</td>
+          <td>会员手机号: {{ item.memberMobile }}</td>
+          <td>会员名称: {{ item.memberName }}</td>
+          <td>会员昵称: {{ item.nickname }}</td>
         </tr>
         <tr>
-          <td>支付方式: </td>
-          <td>配送方式: </td>
-          <td>发票类型: {{ item.invoiceType === 0 ? '不开发票' : '开发票' }}</td>
+          <td>订单编号: {{ item.orderSn }}</td>
+          <td>支付时间: {{ item.payTime }}</td>
+          <td>第三方支付单号: {{ item.paymentOrderNo }}</td>
         </tr>
         <tr>
-          <td>发票内容: {{ item.invoiceContent }}</td>
-          <td>税号: {{ item.taxCode }}</td>
-          <td>发票抬头: {{ item.invoiceOpen }}</td>
-        </tr>
-        <tr>
-          <td>订单优惠金额: ￥{{ item['order-price'].toFixed(2) }}元</td>
-          <td>商品优惠金额: ￥{{ item['shop-price'].toFixed(2) }}元</td>
-          <td>优惠券优惠: ￥{{ item['coupons-price'].toFixed(2) }}元</td>
-        </tr>
-        <tr>
-          <td>积分优惠: ￥{{ item['integral-price'].toFixed(2) }}元</td>
-          <td>商品总重量: {{ item.shopWeight }}</td>
-          <td>商品总价: ￥{{ item.shopPrice.toFixed(2) }}元</td>
-        </tr>
-        <tr>
-          <td>下单人: {{ item.downOrderMan }}</td>
-          <td>下单来源: {{ item.downOrderSource }}</td>
-          <td>下单时间: {{ item.downOrderTime }}</td>
-        </tr>
-        <tr>
-          <td>配送费用: ￥{{ item.distributionPrice.toFixed(2) }}元</td>
-          <td>收货状态: {{ item.harvestStatus === 0 ? '未确认收货' : '已确认收获' }}</td>
+          <td>订单总价: {{ item.price }}</td>
+          <td>订单状态: {{ item.status === 1 ? '未支付' : '已支付' }}</td>
         </tr>
       </table>
     </div>
@@ -97,7 +69,7 @@ import { S } from 'mockjs';
         position: absolute;
         top: 0;
         color: #666;
-        background-color: #666;
+        background-color: #c1bdbd;
         width: 100%;
         height: 1px;
       }
@@ -112,4 +84,8 @@ import { S } from 'mockjs';
       }
     }
   }
+  .table {
+    width: 650px;
+    height: 300px;
+  }
 </style>
-- 
Gitee


From 70a16770477036e4a67ec3ef95ee996bef7d4535 Mon Sep 17 00:00:00 2001
From: DanyangZhao <1909085973@qq.com>
Date: Wed, 5 Jul 2023 11:09:10 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E9=83=A8=E5=88=86=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/blindBox/blindBoxOeder.ts             |  11 +
 src/api/order/order.ts                        |  69 +++
 src/api/order/orderItem.ts                    |  69 +++
 src/enums/orderEnum.ts                        |   8 +
 src/router/modules/order.ts                   |  54 +++
 src/views/blindBox/bindBoxOrder/index.vue     |  53 +--
 .../lib/components/GoodsTable.vue             |  61 +++
 .../lib/components/OrderTable.vue             |  91 ++--
 src/views/order/OrderItem/columns.ts          |  67 +++
 src/views/order/OrderItem/index.vue           | 395 ++++++++++++++++++
 src/views/order/orderList/columns.ts          | 203 +++++++++
 src/views/order/orderList/index.vue           | 292 +++++++++++++
 .../orderList/lib/components/OrderDetail.vue  |  93 +++++
 .../rushPurchase/rushPurchaseOrder.vue        |   2 +-
 14 files changed, 1361 insertions(+), 107 deletions(-)
 create mode 100644 src/api/order/order.ts
 create mode 100644 src/api/order/orderItem.ts
 create mode 100644 src/enums/orderEnum.ts
 create mode 100644 src/router/modules/order.ts
 create mode 100644 src/views/blindBox/bindBoxOrder/lib/components/GoodsTable.vue
 create mode 100644 src/views/order/OrderItem/columns.ts
 create mode 100644 src/views/order/OrderItem/index.vue
 create mode 100644 src/views/order/orderList/columns.ts
 create mode 100644 src/views/order/orderList/index.vue
 create mode 100644 src/views/order/orderList/lib/components/OrderDetail.vue

diff --git a/src/api/blindBox/blindBoxOeder.ts b/src/api/blindBox/blindBoxOeder.ts
index 3b68ed0..4bf93b3 100644
--- a/src/api/blindBox/blindBoxOeder.ts
+++ b/src/api/blindBox/blindBoxOeder.ts
@@ -67,3 +67,14 @@ export function deleteBlindBoxOrder(params?) {
     }
   );
 }
+/***
+ * 获取盲盒订单项
+ * @param params
+ */
+export const getBlindOrderItem = (params: number) => {
+  return http.request<BasicResponseModel>({
+    url: `/blind-box/blind-box-order/item/list/${params}`,
+    method: 'GET',
+    // params,
+  });
+};
diff --git a/src/api/order/order.ts b/src/api/order/order.ts
new file mode 100644
index 0000000..ee12a9e
--- /dev/null
+++ b/src/api/order/order.ts
@@ -0,0 +1,69 @@
+import { http } from '@/utils/http/axios';
+
+export interface BasicResponseModel<T = any> {
+  code: number;
+  message: string;
+  result: T;
+}
+
+/**
+ * @description: 订单表列表
+ */
+export function getOrderPage(params?) {
+  return http.request({
+    url: '/order/order/page',
+    method: 'GET',
+    params,
+  });
+}
+//isTransformResponse true不进行任何处理直接返回， false会进行处理后返回 例如权限不够都会处理
+/**
+ * 保存订单表
+ * @param params
+ */
+export function saveOrder(params?) {
+  return http.request<BasicResponseModel>(
+    {
+      url: `/order/order`,
+      method: 'POST',
+      params,
+    },
+    {
+      isTransformResponse: false,
+    }
+  );
+}
+
+/**
+ * 编辑订单表
+ * @param params
+ */
+export function updateOrder(params?) {
+  return http.request<BasicResponseModel>(
+    {
+      url: `/order/order/${params.id}`,
+      method: 'PUT',
+      params,
+    },
+    {
+      isTransformResponse: false,
+    }
+  );
+}
+
+/**
+ * 删除订单表
+ * @param params
+ */
+export function deleteOrder(params?) {
+  return http.request<BasicResponseModel>(
+    {
+      url: `/order/order/${params.id}`,
+      method: 'DELETE',
+      params,
+    },
+    {
+      isTransformResponse: false,
+    }
+  );
+}
diff --git a/src/api/order/orderItem.ts b/src/api/order/orderItem.ts
new file mode 100644
index 0000000..af2130f
--- /dev/null
+++ b/src/api/order/orderItem.ts
@@ -0,0 +1,69 @@
+import { http } from '@/utils/http/axios';
+
+export interface BasicResponseModel<T = any> {
+  code: number;
+  message: string;
+  result: T;
+}
+
+/**
+ * @description: 订单子项表列表
+ */
+export function getOrderItemPage(params?) {
+  return http.request({
+    url: '/order/orderItem/page',
+    method: 'GET',
+    params,
+  });
+}
+//isTransformResponse true不进行任何处理直接返回， false会进行处理后返回 例如权限不够都会处理
+/**
+ * 保存订单子项表
+ * @param params
+ */
+export function saveOrderItem(params?) {
+  return http.request<BasicResponseModel>(
+    {
+      url: `/order/orderItem`,
+      method: 'POST',
+      params,
+    },
+    {
+      isTransformResponse: false,
+    }
+  );
+}
+
+/**
+ * 编辑订单子项表
+ * @param params
+ */
+export function updateOrderItem(params?) {
+  return http.request<BasicResponseModel>(
+    {
+      url: `/order/orderItem/${params.id}`,
+      method: 'PUT',
+      params,
+    },
+    {
+      isTransformResponse: false,
+    }
+  );
+}
+
+/**
+ * 删除订单子项表
+ * @param params
+ */
+export function deleteOrderItem(params?) {
+  return http.request<BasicResponseModel>(
+    {
+      url: `/order/orderItem/${params.id}`,
+      method: 'DELETE',
+      params,
+    },
+    {
+      isTransformResponse: false,
+    }
+  );
+}
diff --git a/src/enums/orderEnum.ts b/src/enums/orderEnum.ts
new file mode 100644
index 0000000..b390c7f
--- /dev/null
+++ b/src/enums/orderEnum.ts
@@ -0,0 +1,8 @@
+export enum OrderStatus {
+  PendingPay = 0, // 待付款
+  AlreadyPay = 1, // 已付款
+  AlreadyGo = 2, // 已发货
+  AlreadyGet = 3, // 已收货
+  AlreadyCancel = 4, // 已取消
+  AlreadyFinish = 5, //已完成
+}
diff --git a/src/router/modules/order.ts b/src/router/modules/order.ts
new file mode 100644
index 0000000..c6ce46c
--- /dev/null
+++ b/src/router/modules/order.ts
@@ -0,0 +1,54 @@
+import { RouteRecordRaw } from 'vue-router';
+import { Layout } from '@/router/constant';
+import { GiftOutlined } from '@vicons/antd';
+import { renderIcon } from '@/utils/index';
+/**
+ * @param name 路由名称, 必须设置,且不能重名
+ * @param meta 路由元信息（路由附带扩展信息）
+ * @param redirect 重定向地址, 访问这个路由时,自定进行重定向
+ * @param meta.disabled 禁用整个菜单
+ * @param meta.title 菜单名称
+ * @param meta.icon 菜单图标
+ * @param meta.keepAlive 缓存该路由
+ * @param meta.sort 排序越小越排前
+ *
+ * */
+const routes: Array<RouteRecordRaw> = [
+  {
+    path: '/order',
+    name: 'order',
+    redirect: '/order/order',
+    component: Layout,
+    meta: {
+      title: '订单',
+      icon: renderIcon(GiftOutlined),
+      permissions: ['order_list'],
+      sort: 4,
+    },
+    children: [
+      {
+        path: '/order',
+        name: 'order',
+        redirect: '/order/order',
+        meta: {
+          title: '订单',
+          permissions: ['order_list'],
+          //keepAlive: true,
+        },
+        // component: () => import('@/views/order/order/index.vue'),
+        children: [
+          {
+            path: '/order-list',
+            name: 'orderList',
+            meta: {
+              title: '订单列表',
+              permissions: ['order_list'],
+            },
+            component: () => import('@/views/order/orderList/index.vue'),
+          },
+        ],
+      },
+    ],
+  },
+];
+export default routes;
diff --git a/src/views/blindBox/bindBoxOrder/index.vue b/src/views/blindBox/bindBoxOrder/index.vue
index 4e7483a..b505a53 100644
--- a/src/views/blindBox/bindBoxOrder/index.vue
+++ b/src/views/blindBox/bindBoxOrder/index.vue
@@ -44,7 +44,9 @@
           <n-tab-pane name="message" tab="基本信息">
             <order-table :item="shopMessage" />
           </n-tab-pane>
-          <n-tab-pane name="commodityMSG" tab="商品信息"> 商品信息 </n-tab-pane>
+          <n-tab-pane name="commodityMSG" tab="商品信息">
+            <goods-table :item="shopMessage" />
+          </n-tab-pane>
         </n-tabs>
       </n-card>
       <template #action>
@@ -72,54 +74,6 @@
   import { PlusOutlined } from '@vicons/antd';
   import { ResultEnum } from '@/enums/httpEnum';
   import { Item } from './lib/components/OrderTable.vue';
-  // const rules = {
-  //   orderSn: {
-  //     required: true,
-  //     trigger: ['blur', 'input'],
-  //     message: '请输入订单编号',
-  //   },
-  //   blindBoxId: {
-  //     required: true,
-  //     trigger: ['blur', 'input'],
-  //     message: '请输入盲盒id',
-  //   },
-  //   memberId: {
-  //     required: true,
-  //     trigger: ['blur', 'input'],
-  //     message: '请输入会员id',
-  //   },
-  //   blindBoxNum: {
-  //     required: true,
-  //     trigger: ['blur', 'input'],
-  //     message: '请输入盲盒抽奖次数',
-  //   },
-  //   price: {
-  //     required: true,
-  //     trigger: ['blur', 'input'],
-  //     message: '请输入订单总价',
-  //   },
-  //   status: {
-  //     required: true,
-  //     trigger: ['blur', 'input'],
-  //     message: '请输入订单状态',
-  //   },
-  //   paymentOrderNo: {
-  //     required: true,
-  //     trigger: ['blur', 'input'],
-  //     message: '请输入第三方支付单号',
-  //   },
-  //   payTime: {
-  //     required: true,
-  //     trigger: ['blur', 'input'],
-  //     message: '请输入支付时间',
-  //   },
-  //   createTime: {
-  //     required: true,
-  //     trigger: ['blur', 'input'],
-  //     message: '请输入创建时间',
-  //   },
-  // };
-
   const schemas: FormSchema[] = [
     {
       field: 'blindBoxName',
@@ -173,6 +127,7 @@
   const checkedBlindBoxOrderId = ref(); //当前编辑id
   const isEdit = ref(false); // 弹出框是否为编辑
   const editTitle = ref('');
+  import GoodsTable from './lib/components/GoodsTable.vue';
   import OrderTable from '@/views/blindBox/bindBoxOrder/lib/components/OrderTable.vue';
   const shopMessage = ref({} as Item);
   // const dialog = useDialog();
diff --git a/src/views/blindBox/bindBoxOrder/lib/components/GoodsTable.vue b/src/views/blindBox/bindBoxOrder/lib/components/GoodsTable.vue
new file mode 100644
index 0000000..39ae38e
--- /dev/null
+++ b/src/views/blindBox/bindBoxOrder/lib/components/GoodsTable.vue
@@ -0,0 +1,61 @@
+<script setup lang="ts">
+  // eslint-disable-next-line vue/no-setup-props-destructure
+  const { item } = defineProps<{
+    item: Item;
+  }>();
+  export interface Item {
+    blindBoxId: number;
+    blindBoxName: string;
+    blindBoxNum: number;
+    createTime: number;
+    id: number;
+    memberId: number;
+    memberMobile: string;
+    memberName: string;
+    nickname: string;
+    orderSn: string;
+    payTime: number;
+    paymentOrderNo: string;
+    price: number;
+    priceRule: object;
+    status: number;
+  }
+  import { getBlindOrderItem } from '@/api/blindBox/blindBoxOeder';
+  console.log(typeof Number(item.orderSn));
+  const getGoodsItem = () => {
+    const res = getBlindOrderItem(item.blindBoxId);
+    console.log(res);
+  };
+  getGoodsItem();
+</script>
+
+<template>
+  <div class="message">
+    <div class="order-msg-content">
+      <n-descriptions label-placement="left" title="订单信息">
+        <n-descriptions-item>
+          <template #label> 盲盒名称 </template>
+          {{ item.blindBoxName }}
+        </n-descriptions-item>
+        <n-descriptions-item label="盲盒抽奖次数"> {{ item.blindBoxNum }} </n-descriptions-item>
+        <n-descriptions-item label="创建时间"> {{ item.createTime }} </n-descriptions-item>
+        <n-descriptions-item label="会员手机号"> {{ item.memberMobile }} </n-descriptions-item>
+        <n-descriptions-item label="会员名称"> {{ item.memberName }} </n-descriptions-item>
+        <n-descriptions-item label="会员昵称"> {{ item.nickname }} </n-descriptions-item>
+        <n-descriptions-item label="订单编号"> {{ item.orderSn }} </n-descriptions-item>
+        <n-descriptions-item label="支付时间"> {{ item.payTime }} </n-descriptions-item>
+        <n-descriptions-item label="第三方支付单号">
+          {{ item.paymentOrderNo }}
+        </n-descriptions-item>
+        <n-descriptions-item label="订单总价">
+          {{ item.price }}
+        </n-descriptions-item>
+        <n-descriptions-item label="订单状态">
+          {{ item.status === 1 ? '未支付' : '已支付' }}
+        </n-descriptions-item>
+      </n-descriptions>
+    </div>
+  </div>
+</template>
+
+<style scoped></style>
diff --git a/src/views/blindBox/bindBoxOrder/lib/components/OrderTable.vue b/src/views/blindBox/bindBoxOrder/lib/components/OrderTable.vue
index dde5d2c..6cb8b68 100644
--- a/src/views/blindBox/bindBoxOrder/lib/components/OrderTable.vue
+++ b/src/views/blindBox/bindBoxOrder/lib/components/OrderTable.vue
@@ -23,69 +23,46 @@
     priceRule: object;
     status: number;
   }
-  console.log(item);
+  import { formatToDateTime } from '@/utils/dateUtil';
+  import { ref } from 'vue';
+  // formatToDateTime(item.createTime);
+  const createTime = ref<number>(0);
+  createTime.value = item.createTime * 1000; //创建时间
+  const payTime = ref<number>(0);
+  payTime.value = item.payTime * 1000; // 支付时间
 </script>
 
 <template>
   <div class="message">
-    <div class="order-msg-title">
-      <div class="line"></div>
-      <div class="order-message">订单信息</div>
-    </div>
     <div class="order-msg-content">
-      <table class="table" width="100%">
-        <tr>
-          <td>盲盒名称: {{ item.blindBoxName }}</td>
-          <td>盲盒抽奖次数: {{ item.blindBoxNum }}</td>
-          <td>创建时间: {{ item.createTime }}</td>
-        </tr>
-        <tr>
-          <td>会员手机号: {{ item.memberMobile }}</td>
-          <td>会员名称: {{ item.memberName }}</td>
-          <td>会员昵称: {{ item.nickname }}</td>
-        </tr>
-        <tr>
-          <td>订单编号: {{ item.orderSn }}</td>
-          <td>支付时间: {{ item.payTime }}</td>
-          <td>第三方支付单号: {{ item.paymentOrderNo }}</td>
-        </tr>
-        <tr>
-          <td>订单总价: {{ item.price }}</td>
-          <td>订单状态: {{ item.status === 1 ? '未支付' : '已支付' }}</td>
-        </tr>
-      </table>
+      <n-descriptions label-placement="left" title="订单信息">
+        <n-descriptions-item>
+          <template #label> 盲盒名称 </template>
+          {{ item.blindBoxName }}
+        </n-descriptions-item>
+        <n-descriptions-item label="盲盒抽奖次数"> {{ item.blindBoxNum }} </n-descriptions-item>
+        <n-descriptions-item label="创建时间">
+          {{ formatToDateTime(createTime) }}
+        </n-descriptions-item>
+        <n-descriptions-item label="会员手机号"> {{ item.memberMobile }} </n-descriptions-item>
+        <n-descriptions-item label="会员名称"> {{ item.memberName }} </n-descriptions-item>
+        <n-descriptions-item label="会员昵称"> {{ item.nickname }} </n-descriptions-item>
+        <n-descriptions-item label="订单编号"> {{ item.orderSn }} </n-descriptions-item>
+        <n-descriptions-item label="支付时间">
+          {{ payTime ? formatToDateTime(payTime) : '' }}
+        </n-descriptions-item>
+        <n-descriptions-item label="第三方支付单号">
+          {{ item.paymentOrderNo }}
+        </n-descriptions-item>
+        <n-descriptions-item label="订单总价">
+          {{ item.price }}
+        </n-descriptions-item>
+        <n-descriptions-item label="订单状态">
+          {{ item.status === 1 ? '未支付' : '已支付' }}
+        </n-descriptions-item>
+      </n-descriptions>
     </div>
   </div>
 </template>
 
-<style scoped lang="less">
-  .message {
-    margin-top: 15px;
-    position: relative;
-    padding-top: 10px;
-    .order-msg-title {
-      margin-bottom: 10px;
-      .line {
-        position: absolute;
-        top: 0;
-        color: #666;
-        background-color: #c1bdbd;
-        width: 100%;
-        height: 1px;
-      }
-      .order-message {
-        position: absolute;
-        top: -10px;
-        left: 15px;
-        background-color: #fff;
-        color: #666;
-        text-align: center;
-        width: 70px;
-      }
-    }
-  }
-  .table {
-    width: 650px;
-    height: 300px;
-  }
-</style>
+<style scoped lang="less"></style>
diff --git a/src/views/order/OrderItem/columns.ts b/src/views/order/OrderItem/columns.ts
new file mode 100644
index 0000000..b3633b6
--- /dev/null
+++ b/src/views/order/OrderItem/columns.ts
@@ -0,0 +1,67 @@
+export const columns = [
+  {
+    title: 'ID',
+    key: 'id',
+    width: 100,
+  },
+  {
+    title: '订单ID',
+    key: 'orderId',
+    width: 100,
+  },
+  {
+    title: '订单编号',
+    key: 'orderSn',
+    width: 100,
+  },
+  {
+    title: '商品ID',
+    key: 'goodsId',
+    width: 100,
+  },
+  {
+    title: '商品名称',
+    key: 'goodsName',
+    width: 100,
+  },
+  {
+    title: '商品主图',
+    key: 'goodsImg',
+    width: 100,
+  },
+  {
+    title: '商品数量',
+    key: 'goodsNum',
+    width: 100,
+  },
+  {
+    title: '商品原价',
+    key: 'goodsOriginalPrice',
+    width: 100,
+  },
+  {
+    title: '商品成交价',
+    key: 'goodsPrice',
+    width: 100,
+  },
+  {
+    title: '商品优惠金额',
+    key: 'goodsDiscounPrice',
+    width: 100,
+  },
+  {
+    title: '优惠规则',
+    key: 'discountRule',
+    width: 100,
+  },
+  {
+    title: '状态',
+    key: 'status',
+    width: 100,
+  },
+  {
+    title: '创建时间',
+    key: 'createTime',
+    width: 100,
+  },
+];
diff --git a/src/views/order/OrderItem/index.vue b/src/views/order/OrderItem/index.vue
new file mode 100644
index 0000000..ba1caea
--- /dev/null
+++ b/src/views/order/OrderItem/index.vue
@@ -0,0 +1,395 @@
+<template>
+  <n-card :bordered="false" class="proCard">
+    <BasicForm @register="register" @submit="handleSubmit" @reset="handleReset">
+      <template #statusSlot="{ model, field }">
+        <n-input v-model:value="model[field]" />
+      </template>
+    </BasicForm>
+
+    <BasicTable
+      :columns="columns"
+      :request="loadDataTable"
+      :row-key="(row) => row.id"
+      ref="actionRef"
+      :actionColumn="actionColumn"
+      @update:checked-row-keys="onCheckedRow"
+      :scroll-x="1090"
+    >
+      <template #tableTitle>
+        <n-button type="primary" @click="addTable">
+          <template #icon>
+            <n-icon>
+              <PlusOutlined />
+            </n-icon>
+          </template>
+          新建
+        </n-button>
+      </template>
+
+      <template #toolbar>
+        <n-button type="primary" @click="reloadTable">刷新数据</n-button>
+      </template>
+    </BasicTable>
+
+    <n-modal v-model:show="showModal" :show-icon="false" preset="dialog" :title="editTitle">
+      <n-form
+        :model="formParams"
+        :rules="rules"
+        ref="formRef"
+        label-placement="left"
+        :label-width="80"
+        class="py-4"
+      >
+        <n-form-item label="订单ID" path="orderId">
+          <n-input placeholder="请输入订单ID" v-model:value="formParams.orderId" />
+        </n-form-item>
+        <n-form-item label="订单编号" path="orderSn">
+          <n-input placeholder="请输入订单编号" v-model:value="formParams.orderSn" />
+        </n-form-item>
+        <n-form-item label="商品ID" path="goodsId">
+          <n-input placeholder="请输入商品ID" v-model:value="formParams.goodsId" />
+        </n-form-item>
+        <n-form-item label="商品名称" path="goodsName">
+          <n-input placeholder="请输入商品名称" v-model:value="formParams.goodsName" />
+        </n-form-item>
+        <n-form-item label="商品主图" path="goodsImg">
+          <n-input placeholder="请输入商品主图" v-model:value="formParams.goodsImg" />
+        </n-form-item>
+        <n-form-item label="商品数量" path="goodsNum">
+          <n-input placeholder="请输入商品数量" v-model:value="formParams.goodsNum" />
+        </n-form-item>
+        <n-form-item label="商品原价" path="goodsOriginalPrice">
+          <n-input placeholder="请输入商品原价" v-model:value="formParams.goodsOriginalPrice" />
+        </n-form-item>
+        <n-form-item label="商品成交价" path="goodsPrice">
+          <n-input placeholder="请输入商品成交价" v-model:value="formParams.goodsPrice" />
+        </n-form-item>
+        <n-form-item label="商品优惠金额" path="goodsDiscounPrice">
+          <n-input placeholder="请输入商品优惠金额" v-model:value="formParams.goodsDiscounPrice" />
+        </n-form-item>
+        <n-form-item label="优惠规则" path="discountRule">
+          <n-input placeholder="请输入优惠规则" v-model:value="formParams.discountRule" />
+        </n-form-item>
+        <n-form-item label="状态" path="status">
+          <n-input placeholder="请输入状态" v-model:value="formParams.status" />
+        </n-form-item>
+        <n-form-item label="创建时间" path="createTime">
+          <n-input placeholder="请输入创建时间" v-model:value="formParams.createTime" />
+        </n-form-item>
+      </n-form>
+
+      <template #action>
+        <n-space>
+          <n-button @click="() => (showModal = false)">取消</n-button>
+          <n-button type="info" :loading="formBtnLoading" @click="confirmForm">确定</n-button>
+        </n-space>
+      </template>
+    </n-modal>
+  </n-card>
+</template>
+
+<script lang="ts" setup>
+  import { h, reactive, ref } from 'vue';
+  import { useDialog, useMessage } from 'naive-ui';
+  import { BasicTable, TableAction } from '@/components/Table';
+  import { BasicForm, FormSchema, useForm } from '@/components/Form/index';
+  import {
+    getOrderItemPage,
+    saveOrderItem,
+    updateOrderItem,
+    deleteOrderItem,
+  } from '@/api/order/orderItem';
+  import { columns } from './columns';
+  import { PlusOutlined } from '@vicons/antd';
+  import { ResultEnum } from '@/enums/httpEnum';
+
+  const rules = {
+    orderId: {
+      required: true,
+      trigger: ['blur', 'input'],
+      message: '请输入订单ID',
+    },
+    orderSn: {
+      required: true,
+      trigger: ['blur', 'input'],
+      message: '请输入订单编号',
+    },
+    goodsId: {
+      required: true,
+      trigger: ['blur', 'input'],
+      message: '请输入商品ID',
+    },
+    goodsName: {
+      required: true,
+      trigger: ['blur', 'input'],
+      message: '请输入商品名称',
+    },
+    goodsImg: {
+      required: true,
+      trigger: ['blur', 'input'],
+      message: '请输入商品主图',
+    },
+    goodsNum: {
+      required: true,
+      trigger: ['blur', 'input'],
+      message: '请输入商品数量',
+    },
+    goodsOriginalPrice: {
+      required: true,
+      trigger: ['blur', 'input'],
+      message: '请输入商品原价',
+    },
+    goodsPrice: {
+      required: true,
+      trigger: ['blur', 'input'],
+      message: '请输入商品成交价',
+    },
+    goodsDiscounPrice: {
+      required: true,
+      trigger: ['blur', 'input'],
+      message: '请输入商品优惠金额',
+    },
+    discountRule: {
+      required: true,
+      trigger: ['blur', 'input'],
+      message: '请输入优惠规则',
+    },
+    status: {
+      required: true,
+      trigger: ['blur', 'input'],
+      message: '请输入状态',
+    },
+    createTime: {
+      required: true,
+      trigger: ['blur', 'input'],
+      message: '请输入创建时间',
+    },
+  };
+
+  const schemas: FormSchema[] = [
+    {
+      field: 'orderId',
+      component: 'NInput',
+      label: '订单ID',
+      rules: [{ required: false }],
+    },
+    {
+      field: 'orderSn',
+      component: 'NInput',
+      label: '订单编号',
+      rules: [{ required: false }],
+    },
+    {
+      field: 'goodsId',
+      component: 'NInput',
+      label: '商品ID',
+      rules: [{ required: false }],
+    },
+    {
+      field: 'goodsName',
+      component: 'NInput',
+      label: '商品名称',
+      rules: [{ required: false }],
+    },
+    {
+      field: 'goodsImg',
+      component: 'NInput',
+      label: '商品主图',
+      rules: [{ required: false }],
+    },
+    {
+      field: 'goodsNum',
+      component: 'NInput',
+      label: '商品数量',
+      rules: [{ required: false }],
+    },
+    {
+      field: 'goodsOriginalPrice',
+      component: 'NInput',
+      label: '商品原价',
+      rules: [{ required: false }],
+    },
+    {
+      field: 'goodsPrice',
+      component: 'NInput',
+      label: '商品成交价',
+      rules: [{ required: false }],
+    },
+    {
+      field: 'goodsDiscounPrice',
+      component: 'NInput',
+      label: '商品优惠金额',
+      rules: [{ required: false }],
+    },
+    {
+      field: 'discountRule',
+      component: 'NInput',
+      label: '优惠规则',
+      rules: [{ required: false }],
+    },
+    {
+      field: 'status',
+      component: 'NInput',
+      label: '状态',
+      rules: [{ required: false }],
+    },
+    {
+      field: 'createTime',
+      component: 'NInput',
+      label: '创建时间',
+      rules: [{ required: false }],
+    },
+  ];
+
+  const formRef: any = ref(null);
+  const message = useMessage();
+  const actionRef = ref();
+
+  const showModal = ref(false);
+  const formBtnLoading = ref(false);
+  const checkedOrderItemId = ref(); //当前编辑id
+  const isEdit = ref(false); // 弹出框是否为编辑
+  const editTitle = ref('');
+  const dialog = useDialog();
+  const formParams = reactive({
+    id: null,
+    orderId: '',
+    orderSn: '',
+    goodsId: '',
+    goodsName: '',
+    goodsImg: '',
+    goodsNum: '',
+    goodsOriginalPrice: '',
+    goodsPrice: '',
+    goodsDiscounPrice: '',
+    discountRule: '',
+    status: '',
+    createTime: '',
+  });
+  const formParamsBak = { ...formParams };
+
+  const params = ref({});
+
+  const actionColumn = reactive({
+    width: 220,
+    title: '操作',
+    key: 'action',
+    fixed: 'right',
+    render(record) {
+      return h(TableAction as any, {
+        style: 'button',
+        actions: [
+          {
+            label: '编辑',
+            onClick: handleEdit.bind(null, record),
+          },
+          {
+            label: '删除',
+            icon: 'ic:outline-delete-outline',
+            onClick: handleDelete.bind(null, record),
+          },
+        ],
+      });
+    },
+  });
+
+  const [register, {}] = useForm({
+    gridProps: { cols: '1 s:1 m:2 l:3 xl:4 2xl:4' },
+    labelWidth: 100,
+    schemas,
+  });
+
+  function addTable() {
+    // 新增清空表单
+    Object.assign(formParams, formParamsBak);
+    isEdit.value = false;
+    showModal.value = true;
+    editTitle.value = '新建';
+  }
+
+  const loadDataTable = async (res) => {
+    return await getOrderItemPage({ ...params.value, ...res });
+  };
+
+  function onCheckedRow(rowKeys) {
+    console.log(rowKeys);
+  }
+
+  function reloadTable() {
+    actionRef.value.reload();
+  }
+
+  function confirmForm(e) {
+    e.preventDefault();
+    formBtnLoading.value = true;
+    formRef.value.validate(async (errors) => {
+      if (!errors) {
+        let response;
+        // 如果是编辑
+        if (isEdit.value) {
+          formParams.id = checkedOrderItemId.value;
+          response = await updateOrderItem(formParams);
+        } else {
+          response = await saveOrderItem(formParams);
+        }
+        const { message: msg, code } = response;
+        if (code == ResultEnum.SUCCESS) {
+          message.success(msg);
+          Object.assign(formParams, formParamsBak);
+          showModal.value = false;
+          reloadTable();
+        } else {
+          message.error(msg);
+        }
+      } else {
+        message.error('请填写完整信息');
+      }
+      formBtnLoading.value = false;
+    });
+  }
+
+  function handleEdit(record: Recordable) {
+    console.log('点击了编辑', record);
+    checkedOrderItemId.value = record.id;
+    Object.assign(formParams, record);
+    editTitle.value = '编辑';
+    showModal.value = true;
+    isEdit.value = true;
+  }
+
+  function handleDelete(record: Recordable) {
+    console.log('点击了删除', record);
+    dialog.info({
+      title: '提示',
+      content: `您确定想删除吗?`,
+      positiveText: '确定',
+      negativeText: '取消',
+      onPositiveClick: async () => {
+        const params = { id: record.id };
+        const response = await deleteOrderItem(params);
+        const { message: msg, code } = response;
+        if (code == ResultEnum.SUCCESS) {
+          message.success(msg);
+          reloadTable();
+        } else {
+          message.error(msg);
+        }
+      },
+      onNegativeClick: () => {
+        message.error('已取消');
+      },
+    });
+  }
+
+  function handleSubmit(values: Recordable) {
+    console.log(values);
+    params.value = values;
+    reloadTable();
+  }
+
+  function handleReset(values: Recordable) {
+    console.log(values);
+  }
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/order/orderList/columns.ts b/src/views/order/orderList/columns.ts
new file mode 100644
index 0000000..355546b
--- /dev/null
+++ b/src/views/order/orderList/columns.ts
@@ -0,0 +1,203 @@
+import { formatToDateTime } from '@/utils/dateUtil';
+export const columns = [
+  {
+    title: 'id',
+    key: 'id',
+    width: 40,
+  },
+  {
+    title: '订单编号',
+    key: 'orderSn',
+    width: 100,
+  },
+  {
+    title: '订单类型',
+    key: 'orderType',
+    width: 100,
+    render: (data) => {
+      switch (data.orderType) {
+        case 1:
+          return '标准订单';
+        case 2:
+          return '盲盒订单';
+      }
+    },
+  },
+  {
+    title: '会员id',
+    key: 'memberId',
+    width: 70,
+  },
+  {
+    title: '会员名称',
+    key: 'memberName',
+    width: 80,
+  },
+  {
+    title: '订单状态',
+    key: 'orderStatus',
+    width: 80,
+    render: (data) => {
+      switch (Number(data.orderStatus)) {
+        case 0:
+          return '待付款';
+        case 1:
+          return '已付款';
+        case 2:
+          return '已发货';
+        case 3:
+          return '已收货';
+        case 4:
+          return '已取消';
+        case 5:
+          return '已完成';
+      }
+    },
+  },
+  {
+    title: '付款状态',
+    key: 'payStatus',
+    width: 80,
+    render: (data) => {
+      if (Number(data.payStatus) === 1) {
+        return '已付款';
+      } else {
+        return '未付款';
+      }
+    },
+  },
+  {
+    title: '支付时间',
+    key: 'paymentTime',
+    width: 100,
+    render: (data) => {
+      try {
+        const createTime = data.createTime * 1000;
+        return formatToDateTime(createTime);
+      } catch (error) {
+        console.log(error);
+        return data.createTime;
+      }
+    },
+  },
+  {
+    title: '支付单单号',
+    key: 'paymentSn',
+    width: 100,
+  },
+  {
+    title: '订单总金额',
+    key: 'orderPrice',
+    width: 100,
+  },
+  {
+    title: '商品总金额',
+    key: 'goodsPrice',
+    width: 100,
+  },
+  {
+    title: '配送金额',
+    key: 'shippingPrice',
+    width: 100,
+  },
+  {
+    title: '优惠金额',
+    key: 'discountPrice',
+    width: 100,
+  },
+  {
+    title: '优惠规则',
+    key: 'discountRule',
+    width: 100,
+  },
+  {
+    title: '商品总数',
+    key: 'goodsNum',
+    width: 100,
+  },
+  {
+    title: '配送省份id',
+    key: 'shipProvinceId',
+    width: 100,
+  },
+  {
+    title: '配送省名',
+    key: 'shipProvinceName',
+    width: 100,
+  },
+  {
+    title: '配送市区id',
+    key: 'shipCityId',
+    width: 100,
+  },
+  {
+    title: '配送市区名称',
+    key: 'shipCityName',
+    width: 100,
+  },
+  {
+    title: '配送县区id',
+    key: 'shipCountyId',
+    width: 100,
+  },
+  {
+    title: '配送县区名称',
+    key: 'shipCountyName',
+    width: 100,
+  },
+  {
+    title: '配送详细地址',
+    key: 'shipFullAddress',
+    width: 100,
+  },
+  {
+    title: '收货人姓名',
+    key: 'shipName',
+    width: 100,
+  },
+  {
+    title: '收货人手机号',
+    key: 'shipMobile',
+    width: 100,
+  },
+  {
+    title: '发货时间',
+    key: 'shipTime',
+    width: 100,
+  },
+  {
+    title: '物流单号',
+    key: 'logisticsSn',
+    width: 100,
+  },
+  {
+    title: '物流公司id',
+    key: 'logisticsId',
+    width: 100,
+  },
+  {
+    title: '物流公司名称',
+    key: 'logisticsName',
+    width: 100,
+  },
+  {
+    title: '订单备注',
+    key: 'remark',
+    width: 100,
+  },
+  {
+    title: '订单取消原因',
+    key: 'cancelReason',
+    width: 100,
+  },
+  {
+    title: '订单创建时间',
+    key: 'createTime',
+    width: 100,
+  },
+  {
+    title: '完成时间',
+    key: 'completeTime',
+    width: 100,
+  },
+];
diff --git a/src/views/order/orderList/index.vue b/src/views/order/orderList/index.vue
new file mode 100644
index 0000000..7b1097b
--- /dev/null
+++ b/src/views/order/orderList/index.vue
@@ -0,0 +1,292 @@
+<template>
+  <n-card :bordered="false" class="proCard">
+    <BasicForm @register="register" @submit="handleSubmit" @reset="handleReset">
+      <template #statusSlot="{ model, field }">
+        <n-input v-model:value="model[field]" />
+      </template>
+    </BasicForm>
+
+    <BasicTable
+      :columns="columns"
+      :request="loadDataTable"
+      :row-key="(row) => row.id"
+      ref="actionRef"
+      :actionColumn="actionColumn"
+      @update:checked-row-keys="onCheckedRow"
+      :scroll-x="1090"
+    >
+      <template #tableTitle>
+        <n-button type="primary" @click="addTable">
+          <template #icon>
+            <n-icon>
+              <PlusOutlined />
+            </n-icon>
+          </template>
+          新建
+        </n-button>
+      </template>
+
+      <template #toolbar>
+        <n-button type="primary" @click="reloadTable">刷新数据</n-button>
+      </template>
+    </BasicTable>
+
+    <n-modal
+      v-model:show="showModal"
+      :show-icon="false"
+      preset="dialog"
+      :title="editTitle"
+      style="width: 850px"
+    >
+      <order-detail :item="formParams" />
+      <template #action>
+        <n-space>
+          <n-button @click="() => (showModal = false)">取消</n-button>
+          <n-button type="info" :loading="formBtnLoading" @click="confirmForm">确定</n-button>
+        </n-space>
+      </template>
+    </n-modal>
+  </n-card>
+</template>
+
+<script lang="ts" setup>
+  import { h, reactive, ref } from 'vue';
+  import { useDialog, useMessage } from 'naive-ui';
+  import { BasicTable, TableAction } from '@/components/Table';
+  import { BasicForm, FormSchema, useForm } from '@/components/Form/index';
+  import { getOrderPage, saveOrder, updateOrder, deleteOrder } from '@/api/order/order';
+  import { columns } from './columns';
+  import { PlusOutlined } from '@vicons/antd';
+  import { ResultEnum } from '@/enums/httpEnum';
+  import OrderDetail from './lib/components/OrderDetail.vue';
+  const rules = {
+    orderSn: {
+      required: true,
+      trigger: ['blur', 'input'],
+      message: '请输入订单编号',
+    },
+    orderType: {
+      required: true,
+      trigger: ['blur', 'input'],
+      message: '请输入订单类型',
+    },
+    memberMobile: {
+      required: true,
+      trigger: ['blur', 'input'],
+      message: '请输入会员手机号',
+    },
+    orderStatus: {
+      required: true,
+      trigger: ['blur', 'input'],
+      message: '请输入订单状态',
+    },
+  };
+
+  const schemas: FormSchema[] = [
+    {
+      field: 'orderType',
+      component: 'NInput',
+      label: '订单类型',
+      rules: [{ required: false }],
+    },
+    {
+      field: 'orderStatus',
+      component: 'NInput',
+      label: '订单状态',
+      rules: [{ required: false }],
+    },
+    {
+      field: 'orderSn',
+      component: 'NInput',
+      label: '订单编号',
+      rules: [{ required: false }],
+    },
+    {
+      field: 'memberMoblie',
+      component: 'NInput',
+      label: '会员手机号',
+      rules: [{ required: false }],
+    },
+    {
+      field: 'buyTime',
+      component: 'NDatePicker',
+      label: '下单时间',
+      componentProps: {
+        type: 'datetimerange',
+        defaultTime: ['00:00:00', '23:59:59'],
+      },
+      rules: [{ required: false }],
+    },
+  ];
+
+  const formRef: any = ref(null);
+  const message = useMessage();
+  const actionRef = ref();
+
+  const showModal = ref(false);
+  const formBtnLoading = ref(false);
+  const checkedOrderId = ref(); //当前编辑id
+  const isEdit = ref(false); // 弹出框是否为编辑
+  const editTitle = ref('');
+  const dialog = useDialog();
+  const formParams = reactive({
+    id: null,
+    orderSn: '',
+    orderType: '',
+    memberId: '',
+    memberName: '',
+    orderStatus: '',
+    payStatus: '',
+    paymentTime: '',
+    paymentSn: '',
+    orderPrice: '',
+    goodsPrice: '',
+    shippingPrice: '',
+    discountPrice: '',
+    discountRule: '',
+    goodsNum: '',
+    shipProvinceId: '',
+    shipProvinceName: '',
+    shipCityId: '',
+    shipCityName: '',
+    shipCountyId: '',
+    shipCountyName: '',
+    shipFullAddress: '',
+    shipName: '',
+    shipMobile: '',
+    shipTime: '',
+    logisticsSn: '',
+    logisticsId: '',
+    logisticsName: '',
+    remark: '',
+    cancelReason: '',
+    createTime: '',
+    completeTime: '',
+  });
+  const formParamsBak = { ...formParams };
+
+  const params = ref({});
+
+  const actionColumn = reactive({
+    width: 220,
+    title: '操作',
+    key: 'action',
+    fixed: 'right',
+    render(record) {
+      return h(TableAction as any, {
+        style: 'button',
+        actions: [
+          {
+            label: '订单详情',
+            onClick: handleEdit.bind(null, record),
+          },
+          // {
+          //   label: '删除',
+          //   icon: 'ic:outline-delete-outline',
+          //   onClick: handleDelete.bind(null, record),
+          // },
+        ],
+      });
+    },
+  });
+
+  const [register, {}] = useForm({
+    gridProps: { cols: '1 s:1 m:2 l:2 xl:5 2xl:4' },
+    labelWidth: 100,
+    schemas,
+  });
+
+  function addTable() {
+    // 新增清空表单
+    Object.assign(formParams, formParamsBak);
+    isEdit.value = false;
+    showModal.value = true;
+    editTitle.value = '新建';
+  }
+
+  const loadDataTable = async (res) => {
+    return await getOrderPage({ ...params.value, ...res, size: 10 });
+  };
+
+  function onCheckedRow(rowKeys) {
+    console.log(rowKeys);
+  }
+
+  function reloadTable() {
+    actionRef.value.reload();
+  }
+
+  function confirmForm(e) {
+    e.preventDefault();
+    formBtnLoading.value = true;
+    formRef.value.validate(async (errors) => {
+      if (!errors) {
+        let response;
+        // 如果是编辑
+        if (isEdit.value) {
+          formParams.id = checkedOrderId.value;
+          response = await updateOrder(formParams);
+        } else {
+          response = await saveOrder(formParams);
+        }
+        const { message: msg, code } = response;
+        if (code == ResultEnum.SUCCESS) {
+          message.success(msg);
+          Object.assign(formParams, formParamsBak);
+          showModal.value = false;
+          reloadTable();
+        } else {
+          message.error(msg);
+        }
+      } else {
+        message.error('请填写完整信息');
+      }
+      formBtnLoading.value = false;
+    });
+  }
+
+  function handleEdit(record: Recordable) {
+    console.log('点击了编辑', record);
+    checkedOrderId.value = record.id;
+    Object.assign(formParams, record);
+    editTitle.value = '订单详情';
+    showModal.value = true;
+    isEdit.value = true;
+  }
+
+  // function handleDelete(record: Recordable) {
+  //   console.log('点击了删除', record);
+  //   dialog.info({
+  //     title: '提示',
+  //     content: `您确定想删除吗?`,
+  //     positiveText: '确定',
+  //     negativeText: '取消',
+  //     onPositiveClick: async () => {
+  //       const params = { id: record.id };
+  //       const response = await deleteOrder(params);
+  //       const { message: msg, code } = response;
+  //       if (code == ResultEnum.SUCCESS) {
+  //         message.success(msg);
+  //         reloadTable();
+  //       } else {
+  //         message.error(msg);
+  //       }
+  //     },
+  //     onNegativeClick: () => {
+  //       message.error('已取消');
+  //     },
+  //   });
+  // }
+
+  function handleSubmit(values: Recordable) {
+    console.log(values);
+    params.value = values;
+    reloadTable();
+  }
+
+  function handleReset(values: Recordable) {
+    console.log(values);
+  }
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/order/orderList/lib/components/OrderDetail.vue b/src/views/order/orderList/lib/components/OrderDetail.vue
new file mode 100644
index 0000000..14d0231
--- /dev/null
+++ b/src/views/order/orderList/lib/components/OrderDetail.vue
@@ -0,0 +1,93 @@
+<script setup lang="ts">
+  import { formatToDateTime } from '@/utils/dateUtil';
+
+  // eslint-disable-next-line vue/no-setup-props-destructure
+  const { item } = defineProps<{
+    item: Item;
+  }>();
+  export interface Item {
+    cancelReason: string;
+    completeTime: number;
+    createTime: number;
+    discountPrice: number;
+    discountRule: string;
+    goodsNum: number;
+    goodsPrice: number;
+    id: number;
+    logisticsId: number;
+    logisticsName: string;
+    logisticsSn: string;
+    memberId: number;
+    memberName: string;
+    orderPrice: number;
+    orderSn: string;
+    orderStatus: string;
+    orderType: number;
+    payStatus: string;
+    paymentSn: string;
+    paymentTime: number;
+    remark: string;
+    shipCityId: number;
+    shipCityName: string;
+    shipCountyId: number;
+    shipCountyName: string;
+    shipFullAddress: string;
+    shipMobile: string;
+    shipName: string;
+    shipProvinceId: number;
+    shipProvinceName: string;
+    shipTime: number;
+    shippingPrice: number;
+  }
+  const orderStatus = (item) => {
+    switch (Number(item.orderStatus)) {
+      case 0:
+        return '待付款';
+      case 1:
+        return '已付款';
+      case 2:
+        return '已发货';
+      case 3:
+        return '已收货';
+      case 4:
+        return '已取消';
+      case 5:
+        return '已完成';
+    }
+  };
+</script>
+
+<template>
+  <div class="message">
+    <div class="order-msg-content">
+      <n-descriptions label-placement="left" title="">
+        <n-descriptions-item>
+          <template #label> 订单名称 </template>
+          {{ item.shipProvinceName }}
+        </n-descriptions-item>
+        <n-descriptions-item label="订单数量"> {{ item.goodsNum }} </n-descriptions-item>
+        <n-descriptions-item label="订单价格"> {{ item.goodsPrice }} </n-descriptions-item>
+        <n-descriptions-item label="订单状态">
+          {{ orderStatus(item) }}
+        </n-descriptions-item>
+        <n-descriptions-item label="会员id">
+          {{ item.memberId }}
+        </n-descriptions-item>
+        <n-descriptions-item label="会员名称"> {{ item.memberName }} </n-descriptions-item>
+        <n-descriptions-item label="会员昵称"> {{ item.shipName }} </n-descriptions-item>
+        <n-descriptions-item label="订单编号"> {{ item.orderSn }} </n-descriptions-item>
+        <n-descriptions-item label="创建时间">
+          {{ formatToDateTime(item.createTime * 1000) }}
+        </n-descriptions-item>
+        <n-descriptions-item label="折扣规则">
+          {{ item.discountRule }}
+        </n-descriptions-item>
+        <n-descriptions-item label="支付时间">
+          {{ formatToDateTime(item.paymentTime * 1000) }}
+        </n-descriptions-item>
+      </n-descriptions>
+    </div>
+  </div>
+</template>
+
+<style scoped></style>
diff --git a/src/views/promotion/rushPurchase/rushPurchaseOrder.vue b/src/views/promotion/rushPurchase/rushPurchaseOrder.vue
index 1040541..40ec3f7 100644
--- a/src/views/promotion/rushPurchase/rushPurchaseOrder.vue
+++ b/src/views/promotion/rushPurchase/rushPurchaseOrder.vue
@@ -203,7 +203,7 @@
   };
 
   function handSwitchStatus(status) {
-    console.log(status)
+    console.log(status);
     params.value = { ...params.value, status };
     reloadTable();
   }
-- 
Gitee


From 7224b4d6b8938463800aff54085e9a7874eb8e4a Mon Sep 17 00:00:00 2001
From: DanyangZhao <1909085973@qq.com>
Date: Wed, 5 Jul 2023 18:24:34 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84=E9=83=A8=E5=88=86=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/order/order.ts                        |   7 +
 src/views/order/orderList/columns.ts          | 140 +++++-------------
 src/views/order/orderList/index.vue           |  28 +---
 .../orderList/lib/components/OrderDetail.vue  |  46 +++---
 .../orderList/lib/components/OrderItem.vue    |  80 ++++++++++
 types/order.d.ts                              |  36 +++++
 6 files changed, 181 insertions(+), 156 deletions(-)
 create mode 100644 src/views/order/orderList/lib/components/OrderItem.vue
 create mode 100644 types/order.d.ts

diff --git a/src/api/order/order.ts b/src/api/order/order.ts
index ee12a9e..3a269ad 100644
--- a/src/api/order/order.ts
+++ b/src/api/order/order.ts
@@ -67,3 +67,10 @@ export function deleteOrder(params?) {
     }
   );
 }
+export const getOrderItemPage = (orderId) => {
+  return http.request<BasicResponseModel>({
+    url: `/order/order/item/list`,
+    method: 'GET',
+    params: { orderId },
+  });
+};
diff --git a/src/views/order/orderList/columns.ts b/src/views/order/orderList/columns.ts
index 355546b..fc5690e 100644
--- a/src/views/order/orderList/columns.ts
+++ b/src/views/order/orderList/columns.ts
@@ -8,7 +8,7 @@ export const columns = [
   {
     title: '订单编号',
     key: 'orderSn',
-    width: 100,
+    width: 130,
   },
   {
     title: '订单类型',
@@ -23,11 +23,6 @@ export const columns = [
       }
     },
   },
-  {
-    title: '会员id',
-    key: 'memberId',
-    width: 70,
-  },
   {
     title: '会员名称',
     key: 'memberName',
@@ -72,19 +67,14 @@ export const columns = [
     width: 100,
     render: (data) => {
       try {
-        const createTime = data.createTime * 1000;
-        return formatToDateTime(createTime);
+        const paymentTime = data.paymentTime * 1000;
+        return formatToDateTime(paymentTime);
       } catch (error) {
         console.log(error);
-        return data.createTime;
+        return data.paymentTime;
       }
     },
   },
-  {
-    title: '支付单单号',
-    key: 'paymentSn',
-    width: 100,
-  },
   {
     title: '订单总金额',
     key: 'orderPrice',
@@ -95,61 +85,11 @@ export const columns = [
     key: 'goodsPrice',
     width: 100,
   },
-  {
-    title: '配送金额',
-    key: 'shippingPrice',
-    width: 100,
-  },
-  {
-    title: '优惠金额',
-    key: 'discountPrice',
-    width: 100,
-  },
-  {
-    title: '优惠规则',
-    key: 'discountRule',
-    width: 100,
-  },
   {
     title: '商品总数',
     key: 'goodsNum',
     width: 100,
   },
-  {
-    title: '配送省份id',
-    key: 'shipProvinceId',
-    width: 100,
-  },
-  {
-    title: '配送省名',
-    key: 'shipProvinceName',
-    width: 100,
-  },
-  {
-    title: '配送市区id',
-    key: 'shipCityId',
-    width: 100,
-  },
-  {
-    title: '配送市区名称',
-    key: 'shipCityName',
-    width: 100,
-  },
-  {
-    title: '配送县区id',
-    key: 'shipCountyId',
-    width: 100,
-  },
-  {
-    title: '配送县区名称',
-    key: 'shipCountyName',
-    width: 100,
-  },
-  {
-    title: '配送详细地址',
-    key: 'shipFullAddress',
-    width: 100,
-  },
   {
     title: '收货人姓名',
     key: 'shipName',
@@ -158,46 +98,34 @@ export const columns = [
   {
     title: '收货人手机号',
     key: 'shipMobile',
-    width: 100,
-  },
-  {
-    title: '发货时间',
-    key: 'shipTime',
-    width: 100,
-  },
-  {
-    title: '物流单号',
-    key: 'logisticsSn',
-    width: 100,
-  },
-  {
-    title: '物流公司id',
-    key: 'logisticsId',
-    width: 100,
-  },
-  {
-    title: '物流公司名称',
-    key: 'logisticsName',
-    width: 100,
-  },
-  {
-    title: '订单备注',
-    key: 'remark',
-    width: 100,
-  },
-  {
-    title: '订单取消原因',
-    key: 'cancelReason',
-    width: 100,
-  },
-  {
-    title: '订单创建时间',
-    key: 'createTime',
-    width: 100,
-  },
-  {
-    title: '完成时间',
-    key: 'completeTime',
-    width: 100,
-  },
+    width: 120,
+  },
+  // {
+  //   title: '订单创建时间',
+  //   key: 'createTime',
+  //   width: 100,
+  //   render: (data) => {
+  //     try {
+  //       const createTime = data.createTime * 1000;
+  //       return formatToDateTime(createTime);
+  //     } catch (error) {
+  //       console.log(error);
+  //       return data.createTime;
+  //     }
+  //   },
+  // },
+  // {
+  //   title: '完成时间',
+  //   key: 'completeTime',
+  //   width: 100,
+  //   render: (data) => {
+  //     try {
+  //       const completeTime = data.completeTime * 1000;
+  //       return formatToDateTime(completeTime);
+  //     } catch (error) {
+  //       console.log(error);
+  //       return data.completeTime;
+  //     }
+  //   },
+  // },
 ];
diff --git a/src/views/order/orderList/index.vue b/src/views/order/orderList/index.vue
index 7b1097b..5285ff1 100644
--- a/src/views/order/orderList/index.vue
+++ b/src/views/order/orderList/index.vue
@@ -36,9 +36,10 @@
       :show-icon="false"
       preset="dialog"
       :title="editTitle"
-      style="width: 850px"
+      style="width: 1000px"
     >
       <order-detail :item="formParams" />
+      <order-item :item="formParams" />
       <template #action>
         <n-space>
           <n-button @click="() => (showModal = false)">取消</n-button>
@@ -59,29 +60,7 @@
   import { PlusOutlined } from '@vicons/antd';
   import { ResultEnum } from '@/enums/httpEnum';
   import OrderDetail from './lib/components/OrderDetail.vue';
-  const rules = {
-    orderSn: {
-      required: true,
-      trigger: ['blur', 'input'],
-      message: '请输入订单编号',
-    },
-    orderType: {
-      required: true,
-      trigger: ['blur', 'input'],
-      message: '请输入订单类型',
-    },
-    memberMobile: {
-      required: true,
-      trigger: ['blur', 'input'],
-      message: '请输入会员手机号',
-    },
-    orderStatus: {
-      required: true,
-      trigger: ['blur', 'input'],
-      message: '请输入订单状态',
-    },
-  };
-
+  import OrderItem from './lib/components/OrderItem.vue';
   const schemas: FormSchema[] = [
     {
       field: 'orderType',
@@ -244,7 +223,6 @@
       formBtnLoading.value = false;
     });
   }
-
   function handleEdit(record: Recordable) {
     console.log('点击了编辑', record);
     checkedOrderId.value = record.id;
diff --git a/src/views/order/orderList/lib/components/OrderDetail.vue b/src/views/order/orderList/lib/components/OrderDetail.vue
index 14d0231..c8c269a 100644
--- a/src/views/order/orderList/lib/components/OrderDetail.vue
+++ b/src/views/order/orderList/lib/components/OrderDetail.vue
@@ -1,22 +1,16 @@
 <script setup lang="ts">
   import { formatToDateTime } from '@/utils/dateUtil';
-
   // eslint-disable-next-line vue/no-setup-props-destructure
   const { item } = defineProps<{
     item: Item;
   }>();
   export interface Item {
-    cancelReason: string;
-    completeTime: number;
     createTime: number;
     discountPrice: number;
     discountRule: string;
     goodsNum: number;
     goodsPrice: number;
     id: number;
-    logisticsId: number;
-    logisticsName: string;
-    logisticsSn: string;
     memberId: number;
     memberName: string;
     orderPrice: number;
@@ -24,20 +18,14 @@
     orderStatus: string;
     orderType: number;
     payStatus: string;
-    paymentSn: string;
-    paymentTime: number;
-    remark: string;
-    shipCityId: number;
-    shipCityName: string;
-    shipCountyId: number;
-    shipCountyName: string;
+    shipAreaId: number;
+    shipAreaName: string;
     shipFullAddress: string;
     shipMobile: string;
     shipName: string;
-    shipProvinceId: number;
-    shipProvinceName: string;
-    shipTime: number;
     shippingPrice: number;
+    paymentTime: number;
+    completeTime: number;
   }
   const orderStatus = (item) => {
     switch (Number(item.orderStatus)) {
@@ -61,12 +49,16 @@
   <div class="message">
     <div class="order-msg-content">
       <n-descriptions label-placement="left" title="">
+        <n-descriptions-item label="订单id"> {{ item.id }} </n-descriptions-item>
         <n-descriptions-item>
-          <template #label> 订单名称 </template>
-          {{ item.shipProvinceName }}
+          <template #label> 创建时间 </template>
+          {{ formatToDateTime(item.createTime * 1000) }}
         </n-descriptions-item>
         <n-descriptions-item label="订单数量"> {{ item.goodsNum }} </n-descriptions-item>
-        <n-descriptions-item label="订单价格"> {{ item.goodsPrice }} </n-descriptions-item>
+        <n-descriptions-item label="折扣金额"> {{ item.discountPrice }} </n-descriptions-item>
+        <n-descriptions-item label="订单价格">
+          {{ item.goodsPrice.toFixed(2) }}
+        </n-descriptions-item>
         <n-descriptions-item label="订单状态">
           {{ orderStatus(item) }}
         </n-descriptions-item>
@@ -75,15 +67,19 @@
         </n-descriptions-item>
         <n-descriptions-item label="会员名称"> {{ item.memberName }} </n-descriptions-item>
         <n-descriptions-item label="会员昵称"> {{ item.shipName }} </n-descriptions-item>
+        <n-descriptions-item label="手机号"> {{ item.shipMobile }} </n-descriptions-item>
         <n-descriptions-item label="订单编号"> {{ item.orderSn }} </n-descriptions-item>
-        <n-descriptions-item label="创建时间">
-          {{ formatToDateTime(item.createTime * 1000) }}
-        </n-descriptions-item>
-        <n-descriptions-item label="折扣规则">
-          {{ item.discountRule }}
+        <n-descriptions-item label="付款状态">
+          {{ Number(item.payStatus) === 1 ? '已付款' : '未付款' }}
         </n-descriptions-item>
         <n-descriptions-item label="支付时间">
-          {{ formatToDateTime(item.paymentTime * 1000) }}
+          {{ item.paymentTime ? formatToDateTime(item.paymentTime * 1000) : '' }}
+        </n-descriptions-item>
+        <n-descriptions-item label="完成时间">
+          {{ item.completeTime ? formatToDateTime(item.completeTime * 1000) : '' }}
+        </n-descriptions-item>
+        <n-descriptions-item label="详细收货地址">
+          {{ `${item.shipAreaName}-${item.shipFullAddress}` }}
         </n-descriptions-item>
       </n-descriptions>
     </div>
diff --git a/src/views/order/orderList/lib/components/OrderItem.vue b/src/views/order/orderList/lib/components/OrderItem.vue
new file mode 100644
index 0000000..786ac5d
--- /dev/null
+++ b/src/views/order/orderList/lib/components/OrderItem.vue
@@ -0,0 +1,80 @@
+<script setup lang="ts">
+  import { ref } from 'vue';
+  import { Item } from './OrderDetail.vue';
+  import { type OrderItemType } from '@/types/order';
+  // eslint-disable-next-line vue/no-setup-props-destructure
+  const { item } = defineProps<{
+    item: Item;
+  }>();
+  import { getOrderItemPage } from '@/api/order/order';
+  import { formatToDateTime } from '@/utils/dateUtil';
+  const orderItemList = ref<OrderItemType[]>();
+  const getOrderItem = async (item) => {
+    const res = await getOrderItemPage<OrderItemType[]>(item.id);
+    orderItemList.value = res;
+  };
+  getOrderItem(item);
+  const orderStatus = (item) => {
+    switch (Number(item.status)) {
+      case 0:
+        return '待付款';
+      case 1:
+        return '已付款';
+      case 2:
+        return '已发货';
+      case 3:
+        return '已收货';
+      case 4:
+        return '已取消';
+      case 5:
+        return '已完成';
+    }
+  };
+</script>
+
+<template>
+  <div class="title">商品信息</div>
+  <n-table :bordered="false" :single-line="false" class="table">
+    <thead>
+      <tr>
+        <th>创建时间</th>
+        <th>商品id</th>
+        <th>商品图片</th>
+        <th>商品名字</th>
+        <th>商品数量</th>
+        <th>商品原价</th>
+        <th>商品价格</th>
+        <th>订单编号</th>
+        <th>订单状态</th>
+      </tr>
+    </thead>
+    <tbody v-for="goods in orderItemList" :key="goods.id">
+      <tr>
+        <td>{{ formatToDateTime(goods.createTime * 1000) }}</td>
+        <td>{{ goods.goodsId }}</td>
+        <td>
+          <n-image width="50" :src="goods.goodsImg" />
+        </td>
+        <td>{{ goods.goodsName }}</td>
+        <td>{{ goods.goodsNum }}</td>
+        <td>{{ goods.goodsOriginalPrice }}</td>
+        <td>{{ goods.goodsPrice }}</td>
+        <td>{{ goods.orderSn }}</td>
+        <td>{{ orderStatus(goods) }}</td>
+      </tr>
+    </tbody>
+  </n-table>
+</template>
+
+<style scoped lang="less">
+  .title {
+    font-size: 20px;
+    width: 100px;
+    height: 100px;
+    line-height: 100px;
+  }
+  img {
+    width: 50px;
+    height: 50px;
+  }
+</style>
diff --git a/types/order.d.ts b/types/order.d.ts
new file mode 100644
index 0000000..6db10ae
--- /dev/null
+++ b/types/order.d.ts
@@ -0,0 +1,36 @@
+export interface Item {
+  createTime: number;
+  discountPrice: number;
+  discountRule: string;
+  goodsNum: number;
+  goodsPrice: number;
+  id: number;
+  memberId: number;
+  memberName: string;
+  orderPrice: number;
+  orderSn: string;
+  orderStatus: string;
+  orderType: number;
+  payStatus: string;
+  shipAreaId: number;
+  shipAreaName: string;
+  shipFullAddress: string;
+  shipMobile: string;
+  shipName: string;
+  shippingPrice: number;
+}
+export interface OrderItemType {
+  createTime: number; //创建时间
+  discountRule: string; // 折扣规则
+  goodsDiscountPrice: number; //商品折扣价格
+  goodsId: number; //商品id
+  goodsImg: string; // 商品图片
+  goodsName: string; //商品名字
+  goodsNum: number; // 商品数量
+  goodsOriginalPrice: number; // 商品原价
+  goodsPrice: number; //商品价格
+  id: number;
+  orderId: number; //订单id
+  orderSn: string; //订单编号
+  status: number; //订单状态
+}
-- 
Gitee