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

This commit is contained in:
2018-05-14 15:36:28 +08:00
19 changed files with 215 additions and 79 deletions
Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

+1 -1
View File
@@ -1,6 +1,6 @@
axios.defaults.baseURL = BASE_PATH;
axios.defaults.headers.post['Content-Type'] = 'application/json';
axios.defaults.timeout = 15000;
axios.defaults.timeout = 120000;
// 添加请求拦截器
axios.interceptors.request.use(function (config) {
+29 -4
View File
@@ -12,9 +12,17 @@ var mapLoadCount = 0;
function doAddCollect(){
if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") {
clicked('../user/codeSms.html',true,false,{},{},function(){
plus.webview.getWebviewById('views/user/userInfo.html').reload();
if(plus.webview.getWebviewById('views/house/houseDetail.html')!= null) {
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
}
if(plus.webview.getWebviewById('views/house/houseManageList.html') != null) {
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
}
if(plus.webview.getWebviewById('views/user/userInfo.html')!= null){
plus.webview.getWebviewById('views/user/userInfo.html').reload();
}
doAddCollect();
})
return;
@@ -32,8 +40,10 @@ function addCollect(){
$(".collection01").hide();
$(".collection02").show();
$.toast("随时掌握小区动态");
if(plus.webview.getWebviewById('views/user/userInfo.html')!= null){
plus.webview.getWebviewById('views/user/userInfo.html').reload();
}
}
})
.catch(function (error) {
@@ -49,7 +59,9 @@ function doRemoveCollect(){
if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") {
clicked('../user/codeSms.html',true,false,{},{},function(){
doRemoveCollect();
if(plus.webview.getWebviewById('views/user/userInfo.html')!= null){
plus.webview.getWebviewById('views/user/userInfo.html').reload();
}
})
return;
} else {
@@ -67,9 +79,14 @@ function removeCollect(){
$(".collection01").show();
$.toast("取消关注");
}
plus.webview.getWebviewById('views/user/userInfo.html').reload();
plus.webview.getWebviewById('yfindex.html').reload();
if(plus.webview.getWebviewById('views/house/houseManageList.html') != null) {
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
}
if(plus.webview.getWebviewById('views/user/userInfo.html')!= null){
plus.webview.getWebviewById('views/user/userInfo.html').reload();
}
plus.webview.getWebviewById('yfindex.html').reload();
})
.catch(function (error) {
console.log(error);
@@ -313,9 +330,17 @@ function showTrends(v){
if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") {
clicked('../user/codeSms.html',true,false,{},{},function(){
showTrends(v);
plus.webview.getWebviewById('views/user/userInfo.html').reload();
if(plus.webview.getWebviewById('views/house/houseDetail.html')!= null) {
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
}
if(plus.webview.getWebviewById('views/house/houseManageList.html') != null) {
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
}
if(plus.webview.getWebviewById('views/user/userInfo.html')!= null){
plus.webview.getWebviewById('views/user/userInfo.html').reload();
}
})
return;
} else {
+20 -2
View File
@@ -198,9 +198,17 @@ function clickTrend(city, type){
if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") {
clicked('../user/codeSms.html',true,false,{},{},function(){
clickTrend(city, type);
plus.webview.getWebviewById('views/user/userInfo.html').reload();
if(plus.webview.getWebviewById('views/house/houseDetail.html')!= null) {
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
}
if(plus.webview.getWebviewById('views/house/houseManageList.html') != null) {
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
}
if(plus.webview.getWebviewById('views/user/userInfo.html')!= null){
plus.webview.getWebviewById('views/user/userInfo.html').reload();
}
})
return;
} else {
@@ -543,9 +551,13 @@ function collectCity(city, type){
if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") {
clicked('../user/codeSms.html',true,false,{},{},function(){
collectCity(city, type)
if(plus.webview.getWebviewById('views/house/houseManageList.html') != null) {
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
}
if(plus.webview.getWebviewById('views/user/userInfo.html')!= null){
plus.webview.getWebviewById('views/user/userInfo.html').reload();
//plus.webview.getWebviewById('views/house/houseDetail.html').reload();
}
})
return;
} else {
@@ -562,7 +574,9 @@ function collectCity(city, type){
// plus.webview.getWebviewById('views/house/houseDetail.html').reload();
},function(){
if(plus.webview.getWebviewById('views/house/houseDetail.html')!= null) {
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
}
//loadMyCollectCity();
});
@@ -602,13 +616,17 @@ function docollectCity(city, type){
//loadMyCollectCity();
$("a[href='#tabQuotation1']").click();
if(plus.webview.getWebviewById('views/house/houseDetail.html')!= null) {
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
}
//reloadMyFocus();
//reloadCityPotentialRanking()
//reloadCityIncreaseRanking()
}else if(msg == "关注成功"){
cityInfoVue.$data.collecd = true;
if(plus.webview.getWebviewById('views/house/houseDetail.html')!= null) {
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
}
//reloadMyFocus();
//reloadCityPotentialRanking()
//reloadCityIncreaseRanking()
@@ -528,10 +528,18 @@ function showRegionInfo(city){
function collectCity(city, index){
if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") {
clicked('../user/codeSms.html',true,false,{},{},function(){
if(plus.webview.getWebviewById('views/house/houseDetail.html')!= null) {
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
}
collectCity(city)
if(plus.webview.getWebviewById('views/house/houseManageList.html') != null) {
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
}
if(plus.webview.getWebviewById('views/user/userInfo.html')!= null){
plus.webview.getWebviewById('views/user/userInfo.html').reload();
}
})
return;
+2 -2
View File
@@ -78,10 +78,10 @@ function shareMessage(msg,s){
var ss=shares['weixin'];
ss&&ss.nativeClient&&(shareBts.push({title:'微信朋友圈',s:ss,x:'WXSceneTimeline'}),
shareBts.push({title:'微信好友',s:ss,x:'WXSceneSession'}));
ss=shares['qq'];
/* ss=shares['qq'];
ss&&ss.nativeClient&&shareBts.push({title:'QQ',s:ss});
ss=shares['sinaweibo'];
ss&&shareBts.push({title:'新浪微博',s:ss});
ss&&shareBts.push({title:'新浪微博',s:ss});*/
// 弹出分享列表
shareBts.length>0?plus.nativeUI.actionSheet({title:'分享链接',cancel:'取消',buttons:shareBts},function(e){
(e.index>0)&&shareAction(shareBts[e.index-1],true);
+6 -2
View File
@@ -134,10 +134,11 @@
var self = plus.webview.currentWebview();
for (var i = 0; i < 4; i++) {
var temp = {};
var sub = plus.webview.create(subpages[i], subpages[i], subpage_style);
if (i > 0) {
sub.hide();
/*var sub = plus.webview.create(subpages[i], subpages[i], subpage_style);
sub.hide();*/
}else{
var sub = plus.webview.create(subpages[i], subpages[i], subpage_style);
temp[subpages[i]] = "true";
mui.extend(aniShow,temp);
}
@@ -158,6 +159,9 @@
//显示目标选项卡
//若为iOS平台或非首次显示,则直接显示
if(mui.os.ios||aniShow[targetTab]){
if(plus.webview.getWebviewById(targetTab)==null){
plus.webview.create(targetTab, targetTab, subpage_style)
}
plus.webview.show(targetTab);
}else{
//否则,使用fade-in动画,且保存变量
+6 -6
View File
@@ -7,7 +7,7 @@
"id": "H5693FF3D",/*应用的标识,创建应用时自动生成,勿手动修改*/
"name": "有房",/*应用名称,程序桌面图标名称*/
"version": {
"name": "1.1",/*应用版本名称*/
"name": "1.1.6",/*应用版本名称*/
"code": "20109"
},
"description": "有房,围绕房产提供全方位数据分析的房产及金融服务平台,通过个性化的智能推荐,定制专属的个人投资或购房计划,多维度管理自有房产并提供房产融资通道。",/*应用描述信息*/
@@ -154,8 +154,8 @@
],
"frameworks": [], /*调用Native.js调用原生Objective-c API需要引用的FrameWork,如需调用GameCenter,则添加"GameKit.framework"*/
"plistcmds": [
"Set :NSLocationWhenInUseUsageDescription 根据您的位置信息,您可随时掌握所在位置周边房产的行情。",
"Set :NSLocationAlwaysUsageDescription 根据您的位置信息,您可随时掌握所在位置周边房产的行情。"
"Set :NSLocationAlwaysUsageDescription 根据您的位置信息,您可随时掌握所在位置周边房产的行情。",
"Set :NSLocationWhenInUseUsageDescription 根据您的位置信息,您可随时掌握所在位置周边房产的行情。"
]
},
"google": {
@@ -276,9 +276,9 @@
"android": {
"mdpi": "", /*普通屏启动图片,分辨率:240x282*/
"ldpi": "",
"hdpi": "E:/房价网/201804/启动页尺寸/android/启动页android高分屏.png",
"xhdpi": "E:/房价网/201804/启动页尺寸/android/启动页android-720P高分屏.png",
"xxhdpi": "E:/房价网/201804/启动页尺寸/android/启动页android-1080高分屏.png"
"hdpi": "E:/房价网/201804/安卓启动页/启动页android高分屏1.png",
"xhdpi": "E:/房价网/201804/安卓启动页/启动页android-720P高分屏2.png",
"xxhdpi": "E:/房价网/201804/安卓启动页/启动页android-1080高分屏3.png"
}
},
"plugins": {
@@ -58,7 +58,9 @@ Vue.component('city_increase_ranking',{
var msg = response.data.message;
if(msg != "取消关注成功" && msg != "关注成功"){
$.toast(msg);
if (plus.webview.getWebviewById('views/house/houseDetail.html') != null) {
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
}
}else{
//$(event.target).parent().children().removeClass("dn");
//$(event.target).addClass("dn");
@@ -80,7 +82,9 @@ Vue.component('city_increase_ranking',{
}
if(plus.webview.getWebviewById('views/house/houseDetail.html')!= null) {
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
}
// loadMyCollectCity()
if(type == 0){
@@ -97,12 +101,18 @@ Vue.component('city_increase_ranking',{
console.log(error)
})
},function(){
if (plus.webview.getWebviewById('views/house/houseDetail.html') != null) {
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
}
});
if(plus.webview.getWebviewById('views/house/houseManageList.html') != null) {
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
}
if(plus.webview.getWebviewById('views/user/userInfo.html') != null) {
plus.webview.getWebviewById('views/user/userInfo.html').reload();
}
}
})
}else{
$.confirm('您确定要关注'+city+"?", function () {
@@ -77,7 +77,10 @@ Vue.component('city_potential_ranking',{
var msg = response.data.message;
if(msg != "取消关注成功" && msg != "关注成功"){
$.toast(msg);
if(plus.webview.getWebviewById('views/house/houseDetail.html')!= null) {
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
}
}else{
//$(event.target).parent().children().removeClass("dn");
//$(event.target).addClass("dn");
@@ -96,7 +99,10 @@ Vue.component('city_potential_ranking',{
}
}
}
if(plus.webview.getWebviewById('views/house/houseDetail.html')!= null) {
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
}
reloadMyFocus()
reloadCityIncreaseRanking()
@@ -106,12 +112,17 @@ Vue.component('city_potential_ranking',{
console.log(error)
})
},function(){
if(plus.webview.getWebviewById('views/house/houseDetail.html')!= null) {
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
}
});
if(plus.webview.getWebviewById('views/house/houseManageList.html') != null) {
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
}
if(plus.webview.getWebviewById('views/user/userInfo.html')!= null){
plus.webview.getWebviewById('views/user/userInfo.html').reload();
}
}
})
}else{
$.confirm('您确定要关注'+city+"?", function () {
@@ -344,8 +344,13 @@ function addManagement(id, houseStatus, liveStatus){
var status = response.data.status;
if(status){
$.toast(response.data.data);
if(plus.webview.getWebviewById('views/house/houseManageList.html') != null) {
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
}
if(plus.webview.getWebviewById('views/user/userInfo.html')!= null){
plus.webview.getWebviewById('views/user/userInfo.html').reload();
}
}else{
$.toast(response.data.message);
}
+18 -2
View File
@@ -1845,10 +1845,18 @@ function checkIsLogin(){
}else{
addEvaluation();
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
plus.webview.getWebviewById('views/user/userInfo.html').reload();
if(plus.webview.getWebviewById('views/house/houseDetail.html')!= null) {
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
}
if(plus.webview.getWebviewById('views/house/houseManageList.html') != null) {
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
}
if(plus.webview.getWebviewById('views/user/userInfo.html')!= null){
plus.webview.getWebviewById('views/user/userInfo.html').reload();
}
}
})
}else{
addEvaluation();
@@ -1891,16 +1899,24 @@ function addEvaluation(){
if(response.data.data!=null && response.data.data.success){
$("#evaluation_btn").removeAttr("disabled");
var id = response.data.data.id;
if(plus.webview.getWebviewById('views/house/houseManageList.html') != null) {
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
}
if(plus.webview.getWebviewById('views/user/userInfo.html')!= null){
plus.webview.getWebviewById('views/user/userInfo.html').reload();
}
clicked('/views/evaluate/evaluateReport.html',true,false,{},{hid:id},function(){
getRequestId();
})
}else{
$("#evaluation_btn").removeAttr("disabled");
$.toast(response.data.message);
if(plus.webview.getWebviewById('views/user/userInfo.html')!= null){
plus.webview.getWebviewById('views/user/userInfo.html').reload();
}
}
})
.catch(function (error) {
console.log(error);
+5 -1
View File
@@ -529,10 +529,14 @@ function addManagement(id, houseStatus, liveStatus){
}).then(function (response) {
var status = response.data.status;
if(status){
if(plus.webview.getWebviewById('views/house/houseManageList.html') != null) {
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
}
if(plus.webview.getWebviewById('views/user/userInfo.html')!= null){
plus.webview.getWebviewById('views/user/userInfo.html').reload();
}
$.toast("修改状态成功!");
plus.webview.getWebviewById('views/user/userInfo.html').reload();
}else{
$.toast(response.data.message);
}
+9 -2
View File
@@ -1557,10 +1557,17 @@ function addFocus(city){
reloadMyFocus()
reloadCityIncreaseRanking()
reloadCityPotentialRanking()
if(plus.webview.getWebviewById('views/house/houseDetail.html')!= null) {
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
plus.webview.getWebviewById('views/user/userInfo.html').reload();
}
if(plus.webview.getWebviewById('views/house/houseManageList.html') != null) {
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
}
if(plus.webview.getWebviewById('views/user/userInfo.html')!= null){
plus.webview.getWebviewById('views/user/userInfo.html').reload();
}
var curDatas = response.data.data
if(curDatas && curDatas.length>=0){
if(!IsInArray(curDatas, city)){
@@ -155,7 +155,9 @@ function addManagement(id, houseStatus, liveStatus){
$.toast(response.data.data);
$('.loadingBgDiv').show();
checkIsLogin();
if(plus.webview.getWebviewById('views/user/userInfo.html')!= null){
plus.webview.getWebviewById('views/user/userInfo.html').reload();
}
//plus.webview.getWebviewById('yfindex.html').reload();
}else{
$.toast(response.data.message);
+10 -2
View File
@@ -137,7 +137,7 @@ var city;
var region;
//var picUrl = '_www/logo.png';
var picUrl = '../../img/default_share.png';
var picUrl = '_www/img/default_share.png';
//新闻评论列表
@@ -504,9 +504,17 @@ $(".collection").on("click", function () {
function doCollect() {
if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") {
clicked('../user/codeSms.html',true,false,{},{},function(){
if(plus.webview.getWebviewById('views/house/houseDetail.html')!= null) {
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
plus.webview.getWebviewById('views/user/userInfo.html').reload()
}
if(plus.webview.getWebviewById('views/house/houseManageList.html') != null) {
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
}
if(plus.webview.getWebviewById('views/user/userInfo.html')!= null){
plus.webview.getWebviewById('views/user/userInfo.html').reload();
}
doCollect();
})
return;
+10 -2
View File
@@ -110,9 +110,17 @@ function logout() {
localStorage.removeItem("user_token");
localStorage.removeItem("user_token_add_time");
//退出登录之前loading下个人中心
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
plus.webview.getWebviewById('views/user/userInfo.html').reload();
if(plus.webview.getWebviewById('views/house/houseDetail.html')!= null) {
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
}
if(plus.webview.getWebviewById('views/house/houseManageList.html') != null) {
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
}
if(plus.webview.getWebviewById('views/user/userInfo.html')!= null){
plus.webview.getWebviewById('views/user/userInfo.html').reload();
}
timer.start();
}
+7 -2
View File
@@ -289,9 +289,14 @@ 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();
if(plus.webview.getWebviewById('views/house/houseDetail.html')!= null) {
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
}
if(plus.webview.getWebviewById('views/house/houseManageList.html') != null) {
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
}
checkIsLogin();
})
}
+14 -9
View File
@@ -2229,13 +2229,6 @@ function changeCity(cityStr){
city = cityStr
console.log(oriCity + "==" + cityStr)
if(oriCity== cityStr){
if(oriRegion!=""){
//$("#region").text(oriRegion);
setTimeout(function(){
baseInfo.region = oriRegion;
},1000)
}
lat = oriLat;
lng = oriLng;
if(cityStr=="上海"){
@@ -2274,7 +2267,7 @@ function changeCity(cityStr){
$("#ShangHaiDiv").show();
$("#otherCityDiv").hide();
//initNearDistricts($(this).text(),0,0,"",0,0,0,"");
initBaseInfo(cityStr,"",address,lat,lng);
//initBaseInfo(cityStr,oriRegion,address,lat,lng);
}else{
$("#ShangHaiDiv").hide();
$("#otherCityDiv").show();
@@ -2291,9 +2284,21 @@ function changeCity(cityStr){
//加载列表
sort=6;
getDistrictList(cityStr,lat,lng,"",sort,0,0,"");
initBaseInfo(cityStr,"","",0,0);
}
if(oriCity== cityStr){
if(oriRegion!=""){
setTimeout(function(){
//alert(oriRegion)
baseInfo.region = oriRegion;
//changeRegion();
},1000)
}
initBaseInfo(cityStr,oriRegion,"",0,0);
}else{
initBaseInfo(cityStr,"","",0,0);
}
$(".selectContent").hide();
//刷新下拉滚动加载事件
$.attachInfiniteScroll($('.infinite-scroll'))