Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1
This commit is contained in:
@@ -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;
|
||||
@@ -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*/
|
||||
|
||||
@@ -105,7 +105,7 @@ function mhAddItems(itemsPerLoad, lastIndex, dataObj, xqOneMonthUpDownRangeMap,
|
||||
if(!isNaN(xqPotentialIndexValue)){
|
||||
//涨跌幅大于零
|
||||
if(parseInt(xqPotentialIndexValue)>=50){
|
||||
html += "<div>下跌概率: <em class='up'>"+xqPotentialIndexValue+"%<i class='icon icon-arrow-red'></i></em></div>";
|
||||
html += "<div>上涨概率: <em class='up'>"+xqPotentialIndexValue+"%<i class='icon icon-arrow-red'></i></em></div>";
|
||||
}else{
|
||||
html += "<div>下跌概率: <em class='down'>"+(parseInt(100)-parseInt(xqPotentialIndexValue))+"%<i class='icon icon-arrow-green'></i></em></div>";
|
||||
}
|
||||
|
||||
@@ -11,7 +11,9 @@
|
||||
<link rel="stylesheet" href="css/mui.min.css">
|
||||
<link rel="stylesheet" href="css/main.css">
|
||||
<style>
|
||||
.mui-bar-tab .mui-tab-item .mui-icon{color:#C3C0BC;}
|
||||
.mui-bar-tab{background:#fff;box-shadow:none;}
|
||||
.mui-bar-tab .mui-tab-item{border-top:solid 1px #e7e7e7;}
|
||||
.mui-bar-tab .mui-tab-item .mui-icon{font-size:1.4rem;color:#C3C0BC;}
|
||||
.mui-bar-tab .mui-tab-item.mui-active .mui-icon{color:#F18D00;}
|
||||
.mui-bar-tab .mui-tab-item .mui-icon~.mui-tab-label{color:#C3C0BC;}
|
||||
.mui-bar-tab .mui-tab-item.mui-active .mui-icon~.mui-tab-label{color:#F18D00;}
|
||||
|
||||
@@ -1576,7 +1576,8 @@
|
||||
"views/district/detail.html": {
|
||||
"resources": [],
|
||||
"refer": [
|
||||
"views/district/arround.html"
|
||||
"views/district/arround.html",
|
||||
"views/user/codeSms.html"
|
||||
],
|
||||
"priority": 0
|
||||
},
|
||||
@@ -1703,6 +1704,20 @@
|
||||
"views/house/add.html"
|
||||
],
|
||||
"priority": 0
|
||||
},
|
||||
"views/house/cityDetail.html": {
|
||||
"resources": [],
|
||||
"refer": [
|
||||
"views/user/codeSms.html"
|
||||
],
|
||||
"priority": 0
|
||||
},
|
||||
"views/setting/setting.html": {
|
||||
"resources": [],
|
||||
"refer": [
|
||||
"views/setting/about.html"
|
||||
],
|
||||
"priority": 0
|
||||
}
|
||||
},
|
||||
"idle": {
|
||||
|
||||
@@ -53,13 +53,19 @@ 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()
|
||||
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();
|
||||
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)
|
||||
@@ -68,11 +74,17 @@ 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()
|
||||
reloadCityPotentialRanking()
|
||||
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()
|
||||
reloadCityPotentialRanking()
|
||||
cityDetaiVue.$data.citys.push(city);
|
||||
}
|
||||
|
||||
}).catch(function(error){
|
||||
console.log(error)
|
||||
})
|
||||
|
||||
@@ -69,16 +69,23 @@ Vue.component('city_potential_ranking',{
|
||||
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") == ""){
|
||||
alert("rrrr")
|
||||
}else{
|
||||
axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){
|
||||
$(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);
|
||||
|
||||
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)
|
||||
})
|
||||
@@ -86,12 +93,17 @@ 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()
|
||||
reloadCityIncreaseRanking()
|
||||
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()
|
||||
reloadCityIncreaseRanking()
|
||||
cityDetaiVue.$data.citys.push(city);
|
||||
//plus.webview.getWebviewById('views/user/userInfo.html').reload();
|
||||
}
|
||||
}).catch(function(error){
|
||||
console.log(error)
|
||||
})
|
||||
@@ -141,4 +153,4 @@ function reloadCityPotentialRanking(){
|
||||
}).catch(function(error){
|
||||
console.log(error)
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -13,7 +13,8 @@
|
||||
<link rel="stylesheet" href="../../css/main.css">
|
||||
<link rel="stylesheet" href="../../css/theme-orange.css">
|
||||
<style type="text/css">
|
||||
.page > header.bar {background: #F18D00;}
|
||||
.list-block{border-bottom:solid 0.5rem #f3f3f3;}
|
||||
.list-block ul:after{height:0;}
|
||||
</style>
|
||||
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=9E99D3540e4dafb7894f7b9fe27fa6b5"></script>
|
||||
</head>
|
||||
@@ -22,7 +23,7 @@
|
||||
|
||||
<div class="page-group">
|
||||
<div class="page page-current">
|
||||
<header class="bar bar-nav theme">
|
||||
<header class="bar bar-nav barBorder">
|
||||
<button class="button button-link button-nav pull-left" onclick="back(),plus.nativeUI.closeWaiting();">
|
||||
<span class="icon icon-left"></span>
|
||||
</button>
|
||||
|
||||
@@ -27,7 +27,6 @@
|
||||
line-height: 24px;
|
||||
background: url(../../images/dw.png) no-repeat;
|
||||
}
|
||||
.page > header.bar {background: #F18D00;}
|
||||
</style>
|
||||
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=9E99D3540e4dafb7894f7b9fe27fa6b5"></script>
|
||||
</head>
|
||||
@@ -36,7 +35,7 @@
|
||||
|
||||
<div class="page-group">
|
||||
<div class="page page-current">
|
||||
<header class="bar bar-nav theme">
|
||||
<header class="bar bar-nav barBorder">
|
||||
<button class="button button-link button-nav pull-left" onclick="back(),plus.nativeUI.closeWaiting();">
|
||||
<span class="icon icon-left" ></span>
|
||||
</button>
|
||||
|
||||
@@ -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
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
<div class="card cardPrice cardPrice01 cardCity01" v-bind:hrefid="myCityMap.hrefId">
|
||||
<div class="card-header">
|
||||
<label>{{myCityMap.city}}</label>
|
||||
<a v-if="collecd" class="button theme collection collection02 " @click="collectCity(myCityMap.city)">取消关注</a>
|
||||
<a v-if="collecd" class="button theme collection collection02 " @click="collectCity(myCityMap.city)">取消关注</a>
|
||||
<a v-else class="button theme collection collection01" @click="collectCity(myCityMap.city)">关注</a>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -348,7 +348,7 @@ function addItems(itemsPerLoad, lastIndex, dataObj, xqOneMonthUpDownRangeMap, xq
|
||||
if(!isNaN(xqPotentialIndexValue)){
|
||||
//涨跌幅大于零
|
||||
if(parseInt(xqPotentialIndexValue)>=50){
|
||||
html += "<div>下跌概率: <em class='up'>"+xqPotentialIndexValue+"%<i class='icon icon-arrow-red'></i></em></div>";
|
||||
html += "<div>上涨概率: <em class='up'>"+xqPotentialIndexValue+"%<i class='icon icon-arrow-red'></i></em></div>";
|
||||
}else{
|
||||
html += "<div>下跌概率: <em class='down'>"+(parseInt(100)-parseInt(xqPotentialIndexValue))+"%<i class='icon icon-arrow-green'></i></em></div>";
|
||||
}
|
||||
|
||||
@@ -246,8 +246,8 @@ function constructHtmlContent(results, xqOneMonthUpDownRangeMap, cityAvgPriceMap
|
||||
var cityAvgPriceKey = result.city;
|
||||
//取得对应城市的value
|
||||
var cityAvgPriceValue = cityAvgPriceMap[cityAvgPriceKey];
|
||||
if(!isNaN(cityAvgPriceValue)){
|
||||
if(parseInt(cityAvgPriceValue)>=parseInt(result.price)){
|
||||
if(!isNaN(cityAvgPriceValue) && result.price>0){
|
||||
if(parseInt(cityAvgPriceValue)>parseInt(result.price)){
|
||||
htmlContent = htmlContent + "<div>相比"+result.city+"均价: <em class='down'>低"+(parseInt(cityAvgPriceValue)-parseInt(result.price))+"元</em></div>";
|
||||
}else{
|
||||
htmlContent = htmlContent + "<div>相比"+result.city+"均价: <em class='up'>高"+(parseInt(result.price)-parseInt(cityAvgPriceValue))+"元</em></div>";
|
||||
|
||||
@@ -291,12 +291,19 @@ function addItems(number, lastIndex) {
|
||||
|
||||
html = html + "<div class='item-inner'>";
|
||||
|
||||
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 + "<div class='item-title-row'>"+
|
||||
"<div class='item-title'>"+name+"</div>"+
|
||||
"<div class='item-after'><span data-cid='"+vo.id+"'><i class='icon icon-praise-grey01'></i><label>"+numberConver(vo.praiseCount)+"</label></span></div>"+
|
||||
|
||||
@@ -15,20 +15,10 @@
|
||||
<link rel="stylesheet" href="css/theme-orange.css">
|
||||
|
||||
<style>
|
||||
.bar{background:#fff;}
|
||||
.selectBox{border-top:solid 0.5rem #f3f3f3;border-bottom:solid 1px #e5e5e5;}
|
||||
.selectContent .topic{border-bottom:solid 1px #e5e5e5;}
|
||||
.selectContent .list-block .item-title{font-size:0.7rem;}
|
||||
.buttons-row.theme .button{border:solid 1px #D7D7D7;color:#333;}
|
||||
.buttons-row.theme .button.active{background:none;color:#F18D00;}
|
||||
.content-block01 .row{margin-left:0;}
|
||||
.content-block01 .row .col-50 .button.button-fill{height:2rem;line-height:2rem;}
|
||||
.content-block01 .row .col-50 .button.button-fill.reset_btn{background:#fff;border:none;border-top:solid 1px #e5e5e5;}
|
||||
.content-block01 .row .col-50 .button.button-fill.confirm_btn{background:#F18D00;border:solid 1px #F18D00;}
|
||||
.selectBox{border-top:solid 0.5rem #f3f3f3;}
|
||||
.cardInfo:first-child{border-top:none;}
|
||||
.info-container input{float:none;width:100%;}
|
||||
.picker-item{padding:0 5rem;font-size:18px;}
|
||||
.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%;}
|
||||
</style>
|
||||
|
||||
</head>
|
||||
|
||||
Reference in New Issue
Block a user