From 8e254ff7220d2d70cc19a9bb2bdb9ad480886d75 Mon Sep 17 00:00:00 2001 From: txz Date: Thu, 21 Apr 2016 10:38:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=BE=AE=E4=BF=A1loading=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/wechat/app.html | 8 +++++++- public/javascripts/wechat/app.js | 24 +++++++++++++++++++++--- public/stylesheets/weui/weixin.css | 8 +++++++- 3 files changed, 35 insertions(+), 5 deletions(-) diff --git a/public/assets/wechat/app.html b/public/assets/wechat/app.html index eb97a8360..5b2f4e9ec 100644 --- a/public/assets/wechat/app.html +++ b/public/assets/wechat/app.html @@ -13,7 +13,13 @@ -
+
+
+
+ 加载中... +
+
+
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js index bedd79ed4..984d9a9b2 100644 --- a/public/javascripts/wechat/app.js +++ b/public/javascripts/wechat/app.js @@ -1,9 +1,9 @@ var app = angular.module('wechat', ['ngRoute','ngCookies']); var apiUrl = '/api/v1/'; -var debug = false; //调试标志,如果在本地请置为true +var debug = true; //调试标志,如果在本地请置为true if(debug===true){ - apiUrl = 'https://www.trustie.net/api/v1/'; + apiUrl = 'http://localhost:3000/api/v1/'; } app.factory('auth', function($http,$routeParams, $cookies, $q){ @@ -399,7 +399,7 @@ app.directive('textAutoHeight', function($timeout){ } }); -app.config(['$routeProvider',function ($routeProvider) { +app.config(['$routeProvider',"$httpProvider",function ($routeProvider, $httpProvider) { $routeProvider .when('/activities', { templateUrl: 'activities.html', @@ -436,4 +436,22 @@ app.config(['$routeProvider',function ($routeProvider) { .otherwise({ redirectTo: '/activities' }); + $httpProvider.interceptors.push('timestampMarker'); +}]); + +//loading +app.factory('timestampMarker', ["$rootScope", function ($rootScope) { + var timestampMarker = { + request: function (config) { + $rootScope.loading = true; + config.requestTimestamp = new Date().getTime(); + return config; + }, + response: function (response) { + // $rootScope.loading = false; + response.config.responseTimestamp = new Date().getTime(); + return response; + } + }; + return timestampMarker; }]); diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css index 3872bb649..d79ad16ae 100644 --- a/public/stylesheets/weui/weixin.css +++ b/public/stylesheets/weui/weixin.css @@ -64,4 +64,10 @@ a.underline {text-decoration:underline;} .post-reply-trigger {font-size:13px;} .post-input-container {padding-right:2px;} .post-reply-input {width:100%; height:28px; line-height:28px; border:1px solid #e6e6e6; outline:none; padding:0; margin:0; border-radius:3px;} -.post-reply-submit {font-size:13px; padding:3px 8px; color:#fff; background-color:#269ac9; outline:none; border:none; display:inline-block;} \ No newline at end of file +.post-reply-submit {font-size:13px; padding:3px 8px; color:#fff; background-color:#269ac9; outline:none; border:none; display:inline-block;} + +/* loading 弹框*/ +.loading-bg {position:fixed; width:100%; height:100%; left:0; top:0; z-index:99; background:rgba(0, 0, 0, 0.3); overflow:hidden;} +.loading-box {position:absolute; top:50%; background:white; width:160px; height:72px; left:50%; margin-top:-36px; margin-left:-80px; text-align:center;} +.loading-box img {margin-top: 12px; text-align: center;} +.loading-box span {display: block;} \ No newline at end of file From 0bab42256c6e6c6d54c9cf0b61553d42205788e0 Mon Sep 17 00:00:00 2001 From: txz Date: Thu, 21 Apr 2016 11:21:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BE=AE=E4=BF=A1loading=E5=BC=B9=E6=A1=86?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/wechat/app.html | 2 +- public/images/wechat/loading.gif | Bin 0 -> 3878 bytes public/javascripts/wechat/app.js | 2 +- public/stylesheets/weui/weixin.css | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) create mode 100755 public/images/wechat/loading.gif diff --git a/public/assets/wechat/app.html b/public/assets/wechat/app.html index 5b2f4e9ec..187439468 100644 --- a/public/assets/wechat/app.html +++ b/public/assets/wechat/app.html @@ -16,7 +16,7 @@
- 加载中... + 加载中...
diff --git a/public/images/wechat/loading.gif b/public/images/wechat/loading.gif new file mode 100755 index 0000000000000000000000000000000000000000..b806bf34c396900414f74b8e591e85333f9ab38f GIT binary patch literal 3878 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 literal 0 HcmV?d00001 diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js index 984d9a9b2..241c88129 100644 --- a/public/javascripts/wechat/app.js +++ b/public/javascripts/wechat/app.js @@ -377,7 +377,7 @@ app.directive('textAutoHeight', function($timeout){ link: function(scope, element, attr){ scope.text = '点击展开'; $timeout(function(){ - var e = element.parent().children().eq(4); + var e = element.parent().children().eq(5); var height = e[0].scrollHeight; var offsetHeight = e[0].offsetHeight; if(height>90){ diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css index 92aeec9cf..21fde54bb 100644 --- a/public/stylesheets/weui/weixin.css +++ b/public/stylesheets/weui/weixin.css @@ -73,7 +73,7 @@ a.underline {text-decoration:underline;} .praised-icon {background:url(/images/wechat/wechat_icon.png) -100px -76px no-repeat; width:20px; height:18px; display:inline-block; vertical-align:middle;} /* loading 弹框*/ -.loading-bg {position:fixed; width:100%; height:100%; left:0; top:0; z-index:99; background:rgba(0, 0, 0, 0.3); overflow:hidden;} +.loading-bg {position:fixed; width:100%; height:100%; left:0; top:0; z-index:99; background:rgba(206, 206, 206, 0.3); overflow:hidden;} .loading-box {position:absolute; top:50%; background:white; width:160px; height:72px; left:50%; margin-top:-36px; margin-left:-80px; text-align:center;} -.loading-box img {margin-top: 12px; text-align: center;} +.loading-box img {margin-top: 3px; text-align: center;} .loading-box span {display: block;} From 2345eb9d644730310786e791913965677740bd40 Mon Sep 17 00:00:00 2001 From: txz Date: Thu, 21 Apr 2016 11:22:52 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/wechat/app.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js index 241c88129..0a6b97e5b 100644 --- a/public/javascripts/wechat/app.js +++ b/public/javascripts/wechat/app.js @@ -1,9 +1,9 @@ var app = angular.module('wechat', ['ngRoute','ngCookies']); var apiUrl = '/api/v1/'; -var debug = true; //调试标志,如果在本地请置为true +var debug = false; //调试标志,如果在本地请置为true if(debug===true){ - apiUrl = 'http://localhost:3000/api/v1/'; + apiUrl = 'https://www.trustie.net/api/v1/'; } app.factory('auth', function($http,$routeParams, $cookies, $q){