diff --git a/config/api.js b/config/api.js
index a33ceb7..43df310 100644
--- a/config/api.js
+++ b/config/api.js
@@ -40,10 +40,8 @@ var api = {
 	ossUpload:function(data,ossthenFun,osscatchFun){
 		//从http://tmp/IX45zGr8kI1Tb1fd2c2b3045e9bfce734869d2024805.png 中
 		//提取 IX45zGr8kI1Tb1fd2c2b3045e9bfce734869d2024805.png 文件名
-		var fileNameArr = data.filePath.split('/').pop();
-		console.log(fileNameArr);
 		//获取文件名
-		var fileName = fileNameArr[1];
+		var fileName = data.filePath.split('/').pop();
 		//获取文件格式
 		var suffixArr = fileName.split('.');
 		var suffix = suffixArr[1];
diff --git a/pagesA/merge/index.vue b/pagesA/merge/index.vue
index 5cad265..874df6e 100644
--- a/pagesA/merge/index.vue
+++ b/pagesA/merge/index.vue
@@ -96,7 +96,7 @@
 									<u-input
 									    placeholder="宽"
 									    border="surround"
-									    v-model="value"
+									    v-model="FormData.w_h_px.w"
 									    @change="change"
 									  ></u-input>
 								</view>
@@ -105,7 +105,7 @@
 									<u-input
 									    placeholder="高"
 									    border="surround"
-									    v-model="value"
+									    v-model="FormData.w_h_px.h"
 									    @change="change"
 									  ></u-input>
 								</view>
@@ -250,15 +250,7 @@
 				selectList:[],
 				selectIndex:0,//默认选第一个
 				
-				//自定义
-				w_h_px:{
-					w:0,
-					h:0,
-				},
-				kb:{
-					min:0,
-					max:0,
-				},
+				//传值
 				FormData:{
 					specs_id:0, //证件照合成规格id
 					portrait_id:0, //用户面部形象id