Browse Source

评论 :测试问题反馈修改(卖家切换或刷新所有订单或者代收款订单tab标签时会短暂出现【评价】和【追加评价】并排显示的情况)

wangdy 8 years ago
parent
commit
9da2c86b9c

+ 2 - 1
src/main/webapp/resources/js/vendor/controllers/forstore/vendor_order_ctrl.js

@@ -382,6 +382,7 @@ define(['app/app'], function (app) {
                             }
                         }
                         $scope.purchases = page.content;
+                        $scope.requestOver = 0;
                         angular.forEach($scope.purchases, function (order) {
                             Rate.getRateVendor({orderId:order.orderid},{},function (data) {
                                if (data.data){
@@ -397,7 +398,7 @@ define(['app/app'], function (app) {
                                         order.isAfterRate = true; // 是否完成追评
                                     }
                                 }
-
+                                $scope.requestOver += 1;
                             });
                             angular.forEach(JSON.parse(order.statushistory),function (data) {
                                 if (data.status == 520){

+ 2 - 2
src/main/webapp/resources/view/vendor/forstore/vendor_order.html

@@ -1042,8 +1042,8 @@
                                 <a class="order-operation" href="javascript:void(0)" ng-if="(purchase.status == 502 || purchase.status == 406)&&(purchase.uasPurcid == null)" ng-click="toBeShiped(purchase)">点击发货</a>
 								<a ng-if="purchase.uasPurcid" style="text-decoration: none;color: #323232;">来源UAS</a>
                                 <a class="order-operation" href="javascript:void(0)" ng-if="purchase.status == 404 && purchase.lgtId&&!purchase.uasPurcid" ng-click="toBeShiped(purchase)" style="position: relative;">修改物流</a>
-								<a class="order-operation" href="javascript:void(0)" ng-click="getModal(purchase,'addRate')" style="position: relative;" ng-if="[405,503,514,506,511,520].indexOf(purchase.status) != -1 && !purchase.isAfterRate && purchase.isFirstRate">追加评价</a>
-								<a class="order-operation" href="javascript:void(0)" style="position: relative;" ng-click="getModal(purchase,'firstRate')" ng-if="[405,503,514,506,511,520].indexOf(purchase.status) != -1 && !purchase.isFirstRate">评价</a>
+								<a class="order-operation" href="javascript:void(0)" ng-click="getModal(purchase,'addRate')" style="position: relative;" ng-if="[405,503,514,506,511,520].indexOf(purchase.status) != -1 && !purchase.isAfterRate && purchase.isFirstRate && requestOver==purchases.length">追加评价</a>
+								<a class="order-operation" href="javascript:void(0)" style="position: relative;" ng-click="getModal(purchase,'firstRate')" ng-if="[405,503,514,506,511,520].indexOf(purchase.status) != -1 && !purchase.isFirstRate && requestOver==purchases.length">评价</a>
 								<!--<div ng-if="purchase.status == 520" class="clock-mind">
                                   <i class="fa fa-clock-o" aria-hidden="true"></i>&nbsp; <em ng-bind="purchase.complete + 1728000000 | restTime"></em>&lt;!&ndash;暂时设定30天自动初评&ndash;&gt;
                               </div>