Merge remote-tracking branch 'origin/master'

src/views/baseManagement/bannerManagement/index.vue

@@ -37,6 +37,18 @@ export default {
     return {
       columns: [
         {
+          key: 'type',
+          name: '位置',
+          minWidth: this.$col.s,
+          render: (h, { row }) => {
+            const item = this.options.find(x => x.value === row.type);
+            if (item) {
+              return h('span', item.label);
+            }
+            return h('span', '-');
+          }
+        },
+        {
           key: 'imgUrl',
           name: '图片',
           width: this.$col.b,
@@ -58,18 +70,6 @@ export default {
             })
         },
         {
-          key: 'type',
-          name: '位置',
-          minWidth: this.$col.s,
-          render: (h, { row }) => {
-            const item = this.options.find(x => x.value === row.type);
-            if (item) {
-              return h('span', item.label);
-            }
-            return h('span', '-');
-          }
-        },
-        {
           key: 'name',
           name: '标题',
           minWidth: this.$col.s

src/views/photoManagement/eventsList/index.vue

@@ -36,9 +36,9 @@ export default {
     return {
       columns: [
         {
-          key: 'name',
-          name: '活动名称',
-          minWidth: this.$col.b
+          key: 'kindergartenName',
+          name: '所属场景',
+          width: this.$col.b
         },
         {
           key: 'cover',
@@ -62,9 +62,9 @@ export default {
             })
         },
         {
-          key: 'kindergartenName',
-          name: '所属场景',
-          width: this.$col.b
+          key: 'name',
+          name: '活动名称',
+          minWidth: this.$col.b
         },
         {
           key: 'createBy',

src/views/photoManagement/eventsList/toolbar.vue

@@ -12,17 +12,17 @@ export default {
     return {
       fields: [
         {
-          type: 'text',
-          name: 'name',
-          label: '活动名称'
-        },
-        {
           // TODO 场景选择框
           type: 'SceneSelect',
           name: 'status',
           label: '所属场景'
         },
         {
+          type: 'text',
+          name: 'name',
+          label: '活动名称'
+        },
+        {
           type: 'select',
           name: 'isShow',
           label: '状态',

src/views/photoManagement/imageGoodsManagement/index.vue

@@ -32,6 +32,13 @@ export default {
     return {
       columns: [
         {
+          key: 'location',
+          name: '上传位置',
+          minWidth: this.$col.b,
+          render: (h, { row }) =>
+            h('span', `${row.kindergartenName}/${row.activityName}`)
+        },
+        {
           key: 'listPreview',
           name: '图片',
           width: this.$col.b,
@@ -53,13 +60,6 @@ export default {
             })
         },
         {
-          key: 'location',
-          name: '上传位置',
-          minWidth: this.$col.b,
-          render: (h, { row }) =>
-            h('span', `${row.kindergartenName}/${row.activityName}`)
-        },
-        {
           key: 'createAt',
           name: '上传时间',
           width: this.$col.b

src/views/photoManagement/photoVerifyManagement/index.vue

@@ -32,6 +32,13 @@ export default {
     return {
       columns: [
         {
+          key: 'location',
+          name: '上传位置',
+          minWidth: this.$col.b,
+          render: (h, { row }) =>
+            h('span', `${row.kindergartenName}/${row.activityName}`)
+        },
+        {
           key: 'listPreview',
           name: '图片',
           width: this.$col.b,
@@ -53,13 +60,6 @@ export default {
             })
         },
         {
-          key: 'location',
-          name: '上传位置',
-          minWidth: this.$col.b,
-          render: (h, { row }) =>
-            h('span', `${row.kindergartenName}/${row.activityName}`)
-        },
-        {
           key: 'createAt',
           name: '上传时间',
           width: this.$col.b

src/views/photographerManagement/photoVerify/index.vue

@@ -36,6 +36,13 @@ export default {
     return {
       columns: [
         {
+          key: 'location',
+          name: '上传位置',
+          minWidth: this.$col.b,
+          render: (h, { row }) =>
+            h('span', `${row.kindergartenName}/${row.activityName}`)
+        },
+        {
           key: 'listPreview',
           name: '图片',
           width: this.$col.b,
@@ -57,13 +64,6 @@ export default {
             })
         },
         {
-          key: 'location',
-          name: '上传位置',
-          minWidth: this.$col.b,
-          render: (h, { row }) =>
-            h('span', `${row.kindergartenName}/${row.activityName}`)
-        },
-        {
           key: 'createAt',
           name: '上传时间',
           width: this.$col.b

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

@@ -33,13 +33,13 @@
         <el-input v-model="form.address" placeholder="请输入详细地址" />
       </el-form-item>
       <el-form-item label="机构logo">
-        <upload v-model="form.logo" params="prefix=/kindergraten" />
+        <upload v-model="form.logo" params="prefix=/kindergarten" />
       </el-form-item>
       <el-form-item label="门店图片">
-        <upload v-model="form.frontDoor" params="prefix=/kindergraten" />
+        <upload v-model="form.frontDoor" params="prefix=/kindergarten" />
       </el-form-item>
       <el-form-item label="营业执照">
-        <upload v-model="form.businessLicense" params="prefix=/kindergraten" />
+        <upload v-model="form.businessLicense" params="prefix=/kindergarten" />
       </el-form-item>
       <el-form-item label="证照号码" prop="idCardNumber">
         <el-input v-model="form.idCardNumber" placeholder="请输入证照号码" />
@@ -62,13 +62,13 @@
         <el-input v-model="form.personPhonenumber" placeholder="请输入手机号" />
       </el-form-item>
       <el-form-item label="半身照">
-        <upload v-model="form.bodyPhoto" params="prefix=/kindergraten" />
+        <upload v-model="form.bodyPhoto" params="prefix=/kindergarten" />
       </el-form-item>
       <el-form-item label="证件正面">
-        <upload v-model="form.idCardFront" params="prefix=/kindergraten" />
+        <upload v-model="form.idCardFront" params="prefix=/kindergarten" />
       </el-form-item>
       <el-form-item label="证件背面">
-        <upload v-model="form.idCardBack" params="prefix=/kindergraten" />
+        <upload v-model="form.idCardBack" params="prefix=/kindergarten" />
       </el-form-item>
       <el-form-item label="状态" prop="isShow">
         <el-radio-group v-model="form.isShow">