Merge branch 'YOUFANGAPP1.1' into 'master'
Youfangapp1.1 See merge request !2
This commit is contained in:
@@ -1291,11 +1291,12 @@ input[type=range]::-webkit-slider-thumb {
|
||||
.rangeNote span.span07{float:right;}
|
||||
|
||||
/* 启动页 */
|
||||
.contentStart{background:#21a5fe;}
|
||||
.contentStart .time{width:65px;height:30px;line-height:1.6rem;text-align:center;font-size:0.7rem;color:#fff;background:rgba(0,0,0,0.3);border-radius:1.25rem;display:block;position:absolute;top:0.75rem;right:0.75rem;}
|
||||
.contentStart{background:#F18D00;}
|
||||
.contentStart .time{width:65px;height:30px;line-height:1.6rem;text-align:center;font-size:0.7rem;color:#fff;background:rgba(0,0,0,0.3);border-radius:1.25rem;display:block;position:absolute;top:0.75rem;right:0.75rem;z-index:4;}
|
||||
.contentStart #time{font-size:0.7rem;vertical-align:middle;}
|
||||
.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;}
|
||||
.contentStart .startImg01{width:50%;position:absolute;top:30%;left:50%;margin-left:-25%;z-index:3;}
|
||||
.contentStart .startImg02{width:100%;position:absolute;bottom:0;z-index:2;}
|
||||
.contentStart .startImg03{width:100%;position:absolute;top:0;z-index:1;}
|
||||
|
||||
/* 引导页 */
|
||||
.swiper-container{width:100%;height:100%;background:#fff;z-index:10000;}
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 4.9 KiB After Width: | Height: | Size: 4.9 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 8.7 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 54 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 83 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 252 KiB |
@@ -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) {
|
||||
|
||||
@@ -77,7 +77,7 @@ function formatBaiduCity(baiduCity) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (newCity == "" && baiduCity.endWith("市")) {
|
||||
if (newCity == "" && baiduCity && baiduCity.endWith("市")) {
|
||||
newCity = baiduCity.substring(0,baiduCity.length-1);
|
||||
}
|
||||
return newCity;
|
||||
|
||||
@@ -12,6 +12,9 @@ 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();
|
||||
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
|
||||
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
|
||||
doAddCollect();
|
||||
})
|
||||
return;
|
||||
@@ -29,10 +32,9 @@ function addCollect(){
|
||||
$(".collection01").hide();
|
||||
$(".collection02").show();
|
||||
$.toast("随时掌握小区动态");
|
||||
plus.webview.getWebviewById('views/user/userInfo.html').reload();
|
||||
}
|
||||
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);
|
||||
@@ -47,6 +49,7 @@ function doRemoveCollect(){
|
||||
if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") {
|
||||
clicked('../user/codeSms.html',true,false,{},{},function(){
|
||||
doRemoveCollect();
|
||||
plus.webview.getWebviewById('views/user/userInfo.html').reload();
|
||||
})
|
||||
return;
|
||||
} else {
|
||||
@@ -311,6 +314,8 @@ function showTrends(v){
|
||||
clicked('../user/codeSms.html',true,false,{},{},function(){
|
||||
showTrends(v);
|
||||
plus.webview.getWebviewById('views/user/userInfo.html').reload();
|
||||
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
|
||||
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
|
||||
})
|
||||
return;
|
||||
} else {
|
||||
|
||||
@@ -198,6 +198,9 @@ 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();
|
||||
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
|
||||
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
|
||||
})
|
||||
return;
|
||||
} else {
|
||||
@@ -542,6 +545,7 @@ function collectCity(city, type){
|
||||
collectCity(city, type)
|
||||
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
|
||||
plus.webview.getWebviewById('views/user/userInfo.html').reload();
|
||||
//plus.webview.getWebviewById('views/house/houseDetail.html').reload();
|
||||
})
|
||||
return;
|
||||
} else {
|
||||
|
||||
+19
-19
@@ -7,7 +7,7 @@
|
||||
"id": "H5693FF3D",/*应用的标识,创建应用时自动生成,勿手动修改*/
|
||||
"name": "有房",/*应用名称,程序桌面图标名称*/
|
||||
"version": {
|
||||
"name": "1.1",/*应用版本名称*/
|
||||
"name": "1.1.1",/*应用版本名称*/
|
||||
"code": "20109"
|
||||
},
|
||||
"description": "有房,围绕房产提供全方位数据分析的房产及金融服务平台,通过个性化的智能推荐,定制专属的个人投资或购房计划,多维度管理自有房产并提供房产融资通道。",/*应用描述信息*/
|
||||
@@ -254,31 +254,31 @@
|
||||
"ios": {
|
||||
"iphone": {
|
||||
"default": "",
|
||||
"retina35": "E:/房价网/201712/最新启动页面/有房-启动画面/iPhone/640x960.png",
|
||||
"retina40": "E:/房价网/201712/最新启动页面/有房-启动画面/iPhone/640x1136.png",
|
||||
"retina47": "E:/房价网/201712/最新启动页面/有房-启动画面/iPhone/750x1334.png",
|
||||
"retina55": "E:/房价网/201712/最新启动页面/有房-启动画面/iPhone/1242x2208.png",
|
||||
"retina55l": "E:/房价网/201712/最新启动页面/有房-启动画面/iPhone/2208x1242.png",
|
||||
"iphonex": "E:/房价网/201712/最新启动页面/有房-启动画面/iPhone/1125x2436.png",
|
||||
"iphonexl": "E:/房价网/201712/最新启动页面/有房-启动画面/iPhone/2436x1125.png"
|
||||
"retina35": "E:/房价网/201804/启动页尺寸/iphone/启动页iphone4_4s.png",
|
||||
"retina40": "E:/房价网/201804/启动页尺寸/iphone/启动页iphone5_5s.png",
|
||||
"retina47": "E:/房价网/201804/启动页尺寸/iphone/启动页iphone6.png",
|
||||
"retina55": "E:/房价网/201804/启动页尺寸/iphone/启动页iphone6plus竖版.png",
|
||||
"retina55l": "E:/房价网/201804/启动页尺寸/iphone/启动页iphone6plus横版.png",
|
||||
"iphonex": "E:/房价网/201804/启动页尺寸/iphone/启动页iphonex竖屏.png",
|
||||
"iphonexl": "E:/房价网/201804/启动页尺寸/iphone/启动页iphonex横版.png"
|
||||
},
|
||||
"ipad": {
|
||||
"portrait": "E:/房价网/201712/最新启动页面/有房-启动画面/iPad/768x1004.png",
|
||||
"portrait7": "E:/房价网/201712/最新启动页面/有房-启动画面/iPad/768x1024.png",
|
||||
"landscape": "E:/房价网/201712/最新启动页面/有房-启动画面/iPad/1024x748.png",
|
||||
"landscape7": "E:/房价网/201712/最新启动页面/有房-启动画面/iPad/1024x768.png",
|
||||
"portrait-retina": "E:/房价网/201712/最新启动页面/有房-启动画面/iPad/1536x2008.png",
|
||||
"portrait-retina7": "E:/房价网/201712/最新启动页面/有房-启动画面/iPad/1536x2048.png",
|
||||
"landscape-retina": "E:/房价网/201712/最新启动页面/有房-启动画面/iPad/2048x1496.png",
|
||||
"landscape-retina7": "E:/房价网/201712/最新启动页面/有房-启动画面/iPad/2048x1536.png"
|
||||
"portrait": "E:/房价网/201804/启动页尺寸/ipad/启动页ipad竖屏768_1004.png",
|
||||
"portrait7": "E:/房价网/201804/启动页尺寸/ipad/启动页ipad-ios7竖屏768_1024.png",
|
||||
"landscape": "E:/房价网/201804/启动页尺寸/ipad/启动页ipad1024_748横屏.png",
|
||||
"landscape7": "E:/房价网/201804/启动页尺寸/ipad/启动页ipad-ios7横屏1024_768.png",
|
||||
"portrait-retina": "E:/房价网/201804/启动页尺寸/ipad/启动页ipad高分屏竖屏.png",
|
||||
"portrait-retina7": "E:/房价网/201804/启动页尺寸/ipad/启动页ipad-ios7高分屏竖屏.png",
|
||||
"landscape-retina": "E:/房价网/201804/启动页尺寸/ipad/启动页ipad高分屏横屏.png",
|
||||
"landscape-retina7": "E:/房价网/201804/启动页尺寸/ipad/启动页ipad-ios7高分屏横屏.png"
|
||||
}
|
||||
},
|
||||
"android": {
|
||||
"mdpi": "", /*普通屏启动图片,分辨率:240x282*/
|
||||
"ldpi": "",
|
||||
"hdpi": "E:/房价网/201712/最新启动页面/有房-启动画面/Android/480x762.png",
|
||||
"xhdpi": "E:/房价网/201712/最新启动页面/有房-启动画面/Android/720x1242.png",
|
||||
"xxhdpi": "E:/房价网/201712/最新启动页面/有房-启动画面/Android/1080x1882.png"
|
||||
"hdpi": "E:/房价网/201804/安卓启动页/启动页android高分屏1.png",
|
||||
"xhdpi": "E:/房价网/201804/安卓启动页/启动页android-720P高分屏2.png",
|
||||
"xxhdpi": "E:/房价网/201804/安卓启动页/启动页android-1080高分屏3.png"
|
||||
}
|
||||
},
|
||||
"plugins": {
|
||||
|
||||
@@ -22,10 +22,9 @@
|
||||
<div class="page page-current">
|
||||
<div class="content contentStart">
|
||||
<a class="time" onclick="skip()">跳过 <span id="time">5</span></a>
|
||||
<img src="images/start.png">
|
||||
<div class="content-block">
|
||||
<p><a onclick="clicked('/views/house/add.html',true,false,{},{})" class="button button-big button-fill button-round theme" id="test_btn">立即测试<i class="mui-icon mui-icon-arrowright"></i></a></p>
|
||||
</div>
|
||||
<img src="images/startImg01.png" class="startImg01">
|
||||
<img src="images/startImg02.png" class="startImg02">
|
||||
<img src="images/startImg03.png" class="startImg03">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -50,7 +50,7 @@ Vue.component('city_increase_ranking',{
|
||||
follow:function(city,event, type){
|
||||
|
||||
if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){
|
||||
clicked('/views/user/passLogin.html',true,false,{},{},function(){
|
||||
clicked('/views/user/codeSms.html',true,false,{},{},function(){
|
||||
if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){
|
||||
}else{
|
||||
$.confirm('您确定要关注'+city+"?", function () {
|
||||
|
||||
@@ -1845,7 +1845,9 @@ function checkIsLogin(){
|
||||
|
||||
}else{
|
||||
addEvaluation();
|
||||
|
||||
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
|
||||
plus.webview.getWebviewById('views/user/userInfo.html').reload();
|
||||
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
|
||||
}
|
||||
})
|
||||
}else{
|
||||
|
||||
@@ -1271,15 +1271,12 @@ $.config = {router: false}
|
||||
var city = "";
|
||||
plus.geolocation.getCurrentPosition(function(p){
|
||||
city = p.address.city;
|
||||
|
||||
if(city && city.endsWith("市")){
|
||||
var formatCity = formatBaiduCity(city);
|
||||
positionCity = formatCity
|
||||
city = formatCity;
|
||||
$(".nowCity").html(city);
|
||||
loadAllCityData();
|
||||
|
||||
var formatCity = formatBaiduCity(city);
|
||||
positionCity = formatCity
|
||||
city = formatCity;
|
||||
$(".nowCity").html(city);
|
||||
loadAllCityData();
|
||||
}
|
||||
loadMyCollectCity();
|
||||
|
||||
}, function(e){
|
||||
|
||||
@@ -504,6 +504,9 @@ $(".collection").on("click", function () {
|
||||
function doCollect() {
|
||||
if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") {
|
||||
clicked('../user/codeSms.html',true,false,{},{},function(){
|
||||
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
|
||||
plus.webview.getWebviewById('views/user/userInfo.html').reload()
|
||||
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
|
||||
doCollect();
|
||||
})
|
||||
return;
|
||||
@@ -533,7 +536,7 @@ function collect(){
|
||||
$(".collection").removeClass("collection02")
|
||||
$(".collection i").removeClass("icon-collection02")
|
||||
}
|
||||
plus.webview.getWebviewById('views/user/userInfo.html').reload()
|
||||
|
||||
}
|
||||
$.toast(msg);
|
||||
|
||||
|
||||
@@ -1546,6 +1546,9 @@ function initNews(page){
|
||||
}
|
||||
})
|
||||
.then(function (response) {
|
||||
if(page == 1){
|
||||
dataObj = []
|
||||
}
|
||||
//合并数组
|
||||
if(response.data.data.list.length == 0){
|
||||
//隐藏加载框
|
||||
@@ -2226,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=="上海"){
|
||||
@@ -2271,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();
|
||||
@@ -2288,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'))
|
||||
|
||||
Reference in New Issue
Block a user