From 5c203d7f302d011f39e496803ae0a812e160da06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Tue, 12 Aug 2025 12:42:58 +0800
Subject: [PATCH] =?UTF-8?q?refactor(shop):=20=E7=A7=BB=E9=99=A4=E5=93=81?=
 =?UTF-8?q?=E7=89=8C=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 删除了 shopBrand2 相关的 API、组件和页面
- 优化了 shopCoupon 和 shopExpress 页面的日期格式显示
- 更新了 shopCoupon 编辑组件，增加了日期选择器并优化了数据格式
---
 src/api/shop/shopBrand2/index.ts              | 105 --------
 src/api/shop/shopBrand2/model/index.ts        |  31 ---
 src/api/shop/shopCoupon/model/index.ts        |   8 +-
 .../shop/shopBrand2/components/search.vue     |  42 ---
 .../shopBrand2/components/shopBrand2Edit.vue  | 208 ---------------
 src/views/shop/shopBrand2/index.vue           | 244 ------------------
 .../shopCoupon/components/shopCouponEdit.vue  |  50 +++-
 src/views/shop/shopCoupon/index.vue           |   7 +
 src/views/shop/shopExpress/index.vue          |   2 +-
 9 files changed, 56 insertions(+), 641 deletions(-)
 delete mode 100644 src/api/shop/shopBrand2/index.ts
 delete mode 100644 src/api/shop/shopBrand2/model/index.ts
 delete mode 100644 src/views/shop/shopBrand2/components/search.vue
 delete mode 100644 src/views/shop/shopBrand2/components/shopBrand2Edit.vue
 delete mode 100644 src/views/shop/shopBrand2/index.vue

