Merge remote-tracking branch 'origin/feature-wangdy-rate-v1.0' into feature-wangdy-rate-v1.0

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

@@ -91,7 +91,7 @@ define(['app/app'], function(app) {
                 var count= 0 ;
                 if ($scope.order.ratestatus == 523){
                     angular.forEach($scope.buyerRateGoods,function (item,index) {
-                        if (item.buyerRate != '此用户没有填写评价！'){
+                        if (item.buyerRate != '此用户没有填写评价！' && item.buyerRate != '此用户未及时做出评价，系统默认好评！'){
                             if (!item.returnMeg || item.returnMeg =='' ){
                                 item.returnMeg = param.returnMeg;
                             }else{count++;}
@@ -99,7 +99,7 @@ define(['app/app'], function(app) {
                     })
                     if (count == $scope.buyerRateGoods.length){
                         $scope.setShowRateBoxFlag(false);
-                        toaster.pop('warning', '所有商品都已回复完成');
+                        toaster.pop('warning', '您当前没有可回复的评价');
                         return;
                     }
                 }else if ($scope.order.ratestatus == 522){
@@ -110,7 +110,7 @@ define(['app/app'], function(app) {
                     })
                     if (count == $scope.buyerRateGoods.length){
                         $scope.setShowRateBoxFlag(false);
-                        toaster.pop('warning', '所有商品都已回复完成');
+                        toaster.pop('warning', '您当前没有可回复的评价');
                         return;
                     }
                 }

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

@@ -366,15 +366,15 @@
     <div class="add-rate-head">
         <span style="width: 27%;">
             <a href="store/{{::order.storeid}}" target="_blank" class="add-rate-company">
-                <img src="static/img/user/images/shop_home.png"/>
-                <em>深圳市优软科技有限公司</em>
+               <!-- <img src="static/img/user/images/shop_home.png"/>-->
+                <em>{{order.buyername + ' | ' + order.sellername}}</em>
             </a>
         </span>
         <span style="position: relative; width: 10%; margin-left: 50px;">
             <img src="static/img/common/songguo.png"/>
             <a href="javascript:void(0)" class="contact_btn">联系买家</a>
         </span>
-        <span style="float: right;margin-right: 46px; font-size: 12px;">其他买家需要你的建议喔</span>
+        <!--<span style="float: right;margin-right: 46px; font-size: 12px;">其他买家需要你的建议喔</span>-->
     </div>
     <table ng-table="showRateTableParams">
         <thead>
@@ -440,7 +440,7 @@
                         </div>
                         <div class="comment">
                             <span ng-bind="detail.buyerRate"></span></div>
-                        <span class="batch-reply single-reply" ng-if="detail.buyerRate != '此用户没有填写评价！'" ng-show="detail.showRateReply && !detail.returnMeg" ng-click="getModal(detail, 'firstRate')">回复</span>
+                        <span class="batch-reply single-reply" ng-if="detail.buyerRate != '此用户没有填写评价！' && detail.buyerRate != '此用户未及时做出评价，系统默认好评！'" ng-show="detail.showRateReply && !detail.returnMeg" ng-click="getModal(detail, 'firstRate')">回复</span>
                     </div>
                     <div class="buyer-first-rate02 isRight" ng-class="{'bg-f5f8fe':detail.showAddRateReply && !detail.afterReturnMeg}" ng-mouseenter="detail.showAddRateReply = true" ng-mouseleave="detail.showAddRateReply = false" ng-if="detail.buyerAfterRate">
                         <div>
@@ -483,7 +483,7 @@
     <div class="reply-box" ng-if="showRateBoxFlag">
         <img src="static/img/vendor/images/rate-box-del.png" ng-click="setShowRateBoxFlag(false)" alt="">
         <div style="position: relative;" ng-show="boxStatus == 1 || boxStatus == 2">
-            <label class="check-active">
+            <label class="check-active" style="height: 34px;line-height: 34px;">
                 <input type="checkbox" id="check-act" ng-click="setGo()" ng-checked="boxStatus == 1" class="ng-pristine ng-untouched ng-valid">
                 <label for="check-act"></label>
                 <span style="font-size: 14px; color: black; font-weight: normal">使用模板</span>