From 3df13f45bad6857ebef06421c6f580530fdf239c Mon Sep 17 00:00:00 2001 From: "xuhe@fangjia.com" Date: Thu, 29 Mar 2018 13:11:34 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/yfindex.html | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/fangija-zsyf/yfindex.html b/fangija-zsyf/yfindex.html index aaff9b5..32836f6 100644 --- a/fangija-zsyf/yfindex.html +++ b/fangija-zsyf/yfindex.html @@ -75,7 +75,7 @@ {{regionRank}} - + {{priceRate}}% @@ -201,7 +201,7 @@ -
+
@@ -1207,6 +1207,7 @@ var scoreCount = 0; var lat = 0; var lng = 0; var address = ""; +var timestamp1 = new Date().getTime(); document.addEventListener('plusready', onPlusReady, false); //扩展API加载完毕,现在可以正常调用扩展API function onPlusReady(){ @@ -1354,6 +1355,16 @@ function initBaseInfo(city,region,address,lat,lng){ $(".loadingBg").hide(); }) .catch(function (error) { + setTimeout(function(){ + mui.init(); + mui.openWindow({ + url: 'error.html', + id:'error.html', + extras:{ + //扩展参数 + } + }); + },10000) console.log(error); }); initNearDistricts(cityParam,latParam,lngParam,regionParam,0,0,0,""); @@ -1817,6 +1828,7 @@ function addItems(number, lastIndex) { // 添加新条目 if(lastIndex2 == 0){ $('.infinite-scroll-bottom .list-container').html(html); + $("#nearDistrictContainer").show(); }else{ $('.infinite-scroll-bottom .list-container').append(html); } @@ -2069,7 +2081,7 @@ function req(cityStr){ initRegionSelect(city); $(".region a").text('不限'); $("#select_price_div a").text('不限'); - potenialIndex(city,sort); + //potenialIndex(city,sort); } function openUrl(url){ @@ -2395,6 +2407,7 @@ function getCityPriceLevel(cityParam){ } function getDistrictList(cityParam,latParam,lngParam,regionParam,order,minPrice,maxPrice,tag){ + $("#nearDistrictContainer").hide(); latParam=0; lngParam=0; axios.get(BASE_PATH+"/rest/index/districtList", { From a597056747ee73fb8f58c50afb39ea760f534945 Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Thu, 29 Mar 2018 16:50:39 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/evaluate/evaluateList.html | 41 ++++++++++++++++--- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/fangija-zsyf/views/evaluate/evaluateList.html b/fangija-zsyf/views/evaluate/evaluateList.html index 0eb1011..c6a0eb4 100644 --- a/fangija-zsyf/views/evaluate/evaluateList.html +++ b/fangija-zsyf/views/evaluate/evaluateList.html @@ -119,7 +119,11 @@ function selectEvaluateList(){ uid: uid } }).then(function (response) { - var results = response.data.data; + var resultsMap = response.data.data; + var results = resultsMap.houseInfoList; + var xqOneMonthUpDownRangeMap = resultsMap.xqOneMonthUpDownRangeMap; + var cityAvgPriceMap = resultsMap.cityAvgPriceMap; + if(results!=null && results.length>0){ for(var i in results){ var result = results[i]; @@ -135,11 +139,38 @@ function selectEvaluateList(){ htmlContent = htmlContent +"
"; htmlContent = htmlContent +"
"+result.roomCount+"室"+result.hallCount+"厅  "+result.area+"m  "+result.floor+"/"+result.height+"层
"; htmlContent = htmlContent +"
"; - //控制显示效果 - htmlContent = htmlContent + "
近30天涨跌幅: "+3.37+"%
"; - - htmlContent = htmlContent + "
相比"+result.city+"均价: "+'低2888元'+"
"; + //对应城市地区小区30天涨跌幅 + //动态构建key + var xqOneMonthUpDownRangeKey = result.city+"-"+result.region +"-"+result.name; + //取得key对于的value + var xqOneMonthUpDownRangeValue = xqOneMonthUpDownRangeMap[xqOneMonthUpDownRangeKey]; + if(!isNaN(xqOneMonthUpDownRangeValue)){ + //涨跌幅大于零 + if(parseFloat(xqOneMonthUpDownRangeValue)>=0){ + htmlContent = htmlContent + "
近30天涨跌幅: "+xqOneMonthUpDownRangeValue+"%
"; + }else{ + //涨跌幅小于零 + htmlContent = htmlContent + "
近30天涨跌幅: "+xqOneMonthUpDownRangeValue+"%
"; + } + }else{ + //为非数字清空放空格 + htmlContent = htmlContent + "
近30天涨跌幅: "+ +"%
"; + } + //相比对于城市均价 + var cityAvgPriceKey = result.city; + //取得对应城市的value + var cityAvgPriceValue = cityAvgPriceMap[cityAvgPriceKey]; + if(!isNaN(cityAvgPriceValue)){ + if(parseInt(cityAvgPriceValue)>=parseInt(result.price)){ + htmlContent = htmlContent + "
相比"+result.city+"均价: "+'高'+(parseInt(cityAvgPriceValue)-parseInt(result.price))+'元'+"
"; + }else{ + htmlContent = htmlContent + "
相比"+result.city+"均价: "+'低'+(parseInt(result.price)-parseInt(cityAvgPriceValue))+'元'+"
"; + } + }else{ + //为非数字清空放空格 + htmlContent = htmlContent + "
相比"+result.city+"均价: "+' '+"
"; + } htmlContent = htmlContent + "
均价: "+result.price+"元/㎡
"; htmlContent = htmlContent + "
"+tempTotalPrice+"万
"; htmlContent = htmlContent + "
添加管理" From a07876257fff7f3fafa80023f9cdd4546b75a152 Mon Sep 17 00:00:00 2001 From: hubingliang Date: Thu, 29 Mar 2018 17:27:19 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E7=99=BB=E9=99=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/css/main.css | 27 +++++ fangija-zsyf/images/checkImg02.png | Bin 0 -> 524 bytes fangija-zsyf/images/icon-login01.png | Bin 0 -> 498 bytes fangija-zsyf/images/icon-login02.png | Bin 0 -> 823 bytes fangija-zsyf/images/icon-loginMode01.png | Bin 0 -> 2312 bytes fangija-zsyf/images/icon-loginMode02.png | Bin 0 -> 2880 bytes fangija-zsyf/images/icon-loginMode03.png | Bin 0 -> 1431 bytes fangija-zsyf/js/login/codeSms.js | 16 +++ fangija-zsyf/js/shara/sharaMine.js | 3 +- fangija-zsyf/manifest.json | 6 ++ fangija-zsyf/views/login/codeSms.html | 132 +++++++++++++++++++++++ 11 files changed, 183 insertions(+), 1 deletion(-) create mode 100644 fangija-zsyf/images/checkImg02.png create mode 100644 fangija-zsyf/images/icon-login01.png create mode 100644 fangija-zsyf/images/icon-login02.png create mode 100644 fangija-zsyf/images/icon-loginMode01.png create mode 100644 fangija-zsyf/images/icon-loginMode02.png create mode 100644 fangija-zsyf/images/icon-loginMode03.png create mode 100644 fangija-zsyf/js/login/codeSms.js create mode 100644 fangija-zsyf/views/login/codeSms.html diff --git a/fangija-zsyf/css/main.css b/fangija-zsyf/css/main.css index 9c8feee..67de03c 100644 --- a/fangija-zsyf/css/main.css +++ b/fangija-zsyf/css/main.css @@ -571,6 +571,33 @@ input::-webkit-input-placeholder{ .commentBox .icon-collection01{display:inline-block;vertical-align:text-bottom;margin:0;} .commentBox .icon-collection02{display:inline-block;vertical-align:text-bottom;margin:0;} +/* 登录 */ +.icon-login01{width:14px;height:20px;background:url(../images/icon-login01.png) no-repeat center center;background-size:100%;vertical-align:text-bottom;} +.icon-login02{width:15px;height:19px;background:url(../images/icon-login02.png) no-repeat center center;background-size:100%;vertical-align:text-bottom;} +.icon-login03{width:15px;height:18px;background:url(../images/icon-login03.png) no-repeat center center;background-size:100%;vertical-align:text-bottom;} +.icon-loginMode01{width:30px;height:24px;background:url(../images/icon-loginMode01.png) no-repeat center center;background-size:100%;} +.icon-loginMode02{width:30px;height:24px;background:url(../images/icon-loginMode02.png) no-repeat center center;background-size:100%;} +.icon-loginMode03{width:22px;height:24px;background:url(../images/icon-loginMode03.png) no-repeat center center;background-size:100%;} +#input_phoneNumber,#input_codeSms,#input_password{left:24px;width:80%;} +#input_phoneNumber{width:50%;} +#input_feedback{width:100%;height:100px;} +.list-block .item-after .icon-eye-grey{width:0.9rem;height:0.65rem;margin-right:0;margin-top:0.25rem;} +.list-block .item-after .icon-eye-orange{width:0.9rem;height:0.65rem;margin-right:0;margin-top:0.25rem;} +.sendCode{padding:0 8px;height:27px;background:#fff;border:solid 1px #2db0fc;border-radius:3px;color:#2db0fc;text-align:center;line-height:26px;font-size:0.7rem;float:right;margin-top:-2px;} +.waiting{padding:0 8px;height:27px;background:#0a8ddf;border:solid 1px #0a8ddf;border-radius:3px;color:#fff;text-align:center;line-height:26px;font-size:0.7rem;float:right;margin-top:-2px;} +.agreement{font-size:0.65rem;color:#666;margin-left:0.75rem;} +.agreement a{font-size:0.65rem;} +.check{width:18px;height:18px;border:solid 1px #D7D7D7;border-radius:0.05rem;display:inline-block;vertical-align:middle;margin-right:0.2rem;position:relative;} +.checkImg{width:10px;height:7px;position:absolute;top:5px;left:3px;} +.loginBox p{text-align:center;margin:0;} +.loginBox p .button{margin-top:2rem;margin-bottom:0.5rem;} +.loginBox p a{font-size:0.65rem;color:#AA907A;} +.loginMode{width:100%;position:absolute;bottom:4.5rem;} +.loginMode p{font-size:0.65rem;color:#999;text-align:center;} +.loginMode p a:nth-child(2){margin:0 2rem;} +.line{width:100%;height:1px;background:#e5e5e5;margin-bottom:1.5rem;position:relative;} +.line span{position:absolute;top:-10px;left:50%;margin-left:-57.5px;display:block;background:#fff;padding:0 25px;font-size:0.65rem;color:#999;} + /* 顶部 */ .top{width:100%;padding:0.75rem 0.5rem;border-bottom:solid 1px #DCDCDC;overflow:hidden;position:absolute;top:0;z-index:10;} .top.bar{height:auto;} diff --git a/fangija-zsyf/images/checkImg02.png b/fangija-zsyf/images/checkImg02.png new file mode 100644 index 0000000000000000000000000000000000000000..bbfdccb9022f1caaa006dd61ed520eb328bd0831 GIT binary patch literal 524 zcmV+n0`vWeP)1wkj9i26%!Jgo{)BE^1+7}N3xuF7DoxPJnHw2_f>0>knbNSpjEbT~KR{?L zv~trQs9n42&Rl7cI$xYYMeWYLSGk_;`QGMR+BKu;YMQ#DKsD zpvxGBI|@i*E}^`$<_Ob%z*NToNtMe8ZvY2j$`6>f-`^2H8gUh2Nfk$ghhD(r?QC#8gQMqt7VnceM?1Cp5UqLiExeaFZ6(JrL^l%Xu+r3hl+UO6Dz zuiXYLqnsD`;+8op!>qT0)FVbRSg>;r1m%!tjWjtRt#VR@Rp1P;;D?Mh10+?(5a#TR zQSP`Eo)^vUgj|d1HOh*@F$`Dyao#r)B@uUlIKNXy{R%IdJ!VgfwgOuM{y5NI4*9xU zycQE?@I)0gh7or>54Y+0ucm3lqQXt!oBpNu!~=d?hg!saff*nZVaN-3-O9Y-9_T#X z={hSwpTM$P=R)0MLX}4%Y@*!oLf*DxUbtw#W;oqdVpWw>wpj}OkegrgD~+>h8S?&t zwK>jhZt&T*P+&uaK|kPQyD#6f$weaD7=cLk07 O00009kM4!P}3ahU1f7s0yBvrT|R(V97rk~ZGylCW}$Bc-_D<}K(dG|SD50Gx1#1Vig08y)vgbe_2f*=^m zWHSDX;6kDBg_&g%#Cspcm@CioPP+C^NdlkxN&@UCr4|5uHOA~V8jaRlHXIu)rTk7r zn*h!MWKyZr=W4b3=QVh2a6X@3XXZHodjJ-N5TmtP?W*VCTrM{*ggA^sO+*{@di~dH o&}jXCf83u@MBj!l{Tesj0gK!BM`KD6BLDyZ07*qoM6N<$f|5<#k^lez literal 0 HcmV?d00001 diff --git a/fangija-zsyf/images/icon-login02.png b/fangija-zsyf/images/icon-login02.png new file mode 100644 index 0000000000000000000000000000000000000000..b825250578c441abddd59f923cdca91ad7a77704 GIT binary patch literal 823 zcmV-71IYY|P)wzY*)#Dgg6t>UHaAv+WCRK!+FEeaxNMNzPbf(LJU^Pm?+K~Mxig!%y@ z-U@=~MG6|)&1_2QDiKlCgWung6t|ftQ_>PkVkAvc583P6ee>J@`U1;7ri^+c(vP)hAH z##|zzN5+_*L?U6&P_s|jAW}+uXi5Nhm(6CQ{bA0m^s$i*w|;!(@Lp9V~h>aDy{X$xyn=o#5z?w44rX6CdI;$9|`IUNMSufKwn+QzGG{|!2V4@uz*(RBa-002ovPDHLkV1kV| BcJ2TG literal 0 HcmV?d00001 diff --git a/fangija-zsyf/images/icon-loginMode01.png b/fangija-zsyf/images/icon-loginMode01.png new file mode 100644 index 0000000000000000000000000000000000000000..09c739bd4d90f22fdcf740a28d80e4e31d36646d GIT binary patch literal 2312 zcmV+j3HSDiP)J<}Ku;9l5R2O9% z8sNADTItt9&l6E@FH~|A6m0KN61~j;lu8EB&rL+Ff_lCY2rTHTq`$m^+Y&owXGwaU zfGaBLJP-GWvQM7p_v?Er<@Y?nZOPc@} zOeg_Xnq^(r^^AK5#gS(Po2l62VE&<_31N>6zSFNY?e6UC^md;QmI)PPVaHDl~}&MQP**hR#SzBofsgNgM$4m?EU@ zYB16`7-Pk^)w1MqJW*LfT_6zo`(Rr$88rZ$H;Dsr)KyhIZd!ePeYzZ?$uL?Mlc23G z$kKvDt)|`b-nm#K8GVv~?>j%zv{u!^16HXm7Q31~yoVXSV!m1M{6MH_doi4w-^onI zUI6%8ZonY?n`HSOMbURA5{Z#M;^kQuKO=%%#6C+zk4oOE^?tv<+lAcWF){n=HFML=XFqi-@$UkVukCm37>P|?*H#M?`szc!9L_wNMS z%OqYE5UrPA?%P#ctJ|roB7=-%^aueHD#GqSN(2GWR*|J=0-;bFGfQTobuJ`HlZfiU zJd+92z+4ST1n_A92Z`_j7;mvGn+Fee8Frd0C3Z5CQTs6PlwveoED;PrSYaPzx#~_} zIT&}jDM$uB892d&Es&&VRWziz^&K4@<3(@xS_a=+ zh6!hYUX`-=c4IjFU#B?i6+Q%DvWsAc1+iZWys~urTs8EDnTXDZgpFWK9Tw>zoVlP0rOo6Vb9YNcwsxMnKxL~pK@IrvglH>BZmn2%= z7zjUS8Szyt#E*xs!#x9mex(G%-yCqzwY0R17(2?hpDU1>2r!gjL~BdM0)jaX6fRJh z(IXMP$G}y9or;Q%j{w-Oj?xtHbL9?HHA zptj&a0=x~+$lDY}IndeKI57MmS;8BMAliS}bssnm3d(;pPDiK@X!)49Ky z$=DWvmlO_$R;gO}CuarQ|FIIWhnV=OvI!g=`g&^9cYT*Vm6F9=V~y#$x6kaXBPKeWWn3iVB}UihJu3IjQDLrh`;7Khrp93Pxr1{ zuwX$?seyN-T4$vNz2l;@St_+_JOQ^T!APs4U@IAYk%>+~@;#xd>M_^sd4N``^*Ls; z3xo?l2-{UHVsF3PD7eCwWsOl3iSGi+9Vp-lP;?>P_(8$4xZ2o zHq!F1onb`3LRtI`}z1UxL`X7`?kTc$rB!9=0}{`KBZ0w5&kez z$oD(l_PZ#8`-K=r^ac`G4Pa3@gb(gtT{0^?I1tOSzC_ucyRyt*BjBqp#AiUX2P|fO zez&tP<@CL@I6WB`b%pZCH#ntRtsBrODCnGy*9^8Z?Jzc|ZE iD9B{(GP2+$oBsj80$pB$RBDd^0000 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 literal 0 HcmV?d00001 diff --git a/fangija-zsyf/js/login/codeSms.js b/fangija-zsyf/js/login/codeSms.js new file mode 100644 index 0000000..2d3743a --- /dev/null +++ b/fangija-zsyf/js/login/codeSms.js @@ -0,0 +1,16 @@ +export default { + methods: { + checkPhoneNum (phone) { + alert("1111111111111") + } + } +} +var sendPhoneCode = new Vue({ + el:'#sendPhoneCode', + methods:{ + sendCode:function(){ + alert("222222222") + checkPhoneNum("1352222222") + } + } +}) \ No newline at end of file diff --git a/fangija-zsyf/js/shara/sharaMine.js b/fangija-zsyf/js/shara/sharaMine.js index 658be98..aa85060 100644 --- a/fangija-zsyf/js/shara/sharaMine.js +++ b/fangija-zsyf/js/shara/sharaMine.js @@ -35,7 +35,7 @@ function shareAction(sb,bh) { }else{ msg.content=sharehrefDes; } - } + } msg.thumbs=[picUrl]; msg.pictures=[picUrl]; }else{ @@ -66,6 +66,7 @@ function shareMessage(msg,s){ alert("分享到\""+s.description+"\"成功! " ); }, function(e){ + console.log(e.code+"========="+e.message) alert( "分享到\""+s.description+"\"失败 !"); } ); diff --git a/fangija-zsyf/manifest.json b/fangija-zsyf/manifest.json index 38efa1b..98399d1 100644 --- a/fangija-zsyf/manifest.json +++ b/fangija-zsyf/manifest.json @@ -312,6 +312,12 @@ "description": "可选,微信分享", "appid": "wx734a9e3085abcd90", "appsecret": "47ce59f3c52984c4e193880fb09b12af" + }, + "sina": { + "appkey": "3194052034", + "appsecret": "e863ae4e4f14d41af3142e5ae06867dd", + "redirect_uri": "http://sh.fangjia.com/", + "description": "可选,新浪微博分享" } }, "payment": {}, diff --git a/fangija-zsyf/views/login/codeSms.html b/fangija-zsyf/views/login/codeSms.html new file mode 100644 index 0000000..f8d4d9e --- /dev/null +++ b/fangija-zsyf/views/login/codeSms.html @@ -0,0 +1,132 @@ + + + + + +快捷登录 + + + + + + + + + + + + + +
+
+
+ +

