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

This commit is contained in:
gongjin
2018-04-17 16:50:32 +08:00
3 changed files with 20 additions and 14 deletions
+7 -1
View File
@@ -11,12 +11,18 @@ axios.interceptors.request.use(function (config) {
return Promise.reject(error);
});
var showTimeOutTime = 0;
// 添加响应拦截器
axios.interceptors.response.use(function (response) {
plus.nativeUI.closeWaiting();
return response;
}, function (error) {
if (error.toString().indexOf('timeout') > -1) {
plus.nativeUI.alert("请求超时");
var curTime = new Date();
if (curTime - showTimeOutTime > 5000) {
plus.nativeUI.alert("请求超时");
showTimeOutTime = new Date();
}
plus.nativeUI.closeWaiting();
}else if(error=="Error: Network Error"){
if(plus.webview.getWebviewById('error.html')==null){
+3 -4
View File
@@ -29,11 +29,11 @@ function shareAction(sb,bh) {
if(sharehrefTitle&&sharehrefTitle!=""){
msg.title=sharehrefTitle;
}
if(sharehrefDes&&sharehrefDes!=""){
if(sharehrefTitle&&sharehrefTitle!=""){
if(sb.title=="新浪微博"){
msg.content=shareUrl+sharehrefDes;
msg.content=shareUrl+"\t"+sharehrefTitle;
}else{
msg.content=sharehrefDes;
msg.content=sharehrefTitle;
}
}
msg.thumbs=[picUrl];
@@ -47,7 +47,6 @@ function shareAction(sb,bh) {
if ( sb.s.authenticated ) {
shareMessage(msg,sb.s);
} else {
plus.nativeUI.alert("---未授权---");
sb.s.authorize( function(){
shareMessage(msg,sb.s);
},function(e){
@@ -144,16 +144,17 @@ $.config = {router: false}
<script type="text/javascript" src="../../js/log/log_stat.js" ></script>
<script>
/*var lat = 31.2221;
var lng = 121.359204;
var city = "上海";
var address="广顺小区";
var travelTime=20;
var minAvgPrice=50000;
var maxAvgPrice=80000;
/*var lat = 39.946147;
var lng = 116.107604;
var city = "北京";
var address="门头沟区";
var travelTime=30;
var minAvgPrice=54545;
var maxAvgPrice=66666;
var areaTag=3;
var tag="近地铁_公交多_买菜做饭_商超便利_爱逛街_在外面吃_近医疗_近幼儿园_近小学_近中学";
var orderBy=0;*/
var orderBy=0;
init();*/
var lat;
var lng;
var city;
@@ -503,7 +504,7 @@ function addItems(number, lastIndex) {
}
}
html += '<li onclick="openDistWindow(\''+dataObj[i].city+'\',\''+dataObj[i].district+'\',\''+dataObj[i].name+'\')">'+
'<a class=external item-content>'+
'<a class="external item-content">'+
'<div class="item-inner">'+
'<div class="item-title-row"><div class="item-title">'+dataObj[i].name+'</div><div class="item-after"><em>¥'+dataObj[i].avgPrice+'元/㎡</em></div></div>'+
'<div class="item-title-row"><div class="item-title"><i class="icon icon-address03"></i><small>'+dataObj[i].city+dataObj[i].district+dataObj[i].address+'</small></div>'+