From c4e62f5e5ee0839882258f25af6f99a5ad8fd776 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 16 Apr 2018 14:44:41 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9F=8E=E5=B8=82?= =?UTF-8?q?=E8=BF=87=E5=A4=9A=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/cityIncreaseRankingComponent.js | 32 +++++++++++----- .../cityPotentialRankingComponent.js | 37 ++++++++++++------- fangija-zsyf/views/house/cityDetail.html | 2 +- 3 files changed, 47 insertions(+), 24 deletions(-) diff --git a/fangija-zsyf/views/component/cityIncreaseRankingComponent.js b/fangija-zsyf/views/component/cityIncreaseRankingComponent.js index de7e321..231c4c6 100644 --- a/fangija-zsyf/views/component/cityIncreaseRankingComponent.js +++ b/fangija-zsyf/views/component/cityIncreaseRankingComponent.js @@ -53,12 +53,18 @@ Vue.component('city_increase_ranking',{ if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ }else{ axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){ - $(event.target).parent().children().removeClass("dn"); - $(event.target).addClass("dn"); - reloadMyFocus() - plus.webview.getWebviewById('views/house/houseDetail.html').reload(); - plus.webview.getWebviewById('views/house/houseManageList.html').reload(); - plus.webview.getWebviewById('views/user/userInfo.html').reload(); + var msg = response.data.message; + if(msg != "取消关注成功" && msg != "关注成功"){ + $.toast(msg); + }else{ + $(event.target).parent().children().removeClass("dn"); + $(event.target).addClass("dn"); + reloadMyFocus() + 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) @@ -67,10 +73,16 @@ Vue.component('city_increase_ranking',{ }) }else{ axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){ - $(event.target).parent().children().removeClass("dn"); - $(event.target).addClass("dn"); - reloadMyFocus() - cityDetaiVue.$data.citys.push(city); + var msg = response.data.message; + if(msg != "取消关注成功" && msg != "关注成功"){ + $.toast(msg); + }else{ + $(event.target).parent().children().removeClass("dn"); + $(event.target).addClass("dn"); + reloadMyFocus() + cityDetaiVue.$data.citys.push(city); + } + }).catch(function(error){ console.log(error) }) diff --git a/fangija-zsyf/views/component/cityPotentialRankingComponent.js b/fangija-zsyf/views/component/cityPotentialRankingComponent.js index 8875151..5965026 100644 --- a/fangija-zsyf/views/component/cityPotentialRankingComponent.js +++ b/fangija-zsyf/views/component/cityPotentialRankingComponent.js @@ -72,14 +72,20 @@ Vue.component('city_potential_ranking',{ alert("rrrr") }else{ axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){ - $(event.target).parent().children().removeClass("dn"); - $(event.target).addClass("dn"); - alert(city) - 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() - //cityDetaiVue.$data.citys.push(city); + + var msg = response.data.message; + if(msg != "取消关注成功" && msg != "关注成功"){ + $.toast(msg); + }else{ + $(event.target).parent().children().removeClass("dn"); + $(event.target).addClass("dn"); + alert(city) + 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() + //cityDetaiVue.$data.citys.push(city); + } }).catch(function(error){ console.log(error) }) @@ -87,11 +93,16 @@ Vue.component('city_potential_ranking',{ }) }else{ axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){ - $(event.target).parent().children().removeClass("dn"); - $(event.target).addClass("dn"); - reloadMyFocus() - cityDetaiVue.$data.citys.push(city); - //plus.webview.getWebviewById('views/user/userInfo.html').reload(); + var msg = response.data.message; + if(msg != "取消关注成功" && msg != "关注成功"){ + $.toast(msg); + }else{ + $(event.target).parent().children().removeClass("dn"); + $(event.target).addClass("dn"); + reloadMyFocus() + cityDetaiVue.$data.citys.push(city); + //plus.webview.getWebviewById('views/user/userInfo.html').reload(); + } }).catch(function(error){ console.log(error) }) diff --git a/fangija-zsyf/views/house/cityDetail.html b/fangija-zsyf/views/house/cityDetail.html index 9ad380c..dac5cf0 100644 --- a/fangija-zsyf/views/house/cityDetail.html +++ b/fangija-zsyf/views/house/cityDetail.html @@ -38,7 +38,7 @@
- 取消关注 + 取消关注 关注
From 03cf44c9e2f874994e08d2dabea995bd598e2610 Mon Sep 17 00:00:00 2001 From: zongzhimin Date: Mon, 16 Apr 2018 15:12:54 +0800 Subject: [PATCH 2/9] YOUFANG1.0.3 --- fangija-zsyf/css/main.css | 1 + 1 file changed, 1 insertion(+) diff --git a/fangija-zsyf/css/main.css b/fangija-zsyf/css/main.css index 5f3c7a7..398ca1e 100644 --- a/fangija-zsyf/css/main.css +++ b/fangija-zsyf/css/main.css @@ -1365,6 +1365,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;} From 52d5e2443a8631d9d1883ab4d625f859dc910f39 Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Mon, 16 Apr 2018 15:20:14 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E4=B8=8A=E6=B6=A8?= =?UTF-8?q?=E6=A6=82=E7=8E=87=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/js/user/myHouse.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fangija-zsyf/js/user/myHouse.js b/fangija-zsyf/js/user/myHouse.js index 7f36148..70cf389 100644 --- a/fangija-zsyf/js/user/myHouse.js +++ b/fangija-zsyf/js/user/myHouse.js @@ -105,7 +105,7 @@ function mhAddItems(itemsPerLoad, lastIndex, dataObj, xqOneMonthUpDownRangeMap, if(!isNaN(xqPotentialIndexValue)){ //涨跌幅大于零 if(parseInt(xqPotentialIndexValue)>=50){ - html += "
下跌概率: "+xqPotentialIndexValue+"%
"; + html += "
上涨概率: "+xqPotentialIndexValue+"%
"; }else{ html += "
下跌概率: "+(parseInt(100)-parseInt(xqPotentialIndexValue))+"%
"; } From f1abdebe90dd9dbfd1a8e5aa1f841d6a78ebf565 Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Mon, 16 Apr 2018 15:20:37 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E4=B8=8A=E6=B6=A8?= =?UTF-8?q?=E6=A6=82=E7=8E=87=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/house/houseList.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fangija-zsyf/views/house/houseList.html b/fangija-zsyf/views/house/houseList.html index 7cc9a1b..02a1b16 100644 --- a/fangija-zsyf/views/house/houseList.html +++ b/fangija-zsyf/views/house/houseList.html @@ -348,7 +348,7 @@ function addItems(itemsPerLoad, lastIndex, dataObj, xqOneMonthUpDownRangeMap, xq if(!isNaN(xqPotentialIndexValue)){ //涨跌幅大于零 if(parseInt(xqPotentialIndexValue)>=50){ - html += "
下跌概率: "+xqPotentialIndexValue+"%
"; + html += "
上涨概率: "+xqPotentialIndexValue+"%
"; }else{ html += "
下跌概率: "+(parseInt(100)-parseInt(xqPotentialIndexValue))+"%
"; } From 2fc1970d6896fe1b31599f786f90fdaa75313476 Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Mon, 16 Apr 2018 15:24:59 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9D=87=E4=BB=B7?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/house/houseManageList.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fangija-zsyf/views/house/houseManageList.html b/fangija-zsyf/views/house/houseManageList.html index 4d8ffad..3948832 100644 --- a/fangija-zsyf/views/house/houseManageList.html +++ b/fangija-zsyf/views/house/houseManageList.html @@ -246,7 +246,7 @@ function constructHtmlContent(results, xqOneMonthUpDownRangeMap, cityAvgPriceMap var cityAvgPriceKey = result.city; //取得对应城市的value var cityAvgPriceValue = cityAvgPriceMap[cityAvgPriceKey]; - if(!isNaN(cityAvgPriceValue)){ + if(!isNaN(cityAvgPriceValue) && result.price>0){ if(parseInt(cityAvgPriceValue)>=parseInt(result.price)){ htmlContent = htmlContent + "
相比"+result.city+"均价: 低"+(parseInt(cityAvgPriceValue)-parseInt(result.price))+"元
"; }else{ From 3d8e7fe2200dfb971700eb7d8f950e0eefd259bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Mon, 16 Apr 2018 15:35:00 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E6=96=B0=E9=97=BB=E8=AF=84=E6=98=B5?= =?UTF-8?q?=E7=A7=B0=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/news/newsDetail.html | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/fangija-zsyf/views/news/newsDetail.html b/fangija-zsyf/views/news/newsDetail.html index ee4962e..bf3ed16 100644 --- a/fangija-zsyf/views/news/newsDetail.html +++ b/fangija-zsyf/views/news/newsDetail.html @@ -291,12 +291,19 @@ function addItems(number, lastIndex) { html = html + "
"; - var name = "游客" + var name = null; if(vo.wxName){ name = vo.wxName - }else if(vo.name){ + } + if(name == null){ name = vo.name } + if(name == null){ + name = vo.mobile + } + if(name == null){ + name = "游客" + } html = html + "
"+ "
"+name+"
"+ "
"+ From c616419ca41855492379331bf4a1a0d2a3ce1456 Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Mon, 16 Apr 2018 15:36:35 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E6=8F=90=E4=BA=A4=20=E5=9D=87=E4=BB=B7=20?= =?UTF-8?q?=20=20=E5=92=8C=20=E5=BD=93=E5=89=8D=E5=9F=8E=E5=B8=82=E7=9B=B8?= =?UTF-8?q?=E7=AD=89=20=E6=98=BE=E7=A4=BA=E9=AB=98=E9=9B=B6=E5=85=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/house/houseManageList.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fangija-zsyf/views/house/houseManageList.html b/fangija-zsyf/views/house/houseManageList.html index 3948832..7b08e84 100644 --- a/fangija-zsyf/views/house/houseManageList.html +++ b/fangija-zsyf/views/house/houseManageList.html @@ -247,7 +247,7 @@ function constructHtmlContent(results, xqOneMonthUpDownRangeMap, cityAvgPriceMap //取得对应城市的value var cityAvgPriceValue = cityAvgPriceMap[cityAvgPriceKey]; if(!isNaN(cityAvgPriceValue) && result.price>0){ - if(parseInt(cityAvgPriceValue)>=parseInt(result.price)){ + 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))+"元
"; From 204b15d5fce0e10c84fcb0ab6b6ab38f9fc37ef5 Mon Sep 17 00:00:00 2001 From: zongzhimin Date: Mon, 16 Apr 2018 16:29:27 +0800 Subject: [PATCH 8/9] YOUFANG1.0.3 --- fangija-zsyf/views/evaluate/evaluateReport.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fangija-zsyf/views/evaluate/evaluateReport.html b/fangija-zsyf/views/evaluate/evaluateReport.html index 0c782c2..9b38627 100644 --- a/fangija-zsyf/views/evaluate/evaluateReport.html +++ b/fangija-zsyf/views/evaluate/evaluateReport.html @@ -257,7 +257,10 @@ $.config = {router: false} house_price.words="元" house_price.compare_money=h.compareMoney }else{ - house_price.compare_money="相等" + //house_price.compare_money="相等" + house_price.compare_word="高" + house_price.words="元" + house_price.compare_money=0 } } From 1beeab69ec4ffbd87a07d59559bf1f17d959db10 Mon Sep 17 00:00:00 2001 From: gongjin Date: Mon, 16 Apr 2018 16:38:34 +0800 Subject: [PATCH 9/9] update --- fangija-zsyf/config.js | 4 +-- fangija-zsyf/css/main.css | 32 +++++++++++++++---- fangija-zsyf/main.html | 4 ++- fangija-zsyf/manifest.json | 17 +++++++++- fangija-zsyf/views/district/aroundDetail.html | 5 +-- fangija-zsyf/views/district/arround.html | 3 +- fangija-zsyf/yfindex.html | 14 ++------ 7 files changed, 52 insertions(+), 27 deletions(-) diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js index 2abd5c9..f5765d0 100644 --- a/fangija-zsyf/config.js +++ b/fangija-zsyf/config.js @@ -2,9 +2,9 @@ //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.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.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 398ca1e..a08075f 100644 --- a/fangija-zsyf/css/main.css +++ b/fangija-zsyf/css/main.css @@ -1,8 +1,6 @@ @charset "utf-8"; /* CSS Document */ -[v-cloak] { - display: none; -} + /* 公用 */ *{font-size:16px;font-family:arial,"华文细黑";} ul li{list-style:none;} @@ -177,6 +175,7 @@ em.down{color:#88D053;} .popover .list-block .item-link.list-button{color:#333;} /* 工具栏 */ +.bar{background:#fff;} .bar-tab .tab-item{color:#C3C0BC;} .bar-tab .tab-item.active,.bar-tab .tab-item:active{color:#F18D00;} .bar-tab .tab-item .icon{padding:0;font-size:1.05rem;} @@ -237,7 +236,7 @@ em.down{color:#88D053;} .list-block .item-title span{font-size:0.7rem;color:#999;} .list-block .item-title span.span01{font-size:0.7rem;color:#666;margin-left:0.3rem;} .list-block .item-title input{display:inline-block;text-align:center;width:60px;border:solid 1px #e6e6ea;} -.list-block .item-title b{font-size:0.9rem;} +.list-block .item-title b{font-size:0.8rem;} .list-block .item-title em{font-size:0.8rem;color:#EB5F34;} .list-block .item-title .button.button-fill{display:inline-block;width:50px;height:24px;line-height:24px;margin-left:0.5rem;vertical-align:2px;} .list-block .item-title.row{margin-left:0;width:100%;} @@ -311,8 +310,9 @@ em.down{color:#88D053;} .popup-about02 .list-block.historyList{margin-top:-1px;} .popup-about02 .list-block.historyList .searchHistory{padding-top:0;} .newCss ul{padding:0.75rem;padding-top:0;padding-left:0.25rem;overflow:hidden;} -.newCss ul li{background:#F4F4F4;border-radius:0.16rem;display:inline-block;margin-left:0.5rem;margin-bottom:0.5rem;padding:0 0.5rem;line-height:1.5rem;} +.newCss ul li{background:#F4F4F4;border-radius:0.16rem;display:inline-block;margin-left:0.5rem;margin-bottom:0.5rem;padding:0 0.5rem;line-height:1.5rem;font-size:0.65rem;color:#333;} .newCss ul li span{font-size:0.65rem;color:#333;} +.newCss ul li a{font-size:0.65rem;color:#333;} .newCss ul:before,.popup-about02 .list-block.newCss ul:after{height:0;} .content-padded + .newCss ul{padding-bottom:0;} @@ -854,6 +854,11 @@ input::-webkit-input-placeholder{ /* 图表 */ .chart{width:100%;height:250px;} .chart tspan{font-size:0.6rem;text-shadow:none;} +/* +#tabChart{width:100%;height:360px;} +#tabChart1{width:100%;position:absolute;z-index:1;} +#tabChart2{width:100%;display:block;position:absolute;z-index:-1;} +*/ .scoreBox{height:130px;position:relative;} .score{width:250px;height:250px;margin:0 auto;margin-top:1rem;} .scoreText{width:250px;height:150px;position:absolute;top:0;left:50%;margin-left:-125px;} @@ -1059,7 +1064,7 @@ input::-webkit-input-placeholder{ .topBg02 p a{font-size:0.75rem;} .collection{position:absolute;right:0.75rem;top:0.4rem;text-align:center;color:#666;font-size:0.7rem;} - +.collection02{border:solid 1px #C3C0BC;color:#999;} .icon-collection01{width:16px;height:16px;background:url(../images/icon-collection01.png) no-repeat center center;background-size:100%;display:block;margin:0 auto;margin-bottom:0.1rem;} .icon-collection02{width:16px;height:16px;background:url(../images/icon-collection02.png) no-repeat center center;background-size:100%;display:block;margin:0 auto;margin-bottom:0.1rem;} @@ -1291,6 +1296,20 @@ input[type=range]::-webkit-slider-thumb { .contentStart img{width:70%;margin:0 auto;margin-top:30%;} .contentStart #test_btn{background:#fff;color:#21a5fe;width:10rem;margin:0 auto;margin-top:1.5rem;} +/* 引导页 */ +.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 div{position:absolute;bottom:5rem;width:100%;} +.swiper-slide p{text-align:center;} +.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 .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;} + /* 字体图标 */ @font-face {font-family: "iconfont"; src: url('iconfont.eot?t=1522051063980'); /* IE9*/ @@ -1365,7 +1384,6 @@ 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;} diff --git a/fangija-zsyf/main.html b/fangija-zsyf/main.html index 2f5f160..82c7932 100644 --- a/fangija-zsyf/main.html +++ b/fangija-zsyf/main.html @@ -11,7 +11,9 @@ @@ -22,7 +23,7 @@
-
+
diff --git a/fangija-zsyf/views/district/arround.html b/fangija-zsyf/views/district/arround.html index 8b233e4..da789df 100644 --- a/fangija-zsyf/views/district/arround.html +++ b/fangija-zsyf/views/district/arround.html @@ -27,7 +27,6 @@ line-height: 24px; background: url(../../images/dw.png) no-repeat; } - .page > header.bar {background: #F18D00;} @@ -36,7 +35,7 @@
-
+
diff --git a/fangija-zsyf/yfindex.html b/fangija-zsyf/yfindex.html index 68abbd7..764c443 100644 --- a/fangija-zsyf/yfindex.html +++ b/fangija-zsyf/yfindex.html @@ -15,20 +15,10 @@