Procházet zdrojové kódy

评价:一期完成,页面调整

wangdy před 8 roky
rodič
revize
19bd90dd10

+ 8 - 2
src/main/webapp/resources/view/usercenter/forstore/buyer_order.html

@@ -743,10 +743,10 @@
 						</span>
 						<span class="oder_deal" ng-class="{'order-border-bottom-solid' : $index == order.orderDetails.length -1 || $index==2}">
                             <div ng-if="$index == 0">
-                                <a class="operate-height" target="_blank" href="user#/rate/firstRate/{{order.orderid | EncryptionFilter}}" style="display: block;">
+                                <a ng-if="order.status == 520" class="operate-height" target="_blank" href="user#/rate/firstRate/{{order.orderid | EncryptionFilter}}" style="display: block;">
                                   <em class="order-operation">评价</em>
                               	</a>
-								<a class="operate-height" target="_blank" href="user#/rate/addRate/{{order.orderid | EncryptionFilter}}" style="display: block;">
+								<a ng-if="order.status == 523" class="operate-height" target="_blank" href="user#/rate/addRate/{{order.orderid | EncryptionFilter}}" style="display: block;">
                                   <em class="order-operation">追加评价</em>
                               	</a>
                               <a class="operate-height" href="user#/order/pay/{{order.orderid | EncryptionFilter}}" ng-if="(order.status == 503 || order.status == 501) && order.auditPayFailReason == null" style="display: block;">
@@ -757,6 +757,12 @@
                               </a>
                               <div ng-if="order.status == 503" class="clock-mind">
                                   <i class="fa fa-clock-o" aria-hidden="true"></i>&nbsp; <em ng-bind="order.availabletime | restTime"></em>
+                              </div>
+								<div ng-if="order.status == 520" class="clock-mind">
+                                  <i class="fa fa-clock-o" aria-hidden="true"></i>&nbsp; <em ng-bind="order.reciptTime + 1728000000 | restTime"></em>
+                              </div>
+								<div ng-if="order.status == 523" class="clock-mind">
+                                  <i class="fa fa-clock-o" aria-hidden="true"></i>&nbsp; <em ng-bind="order.reciptTime + 15552000000 | restTime"></em>
                               </div>
                               <a class="action-link operate-height" ng-if="order.status == 503 || order.status == 501 || order.status == 502" style="display: block;line-height: 20px; height: 20px;" ng-click="cancle(order.orderid)">
                                   取消订单

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

@@ -963,7 +963,7 @@
                                 <a href="vendor#/purchase/detail/{{purchase.purchaseid | EncryptionFilter}}" class="oder_d action-link" target="_blank">订单详情</a><br/>
                                 <em ng-if="purchase.buyerNotifyShip && (purchase.status == 502 || purchase.status == 406)" style="display: block;">买家催促发货</em>
                                 <a class="oder_d action-link" href="vendor#/logistics/query/{{purchase.purchaseid | EncryptionFilter}}" ng-if="purchase.status == 404 || purchase.status == 520 || purchase.status == 405 || purchase.status == 503 || purchase.status == 514" target="_blank">查看物流</a>
-                           		<a class="oder_d action-link" target="_blank" href="vendor#/showRate/1" style="display: block;">双方已评</a>
+                           		<a class="oder_d action-link" target="_blank" href="vendor#/showRate/1" style="display: block;" ng-if="purchase.status == 522">双方已评</a>
                             </div>
                         </span>
 						<span class="click_shop">
@@ -971,8 +971,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;">追加评价</a>
-								<a class="order-operation" href="javascript:void(0)" style="position: relative;" ng-click="getModal(purchase,'firstRate')">评价</a>
+								<a class="order-operation" href="javascript:void(0)" ng-click="getModal(purchase,'addRate')" style="position: relative;" ng-if="purchase.status == 523">追加评价</a>
+								<a class="order-operation" href="javascript:void(0)" style="position: relative;" ng-click="getModal(purchase,'firstRate')" ng-if="purchase.status == 520">评价</a>
 								<div class="seller-ship-tip" ng-if="purchase.status == 404 && purchase.lgtId &&!purchase.uasPurcid" style="position: relative;">
                                     <img src="static/img/common/notice-tip.png" ng-mouseover="purchase.noticeTip = true" ng-mouseleave="purchase.noticeTip = false"/>
                                     <div class="ship-notify" ng-if="purchase.noticeTip">