From 6fc11b72fa9f3812e91814c935cc06b8d04f2f51 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期二, 15 一月 2019 17:13:02 +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 | 6 ++++++
gx_tieta/WebRoot/mobil/wcheckAccept.html | 12 ++++++++++++
gx_tieta/WebRoot/mobil/iframe/homeinfo1.html | 23 +++++++++++++++--------
gx_tieta/WebRoot/mobil/hcheckAccpet.html | 12 ++++++++++++
4 files changed, 45 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-approved1.html b/gx_tieta/WebRoot/mobil/batt-approved1.html
index 66cf1d5..7d8308c 100644
--- a/gx_tieta/WebRoot/mobil/batt-approved1.html
+++ b/gx_tieta/WebRoot/mobil/batt-approved1.html
@@ -357,6 +357,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);
})
diff --git a/gx_tieta/WebRoot/mobil/hcheckAccpet.html b/gx_tieta/WebRoot/mobil/hcheckAccpet.html
index 75b3131..748e036 100644
--- a/gx_tieta/WebRoot/mobil/hcheckAccpet.html
+++ b/gx_tieta/WebRoot/mobil/hcheckAccpet.html
@@ -195,6 +195,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);
// applyendyanshou(arr);
@@ -271,6 +277,12 @@
,full: true
,anim: 4
,content: 'iframe/seenhomeinfo.html'
+ ,success: function() {
+ $('div[data-role=page]').hide();
+ }
+ ,end: function() {
+ $('div[data-role=page]').show();
+ }
});
layer.full(iframePopup);
});
diff --git a/gx_tieta/WebRoot/mobil/iframe/homeinfo1.html b/gx_tieta/WebRoot/mobil/iframe/homeinfo1.html
index 43456d8..7e00195 100644
--- a/gx_tieta/WebRoot/mobil/iframe/homeinfo1.html
+++ b/gx_tieta/WebRoot/mobil/iframe/homeinfo1.html
@@ -425,15 +425,10 @@
var uploadImgsLoad;
var uploadImgs = upload.render({
elem: '#imgsSelect'
- ,url: 'MyFileAction!uploadStationFile'
+ ,url: 'MyFileAction!uploadStationFile_mobile'
,accept: 'image'
,multiple: true
- ,data: {
- json:JSON.stringify( {
- StationId: homeInfo.homeId,
- VideoOrImage: 'image'
- })
- }
+ ,data:{}
,auto: false
,bindAction: '#uploadImgs'
,choose: function(obj){
@@ -466,8 +461,20 @@
imgsInfo.append(tr);
});
}
- ,before:function() {
+ ,before:function(obj) {
uploadImgsLoad = layer.load(1);
+ // 璁剧疆鎻愪氦鐨勫弬鏁�
+ this.data.json = JSON.stringify({
+ StationId: homeInfo.homeId
+ ,VideoOrImage: 'image'
+ ,binfmation: {
+ StationId: homeInfo.homeId
+ ,StationName: $('#homeName').val()
+ ,latitude: $('#lat').val() // 绾害
+ ,longitude: $('#lng').val() // 缁忓害
+ ,Address: $('#addr').val() // 鍦板潃
+ }
+ })
}
,done:function(res) {
var rs = JSON.parse(res.result);
diff --git a/gx_tieta/WebRoot/mobil/wcheckAccept.html b/gx_tieta/WebRoot/mobil/wcheckAccept.html
index ae1c6fc..a27f417 100644
--- a/gx_tieta/WebRoot/mobil/wcheckAccept.html
+++ b/gx_tieta/WebRoot/mobil/wcheckAccept.html
@@ -203,6 +203,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);
// applyendyanshou(arr);
@@ -291,6 +297,12 @@
,full: true
,anim: 4
,content: 'iframe/seenhomeinfo.html'
+ ,success: function() {
+ $('div[data-role=page]').hide();
+ }
+ ,end: function() {
+ $('div[data-role=page]').show();
+ }
});
layer.full(iframePopup);
});
--
Gitblit v1.9.1