Merge branch 'feature-wangdy-rate-v1.0' of C:\Users\uas\uascode\platform_git\platform-b2c with conflicts.

src/main/java/com/uas/platform/b2c/trade/order/model/Order.java

@@ -1330,6 +1330,34 @@ public class Order extends Document implements Serializable {
 		this.statushistory = addStatusHistory(this.statushistory, uu, this.status);
 	}
 
+	/**
+	 * Sets status TO_BE_REVIEWED.
+	 *
+	 * @param uu the uu
+	 */
+	public void setStatusToBeReviewed(Long uu) {
+		this.status = Status.TO_BE_REVIEWED.value();
+		this.statushistory = addStatusHistory(this.statushistory, uu, this.status);
+	}
+	/**
+	 * Sets status TO_BE_AFTERREVIEWED.
+	 *
+	 * @param uu the uu
+	 */
+	public void setStatusToBeAfterReviewed(Long uu) {
+		this.status = Status.TO_BE_AFTERREVIEWED.value();
+		this.statushistory = addStatusHistory(this.statushistory, uu, this.status);
+	}
+	/**
+	 * Sets status REVIEWED.
+	 *
+	 * @param uu the uu
+	 */
+	public void setStatusReviewed(Long uu) {
+		this.status = Status.REVIEWED.value();
+		this.statushistory = addStatusHistory(this.statushistory, uu, this.status);
+	}
+
 	/**
 	 * Sets status un available.
 	 *

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

@@ -736,15 +736,18 @@
 								<a href="user#/order/detail/{{order.orderid | EncryptionFilter}}" class="oder_d action-link" style="display: block;" target="_blank">订单详情</a>
 
 								<a class="action-link" href="user#/buyerQueryLogistics/{{order.orderid | EncryptionFilter}}" ng-if="order.status == 404" style="display: block;" target="_blank">查看物流</a>
-								<a class="action-link" href="user#/rate/showRate" style="display: block;" target="_blank">双方已评</a>
+								<div>双方已评</div>
 							</div>
 						</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" href="user#/rate/addRate" target="_blank" style="display: block;">
+								<a class="operate-height" href="user#/rate/showRate" style="display: block;">
+                                  <em class="order-operation">已评价</em>
+                              	</a>
+								<a class="operate-height" href="user#/rate/addRate" style="display: block;">
                                   <em class="order-operation">追加评价</em>
                               	</a>
-								<a class="operate-height" href="user#/rate/firstRate" target="_blank" style="display: block;">
+								<a ng-if="order.status == 405" class="operate-height" href="user#/rate/firstRate" 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;">