Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/businessOrder/index.vue

src/components/uploader.vue

@@ -271,6 +271,7 @@
   .gallery {
   .gallery {
     display: flex;
     display: flex;
     flex-direction: row;
     flex-direction: row;
+    flex-wrap: wrap;
   }
   }
 
 
   .dustbin {
   .dustbin {
@@ -284,6 +285,7 @@
     border-color: #409EFF;
     border-color: #409EFF;
     border: 1px dashed #d9d9d9;
     border: 1px dashed #d9d9d9;
     border-radius: 6px;
     border-radius: 6px;
+    margin-bottom: 6px;
     overflow: hidden;
     overflow: hidden;
   }
   }
 
 

src/const/crud/mall/merchantMallorder.js

@@ -38,7 +38,7 @@ export const tableOption = {
       "label": "状态",
       "label": "状态",
       "prop": "state",
       "prop": "state",
       "search": true,
       "search": true,
-      "dicUrl": "/admin/merchantMallOrder/getMerchantOrderStateOptions",
+      "dicUrl": "/admin/merchantMallOrder/getOrderStateOptions",
 
 
     },
     },
     {
     {