code-image-backup-public/lilishop-ui
1
0
Fork 0
mirror of https://gitee.com/beijing_hongye_huicheng/lilishop-ui.git synced 2026-11-09 18:38:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 优化商品促销页面并独立展示定时上架

Browse Source 
- 新增平台、商家定时上架独立页面，平台列表仅供查看
- 虚拟销量支持状态筛选及右侧抽屉设置，修复编码显示问题
- 统一列表操作栏，优化商品选择器、砍价、积分及优惠券页面
- 两端新增活动优惠券入口，隐藏创建表单中的活动类型字段
- 移除限时直降、第 N 件优惠页面、路由、接口调用及缓存菜单入口

验证：26 个改动前端文件编译或语法检查通过，暂存差异格式检查通过。
This commit is contained in:
pikachu1995@126.com
2026-11-03 16:29:13 +08:00
parent d64dd08b42
commit 484b6a6dad
32 changed files with 735 additions and 1011 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
manager/src/views/goods/goods-info/goods.vue
View File

@@ -70,7 +70,7 @@
</el-card>
<el-card>
<div class="goods-tab">
<div v-if="!scheduledOnly" class="goods-tab">
<el-tabs v-model="currentStatus" @tab-click="onStatusTabClick">
<el-tab-pane
v-for="item in goodsStatusWithCount"
@@ -81,7 +81,7 @@
</el-tabs>
</div>
<div class="batch-operations" style="margin: 10px 0">
<div v-if="!readOnly" class="batch-operations" style="margin: 10px 0">
<el-button
type="primary"
:disabled="selectedRows.length === 0"
@@ -125,7 +125,7 @@
row-key="id"
@selection-change="onSelectionChange"
>
<el-table-column type="selection" width="100" align="center" />
<el-table-column v-if="!readOnly" type="selection" width="100" align="center" />
<el-table-column prop="id" label="SPU编码" width="200" show-overflow-tooltip />
<el-table-column label="商品图片" width="100" align="center">
<template #default="{ row }">
@@ -141,6 +141,7 @@
<a class="link-text" @click="linkTo(row.id, row.skuId)">{{ row.goodsName }}</a>
</template>
</el-table-column>
<el-table-column v-if="currentStatus === 'SCHEDULED_UPPER'" prop="scheduledUpperTime" label="计划上架时间" width="190" />
<el-table-column label="价格" width="200">
<template #default="{ row }">
<span :style="{ color: $mainColor }">{{ unitPrice(row.price, '￥') }}</span>
@@ -164,7 +165,7 @@
</template>
</el-table-column>
<el-table-column prop="storeName" label="店铺名称" width="200" show-overflow-tooltip />
<el-table-column label="操作" width="200" align="center" fixed="right">
<el-table-column v-if="!readOnly" label="操作" width="200" align="center" fixed="right">
<template #default="{ row }">
<template v-if="row.authFlag === 'TOBEAUDITED'">
<a class="link-text" @click="openAuditModal(row)">审核</a>
@@ -298,6 +299,10 @@ import { ElMessage, ElMessageBox } from "element-plus";
import { unitPrice, customRouterPush } from "@/utils/filters";
defineOptions({ name: "goods" });
const props = defineProps({
scheduledOnly: { type: Boolean, default: false },
readOnly: { type: Boolean, default: false },
});
// 模板 ref（searchFormRef/underFormRef/batchAuditFormRef/goodsGroupFormRef 因与 data 同名改为 xxxRef）
const searchFormRef = ref(null);
@@ -315,7 +320,7 @@ const auditModalVisible = ref(false);
const auditSubmitLoading = ref(false);
const currentAuditGoods = ref(null);
const submitLoading = ref(false);
const currentStatus = ref("ALL");
const currentStatus = ref(props.scheduledOnly ? "SCHEDULED_UPPER" : "ALL");
const { loading, data, total, searchForm, getDataList, handleSearch, resetSearch } = useTable(
getGoodsListData,
@@ -333,8 +338,13 @@ const { loading, data, total, searchForm, getDataList, handleSearch, resetSearch
},
beforeRequest: (p) => {
const params = { ...p };
if (currentStatus.value && currentStatus.value !== "ALL") {
params.goodsStatus = currentStatus.value;
const status = props.scheduledOnly ? "SCHEDULED_UPPER" : currentStatus.value;
if (status && status !== "ALL") {
params.goodsStatus = status;
if (status === "SCHEDULED_UPPER") {
params.sort = "scheduled_upper_time";
params.order = "asc";
}
} else {
delete params.goodsStatus;
}
@@ -347,7 +357,7 @@ const { loading, data, total, searchForm, getDataList, handleSearch, resetSearch
);
function handleReset() {
currentStatus.value = "ALL";
currentStatus.value = props.scheduledOnly ? "SCHEDULED_UPPER" : "ALL";
resetSearch();
}
const goodsNumerData = ref({});
@@ -415,6 +425,7 @@ function init() {
// 搜索
// 获取数据
function getNumberData() {
if (props.scheduledOnly) return;
// 创建一个不包含goodsStatus字段的搜索参数
const { goodsStatus, ...searchParams } = searchForm;
getGoodsNumerData(searchParams).then((res) => {
@@ -488,6 +499,7 @@ function goodsStatusClick(name) {
}
selectedRows.value = [];
clearTableSelection();
searchForm.pageNumber = 1;
getDataList();
}
function examine(v, authFlag) {

39
manager/src/views/goods/goods-manage/brand.vue
View File

@@ -28,17 +28,12 @@
<!-- 品牌数据表格卡片 -->
<el-card shadow="never" class="table-card mt_10">
<template #header>
<div class="card-header-bar">
<div class="header-title">
<span>商品品牌列表</span>
</div>
<div class="header-actions">
<el-button size="small" @click="getDataList">刷新</el-button>
<el-button type="primary" size="small" @click="add">添加品牌</el-button>
</div>
</div>
</template>
<list-action-bar>
<el-button type="primary" @click="add">添加品牌</el-button>
<template #right>
<el-button @click="getDataList">刷新</el-button>
</template>
</list-action-bar>
<el-table
ref="table"
@@ -197,6 +192,7 @@
</template>
<script setup>
import ListActionBar from "@/components/list-action-bar.vue";
import { ref, reactive, nextTick, getCurrentInstance } from "vue";
import { useTable } from "@/utils/useTable";
import {
@@ -429,27 +425,6 @@ function edit(v) {
}
}
.card-header-bar {
display: flex;
justify-content: space-between;
align-items: center;
.header-title {
display: flex;
align-items: center;
gap: 10px;
font-size: 15px;
font-weight: 600;
color: #303133;
}
.header-actions {
display: flex;
align-items: center;
gap: 8px;
}
}
.font-mono {
font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
}

5
manager/src/views/goods/goods-manage/category.vue
View File

@@ -1,9 +1,9 @@
<template>
<div>
<el-card>
<div class="mb_10">
<list-action-bar>
<el-button type="primary" @click="addParent">添加一级分类</el-button>
</div>
</list-action-bar>
<el-table
v-loading="loading"
@@ -121,6 +121,7 @@
</template>
<script setup>
import ListActionBar from "@/components/list-action-bar.vue";
import { ref, reactive, onMounted } from "vue";
import {
delCategory,

12
manager/src/views/goods/goods-manage/parameter.vue
View File

@@ -1,7 +1,7 @@
<template>
<div class="search">
<el-card>
<el-form ref="searchFormRef" :model="searchForm" inline>
<el-card class="parameter-filter-card">
<el-form ref="searchFormRef" :model="searchForm" inline class="search-form" @keyup.enter="handleSearch">
<el-form-item label="参数名称" prop="paramName">
<el-input
v-model="searchForm.paramName"
@@ -16,9 +16,12 @@
<el-button @click="handleReset">重置</el-button>
</el-form-item>
</el-form>
<el-row class="operation" style="margin-bottom: 10px;">
</el-card>
<el-card class="parameter-list-card" style="margin-top: 10px">
<list-action-bar>
<el-button type="primary" @click="goAdd">添加</el-button>
</el-row>
</list-action-bar>
<el-table
ref="tableRef"
v-loading="loading"
@@ -72,6 +75,7 @@
</div>
</template>
<script setup>
import ListActionBar from "@/components/list-action-bar.vue";
import { ref } from "vue";
import { useTable } from "@/utils/useTable";
import { useRouter } from "vue-router";

39
manager/src/views/goods/group/index.vue
View File

@@ -18,24 +18,17 @@
<el-button @click="handleReset">重置</el-button>
</el-form-item>
</el-form>
<div class="toolbar-right">
<el-button type="primary" @click="openAdd">添加分组</el-button>
</div>
</div>
</el-card>
<!-- 分组数据表格卡片 -->
<el-card shadow="never" class="table-card mt_10">
<template #header>
<div class="card-header-bar">
<div class="header-title">
<span>商品分组列表</span>
</div>
<div class="header-actions">
<el-button size="small" @click="getData">刷新</el-button>
</div>
</div>
</template>
<list-action-bar>
<el-button type="primary" @click="openAdd">添加分组</el-button>
<template #right>
<el-button @click="getData">刷新</el-button>
</template>
</list-action-bar>
<el-table
ref="table"
@@ -166,6 +159,7 @@
</template>
<script setup>
import ListActionBar from "@/components/list-action-bar.vue";
import { ref, reactive, nextTick, onMounted } from "vue";
import * as API_Goods from "@/api/goods.js";
import { ElMessage, ElMessageBox } from "element-plus";
@@ -373,25 +367,6 @@ onMounted(() => {
}
}
.toolbar-right {
display: flex;
align-items: center;
}
}
.card-header-bar {
display: flex;
justify-content: space-between;
align-items: center;
.header-title {
display: flex;
align-items: center;
gap: 10px;
font-size: 15px;
font-weight: 600;
color: #303133;
}
}
.pagination-wrap {

14
manager/src/views/goods/scheduled-upper/index.vue Normal file
View File

@@ -0,0 +1,14 @@
<template>
<goods-list scheduled-only read-only />
</template>
<script setup>
/**
* 平台商品定时上架列表。
* @author Bulbasaur
* @since 2026-11-03
*/
import GoodsList from "@/views/goods/goods-info/goods.vue";
defineOptions({ name: "goodsScheduledUpper" });
</script>

81
manager/src/views/goods/virtual-sales/index.vue
View File

@@ -49,6 +49,11 @@
</el-card>
<el-card class="mt_10">
<el-tabs v-model="salesTab" @tab-change="handleSalesTabChange">
<el-tab-pane label="全部" name="all" />
<el-tab-pane label="已设置" name="configured" />
<el-tab-pane label="未设置" name="unconfigured" />
</el-tabs>
<el-alert
type="info"
:closable="false"
@@ -104,8 +109,8 @@
</div>
</template>
</el-table-column>
<el-table-column prop="goodsId" label="SPU编码" width="160" show-overflow-tooltip />
<el-table-column prop="id" label="SKU ID" width="160" show-overflow-tooltip />
<el-table-column prop="goodsId" label="SPU编码" width="220" show-overflow-tooltip />
<el-table-column prop="id" label="SKU ID" width="220" show-overflow-tooltip />
<el-table-column label="真实销量" width="110" align="right">
<template #default="{ row }">
<span v-if="row">{{ row.buyCount || 0 }}</span>
@@ -156,14 +161,19 @@
</div>
</el-card>
<el-dialog
<el-drawer
v-model="editModalVisible"
:title="modalMode === 'batch' ? '批量设置虚拟销量' : '设置虚拟销量'"
width="480px"
class="virtual-sales-drawer"
direction="rtl"
size="min(480px, 100vw)"
append-to-body
:before-close="handleBeforeCloseVirtualSales"
:close-on-click-modal="false"
:close-on-press-escape="!modalSubmitting"
:show-close="!modalSubmitting"
destroy-on-close
@closed="resetVirtualSalesModal"
>
<div v-if="modalMode === 'single' && currentSku" class="virtual-sales-modal">
<div class="sku-info-item">
@@ -208,12 +218,14 @@
</el-form>
</div>
<template #footer>
<el-button :disabled="modalSubmitting" @click="handleCancelVirtualSales">取消</el-button>
<el-button type="primary" :loading="modalSubmitting" @click="handleSubmitVirtualSales">
提交
</el-button>
<div class="drawer-actions">
<el-button :disabled="modalSubmitting" @click="handleCancelVirtualSales">取消</el-button>
<el-button type="primary" :loading="modalSubmitting" @click="handleSubmitVirtualSales">
提交
</el-button>
</div>
</template>
</el-dialog>
</el-drawer>
</div>
</template>
@@ -248,6 +260,7 @@ const modalMode = ref("single");
const currentSku = ref(null);
const currentIndex = ref(-1);
const selectedRows = ref([]);
const salesTab = ref("all");
const editForm = reactive({
virtualSales: 0,
});
@@ -263,6 +276,7 @@ const searchForm = ref({
});
const data = ref([]);
const total = ref(0);
let dataRequestId = 0;
function init() {
getDataList();
@@ -280,6 +294,12 @@ function handleSearch() {
searchForm.value.pageNumber = 1;
getDataList();
}
function handleSalesTabChange() {
searchForm.value.pageNumber = 1;
selectedRows.value = [];
tableRef.value?.clearSelection();
getDataList();
}
function handleReset() {
searchForm.value = {
pageNumber: 1,
@@ -307,9 +327,15 @@ function handleSelectionChange(selection) {
selectedRows.value = selection;
}
function getDataList() {
const requestId = ++dataRequestId;
loading.value = true;
getGoodsSkuData(searchForm.value)
const params = { ...searchForm.value };
if (salesTab.value !== "all") {
params.virtualSalesSet = salesTab.value === "configured";
}
getGoodsSkuData(params)
.then((res) => {
if (requestId !== dataRequestId) return;
if (res && res.success && res.result) {
data.value = (res.result.records || []).map((item) => ({
...item,
@@ -317,6 +343,10 @@ function getDataList() {
saving: false,
}));
total.value = res.result.total || 0;
if (data.value.length === 0 && total.value > 0 && searchForm.value.pageNumber > 1) {
searchForm.value.pageNumber = Math.max(1, Math.ceil(total.value / searchForm.value.pageSize));
getDataList();
}
selectedRows.value = [];
} else {
data.value = [];
@@ -326,13 +356,14 @@ function getDataList() {
}
})
.catch(() => {
if (requestId !== dataRequestId) return;
data.value = [];
total.value = 0;
selectedRows.value = [];
ElMessage.error("加载规格列表失败");
})
.finally(() => {
loading.value = false;
if (requestId === dataRequestId) loading.value = false;
});
}
function getVirtualSalesValue(row) {
@@ -363,6 +394,10 @@ function handleCancelVirtualSales() {
if (modalSubmitting.value) return;
resetVirtualSalesModal();
}
function handleBeforeCloseVirtualSales(done) {
if (modalSubmitting.value) return;
done();
}
function resetVirtualSalesModal() {
editModalVisible.value = false;
modalMode.value = "single";
@@ -397,6 +432,7 @@ function handleSubmitVirtualSales() {
}
ElMessage.success("虚拟销量设置成功");
resetVirtualSalesModal();
getDataList();
} else {
ElMessage.error((res && res.message) || "规格虚拟销量设置失败");
}
@@ -433,6 +469,7 @@ function handleBatchSubmitVirtualSales(virtualSales) {
tableRef.value?.clearSelection();
ElMessage.success("虚拟销量设置成功");
resetVirtualSalesModal();
getDataList();
} else {
ElMessage.error((res && res.message) || "虚拟销量设置失败");
}
@@ -454,6 +491,28 @@ onMounted(() => {
</script>
<style lang="scss" scoped>
.virtual-sales-drawer {
:deep(.el-drawer__header) {
margin-bottom: 0;
padding-bottom: 20px;
border-bottom: 1px solid var(--el-border-color-lighter);
}
:deep(.el-drawer__footer) {
border-top: 1px solid var(--el-border-color-lighter);
}
}
.drawer-actions {
display: flex;
justify-content: flex-end;
gap: 12px;
:deep(.el-button + .el-button) {
margin-left: 0;
}
}
.goods-info {
display: flex;
align-items: center;