评价：修改验收中的bug 批量回复

src/main/webapp/resources/js/common/query/rate.js

@@ -71,6 +71,11 @@ define([ 'ngResource' ], function() {
             saveAfterReply : {
                 url : 'rate/afterRateReply/:orderId',
                 method : 'POST'
+            },
+            //卖家为商品评价添加回复（批量）
+            saveAllReply : {
+                url : 'rate/allRateReply/:orderId',
+                method : 'POST'
             }
         });
     }]);

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

@@ -85,13 +85,22 @@ define(['app/app'], function(app) {
             // $scope.rateContent.purchaseid = purchase.purchaseid;
             // $scope.rateContent.orderid = purchase.orderid;
             $scope.rateType = type;
-            $scope.goodsId = detail.goodsId;
-            Rate.getRateTemplate({storeuuid: detail.storeId},{},function (data) {
-                $scope.modalData = data.data;
-            },function (error) {
-                toaster.pop('error', '获取模板信息失败');
-            });
-            $scope.setShowRateBoxFlag(true);
+            if (detail) {$scope.goodsId = detail.goodsId;
+                Rate.getRateTemplate({storeuuid: detail.storeId},{},function (data) {
+                    $scope.modalData = data.data;
+                },function (error) {
+                    toaster.pop('error', '获取模板信息失败');
+                });
+                $scope.setShowRateBoxFlag(true);
+            }else {
+                Rate.getRateTemplate({storeuuid: $scope.order.storeid},{},function (data) {
+                    $scope.modalData = data.data;
+                },function (error) {
+                    toaster.pop('error', '获取模板信息失败');
+                });
+                $scope.setShowRateBoxFlag(true);
+            }
+
         }
 
         //控制评论模态框的显示隐藏
@@ -199,6 +208,24 @@ define(['app/app'], function(app) {
                 },function (error) {
                     toaster.pop('error', '回复失败');
                 });
+            } else if ($scope.rateType == "allRate") {
+                if ($scope.order.status == 523){
+                    angular.forEach($scope.buyerRateGoods,function (item,index) {
+                        item.returnMeg = param.returnMeg;
+                    })
+                }else if ($scope.order.status == 522){
+                    angular.forEach($scope.buyerRateGoods,function (item,index) {
+                        if (item.buyerAfterRate){
+                            item.afterReturnMeg = param.returnMeg;
+                        }
+                    })
+                }
+                Rate.saveAllReply({orderId: $scope.order.orderid},$scope.buyerRateGoods,function (data) {
+                    toaster.pop('success', '批量回复成功');
+                    $state.reload();
+                },function (error) {
+                    toaster.pop('error', '回复失败');
+                });
             }
         }
 

src/main/webapp/resources/view/usercenter/forstore/show_rate.html

@@ -254,7 +254,7 @@
                         <div class="comment">
                             <span ng-bind="detail.buyerRate"></span></div>
                     </div>
-                    <div class="buyer-first-rate02">
+                    <div class="buyer-first-rate02" isRight>
                         <div>
                             <span>买家追评：</span>
                             <span class="rate-date" ng-bind="detail.buyerAfterRateTime | date:'yyyy-MM-dd'"></span>
@@ -267,7 +267,7 @@
                     <div class="buyer-first-rate02 isLeft" style="margin-left: 100px" ng-if="detail.returnMeg">
                         <div>
                             <span style="color:#6083ce;">卖家回复</span>
-                            <span class="rate-date" ng-bind="detail.returnMegTime"></span>
+                            <span class="rate-date" ng-bind="detail.returnMegTime  | date:'yyyy-MM-dd'"></span>
                         </div>
                         <div class="comment">
                             <span ng-bind="detail.returnMeg"></span></div>
@@ -275,7 +275,7 @@
                     <div class="buyer-first-rate02 isRight" ng-if="detail.afterReturnMeg">
                         <div>
                             <span style="color:#6083ce;">卖家回复</span>
-                            <span class="rate-date" ng-bind="detail.afterReturnMegTime"></span>
+                            <span class="rate-date" ng-bind="detail.afterReturnMegTime  | date:'yyyy-MM-dd'"></span>
                         </div>
                         <div class="comment">
                             <span ng-bind="detail.afterReturnMeg"></span></div>

src/main/webapp/resources/view/vendor/forstore/showRate.html

@@ -183,6 +183,12 @@
         overflow: hidden;
         height: 60px;
     }
