From 5fe2efb71f6ad809a1cfc59beab18bbea99fff5e Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期五, 18 一月 2019 09:01:41 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

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

diff --git a/gx_tieta/WebRoot/mobil/batt-approved1.html b/gx_tieta/WebRoot/mobil/batt-approved1.html
index f0dc700..6d44d6a 100644
--- a/gx_tieta/WebRoot/mobil/batt-approved1.html
+++ b/gx_tieta/WebRoot/mobil/batt-approved1.html
@@ -89,7 +89,7 @@
 										<tr>
 											<td>鏈烘埧鍚嶇О</td>
 											<td>
-												<input type="text" id="homeName"  class="unable" data-mini="true">        	
+												<textarea id="homeName" class="unable" data-mini="true"></textarea>		
 											</td>
 										</tr>
 										<tr>	
@@ -162,19 +162,7 @@
 											</td>
 										</tr>
 										
-										<tr>
-											<td>*閫氳璁℃暟</td>
-											<td>
-												<input type="text" id="tongxunnumber" class="unable" data-mini="true" />
-											</td>
-										</tr>
-										
-										<tr>
-											<td>*涓㈠寘鐜�</td>
-											<td>
-												<input type="text" id="diubaonumber" class="unable" data-mini="true" />
-											</td>
-										</tr>
+									
 										
 										<tr>
 											<td>*鏄惁楠屾敹</td>
@@ -357,6 +345,12 @@
              ,full: true
              ,anim: 4
              ,content: 'iframe/homeinfo1.html'
+             ,success: function() {
+             	$('div[data-role=page]').hide();
+             }
+             ,end: function() {
+             	$('div[data-role=page]').show();
+             }
          });
          layer.full(iframePopup);
 	})
@@ -379,7 +373,7 @@
 		//setTimes($("#startTestrecord"),'2000-01-01');
 		//setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));		
 		installstartdata(temp);//瀵煎叆鍒濆椤甸潰鍊�
-		getnewnumber(temp[0].binf.FBSDeviceId);
+		//getnewnumber(temp[0].binf.FBSDeviceId);
 		updateinstalldata();
 	});
 	var timeer = '';

--
Gitblit v1.9.1