Merge remote-tracking branch 'origin/master'

common/utils/mpi.js

@@ -9,17 +9,25 @@ mpi.uploadFile = (count = 1) => {
 			sizeType: ['compressed'],
 			sourceType: ['album', 'camera'],
 			success: function(res) {
-				uni.uploadFile({
-					url: `${Global.baseUrl}/putObject`, //仅为示例，非真实的接口地址
-					filePath: res.tempFilePaths[0],
-					name: 'file',
-					success: (uploadFileRes) => {
-						resolve(uploadFileRes.data)
-					},
-					fail: () => {
-						reject(err)
-					}
-				});
+				if (res.tempFiles[0].size > 3145728){
+					uni.showToast({
+						title: "上传图片大小不能超过3M",
+						icon: "none"
+					})
+					return;
+				} else {
+					uni.uploadFile({
+						url: `${Global.baseUrl}/putObject`, //仅为示例，非真实的接口地址
+						filePath: res.tempFilePaths[0],
+						name: 'file',
+						success: (uploadFileRes) => {
+							resolve(uploadFileRes.data)
+						},
+						fail: () => {
+							reject(err)
+						}
+					});
+				}
 			}
 		});
 	})