diff --git a/config/api.js b/config/api.js
index dc052a9..ca5a1a7 100644
--- a/config/api.js
+++ b/config/api.js
@@ -281,5 +281,10 @@ var api = {
 		const app_config = uni.getStorageSync('app_config');
 		return app_config.public_url + url;
 	},
+	
+	getOssurl(){
+		const app_config = uni.getStorageSync('app_config');
+		return app_config.public_url;
+	},
 }
 module.exports = api;
diff --git a/config/unit.js b/config/unit.js
index 329d148..3f4e7cf 100644
--- a/config/unit.js
+++ b/config/unit.js
@@ -4,17 +4,23 @@ var unit ={
 	
 	getImgInfo:function(filePath){
 		function getInfo(resolve, reject) {
-			uni.getImageInfo({
-				src: filePath,
-				success: function (image) {
-					resolve(image);
-				},
-				fail: (res) => {
-					reject(res);
-				},
-			});
+			
+			try {
+			  uni.getImageInfo({
+			  	src: filePath,
+			  	success: function (image) {
+			  		resolve(image);
+			  	},
+			  	fail: (res) => {
+			  		reject(res);
+			  	},
+			  });
+			  return new Promise(getInfo);
+			} catch (error) {
+				console.log(error)
+			}			
 		}
-		return new Promise(getInfo);
+		
 	},
 	
 	compressImg:function(filePath, config = {}){
diff --git a/pagesA/merge/face_1.vue b/pagesA/merge/face_1.vue
index 5278ae8..ac876d3 100644
--- a/pagesA/merge/face_1.vue
+++ b/pagesA/merge/face_1.vue
@@ -127,7 +127,7 @@
 			var _this = this;
 			_this.checkAuth();
 			this.setSuccessFiles();
-			console.log('~~~~~~~~~~~~~~~~~~')
+		
 		},
 
 		methods: {
@@ -245,7 +245,10 @@
 					let address = _date.getFullYear() + '' + (_date.getMonth() + 1) + '' + _date.getDate();
 					let fileName = address + _date.getTime() + ext_name;
 					const img_info = await unit.getImgInfo(filePath);
-
+					if(typeof(img_info) == 'undefined' || !img_info){
+						this.$com.showError('图片格式错误!请重试!');
+						return false;
+					}
 					let {
 						width,
 						height