feat(physical): 添加实物商品轮播广告图功能

- 新增实物商品轮播广告图的完整CRUD接口实现
- 添加商品列表查询接口用于轮播图商品关联选择
- 实现轮播广告图管理页面，包含图片上传、商品关联、排序等功能
- 在商户商品页面添加推荐商品广告配置入口
- 在服务标签页面增加详情查看功能跳转到商品列表
- 在商户合作伙伴页面添加下级商品查看功能
- 优化联赛比赛时间显示逻辑，简化模板结构
- 支持通过路由参数传递商户ID和服务标签ID进行商品筛选

src/api/system/physical/merchantItem/index.ts

@@ -61,3 +61,12 @@ export const delMerchantItem = (id: string | number | Array<string | number>) =>
     method: 'delete'
   });
 };
+/**
+ * 查询商品列表
+ */
+export const selectPhysicalMerchantProductList = (): AxiosPromise<MerchantItemVO> => {
+  return request({
+    url: '/physical/merchantItem/selectPhysicalMerchantProductList',
+    method: 'get'
+  });
+};

src/api/system/physical/productBanner/index.ts

@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { ProductBannerVO, ProductBannerForm, ProductBannerQuery } from '@/api/system/physical/productBanner/types';
+
+/**
+ * 查询实物商品轮播广告图列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listProductBanner = (query?: ProductBannerQuery): AxiosPromise<ProductBannerVO[]> => {
+  return request({
+    url: '/physical/productBanner/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询实物商品轮播广告图详细
+ * @param id
+ */
+export const getProductBanner = (id: string | number): AxiosPromise<ProductBannerVO> => {
+  return request({
+    url: '/physical/productBanner/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增实物商品轮播广告图
+ * @param data
+ */
+export const addProductBanner = (data: ProductBannerForm) => {
+  return request({
+    url: '/physical/productBanner',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改实物商品轮播广告图
+ * @param data
+ */
+export const updateProductBanner = (data: ProductBannerForm) => {
+  return request({
+    url: '/physical/productBanner',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除实物商品轮播广告图
+ * @param id
+ */
+export const delProductBanner = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/physical/productBanner/' + id,
+    method: 'delete'
+  });
+};

src/api/system/physical/productBanner/types.ts

@@ -0,0 +1,125 @@
+export interface ProductBannerVO {
+  /**
+   * 主键ID
+   */
+  id: string | number;
+
+  /**
+   * 图片URL地址
+   */
+  imageUrl: string;
+
+  /**
+   * 关联的商品ID
+   */
+  productId: string | number;
+
+  /**
+   * 排序序号，越小越靠前
+   */
+  sortOrder: number;
+
+  /**
+   * 状态：online=上线, offline=下线
+   */
+  status: string;
+
+  /**
+   * 创建时间
+   */
+  createdAt: string;
+
+  /**
+   * 更新时间
+   */
+  updatedAt: string;
+
+  /**
+   * 逻辑删除时间（可选）
+   */
+  deletedAt: string;
+}
+
+export interface ProductBannerForm extends BaseEntity {
+  /**
+   * 主键ID
+   */
+  id?: string | number;
+
+  /**
+   * 图片URL地址
+   */
+  imageUrl?: string;
+
+  /**
+   * 关联的商品ID
+   */
+  productId?: string | number;
+
+  /**
+   * 排序序号，越小越靠前
+   */
+  sortOrder?: number;
+
+  /**
+   * 状态：online=上线, offline=下线
+   */
+  status?: string;
+
+  /**
+   * 创建时间
+   */
+  createdAt?: string;
+
+  /**
+   * 更新时间
+   */
+  updatedAt?: string;
+
+  /**
+   * 逻辑删除时间（可选）
+   */
+  deletedAt?: string;
+}
+
+export interface ProductBannerQuery extends PageQuery {
+  /**
+   * 图片URL地址
+   */
+  imageUrl?: string;
+
+  /**
+   * 关联的商品ID
+   */
+  productId?: string | number;
+
+  /**
+   * 排序序号，越小越靠前
+   */
+  sortOrder?: number;
+
+  /**
+   * 状态：online=上线, offline=下线
+   */
+  status?: string;
+
+  /**
+   * 创建时间
+   */
+  createdAt?: string;
+
+  /**
+   * 更新时间
+   */
+  updatedAt?: string;
+
+  /**
+   * 逻辑删除时间（可选）
+   */
+  deletedAt?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}

src/views/system/physical/leagueTournament/index.vue

@@ -87,9 +87,7 @@
               ~
               {{ parseTime(scope.row.registrationEndTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
             </span>
-                    <span v-else>
-              -
-            </span>
+            <span v-else> - </span>
           </template>
         </el-table-column>
         <el-table-column label="比赛项目" align="center" prop="gameVariant">

src/views/system/physical/merchantItem/index.vue

@@ -38,6 +38,11 @@
               >删除</el-button
             >
           </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Edit" @click="goToProductBanner()" v-hasPermi="['physical:merchantItem:remove']"
+              >推荐商品广告配置</el-button
+            >
+          </el-col>
           <!--          <el-col :span="1.5">
             <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['physical:merchantItem:export']">导出</el-button>
           </el-col>-->
@@ -738,6 +743,13 @@ const handleCarouselImagePreviewClick = (index: number) => {
   }
 };
 onMounted(() => {
+  const route = proxy?.$route;
+  if (route.query.categoryTagId) {
+    queryParams.value.categoryTagId = String(route.query.categoryTagId);
+  }
+  if (route.query.merchantId) {
+    queryParams.value.merchantId = String(route.query.merchantId);
+  }
   getList();
   loadMerchantOptions();
   loadServiceTabOptions();
@@ -794,6 +806,11 @@ const handleToggleStatus = async (row: MerchantItemVO) => {
     buttonLoading.value = false;
   }
 };
+const goToProductBanner = () => {
+  proxy?.$router.push({
+    path: '/physical/productBanner'
+  });
+};
 </script>
 
 <style scoped lang="scss">

src/views/system/physical/merchantPartner/index.vue

@@ -58,6 +58,11 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="下级商品" align="center">
+          <template #default="scope">
+            <el-button type="text" @click="handleViewSubInfo(scope.row.id)">点击查看</el-button>
+          </template>
+        </el-table-column>
         <el-table-column label="创建人" align="center" prop="createdBy" />
         <el-table-column label="创建时间" align="center" prop="createdAt" width="180">
           <template #default="scope">
@@ -273,7 +278,14 @@ const handleExport = () => {
     `merchantPartner_${new Date().getTime()}.xlsx`
   );
 };
-
+const handleViewSubInfo = (merchantId: number) => {
+  proxy?.$router.push({
+    path: '/physical/merchantItem',
+    query: {
+      merchantId: String(merchantId) // 转为字符串以兼容 URL 参数
+    }
+  });
+};
 onMounted(() => {
   getList();
 });

src/views/system/physical/productBanner/index.vue

@@ -0,0 +1,386 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <el-form-item>
+              <el-form-item label="商品" prop="productId">
+                <el-select v-model="queryParams.productId" placeholder="请选择关联的商品" filterable clearable style="width: 100%">
+                  <el-option v-for="item in productOptions" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['physical:productBanner:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['physical:productBanner:edit']"
+              >修改</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['physical:productBanner:remove']"
+              >删除</el-button
+            >
+          </el-col>
+          <!--          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:productBanner:export']">导出</el-button>
+          </el-col>-->
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" border :data="productBannerList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="编号" align="center" prop="id" v-if="true" />
+        <el-table-column label="图片" align="center" width="90">
+          <template #default="scope">
+            <el-image
+              v-if="scope.row.imageUrl"
+              :src="scope.row.imageUrl"
+              style="width: 40px; height: 40px; border-radius: 4px; cursor: zoom-in"
+              :preview-src-list="[scope.row.imageUrl]"
+              :preview-teleported="true"
+              fit="cover"
+            />
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column label="关联的商品" align="center" prop="productName" />
+        <el-table-column label="状态" align="center" prop="status">
+          <template #default="scope">
+            <el-tag :type="scope.row.status === 'online' ? 'success' : 'danger'" style="cursor: pointer">
+              {{ scope.row.status === 'online' ? '上线' : '下线' }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="排序序号" align="center" prop="sortOrder" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['physical:productBanner:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button
+                link
+                type="primary"
+                icon="Delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['physical:productBanner:remove']"
+              ></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改实物商品轮播广告图对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="productBannerFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="图片" prop="imageUrl">
+          <div class="upload-container">
+            <el-upload
+              class="upload-icon"
+              action="#"
+              :on-change="handleImageUrlChange"
+              :on-remove="handleImageUrlRemove"
+              :file-list="imageUrlFileList"
+              :auto-upload="false"
+              :limit="1"
+              accept="image/*"
+            >
+              <template #trigger>
+                <el-button type="primary">点击选择图片</el-button>
+              </template>
+
+              <template #default>
+                <div class="preview-area" @click="handleImageUrlPreviewClick">
+                  <img
+                    v-if="imageUrlPreviewUrl || form.imageUrl"
+                    :src="imageUrlPreviewUrl || form.imageUrl"
+                    alt="预览图"
+                    style="max-width: 100px; max-height: 100px; margin-top: 10px; cursor: pointer"
+                  />
+                  <div v-else style="margin-top: 10px; color: #999">无图片</div>
+                </div>
+              </template>
+
+              <template #tip>
+                <div class="el-upload__tip">
+                  <span v-if="imageUrlFileList.length > 0">当前已选文件：{{ imageUrlFileList[0].name }}</span>
+                </div>
+              </template>
+            </el-upload>
+          </div>
+        </el-form-item>
+        <el-form-item label="商品" prop="productId">
+          <el-select v-model="form.productId" placeholder="请选择关联的商品" filterable clearable style="width: 100%">
+            <el-option v-for="item in productOptions" :key="item.id" :label="item.name" :value="item.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="排序序号" prop="sortOrder">
+          <el-input v-model="form.sortOrder" placeholder="请输入排序序号，越小越靠前" />
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-select v-model="form.status" placeholder="请选择状态">
+            <el-option label="上线" value="online" />
+            <el-option label="下线" value="offline" />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="ProductBanner" lang="ts">
+import { listProductBanner, getProductBanner, delProductBanner, addProductBanner, updateProductBanner } from '@/api/system/physical/productBanner';
+import { ProductBannerVO, ProductBannerQuery, ProductBannerForm } from '@/api/system/physical/productBanner/types';
+import { uploadTournament } from '@/api/system/business/tournaments';
+import { selectPhysicalMerchantProductList } from '@/api/system/physical/merchantItem';
+import { MerchantItemVO } from '@/api/system/physical/merchantItem/types';
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const productBannerList = ref<ProductBannerVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const productBannerFormRef = ref<ElFormInstance>();
+
+// 图片 URL 上传相关
+const imageUrlFileList = ref<any[]>([]);
+const imageUrlPreviewUrl = ref('');
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: ProductBannerForm = {
+  id: undefined,
+  imageUrl: undefined,
+  productId: undefined,
+  sortOrder: undefined,
+  status: 'online',
+  createdAt: undefined,
+  updatedAt: undefined,
+  deletedAt: undefined
+};
+const data = reactive<PageData<ProductBannerForm, ProductBannerQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    imageUrl: undefined,
+    productId: undefined,
+    sortOrder: undefined,
+    status: undefined,
+    createdAt: undefined,
+    updatedAt: undefined,
+    deletedAt: undefined,
+    params: {}
+  },
+  rules: {
+    id: [{ required: true, message: '主键ID不能为空', trigger: 'blur' }],
+    imageUrl: [{ required: true, message: '图片地址不能为空', trigger: 'blur' }],
+    productId: [{ required: true, message: '关联的商品不能为空', trigger: 'blur' }],
+    status: [{ required: true, message: '状态不能为空', trigger: 'change' }]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询实物商品轮播广告图列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listProductBanner(queryParams.value);
+  productBannerList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  productBannerFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: ProductBannerVO[]) => {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = '添加';
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: ProductBannerVO) => {
+  reset();
+  const _id = row?.id || ids.value[0];
+  const res = await getProductBanner(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  productBannerFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateProductBanner(form.value).finally(() => (buttonLoading.value = false));
+      } else {
+        await addProductBanner(form.value).finally(() => (buttonLoading.value = false));
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: ProductBannerVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+  await delProductBanner(_ids);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download(
+    'physical/productBanner/export',
+    {
+      ...queryParams.value
+    },
+    `productBanner_${new Date().getTime()}.xlsx`
+  );
+};
+
+onMounted(() => {
+  getList();
+  loadProductOptions();
+});
+
+// 图片 URL 上传处理
+const handleImageUrlChange = async (file: any) => {
+  const index = imageUrlFileList.value.findIndex((f) => f.uid === file.uid);
+  imageUrlFileList.value = [];
+
+  if (file.raw) {
+    imageUrlPreviewUrl.value = URL.createObjectURL(file.raw);
+  }
+
+  if (index === -1) {
+    imageUrlFileList.value.push(file);
+  }
+
+  try {
+    const rawFile = file.raw;
+    const res = await uploadTournament(rawFile);
+    if (res.code === 200) {
+      imageUrlFileList.value[index] = {
+        ...file,
+        status: 'success',
+        response: res.data.url
+      };
+      form.value.imageUrl = imageUrlFileList.value[index].response;
+      imageUrlPreviewUrl.value = imageUrlFileList.value[index].response;
+      ElMessage.success('上传成功');
+    } else {
+      throw new Error(res.msg);
+    }
+  } catch (error) {
+    imageUrlFileList.value[index] = {
+      ...file,
+      status: 'fail',
+      error: '上传失败'
+    };
+    ElMessage.error('上传失败，请重试');
+  }
+};
+
+// 图片 URL 移除处理
+const handleImageUrlRemove = () => {
+  imageUrlFileList.value = [];
+  imageUrlPreviewUrl.value = '';
+  form.value.imageUrl = '';
+};
+
+// 图片 URL 预览点击
+const handleImageUrlPreviewClick = () => {
+  if (imageUrlPreviewUrl.value || form.value.imageUrl) {
+    ElMessageBox.alert(`<img src="${imageUrlPreviewUrl.value || form.value.imageUrl}" style="max-width: 100%;" />`, '图片预览', {
+      dangerouslyUseHTMLString: true,
+      confirmButtonText: '关闭'
+    });
+  }
+};
+// 商品选项列表
+const productOptions = ref<MerchantItemVO[]>([]);
+/** 加载商品选项列表 */
+const loadProductOptions = async () => {
+  try {
+    const res = await selectPhysicalMerchantProductList();
+    if (res.code === 200 && Array.isArray(res.data)) {
+      productOptions.value = res.data;
+    } else if (Array.isArray(res)) {
+      productOptions.value = res;
+    }
+  } catch (error) {
+    console.error('加载商品列表失败:', error);
+    proxy?.$modal.msgError('加载商品列表失败');
+  }
+};
+// ... existing code ...
+</script>

src/views/system/physical/serviceTab/index.vue

@@ -61,6 +61,11 @@
             <span>{{ parseTime(scope.row.createdAt, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="详情" align="center">
+          <template #default="scope">
+            <el-button type="text" @click="handleViewSubInfo(scope.row.id)">点击查看</el-button>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
@@ -269,6 +274,14 @@ const handleExport = () => {
 onMounted(() => {
   getList();
 });
+const handleViewSubInfo = (categoryTagId: number) => {
+  proxy?.$router.push({
+    path: '/physical/merchantItem',
+    query: {
+      categoryTagId: String(categoryTagId) // 转为字符串以兼容 URL 参数
+    }
+  });
+};
 </script>
 
 <style scoped lang="scss">