需求整改

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

@@ -208,7 +208,7 @@
     .add-rate table tbody tr td .first-rate-item-textBox textarea {
         width: 207px;
         height: 75px;
-        overflow: scroll;
+        overflow-y: scroll;
         padding: 3px 8px;
         border-color: rgb( 236, 242, 255 );
         resize: none;
@@ -319,7 +319,7 @@
                         <div class="buyer-first-rate02" style="background: #fff">
                             <div style="margin-top: 10px;">买家追评：</div>
                             <div class="first-rate-item-textBox">
-                                <textarea placeholder="快来分享您的使用感受吧！" ng-change="listenRateContent(detail)" ng-model="detail.buyerAfterRate"></textarea>
+                                <textarea placeholder="快来分享您的使用感受吧！" rows="10" cols="20" ng-change="listenRateContent(detail)" ng-model="detail.buyerAfterRate"></textarea>
                                 <div class="add-rate-remind">
                                     <span>{{detail.buyerAfterRate.length || 0}}</span>
                                     <span>/200</span>

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

@@ -739,12 +739,12 @@
 								<a ng-if="order.isEachRate && (order.status == 523 || order.status == 522)" 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 == 523 || order.status == 522)" class="oder_d action-link" target="_blank" style="display: block;">
+								<div ng-if="!order.isEachRate && (order.status == 523 || order.status == 522)">
                                   我已评价
-                              	</a>
-								<a ng-if="order.isEachRate && order.status == 520" class="oder_d action-link" target="_blank" style="display: block;">
+                              	</div>
+								<div ng-if="order.isEachRate && order.status == 520">
                                   对方已评
-                              	</a>
+                              	</div>
 							</div>
 						</span>
 						<span class="oder_deal" ng-class="{'order-border-bottom-solid' : $index == order.orderDetails.length -1 || $index==2}">

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

@@ -52,7 +52,7 @@
         width: 73px;
         height: 74px;
         float: left;
-        margin-top: 12px;
+        margin-top: 20px;
         border: 1px solid rgb( 231, 231, 231 );
         margin-left: 23px;
     }
@@ -76,8 +76,8 @@
         text-overflow: ellipsis;
         display: inline-block;
         white-space: nowrap;
