|
|
@@ -782,7 +782,7 @@
|
|
|
:action="uploadUrl"
|
|
|
:headers="uploadHeaders"
|
|
|
:show-file-list="false"
|
|
|
- :before-upload="(file) => beforeCellUpload(file, row)"
|
|
|
+ :before-upload="(file) => beforeCellUpload(file)"
|
|
|
:on-success="(res) => onCellUploadSuccess(res, row)"
|
|
|
accept="image/*"
|
|
|
>
|
|
|
@@ -995,7 +995,28 @@
|
|
|
<!-- 其它小广告卡片专属图片列 -->
|
|
|
<el-table-column v-else label="图片" width="165" align="center">
|
|
|
<template #default="scope">
|
|
|
- <UploadImage v-model="scope.row.image" :limit="1" />
|
|
|
+ <div class="cell-upload-wrap">
|
|
|
+ <el-image
|
|
|
+ v-if="scope.row.image"
|
|
|
+ :src="scope.row.image"
|
|
|
+ :preview-src-list="[scope.row.image]"
|
|
|
+ preview-teleported
|
|
|
+ fit="cover"
|
|
|
+ style="width: 80px; height: 80px; border-radius: 4px"
|
|
|
+ />
|
|
|
+ <el-upload
|
|
|
+ :action="uploadUrl"
|
|
|
+ :headers="uploadHeaders"
|
|
|
+ :show-file-list="false"
|
|
|
+ :before-upload="(file) => beforeCellUpload(file)"
|
|
|
+ :on-success="(res) => onCellUploadSuccess(res, scope.row)"
|
|
|
+ accept="image/*"
|
|
|
+ >
|
|
|
+ <el-button size="small" type="primary" link>
|
|
|
+ {{ scope.row.image ? '更换' : '上传' }}
|
|
|
+ </el-button>
|
|
|
+ </el-upload>
|
|
|
+ </div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
|
|
|
@@ -1265,10 +1286,10 @@
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
|
|
|
- <div class="panel-config-section m-t-20">
|
|
|
+ <!-- <div class="panel-config-section m-t-20">
|
|
|
<div class="config-subtitle">分类分组设置</div>
|
|
|
<div class="field-tip">目前支持在代码中静态配置,弹窗界面待进一步完善。</div>
|
|
|
- </div>
|
|
|
+ </div> -->
|
|
|
</el-tab-pane>
|
|
|
</el-tabs>
|
|
|
</el-form>
|
|
|
@@ -1594,18 +1615,13 @@ import { globalHeaders } from '@/utils/request';
|
|
|
import { addMallConfig, updateMallConfig, getCurrentMallConfig } from '@/api/dkhDesign/mallConfig';
|
|
|
import { listCarouselConfig, delCarouselConfig, addCarouselConfig, updateCarouselConfig } from '@/api/dkhDesign/carouselConfig';
|
|
|
import { listHeaderMenu, delHeaderMenu, addHeaderMenu, updateHeaderMenu } from '@/api/dkhDesign/headerMenu';
|
|
|
-import { listScenarioConfig, delScenarioConfig, addScenarioConfig, updateScenarioConfig } from '@/api/dkhDesign/scenarioConfig';
|
|
|
-import { listAdConfig, delAdConfig, addAdConfig, updateAdConfig } from '@/api/dkhDesign/adConfig';
|
|
|
+import { listScenarioConfig, addScenarioConfig, updateScenarioConfig } from '@/api/dkhDesign/scenarioConfig';
|
|
|
+import { listAdConfig, addAdConfig, updateAdConfig } from '@/api/dkhDesign/adConfig';
|
|
|
import { listCategoryMain, delCategoryMain, addCategoryMain, updateCategoryMain } from '@/api/dkhDesign/categoryMain';
|
|
|
import { listBase } from '@/api/pmsProduct/base';
|
|
|
import { categoryTree } from '@/api/product/base/index';
|
|
|
import { categoryTreeVO } from '@/api/product/category/types';
|
|
|
-import {
|
|
|
- listRecommendThemeConfig,
|
|
|
- delRecommendThemeConfig,
|
|
|
- addRecommendThemeConfig,
|
|
|
- updateRecommendThemeConfig
|
|
|
-} from '@/api/dkhDesign/recommendThemeConfig';
|
|
|
+import { listRecommendThemeConfig, addRecommendThemeConfig, updateRecommendThemeConfig } from '@/api/dkhDesign/recommendThemeConfig';
|
|
|
import {
|
|
|
listRecommendCategoryConfig,
|
|
|
delRecommendCategoryConfig,
|
|
|
@@ -1615,22 +1631,16 @@ import {
|
|
|
|
|
|
import {
|
|
|
ShoppingCart,
|
|
|
- Plus,
|
|
|
Edit,
|
|
|
- Delete,
|
|
|
Picture,
|
|
|
CaretTop,
|
|
|
CaretBottom,
|
|
|
Menu,
|
|
|
ArrowLeft,
|
|
|
ArrowRight,
|
|
|
- Search,
|
|
|
InfoFilled,
|
|
|
ArrowUp,
|
|
|
- ArrowDown,
|
|
|
- ZoomIn,
|
|
|
- Upload,
|
|
|
- Right
|
|
|
+ ArrowDown
|
|
|
} from '@element-plus/icons-vue';
|
|
|
|
|
|
const route = useRoute();
|
|
|
@@ -3234,6 +3244,7 @@ const loadProductList = async (keyword?: string) => {
|
|
|
const res = await listBase(params);
|
|
|
productList.value = (res.rows || []).map((item: any) => ({
|
|
|
id: item.id,
|
|
|
+ productNo: item.productNo || '',
|
|
|
name: item.itemName || item.productName || '',
|
|
|
image: item.productImageUrl || item.productImage || '',
|
|
|
price: item.standardPrice || item.marketPrice || '0'
|
|
|
@@ -3286,6 +3297,8 @@ const confirmSelect = () => {
|
|
|
if (item) {
|
|
|
const target = adForm.items[currentItemIdx.value];
|
|
|
target.id = item.id;
|
|
|
+ target.productId = item.id;
|
|
|
+ target.productNo = item.productNo || '';
|
|
|
target.name = item.name;
|
|
|
target.image = item.image;
|
|
|
target.price = item.price;
|
|
|
@@ -5392,6 +5405,18 @@ watch(activeSubTab, (newVal) => {
|
|
|
height: 90px; /* 增加行高,大气美观 */
|
|
|
}
|
|
|
|
|
|
+.ad-setup-dialog :deep(.el-table__body td) {
|
|
|
+ overflow: visible !important;
|
|
|
+}
|
|
|
+
|
|
|
+.ad-setup-dialog :deep(.el-table__body .cell) {
|
|
|
+ overflow: visible !important;
|
|
|
+}
|
|
|
+
|
|
|
+.ad-setup-dialog :deep(.el-overlay) {
|
|
|
+ z-index: 3000 !important;
|
|
|
+}
|
|
|
+
|
|
|
.config-subtitle {
|
|
|
font-size: 15px;
|
|
|
font-weight: bold;
|