|
@@ -84,6 +84,34 @@ define(['app/app'], function(app) {
|
|
|
// $scope.rateContent.storeid = purchase.storeid;
|
|
// $scope.rateContent.storeid = purchase.storeid;
|
|
|
// $scope.rateContent.purchaseid = purchase.purchaseid;
|
|
// $scope.rateContent.purchaseid = purchase.purchaseid;
|
|
|
// $scope.rateContent.orderid = purchase.orderid;
|
|
// $scope.rateContent.orderid = purchase.orderid;
|
|
|
|
|
+ if(type == 'allRate'){
|
|
|
|
|
+ var count= 0 ;
|
|
|
|
|
+ if ($scope.order.ratestatus == 523){
|
|
|
|
|
+ angular.forEach($scope.buyerRateGoods,function (item,index) {
|
|
|
|
|
+ if (item.buyerRate != '此用户没有填写评价!'){
|
|
|
|
|
+ if (!item.returnMeg || item.returnMeg =='' ){
|
|
|
|
|
+ item.returnMeg = param.returnMeg;
|
|
|
|
|
+ }else{count++;}
|
|
|
|
|
+ }else{count++;}
|
|
|
|
|
+ })
|
|
|
|
|
+ if (count == $scope.buyerRateGoods.length){
|
|
|
|
|
+ $scope.setShowRateBoxFlag(false);
|
|
|
|
|
+ toaster.pop('warning', '所有商品都已回复完成');
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+ }else if ($scope.order.ratestatus == 522){
|
|
|
|
|
+ angular.forEach($scope.buyerRateGoods,function (item,index) {
|
|
|
|
|
+ if (item.buyerAfterRate && !item.afterReturnMeg){
|
|
|
|
|
+ item.afterReturnMeg = param.returnMeg;
|
|
|
|
|
+ }else {count++;}
|
|
|
|
|
+ })
|
|
|
|
|
+ if (count == $scope.buyerRateGoods.length){
|
|
|
|
|
+ $scope.setShowRateBoxFlag(false);
|
|
|
|
|
+ toaster.pop('warning', '所有商品都已回复完成');
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
$scope.rateType = type;
|
|
$scope.rateType = type;
|
|
|
if (detail) {$scope.goodsId = detail.goodsId;
|
|
if (detail) {$scope.goodsId = detail.goodsId;
|
|
|
Rate.getRateTemplate({storeuuid: detail.storeId},{},function (data) {
|
|
Rate.getRateTemplate({storeuuid: detail.storeId},{},function (data) {
|
|
@@ -250,7 +278,7 @@ define(['app/app'], function(app) {
|
|
|
});
|
|
});
|
|
|
} else if ($scope.rateType == "allRate") {
|
|
} else if ($scope.rateType == "allRate") {
|
|
|
var count= 0 ;
|
|
var count= 0 ;
|
|
|
- if ($scope.order.status == 523){
|
|
|
|
|
|
|
+ if ($scope.order.ratestatus == 523){
|
|
|
angular.forEach($scope.buyerRateGoods,function (item,index) {
|
|
angular.forEach($scope.buyerRateGoods,function (item,index) {
|
|
|
if (item.buyerRate != '此用户没有填写评价!'){
|
|
if (item.buyerRate != '此用户没有填写评价!'){
|
|
|
if (!item.returnMeg || item.returnMeg =='' ){
|
|
if (!item.returnMeg || item.returnMeg =='' ){
|
|
@@ -263,7 +291,7 @@ define(['app/app'], function(app) {
|
|
|
toaster.pop('warning', '所有商品都已回复完成');
|
|
toaster.pop('warning', '所有商品都已回复完成');
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
- }else if ($scope.order.status == 522){
|
|
|
|
|
|
|
+ }else if ($scope.order.ratestatus == 522){
|
|
|
angular.forEach($scope.buyerRateGoods,function (item,index) {
|
|
angular.forEach($scope.buyerRateGoods,function (item,index) {
|
|
|
if (item.buyerAfterRate && !item.afterReturnMeg){
|
|
if (item.buyerAfterRate && !item.afterReturnMeg){
|
|
|
item.afterReturnMeg = param.returnMeg;
|
|
item.afterReturnMeg = param.returnMeg;
|