feats

src/api/advert.js

@@ -31,3 +31,10 @@ export function saveAdvert(data) {
     data
   }))
 }
+
+export function deleteAdvert(id) {
+  return pureResponseData(request({
+    url: `/api/admin/advert/${id}`,
+    method: 'delete'
+  }))
+}

src/components/MultiUploadImg/index.vue

@@ -6,8 +6,9 @@
       list-type="picture-card"
       :before-upload="beforeUpload"
       :on-success="handleUploadSuccess"
-      :on-remove="handleRemove">
-      <i class="el-icon-plus"></i>
+      :on-remove="handleRemove"
+    >
+      <i class="el-icon-plus" />
     </el-upload>
     <el-dialog :visible.sync="dialogVisible">
       <img width="100%" :src="dialogImageUrl" alt="">

src/components/UploadImg/index.vue

@@ -9,7 +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>
+    <div class="uploader-tip">{{ tip }}</div>
   </el-upload>
 </template>
 

src/views/activity/components/Detail.vue

@@ -22,7 +22,7 @@
       <el-form-item label="允许报名" prop="isEnroll">
         <el-switch v-model="form.isEnroll" />
       </el-form-item>
-      <el-form-item v-if="form.isEnroll" label="报名时间">
+      <!-- <el-form-item v-if="form.isEnroll" label="报名时间">
         <el-date-picker
           v-model="dtRange2"
           type="daterange"
@@ -30,6 +30,9 @@
           end-placeholder="结束日期"
           style="width: 100%;"
         />
+      </el-form-item> -->
+      <el-form-item v-if="form.isEnroll" label="最大报名人数" prop="enrollMax">
+        <el-input-number v-model="form.enrollMax" :min="1"></el-input-number>
       </el-form-item>
       <el-form-item v-if="form.isEnroll" label="当前报名">
         <el-input v-model="form.enrollNum">
@@ -44,7 +47,7 @@
       <el-form-item label="参与投票" prop="isVote">
         <el-switch v-model="form.isVote" />
       </el-form-item>
-      <el-form-item v-if="form.isVote" label="投票时间">
+      <!-- <el-form-item v-if="form.isVote" label="投票时间">
         <el-date-picker
           v-model="dtRange3"
           type="daterange"
@@ -52,7 +55,7 @@
           end-placeholder="结束日期"
           style="width: 100%;"
         />
-      </el-form-item>
+      </el-form-item> -->
     </template>
     <el-form-item label="首页推荐" prop="toIndex">
       <el-switch v-model="form.toIndex" />
@@ -224,7 +227,8 @@ export default {
           const data = {
             ...this.form,
             typeId: this.typeId,
-            isWarm: this.isWarm
+            isWarm: this.isWarm,
+            enrollMax: this.form.enrollMax || 0
           }
 
           const [dt1, dt2] = transferBeginEndDay(data.startDate, data.endDate)

src/views/advert/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
@@ -35,9 +35,18 @@
           {{ scope.row.createDate | toDayMini }}
         </template>
       </el-table-column>
+      <el-table-column label="状态" align="center" width="200">
+        <template slot-scope="scope">
+          <el-tag
+            :type="scope.row.status | statusTagFormat"
+            disable-transitions
+          >{{ scope.row.status | statusFormat }}</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" width="200">
         <template slot-scope="scope">
           <el-button size="mini" type="primary" plain @click="handleEdit(scope.row)">编辑</el-button>
+          <el-button size="mini" type="danger" plain @click="handleDelete(scope.row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -52,17 +61,44 @@
 
 <script>
 import { getSysModules } from '@/api/comm'
-import { getAdvertList } from '@/api/advert'
+import { getAdvertList, deleteAdvert } from '@/api/advert'
 
 export default {
   components: {
     FilterForm: () => import('./components/FilterForm')
   },
+  filters: {
+    statusFormat(status) {
+      if (status === null || status === undefined) {
+        return undefined
+      }
+
+      const statusMap = [
+        '未发布',
+        '已发布'
+      ]
+      return statusMap[status]
+    },
+
+    statusTagFormat(status) {
+      if (status === null || status === undefined) {
+        return undefined
+      }
+
+      const statusMap = [
+        'warning',
+        'success'
+      ]
+      return statusMap[status]
+    }
+  },
 
   data() {
     return {
       list: null,
-      listLoading: true,
+      loading: {
+        list: false
+      },
       sysModules: [],
       page: {
         total: 0,
@@ -87,7 +123,7 @@ export default {
     },
 
     fetchData() {
-      this.listLoading = true
+      this.loading.list = true
       getAdvertList({
         ...this.filters,
         pageNum: this.page.current,
@@ -95,7 +131,7 @@ export default {
       }).then(res => {
         this.list = res.records
         this.page.total = res.total
-        this.listLoading = false
+        this.loading.list = false
       })
     },
 
@@ -118,6 +154,16 @@ export default {
       })
     },
 
+    handleDelete(row) {
+      this.$confirm('确认删除当前记录?', { type: 'warning' }).then(() => {
+        this.loading.list = true
+        deleteAdvert(row.advId).then(() => {
+          this.list = this.list.filter(x => x.advId !== row.advId)
+          this.loading.list = false
+        })
+      })
+    },
+
     handlePageChange({ current, size }) {
       this.page.current = current
       this.page.size = size

src/views/customer/index.vue

@@ -25,7 +25,6 @@
         </template>
       </el-table-column>
       <el-table-column label="手机" prop="phone" />
-      <el-table-column label="名称" prop="name" />
       <el-table-column label="昵称" prop="nickname" />
       <el-table-column label="性别" align="center" width="200">
         <template slot-scope="scope">

src/views/recommender/index.vue

@@ -37,7 +37,7 @@
       <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>
+            <div>{{ scope.row.remark | limitLen }}</div>
           </el-tooltip>
         </template>
       </el-table-column>
@@ -67,12 +67,13 @@
       v-loading="loading.dialog"
       :visible="dialogVisible"
       title="状态审核"
-      @close="hideDialog">
+      @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="姓名">{{ 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>