快捷登录

+
+
+ +

+ + 我已阅读并接受《服务协议》 +

+ +
+

+ 第三方登录 +

+

+ + + +

+
+
+
+
+ + + + + + + + + + + + + \ No newline at end of file From ba58347b994160c18f4dd597dc54631a83bf78f5 Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Thu, 29 Mar 2018 17:32:11 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=8A=A0=E8=BD=BDloading=20=E6=95=88?= =?UTF-8?q?=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/evaluate/evaluateList.html | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/fangija-zsyf/views/evaluate/evaluateList.html b/fangija-zsyf/views/evaluate/evaluateList.html index c6a0eb4..ed8e1c4 100644 --- a/fangija-zsyf/views/evaluate/evaluateList.html +++ b/fangija-zsyf/views/evaluate/evaluateList.html @@ -27,6 +27,9 @@ .list-block .item-subtitle em.em02{font-size:0.75rem;color:#EB5F34;} .list-block .item-subtitle div.price{position:absolute;bottom:-0.3rem;right:0;} .list-block .item-subtitle div.price em strong{font-size:1.4rem;color:#EB5F34;font-weight:bold;margin-right:0.1rem;} + /**添加loading加载效果**/ + .loadingBg{width:100%;height:100%;background:#fff;overflow:hidden;position:absolute;top:71px;left:0;z-index:100;} + .loadingBg .infinite-scroll-preloader{margin-top:60%;} @@ -41,6 +44,12 @@

房产评估

+ +
+
+
+
+
@@ -49,7 +58,7 @@
- @@ -179,6 +188,9 @@ function selectEvaluateList(){ //动态追加内容 $('.list-block ul').html(htmlContent); } + //添加loading等待效果 + $(".loadingBg").hide(); + $(".content-block").show(); }).catch(function (error) { console.log(error); }); From b58cc2781afe7444581553fe3ccc29e062b9872a Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Thu, 29 Mar 2018 17:44:04 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E8=B0=83=E6=95=B4=20loading=20=E6=95=88?= =?UTF-8?q?=E6=9E=9C=EF=BC=8C=20=E8=B0=83=E6=95=B4=20js=20=E5=85=88em=20cs?= =?UTF-8?q?s=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/evaluate/evaluateList.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fangija-zsyf/views/evaluate/evaluateList.html b/fangija-zsyf/views/evaluate/evaluateList.html index ed8e1c4..4780695 100644 --- a/fangija-zsyf/views/evaluate/evaluateList.html +++ b/fangija-zsyf/views/evaluate/evaluateList.html @@ -13,9 +13,9 @@ + @@ -31,7 +36,7 @@

-


+


@@ -75,7 +80,7 @@ @@ -109,7 +114,7 @@ $.config = {router: false} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fangija-zsyf/views/house/add_noData.html b/fangija-zsyf/views/house/add_noData.html new file mode 100644 index 0000000..4bdcc9b --- /dev/null +++ b/fangija-zsyf/views/house/add_noData.html @@ -0,0 +1,54 @@ + + + + + +房产评估 + + + + + + + + + + + + + +
+
+
+ +

房产评估

+
+
+
+ +

评估房产  发现价值

+ +
+
+
+
+ + + + + + + + + + \ No newline at end of file diff --git a/fangija-zsyf/views/news/newsDetail.html b/fangija-zsyf/views/news/newsDetail.html index f8db054..0807bcb 100644 --- a/fangija-zsyf/views/news/newsDetail.html +++ b/fangija-zsyf/views/news/newsDetail.html @@ -101,6 +101,7 @@ $.config = {router: false} + @@ -109,7 +110,7 @@ $.config = {router: false} \ No newline at end of file diff --git a/fangija-zsyf/yfindex.html b/fangija-zsyf/yfindex.html index 32836f6..d5dd780 100644 --- a/fangija-zsyf/yfindex.html +++ b/fangija-zsyf/yfindex.html @@ -64,21 +64,28 @@
-
{{momAvgPrice}}元/㎡
+
暂无数据
+
{{momAvgPrice}}元/㎡
@@ -124,7 +131,7 @@
-
+
@@ -132,7 +139,7 @@
-
'+ '
'+dataObj[i].introduction+'
'+ '
'+ - ''+dataObj[i].recommendCommentCount+'条
'+ + '
'+ '
'+ '
'; } if(dataObj[i].type=="投票"){ var voteFavorCount = dataObj[i].voteFavorCount; var voteNoFavorCount = dataObj[i].voteNoFavorCount; - var voteFavorCountRate = Math.round((voteFavorCount*100)/(voteFavorCount+voteNoFavorCount)); - var voteNoFavorCountRate = 100-voteFavorCountRate; + var voteFavorCountRate = 50 + var voteNoFavorCountRate = 50 + if(voteFavorCount == 0 && voteNoFavorCount==0){ + + }else{ + voteFavorCountRate = Math.round((voteFavorCount*100)/(voteFavorCount+voteNoFavorCount)); + voteNoFavorCountRate = 100-voteFavorCountRate; + } + html += '
'+dataObj[i].title+ '
'+ ''+dataObj[i].voteFavorText+''+ @@ -1792,7 +1864,6 @@ function addItems(number, lastIndex) { } tagStr += '
'; } - html += '
  • '+ ''+ '
    '+ @@ -2329,7 +2400,7 @@ $("#select_order li").on("click", function () { //查询城市价格区间 function getCityPriceLevel(cityParam){ - axios.get(BASE_PATH+"/house/getCityPriceLevel", { + axios.get("/house/getCityPriceLevel", { params: { city: cityParam } @@ -2410,7 +2481,7 @@ function getDistrictList(cityParam,latParam,lngParam,regionParam,order,minPrice, $("#nearDistrictContainer").hide(); latParam=0; lngParam=0; - axios.get(BASE_PATH+"/rest/index/districtList", { + axios.get("/rest/index/districtList", { params: { city: cityParam, lat:latParam, @@ -2455,7 +2526,7 @@ function openNewsView(newId) { } }); var count = parseInt($("#visitCount_"+newId).text().replace("人",""))+1; - $("#visitCount_"+newId).text(count+'人'); + $("#visitCount_"+newId).text(count+'人'); } From e01253754ceecf63383a45f748c5732a00662f81 Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Fri, 30 Mar 2018 09:39:09 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E8=B0=83=E6=95=B4js=20=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/evaluate/evaluateList.html | 126 ++++++++++-------- 1 file changed, 68 insertions(+), 58 deletions(-) diff --git a/fangija-zsyf/views/evaluate/evaluateList.html b/fangija-zsyf/views/evaluate/evaluateList.html index 4780695..fb0bf9e 100644 --- a/fangija-zsyf/views/evaluate/evaluateList.html +++ b/fangija-zsyf/views/evaluate/evaluateList.html @@ -96,19 +96,21 @@ $(document).on('click','.open-vertical-modal', function () { { text: '自住', onClick: function() { - window.location.href = "01_index01_myHouse01_index.html"; + //window.location.href = "01_index01_myHouse01_index.html"; + + } }, { text: '出租', onClick: function() { - window.location.href = "01_index01_myHouse01_index.html"; + //window.location.href = "01_index01_myHouse01_index.html"; } }, { text: '空置', onClick: function() { - window.location.href = "01_index01_myHouse01_index.html"; + //window.location.href = "01_index01_myHouse01_index.html"; } }, { @@ -118,6 +120,7 @@ $(document).on('click','.open-vertical-modal', function () { }) }); +//查询房产评估列表 function selectEvaluateList(){ //先清空列表 $('.list-block ul').html(""); @@ -132,62 +135,11 @@ function selectEvaluateList(){ var results = resultsMap.houseInfoList; var xqOneMonthUpDownRangeMap = resultsMap.xqOneMonthUpDownRangeMap; var cityAvgPriceMap = resultsMap.cityAvgPriceMap; + //构造数据列表 + htmlContent = constructHtmlContent(results, xqOneMonthUpDownRangeMap, cityAvgPriceMap, htmlContent); - if(results!=null && results.length>0){ - for(var i in results){ - var result = results[i]; - var tempTotalPrice = result.totalPrice; - //考虑是否为数字,加强逻辑判断 - if(!isNaN(tempTotalPrice)){ - //转换成元,四舍五入 - tempTotalPrice = (parseFloat(tempTotalPrice)/10000).toFixed(2); - } - htmlContent = htmlContent +"
  • "; - htmlContent = htmlContent +"
    "; - htmlContent = htmlContent +"
    "+result.name+""+result.city+"-"+result.region+"
    "; - htmlContent = htmlContent +"
    "; - htmlContent = htmlContent +"
    "+result.roomCount+"室"+result.hallCount+"厅  "+result.area+"m  "+result.floor+"/"+result.height+"层
    "; - htmlContent = htmlContent +"
    "; - //对应城市地区小区30天涨跌幅 - //动态构建key - var xqOneMonthUpDownRangeKey = result.city+"-"+result.region +"-"+result.name; - //取得key对于的value - var xqOneMonthUpDownRangeValue = xqOneMonthUpDownRangeMap[xqOneMonthUpDownRangeKey]; - if(!isNaN(xqOneMonthUpDownRangeValue)){ - //涨跌幅大于零 - if(parseFloat(xqOneMonthUpDownRangeValue)>=0){ - htmlContent = htmlContent + "
    近30天涨跌幅: "+xqOneMonthUpDownRangeValue+"%
    "; - }else{ - //涨跌幅小于零 - htmlContent = htmlContent + "
    近30天涨跌幅: "+Math.abs(xqOneMonthUpDownRangeValue)+"%
    "; - } - }else{ - //为非数字清空放空格 - htmlContent = htmlContent + "
    近30天涨跌幅: "+ +"%
    "; - } - - //相比对于城市均价 - var cityAvgPriceKey = result.city; - //取得对应城市的value - var cityAvgPriceValue = cityAvgPriceMap[cityAvgPriceKey]; - if(!isNaN(cityAvgPriceValue)){ - if(parseInt(cityAvgPriceValue)>=parseInt(result.price)){ - htmlContent = htmlContent + "
    相比"+result.city+"均价: "+'高'+(parseInt(cityAvgPriceValue)-parseInt(result.price))+'元'+"
    "; - }else{ - htmlContent = htmlContent + "
    相比"+result.city+"均价: "+'低'+(parseInt(result.price)-parseInt(cityAvgPriceValue))+'元'+"
    "; - } - }else{ - //为非数字清空放空格 - htmlContent = htmlContent + "
    相比"+result.city+"均价: "+' '+"
    "; - } - htmlContent = htmlContent + "
    均价: "+result.price+"元/㎡
    "; - htmlContent = htmlContent + "
    "+tempTotalPrice+"万
    "; - htmlContent = htmlContent + "
    添加管理" - htmlContent = htmlContent +"
  • "; - } - //动态追加内容 - $('.list-block ul').html(htmlContent); - } + //动态追加内容 + $('.list-block ul').html(htmlContent); //添加loading等待效果 $(".loadingBg").hide(); $(".content-block").show(); @@ -196,6 +148,64 @@ function selectEvaluateList(){ }); } +//动态构造房产评估列表 +function constructHtmlContent(results, xqOneMonthUpDownRangeMap, cityAvgPriceMap, htmlContent){ + if(results!=null && results.length>0){ + for(var i in results){ + var result = results[i]; + var tempTotalPrice = result.totalPrice; + //考虑是否为数字,加强逻辑判断 + if(!isNaN(tempTotalPrice)){ + //转换成元,四舍五入 + tempTotalPrice = (parseFloat(tempTotalPrice)/10000).toFixed(2); + } + htmlContent = htmlContent +"
  • "; + htmlContent = htmlContent +"
    "; + htmlContent = htmlContent +"
    "+result.name+""+result.city+"-"+result.region+"
    "; + htmlContent = htmlContent +"
    "; + htmlContent = htmlContent +"
    "+result.roomCount+"室"+result.hallCount+"厅  "+result.area+"m  "+result.floor+"/"+result.height+"层
    "; + htmlContent = htmlContent +"
    "; + //对应城市地区小区30天涨跌幅 + //动态构建key + var xqOneMonthUpDownRangeKey = result.city+"-"+result.region +"-"+result.name; + //取得key对于的value + var xqOneMonthUpDownRangeValue = xqOneMonthUpDownRangeMap[xqOneMonthUpDownRangeKey]; + if(!isNaN(xqOneMonthUpDownRangeValue)){ + //涨跌幅大于零 + if(parseFloat(xqOneMonthUpDownRangeValue)>=0){ + htmlContent = htmlContent + "
    近30天涨跌幅: "+xqOneMonthUpDownRangeValue+"%
    "; + }else{ + //涨跌幅小于零 + htmlContent = htmlContent + "
    近30天涨跌幅: "+Math.abs(xqOneMonthUpDownRangeValue)+"%
    "; + } + }else{ + //为非数字清空放空格 + htmlContent = htmlContent + "
    近30天涨跌幅: "+ +"%
    "; + } + + //相比对于城市均价 + var cityAvgPriceKey = result.city; + //取得对应城市的value + var cityAvgPriceValue = cityAvgPriceMap[cityAvgPriceKey]; + if(!isNaN(cityAvgPriceValue)){ + if(parseInt(cityAvgPriceValue)>=parseInt(result.price)){ + htmlContent = htmlContent + "
    相比"+result.city+"均价: "+'高'+(parseInt(cityAvgPriceValue)-parseInt(result.price))+'元'+"
    "; + }else{ + htmlContent = htmlContent + "
    相比"+result.city+"均价: "+'低'+(parseInt(result.price)-parseInt(cityAvgPriceValue))+'元'+"
    "; + } + }else{ + //为非数字清空放空格 + htmlContent = htmlContent + "
    相比"+result.city+"均价: "+' '+"
    "; + } + htmlContent = htmlContent + "
    均价: "+result.price+"元/㎡
    "; + htmlContent = htmlContent + "
    "+tempTotalPrice+"万
    "; + htmlContent = htmlContent + "
    添加管理" + htmlContent = htmlContent +"
  • "; + } + } + return htmlContent; +} + //界面加载 $(document).ready(function () { selectEvaluateList();