feats

src/api/recommender.js

@@ -9,6 +9,15 @@ export function getRecommenderList(params) {
   }))
 }
 
+export function exportRecommenderList(params) {
+  return request({
+    url: `/api/admin/recommender/export`,
+    method: 'get',
+    responseType: 'blob',
+    params
+  })
+}
+
 export function updateRecommender(data) {
   return pureResponseData(request({
     url: `/api/admin/recommender/${data.serialNo}`,

src/components/MultiUploadImg/index.vue

@@ -0,0 +1,78 @@
+<template>
+  <div>
+    <el-upload
+      v-loading="loading"
+      v-bind="uploadOption"
+      list-type="picture-card"
+      :before-upload="beforeUpload"
+      :on-success="handleUploadSuccess"
+      :on-remove="handleRemove">
+      <i class="el-icon-plus"></i>
+    </el-upload>
+    <el-dialog :visible.sync="dialogVisible">
+      <img width="100%" :src="dialogImageUrl" alt="">
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { Message } from 'element-ui'
+import uploadOption from '@/utils/uploadOption'
+
+export default {
+  props: {
+    value: {
+      type: Array,
+      default: () => []
+    },
+    tip: {
+      type: String,
+      default: undefined
+    }
+  },
+
+  data() {
+    return {
+      loading: false,
+      dialogVisible: false,
+      dialogImageUrl: undefined,
+      uploadOption
+    }
+  },
+
+  methods: {
+    handleUploadSuccess(res, file) {
+      this.loading = false
+      if (res.code !== 1000) {
+        Message({
+          message: res.message || 'Error',
+          type: 'error',
+          duration: 5 * 1000
+        })
+      } else {
+        this.trigChange(this.value.concat(res.data.url))
+      }
+    },
+
+    handleRemove(file, fileList) {
+      this.trigChange(this.value.filter(x => x !== file.url))
+    },
+
+    trigChange(val) {
+      this.$emit('input', val)
+      this.$emit('change', val)
+    },
+
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
+
+    beforeUpload() {
+      // TODO
+      this.loading = true
+      return true
+    }
+  }
+}
+</script>

src/utils/request.js

@@ -41,6 +41,19 @@ service.interceptors.response.use(
    * You can also judge the status by HTTP Status Code
    */
   response => {
+    const contentType = response.headers['Content-Type'] || response.headers['content-type'] || ''
+    if (contentType.indexOf('application/vnd.ms-excel') > -1) {
+      const contentDisposition = response.headers['content-disposition'] || ''
+      const fileName = decodeURI(contentDisposition.replace(/.*filename\=(.*)/, '$1'))
+      const url = window.URL.createObjectURL(new Blob([response.data]))
+      const download = document.createElement('a')
+      download.setAttribute('href', url)
+      debugger
+      download.setAttribute('download', decodeURIComponent(fileName))
+      download.click()
+      return
+    }
+
     const res = response.data
 
     const token = response.headers['x-authorization-jwt']

src/views/activity/components/Gallery.vue

@@ -53,7 +53,7 @@ export default {
       let tmp = []
       for (let i = 0; i < this.list.length; i++) {
         const inx = Math.floor(i % colNum)
-        tmp[inx] = this.list[inx]
+        tmp[inx] = this.list[i]
 
         if (inx === colNum - 1) {
           rtn.push(tmp)
@@ -117,6 +117,7 @@ export default {
   .delete-btn {
     margin: 0 auto;
     display: none;
+    margin-bottom: 1em;
   }
 
   &:hover {

src/views/life/warm/History.vue

@@ -28,8 +28,8 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="图片" prop="imgUrl">
-          <uploadimg v-model="formData.imgUrl" />
+        <el-form-item label="图片" prop="imgUrls" required>
+          <uploadimg v-model="formData.imgUrls" />
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="handleSubmit">保 存</el-button>
@@ -46,7 +46,7 @@ import { getGalleryType, saveGallery } from '@/api/gallery'
 export default {
   components: {
     gallery: () => import('@/views/activity/components/Gallery'),
-    uploadimg: () => import('@/components/UploadImg')
+    uploadimg: () => import('@/components/MultiUploadImg')
   },
 
   data() {
@@ -57,15 +57,27 @@ export default {
         dialog: false
       },
       formData: {
-        imgUrl: undefined,
+        imgUrls: [],
         typeId: undefined
       },
       rules: {
         typeId: [
           { required: true, message: '请选择标签', trigger: 'change' }
         ],
-        imgUrl: [
-          { required: true, message: '请选择图片', trigger: 'change' }
+        imgUrls: [
+          {
+            trigger: 'input',
+            validator: (rule, value, callback) => {
+              if (!value || !value.length) {
+                const err = new Error('请上传图片')
+                callback(err)
+                return err
+              } else {
+                callback()
+                return true
+              }
+            }
+          }
         ]
       }
     }
@@ -100,15 +112,25 @@ export default {
     },
 
     handleSubmit() {
-      this.loading.dialog = true
-      saveGallery(this.formData).then(() => {
-        this.loading.dialog = false
-        this.showDialog = false
-        this.$message({ type: 'success', message: '新增图片成功' })
-        const t = setTimeout(() => {
-          window.location.reload()
-          clearTimeout(t)
-        }, 800)
+      this.$refs.galleryForm.validate((valid) => {
+        if (!valid) return
+
+        this.loading.dialog = true
+
+        const promiseList = (this.formData.imgUrls || []).map(x => saveGallery({
+          imgUrl: x,
+          typeId: this.formData.typeId
+        }))
+
+        Promise.all(promiseList).then(() => {
+          this.loading.dialog = false
+          this.showDialog = false
+          this.$message({ type: 'success', message: '新增图片成功' })
+          const t = setTimeout(() => {
+            window.location.reload()
+            clearTimeout(t)
+          }, 800)
+        })
       })
     }
   }

src/views/recommender/index.vue

@@ -89,7 +89,7 @@
 </template>
 
 <script>
-import { getRecommenderList, updateRecommender } from '@/api/recommender'
+import { getRecommenderList, updateRecommender, exportRecommenderList } from '@/api/recommender'
 
 export default {
   components: {
@@ -184,7 +184,9 @@ export default {
       })
     },
 
-    handleExport() {},
+    handleExport() {
+      exportRecommenderList(this.filters)
+    },
 
     handlePageChange({ current, size }) {
       this.page.current = current