From 4a3fe329840ddfecc9018ae78a64e3bf3a884225 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Tue, 17 Apr 2018 15:00:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/js/axiosPlugin.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/fangija-zsyf/js/axiosPlugin.js b/fangija-zsyf/js/axiosPlugin.js index 6088dd2..ff4df29 100644 --- a/fangija-zsyf/js/axiosPlugin.js +++ b/fangija-zsyf/js/axiosPlugin.js @@ -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){ From 42ec36658e03ff6e2106f4f539de50107ec36a5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Tue, 17 Apr 2018 16:21:11 +0800 Subject: [PATCH 2/3] weibo share --- fangija-zsyf/js/shara/sharaMine.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/fangija-zsyf/js/shara/sharaMine.js b/fangija-zsyf/js/shara/sharaMine.js index c2e80fd..fbe4551 100644 --- a/fangija-zsyf/js/shara/sharaMine.js +++ b/fangija-zsyf/js/shara/sharaMine.js @@ -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){ From 9a7af6bffe8c32e149cc16727c25fd98ec76cf8b Mon Sep 17 00:00:00 2001 From: "xuhe@fangjia.com" Date: Tue, 17 Apr 2018 16:48:26 +0800 Subject: [PATCH 3/3] aa --- .../views/intelligentHouse/aroundDetail.html | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/fangija-zsyf/views/intelligentHouse/aroundDetail.html b/fangija-zsyf/views/intelligentHouse/aroundDetail.html index d5ffcf5..723564f 100644 --- a/fangija-zsyf/views/intelligentHouse/aroundDetail.html +++ b/fangija-zsyf/views/intelligentHouse/aroundDetail.html @@ -144,16 +144,17 @@ $.config = {router: false}