From d2b6258c72af99c4c949f423099c36d1569f2937 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期三, 26 十二月 2018 14:34:56 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/mobil/batt-edit2.html |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/gx_tieta/WebRoot/mobil/batt-edit2.html b/gx_tieta/WebRoot/mobil/batt-edit2.html
index a3b10e8..f996126 100644
--- a/gx_tieta/WebRoot/mobil/batt-edit2.html
+++ b/gx_tieta/WebRoot/mobil/batt-edit2.html
@@ -516,7 +516,7 @@
 						StationName1 : $("#mainteArea").val(),		// 鐪�
 						StationName2 : $("#city").val(),		// 甯�
 						StationName5 : $("#country").val(),		// 鍖�/鍘�
-						homeName : $("#homeName").val(),		// 鏈烘埧鍚嶇О
+						StationName3 : $("#homeName").val(),		// 鏈烘埧鍚嶇О
 						StationName4 : $("#StationName4").val(),		// 璁惧鍚嶇О
 						StationIp : $("#StationIp").val(),				//鏈烘埧ip
 						FBSDeviceId : $("#FBSDeviceId").val(),				//璁惧id
@@ -592,11 +592,14 @@
 		        url: "Battinf_applyAction!addPro",				
 		        async:true,				
 		        dataType:'text',
-		        data:"json="+JSON.stringify(temp),	
-		        success: function(data){							        	
-					data = eval('('+data+')');
-					var model = eval('('+data.result+')');
-					console.info(model);
+		        data:"json="+temp,	
+		        success: function(data){		
+		        	console.info(data);
+		        	data =JSON.parse(data);					        	
+					//var model= JSON.parse(data.result);
+					data = JSON.parse(data.result);
+					console.info(data);
+					var model =data;
 					if(model.code ==1){
 						alert("淇敼鎴愬姛");
 						window.location.href="batt-unapproved.html"

--
Gitblit v1.9.1