Merge branch 'dev' into 'master'

Dev

See merge request motive-power/yxl/yxl-web-admin-frontend!16

src/components/Upload.vue

@@ -52,7 +52,8 @@
         </template> -->
 
     <template v-if="limit">
-      最多上传 <b style="color: #f56c6c">{{ limit }}</b>张
+      最多上传 <b style="color: #f56c6c">{{ limit }}</b
+      >张
     </template>
 
     <el-dialog :visible.sync="dialogVisible" :modal="false">
@@ -186,7 +187,7 @@ export default {
     //   // this.imgList = JSON.parse(JSON.stringify(this.tmp))
     // },
     handleRemove(file, fileList) {
-      const result = this.imgList.filter(x => x.name !== file.name);
+      const result = this.imgList.filter(x => x.url !== file.url);
       this.$emit('input', result);
     },
     handlePictureCardPreview(file) {
@@ -196,7 +197,7 @@ export default {
     handleBeforeUpload(file) {
       const isLt100M = file.size / 1024 / 1024 < 5;
       if (!isLt100M) {
-        this.$message.error("上传照片大小要在5MB以内哦!");
+        this.$message.error('上传照片大小要在5MB以内哦!');
         return false;
       }
       this.loading = this.$loading({

src/views/sceneManagement/sceneList/modal/ItemModal.vue

@@ -47,7 +47,7 @@
         <upload v-model="form.hdLogo" params="prefix=/kindergarten" />
       </el-form-item>
       <el-form-item label="门店图片" prop="cover" required>
-        <upload v-model="form.cover" params="prefix=/kindergarten" />
+        <upload v-model="form.cover" :limit="3" params="prefix=/kindergarten" />
       </el-form-item>
       <el-form-item label="办公电话" prop="phonenumber">
         <el-input v-model="form.phonenumber" placeholder="请输入办公电话" />
@@ -114,6 +114,14 @@
 import SCENETYPE from '@/const/sceneType';
 import { getItem, saveItem } from '@/api/scene';
 
+const setListImg = str => {
+  if (!str || str === '') {
+    return [];
+  } else {
+    return str.split(',').map(x => ({ url: x }));
+  }
+};
+
 export default {
   name: 'SceneItemModal',
 
@@ -133,7 +141,7 @@ export default {
       }
     };
     return {
-      title: '幼儿园详情',
+      title: '新增幼儿园信息',
       modal: true,
 
       TypeOptions: SCENETYPE,
@@ -279,7 +287,10 @@ export default {
   watch: {
     id: {
       handler(id) {
-        id && this.loadData();
+        if (id) {
+          this.loadData();
+          this.title = '编辑幼儿园信息';
+        }
       },
       immediate: true
     }
@@ -298,7 +309,7 @@ export default {
         result.logo = [{ url: data.logo }];
         result.previewLogo = [{ url: data.previewLogo }];
         result.hdLogo = [{ url: data.hdLogo }];
-        result.cover = [{ url: data.cover }];
+        result.cover = data.coverList.map(x => ({ url: x })); // setListImg(data.cover);
         result.businessLicense = [{ url: data.businessLicense }];
         result.bodyPhoto = [{ url: data.bodyPhoto }];
         result.idCardFront = [{ url: data.idCardFront }];
@@ -318,7 +329,7 @@ export default {
           params.logo = this.form.logo[0].url;
           params.previewLogo = this.form.previewLogo[0].url;
           params.hdLogo = this.form.hdLogo[0].url;
-          params.cover = this.form.cover[0].url;
+          params.cover = this.form.cover.map(x => x.url).join(',');
           params.businessLicense = this.form.businessLicense[0].url;
           params.bodyPhoto = this.form.bodyPhoto[0].url;
           params.idCardFront = this.form.idCardFront[0].url;