Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductServiceImpl.java

@@ -80,7 +80,6 @@ import java.lang.reflect.Field;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -1488,12 +1487,7 @@ public class ProductServiceImpl implements ProductService {
         g.setPackaging(packaging);
 
         String produceDate = (detail == null || detail.getProduceDate() == null) ? product.getProduceDate() : detail.getProduceDate();
-        if (produceDate == null) {
-            String format = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
-            g.setProduceDate(format);
-        } else {
-            g.setProduceDate(produceDate);
-        }
+        g.setProduceDate(produceDate);
 
         Double minPackQty = (detail == null || detail.getMinPackQty() == null) ? product.getMinPackQty() : detail.getMinPackQty();
         Double minBuyQty = detail != null ? detail.getMinBuyQty() : null;

src/main/webapp/resources/css/common.css

@@ -953,7 +953,9 @@ textarea{resize:none}
 
 .modal-content {
 	overflow-y: auto;
-	max-height: 500px;
+	max-height: 520px;
+	overflow-x: hidden;
+	height: auto !important;
 }
 .form-control:focus {
 	border: 1px solid #4272d3;

src/main/webapp/resources/css/commonComponent.css

@@ -13,7 +13,7 @@
     </div>
 </div>
 */
-.com-del-box{
+.com-mall-del-box{
     position: fixed;
     z-index: 10;
     height: 152px;
@@ -26,14 +26,14 @@
     top: 55%;
     left: 50%;
 }
-.com-del-box .title{
+.com-mall-del-box .title{
     height: 30px;
     background-color: #5078cb;
     text-align: right;
     padding-right: 15px;
     line-height: 30px;
 }
-.com-del-box .title i{
+.com-mall-del-box .title i{
     background: url(../img/icon/close.png) no-repeat;
     display: inline-block;
     width: 9px;
@@ -41,27 +41,27 @@
     cursor: pointer;
     margin: 0;
 }
-.com-del-box .content{
+.com-mall-del-box .content{
     width: 100%;
     text-align: center;
     margin: 0 auto;
 }
-.com-del-box .content p{
+.com-mall-del-box .content p{
     line-height: 50px;
     font-size: 14px;
     padding-top: 10px;
 }
-.com-del-box .content p i{
+.com-mall-del-box .content p i{
     color: #5078cb;
     font-size: 16px;
     margin-right: 10px;
 }
-.com-del-box .content div{
+.com-mall-del-box .content div{
     width: 100%;
     text-align: center;
     margin: 0 auto;
 }
-.com-del-box .content div a{
+.com-mall-del-box .content div a{
     width: 55px;
     height: 26px;
     line-height: 26px;
@@ -70,16 +70,16 @@
     font-size: 14px;
     cursor: pointer;
 }
-.com-del-box .content div a:first-child{
+.com-mall-del-box .content div a:first-child{
     background: #b4b5b9;
     color: #333;
     margin-right: 10px;
 }
-.com-del-box .content div a:last-child{
+.com-mall-del-box .content div a:last-child{
     background: #5078cb;
     color: #fff;
 }
-.com-del-box .content div a:hover{
+.com-mall-del-box .content div a:hover{
     background: #3f7ae3;
     color: #fff;
 }

src/main/webapp/resources/css/pay.css

@@ -315,8 +315,7 @@
     margin-top: 0;
 }
 .down-payment .pay-price div.stage .content{
-    width: 250px;
-    float: right;
+    text-align: right;
     border: none;
     margin-top: 0;
     padding-bottom: 0;

src/main/webapp/resources/js/usercenter/controllers/forstore/buyer_invoice_ctrl.js

@@ -91,8 +91,9 @@ define(['app/app'], function(app) {
         //上传发票许可证
         $scope.onUploadPermission = function () {
             $scope.isDoUpload = true;
-            if (event.target.files[0].size < 3*1024*1024) {
-                $scope.bill.attachUrl = event.target.files[0].name;
+            // console.log($scope.bill.billInfo);
+            if ($scope.bill.billInfo[0].size < 3*1024*1024) {
+                $scope.bill.attachUrl = $scope.bill.billInfo[0].name;
             } else {
                 $scope.bill.attachUrl = '';
             }

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

@@ -432,7 +432,7 @@
 				<div style="text-align: right;margin-right:25px;margin-top:-30px;">
 					<span class="count-tip">显示 {{$$bankInfo.start}}-{{$$bankInfo.end}} 条,共 <em ng-bind="$$bankInfo.totalElements" style="color: #5078cb">2506</em> 条</span>
 				</div>
-				<div class="com-del-box" ng-if="showDelete">
+				<div class="com-mall-del-box" ng-if="showDelete">
 					<div class="title">
 						<i ng-click="cancelDelete()"></i>
 					</div>