评论验收整改

src/main/webapp/resources/js/index/app.js

@@ -270,6 +270,7 @@ define([ 'angularAMD', 'ngRoute', 'ui-bootstrap', 'ngLocal', 'ngTable', 'common/
 			$('.floors-lift-item a').css('color', '#FFFFFF');
 			$('#fl_' + i + ' a').css('background-color', colors[i] || 'blue');
 			//$('#fl_' + i).addClass('active');
+			// console.log(s)
 			if((floors.offsetTop - s < fl.offsetTop) && (floors.offsetTop + floors.offsetHeight - s > fl.offsetTop + fl.offsetHeight)) {
 				fl.style.opacity = '1';
 				fl.style.pointerEvents = 'auto';

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

@@ -159,6 +159,12 @@ define(['app/app'], function(app) {
             $scope.showModalListFlag = false;
         }
 
+        $scope.listenModalTitle = function () {
+            if ($scope.modalTempData.modalTitle.length > 10) {
+                $scope.modalTempData.modalTitle = $scope.modalTempData.modalTitle.substring(0, 10);
+            }
+        }
+
         //保存模板
         $scope.modalTempData = {};
         $scope.saveModal = function () {
@@ -176,6 +182,7 @@ define(['app/app'], function(app) {
                     toaster.pop('success', '保存成功');
                     Rate.getRateTemplate({storeuuid: $scope.order.storeid},{},function (data) {
                         $scope.modalData = data.data;
+                        $scope.boxStatus = 1;
                     },function (error) {
                         toaster.pop('error', '获取模板信息失败');
                     });

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

@@ -1119,6 +1119,12 @@ define(['app/app'], function (app) {
             $scope.showModalListFlag = false;
         }
 
+        $scope.listenModalTitle = function () {
+            if ($scope.modalTempData.modalTitle.length > 10) {
+                $scope.modalTempData.modalTitle = $scope.modalTempData.modalTitle.substring(0, 10);
+            }
+        }
+
         //保存模板
         $scope.modalTempData = {};
         $scope.saveModal = function () {
@@ -1140,6 +1146,7 @@ define(['app/app'], function (app) {
                         Rate.getRateBuyer({orderId: $scope.rateContent.orderid},{},function (data) {
                             $scope.rateBuyer = data.data;
                         });
+                        $scope.boxStatus = 1;
                     },function (error) {
                         toaster.pop('error', '获取模板信息失败');
                     });

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

@@ -123,7 +123,17 @@
     .add-rate table thead tr td >div >span {
         display: block;
     }
-    .add-rate table thead tr td >div >span.add-rate-item01 {
+    .add-rate table thead tr td >div >span.add-rate-item01 span {
+        float: right;
+        display: block;
+        width: 329px;
+        height: 35px;
+        word-break: break-all;
+        overflow-y: scroll;
+    }
+    .add-rate table thead tr.line01 td >span >img {
+        margin-right: 5px;
+        margin-bottom: 3px;
     }
     .add-rate table thead tr td >div >span.add-rate-item02 {
         margin-top: 5px;
@@ -167,10 +177,10 @@
         height: 67px;
     }
     .add-rate table .buyer-first-rate .comment span{
-        white-space: normal;
-        text-overflow: ellipsis;
-        overflow: hidden;
         height: 60px;
+        width: 215px;
+        overflow-y: auto;
+        word-break: break-all;
     }
     .add-rate table tbody tr td .first-rate-item-textBox {
         display: inline-block;
@@ -229,7 +239,7 @@
                     <span class="add-rate-item01">卖家初评：<span ng-bind="vendorRateBuyer.vendorRate"></span></span>
                     <span class="add-rate-item02" ng-bind="vendorRateBuyer.vendorRateTime | date:'yyyy-MM-dd'"></span>
                 </div>
-                <div style="margin-left: 40px;height: 46px;">
+                <div style="margin-left: 40px;height: 46px;" ng-if="vendorRateBuyer.vendorAfterRate">
                     <span class="add-rate-item01">卖家追评：<span ng-bind="vendorRateBuyer.vendorAfterRate"></span></span>
                     <span class="add-rate-item02" ng-bind="vendorRateBuyer.vendorAfterRateTime | date:'yyyy-MM-dd'"></span>
                 </div>

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

@@ -117,7 +117,13 @@
     .add-rate table thead tr td >div >span {
         display: block;
     }
-    .add-rate table thead tr td >div >span.add-rate-item01 {
+    .add-rate table thead tr td >div >span.add-rate-item01 span {
+        float: right;
+        display: block;
+        width: 329px;
+        height: 35px;
+        word-break: break-all;
+        overflow-y: scroll;
     }
     .add-rate table thead tr td >div >span.add-rate-item02 {
         margin-top: 5px;
@@ -181,10 +187,10 @@
         height: 67px;
     }
     .add-rate table .buyer-first-rate .comment span{
-        white-space: normal;
-        text-overflow: ellipsis;
-        overflow: hidden;
         height: 60px;
+        width: 215px;
+        overflow-y: auto;
+        word-break: break-all;
     }
     .add-rate table thead .temp-line td{
         padding: 0;
@@ -220,7 +226,7 @@
                         <span class="add-rate-item01">卖家初评：<span ng-bind="vendorRateBuyer.vendorRate"></span></span>
                         <span class="add-rate-item02" ng-bind="vendorRateBuyer.vendorRateTime | date:'yyyy-MM-dd'"></span>
                     </div>
-                    <div style="margin-left: 40px;">
+                    <div style="margin-left: 40px;" ng-if="vendorRateBuyer.vendorAfterRate">
                         <span class="add-rate-item01">卖家追评：<span ng-bind="vendorRateBuyer.vendorAfterRate"></span></span>
                         <span class="add-rate-item02" ng-bind="vendorRateBuyer.vendorAfterRateTime | date:'yyyy-MM-dd'"></span>
                     </div>

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

@@ -39,6 +39,7 @@
         height: 74px;
         float: left;
         margin-top: 12px;
+        border: 1px solid rgb( 231, 231, 231 );
     }
     .add-rate table tbody tr td .add-rate-item-info {
         display: inline-block;
@@ -106,7 +107,13 @@
     .add-rate table thead tr td >div >span {
         display: block;
     }
-    .add-rate table thead tr td >div >span.add-rate-item01 {
+    .add-rate table thead tr td >div >span.add-rate-item01 span {
+        float: right;
+        display: block;
+        width: 329px;
+        height: 35px;
+        word-break: break-all;
+        overflow-y: scroll;
     }
     .add-rate table thead tr td >div >span.add-rate-item02 {
         margin-top: 5px;
@@ -178,10 +185,10 @@
         height: 67px;
     }
     .add-rate table .buyer-first-rate .comment span{
-        white-space: normal;
-        text-overflow: ellipsis;
-        overflow: hidden;
         height: 60px;
+        width: 215px;
+        overflow-y: auto;
+        word-break: break-all;
     }
     .add-rate table .buyer-first-rate >div.isLeft {
         margin-left: 100px;
@@ -249,7 +256,8 @@
     }
     .add-rate .reply-box ul {
         max-height: 120px;
-        overflow: auto;
+        overflow-y: auto;
+        overflow-x: hidden;
     }
     .add-rate .reply-box ul li {
         width: 200px;
@@ -483,10 +491,10 @@
             </div>
         </div>
         <div>
-            <input type="text" ng-model="modalTempData.modalTitle" ng-if="boxStatus == 3 || boxStatus == 4" class="modal-head" placeholder="请填写模板名称">
+            <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" placeholder="{{boxStatus==2?'请填写您对此评价的回复':boxStatus==3||boxStatus==4?'请填写模板内容':''}}" ng-change="listenRateContent()" ng-class="{'active': boxStatus != 1}" ng-model="modalTempData.rateContent"></textarea>
+            <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>
             <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

@@ -668,7 +668,8 @@
 	}
 	.sellOder .reply-box ul {
 		max-height: 120px;
-		overflow: auto;
+		overflow-y: auto;
+		overflow-x: hidden;
 	}
 	.sellOder .reply-box ul li {
 		width: 200px;
@@ -787,9 +788,9 @@
 	.sellOder .reply-box .vendor-modal-header .modal-add-rate .rate-content {
 		width: 243px;
 		display: inline-block;
-		overflow: hidden;
+		overflow: auto;
 		float: right;
-		height: 50px;
+		height: 52px;
 	}
 	.sellOder .reply-box .vendor-modal-header .modal-add-rate .rate-content span {
 		word-break: break-all;
@@ -1138,10 +1139,10 @@
 					</div>
 				</div>
 				<div>
-					<input type="text" ng-model="modalTempData.modalTitle" ng-if="boxStatus == 3 || boxStatus == 4" class="modal-head" placeholder="请填写模板名称">
+					<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-change="listenRateContent()" placeholder="{{boxStatus==2?'请填写您对此评价的回复':boxStatus==3||boxStatus==4?'请填写模板内容':''}}" ng-class="{'active': boxStatus != 1}" ng-model="modalTempData.rateContent"></textarea>
+					<textarea ng-readonly="boxStatus == 1" ng-trim="false" ng-change="listenRateContent()" placeholder="{{boxStatus==2?'请填写您对此评价的回复':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>