Merge branch 'master' into 测试

src/views/subsidiary/order/management/add.vue

@@ -180,7 +180,7 @@
                                   }
                                 "
                                 style="width: 100%"
-                                accept=".docx,.jpg,.jpeg,.png,.GIF,.JPG,.PNG">
+                                accept=".jpg,.jpeg,.png,.GIF,.JPG,.PNG">
                                 <el-button type="primary" style="margin-left: 12px" text>上传图片</el-button>
                               </el-upload>
                             </div>
@@ -234,7 +234,8 @@
                                     return handleAdhesiveSuccess(uploadFile, index);
                                   }
                                 "
-                                style="width: 100%">
+                                style="width: 100%"
+                                accept=".jpg,.jpeg,.png,.GIF,.JPG,.PNG">
                                 <el-button type="primary" text>上传文件</el-button>
                               </el-upload>
                             </div>

src/views/subsidiary/order/management/design.vue

@@ -116,7 +116,7 @@
                                   }
                                 "
                                 style="width: 100%"
-                                accept=".docx,.jpg,.jpeg,.png,.GIF,.JPG,.PNG">
+                                accept=".jpg,.jpeg,.png,.GIF,.JPG,.PNG">
                                 <el-button type="primary" style="margin-left: 12px" text>上传图片</el-button>
                               </el-upload>
                             </div>
@@ -170,7 +170,8 @@
                                     return handleAdhesiveSuccess(uploadFile, index);
                                   }
                                 "
-                                style="width: 100%">
+                                style="width: 100%"
+                                accept=".jpg,.jpeg,.png,.GIF,.JPG,.PNG">
                                 <el-button type="primary" text>上传文件</el-button>
                               </el-upload>
                             </div>