diff --git a/public/favicon.ico b/public/favicon.ico index d37092d..17360f3 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/favicon_old.ico b/public/favicon_old.ico new file mode 100644 index 0000000..d37092d Binary files /dev/null and b/public/favicon_old.ico differ diff --git a/src/assets/logo/logo.png b/src/assets/logo/logo.png index 0b4adeb..22f183a 100644 Binary files a/src/assets/logo/logo.png and b/src/assets/logo/logo.png differ diff --git a/src/assets/logo/logo_old.png b/src/assets/logo/logo_old.png new file mode 100644 index 0000000..0b4adeb Binary files /dev/null and b/src/assets/logo/logo_old.png differ diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue index bbae7f9..0b9c83f 100644 --- a/src/components/ImageUpload/index.vue +++ b/src/components/ImageUpload/index.vue @@ -147,7 +147,8 @@ export default { handleUploadSuccess(res) { this.fileList.push({ name: res.fileName, - url: process.env.VUE_APP_BASE_API + res.fileName, + // url: process.env.VUE_APP_BASE_API + res.fileName, + url: res.url, }); this.$emit('input', this.listToString(this.fileList)); this.$emit('change', this.listToString(this.fileList)); @@ -185,7 +186,9 @@ export default { const isValidSize = await this.checkImageSize(file, this.fileWidth, this.fileHeight); if (!isValidSize) { this.$message.error( - `上传图片不符合要求,尺寸要小于:宽${this.fileWidth ? this.fileWidth + 'px' : '不限制'},高${this.fileHeight ? this.fileHeight + 'px' : '不限制'}` + `上传图片不符合要求,尺寸要小于:宽${this.fileWidth ? this.fileWidth + 'px' : '不限制'},高${ + this.fileHeight ? this.fileHeight + 'px' : '不限制' + }` ); return Promise.reject(); } diff --git a/src/views/agriculture/batch/index.vue b/src/views/agriculture/batch/index.vue index 17c7519..ed8f3bd 100644 --- a/src/views/agriculture/batch/index.vue +++ b/src/views/agriculture/batch/index.vue @@ -53,10 +53,10 @@ - + diff --git a/src/views/agriculture/germplasm/index.vue b/src/views/agriculture/germplasm/index.vue index 7e432ee..287a455 100644 --- a/src/views/agriculture/germplasm/index.vue +++ b/src/views/agriculture/germplasm/index.vue @@ -32,10 +32,10 @@ - + @@ -101,7 +101,7 @@ - + @@ -185,7 +185,7 @@ export default { cropEnName: [{ required: true, message: '作物英文名称不能为空', trigger: 'blur' }], germplasmName: [{ required: true, message: '种质名称不能为空', trigger: 'blur' }], germplasmEnName: [{ required: true, message: '种质英文名称不能为空', trigger: 'blur' }], - germplasmImg: [{ required: true, message: '种质图片不能为空', trigger: 'blur' }], + germplasmImg: [{ required: true, message: '种植图片不能为空', trigger: 'blur' }], germplasmDes: [{ required: true, message: '宣传语不能为空', trigger: 'blur' }], }, };