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

Conflicts:
	fangija-zsyf/views/setting/setting.html
This commit is contained in:
2018-04-13 18:27:16 +08:00
6 changed files with 19 additions and 5 deletions
+2 -1
View File
@@ -14,5 +14,6 @@ axios.interceptors.request.use(function (config) {
axios.interceptors.response.use(function (response) {
return response;
}, function (error) {
return Promise.reject(error);
clicked('error.html',true,false,{},{},function(){})
return Promise.reject(error);
});
@@ -36,6 +36,8 @@ function addCollect(){
}
alert(12)
plus.webview.getWebviewById('views/user/userInfo.html').reload();
plus.webview.getWebviewById('yfindex.html').reload();
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
})
.catch(function (error) {
console.log(error);
@@ -68,6 +70,8 @@ function removeCollect(){
$.toast("取消关注");
}
plus.webview.getWebviewById('views/user/userInfo.html').reload();
plus.webview.getWebviewById('yfindex.html').reload();
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
})
.catch(function (error) {
console.log(error);
@@ -240,13 +240,13 @@ function constructHtmlContent(results, xqOneMonthUpDownRangeMap, cityAvgPriceMap
var cityAvgPriceValue = cityAvgPriceMap[cityAvgPriceKey];
if(!isNaN(cityAvgPriceValue)){
if(parseInt(cityAvgPriceValue)>=parseInt(result.price)){
htmlContent = htmlContent + "<div>相比"+result.city+"均价: <em class='up'>高"+(parseInt(cityAvgPriceValue)-parseInt(result.price))+"元</em></div>";
htmlContent = htmlContent + "<div>相比"+result.city+"均价: <em class='down'>低"+(parseInt(cityAvgPriceValue)-parseInt(result.price))+"元</em></div>";
}else{
htmlContent = htmlContent + "<div>相比"+result.city+"均价: <em class='down'>低"+(parseInt(result.price)-parseInt(cityAvgPriceValue))+"元</em></div>";
htmlContent = htmlContent + "<div>相比"+result.city+"均价: <em class='up'>高"+(parseInt(result.price)-parseInt(cityAvgPriceValue))+"元</em></div>";
}
}else{
//为非数字清空放空格
htmlContent = htmlContent + "<div>相比"+result.city+"均价: <em class='down'>"+' '+"</em></div>";
htmlContent = htmlContent + "<div>相比"+result.city+"均价: <em class='down'>暂无</em></div>";
}
htmlContent = htmlContent + "<div>均价: <em class='em02'>"+result.price+"元/㎡</em></div>";
htmlContent = htmlContent + "<div class='price'><em><strong>"+tempTotalPrice+"</strong>万</em></div>";
+1
View File
@@ -110,6 +110,7 @@ function logout() {
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
plus.webview.getWebviewById('views/user/userInfo.html').reload();
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
plus.webview.getWebviewById('yfindex.html').reload();
timer.start();
}
+5 -1
View File
@@ -111,7 +111,11 @@ new Vue({
},
// 修改密码
updatePass: function() {
if (this.pass == '' || this.pass.length < 7) {
if (this.pass == '') {
$.toast("请输入密码");
return;
}
if (this.pass.length < 7) {
$.toast("请输入6位以上数字或字母");
return;
}
+4
View File
@@ -292,6 +292,8 @@ function checkIsLogin(){
//跳转登录方法, 考虑回调
function gotoLogin(){
clicked('/views/user/codeSms.html',true,false,{},{},function(){
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
plus.webview.getWebviewById('yfindex.html').reload();
checkIsLogin();
})
}
@@ -305,10 +307,12 @@ function gotoUpdatePass(){
function gotoLoanApply(houseId, city){
clicked('/views/loan/loanInfo.html',true,false,{},{houseId: houseId, city: city, mobile: _mobile},function(){})
}
//跳转到小区详情
function gotoDistrictDetail(city,region,name){
clicked('/views/district/detail.html',true,false,{},{city:city,region:region,name:name},function(){})
}
//跳转房产详情
function gotoHouseDetail(id){
clicked('/views/house/detail.html',true,false,{},{houseId:id},function(){