diff --git a/.env.development b/.env.development index d84cc4f..a3101d9 100644 --- a/.env.development +++ b/.env.development @@ -3,5 +3,7 @@ ENV = 'development' # 本地环境接口地址 # VITE_API_URL = 'http://192.168.3.200:8808/' -VITE_API_URL = 'http://localhost:8808/' +# VITE_API_URL = 'http://localhost:8808/' +VITE_API_URL = 'http://192.168.3.11:8808/' + diff --git a/src/utils/request.ts b/src/utils/request.ts index 7497982..b13d68e 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -22,8 +22,9 @@ const service: AxiosInstance = axios.create({ const newService: AxiosInstance = axios.create({ // baseURL: 'http://192.168.3.95:8000/', // baseURL: 'http://192.168.3.49:8000/', - baseURL: 'http://localhost:8000/', + // baseURL: 'http://localhost:8000/', // baseURL: 'http://192.168.3.200:8000/', + baseURL: 'http://192.168.3.11:8000/', timeout: 50000, headers: { 'Content-Type': 'application/json' }, paramsSerializer: { @@ -64,9 +65,9 @@ const performLogout = () => { Session.clear(); localStorage.clear(); isHandlingTokenExpired = false; - // 跳转到登录页，确保完全刷新 + // 跳转到后台管理登录页，确保完全刷新 setTimeout(() => { - window.location.href = '/'; + window.location.href = '/login'; }, 500); }; diff --git a/src/views/system/tenant/component/editTenant.vue b/src/views/system/tenant/component/editTenant.vue index e877f5b..3fa018a 100644 --- a/src/views/system/tenant/component/editTenant.vue +++ b/src/views/system/tenant/component/editTenant.vue @@ -74,18 +74,18 @@
- +
点击上传营业执照
+ 删除
支持 jpg、png 格式，文件大小不超过 2MB
@@ -109,6 +109,7 @@ import { Plus } from '@element-plus/icons-vue'; import { addTenant, editTenant } from '/@/api/system/tenant'; import { pcTextArr,provinceAndCityData } from 'element-china-area-data'; import { getUpFileUrl } from '/@/utils/gfast'; +import { uploadAssetImage } from '/@/api/assets/asset'; // 定义父组件传递的事件 const emit = defineEmits(['getTenantList']); @@ -118,8 +119,9 @@ const formRef = ref(null); // 省市数据（使用 element-china-area-data） const cityOptions = ref([]); -// 单独定义文件对象，避免reactive深层代理导致FormData识别错误 -const fileRaw = ref(null); +// 图片上传相关 +const fileAddressPrefix = ref(''); +const imagePreview = ref(''); const initCityData = () => { const data = JSON.parse(JSON.stringify(provinceAndCityData)); @@ -243,6 +245,14 @@ const openDialog = (row?: any) => { confirmPassword: '', businessLicense: row.businessLicense, }; + // 图片预览回显 + if (row.businessLicense) { + // 设置 fileAddressPrefix（如果后端返回了） + if (row.fileAddressPrefix) { + fileAddressPrefix.value = row.fileAddressPrefix; + } + imagePreview.value = formatImageUrl(row.businessLicense); + } } state.isShowDialog = true; }; @@ -282,37 +292,21 @@ const onSubmit = () => { submitForm.cityCode = ''; } - // 转换为FormData - const formData = new FormData(); - for (const key in submitForm) { - // 如果是文件字段，跳过（后面单独处理） - if (key === 'businessLicense') continue; - formData.append(key, submitForm[key]); - } - // 添加文件 - if (fileRaw.value) { - // 【重要】必须append raw file(二进制文件流)，不能是element-plus的uploadFile包装对象 - // 否则后端接收到的会是 { uid: ..., status: ... } 这样的json结构 - formData.append('businessLicense', fileRaw.value); - } else if (submitForm.businessLicense && !submitForm.businessLicense.startsWith('blob:')) { - // 如果没有新文件，且原值不是blob预览地址，则传递原url字符串 - formData.append('businessLicense', submitForm.businessLicense); - } - + // 图片已通过 uploadAssetImage 接口上传，businessLicense 存储的是相对路径 + // 直接提交 JSON 对象 if (state.ruleForm.id === 0) { - addTenant(formData).then(() => { + addTenant(submitForm).then(() => { ElMessage.success('添加成功'); closeDialog(); emit('getTenantList'); }); } else { - // 过滤掉密码字段，或者后端接口决定是否更新密码 - // 根据需求，修改时不能修改密码 - if (formData.has('userPassword')) formData.delete('userPassword'); - if (formData.has('confirmPassword')) formData.delete('confirmPassword'); - if (formData.has('userName')) formData.delete('userName'); + // 修改时不能修改密码和账号 + delete submitForm.userPassword; + delete submitForm.confirmPassword; + delete submitForm.userName; - editTenant(formData).then(() => { + editTenant(submitForm).then(() => { ElMessage.success('修改成功'); closeDialog(); emit('getTenantList'); @@ -336,23 +330,63 @@ const resetForm = () => { businessLicense: '', }; state.passwordStrength = 0; - fileRaw.value = null; + imagePreview.value = ''; }; -// 文件改变时触发 -const handleFileChange: UploadProps['onChange'] = (uploadFile) => { - if (uploadFile.raw) { - fileRaw.value = uploadFile.raw; - state.ruleForm.businessLicense = URL.createObjectURL(uploadFile.raw); +// 格式化图片 URL +const formatImageUrl = (url?: string) => { + if (!url) return ''; + if (/^https?:\/\//i.test(url)) return url; + if (/^blob:/i.test(url)) return url; + return `${fileAddressPrefix.value || ''}${url}`; +}; + +// 上传图片并返回URL +const uploadImage = async (file: File): Promise => { + const res: any = await uploadAssetImage(file); + + // 获取并设置 fileAddressPrefix + if (res.fileAddressPrefix) { + fileAddressPrefix.value = res.fileAddressPrefix; + } else if (res.data && typeof res.data === 'object' && res.data.fileAddressPrefix) { + fileAddressPrefix.value = res.data.fileAddressPrefix; } + + // 获取 fileURL + if (res.fileURL) return res.fileURL; + if (res.data && typeof res.data === 'object') { + if (res.data.fileURL) return res.data.fileURL; + if (res.data.url) return res.data.url; + } + if (typeof res.data === 'string') return res.data; + return ''; +}; + +// 处理图片上传 +const handleImageUpload = async (options: any) => { + try { + const url = await uploadImage(options.file); + if (url) { + state.ruleForm.businessLicense = url; + imagePreview.value = formatImageUrl(url); + } + } catch (error) { + ElMessage.error('图片上传失败'); + } +}; + +// 删除图片 +const removeImage = () => { + state.ruleForm.businessLicense = ''; + imagePreview.value = ''; }; const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => { if (rawFile.type !== 'image/jpeg' && rawFile.type !== 'image/png') { - ElMessage.error('Avatar picture must be JPG/PNG format!'); + ElMessage.error('图片格式必须为 JPG/PNG!'); return false; } else if (rawFile.size / 1024 / 1024 > 2) { - ElMessage.error('Avatar picture size can not exceed 2MB!'); + ElMessage.error('图片大小不能超过 2MB!'); return false; } return true;