|
@@ -318,9 +318,9 @@ define(['app/app'], function(app) {
|
|
|
};*/
|
|
};*/
|
|
|
$scope.unReadMessCount = $rootScope.unReadMessCount;
|
|
$scope.unReadMessCount = $rootScope.unReadMessCount;
|
|
|
$scope.allReadMessCount = 0;
|
|
$scope.allReadMessCount = 0;
|
|
|
|
|
+ //获取所有消息数量
|
|
|
var getData = function () {
|
|
var getData = function () {
|
|
|
InternalMessage.getUrl({}, function(data) {
|
|
InternalMessage.getUrl({}, function(data) {
|
|
|
-
|
|
|
|
|
var url = data.url;
|
|
var url = data.url;
|
|
|
if (url == "http://218.17.158.219:24000/message") {
|
|
if (url == "http://218.17.158.219:24000/message") {
|
|
|
url = 'http://192.168.253.6:24000/message';
|
|
url = 'http://192.168.253.6:24000/message';
|
|
@@ -339,13 +339,10 @@ define(['app/app'], function(app) {
|
|
|
}).success(function (data) {
|
|
}).success(function (data) {
|
|
|
$scope.allReadMessCount = data.count;
|
|
$scope.allReadMessCount = data.count;
|
|
|
}).error(function (err) {
|
|
}).error(function (err) {
|
|
|
- toaster.pop('error', err || '获取未读消息数量失败');
|
|
|
|
|
|
|
+ toaster.pop('error', err || '获取所有消息数量失败');
|
|
|
});
|
|
});
|
|
|
})
|
|
})
|
|
|
- /* $scope.allReadMessCount = data.toRead;
|
|
|
|
|
- }, function (err) {
|
|
|
|
|
- toaster.pop('error', err || '获取未读消息数量失败');
|
|
|
|
|
- })*/
|
|
|
|
|
|
|
+ //获取消息 isread=0为未读 isread=1为已读 isread=null为全部
|
|
|
InternalMessage.getUrl({}, function(info) {
|
|
InternalMessage.getUrl({}, function(info) {
|
|
|
if (info) {
|
|
if (info) {
|
|
|
var url = info.url;
|
|
var url = info.url;
|
|
@@ -371,9 +368,10 @@ define(['app/app'], function(app) {
|
|
|
}).success(function (data) {
|
|
}).success(function (data) {
|
|
|
$scope.messageAllData = data;
|
|
$scope.messageAllData = data;
|
|
|
$scope.messageCurrent = data.content;
|
|
$scope.messageCurrent = data.content;
|
|
|
-
|
|
|
|
|
|
|
+ //获取消息id,并以“,”分隔。以便批量设为已读
|
|
|
var mess = new Array();
|
|
var mess = new Array();
|
|
|
var b = '';
|
|
var b = '';
|
|
|
|
|
+ //根据type跳转页面
|
|
|
angular.forEach($scope.messageCurrent, function (message) {
|
|
angular.forEach($scope.messageCurrent, function (message) {
|
|
|
message.content = $sce.trustAsHtml(message.content);
|
|
message.content = $sce.trustAsHtml(message.content);
|
|
|
if(message.type =="MALL跳转买家已报价页面"){
|
|
if(message.type =="MALL跳转买家已报价页面"){
|
|
@@ -389,6 +387,7 @@ define(['app/app'], function(app) {
|
|
|
b += message.id +",";
|
|
b += message.id +",";
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
|
|
|
+ //设置消息为已读
|
|
|
mess = b.substring(0, b.length - 1);
|
|
mess = b.substring(0, b.length - 1);
|
|
|
var param = {
|
|
var param = {
|
|
|
'receiverUu': info.userUU,
|
|
'receiverUu': info.userUU,
|
|
@@ -411,6 +410,7 @@ define(['app/app'], function(app) {
|
|
|
if ($scope.tab == 'no') {
|
|
if ($scope.tab == 'no') {
|
|
|
// $rootScope.unReadMessCount = data.totalElements;
|
|
// $rootScope.unReadMessCount = data.totalElements;
|
|
|
} else {
|
|
} else {
|
|
|
|
|
+ //获取未读消息数量
|
|
|
var param = {
|
|
var param = {
|
|
|
'receiverUu': info.userUU,
|
|
'receiverUu': info.userUU,
|
|
|
'receiverEnuu': info.enUU,
|
|
'receiverEnuu': info.enUU,
|
|
@@ -424,7 +424,7 @@ define(['app/app'], function(app) {
|
|
|
params: param
|
|
params: param
|
|
|
}).success(function (data) {
|
|
}).success(function (data) {
|
|
|
$rootScope.unReadMessCount = data.count;
|
|
$rootScope.unReadMessCount = data.count;
|
|
|
-
|
|
|
|
|
|
|
+ $scope.unReadMessCount = $rootScope.unReadMessCount;
|
|
|
}).error(function (err) {
|
|
}).error(function (err) {
|
|
|
toaster.pop('error', err || '获取未读消息数量失败');
|
|
toaster.pop('error', err || '获取未读消息数量失败');
|
|
|
});
|
|
});
|