diff --git a/src/api/shop/shopBrand2/index.ts b/src/api/shop/shopBrand2/index.ts
deleted file mode 100644
index 5d23b03..0000000
--- a/src/api/shop/shopBrand2/index.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-import request from '@/utils/request';
-import type { ApiResult, PageResult } from '@/api';
-import type { ShopBrand2, ShopBrand2Param } from './model';
-
-/**
- * 分页查询品牌
- */
-export async function pageShopBrand2(params: ShopBrand2Param) {
-  const res = await request.get<ApiResult<PageResult<ShopBrand2>>>(
-    '/shop/shop-brand2/page',
-    {
-      params
-    }
-  );
-  if (res.data.code === 0) {
-    return res.data.data;
-  }
-  return Promise.reject(new Error(res.data.message));
-}
-
-/**
- * 查询品牌列表
- */
-export async function listShopBrand2(params?: ShopBrand2Param) {
-  const res = await request.get<ApiResult<ShopBrand2[]>>(
-    '/shop/shop-brand2',
-    {
-      params
-    }
-  );
-  if (res.data.code === 0 && res.data.data) {
-    return res.data.data;
-  }
-  return Promise.reject(new Error(res.data.message));
-}
-
-/**
- * 添加品牌
- */
-export async function addShopBrand2(data: ShopBrand2) {
-  const res = await request.post<ApiResult<unknown>>(
-    '/shop/shop-brand2',
-    data
-  );
-  if (res.data.code === 0) {
-    return res.data.message;
-  }
-  return Promise.reject(new Error(res.data.message));
-}
-
-/**
- * 修改品牌
- */
-export async function updateShopBrand2(data: ShopBrand2) {
-  const res = await request.put<ApiResult<unknown>>(
-    '/shop/shop-brand2',
-    data
-  );
-  if (res.data.code === 0) {
-    return res.data.message;
-  }
-  return Promise.reject(new Error(res.data.message));
-}
-
-/**
- * 删除品牌
- */
-export async function removeShopBrand2(id?: number) {
-  const res = await request.delete<ApiResult<unknown>>(
-    '/shop/shop-brand2/' + id
-  );
-  if (res.data.code === 0) {
-    return res.data.message;
-  }
-  return Promise.reject(new Error(res.data.message));
-}
-
-/**
- * 批量删除品牌
- */
-export async function removeBatchShopBrand2(data: (number | undefined)[]) {
-  const res = await request.delete<ApiResult<unknown>>(
-    '/shop/shop-brand2/batch',
-    {
-      data
-    }
-  );
-  if (res.data.code === 0) {
-    return res.data.message;
-  }
-  return Promise.reject(new Error(res.data.message));
-}
-
-/**
- * 根据id查询品牌
- */
-export async function getShopBrand2(id: number) {
-  const res = await request.get<ApiResult<ShopBrand2>>(
-    '/shop/shop-brand2/' + id
-  );
-  if (res.data.code === 0 && res.data.data) {
-    return res.data.data;
-  }
-  return Promise.reject(new Error(res.data.message));
-}
diff --git a/src/api/shop/shopBrand2/model/index.ts b/src/api/shop/shopBrand2/model/index.ts
deleted file mode 100644
index b6a1471..0000000
--- a/src/api/shop/shopBrand2/model/index.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import type { PageParam } from '@/api';
-
-/**
- * 品牌
- */
-export interface ShopBrand2 {
-  // ID
-  brandId?: number;
-  // 品牌名称
-  brandName?: string;
-  // 图标
-  image?: string;
-  // 备注
-  comments?: string;
-  // 状态
-  status?: number;
-  // 排序号
-  sortNumber?: number;
-  // 租户id
-  tenantId?: number;
-  // 创建时间
-  createTime?: string;
-}
-
-/**
- * 品牌搜索条件
- */
-export interface ShopBrand2Param extends PageParam {
-  brandId?: number;
-  keywords?: string;
-}
diff --git a/src/api/shop/shopCoupon/model/index.ts b/src/api/shop/shopCoupon/model/index.ts
index 1b8079c..e3e3867 100644
--- a/src/api/shop/shopCoupon/model/index.ts
+++ b/src/api/shop/shopCoupon/model/index.ts
@@ -25,9 +25,9 @@ export interface ShopCoupon {
   // 领取后生效-有效天数
   expireDay?: number;
   // 有效期开始时间
-  startTime?: string;
+  startTime?: string | Date;
   // 有效期结束时间
-  endTime?: string;
+  endTime?: string | Date;
   // 适用范围(10全部商品 20指定商品 30指定分类)
   applyRange?: number;
   // 适用范围配置(json格式)
@@ -45,9 +45,9 @@ export interface ShopCoupon {
   // 租户id
   tenantId?: number;
   // 创建时间
-  createTime?: string;
+  createTime?: string | Date;
   // 修改时间
-  updateTime?: string;
+  updateTime?: string | Date;
   // 发放总数量(-1表示无限制)
   totalCount?: number;
   // 已发放数量
diff --git a/src/views/shop/shopBrand2/components/search.vue b/src/views/shop/shopBrand2/components/search.vue
deleted file mode 100644
index 82fea9d..0000000
--- a/src/views/shop/shopBrand2/components/search.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-<!-- 搜索表单 -->
-<template>
-  <a-space :size="10" style="flex-wrap: wrap">
-    <a-button type="primary" class="ele-btn-icon" @click="add">
-      <template #icon>
-        <PlusOutlined />
-      </template>
-      <span>添加</span>
-    </a-button>
-  </a-space>
-</template>
-
-<script lang="ts" setup>
-  import { PlusOutlined } from '@ant-design/icons-vue';
-  import type { GradeParam } from '@/api/user/grade/model';
-  import { watch } from 'vue';
-
-  const props = withDefaults(
-    defineProps<{
-      // 选中的角色
-      selection?: [];
-    }>(),
-    {}
-  );
-
-  const emit = defineEmits<{
-    (e: 'search', where?: GradeParam): void;
-    (e: 'add'): void;
-    (e: 'remove'): void;
-    (e: 'batchMove'): void;
-  }>();
-
-  // 新增
-  const add = () => {
-    emit('add');
-  };
-
-  watch(
-    () => props.selection,
-    () => {}
-  );
-</script>
diff --git a/src/views/shop/shopBrand2/components/shopBrand2Edit.vue b/src/views/shop/shopBrand2/components/shopBrand2Edit.vue
deleted file mode 100644
index b96b331..0000000
--- a/src/views/shop/shopBrand2/components/shopBrand2Edit.vue
+++ /dev/null
@@ -1,208 +0,0 @@
-<!-- 编辑弹窗 -->
-<template>
-  <ele-modal
-    :width="800"
-    :visible="visible"
-    :maskClosable="false"
-    :maxable="maxable"
-    :title="isUpdate ? '编辑品牌' : '添加品牌'"
-    :body-style="{ paddingBottom: '28px' }"
-    @update:visible="updateVisible"
-    @ok="save"
-  >
-    <a-form
-      ref="formRef"
-      :model="form"
-      :rules="rules"
-      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
-      :wrapper-col="
-        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
-      "
-    >
-      <a-form-item label="品牌名称" name="brandName">
-        <a-input
-          allow-clear
-          placeholder="请输入品牌名称"
-          v-model:value="form.brandName"
-        />
-      </a-form-item>
-        <a-form-item
-          label="图标"
-          name="image">
-          <SelectFile
-            :placeholder="`请选择图片`"
-            :limit="1"
-            :data="images"
-            @done="chooseImage"
-            @del="onDeleteItem"
-          />
-        </a-form-item>
-      <a-form-item label="备注" name="comments">
-        <a-textarea
-          :rows="4"
-          :maxlength="200"
-          placeholder="请输入描述"
-          v-model:value="form.comments"
-        />
-      </a-form-item>
-      <a-form-item label="状态" name="status">
-        <a-radio-group v-model:value="form.status">
-          <a-radio :value="0">显示</a-radio>
-          <a-radio :value="1">隐藏</a-radio>
-        </a-radio-group>
-      </a-form-item>
-      <a-form-item label="排序号" name="sortNumber">
-        <a-input-number
-          :min="0"
-          :max="9999"
-          class="ele-fluid"
-          placeholder="请输入排序号"
-          v-model:value="form.sortNumber"
-        />
-      </a-form-item>
-    </a-form>
-  </ele-modal>
-</template>
-
-<script lang="ts" setup>
-  import { ref, reactive, watch } from 'vue';
-  import { Form, message } from 'ant-design-vue';
-  import { assignObject, uuid } from 'ele-admin-pro';
-  import { addShopBrand2, updateShopBrand2 } from '@/api/shop/shopBrand2';
-  import { ShopBrand2 } from '@/api/shop/shopBrand2/model';
-  import { useThemeStore } from '@/store/modules/theme';
-  import { storeToRefs } from 'pinia';
-  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
-  import { FormInstance } from 'ant-design-vue/es/form';
-  import { FileRecord } from '@/api/system/file/model';
-
-  // 是否是修改
-  const isUpdate = ref(false);
-  const useForm = Form.useForm;
-  // 是否开启响应式布局
-  const themeStore = useThemeStore();
-  const { styleResponsive } = storeToRefs(themeStore);
-
-  const props = defineProps<{
-    // 弹窗是否打开
-    visible: boolean;
-    // 修改回显的数据
-    data?: ShopBrand2 | null;
-  }>();
-
-  const emit = defineEmits<{
-    (e: 'done'): void;
-    (e: 'update:visible', visible: boolean): void;
-  }>();
-
-  // 提交状态
-  const loading = ref(false);
-  // 是否显示最大化切换按钮
-  const maxable = ref(true);
-  // 表格选中数据
-  const formRef = ref<FormInstance | null>(null);
-  const images = ref<ItemType[]>([]);
-
-  // 用户信息
-  const form = reactive<ShopBrand2>({
-    brandId: undefined,
-    brandName: undefined,
-    image: undefined,
-    comments: undefined,
-    status: undefined,
-    sortNumber: undefined,
-    tenantId: undefined,
-    createTime: undefined,
-    shopBrand2Id: undefined,
-    shopBrand2Name: '',
-    status: 0,
-    comments: '',
-    sortNumber: 100
-  });
-
-  /* 更新visible */
-  const updateVisible = (value: boolean) => {
-    emit('update:visible', value);
-  };
-
-  // 表单验证规则
-  const rules = reactive({
-    shopBrand2Name: [
-      {
-        required: true,
-        type: 'string',
-        message: '请填写品牌名称',
-        trigger: 'blur'
-      }
-    ]
-  });
-
-  const chooseImage = (data: FileRecord) => {
-    images.value.push({
-      uid: data.id,
-      url: data.path,
-      status: 'done'
-    });
-    form.image = data.path;
-  };
-
-  const onDeleteItem = (index: number) => {
-    images.value.splice(index, 1);
-    form.image = '';
-  };
-
-  const { resetFields } = useForm(form, rules);
-
-  /* 保存编辑 */
-  const save = () => {
-    if (!formRef.value) {
-      return;
-    }
-    formRef.value
-      .validate()
-      .then(() => {
-        loading.value = true;
-        const formData = {
-          ...form
-        };
-        const saveOrUpdate = isUpdate.value ? updateShopBrand2 : addShopBrand2;
-        saveOrUpdate(formData)
-          .then((msg) => {
-            loading.value = false;
-            message.success(msg);
-            updateVisible(false);
-            emit('done');
-          })
-          .catch((e) => {
-            loading.value = false;
-            message.error(e.message);
-          });
-      })
-      .catch(() => {});
-  };
-
-  watch(
-    () => props.visible,
-    (visible) => {
-      if (visible) {
-        images.value = [];
-        if (props.data) {
-          assignObject(form, props.data);
-          if(props.data.image){
-            images.value.push({
-              uid: uuid(),
-              url: props.data.image,
-              status: 'done'
-            })
-          }
-          isUpdate.value = true;
-        } else {
-          isUpdate.value = false;
-        }
-      } else {
-        resetFields();
-      }
-    },
-    { immediate: true }
-  );
-</script>
diff --git a/src/views/shop/shopBrand2/index.vue b/src/views/shop/shopBrand2/index.vue
deleted file mode 100644
index d6217ea..0000000
--- a/src/views/shop/shopBrand2/index.vue
+++ /dev/null
@@ -1,244 +0,0 @@
-<template>
-  <a-page-header :title="getPageTitle()" @back="() => $router.go(-1)">
-      <a-card :bordered="false" :body-style="{ padding: '16px' }">
-        <ele-pro-table
-          ref="tableRef"
-          row-key="shopBrand2Id"
-          :columns="columns"
-          :datasource="datasource"
-          :customRow="customRow"
-          tool-class="ele-toolbar-form"
-          class="sys-org-table"
-        >
-          <template #toolbar>
-            <search
-              @search="reload"
-              :selection="selection"
-              @add="openEdit"
-              @remove="removeBatch"
-              @batchMove="openMove"
-            />
-          </template>
-          <template #bodyCell="{ column, record }">
-            <template v-if="column.key === 'image'">
-              <a-image :src="record.image" :width="50" />
-            </template>
-            <template v-if="column.key === 'status'">
-              <a-tag v-if="record.status === 0" color="green">显示</a-tag>
-              <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
-            </template>
-            <template v-if="column.key === 'action'">
-              <a-space>
-                <a @click="openEdit(record)">修改</a>
-                <a-divider type="vertical" />
-                <a-popconfirm
-                  title="确定要删除此记录吗？"
-                  @confirm="remove(record)"
-                >
-                  <a class="ele-text-danger">删除</a>
-                </a-popconfirm>
-              </a-space>
-            </template>
-          </template>
-        </ele-pro-table>
-      </a-card>
-
-      <!-- 编辑弹窗 -->
-      <ShopBrand2Edit v-model:visible="showEdit" :data="current" @done="reload" />
-  </a-page-header>
-</template>
-
-<script lang="ts" setup>
-  import { createVNode, ref } from 'vue';
-  import { message, Modal } from 'ant-design-vue';
-  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
-  import type { EleProTable } from 'ele-admin-pro';
-  import { toDateString } from 'ele-admin-pro';
-  import type {
-    DatasourceFunction,
-    ColumnItem
-  } from 'ele-admin-pro/es/ele-pro-table/types';
-  import Search from './components/search.vue';
-  import {getPageTitle} from '@/utils/common';
-  import ShopBrand2Edit from './components/shopBrand2Edit.vue';
-  import { pageShopBrand2, removeShopBrand2, removeBatchShopBrand2 } from '@/api/shop/shopBrand2';
-  import type { ShopBrand2, ShopBrand2Param } from '@/api/shop/shopBrand2/model';
-
-  // 表格实例
-  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
-
-  // 表格选中数据
-  const selection = ref<ShopBrand2[]>([]);
-  // 当前编辑数据
-  const current = ref<ShopBrand2 | null>(null);
-  // 是否显示编辑弹窗
-  const showEdit = ref(false);
-  // 是否显示批量移动弹窗
-  const showMove = ref(false);
-  // 加载状态
-  const loading = ref(true);
-
-  // 表格数据源
-  const datasource: DatasourceFunction = ({
-    page,
-    limit,
-    where,
-    orders,
-    filters
-  }) => {
-    if (filters) {
-      where.status = filters.status;
-    }
-    return pageShopBrand2({
-      ...where,
-      ...orders,
-      page,
-      limit
-    });
-  };
-
-  // 表格列配置
-  const columns = ref<ColumnItem[]>([
-    {
-      title: 'ID',
-      dataIndex: 'brandId',
-      key: 'brandId',
-      align: 'center',
-      width: 90,
-    },
-    {
-      title: '品牌名称',
-      dataIndex: 'brandName',
-      key: 'brandName',
-      align: 'center',
-    },
-    {
-      title: '图标',
-      dataIndex: 'image',
-      key: 'image',
-      align: 'center',
-    },
-    {
-      title: '备注',
-      dataIndex: 'comments',
-      key: 'comments',
-      align: 'center',
-    },
-    {
-      title: '状态',
-      dataIndex: 'status',
-      key: 'status',
-      align: 'center',
-    },
-    {
-      title: '排序号',
-      dataIndex: 'sortNumber',
-      key: 'sortNumber',
-      align: 'center',
-    },
-    {
-      title: '创建时间',
-      dataIndex: 'createTime',
-      key: 'createTime',
-      align: 'center',
-      sorter: true,
-      ellipsis: true,
-      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
-    },
-    {
-      title: '操作',
-      key: 'action',
-      width: 180,
-      fixed: 'right',
-      align: 'center',
-      hideInSetting: true
-    }
-  ]);
-
-  /* 搜索 */
-  const reload = (where?: ShopBrand2Param) => {
-    selection.value = [];
-    tableRef?.value?.reload({ where: where });
-  };
-
-  /* 打开编辑弹窗 */
-  const openEdit = (row?: ShopBrand2) => {
-    current.value = row ?? null;
-    showEdit.value = true;
-  };
-
-  /* 打开批量移动弹窗 */
-  const openMove = () => {
-    showMove.value = true;
-  };
-
-  /* 删除单个 */
-  const remove = (row: ShopBrand2) => {
-    const hide = message.loading('请求中..', 0);
-    removeShopBrand2(row.shopBrand2Id)
-      .then((msg) => {
-        hide();
-        message.success(msg);
-        reload();
-      })
-      .catch((e) => {
-        hide();
-        message.error(e.message);
-      });
-  };
-
-  /* 批量删除 */
-  const removeBatch = () => {
-    if (!selection.value.length) {
-      message.error('请至少选择一条数据');
-      return;
-    }
-    Modal.confirm({
-      title: '提示',
-      content: '确定要删除选中的记录吗?',
-      icon: createVNode(ExclamationCircleOutlined),
-      maskClosable: true,
-      onOk: () => {
-        const hide = message.loading('请求中..', 0);
-        removeBatchShopBrand2(selection.value.map((d) => d.shopBrand2Id))
-          .then((msg) => {
-            hide();
-            message.success(msg);
-            reload();
-          })
-          .catch((e) => {
-            hide();
-            message.error(e.message);
-          });
-      }
-    });
-  };
-
-  /* 查询 */
-  const query = () => {
-    loading.value = true;
-  };
-
-  /* 自定义行属性 */
-  const customRow = (record: ShopBrand2) => {
-    return {
-      // 行点击事件
-      onClick: () => {
-        // console.log(record);
-      },
-      // 行双击事件
-      onDblclick: () => {
-        openEdit(record);
-      }
-    };
-  };
-  query();
-</script>
-
-<script lang="ts">
-  export default {
-    name: 'ShopBrand2'
-  };
-</script>
-
-<style lang="less" scoped></style>
diff --git a/src/views/shop/shopCoupon/components/shopCouponEdit.vue b/src/views/shop/shopCoupon/components/shopCouponEdit.vue
index 740d0a8..c8d5536 100644
--- a/src/views/shop/shopCoupon/components/shopCouponEdit.vue
+++ b/src/views/shop/shopCoupon/components/shopCouponEdit.vue
@@ -86,17 +86,21 @@
       </a-form-item>
       <template v-if="form.expireType === 20">
         <a-form-item label="有效期开始时间" name="startTime">
-          <a-input
-            allow-clear
-            placeholder="请输入有效期开始时间"
+          <a-date-picker
+            placeholder="请选择开始时间"
             v-model:value="form.startTime"
+            style="width: 100%"
+            format="YYYY-MM-DD"
+            valueFormat="YYYY-MM-DD"
           />
         </a-form-item>
         <a-form-item label="有效期结束时间" name="endTime">
-          <a-input
-            allow-clear
-            placeholder="请输入有效期结束时间"
+          <a-date-picker
+            placeholder="请选择结束时间"
             v-model:value="form.endTime"
+            style="width: 100%"
+            format="YYYY-MM-DD"
+            valueFormat="YYYY-MM-DD"
           />
         </a-form-item>
       </template>
@@ -288,6 +292,29 @@
         const formData = {
           ...form
         };
+
+        // 处理日期格式转换
+        if (formData.startTime && typeof formData.startTime === 'object') {
+          formData.startTime = formData.startTime.format ? formData.startTime.format('YYYY-MM-DD') : formData.startTime;
+        }
+        if (formData.endTime && typeof formData.endTime === 'object') {
+          formData.endTime = formData.endTime.format ? formData.endTime.format('YYYY-MM-DD') : formData.endTime;
+        }
+
+        // 确保数值类型正确
+        if (formData.type) formData.type = Number(formData.type);
+        if (formData.expireType) formData.expireType = Number(formData.expireType);
+        if (formData.applyRange) formData.applyRange = Number(formData.applyRange);
+        if (formData.status !== undefined) formData.status = Number(formData.status);
+        if (formData.enabled !== undefined) formData.enabled = Number(formData.enabled);
+        if (formData.expireDay !== undefined) formData.expireDay = Number(formData.expireDay);
+        if (formData.reducePrice !== undefined) formData.reducePrice = Number(formData.reducePrice);
+        if (formData.discount !== undefined) formData.discount = Number(formData.discount);
+        if (formData.minPrice !== undefined) formData.minPrice = Number(formData.minPrice);
+        if (formData.sortNumber !== undefined) formData.sortNumber = Number(formData.sortNumber);
+        if (formData.totalCount !== undefined) formData.totalCount = Number(formData.totalCount);
+        if (formData.limitPerUser !== undefined) formData.limitPerUser = Number(formData.limitPerUser);
+
         if (applyItemListValue.value.length) {
           formData.couponApplyItemList = applyItemListValue.value.map(pk => {
             return {
@@ -304,6 +331,8 @@
             }
           });
         }else formData.couponApplyCateList = []
+
+        console.log('提交的数据:', formData);
         const saveOrUpdate = isUpdate.value ? updateShopCoupon : addShopCoupon;
         saveOrUpdate(formData)
           .then((msg) => {
@@ -341,6 +370,15 @@
         await getGoodsCateList()
         if (props.data) {
           assignObject(form, props.data);
+
+          // 处理日期字段转换为Date对象
+          if (props.data.startTime && typeof props.data.startTime === 'string') {
+            form.startTime = new Date(props.data.startTime);
+          }
+          if (props.data.endTime && typeof props.data.endTime === 'string') {
+            form.endTime = new Date(props.data.endTime);
+          }
+
           if (props.data.image) {
             images.value.push({
               uid: uuid(),
diff --git a/src/views/shop/shopCoupon/index.vue b/src/views/shop/shopCoupon/index.vue
index 9dadc29..ab65b6c 100644
--- a/src/views/shop/shopCoupon/index.vue
+++ b/src/views/shop/shopCoupon/index.vue
@@ -178,12 +178,16 @@
       dataIndex: 'startTime',
       key: 'startTime',
       align: 'center',
+      width: 120,
+      customRender: ({ text }) => text ? toDateString(text, 'yyyy-MM-dd') : '-'
     },
     {
       title: '有效期结束时间',
       dataIndex: 'endTime',
       key: 'endTime',
       align: 'center',
+      width: 120,
+      customRender: ({ text }) => text ? toDateString(text, 'yyyy-MM-dd') : '-'
     },
     {
       title: '适用范围',
@@ -229,6 +233,9 @@
       dataIndex: 'updateTime',
       key: 'updateTime',
       align: 'center',
+      width: 120,
+      ellipsis: true,
+      customRender: ({ text }) => text ? toDateString(text, 'yyyy-MM-dd HH:mm') : '-'
     },
     {
       title: '发放总数量(-1表示无限制)',
diff --git a/src/views/shop/shopExpress/index.vue b/src/views/shop/shopExpress/index.vue
index c3d0da2..3185d87 100644
--- a/src/views/shop/shopExpress/index.vue
+++ b/src/views/shop/shopExpress/index.vue
@@ -149,7 +149,7 @@
       align: 'center',
       sorter: true,
       ellipsis: true,
-      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd HH:mm:ss')
     },
     {
       title: '修改时间',