Merge branch 'feature/七月迭代' into master

src/views/activity/template-detail.vue

@@ -15,7 +15,7 @@
           <el-input class="w340" v-model="form.templateName" show-word-limit placeholder="请输入模板名称" maxlength="20"></el-input>
         </el-form-item>
         <el-form-item label="游戏首页背景" prop="backImageUrl.materialValue" :rules="[{ required: true, message: '请上传' } ]">
-          <vue-gic-upload-image  :project-name="projectName" is-yw :action-url="actionUrl" :image-list="imageList.backImageUrlList" max-image-length="1" accept="image/jpg,image/jpeg,image/png,image/gif" :before-upload="(file) => beforeUpload(file, 5)" @uploadOnSuccess="(data) => uploadOnSuccess(data, 'backImageUrl')" @deleteImage="deleteImage('backImageUrl')" preview-append-to-body>
+          <vue-gic-upload-image  :project-name="projectName" is-yw  :limit-size="5" :action-url="actionUrl" :image-list="imageList.backImageUrlList" max-image-length="1" accept="image/jpg,image/jpeg,image/png,image/gif" :before-upload="(file) => beforeUpload(file, 5)" @uploadOnSuccess="(data) => uploadOnSuccess(data, 'backImageUrl')" @deleteImage="deleteImage('backImageUrl')" preview-append-to-body>
           </vue-gic-upload-image>
           <p class="tips mt6">图片建议尺寸 750*1800px，格式 jpg/jpeg/png/gif，大小 5M 以内。</p>
         </el-form-item>
@@ -541,7 +541,6 @@ export default {
         this.$message.error(`图片不能大于${size}M，请重新上传！`);
         return false;
       }
-
       return true;
     },
     onValChange(){