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

src/main/webapp/resources/js/common/directives.js

@@ -793,8 +793,8 @@ define(['angular', 'showdown', 'angular-toaster'], function(angular) {
 				if (config.maxSize === 3145728) {
           alert('上传图片的大小不能超过3M')
         } else {
-          alert('上传pdf的大小不能超过20M')
-				}
+				alert('上传pdf的大小不能超过20M')
+			}
 				//toaster.pop('error', '上传图片的大小不能超过3M');
 				return;
 			}
@@ -864,7 +864,7 @@ define(['angular', 'showdown', 'angular-toaster'], function(angular) {
           element.append('<input type=file class=uploadImage style=display:none; accept=image/jpeg,image/jpg,image/gif,image/bmp,image/png,.pdf />');
 				} else {
           element.append("<input type='file' class='uploadImage' style='display:none;' accept='.pdf' />");
-        }
+			}
 				var uploadImage = $(element).find('.uploadImage');
 
 				uploadImage.change(function () {

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

@@ -312,7 +312,7 @@
         color: #e64040;
     }
     .oder_xq_list dl span.total-price strong {
-        width: 70px;
+        width: 86px;
         display: inline-block;
         float: left;
     }