Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1

This commit is contained in:
xuhe@fangjia.com
2018-04-16 20:38:03 +08:00
10 changed files with 47 additions and 15 deletions
+1 -1
View File
@@ -21,7 +21,7 @@ $(document).on("click",".open-about01", function () {
if(collects){
if(collects.indexOf(text)>-1){
$(this).addClass("collectionCity");
$(this).find("i").addClass("icon-collection03");
//$(this).find("i").addClass("icon-collection03");
}
}
+2 -1
View File
@@ -496,6 +496,7 @@ function docollectCity(city, type){
}).then(function (response) {
var msg = response.data.message;
if(msg){
if(msg == "取消关注成功"){
try{
cityInfoVue.$data.collecd = false;
@@ -503,7 +504,7 @@ function docollectCity(city, type){
var da = cityDetaiVue.$data.citys
if(da && da.length>0){
var index = da.indexOf(city)
if(index>0){
if(index>=0){
da.splice(index, 1)
cityDetaiVue.$data.citys = da;
if(da.length>0){
+2 -1
View File
@@ -1545,7 +1545,8 @@
"error.html",
"views/rent/rent.html",
"views/district/detail.html",
"views/house/houseList.html"
"views/house/houseList.html",
"views/house/cityDetail.html"
],
"priority": 0
},
@@ -82,7 +82,14 @@ Vue.component('city_increase_ranking',{
$(event.target).addClass("dn");
reloadMyFocus()
reloadCityPotentialRanking()
cityDetaiVue.$data.citys.push(city);
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){
@@ -69,7 +69,7 @@ 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, type:type}}).then(function(response){
@@ -101,7 +101,14 @@ Vue.component('city_potential_ranking',{
$(event.target).addClass("dn");
reloadMyFocus()
reloadCityIncreaseRanking()
cityDetaiVue.$data.citys.push(city);
if(type == 0){
var curDatas = cityDetaiVue.$data.citys
if(curDatas && curDatas.length>0){
if(!IsInArray(curDatas, city)){
cityDetaiVue.$data.citys.push(city);
}
}
}
//plus.webview.getWebviewById('views/user/userInfo.html').reload();
}
}).catch(function(error){
+1 -1
View File
@@ -34,7 +34,7 @@
</button>
</header>
<div class="content" id="cityInfo">
<div class="content" id="cityInfo" v-cloak>
<div class="card cardPrice cardPrice01 cardCity01" v-bind:hrefid="myCityMap.hrefId">
<div class="card-header">
<label>{{myCityMap.city}}</label>
+17 -2
View File
@@ -1565,7 +1565,14 @@ function addFocus(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();
createData(city, myDatasVue.$data.cityDatas.length);
var curDatas = response.data.data
if(curDatas && curDatas.length>0){
if(!IsInArray(curDatas, city)){
cityDetaiVue.$data.citys.push(city);
}
}
}).catch(function(error){
console.log(error)
})
@@ -1577,7 +1584,15 @@ function addFocus(city){
reloadMyFocus()
reloadCityIncreaseRanking()
reloadCityPotentialRanking()
cityDetaiVue.$data.citys.push(city);
var curDatas = cityDetaiVue.$data.citys
if(curDatas && curDatas.length>0){
if(!IsInArray(curDatas, city)){
cityDetaiVue.$data.citys.push(city);
}
}
} else {
$.toast(response.data.message);
}
+1 -1
View File
@@ -89,7 +89,7 @@ $.config = {router: false}
<script type="text/javascript" src="../../js/common.js" ></script>
<script type="text/javascript" src="../../js/log/log_stat.js" ></script>
<script>
window.viewsPage="bindingMobile";
timer = {
countdown:60,
start:function(){
+4 -3
View File
@@ -104,7 +104,7 @@ $.config = {router: false}
<script>
window.viewsPage="codeSms";
/* 勾选-已阅读 */
$(".check").on("click", function () {
var a = $(this).find(".checkImg").css("display");
@@ -125,10 +125,11 @@ window.onresize=function(){
//软键盘弹起与隐藏 都会引起窗口的高度发生变化
var resizeHeight=document.documentElement.clientHeight || document.body.clientHeight;
if(resizeHeight*1<originalHeight*1){ //resizeHeight<originalHeight证明窗口被挤压了
plus.webview.currentWebview().setStyle({
if(window.viewsPage=="codeSms"){
plus.webview.currentWebview().setStyle({
height:originalHeight
});
}
}
}
</script>
+2 -2
View File
@@ -713,8 +713,8 @@
<div class="city-list">
<span class="city-letter" id="City1">一线城市</span>
<div>
<p class="close-popup collectionCity">北京<i class="icon-collection03"></i></p>
<p class="close-popup collectionCity active">上海<i class="icon-collection03"></i></p>
<p class="close-popup collectionCity">北京</p>
<p class="close-popup collectionCity active">上海</p>
<p class="close-popup">广州<i></i></p>
<p class="close-popup">深圳<i></i></p>
</div>