feat(shop): 添加品牌管理和物流公司管理功能

- 新增品牌管理相关接口和页面组件
- 新增物流公司管理相关接口和页面组件
- 优化运费模板和运费模板详情页面的请求路径

src/api/shop/shopBrand2/index.ts

@@ -0,0 +1,105 @@
+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));
+}

src/api/shop/shopBrand2/model/index.ts

@@ -0,0 +1,31 @@
+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;
+}

src/api/shop/shopExpress/index.ts

@@ -1,14 +1,13 @@
 import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api';
 import type { ShopExpress, ShopExpressParam } from './model';
-import { MODULES_API_URL } from '@/config/setting';
 
 /**
  * 分页查询物流公司
  */
 export async function pageShopExpress(params: ShopExpressParam) {
   const res = await request.get<ApiResult<PageResult<ShopExpress>>>(
-    MODULES_API_URL + '/shop/shop-express/page',
+    '/shop/shop-express/page',
     {
       params
     }
@@ -24,7 +23,7 @@ export async function pageShopExpress(params: ShopExpressParam) {
  */
 export async function listShopExpress(params?: ShopExpressParam) {
   const res = await request.get<ApiResult<ShopExpress[]>>(
-    MODULES_API_URL + '/shop/shop-express',
+    '/shop/shop-express',
     {
       params
     }
@@ -40,7 +39,7 @@ export async function listShopExpress(params?: ShopExpressParam) {
  */
 export async function addShopExpress(data: ShopExpress) {
   const res = await request.post<ApiResult<unknown>>(
-    MODULES_API_URL + '/shop/shop-express',
+    '/shop/shop-express',
     data
   );
   if (res.data.code === 0) {
@@ -54,7 +53,7 @@ export async function addShopExpress(data: ShopExpress) {
  */
 export async function updateShopExpress(data: ShopExpress) {
   const res = await request.put<ApiResult<unknown>>(
-    MODULES_API_URL + '/shop/shop-express',
+    '/shop/shop-express',
     data
   );
   if (res.data.code === 0) {
@@ -68,7 +67,7 @@ export async function updateShopExpress(data: ShopExpress) {
  */
 export async function removeShopExpress(id?: number) {
   const res = await request.delete<ApiResult<unknown>>(
-    MODULES_API_URL + '/shop/shop-express/' + id
+    '/shop/shop-express/' + id
   );
   if (res.data.code === 0) {
     return res.data.message;
@@ -81,7 +80,7 @@ export async function removeShopExpress(id?: number) {
  */
 export async function removeBatchShopExpress(data: (number | undefined)[]) {
   const res = await request.delete<ApiResult<unknown>>(
-    MODULES_API_URL + '/shop/shop-express/batch',
+    '/shop/shop-express/batch',
     {
       data
     }
@@ -97,7 +96,7 @@ export async function removeBatchShopExpress(data: (number | undefined)[]) {
  */
 export async function getShopExpress(id: number) {
   const res = await request.get<ApiResult<ShopExpress>>(
-    MODULES_API_URL + '/shop/shop-express/' + id
+    '/shop/shop-express/' + id
   );
   if (res.data.code === 0 && res.data.data) {
     return res.data.data;

src/api/shop/shopExpressTemplate/index.ts

@@ -1,14 +1,13 @@
 import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api';
 import type { ShopExpressTemplate, ShopExpressTemplateParam } from './model';
-import { MODULES_API_URL } from '@/config/setting';
 
 /**
  * 分页查询运费模板
  */
 export async function pageShopExpressTemplate(params: ShopExpressTemplateParam) {
   const res = await request.get<ApiResult<PageResult<ShopExpressTemplate>>>(
-    MODULES_API_URL + '/shop/shop-express-template/page',
+    '/shop/shop-express-template/page',
     {
       params
     }
@@ -24,7 +23,7 @@ export async function pageShopExpressTemplate(params: ShopExpressTemplateParam)
  */
 export async function listShopExpressTemplate(params?: ShopExpressTemplateParam) {
   const res = await request.get<ApiResult<ShopExpressTemplate[]>>(
-    MODULES_API_URL + '/shop/shop-express-template',
+    '/shop/shop-express-template',
     {
       params
     }
@@ -40,7 +39,7 @@ export async function listShopExpressTemplate(params?: ShopExpressTemplateParam)
  */
 export async function addShopExpressTemplate(data: ShopExpressTemplate) {
   const res = await request.post<ApiResult<unknown>>(
-    MODULES_API_URL + '/shop/shop-express-template',
+    '/shop/shop-express-template',
     data
   );
   if (res.data.code === 0) {
@@ -54,7 +53,7 @@ export async function addShopExpressTemplate(data: ShopExpressTemplate) {
  */
 export async function updateShopExpressTemplate(data: ShopExpressTemplate) {
   const res = await request.put<ApiResult<unknown>>(
-    MODULES_API_URL + '/shop/shop-express-template',
+    '/shop/shop-express-template',
     data
   );
   if (res.data.code === 0) {
@@ -68,7 +67,7 @@ export async function updateShopExpressTemplate(data: ShopExpressTemplate) {
  */
 export async function removeShopExpressTemplate(id?: number) {
   const res = await request.delete<ApiResult<unknown>>(
-    MODULES_API_URL + '/shop/shop-express-template/' + id
+    '/shop/shop-express-template/' + id
   );
   if (res.data.code === 0) {
     return res.data.message;
@@ -81,7 +80,7 @@ export async function removeShopExpressTemplate(id?: number) {
  */
 export async function removeBatchShopExpressTemplate(data: (number | undefined)[]) {
   const res = await request.delete<ApiResult<unknown>>(
-    MODULES_API_URL + '/shop/shop-express-template/batch',
+    '/shop/shop-express-template/batch',
     {
       data
     }
@@ -97,7 +96,7 @@ export async function removeBatchShopExpressTemplate(data: (number | undefined)[
  */
 export async function getShopExpressTemplate(id: number) {
   const res = await request.get<ApiResult<ShopExpressTemplate>>(
-    MODULES_API_URL + '/shop/shop-express-template/' + id
+    '/shop/shop-express-template/' + id
   );
   if (res.data.code === 0 && res.data.data) {
     return res.data.data;

src/api/shop/shopExpressTemplateDetail/index.ts

@@ -1,14 +1,13 @@
 import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api';
 import type { ShopExpressTemplateDetail, ShopExpressTemplateDetailParam } from './model';
-import { MODULES_API_URL } from '@/config/setting';
 
 /**
  * 分页查询运费模板
  */
 export async function pageShopExpressTemplateDetail(params: ShopExpressTemplateDetailParam) {
   const res = await request.get<ApiResult<PageResult<ShopExpressTemplateDetail>>>(
-    MODULES_API_URL + '/shop/shop-express-template-detail/page',
+    '/shop/shop-express-template-detail/page',
     {
       params
     }
@@ -24,7 +23,7 @@ export async function pageShopExpressTemplateDetail(params: ShopExpressTemplateD
  */
 export async function listShopExpressTemplateDetail(params?: ShopExpressTemplateDetailParam) {
   const res = await request.get<ApiResult<ShopExpressTemplateDetail[]>>(
-    MODULES_API_URL + '/shop/shop-express-template-detail',
+    '/shop/shop-express-template-detail',
     {
       params
     }
@@ -40,7 +39,7 @@ export async function listShopExpressTemplateDetail(params?: ShopExpressTemplate
  */
 export async function addShopExpressTemplateDetail(data: ShopExpressTemplateDetail) {
   const res = await request.post<ApiResult<unknown>>(
-    MODULES_API_URL + '/shop/shop-express-template-detail',
+    '/shop/shop-express-template-detail',
     data
   );
   if (res.data.code === 0) {
@@ -54,7 +53,7 @@ export async function addShopExpressTemplateDetail(data: ShopExpressTemplateDeta
  */
 export async function updateShopExpressTemplateDetail(data: ShopExpressTemplateDetail) {
   const res = await request.put<ApiResult<unknown>>(
-    MODULES_API_URL + '/shop/shop-express-template-detail',
+    '/shop/shop-express-template-detail',
     data
   );
   if (res.data.code === 0) {
@@ -68,7 +67,7 @@ export async function updateShopExpressTemplateDetail(data: ShopExpressTemplateD
  */
 export async function removeShopExpressTemplateDetail(id?: number) {
   const res = await request.delete<ApiResult<unknown>>(
-    MODULES_API_URL + '/shop/shop-express-template-detail/' + id
+    '/shop/shop-express-template-detail/' + id
   );
   if (res.data.code === 0) {
     return res.data.message;
@@ -81,7 +80,7 @@ export async function removeShopExpressTemplateDetail(id?: number) {
  */
 export async function removeBatchShopExpressTemplateDetail(data: (number | undefined)[]) {
   const res = await request.delete<ApiResult<unknown>>(
-    MODULES_API_URL + '/shop/shop-express-template-detail/batch',
+    '/shop/shop-express-template-detail/batch',
     {
       data
     }
@@ -97,7 +96,7 @@ export async function removeBatchShopExpressTemplateDetail(data: (number | undef
  */
 export async function getShopExpressTemplateDetail(id: number) {
   const res = await request.get<ApiResult<ShopExpressTemplateDetail>>(
-    MODULES_API_URL + '/shop/shop-express-template-detail/' + id
+    '/shop/shop-express-template-detail/' + id
   );
   if (res.data.code === 0 && res.data.data) {
     return res.data.data;

src/views/shop/shopBrand2/components/search.vue

@@ -0,0 +1,42 @@
+<!-- 搜索表单 -->
+<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>

src/views/shop/shopBrand2/components/shopBrand2Edit.vue

@@ -0,0 +1,208 @@
+<!-- 编辑弹窗 -->
+<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>

src/views/shop/shopBrand2/index.vue

@@ -0,0 +1,244 @@
+<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>

src/views/shop/shopExpress/components/search.vue

@@ -0,0 +1,42 @@
+<!-- 搜索表单 -->
+<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>

src/views/shop/shopExpress/components/shopExpressEdit.vue

@@ -0,0 +1,220 @@
+<!-- 编辑弹窗 -->
+<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="expressName">
+        <a-input
+          allow-clear
+          placeholder="请输入物流公司名称"
+          v-model:value="form.expressName"
+        />
+      </a-form-item>
+      <a-form-item label="物流公司编码 (微信)" name="wxCode">
+        <a-input
+          allow-clear
+          placeholder="请输入物流公司编码 (微信)"
+          v-model:value="form.wxCode"
+        />
+      </a-form-item>
+      <a-form-item label="物流公司编码 (快递100)" name="kuaidi100Code">
+        <a-input
+          allow-clear
+          placeholder="请输入物流公司编码 (快递100)"
+          v-model:value="form.kuaidi100Code"
+        />
+      </a-form-item>
+      <a-form-item label="物流公司编码 (快递鸟)" name="kdniaoCode">
+        <a-input
+          allow-clear
+          placeholder="请输入物流公司编码 (快递鸟)"
+          v-model:value="form.kdniaoCode"
+        />
+      </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-item label="是否删除, 0否, 1是" name="deleted">
+        <a-input
+          allow-clear
+          placeholder="请输入是否删除, 0否, 1是"
+          v-model:value="form.deleted"
+        />
+      </a-form-item>
+      <a-form-item label="修改时间" name="updateTime">
+        <a-input
+          allow-clear
+          placeholder="请输入修改时间"
+          v-model:value="form.updateTime"
+        />
+      </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 { addShopExpress, updateShopExpress } from '@/api/shop/shopExpress';
+  import { ShopExpress } from '@/api/shop/shopExpress/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?: ShopExpress | 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<ShopExpress>({
+    expressId: undefined,
+    expressName: undefined,
+    wxCode: undefined,
+    kuaidi100Code: undefined,
+    kdniaoCode: undefined,
+    sortNumber: undefined,
+    deleted: undefined,
+    tenantId: undefined,
+    createTime: undefined,
+    updateTime: undefined,
+    shopExpressId: undefined,
+    shopExpressName: '',
+    status: 0,
+    comments: '',
+    sortNumber: 100
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    shopExpressName: [
+      {
+        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 ? updateShopExpress : addShopExpress;
+        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>

src/views/shop/shopExpress/index.vue

@@ -0,0 +1,256 @@
+<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="shopExpressId"
+          :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>
+
+      <!-- 编辑弹窗 -->
+      <ShopExpressEdit 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 ShopExpressEdit from './components/shopExpressEdit.vue';
+  import { pageShopExpress, removeShopExpress, removeBatchShopExpress } from '@/api/shop/shopExpress';
+  import type { ShopExpress, ShopExpressParam } from '@/api/shop/shopExpress/model';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<ShopExpress[]>([]);
+  // 当前编辑数据
+  const current = ref<ShopExpress | 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 pageShopExpress({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: '物流公司ID',
+      dataIndex: 'expressId',
+      key: 'expressId',
+      align: 'center',
+      width: 90,
+    },
+    {
+      title: '物流公司名称',
+      dataIndex: 'expressName',
+      key: 'expressName',
+      align: 'center',
+    },
+    {
+      title: '物流公司编码 (微信)',
+      dataIndex: 'wxCode',
+      key: 'wxCode',
+      align: 'center',
+    },
+    {
+      title: '物流公司编码 (快递100)',
+      dataIndex: 'kuaidi100Code',
+      key: 'kuaidi100Code',
+      align: 'center',
+    },
+    {
+      title: '物流公司编码 (快递鸟)',
+      dataIndex: 'kdniaoCode',
+      key: 'kdniaoCode',
+      align: 'center',
+    },
+    {
+      title: '排序号',
+      dataIndex: 'sortNumber',
+      key: 'sortNumber',
+      align: 'center',
+    },
+    {
+      title: '是否删除, 0否, 1是',
+      dataIndex: 'deleted',
+      key: 'deleted',
+      align: 'center',
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createTime',
+      key: 'createTime',
+      align: 'center',
+      sorter: true,
+      ellipsis: true,
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
+    },
+    {
+      title: '修改时间',
+      dataIndex: 'updateTime',
+      key: 'updateTime',
+      align: 'center',
+    },
+    {
+      title: '操作',
+      key: 'action',
+      width: 180,
+      fixed: 'right',
+      align: 'center',
+      hideInSetting: true
+    }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: ShopExpressParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: ShopExpress) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: ShopExpress) => {
+    const hide = message.loading('请求中..', 0);
+    removeShopExpress(row.shopExpressId)
+      .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);
+        removeBatchShopExpress(selection.value.map((d) => d.shopExpressId))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  const query = () => {
+    loading.value = true;
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: ShopExpress) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+  query();
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'ShopExpress'
+  };
+</script>
+
+<style lang="less" scoped></style>

src/views/shop/shopExpressTemplate/components/search.vue

@@ -0,0 +1,42 @@
+<!-- 搜索表单 -->
+<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>

src/views/shop/shopExpressTemplate/components/shopExpressTemplateEdit.vue

@@ -0,0 +1,243 @@
+<!-- 编辑弹窗 -->
+<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="type">
+        <a-input
+          allow-clear
+          placeholder="请输入"
+          v-model:value="form.type"
+        />
+      </a-form-item>
+      <a-form-item label="" name="title">
+        <a-input
+          allow-clear
+          placeholder="请输入"
+          v-model:value="form.title"
+        />
+      </a-form-item>
+      <a-form-item label="收件价格" name="firstAmount">
+        <a-input
+          allow-clear
+          placeholder="请输入收件价格"
+          v-model:value="form.firstAmount"
+        />
+      </a-form-item>
+      <a-form-item label="续件价格" name="extraAmount">
+        <a-input
+          allow-clear
+          placeholder="请输入续件价格"
+          v-model:value="form.extraAmount"
+        />
+      </a-form-item>
+      <a-form-item label="状态, 0已发布, 1待审核 2已驳回 3违规内容" 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="是否删除, 0否, 1是" name="deleted">
+        <a-input
+          allow-clear
+          placeholder="请输入是否删除, 0否, 1是"
+          v-model:value="form.deleted"
+        />
+      </a-form-item>
+      <a-form-item label="修改时间" name="updateTime">
+        <a-input
+          allow-clear
+          placeholder="请输入修改时间"
+          v-model:value="form.updateTime"
+        />
+      </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-item label="首件数量/重量" name="firstNum">
+        <a-input
+          allow-clear
+          placeholder="请输入首件数量/重量"
+          v-model:value="form.firstNum"
+        />
+      </a-form-item>
+      <a-form-item label="续件数量/重量" name="extraNum">
+        <a-input
+          allow-clear
+          placeholder="请输入续件数量/重量"
+          v-model:value="form.extraNum"
+        />
+      </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 { addShopExpressTemplate, updateShopExpressTemplate } from '@/api/shop/shopExpressTemplate';
+  import { ShopExpressTemplate } from '@/api/shop/shopExpressTemplate/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?: ShopExpressTemplate | 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<ShopExpressTemplate>({
+    id: undefined,
+    type: undefined,
+    title: undefined,
+    firstAmount: undefined,
+    extraAmount: undefined,
+    status: undefined,
+    deleted: undefined,
+    tenantId: undefined,
+    createTime: undefined,
+    updateTime: undefined,
+    sortNumber: undefined,
+    firstNum: undefined,
+    extraNum: undefined,
+    shopExpressTemplateId: undefined,
+    shopExpressTemplateName: '',
+    status: 0,
+    comments: '',
+    sortNumber: 100
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    shopExpressTemplateName: [
+      {
+        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 ? updateShopExpressTemplate : addShopExpressTemplate;
+        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>

src/views/shop/shopExpressTemplate/index.vue

@@ -0,0 +1,274 @@
+<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="shopExpressTemplateId"
+          :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>
+
+      <!-- 编辑弹窗 -->
+      <ShopExpressTemplateEdit 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 ShopExpressTemplateEdit from './components/shopExpressTemplateEdit.vue';
+  import { pageShopExpressTemplate, removeShopExpressTemplate, removeBatchShopExpressTemplate } from '@/api/shop/shopExpressTemplate';
+  import type { ShopExpressTemplate, ShopExpressTemplateParam } from '@/api/shop/shopExpressTemplate/model';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<ShopExpressTemplate[]>([]);
+  // 当前编辑数据
+  const current = ref<ShopExpressTemplate | 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 pageShopExpressTemplate({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: '',
+      dataIndex: 'id',
+      key: 'id',
+      align: 'center',
+      width: 90,
+    },
+    {
+      title: '',
+      dataIndex: 'type',
+      key: 'type',
+      align: 'center',
+    },
+    {
+      title: '',
+      dataIndex: 'title',
+      key: 'title',
+      align: 'center',
+    },
+    {
+      title: '收件价格',
+      dataIndex: 'firstAmount',
+      key: 'firstAmount',
+      align: 'center',
+    },
+    {
+      title: '续件价格',
+      dataIndex: 'extraAmount',
+      key: 'extraAmount',
+      align: 'center',
+    },
+    {
+      title: '状态, 0已发布, 1待审核 2已驳回 3违规内容',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+    },
+    {
+      title: '是否删除, 0否, 1是',
+      dataIndex: 'deleted',
+      key: 'deleted',
+      align: 'center',
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createTime',
+      key: 'createTime',
+      align: 'center',
+      sorter: true,
+      ellipsis: true,
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
+    },
+    {
+      title: '修改时间',
+      dataIndex: 'updateTime',
+      key: 'updateTime',
+      align: 'center',
+    },
+    {
+      title: '',
+      dataIndex: 'sortNumber',
+      key: 'sortNumber',
+      align: 'center',
+    },
+    {
+      title: '首件数量/重量',
+      dataIndex: 'firstNum',
+      key: 'firstNum',
+      align: 'center',
+    },
+    {
+      title: '续件数量/重量',
+      dataIndex: 'extraNum',
+      key: 'extraNum',
+      align: 'center',
+    },
+    {
+      title: '操作',
+      key: 'action',
+      width: 180,
+      fixed: 'right',
+      align: 'center',
+      hideInSetting: true
+    }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: ShopExpressTemplateParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: ShopExpressTemplate) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: ShopExpressTemplate) => {
+    const hide = message.loading('请求中..', 0);
+    removeShopExpressTemplate(row.shopExpressTemplateId)
+      .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);
+        removeBatchShopExpressTemplate(selection.value.map((d) => d.shopExpressTemplateId))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  const query = () => {
+    loading.value = true;
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: ShopExpressTemplate) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+  query();
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'ShopExpressTemplate'
+  };
+</script>
+
+<style lang="less" scoped></style>

src/views/shop/shopExpressTemplateDetail/components/search.vue

@@ -0,0 +1,42 @@
+<!-- 搜索表单 -->
+<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>

src/views/shop/shopExpressTemplateDetail/components/shopExpressTemplateDetailEdit.vue

@@ -0,0 +1,259 @@
+<!-- 编辑弹窗 -->
+<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="templateId">
+        <a-input
+          allow-clear
+          placeholder="请输入"
+          v-model:value="form.templateId"
+        />
+      </a-form-item>
+      <a-form-item label="0按件" name="type">
+        <a-input
+          allow-clear
+          placeholder="请输入0按件"
+          v-model:value="form.type"
+        />
+      </a-form-item>
+      <a-form-item label="" name="provinceId">
+        <a-input
+          allow-clear
+          placeholder="请输入"
+          v-model:value="form.provinceId"
+        />
+      </a-form-item>
+      <a-form-item label="" name="cityId">
+        <a-input
+          allow-clear
+          placeholder="请输入"
+          v-model:value="form.cityId"
+        />
+      </a-form-item>
+      <a-form-item label="首件数量/重量" name="firstNum">
+        <a-input
+          allow-clear
+          placeholder="请输入首件数量/重量"
+          v-model:value="form.firstNum"
+        />
+      </a-form-item>
+      <a-form-item label="收件价格" name="firstAmount">
+        <a-input
+          allow-clear
+          placeholder="请输入收件价格"
+          v-model:value="form.firstAmount"
+        />
+      </a-form-item>
+      <a-form-item label="续件价格" name="extraAmount">
+        <a-input
+          allow-clear
+          placeholder="请输入续件价格"
+          v-model:value="form.extraAmount"
+        />
+      </a-form-item>
+      <a-form-item label="续件数量/重量" name="extraNum">
+        <a-input
+          allow-clear
+          placeholder="请输入续件数量/重量"
+          v-model:value="form.extraNum"
+        />
+      </a-form-item>
+      <a-form-item label="状态, 0已发布, 1待审核 2已驳回 3违规内容" 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="是否删除, 0否, 1是" name="deleted">
+        <a-input
+          allow-clear
+          placeholder="请输入是否删除, 0否, 1是"
+          v-model:value="form.deleted"
+        />
+      </a-form-item>
+      <a-form-item label="修改时间" name="updateTime">
+        <a-input
+          allow-clear
+          placeholder="请输入修改时间"
+          v-model:value="form.updateTime"
+        />
+      </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 { addShopExpressTemplateDetail, updateShopExpressTemplateDetail } from '@/api/shop/shopExpressTemplateDetail';
+  import { ShopExpressTemplateDetail } from '@/api/shop/shopExpressTemplateDetail/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?: ShopExpressTemplateDetail | 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<ShopExpressTemplateDetail>({
+    id: undefined,
+    templateId: undefined,
+    type: undefined,
+    provinceId: undefined,
+    cityId: undefined,
+    firstNum: undefined,
+    firstAmount: undefined,
+    extraAmount: undefined,
+    extraNum: undefined,
+    status: undefined,
+    deleted: undefined,
+    tenantId: undefined,
+    createTime: undefined,
+    updateTime: undefined,
+    sortNumber: undefined,
+    shopExpressTemplateDetailId: undefined,
+    shopExpressTemplateDetailName: '',
+    status: 0,
+    comments: '',
+    sortNumber: 100
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    shopExpressTemplateDetailName: [
+      {
+        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 ? updateShopExpressTemplateDetail : addShopExpressTemplateDetail;
+        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>

src/views/shop/shopExpressTemplateDetail/index.vue

@@ -0,0 +1,286 @@
+<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="shopExpressTemplateDetailId"
+          :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>
+
+      <!-- 编辑弹窗 -->
+      <ShopExpressTemplateDetailEdit 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 ShopExpressTemplateDetailEdit from './components/shopExpressTemplateDetailEdit.vue';
+  import { pageShopExpressTemplateDetail, removeShopExpressTemplateDetail, removeBatchShopExpressTemplateDetail } from '@/api/shop/shopExpressTemplateDetail';
+  import type { ShopExpressTemplateDetail, ShopExpressTemplateDetailParam } from '@/api/shop/shopExpressTemplateDetail/model';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<ShopExpressTemplateDetail[]>([]);
+  // 当前编辑数据
+  const current = ref<ShopExpressTemplateDetail | 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 pageShopExpressTemplateDetail({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: '',
+      dataIndex: 'id',
+      key: 'id',
+      align: 'center',
+      width: 90,
+    },
+    {
+      title: '',
+      dataIndex: 'templateId',
+      key: 'templateId',
+      align: 'center',
+    },
+    {
+      title: '0按件',
+      dataIndex: 'type',
+      key: 'type',
+      align: 'center',
+    },
+    {
+      title: '',
+      dataIndex: 'provinceId',
+      key: 'provinceId',
+      align: 'center',
+    },
+    {
+      title: '',
+      dataIndex: 'cityId',
+      key: 'cityId',
+      align: 'center',
+    },
+    {
+      title: '首件数量/重量',
+      dataIndex: 'firstNum',
+      key: 'firstNum',
+      align: 'center',
+    },
+    {
+      title: '收件价格',
+      dataIndex: 'firstAmount',
+      key: 'firstAmount',
+      align: 'center',
+    },
+    {
+      title: '续件价格',
+      dataIndex: 'extraAmount',
+      key: 'extraAmount',
+      align: 'center',
+    },
+    {
+      title: '续件数量/重量',
+      dataIndex: 'extraNum',
+      key: 'extraNum',
+      align: 'center',
+    },
+    {
+      title: '状态, 0已发布, 1待审核 2已驳回 3违规内容',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+    },
+    {
+      title: '是否删除, 0否, 1是',
+      dataIndex: 'deleted',
+      key: 'deleted',
+      align: 'center',
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createTime',
+      key: 'createTime',
+      align: 'center',
+      sorter: true,
+      ellipsis: true,
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
+    },
+    {
+      title: '修改时间',
+      dataIndex: 'updateTime',
+      key: 'updateTime',
+      align: 'center',
+    },
+    {
+      title: '',
+      dataIndex: 'sortNumber',
+      key: 'sortNumber',
+      align: 'center',
+    },
+    {
+      title: '操作',
+      key: 'action',
+      width: 180,
+      fixed: 'right',
+      align: 'center',
+      hideInSetting: true
+    }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: ShopExpressTemplateDetailParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: ShopExpressTemplateDetail) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: ShopExpressTemplateDetail) => {
+    const hide = message.loading('请求中..', 0);
+    removeShopExpressTemplateDetail(row.shopExpressTemplateDetailId)
+      .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);
+        removeBatchShopExpressTemplateDetail(selection.value.map((d) => d.shopExpressTemplateDetailId))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  const query = () => {
+    loading.value = true;
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: ShopExpressTemplateDetail) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+  query();
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'ShopExpressTemplateDetail'
+  };
+</script>
+
+<style lang="less" scoped></style>

src/views/shop/shopGift/components/shopGiftEdit.vue

@@ -19,7 +19,7 @@
         styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
       "
     >
-      <a-form-item label="" name="name">
+      <a-form-item label="名称" name="name">
         <a-input
           allow-clear
           placeholder="请输入"

src/views/shop/shopOrder/components/search.vue

@@ -146,9 +146,9 @@
   };
 
   // 批量删除
-  const removeBatch = () => {
+  // const removeBatch = () => {
-    emit('remove');
+  //   emit('remove');
-  };
+  // };
 
   const onType = () => {
     resetFields();