评论模块 逻辑bug修改

src/main/java/com/uas/platform/b2c/trade/order/status/OrderStatus.java

@@ -31,7 +31,7 @@ public enum OrderStatus {
 	/**
 	 * {@code success 已完成}
 	 */
-	SUCCESS("success", "520-405"),
+	SUCCESS("success", "520-405-522-523"),
 	/**
 	 * {@code unavailable 已失效}
 	 */
@@ -39,7 +39,7 @@ public enum OrderStatus {
 	/**
 	 * {@code unavailable 待评价}
 	 */
-	TOBECOMMENT("tobecomment", "520-523");
+	TOBECOMMENT("tobecomment", "520");
 
 	/**
 	 * 状态名称

src/main/java/com/uas/platform/b2c/trade/order/status/PurchaseStatus.java

@@ -39,7 +39,7 @@ public enum PurchaseStatus {
 	/**
 	 * {@code unavailable 待评价}
 	 */
-	TOBERATE("toBeRate","523-520");
+	TOBERATE("toBeRate","520");
 
 	/**
 	 * 状态名称

src/main/webapp/resources/js/usercenter/controllers/forstore/buyer_order_ctrl.js

@@ -83,11 +83,11 @@ define(['app/app'], function (app) {
 				case 'received' : // 已收货
 					state = '405'; break;
 				case 'success': // 已完成
-					state = '520-405-521'; break;
+					state = '520-405-521-522-523'; break;
 				case 'unavailable' : // 已失效
 					state = '602-603-315-604-605-606'; break;
 				case 'tobecomment' :
-					state = '520-523'; break;
+					state = '520'; break;
 				//下面的状态栏新增的状态
 				case 'tobepay':
 					state = '503'; break;

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

@@ -80,11 +80,6 @@
         text-align: center;
         margin: 35px auto;
     }
-    .add-rate .submitBox label {
-        font-size: 14px;
-        font-weight: normal;
-        margin-right: 22px;
-    }
     .add-rate .submitBox >span.submit-btn {
         font-size: 14px;
         padding: 4px 17px;
@@ -92,6 +87,27 @@
         color: #fff;
         cursor: pointer;
     }
+    .add-rate .submitBox .rate-status {
+        display: inline-block;
+        margin-right: 10px;
+    }
+    .add-rate .submitBox .rate-status i {
+        font-size: 14px;
+    }
+    .add-rate .submitBox .rate-status .no-rate {
+        width: 12px;
+        height: 12px;
+        display: inline-block;
+        background: #ccc;
+        border: 1px solid;
+        border-radius: 2px;
+        position: relative;
+        top: 1px;
+    }
+    .add-rate .submitBox .rate-status span:last-child {
+        color: #999;
+        font-size: 14px;
+    }
     .add-rate table thead tr.line02 {
         background: #f5f8fe;
     }
@@ -321,11 +337,11 @@
         </tbody>
     </table>
     <div class="submitBox">
-     <label class="check-active">
-         <input ng-model="isSetTop" type="checkbox" id="check-act" class="ng-pristine ng-untouched ng-valid" disabled ng-checked="isAnony" >
-         <label for="check-act"></label>
-         <span style="font-size: 14px; color: black">匿名评价</span>
-     </label>
+        <div class="rate-status">
+            <i class="fa fa-check-square" aria-hidden="true" ng-if="isAnony"></i>
+            <span class="no-rate" ng-if="!isAnony"></span>
+            <span>匿名评价</span>
+        </div>
         <span class="submit-btn" ng-click="submit()">提交</span>
     </div>
 </div>

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

@@ -738,6 +738,12 @@
 								<a class="action-link" href="user#/buyerQueryLogistics/{{order.orderid | EncryptionFilter}}" ng-if="order.status == 404" style="display: block;" target="_blank">查看物流</a>
 								<a ng-if="order.isEachRate && order.status != 520" class="oder_d action-link" target="_blank" href="user#/rate/showRate/{{order.orderid | EncryptionFilter}}" style="display: block;">
                                   双方已评
+                              	</a>
+								<a ng-if="!order.isEachRate && order.status != 520" class="oder_d action-link" target="_blank" style="display: block;">
+                                  我已评价
+                              	</a>
+								<a ng-if="order.isEachRate && order.status == 520" class="oder_d action-link" target="_blank" style="display: block;">
+                                  对方已评
                               	</a>
 							</div>
 						</span>

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

@@ -1019,6 +1019,8 @@
                                 <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/{{purchase.orderid | EncryptionFilter}}" style="display: block;" ng-if="purchase.isEachRate && purchase.status != 520">双方已评</a>
+								<a class="oder_d action-link" target="_blank" style="display: block;" ng-if="!purchase.isEachRate && purchase.status != 520">我已评价</a>
+								<a class="oder_d action-link" target="_blank" style="display: block;" ng-if="purchase.isEachRate && purchase.status == 520">对方已评</a>
                             </div>
                         </span>
 						<span class="click_shop">