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

src/components/icss/MedicineInfoPg.vue

@@ -53,6 +53,14 @@
             ImageExtend: {
               loading: true,
               name: 'upfile',
+              size:1,
+              sizeError: () => {
+                this.$message({
+                  showClose: true,
+                  message: '请上传 1M 以内的图片！',
+                  type: 'warning'
+                })
+              },
               action: config.urls.promptServer,
               response: (res) => {
                 return config.imgHost+res.url;