Browse Source

Merge remote-tracking branch 'origin/liusw-seekpurchae-v2.0.1.13' into liusw-seekpurchase-v2.0.1.13

liusw 8 years ago
parent
commit
ce4b9e11ea

+ 8 - 1
src/main/webapp/resources/css/common.css

@@ -949,4 +949,11 @@ input::-webkit-input-safebox-button{
 	display: none;
 }
 /*去除textarea默认右下角可自由放大样式*/
-textarea{resize:none}
+textarea{resize:none}
+
+input[type="number"]{
+	-moz-appearance: textfield !important;
+}
+select {
+	-moz-appearance: none;
+}

+ 10 - 1
src/main/webapp/resources/js/usercenter/controllers/forstore/seek_purchase_ctrl.js

@@ -47,6 +47,15 @@ define(['app/app'], function (app) {
             }
             return len;
           }
+          var cutOutString = function (str, length) {
+            for (var i = 1; i <= str.length; i++) {
+              if (getRealLen(str.substr(0, i)) > length){
+                str = str.substr(0, i-1);
+                break;
+              }
+            }
+            return str;
+          };
 
           $scope.nowDate = new Date();
 
@@ -109,7 +118,7 @@ define(['app/app'], function (app) {
           }
           $scope.onProduceDateChange = function () {
             if ($scope.applyObj.produceDate && getRealLen($scope.applyObj.produceDate) > 12) {
-              $scope.applyObj.produceDate = $scope.applyObj.produceDate.substring(0, $scope.applyObj.produceDate.length - 1)
+              $scope.applyObj.produceDate = cutOutString($scope.applyObj.produceDate, 12);
             }
           }
           $scope.checkAmount = function () {

+ 1 - 0
src/main/webapp/resources/view/usercenter/forstore/seekPurchase.html

@@ -58,6 +58,7 @@
         background: url('static/img/seekPurchase/currency-arrow-down.png') no-repeat;
         background-position: 14px -1px;
         padding: 0 3px;
+        border: 1px solid #b5b5b5;
     }
     .seek-purchase select {
         opacity: 1;

+ 7 - 6
src/main/webapp/resources/view/vendor/forstore/seekPurchase.html

@@ -257,12 +257,6 @@
         height: 25px;
         border: 1px solid #5392f9;
     }
-    .seek-purchase .seek-purchase-content >table tbody tr.say-price td >div >div:nth-child(2) select {
-        border: none;
-        padding-left: 9px;
-        background: url(static/img/seekPurchase/select-arrow-down.png) no-repeat;
-        background-position: 18px 9px;
-    }
     .seek-purchase .seek-purchase-content >table tbody tr.say-price td >div >div:nth-child(2) div,
     .seek-purchase .seek-purchase-content >table tbody tr.say-price td >div >div:nth-child(2) select {
         position: absolute;
@@ -277,6 +271,13 @@
         border-bottom-left-radius: 4px;
         border-top-left-radius: 4px;
     }
+    .seek-purchase .seek-purchase-content >table tbody tr.say-price td >div >div:nth-child(2) select {
+        border: none;
+        padding-left: 9px;
+        background: url(static/img/seekPurchase/select-arrow-down.png) no-repeat;
+        background-position: 18px 9px;
+        text-align: left;
+    }
     .seek-purchase .seek-purchase-content >table tbody tr.say-price td >div >div:nth-child(2) div + input,
     .seek-purchase .seek-purchase-content >table tbody tr.say-price td >div >div:nth-child(2) select + input {
         padding: 0 0 0 34px;