@@ -62,7 +62,6 @@
-
\ No newline at end of file
diff --git a/src/layout/components/Header.vue b/src/layout/components/Header.vue
index 880f984..c2e5761 100644
--- a/src/layout/components/Header.vue
+++ b/src/layout/components/Header.vue
@@ -16,7 +16,7 @@
- ![]()
+ ![]()
@@ -35,13 +35,15 @@
\ No newline at end of file
diff --git a/src/utils/imgUpload/ImgSingleUpload.vue b/src/utils/imgUpload/ImgSingleUpload.vue
new file mode 100644
index 0000000..f9143b3
--- /dev/null
+++ b/src/utils/imgUpload/ImgSingleUpload.vue
@@ -0,0 +1,103 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/utils/imgUpload/PreviewImgUpload.vue b/src/utils/imgUpload/PreviewImgUpload.vue
new file mode 100644
index 0000000..94dfe47
--- /dev/null
+++ b/src/utils/imgUpload/PreviewImgUpload.vue
@@ -0,0 +1,148 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/utils/imgUpload/PreviewSingleImgUpload.vue b/src/utils/imgUpload/PreviewSingleImgUpload.vue
new file mode 100644
index 0000000..27a2bcf
--- /dev/null
+++ b/src/utils/imgUpload/PreviewSingleImgUpload.vue
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/ActivityMessageManagement/AddMessage.vue b/src/views/ActivityMessageManagement/AddMessage.vue
new file mode 100644
index 0000000..f0a9aaf
--- /dev/null
+++ b/src/views/ActivityMessageManagement/AddMessage.vue
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/ActivityMessageManagement/MessageCenter.vue b/src/views/ActivityMessageManagement/MessageCenter.vue
new file mode 100644
index 0000000..cc4e666
--- /dev/null
+++ b/src/views/ActivityMessageManagement/MessageCenter.vue
@@ -0,0 +1,178 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+
+
+ 重置
+
+
+
+
+
+
+ {{ $index + 1 }}
+
+
+
+
+
+
+
+
+ 详情
+
+
+ 编辑
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/ActivityMessageManagement/SingleMessageDetail.vue b/src/views/ActivityMessageManagement/SingleMessageDetail.vue
new file mode 100644
index 0000000..d05f670
--- /dev/null
+++ b/src/views/ActivityMessageManagement/SingleMessageDetail.vue
@@ -0,0 +1,139 @@
+
+
+
+ 搜索
+
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/Commodity/AddProduct.vue b/src/views/Commodity/AddProduct.vue
index 71eb3a8..5ae63b0 100644
--- a/src/views/Commodity/AddProduct.vue
+++ b/src/views/Commodity/AddProduct.vue
@@ -7,24 +7,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+
+
+ 重置
+
+
+
-
+
-
-
-
-
-
+
-
+
@@ -35,7 +28,7 @@
style="width: 300px;" />
+
@@ -60,7 +53,8 @@
- 添加
+ 添加
+ 删除
添加类别
@@ -25,9 +26,6 @@
-
-
-
-
-
-
-
+
-
@@ -63,21 +56,21 @@
-
\ No newline at end of file
diff --git a/src/views/CostumeAppointments/ManagementCenter.vue b/src/views/CostumeAppointments/ManagementCenter.vue
index 1ea15f8..e4cf23f 100644
--- a/src/views/CostumeAppointments/ManagementCenter.vue
+++ b/src/views/CostumeAppointments/ManagementCenter.vue
@@ -66,7 +66,7 @@
@@ -117,10 +117,10 @@
-
+
详情
-
+
编辑
@@ -143,71 +143,6 @@
:small="null" :disabled="null" :background="null" layout="total, sizes, prev, pager, next, jumper"
:total="total" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -249,13 +184,14 @@
\ No newline at end of file
diff --git a/src/views/CostumeAppointments/OutfitOrderDetail.vue b/src/views/CostumeAppointments/OutfitOrderDetail.vue
index ea2a48b..2079d66 100644
--- a/src/views/CostumeAppointments/OutfitOrderDetail.vue
+++ b/src/views/CostumeAppointments/OutfitOrderDetail.vue
@@ -75,7 +75,7 @@
服装价格
- ![]()
![]()
{{ photoProductsSnapshot.name }}
{{ photoProductsSnapshot.categoryName }}
@@ -94,6 +94,7 @@ import { onMounted, ref } from "vue";
import myAxios from "@/api/myAxios";
import { SuccessInfo, ErrorInfo } from "@/utils/messageInfo";
import { useRoute } from "vue-router";
+import { downloadUrl } from '@/utils/formatImgUpload'
const route = useRoute();
const orderObj: any = ref({}) //订单对象
diff --git a/src/views/Coupons/AddCoupons.vue b/src/views/Coupons/AddCoupons.vue
index 8c9b1dc..a5a46e9 100644
--- a/src/views/Coupons/AddCoupons.vue
+++ b/src/views/Coupons/AddCoupons.vue
@@ -40,7 +40,7 @@
\ No newline at end of file
diff --git a/src/views/OtherManagement/EntityCarouseCenter.vue b/src/views/OtherManagement/EntityCarouseCenter.vue
index e97026f..8171ecd 100644
--- a/src/views/OtherManagement/EntityCarouseCenter.vue
+++ b/src/views/OtherManagement/EntityCarouseCenter.vue
@@ -1,70 +1,64 @@
-
-
-
- ![]()
+ ![]()
@@ -60,22 +42,22 @@
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/views/Refund/Refund.vue b/src/views/Refund/Refund.vue
index 77239c1..0a1d731 100644
--- a/src/views/Refund/Refund.vue
+++ b/src/views/Refund/Refund.vue
@@ -1,6 +1,5 @@
-
-
+
重置
@@ -30,8 +27,8 @@
+
-
-
-
-
-
-
-
+
+
+
-
+
@@ -30,8 +23,8 @@
-
-
+
@@ -44,7 +37,7 @@
-
@@ -52,13 +45,12 @@
\ No newline at end of file
diff --git a/src/views/ServiceType/ProductCenter.vue b/src/views/ServiceType/ProductCenter.vue
index 279b13b..12e713a 100644
--- a/src/views/ServiceType/ProductCenter.vue
+++ b/src/views/ServiceType/ProductCenter.vue
@@ -1,6 +1,5 @@
-
-
+
@@ -114,57 +113,7 @@
:small="null" :disabled="null" :background="null" layout="total, sizes, prev, pager, next, jumper"
:total="total" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
import { ElMessage , type UploadProps , genFileId ,type UploadRawFile } from 'element-plus';
-import {ref, onMounted, inject, toRaw} from 'vue';
+import {ref, onMounted, inject} from 'vue';
import myAxios from "@/api/myAxios";
import calendarUtil from '@/layout/components/calendarUtil.vue';
import emitter from "@/utils/emitter";
import { useRouter } from "vue-router";
+import { downloadUrl } from '@/utils/formatImgUpload'
const router = useRouter(); //路由
const total = ref(0); //总页数
@@ -245,16 +195,9 @@ const searchParams: any = ref({ //封装分页
})
const tableData : any= ref([]);
const appointmentDateArr : any = ref([])
-const disabled = ref(true)
-const title = ref('') //表单名字
const productName = ref('');
-const DialogVisible = ref(false);
const state = ref(''); //根据商品上架状态select栏
-const editForm : any = ref({});
-const reload : any = inject("reload") //页面重新刷新
-const fileSimple = ref()
-const uploadProductImg : any = ref() //图片上传的ref绑定
-const uploadProductDetail : any = ref() //图片上传的ref绑定
+const reload : any = inject("reload") //页面重新刷新
//抽屉变量
const drawer = ref(false) //抽屉打开
const drawerDate : any = ref({}) //当前日期、时间段人数信息
@@ -313,22 +256,7 @@ const getProductList = async () => {
});
}
}
-const saveEdit = async () => { //编辑商品
- const res = await myAxios.post('/goods/service/single/update',{...editForm.value})
- if(res.data.code === 1) {
- DialogVisible.value = false
- ElMessage({
- type: 'success',
- message: '更新成功'
- })
- } else {
- ElMessage({
- type: 'error',
- message: '请检查字段是否正确填写'
- })
- }
- console.log(res.data);
-}
+
const searchByState = (event : any) => { //通过商品是否上架/下架搜索
searchParams.value.isShelves = event
searchParams.value.current = 1
@@ -356,11 +284,9 @@ const ReviseOrView = (index: number, row: any , flag : number) => {
flag: flag
}
})
- //flag值不同显示不同内容 disabled开启和关闭
- flag ? (title.value = "编辑商品" , disabled.value = false) : (title.value = "商品详情" , disabled.value = true)
- editForm.value = JSON.parse(JSON.stringify(row));
};
-//下架商品(待优化，有问题，逻辑有问题)
+
+//下架商品
const handleOff = async (row: any) => {
console.log(row.isShelves);
const res = await myAxios.post('/goods/service/shelves',{id: row.id})
@@ -385,45 +311,8 @@ const handleCurrentChange = (Current: any) => {
//重置按钮
const reset = () => {
reload()
-};
-// 上传图片移除 --逻辑上移除
-const handleRemove: UploadProps['onRemove'] = (uploadFile, uploadFiles) => {
- console.log(uploadFile, uploadFiles)
-}
-const Exceed_ProductImg: UploadProps['onExceed'] = (files , flag) => { //覆盖商品照片
- uploadProductImg.value!.clearFiles()
- const file = files[0] as UploadRawFile
- file.uid = genFileId()
- uploadProductImg.value!.handleStart(file)
-}
-const Exceed_ProductDetail: UploadProps['onExceed'] = (files) => { //覆盖商品详情图片
- uploadProductDetail.value!.clearFiles()
- const file = files[0] as UploadRawFile
- file.uid = genFileId()
- uploadProductDetail.value!.handleStart(file)
-}
-// 图片上传请求 此请求只要选择了图片，就会默认上传
-const handleChange = async (file: any, flag: number) => {
- fileSimple.value = file
- let formData = new FormData() //这一步很重要 创建一个FormData对象
- formData.append("file", fileSimple.value.raw) //fileSimple.value.raw 才是文件主体 将其以文件的格式插入formData
- const res = await myAxios({ //编写请求，与以前的请求不同，这一次要指定好头部类型和文件类型
- url: '/file/uploadFile',
- method: 'post',
- headers: {
- 'content-Type': 'multipart/form-data'
- },
- data: {
- biz: "test",
- file: formData.get("file") // 取出formData对象中的file
- }
- })
- if (res.data.code === 1) {
- //三元运算 当flag为0时，赋值给商品图片 flag为1时，赋值给详情图片
- flag ? editForm.value.detailImg = res.data.data : editForm.value.goodImg = res.data.data
- console.log('res--->',res.data.data)
- }
}
+
const onSearch = (data : String)=>{ //搜索按钮方法
searchParams.value.name = data
searchParams.value.current = 1
@@ -635,7 +524,8 @@ const submitDate = async ()=> { //提交日期方法
\ No newline at end of file
diff --git a/src/views/ServiceType/ServiceProductDetail.vue b/src/views/ServiceType/ServiceProductDetail.vue
index 9f2f9fd..3d3ec67 100644
--- a/src/views/ServiceType/ServiceProductDetail.vue
+++ b/src/views/ServiceType/ServiceProductDetail.vue
@@ -2,22 +2,16 @@
-
-
-
-
-
-
-
-
-
- 取消
- 确认
-
-
diff --git a/src/views/test.vue b/src/views/test.vue
index 55cebb8..be24b9a 100644
--- a/src/views/test.vue
+++ b/src/views/test.vue
@@ -1,128 +1,94 @@
-
-
-
-
-
-
-
- Group 1
- Option 1
- Option 2
-
-
- Option 3
-
-
- Option4
- Option 4-1
-
-
-
-
-
- Group 1
- Option 1
- Option 2
-
-
- Option 3
-
-
- Option 4
- Option 4-1
-
-
-
-
-
- Group 1
- Option 1
- Option 2
-
-
- Option 3
-
-
- Option 4
- Option 4-1
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 看看删除后的图片
+const goodImgStr = ref('') //图片字符串
+const goodImgArr= ref([]) //后端数据库返回的图片objectKey
+const dialogImageUrl = ref('')
+const dialogVisible = ref(false)
+const loading = ref(false)
-
\ No newline at end of file
+//图片上传方法
+const customUpload = async (e:any) => {
+ loading.value = true
+ const res = await myAxios({
+ url: e.action,
+ method: 'post',
+ headers: {
+ 'Content-Type': 'multipart/form-data',
+ },
+ data: {
+ biz: "test",
+ file: e.file
+ }
+ })
+ console.log('图片上传结果--->',res.data)
+ if(res.data.code === 1) {
+ goodImgArr.value.push(res.data.data)
+ loading.value = false
+ }
+}
+
\ No newline at end of file
diff --git a/tsconfig.app.json b/tsconfig.app.json
index b59170f..98f11ea 100644
--- a/tsconfig.app.json
+++ b/tsconfig.app.json
@@ -1,6 +1,6 @@
{
"extends": "@vue/tsconfig/tsconfig.dom.json",
- "include": ["env.d.ts", "src/**/*"],
+ "include": ["env.d.ts", "src/**/*","src/**/*.ts"],
"exclude": ["src/**/__tests__/*"],
"compilerOptions": {
"composite": true,
元
-
+
@@ -46,7 +39,7 @@
@@ -46,10 +44,9 @@
- ![]()
+ ![]()
-
修改类别
@@ -64,6 +61,7 @@
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/views/CostumeAppointments/AddCostumes.vue b/src/views/CostumeAppointments/AddCostumes.vue
index 1c79fb4..8e299a3 100644
--- a/src/views/CostumeAppointments/AddCostumes.vue
+++ b/src/views/CostumeAppointments/AddCostumes.vue
@@ -2,20 +2,13 @@
移动端预览
-
+
- ![]()
+ ![]()
- ![服装图标]()
-
- 元
-
- ![商品图标]()
-
-
-
-
- ![]()
-
-
-
- 编辑
-
-
- 删除
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/views/OtherManagement/FestivalManagement.vue b/src/views/OtherManagement/FestivalManagement.vue
index d4b62a3..7ec6415 100644
--- a/src/views/OtherManagement/FestivalManagement.vue
+++ b/src/views/OtherManagement/FestivalManagement.vue
@@ -6,27 +6,10 @@
-
-
-
-
+
-
-
-
+
@@ -38,14 +21,13 @@
+
- 搜索
- 重置
-
-
-
-
- 批量删除
-
-
-
-
-
-
+
+
+
+ ![]()
+
+
+
+ 编辑
+
+
+ 删除
+
+
+
+
+
+
-
+ 添加图片
+
+
+ 批量删除
+
+
+
+
+
+
-
-
移动端预览
-
+
- ![]()
+ ![]()
- ![商品图标]()
-
- 元
-
- ![商品图标]()
-
- 移动端预览
-
+
-
+
-
-
-
-
+
-
-
-
+
@@ -53,21 +47,18 @@
@@ -158,11 +157,15 @@ const getInfo = (info: any) => { //富文本赋值
overflow-y: auto;
word-break: break-all;
width: 400px;
+ min-width: 400px;
margin-right: 10px;
}
.form-container {
width: 700px;
+ min-width: 700px;
+ height: 800px;
+ overflow: auto;
/* margin: 0 auto; */
}
.form {
@@ -186,4 +189,9 @@ const getInfo = (info: any) => { //富文本赋值
display: flex;
justify-content: space-around;
}
+
+.titleText {
+ text-align: center;
+ margin: 0 auto;
+}
\ No newline at end of file
diff --git a/src/views/User/PersonalCenter.vue b/src/views/User/PersonalCenter.vue
index c426bb1..86a68b3 100644
--- a/src/views/User/PersonalCenter.vue
+++ b/src/views/User/PersonalCenter.vue
@@ -1,112 +1,72 @@
-
\ No newline at end of file
diff --git a/src/views/User/SingleUserDetail.vue b/src/views/User/SingleUserDetail.vue
new file mode 100644
index 0000000..2883068
--- /dev/null
+++ b/src/views/User/SingleUserDetail.vue
@@ -0,0 +1,91 @@
+
+
-
-
-
-
- ![]()
+ ![]()
{{ scope.row.userRole === 'boss' ? '管理员' : '小程序用户' }}
-
- 详情
- 编辑
+ 详情
+ 编辑
@@ -37,53 +35,15 @@
@size-change="handleSizeChange" @current-change="handleCurrentChange" :small="null" background
layout="total, sizes, prev, pager, next, jumper" :total="total" />
-
-
@@ -31,12 +25,12 @@
+
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
- {{ btnText }}
确认
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/User/Upload.vue b/src/views/User/Upload.vue
deleted file mode 100644
index 8d2971b..0000000
--- a/src/views/User/Upload.vue
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确认
+
+ 图片url: {{ imgUrl }}
-
-
-
-
-
\ No newline at end of file
diff --git a/src/views/User/UserManagement.vue b/src/views/User/UserManagement.vue
index 52e5d98..377cf79 100644
--- a/src/views/User/UserManagement.vue
+++ b/src/views/User/UserManagement.vue
@@ -15,19 +15,17 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-