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/iframe/homeinfo1.html | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/iframe/homeinfo1.html b/gx_tieta/WebRoot/mobil/iframe/homeinfo1.html
index 630c67d..23b815f 100644
--- a/gx_tieta/WebRoot/mobil/iframe/homeinfo1.html
+++ b/gx_tieta/WebRoot/mobil/iframe/homeinfo1.html
@@ -323,11 +323,23 @@
var mk = new BMap.Marker(point);
var label = new BMap.Label("鏂版満鎴�",{offset:new BMap.Size(20,-10)});
label.setStyle({display: 'none', padding: '4px 2px'});
- mk.disableDragging(); // 璁剧疆涓嶅彲鎷栧姩
+ mk.enableDragging(); // 璁剧疆鍙嫋鍔�
map.addOverlay(mk); // 灏嗚鐩栫墿娣诲姞鍒板湴鍥句腑
mk.setLabel(label); // 缁欒鐩栫墿娣诲姞label鎻愮ず
map.panTo(point); // 灏嗗湴鍥剧Щ鍔ㄥ埌娣诲姞鐨勭偣浣嶇疆
- map.setZoom(20); // 璁剧疆鍦板浘鐨勭缉鏀剧瓑绾�
+ map.setZoom(20); // 璁剧疆鍦板浘鐨勭缉鏀剧瓑绾�
+
+ // 缁檓k鐐规坊鍔犵Щ鍔ㄤ簨浠�
+ mk.addEventListener('dragend', function(e) {
+ console.log(e.point);
+ var lat = e.point.lat;
+ var lng = e.point.lng;
+
+ // 鏍规嵁鎷栧姩鐨勪綅缃洿鏂扮粡绾害
+ $('#lng').val(lng);
+ $('#lat').val(lat);
+
+ });
}, 500);
});
@@ -351,7 +363,6 @@
var footerMenu = new FooterMenu($('#pageFooter')); // 瀹炰緥鍖栧簳閮ㄥ鑸爮
-
// 涓婁紶瑙嗛妯″潡
var videoInfoTbl = $('#videoInfoTbl');
// 娓叉煋骞跺垵濮嬪寲涓婁紶鎸夐挳
@@ -368,6 +379,7 @@
VideoOrImage: 'video'
})
}
+ ,exts: 'mp4|MOV|avi|rmvb'
,accept: 'video' //瑙嗛
,choose: function(obj) {
@@ -413,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){
@@ -454,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);
--
Gitblit v1.9.1