增加图片编辑功能

components/fs-upload/fs-upload.vue

@@ -114,6 +114,7 @@ const props = defineProps({
 		type: String,
 		default: 'filePath'
 	},
+	editable: Boolean,
 	cloudUpload: Boolean
 })
 const emit = defineEmits(['update:modelValue'])
@@ -140,7 +141,8 @@ const upload = async () => {
 			url: props.action || proxy.$uploadUrl,
 			name: props.name,
 			header: props.header,
-			formData: props.formData
+			formData: props.formData,
+			editable: props.editable
 		},
 		props.cloudUpload
 	).then(res => {

pages/my/userInfo.vue

@@ -51,7 +51,8 @@ const handleUpload = () => {
 		.chooseAndUploadImage(
 			{},
 			{
-				url: proxy.$uploadUrl
+				url: proxy.$uploadUrl,
+				editable: true
 			}
 		)
 		.then(res => {

utils/config.js

@@ -1,4 +1,4 @@
-const baseUrl = process.env.NODE_ENV === 'development' ? 'http://johnny-ttj.vaiwan.com' : 'https://zhswapi.sxidc.com'
+const baseUrl = process.env.NODE_ENV === 'development' ? '' : ''
 
 const config = {
 	baseUrl,

utils/utils.js

@@ -42,6 +42,25 @@ export default {
 		return uuid.join('')
 	},
 	upload(data) {
+		if (data.editable) {
+			return new Promise(resolve => {
+				wx.editImage({
+					src: data.filePath,
+					success(res) {
+						this.uploadFile({
+							...data,
+							filePath: res.tempFilePath
+						}).then(res => {
+							resolve(res)
+						})
+					}
+				})
+			})
+		} else {
+			return this.uploadFile(data)
+		}
+	},
+	uploadFile(data) {
 		return uni.uploadFile({
 			url: this.isHttp(data.url) ? data.url : config.apiBaseUrl + data.url,
 			name: data.name || 'file',