+    .add-rate table .buyer-first-rate >div.isLeft {
+        margin-left: 100px;
+    }
+    .add-rate table .buyer-first-rate >div.isRight {
+        float: right;
+    }
     .add-rate .reply-box {
         position: fixed;
         width: 391px;
@@ -354,7 +360,7 @@
                     <img ng-if="buyerRateSeller.logisticsLevel && buyerRateSeller.logisticsLevel > 3" src="static/img/user/images/rateGood.png" alt="">
                     <img ng-if="buyerRateSeller.logisticsLevel && buyerRateSeller.logisticsLevel > 4" src="static/img/user/images/rateGood.png" alt="">
                 </span>
-                <!--<span class="batch-reply">批量回复</span>-->
+                <span class="batch-reply" ng-click="getModal(null,'allRate')">批量回复</span>
             </td>
         </tr>
         </thead>
@@ -368,7 +374,7 @@
                     <span class="add-rate-item-introduce"><span class="add-rate-item-link">品牌：<a href="product#/brand/{{::detail.goodsDetail.branduuid}}/" target="_blank"><em ng-bind="::detail.goodsDetail.brName" title="{{::detail.goodsDetail.brName}}"></em></a></span></span>
                 </div>
                 <div class="buyer-first-rate">
-                    <div class="buyer-first-rate02" style="margin-left: 100px" ng-mouseenter="detail.showRateReply = true" ng-mouseleave="detail.showRateReply = false">
+                    <div class="buyer-first-rate02 isLeft" style="margin-left: 100px" ng-mouseenter="detail.showRateReply = true" ng-mouseleave="detail.showRateReply = false">
                         <div>
                             <span>买家初评：</span>
                             <span><img ng-src="static/img/user/images/{{detail.level == 1?'rate1.png':detail.level == 2?'rate2.png':'rate3.png'}}" alt=""><span ng-bind="detail.level == 1?'好评':detail.level == 2?'中评':'差评'"></span></span>
@@ -376,22 +382,21 @@
                         </div>
                         <div class="comment">
                             <span ng-bind="detail.buyerRate"></span></div>
-                        <span class="batch-reply single-reply" ng-show="detail.showRateReply" ng-click="getModal(detail, 'firstRate')">回复</span>
+                        <span class="batch-reply single-reply" ng-show="detail.showRateReply && !detail.returnMeg" ng-click="getModal(detail, 'firstRate')">回复</span>
                     </div>
-                    <div class="buyer-first-rate02" ng-mouseenter="detail.showAddRateReply = true" ng-mouseleave="detail.showAddRateReply = false" ng-if="detail.buyerAfterRate">
+                    <div class="buyer-first-rate02 isRight" ng-mouseenter="detail.showAddRateReply = true" ng-mouseleave="detail.showAddRateReply = false" ng-if="detail.buyerAfterRate">
                         <div>
                             <span>买家追评：</span>
-                            <span><img ng-src="static/img/user/images/{{detail.level == 1?'rate1.png':detail.level == 2?'rate2.png':'rate3.png'}}" alt=""><span ng-bind="detail.level == 1?'好评':detail.level == 2?'中评':'差评'"></span></span>
                             <span class="rate-date" ng-bind="detail.buyerAfterRateTime | date:'yyyy-MM-dd'"></span>
                         </div>
                         <div class="comment">
                             <span ng-bind="detail.buyerAfterRate"></span>
                         </div>
-                        <span class="batch-reply single-reply" ng-show="detail.showAddRateReply" ng-click="getModal(detail, 'addRate')">回复</span>
+                        <span class="batch-reply single-reply" ng-show="detail.showAddRateReply && !detail.afterReturnMeg" ng-click="getModal(detail, 'addRate')">回复</span>
                     </div>
                 </div>
-                <div class="buyer-first-rate" ng-if="detail.returnMeg">
-                    <div class="buyer-first-rate02" style="margin-left: 100px">
+                <div class="buyer-first-rate" >
+                    <div class="buyer-first-rate02 isLeft" style="margin-left: 100px" ng-if="detail.returnMeg">
                         <div>
                             <span style="color:#6083ce;">卖家回复</span>
                             <span class="rate-date" ng-bind="detail.returnMegTime | date: 'yyyy-mm-dd'"></span>
@@ -399,13 +404,13 @@
                         <div class="comment">
                             <span ng-bind="detail.returnMeg"></span></div>
                     </div>
-                    <div class="buyer-first-rate02" ng-if="detail.afterReturnMeg">
+                    <div class="buyer-first-rate02 isRight" ng-if="detail.afterReturnMeg">
                         <div>
                             <span style="color:#6083ce;">卖家回复</span>
-                            <span class="rate-date" ng-bind="detail.afterReturnMegTime | date: 'yyyy-mm-dd'">2017-06-05</span>
+                            <span class="rate-date" ng-bind="detail.afterReturnMegTime | date: 'yyyy-mm-dd'"></span>
                         </div>
                         <div class="comment">
-                            <span ng-bind="detail.afterReturnMeg">谢谢亲阿双方打款付了哈咖啡韩哈见客户</span></div>
+                            <span ng-bind="detail.afterReturnMeg"></span></div>
                     </div>
                 </div>
             </td>