diff --git a/config/api.js b/config/api.js
index ca5a1a7..a33ceb7 100644
--- a/config/api.js
+++ b/config/api.js
@@ -40,7 +40,7 @@ var api = {
 	ossUpload:function(data,ossthenFun,osscatchFun){
 		//从http://tmp/IX45zGr8kI1Tb1fd2c2b3045e9bfce734869d2024805.png 中
 		//提取 IX45zGr8kI1Tb1fd2c2b3045e9bfce734869d2024805.png 文件名
-		var fileNameArr = data.filePath.split('//tmp/');
+		var fileNameArr = data.filePath.split('/').pop();
 		console.log(fileNameArr);
 		//获取文件名
 		var fileName = fileNameArr[1];
diff --git a/pagesA/merge/index.vue b/pagesA/merge/index.vue
index f90eef3..5cad265 100644
--- a/pagesA/merge/index.vue
+++ b/pagesA/merge/index.vue
@@ -249,7 +249,30 @@
 				//选择面部档案
 				selectList:[],
 				selectIndex:0,//默认选第一个
-
+				
+				//自定义
+				w_h_px:{
+					w:0,
+					h:0,
+				},
+				kb:{
+					min:0,
+					max:0,
+				},
+				FormData:{
+					specs_id:0, //证件照合成规格id
+					portrait_id:0, //用户面部形象id
+					template_id:0,//证件照合成模版id
+					w_h_px:{
+						w:0,
+						h:0,
+					},
+					kb:{
+						min:0,
+						max:0,
+					},
+					image_suffix:0,
+				},
 			}
 		},
 		onLoad(){
@@ -423,6 +446,7 @@
 					 break;
 					 //选择面部档案 跳转到选择模板信息
 					 case 'select_show':
+						_this.FormData.portrait_id = _this.selectList[_this.selectIndex].id;
 					 	uni.navigateTo({
 					 		url:'/pagesA/merge/idcard'
 					 	});
@@ -439,6 +463,7 @@
 			//判断选择
 			checkHave(item){
 				var _this = this;
+				_this.FormData.specs_id = item.id;
 				if(!(item.w_h_mm.w == 0 && item.w_h_mm.h == 0 && item.w_h_px.w == 0 && item.w_h_px.h == 0))
 				{
 					var post = {};