From aa3c69d77778e72a3b3cecfe504685a325862f2b Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Mon, 25 May 2020 17:24:07 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=20-=20banner?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A1=B5=E9=9D=A2=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/heart/actbanner-add-or-update.vue | 168 ++++++++----------
 src/views/modules/heart/actbanner.vue         |  53 +++---
 2 files changed, 104 insertions(+), 117 deletions(-)

diff --git a/src/views/modules/heart/actbanner-add-or-update.vue b/src/views/modules/heart/actbanner-add-or-update.vue
index 403a20e..9679082 100644
--- a/src/views/modules/heart/actbanner-add-or-update.vue
+++ b/src/views/modules/heart/actbanner-add-or-update.vue
@@ -1,53 +1,31 @@
 <template>
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-          <el-form-item label="活动ID" prop="actId">
-          <el-input v-model="dataForm.actId" placeholder="活动ID"></el-input>
-      </el-form-item>
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '200px' : '120px'">
           <el-form-item label="标题" prop="title">
-          <el-input v-model="dataForm.title" placeholder="标题"></el-input>
-      </el-form-item>
-          <el-form-item label="banner图片" prop="bannerImg">
-          <el-input v-model="dataForm.bannerImg" placeholder="banner图片"></el-input>
-      </el-form-item>
-          <el-form-item label="banner类型 0-活动，1-连接" prop="bannerType">
-          <el-input v-model="dataForm.bannerType" placeholder="banner类型 0-活动，1-连接"></el-input>
-      </el-form-item>
-          <el-form-item label="连接地址" prop="url">
-          <el-input v-model="dataForm.url" placeholder="连接地址"></el-input>
-      </el-form-item>
-          <el-form-item label="上下架状态 0-下架，1-上架" prop="statue">
-          <el-input v-model="dataForm.statue" placeholder="上下架状态 0-下架，1-上架"></el-input>
-      </el-form-item>
-          <el-form-item label="上下架时间" prop="statueTime">
-          <el-input v-model="dataForm.statueTime" placeholder="上下架时间"></el-input>
-      </el-form-item>
-          <el-form-item label="banner位置 0-顶部" prop="bannerPosition">
-          <el-input v-model="dataForm.bannerPosition" placeholder="banner位置 0-顶部"></el-input>
-      </el-form-item>
-          <el-form-item label="浏览数量" prop="browseNum">
-          <el-input v-model="dataForm.browseNum" placeholder="浏览数量"></el-input>
-      </el-form-item>
-          <el-form-item label="创建部门ID" prop="deptId">
-          <el-input v-model="dataForm.deptId" placeholder="创建部门ID"></el-input>
-      </el-form-item>
-          <el-form-item label="乐观锁" prop="revision">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
-      </el-form-item>
-          <el-form-item label="删除标识 0-否，1-是" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="删除标识 0-否，1-是"></el-input>
-      </el-form-item>
-          <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
-      </el-form-item>
-          <el-form-item label="创建时间" prop="createdTime">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
-      </el-form-item>
-          <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
-      </el-form-item>
-          <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+          <el-input v-model="dataForm.title" placeholder="标题" maxlength="30" show-word-limit></el-input>
+      </el-form-item>
+      <el-row>
+        <el-form-item label="banner图片"
+                      v-loading="loading"
+                      prop="bannerImg">
+          <el-upload class="avatar-uploader"
+                     :action="uploadUrl"
+                     :show-file-list="false"
+                     :on-success="handleAvatarActSuccess"
+                     :on-error="handelError"
+                     :before-upload="beforeAvatarUpload">
+            <img v-if="dataForm.bannerImg"
+                 :src="dataForm.bannerImg"
+                 class="avatar">
+            <i v-else
+               class="el-icon-plus avatar-uploader-icon"></i>
+            <div slot="tip"
+                 class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
+          </el-upload>
+        </el-form-item>
+      </el-row>
+          <el-form-item label="排序" prop="sort">
+          <el-input-number v-model="dataForm.sort" :min="0" :max="4"></el-input-number>
       </el-form-item>
       </el-form>
     <template slot="footer">
@@ -59,6 +37,7 @@
 
 <script>
 import debounce from 'lodash/debounce'
