From ffb4759c850c8f2ce49be81edfd0fccd0f658080 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=AE=87=E8=88=AA?= <740464440@qq.com>
Date: Wed, 29 Nov 2023 16:38:19 +0800
Subject: [PATCH] =?UTF-8?q?fix():=20=E7=AC=AC=E4=B8=80=E6=AC=A1=E5=A4=84?=
=?UTF-8?q?=E7=90=86=E5=B9=BF=E5=91=8A=E7=AE=A1=E7=90=86bug=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/OperationCenter/OperationSales/AdsMgm/index.scss | 10 ++++++++--
src/pages/OperationCenter/OperationSales/AdsMgm/loadable.jsx | 11 ++++++-----
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/pages/OperationCenter/OperationSales/AdsMgm/index.scss b/src/pages/OperationCenter/OperationSales/AdsMgm/index.scss
index 9300b6c..2d2d1f4 100644
--- a/src/pages/OperationCenter/OperationSales/AdsMgm/index.scss
+++ b/src/pages/OperationCenter/OperationSales/AdsMgm/index.scss
@@ -3,8 +3,8 @@
.ads-mgm {
width: 100%;
height: 100%;
- overflow-y: auto;
- @include scrollBar(var(--color-user-list-bg), #3B97FF);
+ // overflow-y: auto;
+ // @include scrollBar(var(--color-user-list-bg), #3B97FF);
.hidden {
display: none !important;
@@ -206,6 +206,12 @@
}
}
}
+ .ant-table-wrapper {
+ height: calc(100% - 45px);
+ .ant-table-body {
+ @include scrollBar(var(--color-user-list-bg), #3b97ff);
+ }
+ }
}
}
diff --git a/src/pages/OperationCenter/OperationSales/AdsMgm/loadable.jsx b/src/pages/OperationCenter/OperationSales/AdsMgm/loadable.jsx
index bb6bfd3..92646f5 100644
--- a/src/pages/OperationCenter/OperationSales/AdsMgm/loadable.jsx
+++ b/src/pages/OperationCenter/OperationSales/AdsMgm/loadable.jsx
@@ -170,7 +170,7 @@ function AdsMgm() {
{
title: "标题",
dataIndex: "title",
- align: "center",
+ align: "left",
render: (val, row, index) => {
return (
<div className="row-pic">
@@ -290,7 +290,7 @@ function AdsMgm() {
// 操作
const clickDropDown = (param, record) => {
// console.log(param.key, record);
- setRowData(record);
+ setRowData({...record, areaIds: record?.areaId?.split(',')});
if (param.key == "3") {
// 下架
offItem(record?.advertId);
@@ -613,10 +613,10 @@ function AdsMgm() {
let isFormat = false;
// console.log(file.type);
// 图片文件 jpg、png、jpeg、bmp格式
- const picList = ["image/jpeg", "image/png", "image/jpg", "image/bmp"];
+ const picList = ["image/jpeg", "image/png", "image/jpg", "image/bmp", "image/gif"];
isFormat = picList.indexOf(file.type) > -1;
if (!isFormat) {
- message.error("请上传jpg、jpeg、png、bmp的图片格式");
+ message.error("请上传jpg、jpeg、png、bmp、gif的图片格式");
}
return isFormat;
}
@@ -793,7 +793,7 @@ function AdsMgm() {
useEffect(() => {
setSessionAdsMgm({...formData});
}, [formData]);
-
+ console.log(rowData);
return (
<div className="ads-mgm">
{/* 主页 */}
@@ -1008,6 +1008,7 @@ function AdsMgm() {
columns={columns}
pagination={false}
loading={tabLoading}
+ scroll={{ y: "calc(100vh - 315px)" }}
/>
<Pagination {...paginationProps} className="pagination-common" />
</ResultFlowResult>