1、新增首页轮播图切换效果

2、其他调整
This commit is contained in:
2024-09-30 18:20:29 +08:00
parent 7a180ee5a7
commit 713f24ca3e
22 changed files with 3239 additions and 1603 deletions

View File

@@ -146,245 +146,251 @@
</template>
<script lang="ts" setup>
import { ref, reactive, watch } from 'vue';
import { Form, message } from 'ant-design-vue';
import { assignObject } from 'ele-admin-pro';
import { addAd, updateAd } from '@/api/cms/ad';
import { Ad } from '@/api/cms/ad/model';
import { useThemeStore } from '@/store/modules/theme';
import { storeToRefs } from 'pinia';
import { FormInstance, type Rule } from 'ant-design-vue/es/form';
import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
import { uploadFile } from '@/api/system/file';
import { FileRecord } from '@/api/system/file/model';
import { Design } from '@/api/cms/design/model';
import { getMerchantId } from '@/utils/merchant';
import {ref, reactive, watch} from 'vue';
import {Form, message} from 'ant-design-vue';
import {assignObject} from 'ele-admin-pro';
import {addAd, updateAd} from '@/api/cms/ad';
import {Ad} from '@/api/cms/ad/model';
import {useThemeStore} from '@/store/modules/theme';
import {storeToRefs} from 'pinia';
import {FormInstance, type Rule} from 'ant-design-vue/es/form';
import {ItemType} from 'ele-admin-pro/es/ele-image-upload/types';
import {uploadFile} from '@/api/system/file';
import {FileRecord} from '@/api/system/file/model';
import {Design} from '@/api/cms/design/model';
import {getMerchantId} from '@/utils/merchant';
// 是否是修改
const isUpdate = ref(false);
const useForm = Form.useForm;
// 是否开启响应式布局
const themeStore = useThemeStore();
const { styleResponsive } = storeToRefs(themeStore);
// 是否是修改
const isUpdate = ref(false);
const useForm = Form.useForm;
// 是否开启响应式布局
const themeStore = useThemeStore();
const {styleResponsive} = storeToRefs(themeStore);
const props = defineProps<{
// 弹窗是否打开
visible: boolean;
// 修改回显的数据
data?: Ad | null;
}>();
const props = defineProps<{
// 弹窗是否打开
visible: boolean;
// 修改回显的数据
data?: Ad | null;
}>();
const emit = defineEmits<{
(e: 'done'): void;
(e: 'update:visible', visible: boolean): void;
}>();
const emit = defineEmits<{
(e: 'done'): void;
(e: 'update:visible', visible: boolean): void;
}>();
// 提交状态
const loading = ref(false);
// 已上传数据
const images = ref<ItemType[]>([]);
const pathList = ref<any[]>([]);
// 是否显示最大化切换按钮
const maxable = ref(true);
// 表格选中数据
const formRef = ref<FormInstance | null>(null);
// 提交状态
const loading = ref(false);
// 已上传数据
const images = ref<ItemType[]>([]);
const pathList = ref<any[]>([]);
// 是否显示最大化切换按钮
const maxable = ref(true);
// 表格选中数据
const formRef = ref<FormInstance | null>(null);
// 用户信息
const form = reactive<Ad>({
adId: undefined,
name: '',
adType: '图片广告',
images: '',
width: '',
height: '',
path: '',
type: '',
status: 0,
comments: '',
sortNumber: 100,
pageName: '',
pageId: undefined,
merchantId: undefined
});
// 用户信息
const form = reactive<Ad>({
adId: undefined,
name: '',
adType: '图片广告',
images: '',
width: '',
height: '',
path: '',
type: '',
status: 0,
comments: '',
sortNumber: 100,
pageName: '',
pageId: undefined,
merchantId: undefined
});
/* 更新visible */
const updateVisible = (value: boolean) => {
emit('update:visible', value);
};
/* 更新visible */
const updateVisible = (value: boolean) => {
emit('update:visible', value);
};
// 表单验证规则
const rules = reactive({
adType: [
{
required: true,
type: 'string',
message: '请选择广告类型',
trigger: 'blur'
}
],
images: [
{
required: true,
type: 'string',
message: '请上传图片或视频',
trigger: 'blur',
validator: (_rule: Rule, value: string) => {
return new Promise<void>((resolve, reject) => {
if (images.value.length == 0) {
return reject('请上传图片或视频文件');
}
return resolve();
});
}
}
]
});
const { resetFields } = useForm(form, rules);
/* 上传事件 */
const uploadHandler = (file: File) => {
const item: ItemType = {
file,
uid: (file as any).uid,
name: file.name
};
if (file.type.startsWith('video')) {
if (file.size / 1024 / 1024 > 200) {
message.error('大小不能超过 200MB');
return;
}
// 表单验证规则
const rules = reactive({
adType: [
{
required: true,
type: 'string',
message: '请选择广告类型',
trigger: 'blur'
}
if (file.type.startsWith('image')) {
if (file.size / 1024 / 1024 > 5) {
message.error('大小不能超过 5MB');
return;
}
}
onUpload(item);
};
// 上传文件
const onUpload = (item: any) => {
const { file } = item;
uploadFile(file)
.then((data) => {
images.value.push({
uid: data.id,
url:
file.type == 'video/mp4'
? 'https://oss.wsdns.cn/20240301/6e4e32cb808245d4be336b9486961145.png'
: data.path,
status: 'done'
],
images: [
{
required: true,
type: 'string',
message: '请上传图片或视频',
trigger: 'blur',
validator: (_rule: Rule, value: string) => {
return new Promise<void>((resolve, reject) => {
if (images.value.length == 0) {
return reject('请上传图片或视频文件');
}
return resolve();
});
})
.catch((e) => {
message.error(e.message);
});
};
}
}
]
});
const chooseFile = (data: FileRecord) => {
images.value.push({
uid: data.id,
url: data.downloadUrl,
status: 'done'
});
form.images = data.downloadUrl;
};
const {resetFields} = useForm(form, rules);
const onDeleteItem = (index: number) => {
images.value.splice(index, 1);
form.images = '';
/* 上传事件 */
const uploadHandler = (file: File) => {
const item: ItemType = {
file,
uid: (file as any).uid,
name: file.name
};
const choosePageId = (data: Design) => {
form.pageName = data.name;
form.pageId = data.pageId;
};
/* 保存编辑 */
const save = () => {
if (!formRef.value) {
if (file.type.startsWith('video')) {
if (file.size / 1024 / 1024 > 200) {
message.error('大小不能超过 200MB');
return;
}
formRef.value
.validate()
.then(() => {
loading.value = true;
const formData = {
...form,
merchantId: getMerchantId(),
images: JSON.stringify(images.value),
path:
form.adType == '幻灯片' ? JSON.stringify(pathList.value) : form.path
};
const saveOrUpdate = isUpdate.value ? updateAd : addAd;
saveOrUpdate(formData)
.then((msg) => {
loading.value = false;
message.success(msg);
updateVisible(false);
emit('done');
})
.catch((e) => {
loading.value = false;
message.error(e.message);
});
})
.catch(() => {});
};
}
if (file.type.startsWith('image')) {
if (file.size / 1024 / 1024 > 5) {
message.error('大小不能超过 5MB');
return;
}
}
watch(
() => props.visible,
(visible) => {
if (visible) {
if (props.data) {
assignObject(form, props.data);
images.value = [];
pathList.value = [];
if (props.data.images) {
const arr = JSON.parse(props.data.images);
arr.map((d) => {
images.value.push({
uid: d.uid,
url: d.url,
status: 'done'
});
onUpload(item);
};
// 上传文件
const onUpload = (item: any) => {
const {file} = item;
uploadFile(file)
.then((data) => {
images.value.push({
uid: data.id,
url:
file.type == 'video/mp4'
? 'https://oss.wsdns.cn/20240301/6e4e32cb808245d4be336b9486961145.png'
: data.path,
status: 'done'
});
})
.catch((e) => {
message.error(e.message);
});
};
const chooseFile = (data: FileRecord) => {
images.value.push({
uid: data.id,
url: data.downloadUrl,
status: 'done'
});
form.images = data.downloadUrl;
};
const onDeleteItem = (index: number) => {
images.value.splice(index, 1);
form.images = '';
};
const choosePageId = (data: Design) => {
form.pageName = data.name;
form.pageId = data.pageId;
};
/* 保存编辑 */
const save = () => {
if (!formRef.value) {
return;
}
formRef.value
.validate()
.then(() => {
loading.value = true;
const formData = {
...form,
merchantId: getMerchantId(),
images: JSON.stringify(images.value),
path:
form.adType == '幻灯片' ? JSON.stringify(pathList.value) : form.path
};
const saveOrUpdate = isUpdate.value ? updateAd : addAd;
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) {
if (props.data) {
assignObject(form, props.data);
images.value = [];
pathList.value = [];
if (props.data.images) {
const arr = JSON.parse(props.data.images);
arr.map((d) => {
images.value.push({
uid: d.uid,
url: d.url,
status: 'done'
});
}
// if (props.data.adType == '幻灯片') {
// const arr = JSON.parse(props.data.path);
// arr.map((d) => {
// pathList.value.push(d);
// });
// }
isUpdate.value = true;
} else {
isUpdate.value = false;
});
}
// if (props.data.adType == '幻灯片') {
// const arr = JSON.parse(props.data.path);
// arr.map((d) => {
// pathList.value.push(d);
// });
// }
isUpdate.value = true;
} else {
resetFields();
isUpdate.value = false;
}
},
{ immediate: true }
);
} else {
resetFields();
}
},
{immediate: true}
);
</script>
<style lang="less">
.tab-pane {
min-height: 300px;
}
.ml-10 {
margin-left: 5px;
}
.upload-text {
margin-right: 70px;
}
.icon-bg {
width: 50px;
height: 50px;
display: block;
border-radius: 50px;
background: url('data:image/svg+xml;charset=utf8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20version%3D%221.1%22%3E%3Cdefs%3E%3ClinearGradient%20id%3D%221%22%20x1%3D%220%22%20x2%3D%221%22%20y1%3D%220%22%20y2%3D%220%22%20gradientTransform%3D%22matrix(6.123233995736766e-17%2C%201%2C%20-0.024693877551020406%2C%206.123233995736766e-17%2C%200.5%2C%200)%22%3E%3Cstop%20stop-color%3D%22%230a060d%22%20stop-opacity%3D%221%22%20offset%3D%220%22%3E%3C%2Fstop%3E%3Cstop%20stop-color%3D%22%23660061%22%20stop-opacity%3D%221%22%20offset%3D%220.95%22%3E%3C%2Fstop%3E%3C%2FlinearGradient%3E%3C%2Fdefs%3E%3Crect%20width%3D%22100%25%22%20height%3D%22100%25%22%20fill%3D%22url(%231)%22%3E%3C%2Frect%3E%3C%2Fsvg%3E');
}
.tab-pane {
min-height: 300px;
}
.ml-10 {
margin-left: 5px;
}
.upload-text {
margin-right: 70px;
}
.icon-bg {
width: 50px;
height: 50px;
display: block;
border-radius: 50px;
background: url('data:image/svg+xml;charset=utf8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20version%3D%221.1%22%3E%3Cdefs%3E%3ClinearGradient%20id%3D%221%22%20x1%3D%220%22%20x2%3D%221%22%20y1%3D%220%22%20y2%3D%220%22%20gradientTransform%3D%22matrix(6.123233995736766e-17%2C%201%2C%20-0.024693877551020406%2C%206.123233995736766e-17%2C%200.5%2C%200)%22%3E%3Cstop%20stop-color%3D%22%230a060d%22%20stop-opacity%3D%221%22%20offset%3D%220%22%3E%3C%2Fstop%3E%3Cstop%20stop-color%3D%22%23660061%22%20stop-opacity%3D%221%22%20offset%3D%220.95%22%3E%3C%2Fstop%3E%3C%2FlinearGradient%3E%3C%2Fdefs%3E%3Crect%20width%3D%22100%25%22%20height%3D%22100%25%22%20fill%3D%22url(%231)%22%3E%3C%2Frect%3E%3C%2Fsvg%3E');
}
</style>

View File

@@ -94,6 +94,22 @@
/>
</template>
</a-form-item>
<a-form-item label="图标背景色" v-if="data && data.adId === 278">
<div class="flex justify-start items-start flex-wrap">
<div class="flex flex-col justify-center items-center" v-for="(item, index) in colors" :key="index">
<div
@click="changeShowColorPicker(index)"
class=" w-10 h-10 rounded-full m-2 cursor-pointer border-2 border-solid flex justify-center items-center text-red-600"
:class="[item ? 'border-none' : 'border-red-300']"
:style="{backgroundColor: item ?? 'red'}"
>{{ item ? '' : '选色' }}
</div>
<span v-if="item" class="text-sm cursor-pointer" @click="clearColor(index)">清除</span>
</div>
</div>
<Vue3ColorPicker v-if="showColorPicker" v-model="colors[showColorPickerIndex]" mode="solid"
:showColorList="false" :showEyeDrop="false" type="RGBA"/>
</a-form-item>
<a-form-item label="标题" name="name">
<a-input
allow-clear
@@ -130,199 +146,233 @@
</template>
<script lang="ts" setup>
import { ref, reactive, watch } from 'vue';
import { Form, message } from 'ant-design-vue';
import { assignObject } from 'ele-admin-pro';
import { addMpAd, updateMpAd } from '@/api/cms/mpAd';
import { MpAd } from '@/api/cms/mpAd/model';
import { useThemeStore } from '@/store/modules/theme';
import { storeToRefs } from 'pinia';
import { FormInstance, type Rule, RuleObject } from 'ant-design-vue/es/form';
import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
import { FileRecord } from '@/api/system/file/model';
import { MpPages } from '@/api/cms/mpPages/model';
import {ref, reactive, watch} from 'vue';
import {Form, message} from 'ant-design-vue';
import {assignObject} from 'ele-admin-pro';
import {addMpAd, updateMpAd} from '@/api/cms/mpAd';
import {MpAd} from '@/api/cms/mpAd/model';
import {useThemeStore} from '@/store/modules/theme';
import {storeToRefs} from 'pinia';
import {FormInstance, type Rule, RuleObject} from 'ant-design-vue/es/form';
import {ItemType} from 'ele-admin-pro/es/ele-image-upload/types';
import {FileRecord} from '@/api/system/file/model';
import {MpPages} from '@/api/cms/mpPages/model';
import {Vue3ColorPicker} from "@cyhnkckali/vue3-color-picker";
// 是否是修改
const isUpdate = ref(false);
const useForm = Form.useForm;
// 是否开启响应式布局
const themeStore = useThemeStore();
const { styleResponsive } = storeToRefs(themeStore);
// 是否是修改
const isUpdate = ref(false);
const useForm = Form.useForm;
// 是否开启响应式布局
const themeStore = useThemeStore();
const {styleResponsive} = storeToRefs(themeStore);
const props = defineProps<{
// 弹窗是否打开
visible: boolean;
// 修改回显的数据
data?: MpAd | null;
}>();
const props = defineProps<{
// 弹窗是否打开
visible: boolean;
// 修改回显的数据
data?: MpAd | null;
}>();
const emit = defineEmits<{
(e: 'done'): void;
(e: 'update:visible', visible: boolean): void;
}>();
const emit = defineEmits<{
(e: 'done'): void;
(e: 'update:visible', visible: boolean): void;
}>();
// 提交状态
const loading = ref(false);
// 已上传数据
const images = ref<ItemType[]>([]);
const pathList = ref<any[]>([]);
// 是否显示最大化切换按钮
const maxable = ref(true);
// 表格选中数据
const formRef = ref<FormInstance | null>(null);
// 提交状态
const loading = ref(false);
// 已上传数据
const images = ref<ItemType[]>([]);
const pathList = ref<any[]>([]);
// 是否显示最大化切换按钮
const maxable = ref(true);
// 表格选中数据
const formRef = ref<FormInstance | null>(null);
// 用户信息
const form = reactive<MpAd>({
adId: undefined,
pageId: 0,
pageName: '',
name: '',
adType: '图片广告',
images: '',
width: '',
height: '',
path: '',
status: 0,
comments: '',
sortNumber: 100
});
// 用户信息
const form = reactive<MpAd>({
adId: undefined,
pageId: 0,
pageName: '',
name: '',
adType: '图片广告',
images: '',
colors: '',
width: '',
height: '',
path: '',
status: 0,
comments: '',
sortNumber: 100
});
/* 更新visible */
const updateVisible = (value: boolean) => {
emit('update:visible', value);
};
/* 更新visible */
const updateVisible = (value: boolean) => {
emit('update:visible', value);
};
// 表单验证规则
const rules = reactive({
adType: [
{
required: true,
type: 'string',
message: '请选择广告类型',
trigger: 'blur'
}
],
images: [
{
required: true,
type: 'string',
message: '请上传图片或视频',
trigger: 'blur',
validator: (_rule: Rule, value: string) => {
return new Promise<void>((resolve, reject) => {
if (images.value.length == 0) {
return reject('请上传图片或视频文件');
}
return resolve();
});
}
}
]
});
const { resetFields } = useForm(form, rules);
const chooseFile = (data: FileRecord) => {
images.value.push({
uid: data.id,
url: data.downloadUrl,
status: 'done'
});
form.images = data.downloadUrl;
};
const onDeleteItem = (index: number) => {
images.value.splice(index, 1);
form.images = '';
};
const choosePageId = (data: MpPages) => {
form.pageName = data.title;
form.pageId = data.id;
};
/* 保存编辑 */
const save = () => {
if (!formRef.value) {
return;
// 表单验证规则
const rules = reactive({
adType: [
{
required: true,
type: 'string',
message: '请选择广告类型',
trigger: 'blur'
}
formRef.value
.validate()
.then(() => {
loading.value = true;
const formData = {
...form,
images: JSON.stringify(images.value),
path:
form.adType == '幻灯片' ? JSON.stringify(pathList.value) : form.path
};
const saveOrUpdate = isUpdate.value ? updateMpAd : addMpAd;
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) {
if (props.data) {
assignObject(form, props.data);
images.value = [];
pathList.value = [];
if (props.data.images) {
const arr = JSON.parse(props.data.images);
arr.map((d) => {
images.value.push({
uid: d.uid,
url: d.url,
status: 'done'
});
});
],
images: [
{
required: true,
type: 'string',
message: '请上传图片或视频',
trigger: 'blur',
validator: (_rule: Rule, value: string) => {
return new Promise<void>((resolve, reject) => {
if (images.value.length == 0) {
return reject('请上传图片或视频文件');
}
if (props.data.adType == '幻灯片') {
const arr = JSON.parse(props.data.path);
arr.map((d) => {
pathList.value.push(d);
});
}
isUpdate.value = true;
} else {
images.value = [];
isUpdate.value = false;
}
} else {
resetFields();
return resolve();
});
}
},
{ immediate: true }
);
}
]
});
const {resetFields} = useForm(form, rules);
const chooseFile = (data: FileRecord) => {
images.value.push({
uid: data.id,
url: data.downloadUrl,
status: 'done'
});
form.images = data.downloadUrl;
colors.value.push('')
};
const onDeleteItem = (index: number) => {
images.value.splice(index, 1);
colors.value.splice(index, 1);
form.images = '';
};
const choosePageId = (data: MpPages) => {
form.pageName = data.title;
form.pageId = data.id;
};
/* 保存编辑 */
const save = () => {
if (!formRef.value) {
return;
}
formRef.value
.validate()
.then(() => {
loading.value = true;
const formData = {
...form,
images: JSON.stringify(images.value),
colors: JSON.stringify(colors.value),
path:
form.adType == '幻灯片' ? JSON.stringify(pathList.value) : form.path
};
const saveOrUpdate = isUpdate.value ? updateMpAd : addMpAd;
saveOrUpdate(formData)
.then((msg) => {
loading.value = false;
message.success(msg);
updateVisible(false);
emit('done');
})
.catch((e) => {
loading.value = false;
message.error(e.message);
});
})
.catch(() => {
});
};
const colors = ref<string[]>([])
const showColorPicker = ref(false)
const showColorPickerIndex = ref<number>(-1)
const changeShowColorPicker = (index: number) => {
if (showColorPickerIndex.value === index) showColorPicker.value = !showColorPicker.value
else {
showColorPickerIndex.value = index
showColorPicker.value = true
}
}
const clearColor = (index) => {
showColorPicker.value = false
colors.value[index] = ''
}
watch(
() => props.visible,
(visible) => {
if (visible) {
if (props.data) {
assignObject(form, props.data);
images.value = [];
pathList.value = [];
colors.value = []
if (props.data.images) {
const arr = JSON.parse(props.data.images);
arr.map((d) => {
images.value.push({
uid: d.uid,
url: d.url,
status: 'done'
});
});
}
if (props.data.colors) {
colors.value = JSON.parse(props.data.colors);
} else {
colors.value = []
for (let i = 0; i < images.value.length; i++) {
colors.value.push('')
}
}
if (props.data.adType == '幻灯片') {
const arr = JSON.parse(props.data.path);
arr.map((d) => {
pathList.value.push(d);
});
}
isUpdate.value = true;
} else {
images.value = [];
isUpdate.value = false;
}
} else {
resetFields();
}
},
{immediate: true}
);
</script>
<style lang="less">
.tab-pane {
min-height: 300px;
}
.ml-10 {
margin-left: 5px;
}
.upload-text {
margin-right: 70px;
}
.icon-bg {
width: 50px;
height: 50px;
display: block;
border-radius: 50px;
background: url('data:image/svg+xml;charset=utf8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20version%3D%221.1%22%3E%3Cdefs%3E%3ClinearGradient%20id%3D%221%22%20x1%3D%220%22%20x2%3D%221%22%20y1%3D%220%22%20y2%3D%220%22%20gradientTransform%3D%22matrix(6.123233995736766e-17%2C%201%2C%20-0.024693877551020406%2C%206.123233995736766e-17%2C%200.5%2C%200)%22%3E%3Cstop%20stop-color%3D%22%230a060d%22%20stop-opacity%3D%221%22%20offset%3D%220%22%3E%3C%2Fstop%3E%3Cstop%20stop-color%3D%22%23660061%22%20stop-opacity%3D%221%22%20offset%3D%220.95%22%3E%3C%2Fstop%3E%3C%2FlinearGradient%3E%3C%2Fdefs%3E%3Crect%20width%3D%22100%25%22%20height%3D%22100%25%22%20fill%3D%22url(%231)%22%3E%3C%2Frect%3E%3C%2Fsvg%3E');
}
.tab-pane {
min-height: 300px;
}
.ml-10 {
margin-left: 5px;
}
.upload-text {
margin-right: 70px;
}
.icon-bg {
width: 50px;
height: 50px;
display: block;
border-radius: 50px;
background: url('data:image/svg+xml;charset=utf8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20version%3D%221.1%22%3E%3Cdefs%3E%3ClinearGradient%20id%3D%221%22%20x1%3D%220%22%20x2%3D%221%22%20y1%3D%220%22%20y2%3D%220%22%20gradientTransform%3D%22matrix(6.123233995736766e-17%2C%201%2C%20-0.024693877551020406%2C%206.123233995736766e-17%2C%200.5%2C%200)%22%3E%3Cstop%20stop-color%3D%22%230a060d%22%20stop-opacity%3D%221%22%20offset%3D%220%22%3E%3C%2Fstop%3E%3Cstop%20stop-color%3D%22%23660061%22%20stop-opacity%3D%221%22%20offset%3D%220.95%22%3E%3C%2Fstop%3E%3C%2FlinearGradient%3E%3C%2Fdefs%3E%3Crect%20width%3D%22100%25%22%20height%3D%22100%25%22%20fill%3D%22url(%231)%22%3E%3C%2Frect%3E%3C%2Fsvg%3E');
}
</style>

View File

@@ -41,7 +41,7 @@
<a-space>
<a @click="openEdit(record)">修改</a>
<a-divider type="vertical" />
<a-popconfirm
<a-popconfirm v-if="record.adId !== 278"
title="确定要删除此记录吗?"
@confirm="remove(record)"
>

File diff suppressed because it is too large Load Diff

View File

@@ -63,6 +63,12 @@
@done="chooseShopType"
/>
</a-form-item>
<a-form-item label="经营类型" name="merchantCategoryId">
<a-cascader v-model:value="merchantCategoryId" :options="merchantCategoryList"
:field-names="{ label: 'title', value: 'categoryId' }"
@change="selectMerchantCategory"
placeholder="请选择经营类型"/>
</a-form-item>
<a-form-item label="商户分类" name="category">
<industry-select
v-model:value="form.category"
@@ -186,288 +192,333 @@
</template>
<script lang="ts" setup>
import { ref, reactive, watch } from 'vue';
import { Form, message } from 'ant-design-vue';
import { assignObject, uuid, phoneReg } from 'ele-admin-pro';
import { addMerchant, updateMerchant } from '@/api/shop/merchant';
import { Merchant } from '@/api/shop/merchant/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';
import { MerchantType } from '@/api/shop/merchantType/model';
import { CenterPoint } from 'ele-admin-pro/es/ele-map-picker/types';
import { listRoles } from '@/api/system/role';
import { getTenantId } from '@/utils/domain';
import {ref, reactive, watch} from 'vue';
import {Form, message} from 'ant-design-vue';
import {assignObject, uuid, phoneReg} from 'ele-admin-pro';
import {addMerchant, updateMerchant} from '@/api/shop/merchant';
import {Merchant} from '@/api/shop/merchant/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';
import {MerchantType} from '@/api/shop/merchantType/model';
import {CenterPoint} from 'ele-admin-pro/es/ele-map-picker/types';
import {listRoles} from '@/api/system/role';
import {getTenantId} from '@/utils/domain';
import {MerchantCategory} from "@/api/shop/merchantCategory/model";
import {listMerchantCategory} from "@/api/shop/merchantCategory";
// 是否是修改
const isUpdate = ref(false);
const useForm = Form.useForm;
// 是否开启响应式布局
const themeStore = useThemeStore();
const { styleResponsive, darkMode } = storeToRefs(themeStore);
// 是否是修改
const isUpdate = ref(false);
const useForm = Form.useForm;
// 是否开启响应式布局
const themeStore = useThemeStore();
const {styleResponsive, darkMode} = storeToRefs(themeStore);
const props = defineProps<{
// 弹窗是否打开
visible: boolean;
// 修改回显的数据
data?: Merchant | null;
}>();
const props = defineProps<{
// 弹窗是否打开
visible: boolean;
// 修改回显的数据
data?: Merchant | null;
}>();
const emit = defineEmits<{
(e: 'done'): void;
(e: 'update:visible', visible: boolean): void;
}>();
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 files = ref<ItemType[]>([]);
// 是否显示地图选择弹窗
const showMap = ref(false);
// 提交状态
const loading = ref(false);
// 是否显示最大化切换按钮
const maxable = ref(true);
// 表格选中数据
const formRef = ref<FormInstance | null>(null);
const images = ref<ItemType[]>([]);
const files = ref<ItemType[]>([]);
// 是否显示地图选择弹窗
const showMap = ref(false);
// 用户信息
const form = reactive<Merchant>({
merchantId: undefined,
merchantName: undefined,
image: undefined,
phone: undefined,
realName: undefined,
shopType: undefined,
category: undefined,
province: '',
city: '',
region: '',
address: '',
lngAndLat: '',
commission: 0,
keywords: undefined,
files: undefined,
ownStore: undefined,
recommend: undefined,
goodsReview: 1,
comments: '',
adminUrl: '',
status: 0,
sortNumber: 100,
roleId: undefined,
roleName: '',
tenantId: undefined
// 用户信息
const form = reactive<Merchant>({
merchantId: undefined,
merchantName: undefined,
image: undefined,
phone: undefined,
realName: undefined,
shopType: undefined,
category: undefined,
merchantCategoryId: undefined,
merchantCategoryTitle: undefined,
province: '',
city: '',
region: '',
address: '',
lngAndLat: '',
lng: '',
lat: '',
commission: 0,
keywords: undefined,
files: undefined,
ownStore: undefined,
recommend: undefined,
goodsReview: 1,
comments: '',
adminUrl: '',
status: 0,
sortNumber: 100,
roleId: undefined,
roleName: '',
tenantId: undefined
});
/* 更新visible */
const updateVisible = (value: boolean) => {
emit('update:visible', value);
};
// 表单验证规则
const rules = reactive({
merchantName: [
{
required: true,
type: 'string',
message: '请填写商户名称',
trigger: 'blur'
}
],
category: [
{
required: true,
type: 'string',
message: '请填写商户分类',
trigger: 'blur'
}
],
lngAndLat: [
{
required: true,
type: 'string',
message: '请填写商户坐标',
trigger: 'blur'
}
],
realName: [
{
required: true,
type: 'string',
message: '请填写商户姓名',
trigger: 'blur'
}
],
shopType: [
{
required: true,
type: 'string',
message: '请选择店铺类型',
trigger: 'blur'
}
],
phone: [
{
required: true,
message: '请输入手机号',
trigger: 'blur'
},
{
pattern: phoneReg,
message: '手机号格式不正确',
type: 'string'
}
],
merchantCategoryId: [
{
required: true,
type: 'number',
message: '请选择经营类型',
trigger: 'blur'
}
]
});
const chooseShopType = (data: MerchantType) => {
form.shopType = data.name;
};
const merchantCategoryId = ref<number[]>([])
const selectMerchantCategory = (value: number[]) => {
if (value.length < 2) return message.error('请选择二级分类')
form.merchantCategoryId = value[1];
const data = merchantCategoryList.value.find(item => item.categoryId === value[1])
if (data) {
form.merchantCategoryTitle = data.title;
}
console.log(value)
};
const chooseImage = (data: FileRecord) => {
images.value.push({
uid: data.id,
url: data.path,
status: 'done'
});
form.image = data.path;
};
/* 更新visible */
const updateVisible = (value: boolean) => {
emit('update:visible', value);
};
const onDeleteItem = (index: number) => {
images.value.splice(index, 1);
form.image = '';
};
// 表单验证规则
const rules = reactive({
merchantName: [
{
required: true,
type: 'string',
message: '请填写商户名称',
trigger: 'blur'
}
],
category: [
{
required: true,
type: 'string',
message: '请填写商户分类',
trigger: 'blur'
}
],
lngAndLat: [
{
required: true,
type: 'string',
message: '请填写商户坐标',
trigger: 'blur'
}
],
realName: [
{
required: true,
type: 'string',
message: '请填写商户姓名',
trigger: 'blur'
}
],
shopType: [
{
required: true,
type: 'string',
message: '请选择店铺类型',
trigger: 'blur'
}
],
phone: [
{
required: true,
message: '请输入手机号',
trigger: 'blur'
},
{
pattern: phoneReg,
message: '手机号格式不正确',
type: 'string'
}
]
const chooseFiles = (data: FileRecord) => {
files.value.push({
uid: data.id,
url: data.path,
status: 'done'
});
};
const chooseShopType = (data: MerchantType) => {
form.shopType = data.name;
};
/* 打开位置选择 */
const openMapPicker = () => {
showMap.value = true;
};
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 chooseFiles = (data: FileRecord) => {
files.value.push({
uid: data.id,
url: data.path,
status: 'done'
});
};
/* 打开位置选择 */
const openMapPicker = () => {
showMap.value = true;
};
/* 地图选择后回调 */
const onDone = (location: CenterPoint) => {
// city.value = [
// `${location.city?.province}`,
// `${location.city?.city}`,
// `${location.city?.district}`
// ];
/* 地图选择后回调 */
const onDone = (location: CenterPoint) => {
// city.value = [
// `${location.city?.province}`,
// `${location.city?.city}`,
// `${location.city?.district}`
// ];
if (location) {
form.province = `${location.city?.province}`;
form.city = `${location.city?.city}`;
form.region = `${location.city?.district}`;
form.address = `${location.address}`;
form.lngAndLat = `${location.lng},${location.lat}`;
showMap.value = false;
};
form.lng = location.lng?.toString();
form.lat = location.lat?.toString();
}
showMap.value = false;
};
const onDeleteFiles = (index: number) => {
files.value.splice(index, 1);
};
const onDeleteFiles = (index: number) => {
files.value.splice(index, 1);
};
const updateOwnStore = (value: boolean) => {
form.ownStore = value ? 1 : 0;
};
const updateOwnStore = (value: boolean) => {
form.ownStore = value ? 1 : 0;
};
const updateRecommend = (value: boolean) => {
form.recommend = value ? 1 : 0;
};
const updateRecommend = (value: boolean) => {
form.recommend = value ? 1 : 0;
};
const updateGoodsReview = (value: boolean) => {
form.goodsReview = value ? 1 : 0;
};
const updateGoodsReview = (value: boolean) => {
form.goodsReview = value ? 1 : 0;
};
const onIndustry = (item: any) => {
form.category = item[0] + '/' + item[1];
};
const onIndustry = (item: any) => {
form.category = item[0] + '/' + item[1];
};
const { resetFields } = useForm(form, rules);
const {resetFields} = useForm(form, rules);
/* 保存编辑 */
const save = () => {
if (!formRef.value) {
return;
}
/* 保存编辑 */
const save = () => {
if (!formRef.value) {
return;
}
formRef.value
.validate()
.then(() => {
loading.value = true;
const formData = {
...form,
keywords: JSON.stringify(form.keywords),
files: JSON.stringify(files.value)
};
const saveOrUpdate = isUpdate.value ? updateMerchant : addMerchant;
saveOrUpdate(formData)
.then((msg) => {
loading.value = false;
message.success(msg);
updateVisible(false);
emit('done');
})
.catch((e) => {
loading.value = false;
message.error(e.message);
formRef.value
.validate()
.then(() => {
loading.value = true;
const formData = {
...form,
keywords: JSON.stringify(form.keywords),
files: JSON.stringify(files.value)
};
const saveOrUpdate = isUpdate.value ? updateMerchant : addMerchant;
saveOrUpdate(formData)
.then((msg) => {
loading.value = false;
message.success(msg);
updateVisible(false);
emit('done');
})
.catch((e) => {
loading.value = false;
message.error(e.message);
});
})
.catch(() => {
});
};
const merchantCategoryList = ref<MerchantCategory[]>([]);
const getMerchantCategoryList = async () => {
merchantCategoryList.value = await listMerchantCategory({
parentId: 0
});
}
watch(
() => props.visible,
async (visible) => {
if (visible) {
await getMerchantCategoryList()
images.value = [];
files.value = [];
merchantCategoryId.value = [];
if (props.data) {
isUpdate.value = true;
assignObject(form, props.data);
if (props.data.image) {
images.value.push({
uid: uuid(),
url: props.data.image,
status: 'done'
});
})
.catch(() => {});
};
watch(
() => props.visible,
(visible) => {
if (visible) {
images.value = [];
files.value = [];
if (props.data) {
isUpdate.value = true;
assignObject(form, props.data);
if (props.data.image) {
images.value.push({
}
if (props.data.files) {
const arr = JSON.parse(props.data.files);
arr.map((item) => {
files.value.push({
uid: uuid(),
url: props.data.image,
url: item.url,
status: 'done'
});
}
if (props.data.files) {
const arr = JSON.parse(props.data.files);
arr.map((item) => {
files.value.push({
uid: uuid(),
url: item.url,
status: 'done'
});
});
}
if (props.data.keywords) {
form.keywords = JSON.parse(props.data.keywords);
}
} else {
isUpdate.value = false;
});
}
if (props.data.keywords) {
form.keywords = JSON.parse(props.data.keywords);
}
if (props.data && props.data.merchantCategoryId) {
merchantCategoryList.value.forEach(item => {
const cate = item.children?.find(i => i.categoryId === props?.data?.merchantCategoryId)
if (cate) merchantCategoryId.value.push(item?.categoryId, cate.categoryId)
});
}
// 获取商户管理员的roleId
listRoles({ roleCode: 'merchant' }).then((res) => {
form.roleId = res[0].roleId;
form.roleName = res[0].roleName;
});
} else {
resetFields();
isUpdate.value = false;
}
},
{ immediate: true }
);
// 获取商户管理员的roleId
listRoles({roleCode: 'merchant'}).then((res) => {
form.roleId = res[0].roleId;
form.roleName = res[0].roleName;
});
} else {
resetFields();
}
},
{immediate: true}
);
</script>
<style lang="less" scoped>
.flex-sb {
display: flex;
justify-content: space-between;
}
.flex-sb {
display: flex;
justify-content: space-between;
}
</style>

View File

@@ -0,0 +1,299 @@
<!-- 编辑弹窗 -->
<template>
<ele-modal
:width="620"
:visible="visible"
:confirm-loading="loading"
:title="isUpdate ? '修改分类' : '新建分类'"
:body-style="{ paddingBottom: '8px' }"
@update:visible="updateVisible"
@ok="save"
>
<a-form
ref="formRef"
:model="form"
:rules="rules"
:label-col="styleResponsive ? { md: 4, sm: 4, xs: 24 } : { flex: '90px' }"
:wrapper-col="
styleResponsive ? { md: 18, sm: 20, xs: 24 } : { flex: '1' }
"
>
<a-row :gutter="16">
<a-col
v-bind="styleResponsive ? { md: 24, sm: 24, xs: 24 } : { span: 12 }"
>
<a-form-item label="上级分类" name="parentId">
<a-tree-select
allow-clear
:tree-data="categoryList"
tree-default-expand-all
placeholder="请选择上级分类"
:value="form.parentId || undefined"
:dropdown-style="{ maxHeight: '360px', overflow: 'auto' }"
@update:value="(value?: number) => (form.parentId = value)"
/>
</a-form-item>
<a-form-item label="分类名称" name="title">
<a-input
allow-clear
placeholder="请输入分类名称"
v-model:value="form.title"
@pressEnter="save"
/>
</a-form-item>
</a-col>
<a-col
v-bind="styleResponsive ? { md: 24, sm: 24, xs: 24 } : { span: 12 }"
>
<a-form-item label="排序号" name="sortNumber">
<a-input-number
:min="0"
:max="99999"
class="ele-fluid"
placeholder="请输入排序号"
v-model:value="form.sortNumber"
/>
</a-form-item>
<a-form-item label="是否展示">
<a-switch
checked-children=""
un-checked-children=""
:checked="form.status === 0"
@update:checked="updateHideValue"
/>
</a-form-item>
<a-form-item label="分类图标" name="image" extra="尺寸180*180">
<SelectFile
:placeholder="`请选择图片`"
:limit="1"
:data="images"
@done="chooseFile"
@del="onDeleteItem"
/>
</a-form-item>
</a-col>
</a-row>
<div style="margin-bottom: 22px">
<a-divider/>
</div>
<a-form-item
label="备注"
name="comments"
:label-col="
styleResponsive ? { md: 3, sm: 4, xs: 24 } : { flex: '90px' }
"
:wrapper-col="
styleResponsive ? { md: 21, sm: 20, xs: 24 } : { flex: '1' }
"
>
<a-textarea
:rows="4"
:maxlength="200"
placeholder="请输入备注信息"
v-model:value="form.comments"
/>
</a-form-item>
</a-form>
</ele-modal>
</template>
<script lang="ts" setup>
import {ref, reactive, watch} from 'vue';
import {message} from 'ant-design-vue/es';
import type {FormInstance, Rule} from 'ant-design-vue/es/form';
import {storeToRefs} from 'pinia';
import {useThemeStore} from '@/store/modules/theme';
import useFormData from '@/utils/use-form-data';
import {ItemType} from 'ele-admin-pro/es/ele-image-upload/types';
import {FileRecord} from '@/api/system/file/model';
import {getMerchantId} from "@/utils/merchant";
import {MerchantCategory} from "@/api/shop/merchantCategory/model";
import {addMerchantCategory, updateMerchantCategory} from "@/api/shop/merchantCategory";
// 是否开启响应式布局
const themeStore = useThemeStore();
const {styleResponsive} = storeToRefs(themeStore);
// 已上传数据
const images = ref<ItemType[]>([]);
const emit = defineEmits<{
(e: 'done'): void;
(e: 'update:visible', visible: boolean): void;
}>();
const props = defineProps<{
// 弹窗是否打开
visible: boolean;
// 修改回显的数据
data?: MerchantCategory | null;
// 上级分类id
parentId?: number;
// 全部分类数据
categoryList: MerchantCategory[];
}>();
//
const formRef = ref<FormInstance | null>(null);
// 是否是修改
const isUpdate = ref(false);
// 提交状态
const loading = ref(false);
// 表单数据
const {form, resetFields, assignFields} = useFormData<MerchantCategory>({
categoryId: undefined,
title: '',
parentId: undefined,
image: '',
status: 0,
sortNumber: 100
});
// 表单验证规则
const rules = reactive<Record<string, Rule[]>>({
title: [
{
required: true,
message: '请输入分类名称',
type: 'string',
trigger: 'blur'
}
],
sortNumber: [
{
required: true,
message: '请输入排序号',
type: 'number',
trigger: 'blur'
}
],
meta: [
{
type: 'string',
validator: async (_rule: Rule, value: string) => {
if (value) {
const msg = '请输入正确的JSON格式';
try {
const obj = JSON.parse(value);
if (typeof obj !== 'object' || obj === null) {
return Promise.reject(msg);
}
} catch (_e) {
return Promise.reject(msg);
}
}
return Promise.resolve();
},
trigger: 'blur'
}
]
});
const chooseFile = (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 save = () => {
if (!formRef.value) {
return;
}
formRef.value
.validate()
.then(() => {
loading.value = true;
const categoryForm = {
...form,
// menuType 对应的值与后端不一致在前端处理
// menuType: form.menuType === 2 ? 1 : 0,
parentId: form.parentId || 0
};
const saveOrUpdate = isUpdate.value
? updateMerchantCategory
: addMerchantCategory;
saveOrUpdate(categoryForm)
.then((msg) => {
loading.value = false;
message.success(msg);
updateVisible(false);
emit('done');
})
.catch((e) => {
loading.value = false;
message.error(e.message);
});
})
.catch(() => {
});
};
/* 更新visible */
const updateVisible = (value: boolean) => {
emit('update:visible', value);
};
const updateHideValue = (value: boolean) => {
form.status = value ? 0 : 1;
};
watch(
() => props.visible,
(visible) => {
if (visible) {
if (props.data) {
assignFields({
...props.data,
parentId:
props.data.parentId === 0 ? undefined : props.data.parentId
});
images.value = [];
if (props.data.image) {
images.value.push({
uid: `${props.data.categoryId}`,
url: props.data.image,
status: 'done'
});
}
isUpdate.value = true;
} else {
images.value = [];
form.parentId = props.parentId;
isUpdate.value = false;
}
} else {
resetFields();
formRef.value?.clearValidate();
}
}
);
</script>
<script lang="ts">
import * as icons from '@/layout/menu-icons';
export default {
components: icons,
data() {
return {
iconData: [
{
title: '已引入的图标',
icons: Object.keys(icons)
}
]
};
}
};
</script>

View File

@@ -0,0 +1,294 @@
<!-- 编辑弹窗 -->
<template>
<ele-modal
:width="620"
:visible="visible"
:confirm-loading="loading"
:title="isUpdate ? '修改分类' : '新建分类'"
:body-style="{ paddingBottom: '8px' }"
@update:visible="updateVisible"
@ok="save"
>
<a-form
ref="formRef"
:model="form"
:rules="rules"
:label-col="styleResponsive ? { md: 4, sm: 4, xs: 24 } : { flex: '90px' }"
:wrapper-col="
styleResponsive ? { md: 18, sm: 20, xs: 24 } : { flex: '1' }
"
>
<a-row :gutter="16">
<a-col
v-bind="styleResponsive ? { md: 24, sm: 24, xs: 24 } : { span: 12 }"
>
<a-form-item label="分类名称" name="title">
<a-input
allow-clear
placeholder="请输入分类名称"
v-model:value="form.title"
@pressEnter="save"
/>
</a-form-item>
</a-col>
<a-col
v-bind="styleResponsive ? { md: 24, sm: 24, xs: 24 } : { span: 12 }"
>
<a-form-item label="排序号" name="sortNumber">
<a-input-number
:min="0"
:max="99999"
class="ele-fluid"
placeholder="请输入排序号"
v-model:value="form.sortNumber"
/>
</a-form-item>
<a-form-item label="是否展示">
<a-switch
checked-children=""
un-checked-children=""
:checked="form.status === 0"
@update:checked="updateHideValue"
/>
</a-form-item>
<a-form-item label="分类图标" name="image" extra="尺寸180*180">
<SelectFile
:placeholder="`请选择图片`"
:limit="1"
:data="images"
@done="chooseFile"
@del="onDeleteItem"
/>
</a-form-item>
</a-col>
</a-row>
<div style="margin-bottom: 22px">
<a-divider />
</div>
<a-form-item
label="备注"
name="comments"
:label-col="
styleResponsive ? { md: 3, sm: 4, xs: 24 } : { flex: '90px' }
"
:wrapper-col="
styleResponsive ? { md: 21, sm: 20, xs: 24 } : { flex: '1' }
"
>
<a-textarea
:rows="4"
:maxlength="200"
placeholder="请输入备注信息"
v-model:value="form.comments"
/>
</a-form-item>
</a-form>
</ele-modal>
</template>
<script lang="ts" setup>
import { ref, reactive, watch } from 'vue';
import { message } from 'ant-design-vue/es';
import type { FormInstance, Rule } from 'ant-design-vue/es/form';
import { storeToRefs } from 'pinia';
import { useThemeStore } from '@/store/modules/theme';
import useFormData from '@/utils/use-form-data';
import { GoodsCategory } from '@/api/shop/goodsCategory/model';
import {
addGoodsCategory,
updateGoodsCategory
} from '@/api/shop/goodsCategory';
import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
import { FileRecord } from '@/api/system/file/model';
import { getMerchantId } from "@/utils/merchant";
// 是否开启响应式布局
const themeStore = useThemeStore();
const { styleResponsive } = storeToRefs(themeStore);
// 已上传数据
const images = ref<ItemType[]>([]);
const emit = defineEmits<{
(e: 'done'): void;
(e: 'update:visible', visible: boolean): void;
}>();
const props = defineProps<{
// 弹窗是否打开
visible: boolean;
// 修改回显的数据
data?: GoodsCategory | null;
// 上级分类id
parentId?: number;
// 商户ID
merchantId?: number;
// 全部分类数据
categoryList: GoodsCategory[];
}>();
//
const formRef = ref<FormInstance | null>(null);
// 是否是修改
const isUpdate = ref(false);
// 提交状态
const loading = ref(false);
// 表单数据
const { form, resetFields, assignFields } = useFormData<GoodsCategory>({
categoryId: undefined,
title: '',
parentId: undefined,
image: '',
status: 0,
sortNumber: 100,
merchantId: getMerchantId()
});
// 表单验证规则
const rules = reactive<Record<string, Rule[]>>({
title: [
{
required: true,
message: '请输入分类名称',
type: 'string',
trigger: 'blur'
}
],
sortNumber: [
{
required: true,
message: '请输入排序号',
type: 'number',
trigger: 'blur'
}
],
meta: [
{
type: 'string',
validator: async (_rule: Rule, value: string) => {
if (value) {
const msg = '请输入正确的JSON格式';
try {
const obj = JSON.parse(value);
if (typeof obj !== 'object' || obj === null) {
return Promise.reject(msg);
}
} catch (_e) {
return Promise.reject(msg);
}
}
return Promise.resolve();
},
trigger: 'blur'
}
]
});
const chooseFile = (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 save = () => {
if (!formRef.value) {
return;
}
formRef.value
.validate()
.then(() => {
loading.value = true;
const categoryForm = {
...form,
// menuType 对应的值与后端不一致在前端处理
// menuType: form.menuType === 2 ? 1 : 0,
parentId: form.parentId || 0,
type: 1
};
const saveOrUpdate = isUpdate.value
? updateGoodsCategory
: addGoodsCategory;
saveOrUpdate(categoryForm)
.then((msg) => {
loading.value = false;
message.success(msg);
updateVisible(false);
emit('done');
})
.catch((e) => {
loading.value = false;
message.error(e.message);
});
})
.catch(() => {});
};
/* 更新visible */
const updateVisible = (value: boolean) => {
emit('update:visible', value);
};
const updateHideValue = (value: boolean) => {
form.status = value ? 0 : 1;
};
watch(
() => props.visible,
(visible) => {
if (visible) {
if (props.data) {
assignFields({
...props.data,
parentId:
props.data.parentId === 0 ? undefined : props.data.parentId
});
images.value = [];
if (props.data.image) {
images.value.push({
uid: `${props.data.categoryId}`,
url: props.data.image,
status: 'done'
});
}
isUpdate.value = true;
} else {
images.value = [];
form.parentId = props.parentId;
isUpdate.value = false;
}
} else {
resetFields();
formRef.value?.clearValidate();
}
}
);
</script>
<script lang="ts">
import * as icons from '@/layout/menu-icons';
export default {
components: icons,
data() {
return {
iconData: [
{
title: '已引入的图标',
icons: Object.keys(icons)
}
]
};
}
};
</script>

View File

@@ -0,0 +1,206 @@
<!-- 编辑弹窗 -->
<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">
<a-form-item label="分类名称" name="title">
<a-input
allow-clear
placeholder="请输入分类名称"
v-model:value="form.title"
/>
</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="parentId">
<a-select v-model:value="form.parentId">
<a-select-option v-for="(item, index) in parentList" :key="index" :value="item.categoryId">{{ item.title }}</a-select-option>
</a-select>
</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="comments">
<a-textarea
:rows="4"
:maxlength="200"
placeholder="请输入描述"
v-model:value="form.comments"
/>
</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 {addMerchantCategory, listMerchantCategory, updateMerchantCategory} from '@/api/shop/merchantCategory';
import {MerchantCategory} from '@/api/shop/merchantCategory/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?: MerchantCategory | 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<MerchantCategory>({
categoryId: undefined,
title: undefined,
type: 0,
image: undefined,
parentId: undefined,
userId: undefined,
count: undefined,
sortNumber: undefined,
comments: undefined,
hide: undefined,
status: undefined,
deleted: undefined,
tenantId: undefined,
createTime: undefined,
updateTime: undefined,
});
/* 更新visible */
const updateVisible = (value: boolean) => {
emit('update:visible', value);
};
// 表单验证规则
const rules = reactive({
title: [{required: true, message: '请输入分类名称', trigger: 'blur'}],
image: [{required: true, 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 ? updateMerchantCategory : addMerchantCategory;
saveOrUpdate(formData)
.then((msg) => {
loading.value = false;
message.success(msg);
updateVisible(false);
emit('done');
})
.catch((e) => {
loading.value = false;
message.error(e.message);
});
})
.catch(() => {
});
};
const parentList = ref<MerchantCategory[]>([])
const getParentList = async () => {
parentList.value = await listMerchantCategory({parentId: null})
}
watch(
() => props.visible,
(visible) => {
if (visible) {
getParentList()
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>

View File

@@ -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>

View File

@@ -0,0 +1,306 @@
<template>
<div class="ele-body">
<a-card :bordered="false">
<!-- 表格 -->
<ele-pro-table
ref="tableRef"
row-key="categoryId"
:columns="columns"
:datasource="datasource"
:parse-data="parseData"
:need-page="false"
:customRow="customRow"
:expand-icon-column-index="1"
:expanded-row-keys="expandedRowKeys"
:scroll="{ x: 1200 }"
cache-key="proGoodsCategoryTable"
@done="onDone"
@expand="onExpand"
>
<template #toolbar>
<search
@search="reload"
:merchantId="merchantId"
@add="openEdit"
@expand="expandAll"
@fold="foldAll"
/>
</template>
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'path'">
<span class="ele-text-placeholder">{{ record.path }}</span>
</template>
<template v-if="column.key === 'component'">
<span class="ele-text-placeholder">{{ record.component }}</span>
</template>
<template v-else-if="column.key === 'title'">
<a-avatar
:size="26"
shape="square"
:src="`${record.image}`"
style="margin-right: 10px"
v-if="record.image"
/>
<a
:href="`${domain}/product/${record.categoryId}`"
target="_blank"
>{{ record.title }}</a
>
</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="orange">隐藏</a-tag>
</template>
<template v-else-if="column.key === 'action'">
<a-space>
<a @click="openEdit(null, record.categoryId)">添加</a>
<a-divider type="vertical"/>
<a @click="moveUp(record)">上移
<ArrowUpOutlined/>
</a>
<a-divider type="vertical"/>
<a @click="openEdit(record)">修改</a>
<a-divider type="vertical"/>
<a-popconfirm
placement="topRight"
title="确定要删除此分类吗?"
@confirm="remove(record)"
>
<a class="ele-text-danger">删除</a>
</a-popconfirm>
</a-space>
</template>
</template>
</ele-pro-table>
</a-card>
<!-- 商城分类编辑弹窗 -->
<MerchantCategoryEdit
v-model:visible="showEdit"
:data="current"
:parent-id="parentId"
:category-list="categoryData"
@done="reload"
/>
</div>
</template>
<script lang="ts" setup>
import {ref, watch} from 'vue';
import {message} from 'ant-design-vue/es';
import {
ArrowUpOutlined,
} from '@ant-design/icons-vue';
import type {
DatasourceFunction,
ColumnItem,
EleProTableDone
} from 'ele-admin-pro/es/ele-pro-table/types';
import {
messageLoading,
toDateString,
toTreeData,
eachTreeData
} from 'ele-admin-pro/es';
import type {EleProTable} from 'ele-admin-pro/es';
import MerchantCategoryEdit from './components/merchantCategoryEdit.vue';
import {getSiteInfo} from '@/api/layout';
import router from '@/router';
import Search from './components/search.vue';
import {getSiteDomain} from '@/utils/domain';
import {MerchantCategory, MerchantCategoryParam} from "@/api/shop/merchantCategory/model";
import {listMerchantCategory, removeMerchantCategory, updateMerchantCategory} from "@/api/shop/merchantCategory";
// 表格实例
const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
// 表格列配置
const columns = ref<ColumnItem[]>([
{
title: 'ID',
dataIndex: 'categoryId',
width: 80
},
{
title: '分类名称',
dataIndex: 'title',
key: 'title',
showSorterTooltip: false,
ellipsis: true
},
{
title: '排序',
dataIndex: 'sortNumber',
align: 'center',
width: 120,
showSorterTooltip: false
},
{
title: '状态',
dataIndex: 'status',
key: 'status',
align: 'center',
width: 120,
showSorterTooltip: false,
customRender: ({text}) => ['显示', '隐藏'][text]
},
{
title: '创建时间',
dataIndex: 'createTime',
showSorterTooltip: false,
ellipsis: true,
width: 180,
customRender: ({text}) => toDateString(text)
},
{
title: '操作',
key: 'action',
width: 200,
align: 'center'
}
]);
// 当前编辑数据
const current = ref<MerchantCategory | null>(null);
// 是否显示编辑弹窗
const showEdit = ref(false);
// 上级分类id
const parentId = ref<number>();
// 分类数据
const categoryData = ref<MerchantCategory[]>([]);
// 表格展开的行
const expandedRowKeys = ref<number[]>([]);
const searchText = ref('');
const tenantId = ref<number>();
const merchantId = ref<number>();
// 网站域名
const domain = getSiteDomain();
getSiteInfo().then((data) => {
tenantId.value = data.tenantId;
});
// 表格数据源
const datasource: DatasourceFunction = ({where}) => {
where.title = searchText.value;
return listMerchantCategory({...where});
};
// 上移
const moveUp = (row?: MerchantCategory) => {
updateMerchantCategory({
categoryId: row?.categoryId,
sortNumber: Number(row?.sortNumber) - 1
}).then((msg) => {
message.success(msg);
reload();
});
};
/* 数据转为树形结构 */
const parseData = (data: MerchantCategory[]) => {
return toTreeData({
data: data.map((d) => {
return {...d, key: d.categoryId, value: d.categoryId};
}),
idField: 'categoryId',
parentIdField: 'parentId'
});
};
/* 表格渲染完成回调 */
const onDone: EleProTableDone<MerchantCategory> = ({data}) => {
categoryData.value = data;
};
/* 刷新表格 */
const reload = (where?: MerchantCategoryParam) => {
tableRef?.value?.reload({where});
};
/* 打开编辑弹窗 */
const openEdit = (row?: MerchantCategory | null, id?: number) => {
current.value = row ?? null;
parentId.value = id;
showEdit.value = true;
};
/* 删除单个 */
const remove = (row: MerchantCategory) => {
if (row.children?.length) {
message.error('请先删除子节点');
return;
}
const hide = messageLoading('请求中..', 0);
removeMerchantCategory(row.categoryId)
.then((msg) => {
hide();
message.success(msg);
reload();
})
.catch((e) => {
hide();
message.error(e.message);
});
};
/* 展开全部 */
const expandAll = () => {
let keys: number[] = [];
eachTreeData(categoryData.value, (d) => {
if (d.children && d.children.length && d.categoryId) {
keys.push(d.categoryId);
}
});
expandedRowKeys.value = keys;
};
/* 折叠全部 */
const foldAll = () => {
expandedRowKeys.value = [];
};
/* 点击展开图标时触发 */
const onExpand = (expanded: boolean, record: MerchantCategory) => {
if (expanded) {
expandedRowKeys.value = [
...expandedRowKeys.value,
record.categoryId as number
];
} else {
expandedRowKeys.value = expandedRowKeys.value.filter(
(d) => d !== record.categoryId
);
}
};
/* 自定义行属性 */
const customRow = (record: MerchantCategory) => {
return {
// 行点击事件
onClick: () => {
// console.log(record);
},
// 行双击事件
onDblclick: () => {
openEdit(record);
}
};
};
watch(
() => router.currentRoute.value.params.id,
(id) => {
merchantId.value = Number(id);
reload();
},
{immediate: true}
);
</script>
<script lang="ts">
export default {
name: 'MerchantCategory'
};
</script>

View File

@@ -0,0 +1,124 @@
<template>
<a-card :title="title" class="ele-body">
<a-list item-layout="vertical" :pagination="pagination" :data-source="list">
<template #renderItem="{ item }">
<a-list-item key="item.title">
<template #actions>
<span v-for="{ icon, text } in actions" :key="icon">
<component :is="icon" style="margin-right: 8px" />
{{ text }}
</span>
</template>
<template #extra>
<img
width="100"
height="100"
alt="logo"
v-if="item.image"
:src="item.image"
/>
</template>
<a-list-item-meta :description="item.title">
<template #title>
<a @click="openNew('/cms/article/' + item.articleId)">{{
item.title
}}</a>
</template>
</a-list-item-meta>
</a-list-item>
</template>
</a-list>
</a-card>
</template>
<script lang="ts" setup>
import { ref, unref, watch } from 'vue';
import { useRouter } from 'vue-router';
import { setPageTabTitle } from '@/utils/page-tab-util';
import { pageArticle } from '@/api/cms/article';
import { Article } from '@/api/cms/article/model';
import { getArticleCategory } from '@/api/cms/category';
import { ArticleCategory } from '@/api/cms/category/model';
import {
StarOutlined,
LikeOutlined,
MessageOutlined
} from '@ant-design/icons-vue';
import { openNew } from '@/utils/common';
const { currentRoute } = useRouter();
const title = ref<string>('');
const categoryId = ref(0);
const category = ref<ArticleCategory | any>();
const list = ref<Article[]>([]);
const spinning = ref(true);
const page = ref(1);
const pagination = {
onChange: (index: number) => {
page.value = index;
reload();
},
total: 10,
pageSize: 10
};
const actions: Record<string, any>[] = [
{ icon: StarOutlined, text: '156' },
{ icon: LikeOutlined, text: '156' },
{ icon: MessageOutlined, text: '2' }
];
/**
* 加载数据
*/
const reload = () => {
// 加载文章分类
getArticleCategory(categoryId.value).then((data) => {
category.value = data;
// 修改页签标题
if (data.title) {
title.value = data.title;
setPageTabTitle(data.title);
}
});
// 加载文章列表
pageArticle({ categoryId: categoryId.value, page: page.value }).then(
(data) => {
if (data?.list) {
pagination.total = data.count;
list.value = data.list;
}
spinning.value = false;
}
);
};
watch(
currentRoute,
(route) => {
const { params } = unref(route);
const { id } = params;
if (id) {
categoryId.value = Number(id);
reload();
}
},
{ immediate: true }
);
</script>
<script lang="ts">
export default {
name: 'ArticleCategoryPreview'
};
</script>
<style>
body {
background: #f0f2f5;
}
.ele-body {
margin: 0 auto;
max-width: 1000px;
}
</style>