diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js index 4f3791c..2abd5c9 100644 --- a/fangija-zsyf/config.js +++ b/fangija-zsyf/config.js @@ -1,8 +1,10 @@ /**服务端地址**/ //var BASE_PATH = "http://192.168.10.128:8084"; //var BASE_PATH = "http://192.168.10.47:8086"; -var BASE_PATH = "http://192.168.10.161:8084"; -//var BASE_PATH = "http://192.168.10.53:8084"; +//var BASE_PATH = "http://192.168.10.161:8084"; +//var BASE_PATH = "http://192.168.10.47:8086"; +//var BASE_PATH = "http://192.168.10.161:8084"; +var BASE_PATH = "http://192.168.10.53:8084"; //var BASE_PATH = "http://192.168.10.171:8084"; /**是否显示过启动页面**/ var lauchFlag = false; \ No newline at end of file diff --git a/fangija-zsyf/css/main.css b/fangija-zsyf/css/main.css index b75d3ca..d926112 100644 --- a/fangija-zsyf/css/main.css +++ b/fangija-zsyf/css/main.css @@ -738,7 +738,7 @@ input::-webkit-input-placeholder{ .topic .topicContent .topicContent_bottom p em{color:#F18D00;font-size:0.8rem;} .topic .topicContent .topicContent_bottom p a{float:right;color:#333;} .topic .topicContent .topicContent_bottom font{width:100%;height:16px;background:#eee;border-radius:50px;display:block;margin-top:-10px;} -.topic .topicContent .topicContent_bottom font i{display:block;height:16px;background:#45b9fc;border:solid 3px #eee;border-radius:50px;} +.topic .topicContent .topicContent_bottom font i{display:block;height:10px;background:#F18D00;border:solid 1px #e7e7e7;border-radius:50px;} .topic .topicContent .topicContent_bottom .rankingNote{overflow:hidden;display:block;height:26px;} .topic .topicContent .topicContent_bottom .rankingNote span{font-size:0.65rem;line-height:26px;color:#999;} .topic .topicContent .topicContent_bottom .rankingNote span.rankingNoteLeft{float:left;} diff --git a/fangija-zsyf/css/theme-orange.css b/fangija-zsyf/css/theme-orange.css index 14e17d9..bc1b252 100644 --- a/fangija-zsyf/css/theme-orange.css +++ b/fangija-zsyf/css/theme-orange.css @@ -240,7 +240,7 @@ html:not(.watch-active-state) .theme label.label-radio:active, .bar-tab.theme .tab-item:active{color:#F18D00;} .buttons-row.theme{background:none;} -.buttons-row.theme .button{border-color:#D7D7D7;color:#999;} +.buttons-row.theme .button{border-color:#D7D7D7;color:#333;} .buttons-row.theme .button.active{background:none;border-color:#F18D00;color:#F18D00;} .selectBox div.theme{background:none;} @@ -273,5 +273,6 @@ html:not(.watch-active-state) .theme label.label-radio:active, input[type=range].theme{background:-webkit-linear-gradient(#F18D00, #F18D00) no-repeat;} - +.city-list p.active,.city-list p:active{color:#F18D00;} +.city-list01 div p.active,.city-list01 div p:active{background:#F18D00;border:solid 1px #F18D00;color:#fff;} diff --git a/fangija-zsyf/images/dw.png b/fangija-zsyf/images/dw.png new file mode 100644 index 0000000..7978b10 Binary files /dev/null and b/fangija-zsyf/images/dw.png differ diff --git a/fangija-zsyf/images/dw_h.png b/fangija-zsyf/images/dw_h.png new file mode 100644 index 0000000..5c620ca Binary files /dev/null and b/fangija-zsyf/images/dw_h.png differ diff --git a/fangija-zsyf/js/district/district-map.js b/fangija-zsyf/js/district/district-map.js new file mode 100644 index 0000000..5325661 --- /dev/null +++ b/fangija-zsyf/js/district/district-map.js @@ -0,0 +1,1140 @@ +var that; +var mapConfig = { + /* 初始化入口*/ + init: function () { + that = this; + that.lat = lat; + that.lng = lng; + that.map = new BMap.Map('districtMap'); + var point = new BMap.Point(that.lng, that.lat); + that.map.centerAndZoom(point, 14); + // 编写自定义函数,创建标注 + var marker = new BMap.Marker(point); + function CountOverlay(city, text){ + this._city = city; + this._point = point; + this._text = text; + } + + CountOverlay.prototype = new BMap.Overlay(); + CountOverlay.prototype.initialize = function(map){ + this._map = that.map; + var div = this._div = document.createElement("div"); + div.style.position = "absolute"; + div.style.zIndex = BMap.Overlay.getZIndex(this._point.lat); + div.style.backgroundColor = "grey"; + div.style.border = "1px solid grey"; + div.style.color = "white"; + div.style.height = "25px"; + div.style.padding = "2px"; + div.style.lineHeight = "18px"; + div.style.whiteSpace = "nowrap"; + div.style.MozUserSelect = "none"; + div.style.fontSize = "12px" + div.style.cursor = "pointer" + var span = this._span = document.createElement("span"); + span.style.lineHeight = "inherit"; + span.style.minWidth = "25px"; + span.style.textAlign = "center"; + div.appendChild(span); + span.appendChild(document.createTextNode(this._text)); + + var arrow = this._arrow = document.createElement("div"); + // arrow.style.background = "url(http://map.baidu.com/fwmap/upload/r/map/fwmap/static/house/images/label.png) no-repeat"; + arrow.style.position = "absolute"; + arrow.style.width = "11px"; + arrow.style.height = "10px"; + arrow.style.top = "24px"; + arrow.style.left = "28px"; + arrow.style.overflow = "hidden"; + div.appendChild(arrow); + + /* div.addEventListener('click', function(e){ + that.datas.zoom = that.datas.zoomThreshold + 2; + mp.centerAndZoom(city, that.datas.zoom) + }) */ + that.map.getPanes().labelPane.appendChild(div); + + return div; + } + + CountOverlay.prototype.draw = function(){ + var map = this._map; + var pixel = map.pointToOverlayPixel(this._point); + this._div.style.left = pixel.x - parseInt(this._arrow.style.left) - 13 + "px"; + this._div.style.top = pixel.y - 60 + "px"; + } + + that.map.addOverlay(new CountOverlay(city, name)); + that.map.addOverlay(marker); + that.map.enableScrollWheelZoom(true); // 开启鼠标滚轮缩放 + that.map.citycenter = new BMap.Point(that.lng, that.lat); + + + /* 打开银行、餐饮等tab大类*/ + $('.bar,#aroundLink').on('click', 'a', function () { + var $this = $(this); + //$this.addClass('current').siblings().removeClass('current'); + var id = $this.attr('id'); + that.hidden_all_mark() + that.openTypeWrap(id); + }); + + + that.openTypeWrap('bus'); + + + }, + + /* 计算两点间距离*/ + getShortDistance: function (lon1, lat1, lon2, lat2) { + // PI + var DEF_PI = 3.14159265359; + + // 2*PI + var DEF_2PI = 6.28318530712; + + // PI/180.0 + var DEF_PI180 = 0.01745329252; + + // radius of earth + var DEF_R = 6370693.5; + var ew1, ns1, ew2, ns2, dx, dy, dew, distance; + + // 角度转换为弧度 + ew1 = lon1 * DEF_PI180; + ns1 = lat1 * DEF_PI180; + ew2 = lon2 * DEF_PI180; + ns2 = lat2 * DEF_PI180; + + // 经度差 + dew = ew1 - ew2; + + // 若跨东经和西经180 度,进行调整 + if (dew > DEF_PI) { + dew = DEF_2PI - dew; + } else if (dew < -DEF_PI) { + dew = DEF_2PI + dew; + } + + // 东西方向长度(在纬度圈上的投影长度) + dx = DEF_R * Math.cos(ns1) * dew; + + // 南北方向长度(在经度圈上的投影长度) + dy = DEF_R * (ns1 - ns2); + + // 勾股定理求斜边长 + distance = Math.sqrt(dx * dx + dy * dy); + return parseInt(distance); + }, + + /* 获取附近楼盘创建标记*/ + + + // 设置条数:type大分类 + setCount: function (type) { + var that = this; + var list = '#' + type + '_list'; + var liCount = $(list).find('li[id]').length;; + var countDom = $('#' + type + 'Count'), text = '', split = '、', unit = '个'; + // 楼盘 + if (type === 'hs') { + // 医院 + text += liCount ? liCount + unit + that.have_arr_new[type] + split : ''; + /*for (var item in that.house_type) { + if (that.house_type.hasOwnProperty(item)) { + liCount = $('#' + item + '_list').find('li[id]').length; + text += liCount ? liCount + unit + that.house_type[item] + split : ''; + } + }*/ + } else if (that.house_near_merge[type]) { + // 交通 教育 + for (var i = 0; i < that.house_near_merge[type].length; i++) { + if (that.house_near_merge[type][i]) { + var item_traffic = that.house_near_merge[type][i]; + if (type === 'business') { + unit = '处'; + } else if (type === 'school') { + unit = '所'; + } else if (type === 'school') { + if (item_traffic === 'subway') { + unit = '条'; + } else { + unit = '个'; + } + } + liCount = $('#' + item_traffic + '_list').find('li[id]').length; + text += liCount ? liCount + unit + that.have_arr_new[item_traffic] + split : ''; + } + } + } else if (type === 'hos') { + // 医院 + text += liCount ? liCount + unit + that.have_arr_new[type] + split : ''; + } else if (type === 'other') { + text = liCount + unit; + } + if (text) { + // 除去、 + if (text.lastIndexOf(split) === text.length - 1) { + text = text.substr(0, text.length - 1); + } + countDom.text(text); + //隐藏无结果提示语 + $('#' + type + '_noResult').hide(); + } else { + //显示无结果提示 + $('#' + type + '_noResult').show(); + } + }, + + /* 按距离希尔排序*/ + shellSort: function (arr) { + for (var step = arr.length >> 1; step > 0; step >>= 1) { + for (var i = 0; i < step; ++i) { + for (var j = i + step; j < arr.length; j += step) { + var k = j, value = arr[j].distance, tmp = arr[j]; + while (k >= step && arr[k - step].distance > value) { + arr[k] = arr[k - step]; + k -= step; + } + arr[k] = tmp; + } + } + } + return arr; + }, + + /* 添加标注:单一图标*/ + // tag为true表示楼盘需要清除;n为索引;type为大分类 + addMarker_s: function (info, tag, n, isShow) { + var that = this; + var latLng = new BMap.Point(info.x, info.y); + // var textIndent = (n + '').length > 1 ? ' style="text-indent:2px" ' : ''; + var ltext = '
'; + ltext += ' ' + n + ''; + ltext += '
'; + var marker = new BMapLib.RichMarker(ltext, latLng, {anchor: new BMap.Size(0, 0)}); + tag && that.toDelterMarkers.push(marker); + + marker.provalue = info; + that.openTip[info.uid] = that.opentip(marker); + that.map.addOverlay(marker); + if(isShow){ + marker.hide(); + } + return marker; + }, + + /* 鼠标划到描点事件*/ + focusmarker_b: function (marker) { + var info = marker.provalue; + var focusInfoWinFun = function () { + var container = $(marker._container), mapDiv = container.find('.mark-icon-box'); + if (mapDiv.length) { + marker.setTop && marker.setTop(true); + mapDiv.find('.mark-icon').addClass('mark-icon-h').end().find('.mark-tip').show(); + // 恢复置顶 + container.css('zIndex', Math.abs(container.css('zIndex'))); + var list = $('#list' + info.uid); + list.find('a').css('background', '#e8f4ff'); + } + }; + marker.addEventListener('mouseover', focusInfoWinFun); + return focusInfoWinFun; + }, + + /* 鼠标划过描点事件*/ + blurmarker_b: function (marker) { + var that = this; + var info = marker.provalue; + var blurInfoWinFun = function () { + if (that.isclick != info.uid) { + var container = $(marker._container), mapDiv = container.find('.mark-icon-box'); + if (mapDiv.length) { + mapDiv.find('.mark-icon').removeClass('mark-icon-h').end().find('.mark-tip').hide(); + // 恢复置顶 + container.css('zIndex', -Math.abs(container.css('zIndex'))); + var list = $('#list' + info.uid); + list.find('a').css('background', '#fff'); + } + } + }; + marker.addEventListener('mouseout', blurInfoWinFun); + return blurInfoWinFun; + }, + + /* maibuilding的hover*/ + hoverMarker: function (marker, flg) { + var that = this; + if (!marker._div) { + return; + } + var cName = marker._div.className; + var tip_price = $('#tip_price'); + if (flg) { + if (cName.indexOf('qp') > -1) { + marker._div.className = 'qp02'; + } + marker._div.parentNode.style.zIndex = 1; + if (tip_price.length > 0) { + tip_price.css('display', 'inline'); + } + } else { + if (that.isclick != marker.provalue.newCode) { + marker._div.parentNode.style.zIndex = marker._zindex; + if (cName.indexOf('qp') < 0) { + return; + } + if (tip_price) { + tip_price.css('display', 'none'); + } + var lclass = 'qp01'; + var sTc = {0: '04', 1: '01', 2: '05', 3: '03', 4: '01'}; + if ('undefined' != typeof(marker.provalue.saling) && 'undefined' != typeof(sTc[marker.provalue.saling])) { + lclass = 'qp' + sTc[marker.provalue.saling]; + } + marker._div.className = lclass; + } + } + }, + + /* 关闭详情窗口*/ + closeTip: function () { + var that = this; + $('#maptip').css('visibility', 'hidden'); + var tip_price = $('#tip_price'); + if (tip_price) { + tip_price.css('display', 'none'); + } + }, + + /* 弹出详情窗口****/ + opentip: function (marker) { + var that = this; + var map = that.map; + var maptipDom = $('#maptip'); + if (!maptipDom) { + return; + } + var opentheTip = function () { + var info = marker.provalue; + if (!info) { + return; + } + info.x = info.x || info.baidu_coord_x || info.mapx; + info.y = info.y || info.baidu_coord_y || info.mapy; + if (that.isclick && that.isclick == info.uid) { + that.closeTip(); + return; + } + var point0 = new BMap.Point(marker._position.lng, marker._position.lat); + that.map.centerAndZoom(point0, 14); + }; + marker.addEventListener('click', opentheTip); + return opentheTip; + }, + panMap: function () { + var that = this; + that.map.setViewport(that.markerBounds); + }, + + /* 打开餐饮、银行大类信息*/ + openTypeWrap: function (type) { + var that = this; + that.createPoints_new(type); + }, + + /* 重置所有标注-*/ + reset_all_mark: function (fmaker) { + var that = this; + if ('undefined' != typeof that.map && 'undefined' != typeof that.house_near_p) { + // 设置背景为初始白色 + $('li[id^=list] a').css('background', '#fff'); + // 去除描点悬浮蓝色并且隐藏所有悬浮框 + var map = $('#mapObj'); + map.find('.mark-icon').removeClass('mark-icon-h').end().find('.mark-tip').hide(); + + if (fmaker && !fmaker._div) { + var info = fmaker.provalue; + var container = $(fmaker._container); + container.css('zIndex', Math.abs(container.css('zIndex'))); + var listNew = $('#list' + info.uid); + listNew.find('a').css('background', '#e8f4ff'); + } + } + }, + + /* 隐藏所有标注*/ + hidden_all_mark: function () { + var that = this; + if ('undefined' != typeof that.map && 'undefined' != typeof that.house_near_p) { + for (var key in that.house_near_p) { + if (that.house_near_p[key].length < 1) { + return; + } + for (var j = 0; j < that.house_near_p[key].length; j++) { + var point = that.house_near_p[key][j]; + point && point.hide(); + } + } + } + }, + + /* 只传入类型的大类标注*/ + hideOtherPoints: function (type) { + var that = this; + if ('undefined' == typeof that.map || 'undefined' == typeof that.house_near_p || null == type) { + return; + } + for (var key in that.house_near_p) { + if (that.house_near_p[key].length > 0) { + for (var j = 0; j < that.house_near_p[key].length; j++) { + var point = that.house_near_p[key][j]; + if(point){ + if(key == type){ + point.show(); + }else{ + point.hide() + } + } + } + } + } + }, + + /* 显示周边楼盘标注*/ + createPoints_house: function () { + var that = this; + that.panTo(that.map.citycenter); + that.hidden_all_mark(); + if (that.have_arr['hs'] == 1 && 'undefined' != typeof that.map && 'undefined' != typeof that.house_near_p) { + for (var key in that.house_near_p) { + if ('hs' != key) { + continue; + } + for (var j = 0; j < that.house_near_p[key].length; j++) { + var point = that.house_near_p[key][j]; + point && point.show(); + } + break; + } + } else { + //that.getNearHouse(); + } + }, + + /** + * 创建小分类下的标注:若已经创建则显示已经创建的 + * @param type 分类 + * @returns null + */ + createPoints_new: function (type) { + if (null == type) { + return; + } + type = type.replace(/\s+/g, ''); + var that = this; + that.panTo(that.map.citycenter); + that.hideOtherPoints(type); + // 若已经存在 + if (that.have_arr[type] == 1) { + //that.hideOtherPoints(type); + /* 刷新地图标注*/ + // that.hideOtherPoints(type); + + /* 显示该分类下所有的内容*/ + /*var typeList = $('#' + type + '_list'); + // 记录滚动位置 + that.topScroll = typeList.parent().scrollTop(); + typeList.find('li').show(); + typeList.show().siblings().hide();*/ + /* 隐藏更多按钮*/ + $('.mscoputup').show(); + $('.mscomore').hide(); + } else { + /*if (type == 'hs') { + //that.getNearHouse(); + } else { + that.getnear_s(that.have_arr_new[type], that.maxMarker_count, that.view_count, that.limit, that.maxMarker_count); + }*/ + that.getnear_s(type,that.maxMarker_count, that.view_count, that.limit, that.maxMarker_count); + } + }, + + panTo: function(e, a) { + e && a && that.map.panTo(new BMap.Point(a, e)) + }, + /** + * 创建大分类下的标注:若已经创建则显示已经创建的 + * @param key 大分类 + * @returns null + */ + createPoints_merge: function (key) { + var that = this; + that.panTo(that.map.citycenter); + + /* 隐藏地图上所有标注*/ + that.hidden_all_mark(); + var mergeArr = that.house_near_merge[key]; + + /* 显示标注*/ + var flag = false, i, j = 0, l; + for (i = 0, l = mergeArr.length; i < l; i++) { + if (that.have_arr[mergeArr[i]] == 1) { + flag = true; + break; + } + } + + /* 显示全部*/ + if (flag) { + if ('undefined' != typeof that.map && 'undefined' != typeof that.house_near_p) { + // 显示当前大分类下所有小分类列表 + var typeList = $('#' + mergeArr[0] + '_list'); + typeList.show().siblings().show(); + /* 显示更多按钮 隐藏收起按钮*/ + $('.mscoputup').hide(); + $('.mscomore').show(); + for (var k in that.house_near_p) { + if (that.in_array(k, mergeArr)) { + for (j = 0; j < that.house_near_p[k].length; j++) { + var point = that.house_near_p[k][j]; + point && (j < that.view_count ? point.show() : point.hide()); + } + } + } + for (i = 0, l = mergeArr.length; i < l; i++) { + var objs = $('#' + mergeArr[i] + '_list').find('li'); + for (j = that.view_count; j < that.maxMarker_count; j++) { + if (null == objs[j]) { + break; + } + $(objs[j]).hide(); + } + } + // 滚到展开位置 + typeList.parent().scrollTop(that.topScroll || 0); + } + } else { + that.init_search_merge(key); + } + }, + + init_search_merge: function (key) { + var that = this; + var mergeArr = that.house_near_merge[key]; + for (var i = 0, l = mergeArr.length; i < l; i++) { + that.getnear_s(mergeArr[i], that.maxMarker_count, that.view_count, that.limit, that.maxMarker_count, key); + } + }, + + /** + * 获取周围信息 + * @param type 小分类 + * @param count 需要搜索的最大个数 + * @param view_count 非展开状态下显示个数 + * @param limit 搜索距离(m) + * @param limit_count 页面上展示最大个数 + * @param parentType 大分类 + * @returns null + */ + getnear_s: function (type, count, view_count, limit, limit_count, parentType) { + var that = this; + /*if (cityy == '' || cityx == '' || null == type) { + return; + }*/ + var searchname = that.have_arr_new[type]; + var onLocalSearch = function (resData) { + // 娱乐由于合在了一起所以单独处理 + //var isFun = that.in_array(type, that.house_near_merge['fun']); + /* 判断状态是否正确*/ + if (localSearch.getStatus() == BMAP_STATUS_SUCCESS) { + var resultArr = []; + that.focusInfoWinFuns[type] = []; + that.blurInfoWinFuns[type] = []; + var uidarr = []; + var points = [] + /* 处理百度返回信息*/ + for (var i = 0; i < resData.getCurrentNumPois(); i++) { + var info = resData.getPoi(i); + if(info){ + /* 过滤地铁中的地铁口*/ + info['address'] = info['address'] ? info['address'] : ''; + if ('subway' == type && (!that.array_in_array(that.type_tags[type], info.tags) || info['address'].indexOf('线') < 0)) { + continue; + } + /* 计算距离*/ + info.distance = that.getShortDistance(that.map.citycenter.lng, that.map.citycenter.lat, info.point.lng, info.point.lat); + uidarr.push(info.uid); + resultArr.push(info); + points.push(new BMap.Point(info.point.lng,info.point.lat)) + } + } + resData._pois = that.shellSort(resultArr); + that.have_arr[type] = 1; + // 所有周围娱乐数据加载完毕 + var allFunIsFinished = that.have_arr['ktv'] && that.have_arr['bar'] && that.have_arr['cinema'] + && that.have_arr['beauty'] && that.have_arr['cafe']; + // 若是娱乐将type设为fun + /*if (isFun) { + type = 'fun'; + searchname = '娱乐'; + that.focusInfoWinFuns[type] = []; + that.blurInfoWinFuns[type] = []; + that.have_arr[type] = 1; + !that.funData && (that.funData = []); + that.funData = that.funData.concat(resData._pois); + // 若娱乐都检索完毕则可以画点 + if (allFunIsFinished) { + resData._pois = that.shellSort(that.funData); + } else { + return; + } + }*/ + that.house_near_p[type] = []; + /*if (!isFun || isFun && allFunIsFinished) { + that.getListAndMarker(resData._pois, limit_count, view_count, type, parentType, searchname); + }*/ + that.getListAndMarker(resData._pois, limit_count, view_count, type, parentType, searchname); + + that.map.setViewport(points); + } else { + // 若没搜索成功娱乐也加标识位,因为娱乐是所有加载完后再描点 + /*if (isFun) { + that.have_arr[type] = 1; + if (that.have_arr['ktv'] && that.have_arr['bar'] && that.have_arr['cinema'] + && that.have_arr['beauty'] && that.have_arr['cafe']) { + that.getListAndMarker(that.funData, limit_count, view_count, type, parentType, '娱乐'); + } + }*/ + } + }; + var localSearch = new BMap.LocalSearch(new BMap.Point(that.lng, that.lat), {onSearchComplete: onLocalSearch}); + localSearch.setPageCapacity(count); + localSearch.searchNearby(searchname, that.map.citycenter, limit); + }, + + /** + * 拼接列表并描点 + * @param rsData 描点数组 + * @param limit_count 页面上展示最大个数 + * @param view_count 非展开状态下显示个数 + * @param type 小分类 + * @param mergeType 大分类 + * @param searchName 小分类列表头 + * @param isNotVisible 是否需要隐藏 + * @returns null + */ + getListAndMarker: function (resData, limit_count, view_count, type, mergeType, searchName, isNotVisible) { + var that = this; + var s = [], l = resData.length; + if (l > 0) { + s.push('
' + searchName + '
'); + var domList = $('#' + type + '_list'); + domList.html(s.join('')); + /* 注册多个事件*/ + that.addEventsListener(domList); + that.setCount(mergeType || type); + } + }, + + /* 添加多个事件 提出来了*/ + addEventsListener: function (dom) { + var that = this; + if (!dom) { + return; + } + dom.on('mouseover mouseout click', 'a', function (e) { + var $this = $(this), dataS = $this.attr('data-mydata'), dataMore = $this.attr('data-More'), dataShrink = $this.attr('data-Shrink'); + if (!dataS && !dataMore && !dataShrink) { + return; + } + var data = dataS ? dataS.split(',') : undefined; + switch (e.type) { + case 'click': + /* 更多和收起按钮的动作*/ + if (dataMore) { + that.createPoints_new(dataMore); + break; + } + if (dataShrink) { + that.createPoints_merge(dataShrink); + break; + } + that.openTip[data[1]](); + break; + case 'mouseover': + data && that.focusInfoWinFuns[data[0]][data[1]](); + break; + case 'mouseout': + data && that.blurInfoWinFuns[data[0]][data[1]](); + break; + } + }); + }, + + /* 获取周围餐馆、银行、医院、公交车***/ + searchNearby: function (x, y, keyword, title) { + var that = this; + if (!keyword) { + return; + } + var onLocalSearch = function (resData) { + // 判断状态是否正确 + if (local.getStatus() == BMAP_STATUS_SUCCESS) { + var resultArr = []; + var type = 'other'; + that.house_near_p[type] = []; + that.focusInfoWinFuns[type] = []; + that.blurInfoWinFuns[type] = []; + /* 处理百度返回信息*/ + for (var i = 0; i < resData.getCurrentNumPois(); i++) { + var info = resData.getPoi(i); + /* 计算距离*/ + info.distance = that.getShortDistance(that.map.citycenter.lng, that.map.citycenter.lat, info.point.lng, info.point.lat); + resultArr.push(info); + } + resData._pois = that.shellSort(resultArr); + // + that.getListAndMarker(resData._pois, that.maxMarker_count, null, type, null, title + '周边' + keyword, true); + $('.myWrap').hide(); + $('#' + type + '_wrap').show(); + + } + }; + var local = new BMap.LocalSearch(that.map._map, { + onSearchComplete: onLocalSearch + }); + local.setPageCapacity(20); + local.searchNearby(keyword, new BMap.Point(x, y), that.limit); + that.hidden_all_mark(); + that.removeOtherOverlays(); + }, + cut_str: function (str, len) { + var char_length = 0; + for (var i = 0; i < str.length; i++) { + var son_str = str.charAt(i); + encodeURI(son_str).length > 2 ? char_length += 1 : char_length += 0.5; + if (char_length >= len) { + var sub_len = char_length == len ? i + 1 : i; + return str.substr(0, sub_len); + } + } + return str; + }, + drawMarkers: function () { + var that = this; + for (var i = 0; i < that.metaMarkers.length; i++) { + var proValue = that.metaMarkers[i]; + that.markerBounds.extend(that.createMarker(proValue)); + } + }, + createMarker: function (info) { + var that = this; + that.this_code = info.newCode; + var latLng = new BMap.Point(info.baidu_coord_x || info.mapx, info.baidu_coord_y || info.mapy); + var lclass = 'labeledMarkerStyle3'; + var sTc = {0: '2', 2: '4', 3: '1'}; + if ('undefined' != typeof(info.saling) && 'undefined' != typeof(sTc[info.saling])) { + lclass = 'labeledMarkerStyle' + sTc[info.saling]; + } + var ltext, opts; + if ('hs' != that.iType && info.maplogo != '') { + lclass = 'lpmctd'; + ltext = '
'; + opts = {anchor: new BMap.Size(-50, -47)}; + } else { + lclass = 'qp01'; + sTc = {0: '04', 1: '01', 2: '05', 3: '03', 4: '01'}; + if ('undefined' != typeof(info.saling) && 'undefined' != typeof(sTc[info.saling])) { + lclass = 'qp' + sTc[info.saling]; + } + ltext = '
' + info.title; + ltext += '
'; + opts = {anchor: new BMap.Size(-5, -38)}; + } + var marker = new BMapLib.RichMarker(ltext, latLng, opts); + marker.provalue = that.orgInfo(info); + marker.addEventListener('mouseover', function () { + that.hoverMarker(marker, true); + }); + marker.addEventListener('mouseout', function () { + that.hoverMarker(marker, false); + }); + that.opentip(marker); + that.centerMarker = marker; + that.map.addMarker(marker); + marker._div = $('#tip' + info.newCode)[0]; + marker._zindex = marker._div.parentNode.style.zIndex; + return latLng; + }, + + /* 组织页面*/ + orgInfo: function (info) { + var that = this; + info.uid = info.newCode; + info.detailUrl = that.httpAddress(info.purpose) + info.newCode + '.htm'; + var stimetempstr = ''; + if (info.startTime) { + if (info.startTime.indexOf('-') > -1) { + var stimetemparr = info.startTime.split('-'); + stimetempstr += stimetemparr[0] + '年'; + if ('undefined' != typeof stimetemparr[1]) { + stimetempstr += stimetemparr[1] + '月'; + } + if ('undefined' != typeof stimetemparr[2]) { + stimetempstr += stimetemparr[2] + '日'; + } + } else { + stimetempstr += info.startTime.substr(0, 4) + '年'; + if (info.startTime.substr(4, 2) != '') { + stimetempstr += info.startTime.substr(4, 2) + '月'; + } + if (info.startTime.substr(6, 2) != '') { + stimetempstr += info.startTime.substr(6, 2) + '日'; + } + } + } + info.startTime = stimetempstr; + if (info.picAddress == '') { + info.picAddress = imgUrl + 'shipin0.gif'; + } + info.mapUrl = 'http://map.' + nowsite + '.com/house/' + city + '/index.php'; + if (info.tel) { + info.tel = info.tel.replace(/\s+/g, ''); + info.tel = info.tel.replace(/(转)/g, ' $1 '); + } + if ('' == info.houseurl) { + info.houseurl = 'javascript:void(0)'; + } + info.saleType = info.saling ? '
' + that.saling[info.saling] + '
' : ''; + + if (info.category && info.esfNum && '2' == info.category) { + if (0 == info.esfNum) { + info.saleType = '(暂无房源信息)'; + } else { + info.saleType = '(' + info.esfNum + '套房源)'; + } + } + if (!info.price_num) { + info.price_num = '价格暂无'; + } + if ('--' == info.price_unit) { + info.price_unit = ''; + } + if (info.mobilepayment && 'undefined' != typeof info.mobilepayment) { + info.youhui = '' + that.cut_str(info.mobilepayment, 7) + ''; + } else if (info.signupname && 'undefined' != typeof info.signupname) { + info.youhui = '' + that.cut_str(info.signupname, 7) + ''; + } else if (info.soufun_card_client && 'undefined' != typeof info.soufun_card_client) { + info.youhui = '' + that.cut_str(info.soufun_card_client, 7) + ''; + } else { + info.youhui = ''; + } + + info.city_a = '' + info.city + ''; + info.district_a = info.district ? ' - ' + '' + info.district + '' : ''; + info.comarea_a = info.comarea ? ' - ' + '' + info.comarea + '' : ''; + + info.title_l = that.cut_str(info.title, 14); + if (!info.x) { + info.x = info.lng; + } + if (!info.y) { + info.y = info.lat; + } + info.maptype = 'hs'; + return info; + }, + + /* 拼url*/ + httpAddress: function (purpose) { + var soufunhttp = ''; + var city_cn = ''; + if ('undefined' != typeof cname) { + city_cn = cname; + } else if ('undefined' !== typeof searchcondition['cityname']) { + city_cn = searchcondition['cityname']; + } + // IE兼容 indexOf + if (!Array.indexOf) { + Array.prototype.indexOf = function (obj) { + for (var i = 0; i < this.length; i++) { + if (this[i] == obj) { + return i; + } + } + return -1; + }; + } + if (purpose.indexOf('写字楼') > -1) { + /* 北京、成都、广州、深圳、天津、上海、重庆、苏州、杭州、沈阳*/ + var isInThose = city == 'bj' || city == 'sh' || city == 'cd' || city == 'gz' || city == 'sz' || city == 'tj' || city == 'cq'; + if (isInThose || city == 'sy' || city == 'hz' || city == 'suzhou') { + if (city == 'bj') { + soufunhttp = 'http://office.' + nowsite + '.com'; + } else { + soufunhttp = 'http://office.' + city + '.' + nowsite + '.com'; + } + return soufunhttp + '/house/' + city_cn + '_'; + } + } else if (purpose.indexOf('商铺') > -1) { + /* 北京、天津、上海、深圳、东莞、武汉、南京、苏州*/ + if (city == 'bj' || city == 'sh' || city == 'dg' || city == 'sz' || city == 'tj' || city == 'wuhan' || city == 'nanjing' || city == 'suzhou') { + if (city == 'bj') { + soufunhttp = 'http://shop.' + nowsite + '.com'; + } else { + soufunhttp = 'http://shop.' + city + '.' + nowsite + '.com'; + } + return soufunhttp + '/house/' + city_cn + '_'; + } + } + if (city == 'bj') { + soufunhttp = 'http://www.' + nowsite + '.com/house/'; + } else if (city == 'nanjing') { + soufunhttp = 'http://nanjing.' + nowsite + '.com/house/'; + } else { + soufunhttp = 'http://newhouse.' + city + '.' + nowsite + '.com/house/'; + } + return soufunhttp; + }, + orgSearchInfo: function (info) { + info.x = info.point.lng; + info.y = info.point.lat; + info.address = info.address ? info.address : '暂无'; + info.phoneNumber = info.phoneNumber ? info.phoneNumber : '暂无'; + return info; + }, + + /* 测距**/ + openDis: function () { + var that = this; + if ('undefined' == typeof that._disTool) { + that._disTool = new BMapLib.DistanceTool(that.map._map); + that._disTool.addEventListener('drawend', + function () { + that._disTool.close(); + }); + } + that._disTool.open(); + }, + + /* 用戶行為*/ + yhxw: function (action) { + _ub.city = vars.cityname; + + /* 业务 地图*/ + _ub.biz = 'n'; + + /* 用户动作(浏览0、搜索1)*/ + var b = 0; + + var p = { + nh: encodeURIComponent(action) + }; + + /* 收集方法*/ + _ub.collect(b, p); + }, + + array_in_array: function (arr1, arr2) { + if ('undefined' != typeof arr1 && 'undefined' != typeof arr2) { + for (var key in arr1) { + for (var key2 in arr2) { + if ('string' == typeof arr2[key2] && 'string' == typeof arr1[key] && arr2[key2].indexOf(arr1[key]) >= 0) { + return true; + } + } + } + } + return false; + }, + + in_array: function (type, arr) { + if ('undefined' != typeof arr && 'undefined' != typeof type && $.inArray(type, arr) > -1) { + return true; + } else { + return false; + } + + } + +} + +function initMapConfig(){ + mapConfig.map = null, + mapConfig.defaultZoom= 13, + mapConfig.cityx=121.356766, + mapConfig.cityy=31.213703, + zoom=14, + /* 获取附近楼盘url的参数*/ + mapConfig.params= { + x1: 121.356766, + y1: 31.213703, + distance: '2', + strNewCode: '' + }, + + /* 用来存储当前页面上所有点的信息*/ + mapConfig.markerList= {}, + + /* 地图边界:可用来控制地图的显示范围*/ + mapConfig.markerBounds= new BMap.Bounds(), + mapConfig.iType= 'hs', + mapConfig.house_type= {zz: '住宅', sp: '商铺', xzl: '写字楼', bs: '别墅'}, + + // 销售状态 + mapConfig.saling= { + 1: '在 售', + 2: '待 售', + 3: '在 租', + 4: '待 租', + 0: '售 完' + }, + + /* 以下是周边查询的***/ + mapConfig.have_arr= { + hs: '', + jj: '', + zs: '', + bus: '', + subway: '', + ct: '', + bank: '', + school: '', + hos: '', + buy: '', + park: '', + parking: '', + gas: '', + ktv: '', + bar: '', + cinema: '', + beauty: '', + cafe: '', + kindergarten: '', + primarysc: '', + middlesc: '', + university: '', + traffic: '', + fun: '' + }, + mapConfig.have_arr_new= { + bus: '公交', + subway: '地铁', + ct: '餐饮', + bank: '银行', + school: '学校', + hos: '医院', + buy: '购物', + park: '公园', + parking: '停车场', + gas: '加油站', + supermark: '超市', + ktv: 'KTV', + bar: '酒吧', + cinema: '电影院', + beauty: '美容院', + cafe: '咖啡厅', + kindergarten: '幼儿园', + primarysc: '小学', + middlesc: '中学', + university: '大学', + traffic: '交通', + fun: '娱乐', + hs: '小区' + }, + // 需要删除的点集合包含路线,搜附近type为other的点 + mapConfig.toDelterMarkers= [], + // 已描点集合 + mapConfig.house_near_p= [], + + /* 打开标注框方法集***/ + mapConfig.openTip= [], + + /* 标注获得焦点方法集***/ + mapConfig.focusInfoWinFuns= [], + + /* 标注失去焦点方法集***/ + mapConfig.blurInfoWinFuns= [], + + /* 具有小分类的周边搜索***/ + mapConfig.house_near_merge= { + traffic: ['subway', 'bus', 'parking', 'gas'], + // 商业包含娱乐 超市 餐饮 银行 公园 + business: ['fun', 'supermark', 'ct', 'bank', 'park'], + // 娱乐 + fun: ['ktv', 'bar', 'cinema', 'beauty', 'cafe'], + school: ['kindergarten', 'primarysc', 'middlesc', 'university'] + }, + + /* 大分类列表***/ + mapConfig.search_wrap= ['hs', 'traffic', 'fun', 'supermark', 'ct', 'bank', 'hos', 'park', 'school'], + + /* 需要进行搜索返回值过滤的周边***/ + mapConfig.type_tags= {subway: ['地铁']}, + + /* 获取周边条数*/ + mapConfig.maxMarker_count= 20, + + // 列表中初始化可看到的元素 + mapConfig.view_count= 5, + /* 获取周边范围(m)*/ + mapConfig.limit= 2000, + + /* 驾车查询的参数*/ + mapConfig.searchdrive= {start: '', x1: '', y1: '', sstatus: '', end: '', x2: '', y2: '', estatus: '', type: '', tag: ''}, + mapConfig.sstartname= null, + mapConfig.sendname= null, + mapConfig.tag= null +} + + +function loadMapPoi(){ + initMapConfig(); + mapConfig.init(); +} diff --git a/fangija-zsyf/js/district/districtDetail.js b/fangija-zsyf/js/district/districtDetail.js new file mode 100644 index 0000000..fd4c450 --- /dev/null +++ b/fangija-zsyf/js/district/districtDetail.js @@ -0,0 +1,815 @@ +var colorList = ['#c23531', '#2f4554', '#61a0a8', '#d48265', '#91c7ae', '#749f83', '#ca8622', '#bda29a', '#6e7074', '#546570', '#c4ccd3']; +var labelFont = 'bold 12px Sans-serif'; + +var dates; +var data; +var volumes; +var curOption; + + +/* 关注&已关注切换 */ +$(".collection01").on("click", function () { + + axios.post("/rest/districts/addCollect",{city:city,region:region,name:name,lat:lat,lng:lng,address:address, poiTags:tags}).then(function (response) { + var msg = response.data.message + if(msg){ + $.toast(msg); + }else{ + $(".collection01").hide(); + $(".collection02").show(); + $.toast("随时掌握小区动态"); + } + + }) + .catch(function (error) { + console.log(error); + }); + + +}); +$(".collection02").on("click", function () { + + axios.post("/rest/districts/removeCollect",{city:city,region:region,name:name}).then(function (response) { + var msg = response.data.message + if(msg){ + $.toast(msg); + }else{ + $(".collection02").hide(); + $(".collection01").show(); + $.toast("取消关注"); + } + + }) + .catch(function (error) { + console.log(error); + }); + +}); + +/* button状态切换 */ +$(".content-block .button").on("click", function () { + $(this).parent().children().removeClass("active"); + $(this).addClass("active"); +}); + +//小区详情 +function loadDistrictInfo(){ + axios.get("/rest/districts/detail", { + params: { + city: city, + region:region, + name: name + } + }).then(function (response) { + var vo = response.data.data.detail + var cityPrice = response.data.data.cityPrice + var collected = response.data.data.collected + if(cityPrice){ + baseInfo.cityPrice = cityPrice + } + if(collected){ + $(".collection02").show(); + $(".collection01").hide(); + }else{ + $(".collection02").hide(); + $(".collection01").show(); + } + if(vo){ + if(vo.avgPrice){ + lat = vo.lat2; + lng = vo.lng2; + + //loadMapPoi(); + + baseInfo.city = vo.city + baseInfo.region = vo.region + baseInfo.address = vo.address; + baseInfo.name = vo.name + baseInfo.avgPrice = vo.avgPrice; + baseInfo.oneMonthUpDownRange = vo.oneMonthUpDownRange; + + if(vo.rank){ + baseInfo.priceRate = vo.rank.substring(0, vo.rank.indexOf("/")); + } + + //baseInfo.cityPrice = vo.cityPrice; + + var finishDate = "" + if(vo.finishBuildingDate){ + if(vo.finishBuildingDate.indexOf("~")!=-1){ + finishDate = vo.finishBuildingDate.replace("年",""); + }else{ + finishDate = vo.finishBuildingDate.substring(0,4)+"年" + } + } + + + baseInfo.finishBuildingDate = finishDate; + baseInfo.householdCount = vo.householdCount; + baseInfo.cubagePercent = vo.cubagePercent; + baseInfo.carSiteCount = vo.carSiteCount; + baseInfo.virescencePercent = vo.virescencePercent; + baseInfo.estateCharge = vo.estateCharge; + baseInfo.moreArea = vo.moreArea; + baseInfo.developer = vo.developer; + baseInfo.estateCompany = vo.estateCompany; + + address = vo.address; + tags = vo.poiTags; + + if(vo.poiTags){ + if(vo.poiTags.length>=3){ + baseInfo.tags = vo.poiTags.slice(0,3); + }else{ + baseInfo.tags = vo.poiTags; + } + } + + }else{ + $("#noDataDiv").show() + baseInfo.name = "小区详情" + } + } + + }).catch(function (error) { + alert(error) + console.log(error); + }); +} + +//附近小区 +/*function loadNearDistrict(lat, lng){ + axios.get("/rest/districts/nearDistrict", { + params: { + lat: lat, + lng:lng + } + }).then(function (response) { + var datas = response.data.data + if(datas){ + var ret = [] + for(var v in datas){ + var o = datas[v] + if(o.city == city && o.district == region && o.name == name){ + continue; + }else{ + if(ret.length <= 5){ + ret.push(o); + } + } + } + baseInfo.nearDists = ret; + + $("#nearDistDiv .cardNearbyWin").css("width",(7.5*ret.length)+"rem"); + }else{ + $("#nearDistDiv").hide() + } + + }).catch(function (error) { + alert(error) + console.log(error); + }); +}*/ + + + + +function loadKLineData(city, region, name){ + axios.get("/rest/trend/kData", { + params: { + city: city, + region:region, + name:name + } + }).then(function (response) { + var datas = response.data.data + if(datas){ + var trends = []; + var counts = []; + var times = [] + var haveCount = false; + for(var d in datas){ + times.push(d); + + var prices = new Array(); + for(var m in datas[d]){ + prices.push(datas[d][m]); + } + trends.push(prices); + if(haveCount==false && datas[d][4]){ + haveCount = true; + } + counts.push(datas[d][4]); + } + +// if(haveCount){ + option01.xAxis[0].data = times + option01.xAxis[1].data = times + //option01.series[0].data = counts + option01.series[0].data = trends + curOption = option01; + myChart01.setOption(option01,true); +// }else{ +// option02.xAxis[0].data = times +// option02.xAxis[1].data = times +// option02.series[0].data = trends +// curOption = option02; +// myChart01.setOption(option02,true); +// } + } + }).catch(function (error) { + alert(error) + console.log(error); + }); +} + +$("#trendDiv1 a").click(function(){ + $("#trendDiv1 a").removeClass("active") + $(this).addClass("active") + var v = $(this).attr("t-v"); + if(v == "1"){ + curOption.dataZoom[0].start = 95 + }else if(v == "3"){ + curOption.dataZoom[0].start = 90 + }else if(v == "6"){ + curOption.dataZoom[0].start = 80 + }else if(v == "12"){ + curOption.dataZoom[0].start = 50 + }else if(v == "24"){ + curOption.dataZoom[0].start = 0 + }else if(v == "36"){ + curOption.dataZoom[0].start = 0 + } + myChart01.setOption(curOption,true); +}); + + +var option01 = { + animation: false, + color: colorList, + title: { + text: null, + left: 'center' + }, + legend: { + show: false, + top: 30, + data: ['均价', '成交量'] + }, + tooltip: { + triggerOn: 'none', + transitionDuration: 0, + confine: true, + bordeRadius: 4, + borderWidth: 1, + borderColor: '#333', + backgroundColor: 'rgba(255,255,255,0.9)', + textStyle: { + fontSize: 12, + color: '#333' + }, + formatter: function (params) { + var res = params[0].seriesName + ' ' + params[0].name; + res += '
月初 : ' + params[0].value[1]; + res += '
月末 : ' + params[0].value[2]; + res += '
最低 : ' + params[0].value[3]; + res += '
最高 : ' + params[0].value[4]; + res += '
'+params[0].seriesName + ' : ' +params[0].value; + return res; + }, + position: function (pos, params, el, elRect, size) { + var obj = { + top: 60 + }; + obj[['left', 'right'][+(pos[0] < size.viewSize[0] / 2)]] = 5; + return obj; + } + }, + axisPointer: { + link: [{ + xAxisIndex: [0, 1] + }] + }, + dataZoom: [{ + type: 'slider', + xAxisIndex: [0, 1], + realtime: false, + start: 50, + end: 100, + top: 65, + height: 20, + handleIcon: 'M10.7,11.9H9.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4h1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z', + handleSize: '120%' + }, { + type: 'inside', + xAxisIndex: [0, 1], + start: 40, + end: 70, + top: 30, + height: 20 + }], + xAxis: [{ + type: 'category', + data: dates, + boundaryGap : false, + axisLine: { lineStyle: { color: '#666' } }, + axisLabel: { + formatter: function (value) { + return echarts.format.formatTime('MM-dd', value); + } + }, + min: 'dataMin', + max: 'dataMax', + axisPointer: { + show: true + } + }, { + type: 'category', + gridIndex: 1, + data: dates, + scale: false, + boundaryGap : false, + splitLine: {show: false}, + axisLabel: {show: false}, + axisTick: {show: false}, + axisLine: {lineStyle: { color: '#fff' } }, + splitNumber: 20, + min: 'dataMin', + max: 'dataMax', + axisPointer: { + //type: 'shadow', + label: {show: false}, + triggerTooltip: true, + handle: { + show: true, + margin: -20, + color: '#F18D00' + } + } + }], + yAxis: [{ + name: '均价(元/㎡)', + nameRotate: 90, + nameLocation: 'center', + nameGap: 5, + position: 'right', + nameTextStyle: { + color: '#999' + }, + scale: true, + splitNumber: 2, + axisLine: { lineStyle: { color: '#999' } }, + splitLine: { show: true }, + axisTick: { show: false }, + axisLabel: { + inside: true, + formatter: '{value}\n' + } + }, { + name: '成交量(套)', + nameRotate: 90, + nameLocation: 'center', + nameGap: 5, + position: 'right', + nameTextStyle: { + color: '#999' + }, + scale: true, + gridIndex: 1, + splitNumber: 2, + axisLabel: {show: false}, + axisLine: {show: false}, + axisTick: {show: false}, + splitLine: {show: false} + }], + grid: [{ + left: 20, + right: 20, + top: 110, + height: 120 + }, { + left: 20, + right: 20, + height: 40, + top: 260 + }], + graphic: [{ + type: 'group', + left: 'center', + top: 70, + width: 300, + bounding: 'raw' + }], + series: [/*{ + name: '成交量', + type: 'bar', + xAxisIndex: 1, + yAxisIndex: 1, + itemStyle: { + normal: { + color: '#87cefa' + }, + emphasis: { + color: 'black' + } + }, + data: volumes + }, */{ + type: 'candlestick', + name: '均价', + data: data, + itemStyle: { + normal: { + color: '#EB5F34', + color0: '#88D053', + borderColor: '#EB5F34', + borderColor0: '#88D053' + }, + emphasis: { + color: 'black', + color0: '#333', + borderColor: 'black', + borderColor0: '#333' + } + } + }] + }; + +/*var option02 = { + animation: false, + color: colorList, + title: { + text: null, + left: 'center' + }, + legend: { + show: false, + top: 30, + data: ['均价'] + }, + tooltip: { + triggerOn: 'none', + transitionDuration: 0, + confine: true, + bordeRadius: 4, + borderWidth: 1, + borderColor: '#333', + backgroundColor: 'rgba(255,255,255,0.9)', + textStyle: { + fontSize: 12, + color: '#333' + }, + formatter: function (params) { + var res = params[0].seriesName + ' ' + params[0].name; + res += '
月初 : ' + params[0].value[1] + res += '
月末 : ' + params[0].value[2]; + res += '
最低 : ' + params[0].value[3]; + res += '
最高 : ' + params[0].value[4]; + return res; + }, + position: function (pos, params, el, elRect, size) { + var obj = { + top: 60 + }; + obj[['left', 'right'][+(pos[0] < size.viewSize[0] / 2)]] = 5; + return obj; + } + }, + axisPointer: { + link: [{ + xAxisIndex: [0, 1] + }] + }, + dataZoom: [{ + type: 'slider', + xAxisIndex: [0, 1], + realtime: false, + start: 50, + end: 100, + top: 65, + height: 20, + handleIcon: 'M10.7,11.9H9.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4h1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z', + handleSize: '120%' + }, { + type: 'inside', + xAxisIndex: [0, 1], + start: 40, + end: 70, + top: 30, + height: 20 + }], + xAxis: [{ + type: 'category', + data: dates, + boundaryGap : false, + axisLine: { lineStyle: { color: '#999' } }, + axisLabel: { + formatter: function (value) { + return echarts.format.formatTime('yy-MM', value); + } + }, + min: 'dataMin', + max: 'dataMax', + axisPointer: { + show: true + } + }, { + type: 'category', + gridIndex: 1, + data: dates, + scale: true, + boundaryGap : false, + splitLine: {show: false}, + axisLabel: {show: false}, + axisTick: {show: false}, + axisLine: { lineStyle: { color: '#fff' } }, + splitNumber: 20, + min: 'dataMin', + max: 'dataMax', + axisPointer: { + type: 'shadow', + label: {show: false}, + triggerTooltip: true, + handle: { + show: true, + margin: 30, + color: '#B80C00' + } + } + }], + yAxis: [{ + name: '均价(元/㎡)', + nameRotate: 90, + nameLocation: 'center', + nameGap: 5, + position: 'right', + nameTextStyle: { + color: '#999' + }, + scale: true, + splitNumber: 2, + axisLine: { lineStyle: { color: '#999' } }, + splitLine: { show: true }, + axisTick: { show: false }, + axisLabel: { + inside: true, + formatter: '{value}\n' + } + }, { + name: '成交量(套)', + nameRotate: 90, + nameLocation: 'center', + nameGap: 5, + position: 'right', + nameTextStyle: { + color: '#999' + }, + scale: true, + gridIndex: 1, + splitNumber: 2, + axisLabel: {show: false}, + axisLine: {show: false}, + axisTick: {show: false}, + splitLine: {show: false} + }], + grid: [{ + left: 20, + right: 20, + top: 110, + height: 120 + }, { + left: 20, + right: 20, + height: 40, + top: 260 + }], + graphic: [{ + type: 'group', + left: 'center', + top: 70, + width: 300, + bounding: 'raw' + }], + series: [ { + type: 'candlestick', + name: '均价', + data: data, + itemStyle: { + normal: { + color: '#ff4500', + color0: '#22ac38', + borderColor: '#ff4500', + borderColor0: '#22ac38' + }, + emphasis: { + color: 'black', + color0: '#444', + borderColor: 'black', + borderColor0: '#444' + } + } + }] + }; +*/ + + +$("#trendDiv2 a").click(function(){ + $("#trendDiv2 a").removeClass("active") + $(this).addClass("active") + //var v = $(this).attr("t-v"); + loadRentTrends(city, region, name); +}); + +/* 小区租金走势 */ + +function loadRentTrends(city, region, name){ + var type = $("#trendDiv2 a.active").attr("t-v") + axios.get("/rest/trend/distRentTrends", { + params: { + city: city, + region:region, + name:name, + type:type + } + }).then(function (response) { + var re = response.data.data + + + var categories = new Array(); + var series = new Array(); + + var m = re.times; + var pm = re.distMap + var rooms = re.rooms; + + if(m && rooms.length>0){ + + for(var i=0;i +
  • + +
    +
    +
    基本信息
    +
    +
    +
    +
  • +
  • + +
    +
    +
    +
    +

    + + {{finishBuildingDate}} +

    + +

    + + {{cubagePercent}} +

    + +

    + + {{virescencePercent}} +

    + +

    + + {{moreArea}} +

    + +

    + + {{developer}} +

    + +

    + + {{estateCompany}} +

    +
    +
    +

    + + {{householdCount}} +

    + +

    + + {{carSiteCount}} +

    + +

    + + {{estateCharge}}元/㎡/月 +

    +
    +
    +
    +
    +
    +
  • + + `, + data: function(){ + return dataParam; + }, + methods: { + loadDistrictInfo:function(){ + axios.get("/rest/districts/detail", { + params: { + city: city, + region:region, + name: name + } + }).then(function (response) { + var vo = response.data.data.detail + var cityPrice = response.data.data.cityPrice + var collected = response.data.data.collected + if(cityPrice){ + baseInfo.cityPrice = cityPrice + } + if(collected){ + $(".collection02").show(); + $(".collection01").hide(); + }else{ + $(".collection02").hide(); + $(".collection01").show(); + } + if(vo){ + if(vo.avgPrice){ + lat = vo.lat2; + lng = vo.lng2; + address = vo.address; + + + baseInfo.city = vo.city + baseInfo.region = vo.region + baseInfo.address = vo.address; + baseInfo.name = vo.name + + tags = vo.poiTags; + + if(vo.poiTags){ + if(vo.poiTags.length>=3){ + baseInfo.tags = vo.poiTags.slice(0,3); + }else{ + baseInfo.tags = vo.poiTags; + } + } + + baseInfo.avgPrice = vo.avgPrice; + baseInfo.oneMonthUpDownRange = vo.oneMonthUpDownRange; + if(vo.rank){ + baseInfo.priceRate = vo.rank.substring(0, vo.rank.indexOf("/")); + } + + baseInfo.cityPrice = cityPrice; + var finishDate = "" + if(vo.finishBuildingDate){ + if(vo.finishBuildingDate.indexOf("~")!=-1){ + finishDate = vo.finishBuildingDate.replace("年",""); + }else{ + finishDate = vo.finishBuildingDate.substring(0,4)+"年" + } + } + + dataParam.finishBuildingDate = finishDate; + dataParam.householdCount = vo.householdCount; + dataParam.cubagePercent = vo.cubagePercent; + dataParam.carSiteCount = vo.carSiteCount; + dataParam.virescencePercent = vo.virescencePercent; + dataParam.estateCharge = vo.estateCharge; + dataParam.moreArea = vo.moreArea; + dataParam.developer = vo.developer; + dataParam.estateCompany = vo.estateCompany; + +// loadNearDistrict(vo.lat2, vo.lng2); + }else{ + $("#noDataDiv").show() + //baseInfo.districtName = "小区详情" + } + } + + }).catch(function (error) { + alert(error) + console.log(error); + }); + } + },mounted:function(){ + this.loadDistrictInfo(); + } +}) + diff --git a/fangija-zsyf/views/component/mapComponent.js b/fangija-zsyf/views/component/mapComponent.js new file mode 100644 index 0000000..b9064f9 --- /dev/null +++ b/fangija-zsyf/views/component/mapComponent.js @@ -0,0 +1,43 @@ +var distDatas = {nearDists: []} +Vue.component('map-component', { + template: ` + + `, + data: function(){ + return distDatas; + }, + methods: { + loadMap:function(){ + alert("map:"+lat+"address:"+address); + baseInfo.address = address; + if(lat && lng && address){ + + loadMapPoi(); + }else{ + axios.get("/rest/districts/detail", { + params: { + city: city, + region:region, + name: name + } + }).then(function (response) { + console.log("map finish.....") + var vo = response.data.data.detail + if(vo.avgPrice){ + lat = vo.lat2; + lng = vo.lng2; + loadMapPoi(); + } + }).catch(function (error) { + alert(error) + console.log(error); + }); + } + + } + }, + mounted:function(){ + alert("map start.....") + this.loadMap(); + } +}) \ No newline at end of file diff --git a/fangija-zsyf/views/component/nearDist.js b/fangija-zsyf/views/component/nearDist.js new file mode 100644 index 0000000..4584432 --- /dev/null +++ b/fangija-zsyf/views/component/nearDist.js @@ -0,0 +1,64 @@ +var distDatas = {nearDists: []} +Vue.component('near-dist-component', { + template: ` +
    +
    附近小区
    +
    +
    +
    + +
    +
    {{dist.name}}
    +
    +
    {{dist.avgPrice}}元/㎡
    +
    + +
    + +
    +
    +
    +
    + `, + data: function(){ + return distDatas; + }, + methods: { + loadNearDistrict:function(){ + axios.get("/rest/districts/nearDistrict", { + params: { + city: city, + region:region, + name: name + } + }).then(function (response) { + var datas = response.data.data + if(datas){ + var ret = [] + for(var v in datas){ + var o = datas[v] + if(o.city == city && o.district == region && o.name == name){ + continue; + }else{ + if(ret.length <= 5){ + ret.push(o); + } + } + } + distDatas.nearDists = ret; + + $("#nearDistDiv .cardNearbyWin").css("width",(7.5*ret.length)+"rem"); + }else{ + $("#nearDistDiv").hide() + } + + }).catch(function (error) { + alert(error) + console.log(error); + }); + } + }, + mounted:function(){ + this.loadNearDistrict(); + } +}) \ No newline at end of file diff --git a/fangija-zsyf/views/component/roomRent.js b/fangija-zsyf/views/component/roomRent.js new file mode 100644 index 0000000..d901511 --- /dev/null +++ b/fangija-zsyf/views/component/roomRent.js @@ -0,0 +1,47 @@ +var rentPricesData = {rentPrices: []} +Vue.component('room-rent-component', { + template: ` +
    +
    +
    +
    {{dist.avgPrice}} 元/月
    {{dist.houseType}}室
    +
    +
    +
    + `, + data: function(){ + return rentPricesData; + }, + methods: { + loadRoomRent:function(){ + axios.get("/rest/trend/roomRent", { + params: { + city: city, + region:region, + name: name + } + }).then(function (response) { + var datas = response.data.data + if(datas){ + var ret = [] + for(var v in datas){ + var o = datas[v] + ret.push(o); + } + rentPricesData.rentPrices = ret; + + $("#roomDiv .cardRentWin").css("width",(6*ret.length)+"rem"); + }else{ + $("#roomDiv").hide() + } + + }).catch(function (error) { + alert(error) + console.log(error); + }); + } + }, + mounted:function(){ + this.loadRoomRent(); + } +}) \ No newline at end of file diff --git a/fangija-zsyf/views/component/trends.js b/fangija-zsyf/views/component/trends.js new file mode 100644 index 0000000..ce57843 --- /dev/null +++ b/fangija-zsyf/views/component/trends.js @@ -0,0 +1,241 @@ +var rentPricesData = {rentPrices: []} +Vue.component('room-rent-component', { + template: ` + + + `, + data: function(){ + return rentPricesData; + }, + methods: { + loadTrend:function(){ + var myChart02 = echarts.init(document.getElementById('chart02')); + myChart02.setOption(option02,true); + } + }, + mounted:function(){ + this.loadTrend(); + } +}) + + +/* 小区租金走势 */ +var option02 = { + tooltip: { + trigger: 'axis', + textStyle: { + fontFamily: 'arial,华文细黑', + fontSize: 12 + }, + formatter: '{a0}: {c0}元/月
    {a1}: {c1}元/月
    {a2}: {c2}元/月
    {a3}: {c3}元/月
    {a4}: {c4}元/月' + }, + grid:{ + x: 54, + y: 10, + x2: 16, + y2: 60, + borderWidth: 1 + }, + color: ['#F88C9F', '#FFBF5C', '#AAD672', '#78CDE6', '#AE94E9'], + legend: { + data: ['一室', '二室', '三室', '四室', '五室'], + y: 'bottom', + textStyle: { + fontFamily: '华文细黑', + fontWeight: 'bold' + }, + itemWidth: 16, + itemHeight: 8 + }, + xAxis: { + type: 'category', + boundaryGap: false, + axisLine: { + lineStyle: { + color: '#ccc' + } + }, + axisLabel: { + textStyle: { + fontFamily: 'arial', + color: '#666' + } + }, + data: ['2017-02', '2017-03', '2017-04', '2017-05', '2017-06', '2017-07', + '2017-08', '2017-09', '2017-10', '2017-11', '2017-12', '2018-01'], + }, + yAxis: { + type: 'value', + axisLine: { + lineStyle: { + color: '#ccc' + } + }, + axisLabel: { + textStyle: { + fontFamily: 'arial', + color: '#666' + } + } + }, + series: [ + { + name: '一室', + type: 'line', + symbol: 'circle', + symbolSize: 6, + data: [2200, 2040, 2790, 2940, 2360, 2440, 2220, 2490, 2740, 2480, 2500, 2860] + }, + { + name: '二室', + type: 'line', + symbol: 'circle', + symbolSize: 6, + data: [3200, 3040, 3790, 3940, 3360, 3440, 3220, 3490, 3740, 3480, 3500, 3860] + }, + { + name: '三室', + type: 'line', + symbol: 'circle', + symbolSize: 6, + data: [4200, 4040, 4790, 4940, 4360, 4440, 4220, 4490, 4740, 4480, 4500, 4860] + }, + { + name: '四室', + type: 'line', + symbol: 'circle', + symbolSize: 6, + data: [5200, 5040, 5790, 5940, 5360, 5440, 5220, 5490, 5740, 5480, 5500, 5860] + }, + { + name: '五室', + type: 'line', + symbol: 'circle', + symbolSize: 6, + data: [6200, 6040, 6790, 6940, 6360, 6440, 6220, 6490, 6740, 6480, 6500, 6860] + } + ] +}; + + +function loadRentTrends(city, region, name){ + var type = $("#trendDiv2 a.active").attr("t-v") + axios.get("/rest/trend/distRentTrends", { + params: { + city: city, + region:region, + name:name, + type:type + } + }).then(function (response) { + var re = response.data.data + + + var categories = new Array(); + var series = new Array(); + + var m = re.times; + var pm = re.distMap + var rooms = re.rooms; + + if(m && rooms.length>0){ + + for(var i=0;i + + + + +位置及周边 + + + + + + + + + + + + + + +
    +
    +
    + + +

    位置及周边

    +
    +
    +
    地铁
    +
    +
    + + +
    公交
    +
    +
    +
    学校
    +
    +
    +
    医院
    +
    +
    +
    银行
    +
    +
    +
    购物
    +
    +
    +
    房屋
    +
    +
    +
    嫌恶
    +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fangija-zsyf/views/district/arround.html b/fangija-zsyf/views/district/arround.html new file mode 100644 index 0000000..7e4229f --- /dev/null +++ b/fangija-zsyf/views/district/arround.html @@ -0,0 +1,132 @@ + + + + + +位置及周边 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fangija-zsyf/views/district/detail.html b/fangija-zsyf/views/district/detail.html new file mode 100644 index 0000000..73a9981 --- /dev/null +++ b/fangija-zsyf/views/district/detail.html @@ -0,0 +1,331 @@ + + + + + +小区详情 + + + + + + + + + + + + + + + + + +
    +
    +
    + +

    {{name}}

    +
    +
    +
    +
      +
    • +
      +
      +
      +
      {{city}}{{region}}{{address}}
      + + +
      +
      + + {{tag}} + +
      +
      +
      +
    • +
    +
    +
    +
    + 当前参考均价 +
    +
    +
    {{avgPrice}}元/㎡
    +
    + +
    +
    +
    小区走势分析
    +
    +
    +
    + 均价 + 租金 +
    +
    +
    +
    +
    +
    + 半年 + 一年 + 三年 +
    +
    +
    +
    +
    +
    +
    + 半年 + 一年 +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    小区评级结果:
    +
    +
    +
    +
    + + +
    + +
    + + +
    +
    位置及周边
    + +
    + + +
    + +
    + +
    + +
    +
    + +

    您的小区数据目前仍在更新
    敬请期待

    +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fangija-zsyf/views/evaluate/evaluateList.html b/fangija-zsyf/views/evaluate/evaluateList.html index 2956840..1fb4c7c 100644 --- a/fangija-zsyf/views/evaluate/evaluateList.html +++ b/fangija-zsyf/views/evaluate/evaluateList.html @@ -92,7 +92,7 @@ $.init() $(document).on('click','.open-vertical-modal', function () { //获取对应
  • 栏目存储的houseinfo id var id = $(this).attr("id"); - var houseStatus = $(this).attr("houseStatus"); + var houseStatus = 0; $.modal({ title: '房产用途', verticalButtons: true, diff --git a/fangija-zsyf/views/house/add.html b/fangija-zsyf/views/house/add.html index 5014f09..6a4162f 100644 --- a/fangija-zsyf/views/house/add.html +++ b/fangija-zsyf/views/house/add.html @@ -1575,14 +1575,20 @@ function addEvaluation(){ address:$("input[name=address]").val(), estateType:$("#input_houseType").val(), loudongName:$("#input_building").val(), - floorName:$("input[name=floorName]").val(), - floors:$("#input_floor").val(), + floorName:$("#input_floor").val(), area:$("#input_area").val() } }) .then(function (response) { if(response.data.data!=null && response.data.data.success){ - alert("添加成功!"); + var id = response.data.data.id; + mui.openWindow({ + url: 'detail.html', + id:'detail.html', + extras:{ + id:id + } + }); }else{ $.toast(response.data.message); } diff --git a/fangija-zsyf/views/house/detail.html b/fangija-zsyf/views/house/detail.html index 6990a30..0a2ef42 100644 --- a/fangija-zsyf/views/house/detail.html +++ b/fangija-zsyf/views/house/detail.html @@ -3,7 +3,7 @@ -龙盛佳苑 + @@ -28,6 +28,7 @@ .cardPrice01 .card-footer span label{display:inline-block;} .cardPrice01 .card-footer span em{display:inline-block;color:#F18D00;} .cardPrice01 .card-footer span em strong{font-size:0.8rem;} + .list-block .item-title small label{color: #999;font-size: 0.7rem;} @@ -35,12 +36,12 @@
    -
    +
    - -

    龙盛佳苑

    +

    {{name}}

    @@ -49,29 +50,29 @@
    -
    龙盛佳苑上海-静安
    +
    {{name}}{{cityRegion}}
    -
    2室1厅  60m  1/6层
    +
      {{area}}m  
    - 自住 + {{liveStatus}}
  • 房屋估价 - 公寓 + {{estatetype}}
    -
    391万
    +
    {{Math.round(totalPrice/10000)}}万
    @@ -97,38 +98,6 @@ -
    -
    -
    -
      -
    • -
      -
      目前状态
      -
      出租
      -
      -
    • -
    • -
      -
      出租日期
      -
      2018/02/01 - 2018/07/31
      -
      -
    • -
    • -
      -
      每期租金
      -
      5,000元 (1月/次)
      -
      -
    • -
    • -
      -
      下次收租
      -
      3月1日
      -
      -
    • -
    -
    -
    -
    @@ -136,13 +105,58 @@
  • 市场交易活跃度
    -
    较差
    +
    + 很差 +
    +
    + 较差 +
    +
    + 良好 +
    +
    + 很好 +
  • 小区潜力指数
    -
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
  • @@ -151,20 +165,20 @@
    -
    龙盛佳苑在上海市:
    +
    {{name}}在{{city}}市:
    -

    涨幅(近12个月)超过了69.7%的住宅

    - +

    涨幅(近12个月)超过了{{roseRanking}}%的住宅

    + 0%100%
    -

    均价超过了64.14%的住宅

    -
    +

    均价超过了{{avgpriceRanking}}%的住宅

    +
    - 65,241元/㎡ + {{price}}元/㎡
    - - 相对最低
    9,290元/㎡
    相对最高
    194,953元/㎡
    + + 相对最低
    {{minSellPrice}}元/㎡
    相对最高
    {{maxSellPrice}}元/㎡
    @@ -200,33 +214,15 @@
    -
    +
    小区本月租金
      -
    • +
    • -
      一居室
      -
      1729-3228 元/月
      -
      -
    • -
    • -
      -
      二居室
      -
      2355-3974 元/月
      -
      -
    • -
    • -
      -
      三居室
      -
      2772-4990 元/月
      -
      -
    • -
    • -
      -
      四居室
      -
      3987-6449 元/月
      +
      {{rentRoom.houseType}}居室
      +
      {{Math.round(rentRoom.avgPrice*0.75)}}-{{Math.round(rentRoom.avgPrice*1.4)}} 元/月
    @@ -276,25 +272,98 @@ Zepto = $ $.config = {router: false} - + - + + + + + + + + + + + + + + +
    +
    +
    + +

    {{name}}

    +
    +
    +
    +
      +
    • +
      +
      +
      +
      {{city}}{{region}}{{address}}
      + + +
      +
      + + {{tag}} + +
      + +
      + 小区关注 + 生活便利 +
      +
      +
      +
    • +
    +
    +
    + +
    + + +
    + +
    + + +
    +
    小区租金走势 +
    +
    + 半年 + 一年 +
    +
    +
    +
    +
    +
    +
    + +
    +
    位置及周边
    + +
    + +
    + +
    + +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fangija-zsyf/views/user/bindingMobile.html b/fangija-zsyf/views/user/bindingMobile.html index 7698f1b..6c112ab 100644 --- a/fangija-zsyf/views/user/bindingMobile.html +++ b/fangija-zsyf/views/user/bindingMobile.html @@ -176,6 +176,7 @@ var vue = new Vue({ // 绑定手机 binding: function() { if (this.checkMobile() && this.checkSmsCode()) { + plus.nativeUI.showWaiting(); axios.post("/rest/user/bindMobile", { mobile:this.mobile, smsCode:this.smsCode, @@ -201,9 +202,11 @@ var vue = new Vue({ } else { $.toast(resData.message); } + plus.nativeUI.closeWaiting(); }) .catch(function (error) { $.toast(error); + plus.nativeUI.closeWaiting(); }); } } diff --git a/fangija-zsyf/views/user/passLogin.html b/fangija-zsyf/views/user/passLogin.html index bf9bb1c..1f3f3a4 100644 --- a/fangija-zsyf/views/user/passLogin.html +++ b/fangija-zsyf/views/user/passLogin.html @@ -124,6 +124,7 @@ new Vue({ $.toast("请输入密码"); return; } + plus.nativeUI.showWaiting(); axios.post("/rest/user/passLogin", {mobile:this.mobile, pass: $.md5(this.pass), pushClientId:getPushInfo()}) .then(function (response) { var resData = response.data; @@ -137,9 +138,11 @@ new Vue({ } else { $.toast(resData.message); } + plus.nativeUI.closeWaiting(); }) .catch(function (error) { $.toast(error); + plus.nativeUI.closeWaiting(); }); } }, diff --git a/fangija-zsyf/views/user/updatePass.html b/fangija-zsyf/views/user/updatePass.html index ed87ad8..c3c8256 100644 --- a/fangija-zsyf/views/user/updatePass.html +++ b/fangija-zsyf/views/user/updatePass.html @@ -115,6 +115,7 @@ new Vue({ $.toast("请输入6位以上数字或字母"); return; } + plus.nativeUI.showWaiting(); axios.post("/rest/user/upass", {newPass: $.md5(this.pass)}) .then(function (response) { var resData = response.data; @@ -124,9 +125,11 @@ new Vue({ } else { $.toast(resData.message); } + plus.nativeUI.closeWaiting(); }) .catch(function (error) { $.toast(error); + plus.nativeUI.closeWaiting(); }); }, /* 密码显示&隐藏 */ diff --git a/fangija-zsyf/yfindex.html b/fangija-zsyf/yfindex.html index 50a04d6..e34a07d 100644 --- a/fangija-zsyf/yfindex.html +++ b/fangija-zsyf/yfindex.html @@ -1173,7 +1173,7 @@ /* 关闭路由,以实现不同页面之间的相互跳转(仅开发环境需要) */ Zepto = $ $.config = {router: false} - +var cat = "" @@ -1213,6 +1213,7 @@ var lat = 0; var lng = 0; var address = ""; var timestamp1 = new Date().getTime(); + document.addEventListener('plusready', onPlusReady, false); //扩展API加载完毕,现在可以正常调用扩展API function onPlusReady(){ @@ -1503,7 +1504,7 @@ function initNearDistricts(cityParam,latParam,lngParam,regionParam,order,minPric textStr = textName.substr(0,5)+ "..."; } - html += '
    '+ + html += '
    '+ textStr+ '
    '+response.data.data.dtos[i].avgPrice+'元/㎡
    '; @@ -1889,7 +1890,7 @@ function addItems(number, lastIndex) { tagStr += '
    '; } html += '
  • '+ - ''+ + ''+ '
    '+ dataObj2[i].districtName+'
    ¥'+dataObj2[i].avgPrice+'元/㎡
    '+ '
    '+ @@ -2604,6 +2605,14 @@ function openNewsView(newId) { } } +function openDistWindow(city, region, name){ + + if(cat == "rent"){ + clicked('views/rent/rent.html',true,false,{},{city:city,region:region,name:name}) + }else{ + clicked('views/district/detail.html',true,false,{},{city:city,region:region,name:name}); + } +}