diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js index 2abd5c9..1efe50c 100644 --- a/fangija-zsyf/config.js +++ b/fangija-zsyf/config.js @@ -1,10 +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.47:8086"; //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.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 e2fb4e3..ea11a5e 100644 --- a/fangija-zsyf/css/main.css +++ b/fangija-zsyf/css/main.css @@ -2,7 +2,6 @@ /* CSS Document */ /* 公用 */ -[v-cloak]{display:none;} *{font-size:16px;font-family:arial,"华文细黑";} ul li{list-style:none;} img{display:block;} @@ -849,7 +848,7 @@ input::-webkit-input-placeholder{ .topic .topicContent .topicContent_bottom01 label em{color:#EB5F34;margin-left:0.1rem;} /* 广告 */ -.ad{display:block;border-top:solid 0.5rem #f3f3f3;border-bottom:solid 0.5rem #f3f3f3;} +.ad{display:block;border-bottom:solid 0.5rem #f3f3f3;} .ad img{width:100%;} /* 图表 */ @@ -1300,14 +1299,15 @@ input[type=range]::-webkit-slider-thumb { /* 引导页 */ .swiper-container{width:100%;height:100%;background:#fff;z-index:10000;} -.swiper-slide img.guideImg01{width:90%;margin:0 auto;margin-top:7.4rem;} -.swiper-slide img.guideImg02{width:85%;margin:0 auto;margin-top:7rem;} -.swiper-slide img.guideImg03{width:55%;margin:0 auto;margin-top:8rem;} +.swiper-slide img{margin:0 auto;margin-top:7rem;} +.swiper-slide img.guideImg01{width:90%;} +.swiper-slide img.guideImg02{width:85%;} +.swiper-slide img.guideImg03{width:55%;} .swiper-slide div{position:absolute;bottom:5rem;width:100%;} -.swiper-slide p{text-align:center;} +.swiper-slide p{text-align:center;padding:0 1rem;} .swiper-slide p label{font-size:1rem;} .swiper-slide p small{font-size:0.7rem;color:#999;} -.swiper-slide div.content-block{bottom:1.5rem;} +.swiper-slide div.content-block{bottom:0.5rem;} .swiper-slide div.content-block .button{width:50%;margin:0 auto;height:2.1rem;line-height:2rem;} .swiper-pagination-bullet{width:10px;height:10px;background:#D7D7D7;opacity:1;} .swiper-pagination-bullet-active{width:22px;height:10px;background:#F18D00;border-radius:0.3rem;} @@ -1386,6 +1386,7 @@ input[type=range]::-webkit-slider-thumb { } @media(max-width:320px){ .list-block .item-title span.c3a{max-width:112px;} + .list-block .item-title label{max-width:100px;} label.spacing01{margin-right:11px;} label.spacing02{margin-right:12px;} .priceInfo div div span{width:125px;} @@ -1405,6 +1406,9 @@ input[type=range]::-webkit-slider-thumb { @media(min-height:750px){ .bar-tab{bottom:1.7rem;} .bar-tab ~ .content{bottom:4.2rem;} + .swiper-slide div{bottom:12rem;} + .swiper-slide div.content-block{bottom:5rem;} + .swiper-container-horizontal>.swiper-pagination{bottom:4rem;} } @media only screen and (-webkit-min-device-pixel-ratio:2){ .list-block .item-inner:after{-webkit-transform:scaleY(1);transform:scaleY(1);} diff --git a/fangija-zsyf/css/theme-orange.css b/fangija-zsyf/css/theme-orange.css index d6bf3cd..d9a8b4d 100644 --- a/fangija-zsyf/css/theme-orange.css +++ b/fangija-zsyf/css/theme-orange.css @@ -231,6 +231,7 @@ html:not(.watch-active-state) .theme label.label-radio:active, .priceRecovery .col-50 .button.theme{background:none;border-color:#F18D00;color:#F18D00;} .page > header.bar.theme{background:#F18D00;} +.bar .button-nav:active{color:#F18D00;} .bar-nav.theme .icon.icon-left{color:#fff;} .bar .button-link.theme{background:none;color:#F18D00;} @@ -243,6 +244,7 @@ html:not(.watch-active-state) .theme label.label-radio:active, .buttons-row.theme{background:none;} .buttons-row.theme .button{border-color:#D7D7D7;color:#999;} .buttons-row.theme .button.active{background:none;border-color:#F18D00;color:#F18D00;} +.buttons-row01.theme .button{color:#333;} .selectBox div.theme{background:none;} .selectBox div.theme.active{color:#F18D00;} diff --git a/fangija-zsyf/error.html b/fangija-zsyf/error.html index 7d6f065..99284f4 100644 --- a/fangija-zsyf/error.html +++ b/fangija-zsyf/error.html @@ -11,33 +11,13 @@ - + @@ -46,9 +26,10 @@ header {
-
-
-

