feats

src/api/gallery.js

@@ -25,3 +25,10 @@ export function saveGallery(data) {
   }))
 }
 
+export function deleteGallery(id) {
+  return pureResponseData(request({
+    url: `/api/admin/gallery/${id}`,
+    method: 'delete'
+  }))
+}
+

src/api/recommender.js

@@ -8,3 +8,11 @@ export function getRecommenderList(params) {
     params
   }))
 }
+
+export function updateRecommender(data) {
+  return pureResponseData(request({
+    url: `/api/admin/recommender/${data.serialNo}`,
+    method: 'put',
+    data
+  }))
+}

src/components/UploadImg/index.vue

@@ -9,6 +9,7 @@
   >
     <img v-if="value" :src="value" class="uploader-preview">
     <i v-else class="el-icon-plus avatar-uploader-icon" />
+    <div class="uploader-tip">{{tip}}</div>
   </el-upload>
 </template>
 
@@ -21,6 +22,10 @@ export default {
     value: {
       type: String,
       default: undefined
+    },
+    tip: {
+      type: String,
+      default: undefined
     }
   },
 
@@ -56,12 +61,12 @@ export default {
 
 <style lang="scss">
 .img-uploader {
+  position: relative;
+
   .el-upload {
     border: 1px dashed #d9d9d9;
     border-radius: 6px;
     cursor: pointer;
-    position: relative;
-    overflow: hidden;
 
     &:hover {
       border-color: #409EFF;
@@ -76,6 +81,13 @@ export default {
       text-align: center;
     }
   }
+
+  .uploader-tip {
+    position: absolute;
+    left: 200px;
+    top: 40%;
+    color: #999;
+  }
 }
 
 .uploader-preview {

src/views/activity/Detail.vue

@@ -6,6 +6,7 @@
           <activity
             :type-id="typeId"
             :dataset="detail"
+            :tip="tip"
             @submit="handleSubmit"
             @cancel="handleCancel"
             @voteChange="handelVoteChange"
@@ -44,6 +45,10 @@ export default {
     typeId: {
       type: Number,
       default: 0
+    },
+    tip: {
+      type: String,
+      default: undefined
     }
   },
 

src/views/activity/components/Detail.vue

@@ -13,7 +13,7 @@
       />
     </el-form-item>
     <el-form-item label="活动封面" prop="thumb">
-      <uploadimg v-model="form.thumb" />
+      <uploadimg v-model="form.thumb" :tip="tip" />
     </el-form-item>
     <el-form-item label="活动地点" prop="address">
       <el-input v-model="form.address" />
@@ -95,6 +95,10 @@ export default {
     dataset: {
       type: Object,
       default: undefined
+    },
+    tip: {
+      type: String,
+      default: undefined
     }
   },
 

src/views/activity/components/Gallery.vue

@@ -3,11 +3,14 @@
     <div>
       <el-row v-for="(cols, rowInx) in rows" :key="rowInx" :gutter="20">
         <el-col v-for="(col, colInx) in cols" :key="colInx" :span="6">
-          <el-image
-            :src="col.imgUrl"
-            :preview-src-list="getImgURLList(cols)"
-            style="width: 100%"
-          />
+          <div class="gallery-item">
+            <el-image
+              :src="col.imgUrl"
+              :preview-src-list="getImgURLList(cols)"
+              style="width: 100%"
+            />
+            <el-button class="delete-btn" type="danger" size="small" @click="handleDelete(col)">删除</el-button>
+          </div>
         </el-col>
       </el-row>
     </div>
@@ -21,7 +24,7 @@
 </template>
 
 <script>
-import { getGalleryList } from '@/api/gallery'
+import { getGalleryList, deleteGallery } from '@/api/gallery'
 
 export default {
   props: {
@@ -91,7 +94,35 @@ export default {
 
     getImgURLList(m = []) {
       return m.map(x => x.imgUrl)
+    },
+
+    handleDelete(img) {
+      this.$confirm('是否删除当前图片?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteGallery(img.imgId).then(res => {
+          this.list = this.list.filter(x => x.imgId !== img.imgId)
+          this.$message({ type: 'success', message: '删除成功' })
+        })
+      })
     }
   }
 }
 </script>
+
+<style lang="scss" scoped>
+.gallery-item {
+  .delete-btn {
+    margin: 0 auto;
+    display: none;
+  }
+
+  &:hover {
+    .delete-btn {
+      display: block;
+    }
+  }
+}
+</style>

src/views/advert/Detail.vue

@@ -5,7 +5,7 @@
         <el-input v-model="form.title" />
       </el-form-item>
       <el-form-item label="图片" prop="image">
-        <uploadimg v-model="form.image" />
+        <uploadimg v-model="form.image" tip="建议图片尺寸：786*322px，格式：jpg，用于页面广告位banner" />
       </el-form-item>
       <el-form-item label="投放位置">
         <el-select v-model="form.position" placeholder="请选择" style="width: 100%">
@@ -17,23 +17,25 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="关联活动">
-        <el-select
-          v-model="form.srcId"
-          v-loading="loading.remote"
-          filterable
-          remote
-          placeholder="请输入活动名称"
-          style="width: 100%"
-          :remote-method="fetchRemoteActivity"
-        >
-          <el-option
-            v-for="item in activityList"
-            :key="item.activityId"
-            :label="item.name"
-            :value="item.activityId"
-          />
-        </el-select>
+      <el-form-item label="关联活动名称">
+        <el-tooltip content="请输入关联活动名称" placement="top-start">
+          <el-select
+            v-model="form.srcId"
+            v-loading="loading.remote"
+            filterable
+            remote
+            placeholder="请输入关联活动名称"
+            style="width: 100%"
+            :remote-method="fetchRemoteActivity"
+          >
+            <el-option
+              v-for="item in activityList"
+              :key="item.activityId"
+              :label="item.name"
+              :value="item.activityId"
+            />
+          </el-select>
+        </el-tooltip>
       </el-form-item>
       <el-form-item label="权重" prop="sortNo">
         <el-input-number v-model="form.sortNo" :min="0" />
@@ -118,6 +120,10 @@ export default {
         this.loading.form = true
         getAdvert(this.id).then(res => {
           this.form = res
+          this.activityList = [{
+            activityId: res.srcId,
+            name: res.srcName
+          }]
           this.loading.form = false
         }).catch(err => {
           console.error(err)
@@ -147,6 +153,8 @@ export default {
         if (valid) {
           //
           const data = this.form
+          data.srcName = ((this.activityList || []).filter(x => x.activityId === data.srcId)[0] || {}).name
+
           this.loading.form = true
           if (this.id) {
             updateAdvert(data).then(() => {

src/views/customer/index.vue

@@ -61,7 +61,7 @@ export default {
   filters: {
     sexFormat(sex) {
       if (sex === null || sex === undefined) {
-        return undefined
+        return '未知'
       }
 
       const sexMap = [
@@ -69,12 +69,12 @@ export default {
         '男',
         '女'
       ]
-      return sexMap[sex]
+      return sexMap[sex] || '未知'
     },
 
     sexTagFormat(sex) {
       if (sex === null || sex === undefined) {
-        return undefined
+        return 'info'
       }
 
       const sexMap = [
@@ -82,7 +82,7 @@ export default {
         'success',
         'danger'
       ]
-      return sexMap[sex]
+      return sexMap[sex] || 'info'
     }
   },
 

src/views/life/Warm/Detail.vue

@@ -1,5 +1,5 @@
 <template>
-  <detail :type-id="1" />
+  <detail :type-id="1" tip="建议图片尺寸：710*390px，格式：jpg，用于封面展示" />
 </template>
 
 <script>

src/views/life/school/Detail.vue

@@ -1,5 +1,5 @@
 <template>
-  <detail :type-id="2" />
+  <detail :type-id="2" tip="建议图片尺寸：710*390px，格式：jpg，用于封面展示" />
 </template>
 
 <script>

src/views/life/sport/Detail.vue

@@ -1,5 +1,5 @@
 <template>
-  <detail :type-id="3" />
+  <detail :type-id="3" tip="建议图片尺寸：710*390px，格式：jpg，用于封面展示" />
 </template>
 
 <script>

src/views/life/travel/Detail.vue

@@ -1,5 +1,5 @@
 <template>
-  <detail :type-id="4" />
+  <detail :type-id="4" tip="建议图片尺寸：710*390px，格式：jpg，用于封面展示" />
 </template>
 
 <script>

src/views/life/warm/History.vue

@@ -103,7 +103,12 @@ export default {
       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)
       })
     }
   }

src/views/love/clothes/Detail.vue

@@ -1,5 +1,5 @@
 <template>
-  <detail :type-id="5" />
+  <detail :type-id="5" tip="建议图片尺寸：710*320px，格式：jpg，用于封面展示" />
 </template>
 
 <script>

src/views/love/help/Detail.vue

@@ -1,5 +1,5 @@
 <template>
-  <detail :type-id="6" />
+  <detail :type-id="6" tip="建议图片尺寸：238*168px，格式：jpg，用于封面展示" />
 </template>
 
 <script>

src/views/recommender/components/FilterForm.vue

@@ -18,6 +18,13 @@
     <el-form-item label="推荐人名称">
       <el-input v-model="formData.recName" placeholder="推荐人名称" />
     </el-form-item>
+    <el-form-item label="状态">
+      <el-select v-model="formData.status" placeholder="请选择">
+        <el-option label="未审核" :value="0" />
+        <el-option label="已通过" :value="1" />
+        <el-option label="未通过" :value="1" />
+      </el-select>
+    </el-form-item>
     <el-form-item style="margin-left: 36px">
       <el-button type="primary" @click="handleSubmit">查询</el-button>
       <el-button @click="handleReset">重置</el-button>

src/views/recommender/index.vue

@@ -7,7 +7,7 @@
       </el-tooltip>
     </div>
     <el-table
-      v-loading="listLoading"
+      v-loading="loading.list"
       :data="list"
       element-loading-text="Loading"
       border
@@ -26,16 +26,36 @@
       </el-table-column>
       <el-table-column label="手机" prop="phone" />
       <el-table-column label="名称" prop="name" />
-      <el-table-column label="性别" align="center" width="200">
+      <el-table-column label="性别" align="center">
         <template slot-scope="scope">
           <el-tag
-            :type="scope.row.sex | sexTagFormat"
+            :type="scope.row.sex | tagFormat"
             disable-transitions
           >{{ scope.row.sex | sexFormat }}</el-tag>
         </template>
       </el-table-column>
+      <el-table-column label="备注" width="500">
+        <template slot-scope="scope">
+          <el-tooltip placement="top-start" :content="scope.row.remark">
+            <div>{{scope.row.remark | limitLen}}</div>
+          </el-tooltip>
+        </template>
+      </el-table-column>
       <el-table-column label="推荐人手机" prop="recPhone" />
       <el-table-column label="推荐人名称" prop="recName" />
+      <el-table-column label="审核状态">
+        <template slot-scope="scope">
+          <el-tag
+            :type="scope.row.status | tagFormat"
+            disable-transitions
+          >{{ scope.row.status | statusFormat }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center">
+        <template slot-scope="scope">
+          <el-button :disabled="!!scope.row.status" size="mini" type="primary" plain @click="showDialog(scope.row)">审核</el-button>
+        </template>
+      </el-table-column>
     </el-table>
     <pagination
       :total="page.total"
@@ -43,11 +63,33 @@
       :current.sync="page.current"
       @change="handlePageChange"
     />
+    <el-dialog
+      v-loading="loading.dialog"
+      :visible="dialogVisible"
+      title="状态审核"
+      @close="hideDialog">
+      <el-form label-width="100px">
+        <el-form-item label="姓名">{{current.name}}</el-form-item>
+        <el-form-item label="手机">{{current.phone}}</el-form-item>
+        <el-form-item label="性别">{{current.sex | sexFormat}}</el-form-item>
+        <el-form-item label="备注">{{current.remark}}</el-form-item>
+        <el-form-item label="状态" :required="true">
+          <el-radio-group v-model="current.status">
+            <el-radio :label="1">审核通过</el-radio>
+            <el-radio :label="2">审核不通过</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="handleSubmit">保 存</el-button>
+          <el-button @click="hideDialog">取 消</el-button>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { getRecommenderList } from '@/api/recommender'
+import { getRecommenderList, updateRecommender } from '@/api/recommender'
 
 export default {
   components: {
@@ -65,27 +107,55 @@ export default {
         '男',
         '女'
       ]
-      return sexMap[sex]
+      return sexMap[sex] || '未知'
     },
 
-    sexTagFormat(sex) {
-      if (sex === null || sex === undefined) {
+    statusFormat(status) {
+      if (status === null || status === undefined) {
         return undefined
       }
 
-      const sexMap = [
+      const statusMap = [
+        '未审核',
+        '已通过',
+        '未通过'
+      ]
+      return statusMap[status] || '未审核'
+    },
+
+    tagFormat(tag) {
+      if (tag === null || tag === undefined) {
+        return undefined
+      }
+
+      const tagMap = [
         'info',
         'success',
         'danger'
       ]
-      return sexMap[sex]
+      return tagMap[tag]
+    },
+
+    limitLen(v) {
+      if (!v) return undefined
+
+      const limit = 20
+      const len = v.length
+      if (len < limit) return v
+
+      return v.substr(0, limit) + '...'
     }
   },
 
   data() {
     return {
       list: null,
-      listLoading: true,
+      loading: {
+        list: false,
+        dialog: false
+      },
+      dialogVisible: false,
+      current: {},
       page: {
         total: 0,
         size: 10,
@@ -102,7 +172,7 @@ export default {
   },
   methods: {
     fetchData() {
-      this.listLoading = true
+      this.loading.list = true
       getRecommenderList({
         ...this.filters,
         pageNum: this.page.current,
@@ -110,7 +180,7 @@ export default {
       }).then(res => {
         this.list = res.records
         this.page.total = res.total
-        this.listLoading = false
+        this.loading.list = false
       })
     },
 
@@ -130,6 +200,42 @@ export default {
       }
 
       this.fetchData()
+    },
+
+    showDialog(row) {
+      this.current = { ...row }
+      this.dialogVisible = true
+    },
+
+    hideDialog() {
+      this.current = {}
+      this.dialogVisible = false
+    },
+
+    handleSubmit() {
+      if (this.current.status !== 1 && this.current.status !== 2) {
+        this.$message({ type: 'warning', message: '请选择审核结果' })
+        return
+      }
+
+      // 依据 serialNo 字段更新 status
+      const data = { serialNo: this.current.serialNo, status: this.current.status }
+      this.loading.dialog = true
+      updateRecommender(data).then((res) => {
+        this.loading.dialog = false
+        this.hideDialog()
+        this.list = this.list.map(x => {
+          if (x.serialNo === res.serialNo) {
+            return {
+              ...x,
+              ...res
+            }
+          }
+
+          return x
+        })
+        this.$message({ type: 'success', message: '审核信息成功' })
+      })
     }
   }
 }