Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev

template/admin/src/components/uploadImg/index.vue

@@ -3,11 +3,12 @@
     <el-dialog
       title="上传图片"
       append-to-body
-      :modal-append-to-body="false"
+      :modal-append-to-body="true"
       :visible.sync="uploadModal"
       :width="isIframe ? '100%' : '1024px'"
       :fullscreen="isIframe"
       @close="closed"
+      top="5vh"
     >
       <div class="main" v-loading="loading">
         <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
@@ -416,7 +417,7 @@ export default {
   font-size: 16px;
 }
 .main{
-    min-height: 600px
+    min-height: 500px
 }
 .pictrue {
   width: 60px;

template/admin/src/pages/product/productAdd/index.vue

@@ -1192,15 +1192,12 @@
         </FormItem>
         <Spin size="large" fix v-if="spinShow"></Spin>
       </Form>
-      <Modal
-        v-model="modalPic"
+      <el-dialog
+        :visible.sync="modalPic"
         width="1024px"
         scrollable
-        footer-hide
-        closable
         title="上传商品图"
-        :mask-closable="false"
-        :z-index="1"
+        :close-on-click-modal="false"
       >
         <uploadPictures
           :isChoice="isChoice"
@@ -1210,7 +1207,7 @@
           :gridPic="gridPic"
           v-if="modalPic"
         ></uploadPictures>
-      </Modal>
+      </el-dialog>
       <Modal
         v-model="addVirtualModel"
         width="700px"