Browse Source

Merge remote-tracking branch 'origin/feature-wangdy-rate-v1.0' into feature-wangdy-rate-v1.0

wangdy 8 years ago
parent
commit
5872f22477

+ 3 - 0
src/main/webapp/resources/js/usercenter/controllers/forstore/add_rate_ctrl.js

@@ -80,7 +80,10 @@ define(['app/app'], function(app) {
         $scope.listenRateContent = function (detail) {
             var str = detail.buyerAfterRate;
             if (str.length > 200) {
+                var el = angular.element('#rateContent');
+                el.blur();
                 detail.buyerAfterRate = str.substring(0, 200);
+                el.focus();
             }
         }
 

+ 3 - 0
src/main/webapp/resources/js/usercenter/controllers/forstore/first_rate_ctrl.js

@@ -90,7 +90,10 @@ define(['app/app'], function(app) {
         $scope.listenRateContent = function ($index) {
             var str = $scope.goodsRate[$index].buyerRate;
             if (str.length > 200) {
+                var el = angular.element('#rateContent');
+                el.blur();
                 $scope.goodsRate[$index].buyerRate = str.substring(0, 200);
+                el.focus();
             }
         }
 

+ 3 - 0
src/main/webapp/resources/js/vendor/controllers/forstore/show_rate_ctrl.js

@@ -74,7 +74,10 @@ define(['app/app'], function(app) {
         $scope.listenRateContent = function () {
             var str = $scope.modalTempData.rateContent
             if (str.length > 200) {
+                var el = angular.element('#rateContent');
+                el.blur();
                 $scope.modalTempData.rateContent = str.substring(0, 200);
+                el.focus();
             }
         }
 

+ 3 - 0
src/main/webapp/resources/js/vendor/controllers/forstore/vendor_order_ctrl.js

@@ -1090,7 +1090,10 @@ define(['app/app'], function (app) {
         $scope.listenRateContent = function () {
             var str = $scope.modalTempData.rateContent
             if (str.length > 200) {
+                var el = angular.element('#rateContent');
+                el.blur();
                 $scope.modalTempData.rateContent = str.substring(0, 200);
+                el.focus();
             }
         }
 

+ 3 - 3
src/main/webapp/resources/view/usercenter/forstore/add_rate.html

@@ -217,8 +217,8 @@
     .add-rate table tbody tr td .first-rate-item-textBox .add-rate-remind {
         color: #999;
         position: absolute;
-        right: 27px;
-        bottom: 13px;
+        right: 29px;
+        bottom: 10px;
     }
     .add-rate table thead .temp-line td{
         padding: 0;
@@ -320,7 +320,7 @@
                         <div class="buyer-first-rate02" style="background: #fff">
                             <div style="margin-top: 10px;">买家追评:</div>
                             <div class="first-rate-item-textBox">
-                                <textarea placeholder="快来分享您的使用感受吧!" rows="10" cols="20" ng-change="listenRateContent(detail)" ng-model="detail.buyerAfterRate"></textarea>
+                                <textarea id="rateContent" 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>

+ 2 - 2
src/main/webapp/resources/view/usercenter/forstore/first_rate.html

@@ -110,7 +110,7 @@
     .first-rate table tbody tr td .first-rate-item-textBox .add-rate-remind {
         color: #999;
         position: absolute;
-        right: 30px;
+        right: 33px;
         bottom: 13px;
     }
     .first-rate table tbody tr td .first-rate-item-textBox textarea {
@@ -248,7 +248,7 @@
                             </label>
                         </div>
                         <div class="first-rate-item-textBox">
-                            <textarea placeholder="请输入您对产品的评价" ng-change="listenRateContent($index)" ng-model="goodsRate[$index].buyerRate"></textarea>
+                            <textarea id="rateContent" placeholder="请输入您对产品的评价" ng-change="listenRateContent($index)" ng-model="goodsRate[$index].buyerRate"></textarea>
                             <div class="add-rate-remind">
                                 <span>{{goodsRate[$index].buyerRate.length || 0}}</span>
                                 <span>/200</span>

+ 2 - 2
src/main/webapp/resources/view/vendor/forstore/showRate.html

@@ -334,7 +334,7 @@
     .add-rate .reply-box .reply-box-text .add-rate-remind {
         position: absolute;
         bottom: 2px;
-        right: 45px;
+        right: 50px;
         font-size: 12px;
         color: #999;
     }
@@ -500,7 +500,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-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>
+            <textarea id="rateContent" 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>

+ 2 - 2
src/main/webapp/resources/view/vendor/forstore/vendor_order.html

@@ -801,7 +801,7 @@
     .sellOder .reply-box .reply-box-text .add-rate-remind {
         position: absolute;
         bottom: 2px;
-        right: 55px;
+        right: 60px;
         font-size: 12px;
         color: #999;
     }
@@ -1159,7 +1159,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-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>
+					<textarea id="rateContent" 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>