+
+
diff --git a/fangija-zsyf/js/RichMarker_min.js b/fangija-zsyf/js/RichMarker_min.js new file mode 100644 index 0000000..95e0f87 --- /dev/null +++ b/fangija-zsyf/js/RichMarker_min.js @@ -0,0 +1 @@ +var BMapLib=window.BMapLib=BMapLib||{};(function(){var a=a||{guid:"$BAIDU$"};(function(){window[a.guid]={};a.extend=function(h,f){for(var g in f){if(f.hasOwnProperty(g)){h[g]=f[g]}}return h};a.lang=a.lang||{};a.lang.guid=function(){return"TANGRAM__"+(window[a.guid]._counter++).toString(36)};window[a.guid]._counter=window[a.guid]._counter||1;window[a.guid]._instances=window[a.guid]._instances||{};a.lang.Class=function(f){this.guid=f||a.lang.guid();window[a.guid]._instances[this.guid]=this};window[a.guid]._instances=window[a.guid]._instances||{};a.lang.isString=function(f){return"[object String]"==Object.prototype.toString.call(f)};a.isString=a.lang.isString;a.lang.isFunction=function(f){return"[object Function]"==Object.prototype.toString.call(f)};a.lang.Event=function(f,g){this.type=f;this.returnValue=true;this.target=g||null;this.currentTarget=null};a.lang.Class.prototype.addEventListener=function(i,h,g){if(!a.lang.isFunction(h)){return}!this.__listeners&&(this.__listeners={});var f=this.__listeners,j;if(typeof g=="string"&&g){if(/[^\w\-]/.test(g)){throw ("nonstandard key:"+g)}else{h.hashCode=g;j=g}}i.indexOf("on")!=0&&(i="on"+i);typeof f[i]!="object"&&(f[i]={});j=j||a.lang.guid();h.hashCode=j;f[i][j]=h};a.lang.Class.prototype.removeEventListener=function(h,g){if(a.lang.isFunction(g)){g=g.hashCode}else{if(!a.lang.isString(g)){return}}!this.__listeners&&(this.__listeners={});h.indexOf("on")!=0&&(h="on"+h);var f=this.__listeners;if(!f[h]){return}f[h][g]&&delete f[h][g]};a.lang.Class.prototype.dispatchEvent=function(j,f){if(a.lang.isString(j)){j=new a.lang.Event(j)}!this.__listeners&&(this.__listeners={});f=f||{};for(var h in f){j[h]=f[h]}var h,g=this.__listeners,k=j.type;j.target=j.target||this;j.currentTarget=this;k.indexOf("on")!=0&&(k="on"+k);a.lang.isFunction(this[k])&&this[k].apply(this,arguments);if(typeof g[k]=="object"){for(h in g[k]){g[k][h].apply(this,arguments)}}return j.returnValue};a.dom=a.dom||{};a.dom._g=function(f){if(a.lang.isString(f)){return document.getElementById(f)}return f};a._g=a.dom._g;a.event=a.event||{};a.event._listeners=a.event._listeners||[];a.event.on=function(g,j,l){j=j.replace(/^on/i,"");g=a.dom._g(g);var k=function(n){l.call(g,n)},f=a.event._listeners,i=a.event._eventFilter,m,h=j;j=j.toLowerCase();if(i&&i[j]){m=i[j](g,j,k);h=m.type;k=m.listener}if(g.addEventListener){g.addEventListener(h,k,false)}else{if(g.attachEvent){g.attachEvent("on"+h,k)}}f[f.length]=[g,j,l,k,h];return g};a.on=a.event.on;a.event.un=function(h,k,g){h=a.dom._g(h);k=k.replace(/^on/i,"").toLowerCase();var n=a.event._listeners,i=n.length,j=!g,m,l,f;while(i--){m=n[i];if(m[1]===k&&m[0]===h&&(j||m[2]===g)){l=m[4];f=m[3];if(h.removeEventListener){h.removeEventListener(l,f,false)}else{if(h.detachEvent){h.detachEvent("on"+l,f)}}n.splice(i,1)}}return h};a.un=a.event.un;a.preventDefault=a.event.preventDefault=function(f){if(f.preventDefault){f.preventDefault()}else{f.returnValue=false}}})();var e=BMapLib.RichMarker=function(h,f,g){if(!h||!f||!(f instanceof BMap.Point)){return}this._map=null;this._content=h;this._position=f;this._container=null;this._size=null;g=g||{};this._opts=a.extend(a.extend(this._opts||{},{enableDragging:false,anchor:new BMap.Size(0,0)}),g)};e.prototype=new BMap.Overlay();e.prototype.initialize=function(g){var f=this,h=f._container=document.createElement("div");f._map=g;a.extend(h.style,{position:"absolute",zIndex:BMap.Overlay.getZIndex(f._position.lat),background:"#FFF",cursor:"pointer"});g.getPanes().labelPane.appendChild(h);f._appendContent();f._setEventDispath();f._getContainerSize();return h};e.prototype.draw=function(){var h=this._map,g=this._opts.anchor,f=h.pointToOverlayPixel(this._position);this._container.style.left=f.x+g.width+"px";this._container.style.top=f.y+g.height+"px"};e.prototype.enableDragging=function(){this._opts.enableDragging=true};e.prototype.disableDragging=function(){this._opts.enableDragging=false};e.prototype.isDraggable=function(){return this._opts.enableDragging};e.prototype.getPosition=function(){return this._position};e.prototype.setPosition=function(f){if(!f instanceof BMap.Point){return}this._position=f;this.draw()};e.prototype.getAnchor=function(){return this._opts.anchor};e.prototype.setAnchor=function(f){if(!f instanceof BMap.Size){return}this._opts.anchor=f;this.draw()};e.prototype._appendContent=function(){var g=this._content;if(typeof g=="string"){var h=document.createElement("DIV");h.innerHTML=g;if(h.childNodes.length==1){g=(h.removeChild(h.firstChild))}else{var f=document.createDocumentFragment();while(h.firstChild){f.appendChild(h.firstChild)}g=f}}this._container.innerHTML="";this._container.appendChild(g)};e.prototype.getContent=function(){return this._content};e.prototype.setContent=function(f){if(!f){return}this._content=f;this._appendContent()};e.prototype._getContainerSize=function(){if(!this._container){return}var g=this._container.offsetHeight;var f=this._container.offsetWidth;this._size=new BMap.Size(f,g)};e.prototype.getWidth=function(){if(!this._size){return}return this._size.width};e.prototype.setWidth=function(f){if(!this._container){return}this._container.style.width=f+"px";this._getContainerSize()};e.prototype.getHeight=function(){if(!this._size){return}return this._size.height};e.prototype.setHeight=function(f){if(!this._container){return}this._container.style.height=f+"px";this._getContainerSize()};e.prototype._setEventDispath=function(){var k=this,l=k._container,g=false,i=null;function j(p){var p=window.event||p,n=p.pageX||p.clientX||0,q=p.pageY||p.clientY||0,o=new BMap.Pixel(n,q),m=k._map.pixelToPoint(o);return{pixel:o,point:m}}a.on(l,"onclick",function(m){c(k,"onclick");d(m)});a.on(l,"ontouchend",function(m){c(k,"ontouchend");c(k,"onclick");d(m)});a.on(l,"ondblclick",function(n){var m=j(n);c(k,"ondblclick",{point:m.point,pixel:m.pixel});d(n)});l.onmouseover=function(n){var m=j(n);c(k,"onmouseover",{point:m.point,pixel:m.pixel});d(n)};l.onmouseout=function(n){var m=j(n);c(k,"onmouseout",{point:m.point,pixel:m.pixel});d(n)};var h=function(n){var m=j(n);c(k,"onmouseup",{point:m.point,pixel:m.pixel});if(k._container.releaseCapture){a.un(l,"onmousemove",f);a.un(l,"onmouseup",h)}else{a.un(window,"onmousemove",f);a.un(window,"onmouseup",h)}if(!k._opts.enableDragging){d(n);return}k._container.releaseCapture&&k._container.releaseCapture();c(k,"ondragend",{point:m.point,pixel:m.pixel});g=false;i=null;k._setCursor("dragend");k._container.style.MozUserSelect="";k._container.style.KhtmlUserSelect="";k._container.style.WebkitUserSelect="";k._container.unselectable="off";k._container.onselectstart=function(){};d(n)};var f=function(o){if(!k._opts.enableDragging||!g){return}var n=j(o);var p=k._map.pointToPixel(k._position);var m=n.pixel.x-i.x+p.x;var q=n.pixel.y-i.y+p.y;i=n.pixel;k._position=k._map.pixelToPoint(new BMap.Pixel(m,q));k.draw();k._setCursor("dragging");c(k,"ondragging",{point:n.point,pixel:n.pixel});d(o)};a.on(l,"onmousedown",function(n){var m=j(n);c(k,"onmousedown",{point:m.point,pixel:m.pixel});if(k._container.setCapture){a.on(l,"onmousemove",f);a.on(l,"onmouseup",h)}else{a.on(window,"onmousemove",f);a.on(window,"onmouseup",h)}if(!k._opts.enableDragging){d(n);return}i=m.pixel;c(k,"ondragstart",{point:m.point,pixel:m.pixel});g=true;k._setCursor("dragstart");k._container.setCapture&&k._container.setCapture();k._container.style.MozUserSelect="none";k._container.style.KhtmlUserSelect="none";k._container.style.WebkitUserSelect="none";k._container.unselectable="on";k._container.onselectstart=function(){return false};d(n)})};e.prototype._setCursor=function(f){var h="";var g={moz:{dragstart:"-moz-grab",dragging:"-moz-grabbing",dragend:"pointer"},other:{dragstart:"move",dragging:"move",dragend:"pointer"}};if(navigator.userAgent.indexOf("Gecko/")!==-1){h=g.moz[f]}else{h=g.other[f]}if(this._container.style.cursor!=h){this._container.style.cursor=h}};e.prototype.remove=function(){c(this,"onremove");if(this._container){b(this._container)}if(this._container&&this._container.parentNode){this._container.parentNode.removeChild(this._container)}};function c(f,g,i){g.indexOf("on")!=0&&(g="on"+g);var h=new a.lang.Event(g);if(!!i){for(var j in i){h[j]=i[j]}}f.dispatchEvent(h)}function b(j){if(!j){return}var g=j.attributes,f="";if(g){for(var h=0,l=g.length;h -1) { + var curTime = new Date(); + if (curTime - showTimeOutTime > 5000) { + plus.nativeUI.alert("请求超时"); + showTimeOutTime = new Date(); + } + plus.nativeUI.closeWaiting(); + }else if(error=="Error: Network Error"){ if(plus.webview.getWebviewById('error.html')==null){ clicked('error.html',true,false,{},{},function(){ window.location.reload(); }) }else{ $(".loadingBg").hide(); - plus.nativeUI.closeWaiting(); + plus.nativeUI.closeWaiting(); plus.webview.getWebviewById("error.html").show(); } } diff --git a/fangija-zsyf/js/city.js b/fangija-zsyf/js/city.js new file mode 100644 index 0000000..dcfe49a --- /dev/null +++ b/fangija-zsyf/js/city.js @@ -0,0 +1,72 @@ +var renameCitys = [{"baiduCity": "阿克苏地区", "city": "阿克苏"}, + {"baiduCity": "阿勒泰地区", "city": "阿勒泰"}, + {"baiduCity": "阿里地区", "city": "阿里"}, + {"baiduCity": "博尔塔拉蒙古自治州", "city": "博尔塔拉"}, + {"baiduCity": "昌都地区", "city": "昌都"}, + {"baiduCity": "昌吉回族自治州", "city": "昌吉"}, + {"baiduCity": "白沙黎族自治县", "city": "白沙"}, + {"baiduCity": "保亭黎族苗族自治县", "city": "保亭"}, + {"baiduCity": "巴音郭楞蒙古自治州", "city": "巴音郭楞"}, + {"baiduCity": "毕节地区", "city": "毕节"}, + {"baiduCity": "昌都地区", "city": "昌都"}, + {"baiduCity": "昌江黎族自治县", "city": "昌江"}, + {"baiduCity": "楚雄彝族自治州", "city": "楚雄"}, + {"baiduCity": "澄迈县", "city": "澄迈"}, + {"baiduCity": "定安县", "city": "定安"}, + {"baiduCity": "大兴安岭地区", "city": "大兴安岭"}, + {"baiduCity": "迪庆藏族自治州", "city": "迪庆州"}, + {"baiduCity": "德宏傣族景颇族自治州", "city": "德宏州"}, + {"baiduCity": "恩施土家族苗族自治州", "city": "恩施"}, + {"baiduCity": "甘南藏族自治州", "city": "甘南"}, + {"baiduCity": "甘孜藏族自治州", "city": "甘孜州"}, + {"baiduCity": "果洛藏族自治州", "city": "果洛州"}, + {"baiduCity": "哈密地区", "city": "哈密"}, + {"baiduCity": "海北藏族自治州", "city": "海北州"}, + {"baiduCity": "海南藏族自治州", "city": "海南州"}, + {"baiduCity": "海西蒙古族藏族自治州", "city": "海西州"}, + {"baiduCity": "海东地区", "city": "海东"}, + {"baiduCity": "和田地区", "city": "和田"}, + {"baiduCity": "红河哈尼族彝族自治州", "city": "红河"}, + {"baiduCity": "黄南藏族自治州", "city": "黄南州"}, + {"baiduCity": "喀什地区", "city": "喀什"}, + {"baiduCity": "克孜勒苏柯尔克孜自治州", "city": "克孜勒苏"}, + {"baiduCity": "乐东黎族自治县", "city": "乐东"}, + {"baiduCity": "凉山彝族自治州", "city": "凉山州"}, + {"baiduCity": "临高县", "city": "临高"}, + {"baiduCity": "临夏回族自治州", "city": "临夏"}, + {"baiduCity": "陵水黎族自治县", "city": "陵水"}, + {"baiduCity": "林芝地区", "city": "林芝"}, + {"baiduCity": "那曲地区", "city": "那曲"}, + {"baiduCity": "怒江傈僳族自治州", "city": "怒江州"}, + {"baiduCity": "琼中黎族苗族自治县", "city": "琼中"}, + {"baiduCity": "黔东南苗族侗族自治州", "city": "黔东南"}, + {"baiduCity": "黔南布依族苗族自治州", "city": "黔南"}, + {"baiduCity": "黔西南布依族苗族自治州", "city": "黔西南"}, + {"baiduCity": "日喀则地区", "city": "日喀则"}, + {"baiduCity": "山南地区", "city": "山南"}, + {"baiduCity": "神农架林区", "city": "神农架"}, + {"baiduCity": "塔城地区", "city": "塔城"}, + {"baiduCity": "铜仁地区", "city": "铜仁"}, + {"baiduCity": "吐鲁番地区", "city": "吐鲁番"}, + {"baiduCity": "屯昌县", "city": "屯昌"}, + {"baiduCity": "文山壮族苗族自治州", "city": "文山州"}, + {"baiduCity": "西双版纳傣族自治州", "city": "西双版纳州"}, + {"baiduCity": "湘西土家族苗族自治州", "city": "湘西"}, + {"baiduCity": "延边朝鲜族自治州", "city": "延边"}, + {"baiduCity": "伊犁哈萨克自治州", "city": "伊犁"}, + {"baiduCity": "玉树藏族自治州", "city": "玉树州"}]; +/** + * 把百度的城市格式化成房价网的城市 + * @param baiduCity + * @returns {string} + */ +function formatBaiduCity(baiduCity) { + var newCity = ""; + for (var i = 0; i < renameCitys.length; i++) { + if (renameCitys[i].baiduCity == baiduCity) { + newCity = renameCitys[i].city; + break; + } + } + return newCity; +} diff --git a/fangija-zsyf/js/district/districtDetail.js b/fangija-zsyf/js/district/districtDetail.js index d625c0a..70c6ffc 100644 --- a/fangija-zsyf/js/district/districtDetail.js +++ b/fangija-zsyf/js/district/districtDetail.js @@ -334,194 +334,199 @@ function showTrends(v){ 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]; - 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; + 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: 1, + end: 99, + top: 5, + 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: { - link: [{ - xAxisIndex: [0, 1] - }] - }, - dataZoom: [{ - type: 'slider', - xAxisIndex: [0, 1], - realtime: false, - start: 5, - end: 95, - 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' } }, + 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: 'line', + lineStyle: { + color: '#fff', + width: 1, + type: 'solid' + }, + label: {show: false}, + triggerTooltip: true, + handle: { + show: true, + margin: -70, + 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: { - formatter: function (value) { - return echarts.format.formatTime('MM-dd', value); - } - }, - min: 'dataMin', - max: 'dataMax', - axisPointer: { - show: true + inside: true, + formatter: '{value}\n' } }, { - type: 'category', + name: '', + nameRotate: 90, + nameLocation: 'center', + nameGap: 5, + position: 'right', + nameTextStyle: { + color: '#999' + }, + scale: true, gridIndex: 1, - data: dates, - scale: false, - boundaryGap : false, - splitLine: {show: false}, + splitNumber: 2, axisLabel: {show: false}, + axisLine: {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' + splitLine: {show: false} + }], + grid: [{ + left: 20, + right: 20, + top: 60, + 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: '#F18D00', + color0: '#666', + borderColor: '#F18D00', + borderColor0: '#666' } } - }], - 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: '#F18D00', - color0: '#666', - borderColor: '#F18D00', - borderColor0: '#666' - } - } - }] - }; + }] +}; /*$("#trendDiv2 a").click(function(){ diff --git a/fangija-zsyf/js/quotations/cityDetail.js b/fangija-zsyf/js/quotations/cityDetail.js index 33f09e9..1dd4e75 100644 --- a/fangija-zsyf/js/quotations/cityDetail.js +++ b/fangija-zsyf/js/quotations/cityDetail.js @@ -15,11 +15,12 @@ function loadMyCollectCity(){ if(positionCity){ cityDetaiVue.$data.citys.push(positionCity); } - - $("#cityInfo").hide() } + $("#cityInfo").hide() plus.nativeUI.closeWaiting(); + }).catch(function (error) { + plus.nativeUI.closeWaiting(); console.log(error); }); } @@ -36,8 +37,10 @@ function loadCurCity(city){ cityInfoVue.$data.collecd = false; } } + plus.nativeUI.closeWaiting(); }).catch(function (error) { + plus.nativeUI.closeWaiting(); console.log(error); }); } @@ -50,6 +53,7 @@ function loadCityPriceInfo(city){ } }).then(function (response) { var data1 = response.data.data + if(data1){ var cityObj = new Object(); cityObj.city = data1.city @@ -62,7 +66,9 @@ function loadCityPriceInfo(city){ cityObj.rangeLevel = data1.rangeLevel cityObj.time = year + month cityInfoVue.$data.myCityMap = cityObj; + $("#priceDiv").removeClass("dn"); } + }).catch(function (error) { console.log(error); }); @@ -482,7 +488,18 @@ function collectCity(city, type){ }) return; } else { - docollectCity(city, type) + + var title = "" + if(type == 0){ + title = "您确定要添加关注?" + }else{ + title = "您确定要取消关注?" + } + + $.confirm(title, function () { + docollectCity(city, type) + }); + } } diff --git a/fangija-zsyf/js/shara/sharaMine.js b/fangija-zsyf/js/shara/sharaMine.js index c2e80fd..fbe4551 100644 --- a/fangija-zsyf/js/shara/sharaMine.js +++ b/fangija-zsyf/js/shara/sharaMine.js @@ -29,11 +29,11 @@ function shareAction(sb,bh) { if(sharehrefTitle&&sharehrefTitle!=""){ msg.title=sharehrefTitle; } - if(sharehrefDes&&sharehrefDes!=""){ + if(sharehrefTitle&&sharehrefTitle!=""){ if(sb.title=="新浪微博"){ - msg.content=shareUrl+sharehrefDes; + msg.content=shareUrl+"\t"+sharehrefTitle; }else{ - msg.content=sharehrefDes; + msg.content=sharehrefTitle; } } msg.thumbs=[picUrl]; @@ -47,7 +47,6 @@ function shareAction(sb,bh) { if ( sb.s.authenticated ) { shareMessage(msg,sb.s); } else { - plus.nativeUI.alert("---未授权---"); sb.s.authorize( function(){ shareMessage(msg,sb.s); },function(e){ diff --git a/fangija-zsyf/manifest.json b/fangija-zsyf/manifest.json index afe5ce7..ed83339 100644 --- a/fangija-zsyf/manifest.json +++ b/fangija-zsyf/manifest.json @@ -310,7 +310,7 @@ "description": "可选,微信分享", "appid": "wx734a9e3085abcd90", "appsecret": "47ce59f3c52984c4e193880fb09b12af" - } + },"qq":{"appid":"1106734669","description":"QQ分享"},"sina":{"appkey":"3194052034","appsecret":"e863ae4e4f14d41af3142e5ae06867dd","redirect_uri":"http://fangjia.com","description":"可选,新浪微博分享"} }, "payment": {}, "oauth": { @@ -1546,7 +1546,8 @@ "views/rent/rent.html", "views/district/detail.html", "views/house/houseList.html", - "views/house/cityDetail.html" + "views/house/cityDetail.html", + "views/intelligentHouse/index.html" ], "priority": 0 }, @@ -1570,7 +1571,8 @@ "/views/user/bindingMobile.html" ], "refer": [ - "views/user/passLogin.html" + "views/user/passLogin.html", + "views/user/bindingMobile.html" ], "priority": 0 }, @@ -1710,7 +1712,8 @@ "views/house/cityDetail.html": { "resources": [], "refer": [ - "views/user/codeSms.html" + "views/user/codeSms.html", + "views/district/detail.html" ], "priority": 0 }, @@ -1735,6 +1738,28 @@ "views/setting/agreement.html" ], "priority": 0 + }, + "views/intelligentHouse/index.html": { + "resources": [], + "refer": [ + "views/intelligentHouse/mapDetail.html" + ], + "priority": 0 + }, + "views/intelligentHouse/mapDetail.html": { + "resources": [], + "refer": [ + "views/intelligentHouse/aroundDetail.html" + ], + "priority": 0 + }, + "views/house/detail.html": { + "resources": [], + "refer": [ + "views/rent/rentManager.html", + "views/loan/loanInfo.html" + ], + "priority": 0 } }, "idle": { diff --git a/fangija-zsyf/views/component/cityIncreaseRankingComponent.js b/fangija-zsyf/views/component/cityIncreaseRankingComponent.js index 6998105..e06f0e1 100644 --- a/fangija-zsyf/views/component/cityIncreaseRankingComponent.js +++ b/fangija-zsyf/views/component/cityIncreaseRankingComponent.js @@ -27,8 +27,8 @@ Vue.component('city_increase_ranking',{ '{{!ci.oneMonthUpDownRange||ci.oneMonthUpDownRange==""?"暂无":Math.abs(100*ci.oneMonthUpDownRange).toFixed(2)+"%"}}'+ '
'+ '
'+ - '关注'+ - '取消'+ + '关注'+ + '取消'+ '
'+ '
'+ '
'+ @@ -48,53 +48,39 @@ Vue.component('city_increase_ranking',{ }) }, follow:function(city,event, type){ + if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ clicked('/views/user/passLogin.html',true,false,{},{},function(){ if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ }else{ - axios.get("/rest/quotations/collectCity",{params:{city:city, type:type}}).then(function(response){ - var msg = response.data.message; - if(msg != "取消关注成功" && msg != "关注成功"){ - $.toast(msg); - }else{ - $(event.target).parent().children().removeClass("dn"); - $(event.target).addClass("dn"); - reloadMyFocus() - reloadCityPotentialRanking() - plus.webview.getWebviewById('views/house/houseDetail.html').reload(); - plus.webview.getWebviewById('views/house/houseManageList.html').reload(); - plus.webview.getWebviewById('views/user/userInfo.html').reload(); - } - - //cityDetaiVue.$data.citys.push(city); - }).catch(function(error){ - console.log(error) - }) + } }) }else{ - axios.get("/rest/quotations/collectCity",{params:{city:city, type:type}}).then(function(response){ - var msg = response.data.message; - if(msg != "取消关注成功" && msg != "关注成功"){ - $.toast(msg); - }else{ - $(event.target).parent().children().removeClass("dn"); - $(event.target).addClass("dn"); - reloadMyFocus() - reloadCityPotentialRanking() - if(type == 0){ - var curDatas = cityDetaiVue.$data.citys - if(curDatas && curDatas.length>0){ - if(!IsInArray(curDatas, city)){ - cityDetaiVue.$data.citys.push(city); + $.confirm('您确定要关注'+city+"?", function () { + axios.get("/rest/quotations/collectCity",{params:{city:city, type:type}}).then(function(response){ + var msg = response.data.message; + if(msg != "取消关注成功" && msg != "关注成功"){ + $.toast(msg); + }else{ + $(event.target).parent().children().removeClass("dn"); + $(event.target).addClass("dn"); + reloadMyFocus() + reloadCityPotentialRanking() + if(type == 0){ + var curDatas = cityDetaiVue.$data.citys + if(curDatas && curDatas.length>0){ + if(!IsInArray(curDatas, city)){ + cityDetaiVue.$data.citys.push(city); + } } } } - } - - }).catch(function(error){ - console.log(error) - }) + + }).catch(function(error){ + console.log(error) + }) + }); } }, @@ -108,23 +94,26 @@ Vue.component('city_increase_ranking',{ } }) }else{ - axios.get("/rest/quotations/collectCity",{params:{city:city, type:type}}).then(function(response){ - $(event.target).parent().children().removeClass("dn"); - $(event.target).addClass("dn"); - reloadMyFocus(); - reloadCityPotentialRanking() - //plus.webview.getWebviewById('views/user/userInfo.html').reload() - var da = cityDetaiVue.$data.citys - if(da && da.length>0){ - var index = da.indexOf(city) - if(index>0){ - da.splice(index, 1) - cityDetaiVue.$data.citys = da; - } - } - }).catch(function(error){ - console.log(error) - }) + + $.confirm("您确定要取消关注?", function () { + axios.get("/rest/quotations/collectCity",{params:{city:city, type:type}}).then(function(response){ + $(event.target).parent().children().removeClass("dn"); + $(event.target).addClass("dn"); + reloadMyFocus(); + reloadCityPotentialRanking() + //plus.webview.getWebviewById('views/user/userInfo.html').reload() + var da = cityDetaiVue.$data.citys + if(da && da.length>0){ + var index = da.indexOf(city) + if(index>0){ + da.splice(index, 1) + cityDetaiVue.$data.citys = da; + } + } + }).catch(function(error){ + console.log(error) + }) + }); } } diff --git a/fangija-zsyf/views/component/cityPotentialRankingComponent.js b/fangija-zsyf/views/component/cityPotentialRankingComponent.js index 7591787..0c58bca 100644 --- a/fangija-zsyf/views/component/cityPotentialRankingComponent.js +++ b/fangija-zsyf/views/component/cityPotentialRankingComponent.js @@ -71,24 +71,26 @@ Vue.component('city_potential_ranking',{ if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ }else{ - axios.get("/rest/quotations/collectCity",{params:{city:city, type:type}}).then(function(response){ - - var msg = response.data.message; - if(msg != "取消关注成功" && msg != "关注成功"){ - $.toast(msg); - }else{ - $(event.target).parent().children().removeClass("dn"); - $(event.target).addClass("dn"); - plus.webview.getWebviewById('views/house/houseDetail.html').reload(); - plus.webview.getWebviewById('views/house/houseManageList.html').reload(); - plus.webview.getWebviewById('views/user/userInfo.html').reload(); - reloadMyFocus() - reloadCityIncreaseRanking() - //cityDetaiVue.$data.citys.push(city); - } - }).catch(function(error){ - console.log(error) - }) + $.confirm('您确定要关注'+city+"?", function () { + axios.get("/rest/quotations/collectCity",{params:{city:city, type:type}}).then(function(response){ + + var msg = response.data.message; + if(msg != "取消关注成功" && msg != "关注成功"){ + $.toast(msg); + }else{ + $(event.target).parent().children().removeClass("dn"); + $(event.target).addClass("dn"); + plus.webview.getWebviewById('views/house/houseDetail.html').reload(); + plus.webview.getWebviewById('views/house/houseManageList.html').reload(); + plus.webview.getWebviewById('views/user/userInfo.html').reload(); + reloadMyFocus() + reloadCityIncreaseRanking() + //cityDetaiVue.$data.citys.push(city); + } + }).catch(function(error){ + console.log(error) + }) + }); } }) }else{ diff --git a/fangija-zsyf/views/district/detail.html b/fangija-zsyf/views/district/detail.html index 8008351..475fa05 100644 --- a/fangija-zsyf/views/district/detail.html +++ b/fangija-zsyf/views/district/detail.html @@ -118,7 +118,7 @@ -
+
租金
@@ -149,7 +149,7 @@
-
+
diff --git a/fangija-zsyf/views/evaluate/evaluateReport.html b/fangija-zsyf/views/evaluate/evaluateReport.html index 9b38627..c7fd6f5 100644 --- a/fangija-zsyf/views/evaluate/evaluateReport.html +++ b/fangija-zsyf/views/evaluate/evaluateReport.html @@ -15,10 +15,8 @@ @@ -27,14 +25,14 @@
-
+

评估报告

-
+
  • @@ -51,7 +49,7 @@
-
+
评估总价 均价:{{avg_price}} @@ -89,7 +87,7 @@
-
+
  • diff --git a/fangija-zsyf/views/house/add.html b/fangija-zsyf/views/house/add.html index 13cb2fa..f412cfa 100644 --- a/fangija-zsyf/views/house/add.html +++ b/fangija-zsyf/views/house/add.html @@ -1267,7 +1267,23 @@ function onPlusReady(){ $("#input_city").val("上海"); $(".nowCity").text("上海"); } + getRequestId(); } + +// 生成请求ID,防止重复提交 +var requestId = ""; +function getRequestId() { + axios.get("/rest/index/id") + .then(function (response) { + if(response.data.status){ + requestId = response.data.data; + } + }) + .catch(function (error) { + console.log(error); + }); +} + /* 弹出城市选择页面 */ $(document).on("click",".open-about01", function () { $.popup(".popup-about01"); @@ -1828,7 +1844,7 @@ function checkIsLogin(){ function addEvaluation(){ var data={}; if(type==0){ - data={cityDisplay: $("#input_city").val(), + data={id:requestId,cityDisplay: $("#input_city").val(), region:$("input[name=region]").val(), district:$("#input_address").val(), address:$("input[name=address]").val(), @@ -1844,7 +1860,7 @@ function addEvaluation(){ lastRentDate:$("#input_time03").val(), houseStatus:0} }else{ - data={cityDisplay: $("#input_city").val(), + data={id:requestId,cityDisplay: $("#input_city").val(), region:$("input[name=region]").val(), district:$("#input_address").val(), address:$("input[name=address]").val(), @@ -1863,7 +1879,9 @@ function addEvaluation(){ var id = response.data.data.id; plus.webview.getWebviewById('views/house/houseManageList.html').reload(); plus.webview.getWebviewById('views/user/userInfo.html').reload(); - clicked('/views/evaluate/evaluateReport.html',true,false,{},{hid:id}) + clicked('/views/evaluate/evaluateReport.html',true,false,{},{hid:id},function(){ + getRequestId(); + }) }else{ $("#evaluation_btn").removeAttr("disabled"); $.toast(response.data.message); @@ -1874,6 +1892,7 @@ function addEvaluation(){ }); } + /* 信息输入弹窗 */ $(document).on('click','.open-modal', function () { $.modal({ diff --git a/fangija-zsyf/views/house/cityDetail.html b/fangija-zsyf/views/house/cityDetail.html index f116ae3..08fadcc 100644 --- a/fangija-zsyf/views/house/cityDetail.html +++ b/fangija-zsyf/views/house/cityDetail.html @@ -28,24 +28,24 @@
    -
    +
    -
    +
    - 取消关注 + 取消关注 关注
    当前参考均价
    -
    +
    {{myCityMap.cityTopMonthAvgPrice}}元/㎡
    暂无
    @@ -151,8 +151,14 @@ $.config = {router: false} var date = new Date(); var year = date.getFullYear()+'年'; var month = date.getMonth()+1+'月'; -var city = "神农架" -var cityInfoVue = new Vue({ +var city = "普洱" +var cityInfoVue; + +document.addEventListener('plusready', onPlusReady, false); +function onPlusReady() { + var self = plus.webview.currentWebview(); + city = self.city + cityInfoVue = new Vue({ el: '#cityInfo', data: { city:"", @@ -162,12 +168,7 @@ var cityInfoVue = new Vue({ myCityMap : [] } }); - -document.addEventListener('plusready', onPlusReady, false); -function onPlusReady() { - var self = plus.webview.currentWebview(); - var city = self.city - cityInfoVue.$data.city = city; + cityInfoVue.$data.city = city; loadCurCity(city); loadCityPriceInfo(city) loadUpOrDown(city); @@ -176,11 +177,6 @@ function onPlusReady() { } -//loadCurCity(city); -// loadCityPriceInfo(city) -// loadUpOrDown(city); -// loadHotDistrict(city) -// loadCityPricesAndCounts(city) diff --git a/fangija-zsyf/views/house/detail.html b/fangija-zsyf/views/house/detail.html index dbf255e..33ff91f 100644 --- a/fangija-zsyf/views/house/detail.html +++ b/fangija-zsyf/views/house/detail.html @@ -228,34 +228,26 @@
    小区走势分析
    -
    -
    -
    - 均价 - 租金 -
    -
    -
    -
    -
    -
    - 半年 - 一年 - 三年 -
    -
    -
    -
    -
    -
    -
    - 半年 - 一年 -
    -
    +
    +
    均价 +
    +
    +
    +
    租金 +
    +
    + 半年 + 一年 +
    +
    +
    +
    diff --git a/fangija-zsyf/views/house/houseDetail.html b/fangija-zsyf/views/house/houseDetail.html index d6cf98c..af690c8 100644 --- a/fangija-zsyf/views/house/houseDetail.html +++ b/fangija-zsyf/views/house/houseDetail.html @@ -9,7 +9,7 @@ - + @@ -172,7 +172,7 @@
    - 取消关注 + 取消关注 关注
    diff --git a/fangija-zsyf/views/house/houseList.html b/fangija-zsyf/views/house/houseList.html index 02a1b16..8a12187 100644 --- a/fangija-zsyf/views/house/houseList.html +++ b/fangija-zsyf/views/house/houseList.html @@ -57,7 +57,7 @@

    我的房产

    -
    +
    房产总值 添加房产 diff --git a/fangija-zsyf/views/rent/rent.html b/fangija-zsyf/views/rent/rent.html index 6b6d5e3..69350e7 100644 --- a/fangija-zsyf/views/rent/rent.html +++ b/fangija-zsyf/views/rent/rent.html @@ -9,7 +9,7 @@ - + @@ -153,8 +153,8 @@
    - - + + + diff --git a/fangija-zsyf/views/user/passLogin.html b/fangija-zsyf/views/user/passLogin.html index de499dd..1f1a809 100644 --- a/fangija-zsyf/views/user/passLogin.html +++ b/fangija-zsyf/views/user/passLogin.html @@ -162,17 +162,19 @@ new Vue({ } }); -var originalHeight=document.documentElement.clientHeight || document.body.clientHeight; -window.onresize=function(){ - //软键盘弹起与隐藏 都会引起窗口的高度发生变化 - var resizeHeight=document.documentElement.clientHeight || document.body.clientHeight; - if(resizeHeight*1 50){ + //当软键盘弹出,在这里面操作 + $(".loginMode").hide(); + }else{ + //当软键盘收起,在此处操作 + $(".loginMode").show(); + } +}); - } -} diff --git a/fangija-zsyf/views/user/userInfo.html b/fangija-zsyf/views/user/userInfo.html index 22c06ad..14426db 100644 --- a/fangija-zsyf/views/user/userInfo.html +++ b/fangija-zsyf/views/user/userInfo.html @@ -142,7 +142,7 @@
    -