+import Cookies from 'js-cookie'
 export default {
   data () {
     return {
@@ -70,9 +49,9 @@ export default {
         bannerImg: '',
         bannerType: '',
         url: '',
-        statue: '',
-        statueTime: '',
-        bannerPosition: '',
+        status: 1, // 默认上架
+        statusTime: '',
+        bannerPosition: 0, // banner位置 0-顶部  默认顶部
         browseNum: '',
         deptId: '',
         revision: '',
@@ -80,64 +59,33 @@ export default {
         createdBy: '',
         createdTime: '',
         updatedBy: '',
-        updatedTime: ''
-      }
+        updatedTime: '',
+        sort: 0
+      },
+      // 图片
+      loading: false,
+      uploadUrl: ''
     }
   },
   computed: {
     dataRule () {
       return {
-        actId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
         title: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         bannerImg: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        bannerType: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        url: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        statue: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        statueTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        bannerPosition: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        browseNum: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        deptId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        revision: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        delFlag: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createdBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createdTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updatedBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updatedTime: [
+        sort: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
     }
   },
+  created () {
+    this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
+    this.dataForm.bannerImg = ''
+  },
   methods: {
     init () {
       this.visible = true
@@ -160,12 +108,23 @@ export default {
         }
       }).catch(() => {})
     },
+    handleAvatarActSuccess (res, file) {
+      this.loading = false
+      this.dataForm.bannerImg = res.data.url
+    },
+    beforeAvatarUpload (file) {
+      this.loading = true
+    },
+    handelError () {
+      this.loading = false
+    },
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
       this.$refs['dataForm'].validate((valid) => {
         if (!valid) {
           return false
         }
+        this.dataForm.statusTime = new Date()
         this.$http[!this.dataForm.id ? 'post' : 'put']('/heart/actbanner/', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
@@ -185,3 +144,28 @@ export default {
   }
 }
 </script>
+<style>
+  .avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409eff;
+  }
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+  }
+  .avatar {
+    width: 178px;
+    height: 178px;
+    display: block;
+  }
+  </style>
diff --git a/src/views/modules/heart/actbanner.vue b/src/views/modules/heart/actbanner.vue
index 408c2e6..3ca3b47 100644
--- a/src/views/modules/heart/actbanner.vue
+++ b/src/views/modules/heart/actbanner.vue
@@ -8,42 +8,40 @@
             <el-option label="下架" :value="0"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间"
-                      prop="startTime">
-          <el-date-picker v-model="dataForm.startTime"
-                          type="date"
-                          :picker-options="pickerBeginDateBefore"
-                          value-format="yyyy-MM-dd"
-                          format="yyyy-MM-dd"
-                          placeholder="选择日期时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="至"
-                      label-width="25px"
-                      prop="endTime">
-          <el-date-picker v-model="dataForm.endTime"
-                          type="date"
-                          :picker-options="pickerBeginDateAfter"
-                          value-format="yyyy-MM-dd"
-                          format="yyyy-MM-dd"
-                          placeholder="选择日期时间">
-          </el-date-picker>
-        </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('heart:actbanner:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
         <el-table-column prop="title" label="标题" header-align="center" align="center"></el-table-column>
+        <el-table-column align="center" label="Banner图片" :show-overflow-tooltip="true" prop="bannerImg">
+          <template slot-scope="scope">
+          <el-popover placement="right"
+                title=""
+                trigger="click"
+                class="big_image">
+            <el-image slot="reference"
+                min-width="70"
+                height="70"
+                :src="scope.row.bannerImg"
+                :alt="scope.row.bannerImg"></el-image>
+            <img class="big_image"
+               :src="scope.row.bannerImg" />
+          </el-popover>
+          </template>
+        </el-table-column>
         <el-table-column prop="status" label="状态" :formatter="formatState" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="sort" label="排序" header-align="center" align="center"></el-table-column>
         <el-table-column prop="statusTime" label="上下架时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="browseNum" label="浏览数量" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
 
           <template slot-scope="scope">
             <el-button v-if="$hasPermission('heart:actbanner:grounding')" type="text" size="small" @click="changeGroundingHandle(scope.row)">{{ changeGroundingText(scope.row.status) }}</el-button>
+            <el-button v-if="$hasPermission('heart:actbanner:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -87,7 +85,7 @@ export default {
     AddOrUpdate
   },
   methods: {
-    changeGroundingText(status){
+    changeGroundingText (status) {
       let state = status
       if (state === '1') {
         return '下架'
@@ -105,7 +103,6 @@ export default {
     },
 
     changeGroundingHandle: debounce(function (row) {
-
       this.$confirm(this.$t('prompt.info', { 'handle': this.changeGroundingText(row.status) }), this.$t('prompt.title'), {
         confirmButtonText: this.$t('confirm'),
         cancelButtonText: this.$t('cancel'),
@@ -130,3 +127,9 @@ export default {
   }
 }
 </script>
+<style scoped>
+  .big_image {
+    width: 300px;
+    height: 240px;
+  }
+</style>

From 6acc99f427e2090929e9faead08ca52400ed9a2e Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Mon, 25 May 2020 17:42:10 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D=20?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=20=E4=B8=8A=E4=BC=A0banner=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/heart/actinfo-add-or-update.vue   | 44 +------------------
 1 file changed, 1 insertion(+), 43 deletions(-)

diff --git a/src/views/modules/heart/actinfo-add-or-update.vue b/src/views/modules/heart/actinfo-add-or-update.vue
index 89ac9f2..95839d7 100644
--- a/src/views/modules/heart/actinfo-add-or-update.vue
+++ b/src/views/modules/heart/actinfo-add-or-update.vue
@@ -262,39 +262,6 @@
             </div>
           </el-form-item>
         </el-row>
-        <el-row>
-          <el-form-item label="banner展示："
-                        prop="isBanner">
-            <template>
-              <el-radio v-model="dataForm.isBanner"
-                        label="1"
-                        @change="changeHandler">是</el-radio>
-              <el-radio v-model="dataForm.isBanner"
-                        label="0"
-                        @change="changeHandler">否</el-radio>
-            </template>
-          </el-form-item>
-        </el-row>
-        <el-row>
-          <el-form-item label=" "
-                        v-loading="loading"
-                        prop="bannerUrl">
-            <el-upload class="avatar-uploader"
-                       :action="uploadUrl"
-                       :show-file-list="false"
-                       :on-success="handleAvatarBannerSuccess"
-                       :on-error="handelError"
-                       :before-upload="beforeAvatarUpload">
-              <img v-if="dataForm.bannerUrl"
-                   :src="dataForm.bannerUrl"
-                   class="avatar">
-              <i v-else
-                 class="el-icon-plus avatar-uploader-icon"></i>
-              <div slot="tip"
-                   class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
-            </el-upload>
-          </el-form-item>
-        </el-row>
         <el-row>
           <el-form-item label-width="500px">
             <el-button type="primary"
@@ -350,9 +317,7 @@ export default {
         deptId: '',
         punishmentPoints: '',
         reward: '',
-        isBanner: '1',
-        actUserDefaultState: '1',
-        bannerUrl: ''
+        actUserDefaultState: '1'
       },
       isSignupEndTime: {
         disabledDate (time) {
@@ -538,9 +503,6 @@ export default {
         ],
         updatedTime: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        bannerUrl: [
-          { required: this.isImgRequired, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
     }
@@ -699,10 +661,6 @@ export default {
       this.loading = false
       this.dataForm.headPic = res.data.url
     },
-    handleAvatarBannerSuccess (res, file) {
-      this.loading = false
-      this.dataForm.bannerUrl = res.data.url
-    },
     beforeAvatarUpload (file) {
       this.loading = true
     },

From 65a7faa09fb861457150db3149f08c934616d7d8 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Wed, 27 May 2020 16:33:49 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/api/imgconfig-add-or-update.vue   | 176 ++++++++++++++++++
 src/views/modules/api/imgconfig.vue           | 119 ++++++++++++
 2 files changed, 295 insertions(+)
 create mode 100644 src/views/modules/api/imgconfig-add-or-update.vue
 create mode 100644 src/views/modules/api/imgconfig.vue

diff --git a/src/views/modules/api/imgconfig-add-or-update.vue b/src/views/modules/api/imgconfig-add-or-update.vue
new file mode 100644
index 0000000..552711e
--- /dev/null
+++ b/src/views/modules/api/imgconfig-add-or-update.vue
@@ -0,0 +1,176 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="类型" prop="imgType">
+            <el-select v-model="dataForm.imgType" placeholder="请选择类型">
+              <el-option
+                v-for="item in optionImgType"
+                :key="item.dictValue"
+                :label="item.dictName"
+                :value="item.dictValue">
+              </el-option>
+            </el-select>
+        </el-form-item>
+        <el-row>
+          <el-form-item label="图片" prop="imgUrl"
+                        v-loading="loading">
+            <el-upload class="avatar-uploader"
+                        :action="uploadUrl"
+                        :show-file-list="false"
+                        :on-success="handleAvatarActSuccess"
+                        :on-error="handelError"
+                        :before-upload="beforeAvatarUpload">
+              <img v-if="dataForm.imgUrl"
+                    :src="dataForm.imgUrl"
+                    class="avatar">
+              <i v-else
+                  class="el-icon-plus avatar-uploader-icon"></i>
+              <div slot="tip"
+                    class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
+            </el-upload>
+          </el-form-item>
+        </el-row>
+          <el-form-item label="排序" prop="sort">
+          <el-input-number v-model="dataForm.sort" :min="0"></el-input-number>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+import Cookies from 'js-cookie'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        imgType: '',
+        imgUrl: '',
+        sort: '',
+        revision: '',
+        delFlag: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      },
+      optionImgType: [],
+      // 图片
+      loading: false,
+      uploadUrl: ''
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        imgType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        imgUrl: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  created () {
+    this.getListImgTypeByHeartImgType()
+    this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
+    this.dataForm.imgUrl = ''
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取图片下拉类型
+    getListImgTypeByHeartImgType () {
+      this.$http.get(`/api/imgconfig/heartImgType/heart_img_type`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.optionImgType = res.data
+      }).catch(() => {})
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/api/imgconfig/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    handleAvatarActSuccess (res, file) {
+      this.loading = false
+      this.dataForm.imgUrl = res.data.url
+    },
+    beforeAvatarUpload (file) {
+      this.loading = true
+    },
+    handelError () {
+      this.loading = false
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/api/imgconfig/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
+<style>
+  .avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409eff;
+  }
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+  }
+  .avatar {
+    width: 178px;
+    height: 178px;
+    display: block;
+  }
+  </style>
diff --git a/src/views/modules/api/imgconfig.vue b/src/views/modules/api/imgconfig.vue
new file mode 100644
index 0000000..2810477
--- /dev/null
+++ b/src/views/modules/api/imgconfig.vue
@@ -0,0 +1,119 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-api__imgconfig}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="类型" prop="imgType">
+          <el-select v-model="dataForm.imgType" placeholder="请选择类型" clearable>
+            <el-option
+              v-for="item in optionImgType"
+              :key="item.dictValue"
+              :label="item.dictName"
+              :value="item.dictValue">
+            </el-option>
+          </el-select>
+      </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('api:imgconfig:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('api:imgconfig:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="imgType" label="类型" :formatter="imgTypeFormat" header-align="center" align="center"></el-table-column>
+        <el-table-column align="center" label="图片" :show-overflow-tooltip="true" prop="imgUrl">
+          <template slot-scope="scope">
+          <el-popover placement="right"
+                title=""
+                trigger="click"
+                class="big_image">
+            <el-image slot="reference"
+                min-width="70"
+                height="70"
+                :src="scope.row.imgUrl"
+                :alt="scope.row.imgUrl"></el-image>
+            <img class="big_image"
+               :src="scope.row.imgUrl" />
+          </el-popover>
+          </template>
+        </el-table-column>
+        <el-table-column prop="sort" label="排序" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission('api:imgconfig:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('api:imgconfig:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './imgconfig-add-or-update'
+import 'element-ui/lib/theme-chalk/image.css'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/api/imgconfig/page',
+        getDataListIsPage: true,
+        deleteURL: '/api/imgconfig',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      },
+      optionImgType: []
+    }
+  },
+  components: {
+    AddOrUpdate
+  },
+  created () {
+    this.getListImgTypeByHeartImgType()
+  },
+  methods: {
+    // 获取图片下拉类型
+    getListImgTypeByHeartImgType () {
+      this.$http.get(`/api/imgconfig/heartImgType/heart_img_type`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.optionImgType = res.data
+      }).catch(() => {})
+    },
+    imgTypeFormat (row, column) {
+      if (row.imgType === '0') {
+        return '志愿者咨询热线'
+      } else {
+        return ' '
+      }
+    }
+  }
+}
+</script>
+<style scoped>
+  .big_image {
+    width: 300px;
+    height: 240px;
+  }
+</style>

From 6bf382aede48fda104f045e9bd1687220bd94961 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Thu, 28 May 2020 10:29:00 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E9=94=A6=E6=B0=B4=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/heart/actinfo-add-or-update.vue   | 12 +++-----
 .../modules/heart/actinfo-detail-view.vue     | 28 +++----------------
 2 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/src/views/modules/heart/actinfo-add-or-update.vue b/src/views/modules/heart/actinfo-add-or-update.vue
index 95839d7..bda5a07 100644
--- a/src/views/modules/heart/actinfo-add-or-update.vue
+++ b/src/views/modules/heart/actinfo-add-or-update.vue
@@ -70,8 +70,7 @@
             <template>
               <el-radio v-model="dataForm.actQuotaCategory"
                         label="1">固定名额</el-radio>&emsp;&emsp;
-              <el-input-number v-enter-number
-                               type="number"
+              <el-input-number type="number"
                                :min="1"
                                v-model="dataForm.actQuota"
                                placeholder="固定名额"
@@ -176,8 +175,7 @@
           <el-form-item label="打卡范围："
                         prop="clockRadius">
             <div>
-              <el-input-number v-enter-number
-                               type="number"
+              <el-input-number type="number"
                                :min="0"
                                :max="5000"
                                v-model="dataForm.clockRadius"
@@ -222,8 +220,7 @@
         <el-row>
           <el-form-item label="奖励积分："
                         prop="reward">
-            <el-input-number v-enter-number
-                             type="number"
+            <el-input-number type="number"
                              :min="0"
                              v-model="dataForm.reward"
                              clearable
@@ -234,8 +231,7 @@
         <el-row>
           <el-form-item label="惩罚积分："
                         prop="punishmentPoints">
-            <el-input-number v-enter-number
-                             type="number"
+            <el-input-number type="number"
                              :min="0"
                              v-model="dataForm.punishmentPoints"
                              clearable
diff --git a/src/views/modules/heart/actinfo-detail-view.vue b/src/views/modules/heart/actinfo-detail-view.vue
index 98b9917..01f51a3 100644
--- a/src/views/modules/heart/actinfo-detail-view.vue
+++ b/src/views/modules/heart/actinfo-detail-view.vue
@@ -46,10 +46,10 @@
             </div>
             <div>
               <el-radio v-model="dataForm.actUserDefaultState"
-                        disabled="true"
+                        :disabled="true"
                         label="1">通过</el-radio>
               <el-radio v-model="dataForm.actUserDefaultState"
-                        disabled="true"
+                        :disabled="true"
                         label="4">不通过</el-radio>
             </div>
           </el-form-item>
@@ -134,27 +134,6 @@
             <p v-html="dataForm.actContent"></p>
           </el-form-item>
         </el-row>
-        <!--                <el-row>-->
-        <!--                    <el-form-item label="banner展示："-->
-        <!--                                  prop="isBanner">-->
-        <!--                        <template>-->
-        <!--                            <el-radio v-model="dataForm.isBanner"-->
-        <!--                                      label="1">是</el-radio>-->
-        <!--                            <el-radio v-model="dataForm.isBanner"-->
-        <!--                                      label="0">否</el-radio>-->
-        <!--                        </template>-->
-        <!--                    </el-form-item>-->
-        <!--                </el-row>-->
-        <el-row>
-          <el-form-item label=" "
-                        v-loading="loading"
-                        prop="bannerUrl">
-            <img v-if="dataForm.bannerUrl"
-                 :src="dataForm.bannerUrl"
-                 class="avatar">
-          </el-form-item>
-        </el-row>
-
         <el-row>
           <el-form-item label-width="500px">
             <el-button size="small"
@@ -210,7 +189,8 @@ export default {
         punishmentPoints: '',
         actUserDefaultState: '1',
         reward: ''
-      }
+      },
+      loading: false
     }
   },
   mounted () {

From 04f4b6baee962b93339cabf2f97f57c59cd86986 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Thu, 28 May 2020 10:47:33 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E5=B8=B8=E7=94=A8=E8=AF=AD=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/heart/actphrase.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/views/modules/heart/actphrase.vue b/src/views/modules/heart/actphrase.vue
index 3ccefae..46ecb57 100644
--- a/src/views/modules/heart/actphrase.vue
+++ b/src/views/modules/heart/actphrase.vue
@@ -5,9 +5,6 @@
       <el-form :inline="true"
                :model="dataForm"
                @keyup.enter.native="getDataList()">
-        <!--<el-form-item  label="ID" prop="id">
-          <el-input v-model="dataForm.id" placeholder="ID" clearable></el-input>
-        </el-form-item>-->
         <el-form-item label="常用语:"
                       prop="phrase">
           <el-input v-model="dataForm.phrase"
@@ -24,7 +21,7 @@
                       prop="showFlag">
           <el-select v-model="dataForm.showFlag"
                      placeholder="是否显示"
-                     clearable=true>
+                     clearable>
             <el-option v-for="item in showFlagArr"
                        :key="item.dictValue"
                        :label="item.dictName"

From 2ba2966d54a0957a5f734a5d97e4cea70bf41145 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Thu, 28 May 2020 10:50:45 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E5=B8=B8=E7=94=A8=E8=AF=AD=20=E6=96=87?=
 =?UTF-8?q?=E5=AD=97=E6=BA=A2=E5=87=BA=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/heart/actphrase.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/heart/actphrase.vue b/src/views/modules/heart/actphrase.vue
index 46ecb57..c92841f 100644
--- a/src/views/modules/heart/actphrase.vue
+++ b/src/views/modules/heart/actphrase.vue
@@ -51,7 +51,7 @@
                          align="center"
                          width="50"></el-table-column>
         <el-table-column prop="phrase"
-                         label="常用语"
+                         label="常用语" show-overflow-tooltip
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="code"

From 911c15b9ddc8a5cf6f7897eb783bb0fdd37d657a Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Thu, 28 May 2020 11:13:12 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=95=B4=E6=B4=81?=
 =?UTF-8?q?=E5=BA=A6=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../case/typicalcase-add-or-update.vue        | 268 +++++++++---------
 src/views/modules/case/typicalcase-detail.vue |  16 +-
 src/views/modules/heart/actbanner.vue         |   2 +-
 src/views/modules/heart/actinfo-list.vue      |   2 +-
 src/views/modules/heart/address-check.vue     |   4 +-
 5 files changed, 141 insertions(+), 151 deletions(-)

diff --git a/src/views/modules/case/typicalcase-add-or-update.vue b/src/views/modules/case/typicalcase-add-or-update.vue
index 6a59bc7..fcd7d3a 100644
--- a/src/views/modules/case/typicalcase-add-or-update.vue
+++ b/src/views/modules/case/typicalcase-add-or-update.vue
@@ -124,11 +124,6 @@ export default {
       // 富文本
       this.hideUpload = false
       this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
-      // if (this.quillEditor) {
-      //   this.quillEditor.deleteText(0, this.quillEditor.getLength())
-      // } else {
-      //   this.quillEditorHandle()
-      // }
       // 富文本end
     })
   },
@@ -145,36 +140,36 @@ export default {
       loading: false,
       isAble: false,
       editorOption: {
-          placeholder: 'Please enter it here...',
-          modules:{
-              toolbar:{
-                  container: [
-                      ['bold', 'italic', 'underline', 'strike'],// 加粗，斜体，下划线，删除线
-                      ['blockquote'],// 引用
-                      [{ 'header': 1 }, { 'header': 2 }],// 标题，键值对的形式；1、2表示字体大小
-                      [{ 'list': 'ordered'}, { 'list': 'bullet' }],//列表
-                      [{ 'indent': '-1'}, { 'indent': '+1' }],// 缩进
-                      [{ 'direction': 'rtl' }],// 文本方向
-                      [{ 'size': ['small', false, 'large', 'huge'] }],// 字体大小
-                      [{ 'header': [1, 2, 3, 4, 5, 6, false] }],//几级标题
-                      [{ 'color': [] }, { 'background': [] }],// 字体颜色，字体背景颜色
-                      [{ 'font': [] }],//字体
-                      [{ 'align': [] }],//对齐方式
-                      ['clean'],//清除字体样式
-                      ['image']//上传图片、上传视频
-                  ],
-                  handlers: {
-                      'image': function (value) {
-                          if (value) {
-                              // 给个点击触发Element-ui，input框选择图片文件
-                              document.querySelector('#quill-upload input').click()
-                          } else {
-                              this.quill.format('image', false);
-                          }
-                      }
-                  }
+        placeholder: 'Please enter it here...',
+        modules: {
+          toolbar: {
+            container: [
+              ['bold', 'italic', 'underline', 'strike'], // 加粗，斜体，下划线，删除线
+              ['blockquote'], // 引用
+              [{ 'header': 1 }, { 'header': 2 }], // 标题，键值对的形式；1、2表示字体大小
+              [{ 'list': 'ordered' }, { 'list': 'bullet' }], // 列表
+              [{ 'indent': '-1' }, { 'indent': '+1' }], // 缩进
+              [{ 'direction': 'rtl' }], // 文本方向
+              [{ 'size': ['small', false, 'large', 'huge'] }], // 字体大小
+              [{ 'header': [1, 2, 3, 4, 5, 6, false] }], // 几级标题
+              [{ 'color': [] }, { 'background': [] }], // 字体颜色，字体背景颜色
+              [{ 'font': [] }], // 字体
+              [{ 'align': [] }], // 对齐方式
+              ['clean'], // 清除字体样式
+              ['image'] // 上传图片、上传视频
+            ],
+            handlers: {
+              'image': function (value) {
+                if (value) {
+                  // 给个点击触发Element-ui，input框选择图片文件
+                  document.querySelector('#quill-upload input').click()
+                } else {
+                  this.quill.format('image', false)
+                }
               }
+            }
           }
+        }
       },
       uploadUrl: '',
       dataForm: {
@@ -186,7 +181,7 @@ export default {
         typicalAbstract: '',
         dynamicItem: []
       },
-        imgIndex: 0,
+      imgIndex: 0,
       requiredFlag: false
     }
   },
@@ -206,95 +201,92 @@ export default {
         typicalAbstract: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-          associatedId: [
-            { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        associatedId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
     }
   },
   methods: {
-    onEditorFocus(index) {
-        this.imgIndex = index
+    onEditorFocus (index) {
+      this.imgIndex = index
     },
     handleChange (file) {
       this.beforeAvatarUpload(file)
     },
     back () {
-        this.$parent.selectComponent = 'CaseInfoList'
-        this.$router.push({ path: '/case-typicalcase'})
+      this.$parent.selectComponent = 'CaseInfoList'
+      this.$router.push({ path: '/case-typicalcase' })
     },
     connectResponse (connectResponse) {
-        // 部门名称
-        this.dataForm.dynamicItem[connectResponse.caseIndex].caseSource = connectResponse.allDeptNames
-        // 案例类别
-        this.dataForm.dynamicItem[connectResponse.caseIndex].associatedType = connectResponse.associatedType
-        // 内容描述
-        if (connectResponse.associatedType == 0) {
-            this.dataForm.dynamicItem[connectResponse.caseIndex].contentDescription = connectResponse.issueContent
-        } else if (connectResponse.associatedType == 1) {
-            this.dataForm.dynamicItem[connectResponse.caseIndex].contentDescription = connectResponse.itemContent
-        } else if (connectResponse.associatedType == 2) {
-            this.dataForm.dynamicItem[connectResponse.caseIndex].contentDescription = connectResponse.topicContent
-        }
-        // 类别
-        this.dataForm.dynamicItem[connectResponse.caseIndex].category = connectResponse.categoryName
-        // 案例ID
-        this.dataForm.dynamicItem[connectResponse.caseIndex].associatedId = connectResponse.id
-        // 网格Id
-        this.dataForm.dynamicItem[connectResponse.caseIndex].sourceGridId = connectResponse.gridId
-        //发布人姓名
-        if (connectResponse.associatedType == 0) {
-            this.dataForm.dynamicItem[connectResponse.caseIndex].publisherName = connectResponse.nickName
-        } else if (connectResponse.associatedType == 1) {
-            this.dataForm.dynamicItem[connectResponse.caseIndex].publisherName = connectResponse.nickName
-        } else if (connectResponse.associatedType == 2) {
-            this.dataForm.dynamicItem[connectResponse.caseIndex].publisherName = connectResponse.nickname
-        }
-        // 头像
-        this.dataForm.dynamicItem[connectResponse.caseIndex].publisherHeader = connectResponse.userFace
-        // 内容
-        if (connectResponse.associatedType == 0) {
-            this.dataForm.dynamicItem[connectResponse.caseIndex].content = connectResponse.issueContent
-        } else if (connectResponse.associatedType == 1) {
-            this.dataForm.dynamicItem[connectResponse.caseIndex].content = connectResponse.itemContent
-        } else if (connectResponse.associatedType == 2) {
-            this.dataForm.dynamicItem[connectResponse.caseIndex].content = connectResponse.topicContent
-        }
-        if (connectResponse.associatedType == 0) {
-            this.dataForm.dynamicItem[connectResponse.caseIndex].releaseTime = connectResponse.distributeTime
-        } else if (connectResponse.associatedType == 1) {
-            this.dataForm.dynamicItem[connectResponse.caseIndex].releaseTime = connectResponse.distributeTime
-        } else if (connectResponse.associatedType == 2) {
-            this.dataForm.dynamicItem[connectResponse.caseIndex].releaseTime = connectResponse.createdTime
-        }
-        this.dataForm.dynamicItem[connectResponse.caseIndex].expressingAttitude = connectResponse.participantsNum
-
-        this.requiredFlag = true
+      // 部门名称
+      this.dataForm.dynamicItem[connectResponse.caseIndex].caseSource = connectResponse.allDeptNames
+      // 案例类别
+      this.dataForm.dynamicItem[connectResponse.caseIndex].associatedType = connectResponse.associatedType
+      // 内容描述
+      if (connectResponse.associatedType == 0) {
+        this.dataForm.dynamicItem[connectResponse.caseIndex].contentDescription = connectResponse.issueContent
+      } else if (connectResponse.associatedType == 1) {
+        this.dataForm.dynamicItem[connectResponse.caseIndex].contentDescription = connectResponse.itemContent
+      } else if (connectResponse.associatedType == 2) {
+        this.dataForm.dynamicItem[connectResponse.caseIndex].contentDescription = connectResponse.topicContent
+      }
+      // 类别
+      this.dataForm.dynamicItem[connectResponse.caseIndex].category = connectResponse.categoryName
+      // 案例ID
+      this.dataForm.dynamicItem[connectResponse.caseIndex].associatedId = connectResponse.id
+      // 网格Id
+      this.dataForm.dynamicItem[connectResponse.caseIndex].sourceGridId = connectResponse.gridId
+      // 发布人姓名
+      if (connectResponse.associatedType == 0) {
+        this.dataForm.dynamicItem[connectResponse.caseIndex].publisherName = connectResponse.nickName
+      } else if (connectResponse.associatedType == 1) {
+        this.dataForm.dynamicItem[connectResponse.caseIndex].publisherName = connectResponse.nickName
+      } else if (connectResponse.associatedType == 2) {
+        this.dataForm.dynamicItem[connectResponse.caseIndex].publisherName = connectResponse.nickname
+      }
+      // 头像
+      this.dataForm.dynamicItem[connectResponse.caseIndex].publisherHeader = connectResponse.userFace
+      // 内容
+      if (connectResponse.associatedType == 0) {
+        this.dataForm.dynamicItem[connectResponse.caseIndex].content = connectResponse.issueContent
+      } else if (connectResponse.associatedType == 1) {
+        this.dataForm.dynamicItem[connectResponse.caseIndex].content = connectResponse.itemContent
+      } else if (connectResponse.associatedType == 2) {
+        this.dataForm.dynamicItem[connectResponse.caseIndex].content = connectResponse.topicContent
+      }
+      if (connectResponse.associatedType == 0) {
+        this.dataForm.dynamicItem[connectResponse.caseIndex].releaseTime = connectResponse.distributeTime
+      } else if (connectResponse.associatedType == 1) {
+        this.dataForm.dynamicItem[connectResponse.caseIndex].releaseTime = connectResponse.distributeTime
+      } else if (connectResponse.associatedType == 2) {
+        this.dataForm.dynamicItem[connectResponse.caseIndex].releaseTime = connectResponse.createdTime
+      }
+      this.dataForm.dynamicItem[connectResponse.caseIndex].expressingAttitude = connectResponse.participantsNum
+      this.requiredFlag = true
     },
-    addConnect(index){
-        this.connectListVisible = true
-        this.$nextTick(() => {
-            this.$refs.connectList.init(index)
-        })
+    addConnect (index) {
+      this.connectListVisible = true
+      this.$nextTick(() => {
+        this.$refs.connectList.init(index)
+      })
     },
     // 动态添加
     addItem () {
       this.dataForm.dynamicItem.push({
-          caseSource: '',
-          associatedType: '',
-          contentDescription: '',
-          category: '',
-          associatedId: '',
-          sourceGridId: '',
-          publisherName: '',
-          publisherHeader: '',
-          releaseTime: '',
-          content: '',
-          expressingAttitude: ''
-
+        caseSource: '',
+        associatedType: '',
+        contentDescription: '',
+        category: '',
+        associatedId: '',
+        sourceGridId: '',
+        publisherName: '',
+        publisherHeader: '',
+        releaseTime: '',
+        content: '',
+        expressingAttitude: ''
       })
     },
-
     // 富文本编辑器
     quillEditorHandle () {
       this.quillEditor = new Quill('#J_quillEditor', {
@@ -323,11 +315,9 @@ export default {
         return false
       }
     },
-
     // 上传图片成功 (富文本)
     uploadSuccessHandle (res) {
-      let quill = this.$refs.myQuillEditor[this.imgIndex].quill;
-        console.log(quill)
+      let quill = this.$refs.myQuillEditor[this.imgIndex].quill
       if (res.code !== 0) {
         return this.$message.error(res.msg)
       }
@@ -340,22 +330,22 @@ export default {
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
-            this.getInfo()
+          this.getInfo()
         }
       })
     },
     // 获取信息
     getInfo () {
-        this.$http.get(`/cloudAnalysis/typicalcase/${this.dataForm.id}`).then(({ data: res }) => {
-            if (res.code !== 0) {
-                return this.$message.error(res.msg)
-            }
-            this.dataForm = {
-                ...this.dataForm,
-                ...res.data
-            }
-        }).catch(() => {})
-        this.requiredFlag = true
+      this.$http.get(`/cloudAnalysis/typicalcase/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+      this.requiredFlag = true
     },
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
@@ -363,19 +353,19 @@ export default {
         if (!valid) {
           return false
         }
-        if(!this.requiredFlag){
-            alert("请关联案例！")
-            return false
+        if (!this.requiredFlag) {
+          alert('请关联案例!')
+          return false
         }
-          for(let item of this.dataForm.dynamicItem) {
-              if(item.associatedId != '') {
-                  this.dataForm.caseNumber = this.dataForm.caseNumber + 1
-              }
+        for (let item of this.dataForm.dynamicItem) {
+          if (item.associatedId != '') {
+            this.dataForm.caseNumber = this.dataForm.caseNumber + 1
           }
-        this.isAble = true;
+        }
+        this.isAble = true
         this.$http[!this.dataForm.id ? 'post' : 'put']('/cloudAnalysis/typicalcase', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
-            this.isAble = false;
+            this.isAble = false
             return this.$message.error(res.msg)
           }
           this.$message({
@@ -383,23 +373,23 @@ export default {
             type: 'success',
             duration: 500,
             onClose: () => {
-                this.isAble = false;
-                this.back()
+              this.isAble = false
+              this.back()
             }
           })
         }).catch(() => {})
       })
     }, 1000, { 'leading': true, 'trailing': false }),
-      handleAvatarActSuccess (res, file) {
-          this.loading = false
-          this.dataForm.mainPicture = res.data.url
-      },
-      beforeAvatarUpload (file) {
-          this.loading = true
-      },
-      handelError () {
-          this.loading = false
-      },
+    handleAvatarActSuccess (res, file) {
+      this.loading = false
+      this.dataForm.mainPicture = res.data.url
+    },
+    beforeAvatarUpload (file) {
+      this.loading = true
+    },
+    handelError () {
+      this.loading = false
+    }
   }
 }
 </script>
diff --git a/src/views/modules/case/typicalcase-detail.vue b/src/views/modules/case/typicalcase-detail.vue
index ef82b1b..4ede1f9 100644
--- a/src/views/modules/case/typicalcase-detail.vue
+++ b/src/views/modules/case/typicalcase-detail.vue
@@ -77,18 +77,18 @@ export default {
         getDataListURL: '/cloudAnalysis/typicalcase/detail' + '/' + this.$route.query.id
       },
       dataForm: {
-          id: '',
-          caseTitle: '',
-          caseNumber: 0,
-          mainPicture: '',
-          typicalAbstract: '',
-          dynamicItem: []
+        id: '',
+        caseTitle: '',
+        caseNumber: 0,
+        mainPicture: '',
+        typicalAbstract: '',
+        dynamicItem: []
       }
     }
   },
   mounted () {
-      this.dataForm.id = this.$route.query.id
-      this.init()
+    this.dataForm.id = this.$route.query.id
+    this.init()
   },
   methods: {
     back () {
diff --git a/src/views/modules/heart/actbanner.vue b/src/views/modules/heart/actbanner.vue
index 3ca3b47..3a59bc0 100644
--- a/src/views/modules/heart/actbanner.vue
+++ b/src/views/modules/heart/actbanner.vue
@@ -63,7 +63,7 @@
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './actbanner-add-or-update'
-import {debounce} from 'lodash'
+import { debounce } from 'lodash'
 export default {
   mixins: [mixinViewModule],
   data () {
diff --git a/src/views/modules/heart/actinfo-list.vue b/src/views/modules/heart/actinfo-list.vue
index 378aca3..b37284a 100644
--- a/src/views/modules/heart/actinfo-list.vue
+++ b/src/views/modules/heart/actinfo-list.vue
@@ -144,7 +144,7 @@ export default {
     addAction () {
       this.$parent.selectComponent = 'ActInfoAdd'
       this.$router.push(
-        { path: '/heart-actinfo'}
+        { path: '/heart-actinfo' }
       )
     },
     joinManage (id) {
diff --git a/src/views/modules/heart/address-check.vue b/src/views/modules/heart/address-check.vue
index 15f31d2..a331cd4 100644
--- a/src/views/modules/heart/address-check.vue
+++ b/src/views/modules/heart/address-check.vue
@@ -30,8 +30,8 @@ export default {
       visible: false,
       dataForm: {
         address: '',
-        longitude: 0,//经度
-        latitude: 0,//纬度
+        longitude: 0, // 经度
+        latitude: 0, // 纬度
         city: ''
       }
     }