From 02fcea0225e0f4065f20b3aa13dc0abdb03707b1 Mon Sep 17 00:00:00 2001 From: yuanteng <1876787513@qq.com> Date: Sat, 22 Mar 2025 23:48:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=90=9C=E7=B4=A2=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=BA=86=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=EF=BC=8C=E5=88=A0=E9=99=A4=E4=BA=86=E4=B8=80=E4=BA=9B=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 + src/api/myAxios.ts | 4 +- src/layout/components/Aside.vue | 12 +- src/layout/components/DateDrawer.vue | 80 -------- src/layout/components/richTextUtil.vue | 18 +- src/router/routes.ts | 22 +-- src/utils/formatImgUpload.ts | 4 +- src/utils/imgUpload/ImgListUpload.vue | 2 +- src/utils/imgUpload/ImgSingleUpload.vue | 2 +- src/utils/imgUpload/PreviewImgUpload.vue | 2 +- .../imgUpload/PreviewSingleImgUpload.vue | 2 +- .../MessageCenter.vue | 128 ++++++------- src/views/Commodity/MerchandiseCenter.vue | 176 +++++++++--------- .../CostumeAppointments/ManagementCenter.vue | 21 --- src/views/Coupons/AddCoupons.vue | 88 ++++----- src/views/Coupons/CouponCenter.vue | 129 ++++++------- src/views/Login.vue | 164 ++++++++-------- src/views/OutfitLease/AddOutfit.vue | 1 + src/views/OutfitLease/LeaseOutfitCenter.vue | 14 +- src/views/ServiceType/ProductCenter.vue | 2 +- src/views/User/UserManagement.vue | 76 ++++---- 21 files changed, 438 insertions(+), 511 deletions(-) delete mode 100644 src/layout/components/DateDrawer.vue diff --git a/src/App.vue b/src/App.vue index 326e883..1fb99c6 100644 --- a/src/App.vue +++ b/src/App.vue @@ -11,7 +11,9 @@ import { ElConfigProvider } from 'element-plus' import router from './router'; import zhCn from 'element-plus/es/locale/lang/zh-cn' //引入ElemenetPlus中文 import myAxios from './api/myAxios'; + const isRouterActive = ref(true) + provide('reload', () => { //页面刷新 isRouterActive.value = false nextTick(() => { diff --git a/src/api/myAxios.ts b/src/api/myAxios.ts index 8ad9826..5ff2bfa 100644 --- a/src/api/myAxios.ts +++ b/src/api/myAxios.ts @@ -4,11 +4,11 @@ import router from '../router' const myAxios = axios.create({ withCredentials:true, - baseURL: 'http://localhost:9092/api' + // baseURL: 'http://localhost:9092/api' // baseURL: 'http://123.249.108.160:8888/api' //测试服务器 // baseURL: 'http://154.8.193.216:9092/api', //隋雨霏服务器 // baseURL: 'http://154.8.193.216:9093/api' //隋雨霏服务器测试环境 - // baseURL: 'https://www.carboner.cn:8888/api' + baseURL: 'https://www.carboner.cn:8888/api' }); // 添加请求拦截器 axios.interceptors.request.use(function (config) { diff --git a/src/layout/components/Aside.vue b/src/layout/components/Aside.vue index 7d8b5c2..29a2b7e 100644 --- a/src/layout/components/Aside.vue +++ b/src/layout/components/Aside.vue @@ -70,6 +70,7 @@ import { defineProps } from 'vue'; import emitter from '@/utils/emitter' import { useRouter } from 'vue-router'; import { + More, House, User, Location, @@ -91,7 +92,10 @@ import { Notification, Tickets, Money, - Odometer + Odometer, + Notebook, + Picture, + PictureRounded } from "@element-plus/icons-vue"; defineProps(['send-data']) @@ -130,6 +134,7 @@ onMounted(()=>{ // 创建图标映射表 const iconComponents = { + More, House, User, Location, @@ -151,7 +156,10 @@ const iconComponents = { Notification, Tickets, Money, - Odometer + Odometer, + Notebook, + Picture, + PictureRounded // 添加其他图标组件映射 }; // 过滤掉不需要展示的路由，并调整 layout 的子路由 diff --git a/src/layout/components/DateDrawer.vue b/src/layout/components/DateDrawer.vue deleted file mode 100644 index 636bdb2..0000000 --- a/src/layout/components/DateDrawer.vue +++ /dev/null @@ -1,80 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/layout/components/richTextUtil.vue b/src/layout/components/richTextUtil.vue index 5c747fb..26d4e42 100644 --- a/src/layout/components/richTextUtil.vue +++ b/src/layout/components/richTextUtil.vue @@ -21,7 +21,6 @@ const props = defineProps({ context: String, disableRich: Boolean }) -// const { context } = toRefs(props) //结构context让他变为可写 onMounted(() => { setTimeout(() => { @@ -30,7 +29,12 @@ onMounted(() => { } }, 1500) }) -const toolbarConfig = {} + +const toolbarConfig = { + excludeKeys: [ //去掉富文本部分功能 + "group-video","uploadVideo","insertVideo","todo","codeBlock","insertImage","code" + ] +} const editorConfig = { placeholder: '请输入内容...', @@ -40,6 +44,8 @@ const editorConfig = { editorConfig.readOnly = props.disableRich //控制富文本是否启用 editorConfig.autoFocus = false editorConfig.MENU_CONF['uploadImage'] = { + allowedFileTypes: ['image/*'], //限定只能上传图片格式 + maxFileSize: 1024 * 1024 * 10, //最大图片10M async customUpload(file, insertFn) { const res = await myAxios({ url: '/file/uploadFile', @@ -52,7 +58,7 @@ editorConfig.MENU_CONF['uploadImage'] = { file: file } }) - console.log('图片上传返回值--->',res.data) + // console.log('图片上传返回值--->',res.data) const downloadUrl = 'https://www.carboner.cn:8888/api/file/downloadFile?objectKey='; insertFn(downloadUrl + res.data.data, res.alt, res.href) } @@ -64,14 +70,14 @@ onBeforeUnmount(() => { if (editor == null) return editor.destroy() }) + const handleCreated = (editor) => { editorRef.value = editor // 记录 editor 实例，重要！ + console.log(editor.getAllMenuKeys()) } + const handleChange = (editor) => { //当选项改变时触发emit传值 - // console.log(valueHtml.value) emit('richTextContent', valueHtml.value) - // emit('disableChange',props.disable) - // console.log('html',editor.getHtml()); } diff --git a/src/router/routes.ts b/src/router/routes.ts index f6ecc95..3ba3fe9 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -247,7 +247,7 @@ export const constantRoute = [ component: () => import("@/layout/Manage.vue"), meta: { title: '服装租赁管理', - icon: '', + icon: 'Money', hidden: false }, children: [ @@ -267,7 +267,7 @@ export const constantRoute = [ component: () => import("@/views/OutfitLease/LeaseOutfitCenter.vue"), meta: { title: '租赁产品中心', - icon: '', + icon: 'DataAnalysis', hidden: false } }, @@ -277,7 +277,7 @@ export const constantRoute = [ component: () => import("@/views/OutfitLease/OutfitType.vue"), meta: { title: '服装类别管理', - icon: '', + icon: 'Files', hidden: false } }, @@ -287,7 +287,6 @@ export const constantRoute = [ component: () => import("@/views/OutfitLease/LeaseOutfitDetail.vue"), meta: { title: '租赁服装详情', - icon: '', hidden: true } }, @@ -297,7 +296,7 @@ export const constantRoute = [ component: () => import("@/views/OutfitLease/OutfitLeaseOrderCenter.vue"), meta: { title: '租赁订单中心', - icon: '', + icon: 'DataBoard', hidden: false } }, @@ -307,7 +306,6 @@ export const constantRoute = [ component: () => import("@/views/OutfitLease/LeaseOrderDetail.vue"), meta: { title: '租赁订单详情', - icon: '', hidden: true } } @@ -320,7 +318,7 @@ export const constantRoute = [ component: () => import("@/layout/Manage.vue"), meta: { title: '活动资讯管理', - icon: '', + icon: 'Notebook', hidden: false }, children: [ @@ -340,7 +338,7 @@ export const constantRoute = [ component: () => import("@/views/ActivityMessageManagement/MessageCenter.vue"), meta: { title: '活动资讯中心', - icon: '', + icon: 'DataAnalysis', hidden: false } }, @@ -461,7 +459,7 @@ export const constantRoute = [ component: () => import("@/layout/Manage.vue"), meta: { title: '其他管理', - icon: '', + icon: 'More', hidden: false }, children: [ @@ -471,7 +469,7 @@ export const constantRoute = [ component: () => import("@/views/OtherManagement/EntityCarouseCenter.vue"), meta: { title: '商城轮播图管理', - icon: '', + icon: 'Picture', hidden: false } }, @@ -481,7 +479,7 @@ export const constantRoute = [ component: () => import("@/views/OtherManagement/CourseCarouseCenter.vue"), meta: { title: '课程轮播图管理', - icon: '', + icon: 'PictureRounded', hidden: false } }, @@ -491,7 +489,7 @@ export const constantRoute = [ component: () => import("@/views/OtherManagement/FestivalManagement.vue"), meta: { title: '节日管理', - icon: '', + icon: 'Calendar', hidden: false } } diff --git a/src/utils/formatImgUpload.ts b/src/utils/formatImgUpload.ts index 87a2e1b..885cab3 100644 --- a/src/utils/formatImgUpload.ts +++ b/src/utils/formatImgUpload.ts @@ -1,4 +1,4 @@ //上传链接 -export const uploadUrl : string = 'http://localhost:9092/api/file/uploadFile' -// export const uploadUrl : string= 'https://www.carboner.cn:8888/api/file/uploadFile' +// export const uploadUrl : string = 'http://localhost:9092/api/file/uploadFile' +export const uploadUrl : string= 'https://www.carboner.cn:8888/api/file/uploadFile' export const downloadUrl : string = 'https://www.carboner.cn:8888/api/file/downloadFile?objectKey=' diff --git a/src/utils/imgUpload/ImgListUpload.vue b/src/utils/imgUpload/ImgListUpload.vue index 8232fcd..d2208dc 100644 --- a/src/utils/imgUpload/ImgListUpload.vue +++ b/src/utils/imgUpload/ImgListUpload.vue @@ -43,7 +43,7 @@ const compressImage =(file: any)=> { //图片压缩方法 // console.log('compressImage',file) return new Promise((resolve, reject) => { new Compressor(file.file, { - quality: 0.3, //压缩质量，越高文件越大 + quality: 0.2, //压缩质量，越高文件越大 success(result) { console.log('res--->',result) // 压缩成功后的处理 diff --git a/src/utils/imgUpload/ImgSingleUpload.vue b/src/utils/imgUpload/ImgSingleUpload.vue index dddb570..0892010 100644 --- a/src/utils/imgUpload/ImgSingleUpload.vue +++ b/src/utils/imgUpload/ImgSingleUpload.vue @@ -42,7 +42,7 @@ const compressImage =(file: any)=> { //图片压缩方法 // console.log('compressImage',file) return new Promise((resolve, reject) => { new Compressor(file.file, { - quality: 0.3, //压缩质量，越高文件越大 + quality: 0.2, //压缩质量，越高文件越大 success(result) { // console.log('res--->',result) // 压缩成功后的处理 diff --git a/src/utils/imgUpload/PreviewImgUpload.vue b/src/utils/imgUpload/PreviewImgUpload.vue index 94dfe47..94fe0d8 100644 --- a/src/utils/imgUpload/PreviewImgUpload.vue +++ b/src/utils/imgUpload/PreviewImgUpload.vue @@ -57,7 +57,7 @@ const compressImage =(file: any)=> { //图片压缩方法 // console.log('compressImage',file) return new Promise((resolve, reject) => { new Compressor(file.file, { - quality: 0.3, //压缩质量，越高文件越大 + quality: 0.2, //压缩质量，越高文件越大 success(result) { console.log('res--->',result) // 压缩成功后的处理 diff --git a/src/utils/imgUpload/PreviewSingleImgUpload.vue b/src/utils/imgUpload/PreviewSingleImgUpload.vue index 27a2bcf..fcc081d 100644 --- a/src/utils/imgUpload/PreviewSingleImgUpload.vue +++ b/src/utils/imgUpload/PreviewSingleImgUpload.vue @@ -55,7 +55,7 @@ const compressImage =(file: any)=> { //图片压缩方法 // console.log('compressImage',file) return new Promise((resolve, reject) => { new Compressor(file.file, { - quality: 0.3, //压缩质量，越高文件越大 + quality: 0.2, //压缩质量，越高文件越大 success(result) { console.log('res--->',result) // 压缩成功后的处理 diff --git a/src/views/ActivityMessageManagement/MessageCenter.vue b/src/views/ActivityMessageManagement/MessageCenter.vue index cc4e666..68aabde 100644 --- a/src/views/ActivityMessageManagement/MessageCenter.vue +++ b/src/views/ActivityMessageManagement/MessageCenter.vue @@ -1,73 +1,57 @@ @@ -87,7 +71,7 @@ const searchParams: any = ref({ //封装分页 sortField: "id", //根据ID分类 sortOrder: "descend" //降序 }) -const productName = ref(''); +const messageName = ref(''); const tableData: any = ref([]); //实体类商品表格 const reload: any = inject("reload") //页面重新刷新 @@ -167,7 +151,11 @@ const selectChange = (selection: any, row: any) => { //selction是对象数组 } //查询 -const onSearch = (value: string) => {} +const onSearch = (value: string) => { + searchParams.value.title = value + searchParams.value.current = 1 + getMessageList() +} \ No newline at end of file diff --git a/src/views/Coupons/CouponCenter.vue b/src/views/Coupons/CouponCenter.vue index e95e624..abe258d 100644 --- a/src/views/Coupons/CouponCenter.vue +++ b/src/views/Coupons/CouponCenter.vue @@ -1,60 +1,60 @@