-        height: 22px;
-        line-height: 22px;
+        height: 27px;
+        line-height: 27px;
     }
     .first-rate table tbody tr td .first-rate-item-rate {
         display: inline-block;
@@ -116,10 +116,11 @@
     .first-rate table tbody tr td .first-rate-item-textBox textarea {
         width: 484px;
         height: 87px;
-        overflow: scroll;
+        overflow-y: scroll;
         padding: 5px 10px;
         border-color: rgb( 236, 242, 255 );
         resize: none;
+        padding-bottom: 15px;
     }
     .first-rate table tbody .record-num {
         border: none;

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

@@ -38,7 +38,7 @@
         width: 73px;
         height: 74px;
         float: left;
-        margin-top: 12px;
+        margin-top: 20px;
         border: 1px solid rgb( 231, 231, 231 );
     }
     .add-rate table tbody tr td .add-rate-item-info {
@@ -61,8 +61,8 @@
         text-overflow: ellipsis;
         display: inline-block;
         white-space: nowrap;
-        height: 22px;
-        line-height: 22px;
+        height: 27px;
+        line-height: 27px;
     }
     .add-rate table tbody .record-num {
         border: none;
@@ -303,6 +303,7 @@
         overflow-y: scroll;
         border: 1px solid rgb( 233, 233, 233 );
         resize: none;
+        padding-bottom: 15px;
     }
     .add-rate .reply-box .reply-box-btn {
         text-align: center;
@@ -354,6 +355,9 @@
         color: #999;
         font-size: 12px;
     }
+    .add-rate .bg-f5f8fe {
+        background: #f5f8fe!important;
+    }
 </style>
 
 <div class="add-rate">
@@ -426,7 +430,7 @@
                     <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 isLeft" style="margin-left: 100px" ng-mouseenter="detail.showRateReply = true" ng-mouseleave="detail.showRateReply = false">
+                    <div class="buyer-first-rate02 isLeft" ng-class="{'bg-f5f8fe':detail.showRateReply && !detail.returnMeg}" style="margin-left: 100px" ng-mouseenter="detail.showRateReply = true" ng-mouseleave="detail.showRateReply = false">
                         <div>
                             <span>买家初评：</span>
                             <span><img ng-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>
@@ -482,7 +486,7 @@
                 <label for="check-act"></label>
                 <span style="font-size: 14px; color: black; font-weight: normal">使用模板</span>
             </label>
-            <input type="search" ng-model="modalTempData.modalTitle" ng-show="boxStatus == 1" class="form-control modal-select" ng-focus="setShowModalListFlag(true)" ng-blur="setShowModalListFlag(false)" readonly>
+            <input type="search" ng-model="modalTempData.modalTitle" ng-show="boxStatus == 1" class="form-control modal-select" ng-focus="setShowModalListFlag(true)" ng-blur="setShowModalListFlag(false)" disabled>
             <div ng-show="showModalListFlag" class="modal-list" ng-mouseenter="setIsInListFlag(true)" ng-mouseleave="setIsInListFlag(false)">
                 <ul>
                     <li ng-repeat="modal in modalData" ng-bind="modal.rateTemplateName" ng-click="chooseModal(modal)"></li>
@@ -494,7 +498,7 @@
             <input type="text" ng-model="modalTempData.modalTitle" ng-change="listenModalTitle()" ng-trim="false" ng-if="boxStatus == 3 || boxStatus == 4" class="modal-head" placeholder="请填写模板名称">
         </div>
         <div class="reply-box-text">
-            <textarea ng-readonly="boxStatus == 1" ng-trim="false" placeholder="{{boxStatus==2?'请填写您对此评价的回复':boxStatus==3||boxStatus==4?'请填写模板内容':''}}" ng-change="listenRateContent()" ng-class="{'active': boxStatus != 1}" ng-model="modalTempData.rateContent"></textarea>
+            <textarea ng-disabled="boxStatus == 1" ng-aria-readonly="boxStatus == 1" ng-trim="false" placeholder="{{boxStatus==2?'请填写您对此评价的回复':boxStatus==3||boxStatus==4?'请填写模板内容':''}}" ng-change="listenRateContent()" ng-class="{'active': boxStatus != 1}" ng-model="modalTempData.rateContent"></textarea>
             <div class="add-rate-remind" ng-show="boxStatus != 1">
                 <span>{{modalTempData.rateContent.length || 0}}</span>
                 <span>/200</span>

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

@@ -712,9 +712,10 @@
 		color: #999;
 		padding-top: 10px;
 		padding-left: 10px;
-		overflow: scroll;
+		overflow-y: scroll;
 		border: 1px solid rgb( 233, 233, 233 );
 		resize: none;
+		padding-bottom: 15px;
 	}
 	.sellOder .reply-box .reply-box-text >textarea.active{
 		background: #fff;
@@ -1019,8 +1020,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 == 523 || purchase.status == 522)">双方已评</a>
-								<a class="oder_d action-link" target="_blank" style="display: block;" ng-if="!purchase.isEachRate && (purchase.status == 523 || purchase.status == 522)">我已评价</a>
-								<a class="oder_d action-link" target="_blank" style="display: block;" ng-if="purchase.isEachRate && purchase.status == 520">对方已评</a>
+								<div ng-if="!purchase.isEachRate && (purchase.status == 523 || purchase.status == 522)">我已评价</div>
+								<div ng-if="purchase.isEachRate && purchase.status == 520">对方已评</div>
                             </div>
                         </span>
 						<span class="click_shop">
@@ -1145,7 +1146,7 @@
 					<input type="text" ng-model="modalTempData.modalTitle" ng-trim="false" ng-change="listenModalTitle()" ng-if="boxStatus == 3 || boxStatus == 4" class="modal-head" placeholder="请填写模板名称">
 				</div>
 				<div class="reply-box-text">
-					<textarea ng-readonly="boxStatus == 1" ng-trim="false" ng-change="listenRateContent()" placeholder="{{boxStatus==2?'请输入不超过200字的评价':boxStatus==3||boxStatus==4?'请填写模板内容':''}}" ng-class="{'active': boxStatus != 1}" ng-model="modalTempData.rateContent"></textarea>
+					<textarea ng-disabled="boxStatus == 1" ng-trim="false" ng-change="listenRateContent()" placeholder="{{boxStatus==2?'请输入不超过200字的评价':boxStatus==3||boxStatus==4?'请填写模板内容':''}}" ng-class="{'active': boxStatus != 1}" ng-model="modalTempData.rateContent"></textarea>
                     <div class="add-rate-remind" ng-show="boxStatus != 1">
                         <span>{{modalTempData.rateContent.length || 0}}</span>
                         <span>/200</span>