Merge branch 'feature-201826-wangcz' into release-201826-wangcz

# Conflicts:
#	src/main/webapp/resources/js/usercenter/controllers/forstore/messagePersonalCtrl.js
#	src/main/webapp/resources/js/vendor/controllers/forstore/messagePersonalCtrl.js

src/main/webapp/resources/js/vendor/controllers/forstore/messagePersonalCtrl.js

@@ -284,6 +284,7 @@ define(['app/app'], function(app) {
         $scope.allReadMessCount = 0;
         //获取所有消息数量
         var getData = function () {
+            //获取所有消息数量
             InternalMessage.getUrl({}, function(data) {
                 var url = data.url;
                 if (url == "http://218.17.158.219:24000/message") {
@@ -372,6 +373,7 @@ define(['app/app'], function(app) {
                     }).error(function (err) {
                         toaster.pop('error', err || '获取未读消息数量失败');
                     })
+
                     if ($scope.tab == 'no') {
                         // $rootScope.unReadMessCount = data.totalElements;
                     } else {
@@ -398,6 +400,10 @@ define(['app/app'], function(app) {
             }, function(response) {
                 toaster.pop('error', '获取消息失败，请重新刷新界面，');
             });
+
+
+
+
         };
 
         // 批量删除