评价：修改验收中的bug 3

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

@@ -26,7 +26,7 @@ public enum PurchaseStatus {
 	/**
 	 * {@code completed 已完成}
 	 */
-	COMPLETED("completed", "520"),//520-606
+	COMPLETED("completed", "520-522-523"),//520-606
 	/**
 	 * {@code unavailable 已失效}
 	 */

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

@@ -158,14 +158,19 @@ define(['app/app'], function(app) {
                 $scope.currentModal.rateTemplateName = $scope.modalTempData.modalTitle;
                 Rate.saveRateTemplate({storeuuid: $scope.order.storeid},$scope.currentModal, function (data) {
                     toaster.pop('success', '保存成功');
-                    $state.reload();
+                    $scope.boxStatus = 1;
                 }, function (error) {
                     toaster.pop('error', '保存失败');
                 })
             } else if ($scope.boxStatus == 3) {
                 Rate.saveRateTemplate({storeuuid: $scope.order.storeid},{rateTemplateName: $scope.modalTempData.modalTitle, rateTemplateContent: $scope.modalTempData.rateContent}, function (data) {
                     toaster.pop('success', '保存成功');
-                    $state.reload();
+                    Rate.getRateTemplate({storeuuid: $scope.order.storeid},{},function (data) {
+                        $scope.modalData = data.data;
+                    },function (error) {
+                        toaster.pop('error', '获取模板信息失败');
+                    });
+                    $scope.boxStatus = 1;
                 }, function (error) {
                     toaster.pop('error', '保存失败');
                 })

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

@@ -113,7 +113,7 @@ define(['app/app'], function (app) {
                     break;
                 case 'completed':
                     // TODO huxz 平台采购单已完成，即交易完成
-                    state = '520';
+                    state = '520-522-523';
                     break;
                 case 'unavailable':
                     // TODO huxz 平台采购单的失效状态
@@ -1123,14 +1123,22 @@ define(['app/app'], function (app) {
                 $scope.currentModal.rateTemplateName = $scope.modalTempData.modalTitle;
                 Rate.saveRateTemplate({storeuuid: $scope.rateContent.storeid},$scope.currentModal, function (data) {
                     toaster.pop('success', '保存成功');
-                    $state.reload();
+                    $scope.boxStatus = 1;
                 }, function (error) {
                     toaster.pop('error', '保存失败');
                 })
             } else if ($scope.boxStatus == 3) {
                 Rate.saveRateTemplate({storeuuid: $scope.rateContent.storeid},{rateTemplateName: $scope.modalTempData.modalTitle, rateTemplateContent: $scope.modalTempData.rateContent}, function (data) {
                     toaster.pop('success', '保存成功');
-                    $state.reload();
+                    Rate.getRateTemplate({storeuuid: $scope.rateContent.storeid},{},function (data) {
+                        $scope.modalData = data.data;
+                        Rate.getRateBuyer({orderId: $scope.rateContent.orderid},{},function (data) {
+                            $scope.rateBuyer = data.data;
+                        });
+                    },function (error) {
+                        toaster.pop('error', '获取模板信息失败');
+                    });
+                    $scope.boxStatus = 1;
                 }, function (error) {
                     toaster.pop('error', '保存失败');
                 })

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

@@ -186,7 +186,7 @@
 <div class="add-rate">
     <div class="add-rate-head">
         <span style="width: 27%;">
-            <a target="_blank" class="add-rate-company">
+            <a href="store/{{::order.storeid}}" target="_blank" class="add-rate-company">
                 <img src="static/img/user/images/shop_home.png"/>
                 <em>{{order.sellername}}</em>
             </a>
@@ -217,27 +217,27 @@
                 <span class="describe-title describe-option">店铺评价：</span>
                 <span>描述相符：</span>
                 <span class="rate-level describe-option">
-                    <img ng-src="static/img/user/images/{{vendorRate.describeLevel - 0 > 0? 'rateGood':'rateBad'}}.png" alt="">
-                    <img ng-src="static/img/user/images/{{vendorRate.describeLevel - 1 > 0? 'rateGood':'rateBad'}}.png" alt="">
-                    <img ng-src="static/img/user/images/{{vendorRate.describeLevel - 2 > 0? 'rateGood':'rateBad'}}.png" alt="">
-                    <img ng-src="static/img/user/images/{{vendorRate.describeLevel - 3 > 0? 'rateGood':'rateBad'}}.png" alt="">
-                    <img ng-src="static/img/user/images/{{vendorRate.describeLevel - 4 > 0? 'rateGood':'rateBad'}}.png" alt="">
+                    <img ng-src="static/img/user/images/rateGood.png" alt="" ng-show="vendorRate.describeLevel - 0 > 0">
+                    <img ng-src="static/img/user/images/rateGood.png" alt="" ng-show="vendorRate.describeLevel - 1 > 0">
+                    <img ng-src="static/img/user/images/rateGood.png" alt="" ng-show="vendorRate.describeLevel - 2 > 0">
+                    <img ng-src="static/img/user/images/rateGood.png" alt="" ng-show="vendorRate.describeLevel - 3 > 0">
+                    <img ng-src="static/img/user/images/rateGood.png" alt="" ng-show="vendorRate.describeLevel - 4 > 0">
                     </span>
                 <span>卖家服务：</span>
                 <span class="rate-level describe-option">
-                    <img ng-src="static/img/user/images/{{vendorRate.vendorLevel - 0 > 0? 'rateGood':'rateBad'}}.png" alt="">
-                    <img ng-src="static/img/user/images/{{vendorRate.vendorLevel - 1 > 0? 'rateGood':'rateBad'}}.png" alt="">
-                    <img ng-src="static/img/user/images/{{vendorRate.vendorLevel - 2 > 0? 'rateGood':'rateBad'}}.png" alt="">
-                    <img ng-src="static/img/user/images/{{vendorRate.vendorLevel - 3 > 0? 'rateGood':'rateBad'}}.png" alt="">
-                    <img ng-src="static/img/user/images/{{vendorRate.vendorLevel - 4 > 0? 'rateGood':'rateBad'}}.png" alt="">
+                    <img ng-src="static/img/user/images/rateGood.png" alt="" ng-show="vendorRate.vendorLevel - 0 > 0">
+                    <img ng-src="static/img/user/images/rateGood.png" alt="" ng-show="vendorRate.vendorLevel - 1 > 0">
+                    <img ng-src="static/img/user/images/rateGood.png" alt="" ng-show="vendorRate.vendorLevel - 2 > 0">
+                    <img ng-src="static/img/user/images/rateGood.png" alt="" ng-show="vendorRate.vendorLevel - 3 > 0">
+                    <img ng-src="static/img/user/images/rateGood.png" alt="" ng-show="vendorRate.vendorLevel - 4 > 0">
                     </span>
                 <span>物流服务：</span>
                 <span class="rate-level describe-option">
-                    <img ng-src="static/img/user/images/{{vendorRate.logisticsLevel - 0 > 0? 'rateGood':'rateBad'}}.png" alt="">
-                    <img ng-src="static/img/user/images/{{vendorRate.logisticsLevel - 1 > 0? 'rateGood':'rateBad'}}.png" alt="">
-                    <img ng-src="static/img/user/images/{{vendorRate.logisticsLevel - 2 > 0? 'rateGood':'rateBad'}}.png" alt="">
-                    <img ng-src="static/img/user/images/{{vendorRate.logisticsLevel - 3 > 0? 'rateGood':'rateBad'}}.png" alt="">
-                    <img ng-src="static/img/user/images/{{vendorRate.logisticsLevel - 4 > 0? 'rateGood':'rateBad'}}.png" alt="">
+                    <img ng-src="static/img/user/images/rateGood.png" alt="" ng-show="vendorRate.logisticsLevel - 0 > 0">
+                    <img ng-src="static/img/user/images/rateGood.png" alt="" ng-show="vendorRate.logisticsLevel - 1 > 0">
+                    <img ng-src="static/img/user/images/rateGood.png" alt="" ng-show="vendorRate.logisticsLevel - 2 > 0">
+                    <img ng-src="static/img/user/images/rateGood.png" alt="" ng-show="vendorRate.logisticsLevel - 3 > 0">
+                    <img ng-src="static/img/user/images/rateGood.png" alt="" ng-show="vendorRate.logisticsLevel - 4 > 0">
                     </span>
             </td>
         </tr>
@@ -246,12 +246,11 @@
 
         <tr ng-repeat="detail in buyerRate track by $index">
             <td>
-                <a href="store/{{::order.storeid}}/{{::detail.goodsDetail.batchCode}}" target="_blank"><img ng-src="{{detail.goodsDetail.img || 'static/img/store/common/default.png'}}" width="55" height="55"/></a>
-
+                <a href="store/{{::order.storeid}}#/batchInfo/{{::detail.goodsDetail.batchCode}}" target="_blank"><img ng-src="{{detail.goodsDetail.img || 'static/img/store/common/default.png'}}" width="55" height="55"/></a>
                 <div class="add-rate-item-info">
-                    <span class="add-rate-item-introduce"><span class="add-rate-item-link">类目：<a href="product/kind/{{::detail.goodsDetail.kindUuid}}" target="_blank"><em ng-bind="::detail.goodsDetail.kiName" title="{{::detail.goodsDetail.kiName}}"></em></a><br/></span></span>
-                    <span class="add-rate-item-introduce"><span class="add-rate-item-link">型号：<a href="store/{{::order.storeid}}/{{::detail.goodsDetail.batchCode}}" target="_blank"><em ng-bind="::detail.goodsDetail.cmpCode" title="{{::detail.goodsDetail.cmpCode}}"></em></a><br/></span></span>
-                    <span class="add-rate-item-introduce"><span class="add-rate-item-link">品牌：<a href="product/brand/{{::detail.goodsDetail.branduuid}}/" target="_blank"><em ng-bind="::detail.goodsDetail.brName" title="{{::detail.goodsDetail.brName}}"></em></a></span></span>
+                    <span class="add-rate-item-introduce"><span class="add-rate-item-link">类目：<a href="product#/kinds/{{::detail.goodsDetail.kindUuid}}" target="_blank"><em ng-bind="::detail.goodsDetail.kiName" title="{{::detail.goodsDetail.kiName}}"></em></a><br/></span></span>
+                    <span class="add-rate-item-introduce"><span class="add-rate-item-link">型号：<a href="store/{{::order.storeid}}#/batchInfo/{{::detail.goodsDetail.batchCode}}" target="_blank"><em ng-bind="::detail.goodsDetail.cmpCode" title="{{::detail.goodsDetail.cmpCode}}"></em></a><br/></span></span>
+                    <span class="add-rate-item-introduce"><span class="add-rate-item-link">品牌：<a href="product#/brand/{{::detail.goodsDetail.branduuid}}/" target="_blank"><em ng-bind="::detail.goodsDetail.brName" title="{{::detail.goodsDetail.brName}}"></em></a></span></span>
                 </div>
                     <div class="buyer-first-rate">
                         <div class="buyer-first-rate02" style="margin-left: 100px">

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

@@ -719,10 +719,10 @@
 						</span>
 						<span class="wd02" ng-class="{true : 'order-border-bottom-solid',false : 'order-border-bottom-dashed'}[$index == order.orderDetails.length - 1 || $index == 2]">
 							<div class="pro_xq">
-								<a href="store/{{::order.storeid}}/{{::detail.batchCode}}" target="_blank"><img ng-src="{{detail.img || 'static/img/store/common/default.png'}}" width="55" height="55"/></a>
+								<a href="store/{{::order.storeid}}#/batchInfo/{{::detail.batchCode}}" target="_blank"><img ng-src="{{detail.img || 'static/img/store/common/default.png'}}" width="55" height="55"/></a>
 								<p>
-									类目：<a href="product/kind/{{::detail.kindUuid}}" target="_blank"><em ng-bind="::detail.kiName" title="{{::detail.kiName}}"></em></a><br/>
-									型号：<a href="store/{{::order.storeid}}/{{::detail.batchCode}}" target="_blank"><em ng-bind="::detail.cmpCode" title="{{::detail.cmpCode}}"></em></a><br/>
+									类目：<a href="product/kinds/{{::detail.kindUuid}}" target="_blank"><em ng-bind="::detail.kiName" title="{{::detail.kiName}}"></em></a><br/>
+									型号：<a href="store/{{::order.storeid}}#/batchInfo/{{::detail.batchCode}}" target="_blank"><em ng-bind="::detail.cmpCode" title="{{::detail.cmpCode}}"></em></a><br/>
 									品牌：<a href="product/brand/{{::detail.branduuid}}/" target="_blank"><em ng-bind="::detail.brName" title="{{::detail.brName}}"></em></a>
 								</p>
 							</div>

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

@@ -138,7 +138,7 @@
 <div class="first-rate">
     <div class="first-rate-head">
         <span style="width: 27%;">
-            <a target="_blank" class="first-rate-company">
+            <a href="store/{{::order.storeid}}" target="_blank" class="first-rate-company">
                 <img src="static/img/user/images/shop_home.png"/>
                 <em>{{order.sellername}}</em>
             </a>
@@ -184,12 +184,12 @@
         <tbody>
             <tr ng-repeat="detail in order.orderDetails track by $index">
                 <td>
-                    <a href="store/{{::order.storeid}}/{{::detail.batchCode}}" target="_blank"><img ng-src="{{detail.img || 'static/img/store/common/default.png'}}" width="55" height="55"/></a>
+                    <a href="store/{{::order.storeid}}#/batchInfo/{{::detail.batchCode}}" target="_blank"><img ng-src="{{detail.img || 'static/img/store/common/default.png'}}" width="55" height="55"/></a>
 
                     <div class="first-rate-item-info">
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">类目：<a href="product/kind/{{::detail.kindUuid}}" target="_blank"><em ng-bind="::detail.kiName" title="{{::detail.kiName}}"></em></a><br/></span></span>
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">型号：<a href="store/{{::order.storeid}}/{{::detail.batchCode}}" target="_blank"><em ng-bind="::detail.cmpCode" title="{{::detail.cmpCode}}"></em></a><br/></span></span>
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">品牌：<a href="product/brand/{{::detail.branduuid}}/" target="_blank"><em ng-bind="::detail.brName" title="{{::detail.brName}}"></em></a></span></span>
+                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">类目：<a href="product#/kinds/{{::detail.kindUuid}}" target="_blank"><em ng-bind="::detail.kiName" title="{{::detail.kiName}}"></em></a><br/></span></span>
+                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">型号：<a href="store/{{::order.storeid}}#/batchInfo/{{::detail.batchCode}}" target="_blank"><em ng-bind="::detail.cmpCode" title="{{::detail.cmpCode}}"></em></a><br/></span></span>
+                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">品牌：<a href="product#/brand/{{::detail.branduuid}}/" target="_blank"><em ng-bind="::detail.brName" title="{{::detail.brName}}"></em></a></span></span>
                     </div>
                     <div class="first-rate-item-rate">
                         <div class="rate-item">

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

@@ -140,7 +140,11 @@
         overflow: hidden;
         height: 87px;
     }
-    .add-rate table .buyer-first-rate >div >div {
+    .add-rate table .buyer-first-rate >div.isLeft {
+        margin-left: 100px;
+    }
+    .add-rate table .buyer-first-rate >div.isRight {
+       float: right;
     }
     .add-rate table .buyer-first-rate >div .rate-date {
         color: #999;
@@ -175,7 +179,7 @@
 <div class="add-rate">
     <div class="add-rate-head">
         <span style="width: 27%;">
-            <a target="_blank" class="add-rate-company">
+            <a href="store/{{::order.storeid}}" target="_blank" class="add-rate-company">
                 <img src="static/img/user/images/shop_home.png"/>
                 <em>{{order.sellername}}</em>
             </a>
@@ -206,27 +210,27 @@
                     <span class="describe-title describe-option">店铺评价：</span>
                     <span>描述相符：</span>
                     <span class="rate-level describe-option">
-                    <img ng-src="static/img/user/images/{{vendorRate.describeLevel - 0 > 0? 'rateGood':'rateBad'}}.png" alt="">
-                    <img ng-src="static/img/user/images/{{vendorRate.describeLevel - 1 > 0? 'rateGood':'rateBad'}}.png" alt="">
-                    <img ng-src="static/img/user/images/{{vendorRate.describeLevel - 2 > 0? 'rateGood':'rateBad'}}.png" alt="">
-                    <img ng-src="static/img/user/images/{{vendorRate.describeLevel - 3 > 0? 'rateGood':'rateBad'}}.png" alt="">
-                    <img ng-src="static/img/user/images/{{vendorRate.describeLevel - 4 > 0? 'rateGood':'rateBad'}}.png" alt="">
+                    <img ng-src="static/img/user/images/rateGood.png" alt="" ng-show="vendorRate.describeLevel - 0 > 0">
+                    <img ng-src="static/img/user/images/rateGood.png" alt="" ng-show="vendorRate.describeLevel - 1 > 0">
+                    <img ng-src="static/img/user/images/rateGood.png" alt="" ng-show="vendorRate.describeLevel - 2 > 0">
+                    <img ng-src="static/img/user/images/rateGood.png" alt="" ng-show="vendorRate.describeLevel - 3 > 0">
+                    <img ng-src="static/img/user/images/rateGood.png" alt="" ng-show="vendorRate.describeLevel - 4 > 0">
                     </span>
                     <span>卖家服务：</span>
                     <span class="rate-level describe-option">
-                    <img ng-src="static/img/user/images/{{vendorRate.vendorLevel - 0 > 0? 'rateGood':'rateBad'}}.png" alt="">
-                    <img ng-src="static/img/user/images/{{vendorRate.vendorLevel - 1 > 0? 'rateGood':'rateBad'}}.png" alt="">
-                    <img ng-src="static/img/user/images/{{vendorRate.vendorLevel - 2 > 0? 'rateGood':'rateBad'}}.png" alt="">
-                    <img ng-src="static/img/user/images/{{vendorRate.vendorLevel - 3 > 0? 'rateGood':'rateBad'}}.png" alt="">
-                    <img ng-src="static/img/user/images/{{vendorRate.vendorLevel - 4 > 0? 'rateGood':'rateBad'}}.png" alt="">
+                    <img ng-src="static/img/user/images/rateGood.png" alt="" ng-show="vendorRate.vendorLevel - 0 > 0">
+                    <img ng-src="static/img/user/images/rateGood.png" alt="" ng-show="vendorRate.vendorLevel - 1 > 0">
+                    <img ng-src="static/img/user/images/rateGood.png" alt="" ng-show="vendorRate.vendorLevel - 2 > 0">
+                    <img ng-src="static/img/user/images/rateGood.png" alt="" ng-show="vendorRate.vendorLevel - 3 > 0">
+                    <img ng-src="static/img/user/images/rateGood.png" alt="" ng-show="vendorRate.vendorLevel - 4 > 0">
                     </span>
                     <span>物流服务：</span>
                     <span class="rate-level describe-option">
-                    <img ng-src="static/img/user/images/{{vendorRate.logisticsLevel - 0 > 0? 'rateGood':'rateBad'}}.png" alt="">
-                    <img ng-src="static/img/user/images/{{vendorRate.logisticsLevel - 1 > 0? 'rateGood':'rateBad'}}.png" alt="">
-                    <img ng-src="static/img/user/images/{{vendorRate.logisticsLevel - 2 > 0? 'rateGood':'rateBad'}}.png" alt="">
-                    <img ng-src="static/img/user/images/{{vendorRate.logisticsLevel - 3 > 0? 'rateGood':'rateBad'}}.png" alt="">
-                    <img ng-src="static/img/user/images/{{vendorRate.logisticsLevel - 4 > 0? 'rateGood':'rateBad'}}.png" alt="">
+                    <img ng-src="static/img/user/images/rateGood.png" alt="" ng-show="vendorRate.logisticsLevel - 0 > 0">
+                    <img ng-src="static/img/user/images/rateGood.png" alt="" ng-show="vendorRate.logisticsLevel - 1 > 0">
+                    <img ng-src="static/img/user/images/rateGood.png" alt="" ng-show="vendorRate.logisticsLevel - 2 > 0">
+                    <img ng-src="static/img/user/images/rateGood.png" alt="" ng-show="vendorRate.logisticsLevel - 3 > 0">
+                    <img ng-src="static/img/user/images/rateGood.png" alt="" ng-show="vendorRate.logisticsLevel - 4 > 0">
                     </span>
                 </td>
             </tr>
@@ -234,14 +238,14 @@
         <tbody>
         <tr ng-repeat="detail in buyerRate track by $index">
             <td>
-                <a href="store/{{::order.storeid}}/{{::detail.goodsDetail.batchCode}}" target="_blank"><img ng-src="{{detail.goodsDetail.img || 'static/img/store/common/default.png'}}" width="55" height="55"/></a>
+                <a href="store/{{::order.storeid}}#/batchInfo/{{::detail.goodsDetail.batchCode}}" target="_blank"><img ng-src="{{detail.goodsDetail.img || 'static/img/store/common/default.png'}}" width="55" height="55"/></a>
                 <div class="add-rate-item-info">
-                    <span class="add-rate-item-introduce"><span class="add-rate-item-link">类目：<a href="product/kind/{{::detail.goodsDetail.kindUuid}}" target="_blank"><em ng-bind="::detail.goodsDetail.kiName" title="{{::detail.goodsDetail.kiName}}"></em></a><br/></span></span>
-                    <span class="add-rate-item-introduce"><span class="add-rate-item-link">型号：<a href="store/{{::order.storeid}}/{{::detail.goodsDetail.batchCode}}" target="_blank"><em ng-bind="::detail.goodsDetail.cmpCode" title="{{::detail.goodsDetail.cmpCode}}"></em></a><br/></span></span>
-                    <span class="add-rate-item-introduce"><span class="add-rate-item-link">品牌：<a href="product/brand/{{::detail.goodsDetail.branduuid}}/" target="_blank"><em ng-bind="::detail.goodsDetail.brName" title="{{::detail.goodsDetail.brName}}"></em></a></span></span>
+                    <span class="add-rate-item-introduce"><span class="add-rate-item-link">类目：<a href="product#/kinds/{{::detail.goodsDetail.kindUuid}}" target="_blank"><em ng-bind="::detail.goodsDetail.kiName" title="{{::detail.goodsDetail.kiName}}"></em></a><br/></span></span>
+                    <span class="add-rate-item-introduce"><span class="add-rate-item-link">型号：<a href="store/{{::order.storeid}}#/batchInfo/{{::detail.goodsDetail.batchCode}}" target="_blank"><em ng-bind="::detail.goodsDetail.cmpCode" title="{{::detail.goodsDetail.cmpCode}}"></em></a><br/></span></span>
+                    <span class="add-rate-item-introduce"><span class="add-rate-item-link">品牌：<a href="product#/brand/{{::detail.goodsDetail.branduuid}}/" target="_blank"><em ng-bind="::detail.goodsDetail.brName" title="{{::detail.goodsDetail.brName}}"></em></a></span></span>
                 </div>
                 <div class="buyer-first-rate">
-                    <div class="buyer-first-rate02" style="margin-left: 100px">
+                    <div class="buyer-first-rate02 isLeft">
                         <div>
                             <span>买家初评：</span>
                             <span><img src="static/img/user/images/{{detail.level == 1?'rate1.png':detail.level == 2?'rate2.png':'rate3.png'}}" alt=""><span ng-bind="detail.level == 1?'好评':detail.level == 2?'中评':'差评'"></span></span>
@@ -260,7 +264,7 @@
                     </div>
                 </div>
                 <div class="buyer-first-rate">
-                    <div class="buyer-first-rate02" style="margin-left: 100px" ng-if="detail.returnMeg">
+                    <div class="buyer-first-rate02 isLeft" style="margin-left: 100px" ng-if="detail.returnMeg">
                         <div>
                             <span style="color:#6083ce;">卖家回复</span>
                             <span class="rate-date" ng-bind="detail.returnMegTime"></span>
@@ -268,7 +272,7 @@
                         <div class="comment">
                             <span ng-bind="detail.returnMeg"></span></div>
                     </div>
-                    <div class="buyer-first-rate02" ng-if="detail.afterReturnMeg">
+                    <div class="buyer-first-rate02 isRight" ng-if="detail.afterReturnMeg">
                         <div>
                             <span style="color:#6083ce;">卖家回复</span>
                             <span class="rate-date" ng-bind="detail.afterReturnMegTime"></span>

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

@@ -218,6 +218,8 @@
         position: absolute;
         right:32px;
         z-index: 100;
+        max-height: 150px;
+        overflow: scroll;
     }
     .add-rate .reply-box ul li {
         width: 200px;
@@ -226,6 +228,7 @@
         background: #fff;
         padding-left: 12px;
         cursor: pointer;
+        overflow: hidden;
     }
     .add-rate .reply-box ul li.add-modal {
         color: #999;
@@ -298,7 +301,7 @@
 <div class="add-rate">
     <div class="add-rate-head">
         <span style="width: 27%;">
-            <a target="_blank" class="add-rate-company">
+            <a href="store/{{::order.storeid}}" target="_blank" class="add-rate-company">
                 <img src="static/img/user/images/shop_home.png"/>
                 <em>深圳市优软科技有限公司</em>
             </a>
@@ -358,11 +361,11 @@
         <tbody>
         <tr ng-repeat="detail in buyerRateGoods">
             <td>
-                <a href="store/{{::order.storeid}}/{{::detail.goodsDetail.batchCode}}" target="_blank"><img ng-src="{{detail.goodsDetail.img || 'static/img/store/common/default.png'}}" width="55" height="55"/></a>
+                <a href="store/{{::order.storeid}}#/batchInfo/{{::detail.goodsDetail.batchCode}}" target="_blank"><img ng-src="{{detail.goodsDetail.img || 'static/img/store/common/default.png'}}" width="55" height="55"/></a>
                 <div class="add-rate-item-info">
-                    <span class="add-rate-item-introduce"><span class="add-rate-item-link">类目：<a href="product/kind/{{::detail.goodsDetail.kindUuid}}" target="_blank"><em ng-bind="::detail.goodsDetail.kiName" title="{{::detail.goodsDetail.kiName}}"></em></a><br/></span></span>
-                    <span class="add-rate-item-introduce"><span class="add-rate-item-link">型号：<a href="store/{{::order.storeid}}/{{::detail.goodsDetail.batchCode}}" target="_blank"><em ng-bind="::detail.goodsDetail.cmpCode" title="{{::detail.goodsDetail.cmpCode}}"></em></a><br/></span></span>
-                    <span class="add-rate-item-introduce"><span class="add-rate-item-link">品牌：<a href="product/brand/{{::detail.goodsDetail.branduuid}}/" target="_blank"><em ng-bind="::detail.goodsDetail.brName" title="{{::detail.goodsDetail.brName}}"></em></a></span></span>
+                    <span class="add-rate-item-introduce"><span class="add-rate-item-link">类目：<a href="product#/kinds/{{::detail.goodsDetail.kindUuid}}" target="_blank"><em ng-bind="::detail.goodsDetail.kiName" title="{{::detail.goodsDetail.kiName}}"></em></a><br/></span></span>
+                    <span class="add-rate-item-introduce"><span class="add-rate-item-link">型号：<a href="store/{{::order.storeid}}#/batchInfo/{{::detail.goodsDetail.batchCode}}" target="_blank"><em ng-bind="::detail.goodsDetail.cmpCode" title="{{::detail.goodsDetail.cmpCode}}"></em></a><br/></span></span>
+                    <span class="add-rate-item-introduce"><span class="add-rate-item-link">品牌：<a href="product#/brand/{{::detail.goodsDetail.branduuid}}/" target="_blank"><em ng-bind="::detail.goodsDetail.brName" title="{{::detail.goodsDetail.brName}}"></em></a></span></span>
                 </div>
                 <div class="buyer-first-rate">
                     <div class="buyer-first-rate02" style="margin-left: 100px" ng-mouseenter="detail.showRateReply = true" ng-mouseleave="detail.showRateReply = false">

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

@@ -637,6 +637,8 @@
 		position: absolute;
 		right:43px;
         z-index: 100;
+		max-height: 150px;
+		overflow: scroll;
 	}
 	.sellOder .reply-box ul li {
 		width: 200px;
@@ -645,6 +647,7 @@
 		background: #fff;
 		padding-left: 12px;
 		cursor: pointer;
+		overflow: hidden;
 	}
 	.sellOder .reply-box ul li.add-modal {
 		color: #999;