feats

src/api/activity.js

@@ -40,6 +40,14 @@ export function getEnrollList(params) {
   }))
 }
 
+export function getVoteList(activityId, params) {
+  return pureResponseData(request({
+    url: `/api/admin/activity/${activityId}/vote`,
+    method: 'get',
+    params
+  }))
+}
+
 export function getVoteItems(activityId) {
   return pureResponseData(request({
     url: `/api/admin/activity/${activityId}/voteitem`,

src/api/customer.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+import { pureResponseData } from './utils'
+
+export function getCustomerList(params) {
+  return pureResponseData(request({
+    url: `/api/admin/person`,
+    method: 'get',
+    params
+  }))
+}

src/api/news.js

@@ -0,0 +1,33 @@
+import request from '@/utils/request'
+import { pureResponseData } from './utils'
+
+export function getNews(id) {
+  return pureResponseData(request({
+    url: `/api/admin/news/${id}`,
+    method: 'get'
+  }))
+}
+
+export function updateNews(data) {
+  return pureResponseData(request({
+    url: `/api/admin/news/${data.newsId}`,
+    method: 'put',
+    data
+  }))
+}
+
+export function saveNews(data) {
+  return pureResponseData(request({
+    url: '/api/admin/news',
+    method: 'post',
+    data
+  }))
+}
+
+export function getNewsList(params) {
+  return pureResponseData(request({
+    url: `/api/admin/news`,
+    method: 'get',
+    params
+  }))
+}

src/api/recommender.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+import { pureResponseData } from './utils'
+
+export function getRecommenderList(params) {
+  return pureResponseData(request({
+    url: `/api/admin/recommender`,
+    method: 'get',
+    params
+  }))
+}

src/components/ECharts/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div ref="echarts"></div>
+  <div ref="echarts" />
 </template>
 
 <script>

src/components/FloatAction/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="floatting-action" :style="style">
-    <slot></slot>
+    <slot />
   </div>
 </template>
 

src/components/MarkdownEditor/index.vue

@@ -1,13 +1,13 @@
 <template>
   <editor
-    :initialValue="value"
-    :initialEditType="mode"
+    ref="toastuiEditor"
+    :initial-value="value"
+    :initial-edit-type="mode"
     :options="options"
     :height="height"
-    previewStyle="vertical"
-    ref="toastuiEditor"
+    preview-style="vertical"
     @change="handleEditorChange"
-    />
+  />
 </template>
 
 <script>

src/components/PAInput/index.vue

@@ -1,16 +1,25 @@
 <template>
-  <el-input placeholder="请输入内容" v-model="val">
-    <template slot="prepend">{{prefix}}</template>
-    <el-button slot="append" :icon="icon" @click="handleBtnClick"></el-button>
+  <el-input v-model="val" placeholder="请输入内容">
+    <template slot="prepend">{{ prefix }}</template>
+    <el-button slot="append" :icon="icon" @click="handleBtnClick" />
   </el-input>
 </template>
 
 <script>
 export default {
   props: {
-    value: String,
-    prefix: String,
-    icon: String
+    value: {
+      type: String,
+      default: undefined
+    },
+    prefix: {
+      type: String,
+      default: undefined
+    },
+    icon: {
+      type: String,
+      default: undefined
+    }
   },
 
   data() {

src/router/index.js

@@ -117,7 +117,7 @@ export const constantRoutes = [
       {
         path: 'warm-history',
         name: 'warm-history',
-        component: () => import('@/views/tree/index'),
+        // component: () => import('@/views/tree/index'),
         meta: { title: '暖场活动回顾', icon: 'tree' }
       }
     ]
@@ -133,14 +133,28 @@ export const constantRoutes = [
       {
         path: 'seasons',
         name: 'seasons',
-        component: () => import('@/views/table/index'),
+        component: () => import('@/views/rights/seasons'),
         meta: { title: '惊喜四季节', icon: 'el-icon-grape' }
       },
+      {
+        path: 'seasons/detail',
+        name: 'seasons.detail',
+        component: () => import('@/views/rights/seasons/Detail'),
+        meta: { title: '惊喜四季节详情' },
+        hidden: true
+      },
       {
         path: 'letter',
         name: 'letter',
-        component: () => import('@/views/tree/index'),
+        component: () => import('@/views/rights/letter'),
         meta: { title: '丽园家书', icon: 'el-icon-notebook-2' }
+      },
+      {
+        path: 'letter/detail',
+        name: 'letter.detail',
+        component: () => import('@/views/rights/letter/Detail'),
+        meta: { title: '丽园家书详情' },
+        hidden: true
       }
     ]
   },
@@ -191,101 +205,18 @@ export const constantRoutes = [
       {
         path: 'list',
         name: 'list',
-        component: () => import('@/views/table/index'),
+        component: () => import('@/views/customer/index'),
         meta: { title: '信息统计', icon: 'el-icon-data-analysis' }
       },
       {
         path: 'recommender',
         name: 'recommender',
-        component: () => import('@/views/tree/index'),
+        component: () => import('@/views/recommender/index'),
         meta: { title: '推荐记录', icon: 'el-icon-notebook-1' }
       }
     ]
   },
 
-  {
-    path: '/form',
-    component: Layout,
-    children: [
-      {
-        path: 'index',
-        name: 'Form',
-        component: () => import('@/views/form/index'),
-        meta: { title: 'Form', icon: 'form' }
-      }
-    ]
-  },
-
-  {
-    path: '/nested',
-    component: Layout,
-    redirect: '/nested/menu1',
-    name: 'Nested',
-    meta: {
-      title: 'Nested',
-      icon: 'nested'
-    },
-    children: [
-      {
-        path: 'menu1',
-        component: () => import('@/views/nested/menu1/index'), // Parent router-view
-        name: 'Menu1',
-        meta: { title: 'Menu1' },
-        children: [
-          {
-            path: 'menu1-1',
-            component: () => import('@/views/nested/menu1/menu1-1'),
-            name: 'Menu1-1',
-            meta: { title: 'Menu1-1' }
-          },
-          {
-            path: 'menu1-2',
-            component: () => import('@/views/nested/menu1/menu1-2'),
-            name: 'Menu1-2',
-            meta: { title: 'Menu1-2' },
-            children: [
-              {
-                path: 'menu1-2-1',
-                component: () => import('@/views/nested/menu1/menu1-2/menu1-2-1'),
-                name: 'Menu1-2-1',
-                meta: { title: 'Menu1-2-1' }
-              },
-              {
-                path: 'menu1-2-2',
-                component: () => import('@/views/nested/menu1/menu1-2/menu1-2-2'),
-                name: 'Menu1-2-2',
-                meta: { title: 'Menu1-2-2' }
-              }
-            ]
-          },
-          {
-            path: 'menu1-3',
-            component: () => import('@/views/nested/menu1/menu1-3'),
-            name: 'Menu1-3',
-            meta: { title: 'Menu1-3' }
-          }
-        ]
-      },
-      {
-        path: 'menu2',
-        component: () => import('@/views/nested/menu2/index'),
-        name: 'Menu2',
-        meta: { title: 'menu2' }
-      }
-    ]
-  },
-
-  {
-    path: 'external-link',
-    component: Layout,
-    children: [
-      {
-        path: 'https://panjiachen.github.io/vue-element-admin-site/#/',
-        meta: { title: 'External Link', icon: 'link' }
-      }
-    ]
-  },
-
   // 404 page must be placed at the end !!!
   { path: '*', redirect: '/404', hidden: true }
 ]

src/views/activity/Detail.vue

@@ -9,11 +9,14 @@
       <el-tab-pane v-if="detail && detail.isEnroll" label="报名详情" name="enroll">
         <enroll-list :activity-id="detail.activityId" />
       </el-tab-pane>
-      <el-tab-pane label="投票设置" name="vote">
+      <el-tab-pane v-if="detail && detail.isVote" label="投票设置" name="vote">
         <voteedit :activity-id="detail.activityId" />
       </el-tab-pane>
-      <el-tab-pane label="投票排行" name="rank">
+      <el-tab-pane v-if="detail && detail.isVote" label="投票排行" name="rank">
         <voterank :show="showRank" :activity-id="detail.activityId" style="width: 60vw; min-height: 400px" />
+        <div style="margin-top: 48px">
+          <votelist :activity-id="detail.activityId" />
+        </div>
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -27,7 +30,8 @@ export default {
     activity: () => import('./components/Detail'),
     enrollList: () => import('./components/EnrollList'),
     voteedit: () => import('./components/VoteEdit'),
-    voterank: () => import('./components/VoteRank')
+    voterank: () => import('./components/VoteRank'),
+    votelist: () => import('./components/VoteList')
   },
 
   props: {

src/views/activity/List.vue

@@ -41,7 +41,7 @@
       :size.sync="page.size"
       :current.sync="page.current"
       @change="handlePageChange"
-    ></pagination>
+    />
   </div>
 </template>
 
@@ -50,7 +50,6 @@ import { getActivityList } from '@/api/activity'
 
 export default {
   components: {
-    // pagination: () => import('@/components/Pagination'),
     FilterForm: () => import('./components/FilterForm')
   },
 

src/views/activity/components/Detail.vue

@@ -9,7 +9,8 @@
         type="daterange"
         start-placeholder="开始日期"
         end-placeholder="结束日期"
-        style="width: 100%;" />
+        style="width: 100%;"
+      />
     </el-form-item>
     <el-form-item label="活动封面" prop="thumb">
       <el-upload
@@ -18,9 +19,10 @@
         class="activty-uploader"
         :show-file-list="false"
         :on-success="handleUploadThumbSuccess"
-        :before-upload="beforeThumbUpload">
+        :before-upload="beforeThumbUpload"
+      >
         <img v-if="form.thumb" :src="form.thumb" class="activty-thumb">
-        <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+        <i v-else class="el-icon-plus avatar-uploader-icon" />
       </el-upload>
     </el-form-item>
     <el-form-item label="活动地点" prop="address">
@@ -30,15 +32,16 @@
       <el-form-item label="允许报名" prop="isEnroll">
         <el-switch v-model="form.isEnroll" />
       </el-form-item>
-      <el-form-item label="报名时间" v-if="form.isEnroll">
+      <el-form-item v-if="form.isEnroll" label="报名时间">
         <el-date-picker
           v-model="dtRange2"
           type="daterange"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
-          style="width: 100%;" />
+          style="width: 100%;"
+        />
       </el-form-item>
-      <el-form-item label="当前报名" v-if="form.isEnroll">
+      <el-form-item v-if="form.isEnroll" label="当前报名">
         <el-input v-model="form.enrollNum">
           <template slot="append">人</template>
         </el-input>
@@ -51,13 +54,14 @@
       <el-form-item label="参与投票" prop="isVote">
         <el-switch v-model="form.isVote" />
       </el-form-item>
-      <el-form-item label="投票时间" v-if="form.isVote">
+      <el-form-item v-if="form.isVote" label="投票时间">
         <el-date-picker
           v-model="dtRange3"
           type="daterange"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
-          style="width: 100%;" />
+          style="width: 100%;"
+        />
       </el-form-item>
     </template>
     <el-form-item label="活动状态" prop="status">
@@ -78,9 +82,10 @@
         action=""
         :show-file-list="false"
         :on-success="handleShareSuccess"
-        :before-upload="beforeShareUpload">
+        :before-upload="beforeShareUpload"
+      >
         <img v-if="form.shareImg" :src="form.shareImg" class="activty-thumb">
-        <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+        <i v-else class="el-icon-plus avatar-uploader-icon" />
       </el-upload>
     </el-form-item>
     <el-form-item>

src/views/activity/components/EnrollList.vue

@@ -11,8 +11,8 @@
     >
       <el-table-column
         type="index"
-        width="50">
-      </el-table-column>
+        width="50"
+      />
       <el-table-column label="报名时间">
         <template slot-scope="scope">
           {{ scope.row.createDate | toDayMini }}
@@ -32,7 +32,7 @@
       :size.sync="page.size"
       :current.sync="page.current"
       @change="handlePageChange"
-    ></pagination>
+    />
   </div>
 </template>
 
@@ -41,7 +41,10 @@ import { getEnrollList } from '@/api/activity'
 
 export default {
   props: {
-    activityId: Number
+    activityId: {
+      type: Number,
+      default: 0
+    }
   },
   data() {
     return {
@@ -54,18 +57,23 @@ export default {
       }
     }
   },
+  watch: {
+    activityId(nw) {
+      this.fetchData(nw)
+    }
+  },
   created() {
     this.fetchData()
   },
   methods: {
-    fetchData() {
-      if (!this.activityId) {
+    fetchData(id) {
+      if (!id && !this.activityId) {
         return
       }
 
       this.listLoading = true
       getEnrollList({
-        activityId: this.activityId,
+        activityId: id || this.activityId,
         pageNum: this.page.current,
         pageSize: this.page.size
       }).then(res => {

src/views/activity/components/VoteEdit.vue

@@ -2,12 +2,12 @@
   <div>
     <floataction>
       <el-tooltip content="新增投票项目" placement="top-start">
-        <el-button type="danger" icon="el-icon-plus" @click="addItem" circle></el-button>
+        <el-button type="danger" icon="el-icon-plus" circle @click="addItem" />
       </el-tooltip>
     </floataction>
-    <ul class="vote-list" v-loading="loading">
+    <ul v-loading="loading" class="vote-list">
       <li v-for="(item, index) in voteItems" :key="index">
-        <painput :prefix="`${index + 1}.`" icon="el-icon-close" v-model="list[index].name" @click="deleteItem(item, index)" />
+        <painput v-model="list[index].name" :prefix="`${index + 1}.`" icon="el-icon-close" @click="deleteItem(item, index)" />
       </li>
     </ul>
 
@@ -51,10 +51,6 @@ export default {
     }
   },
 
-  created() {
-    this.getItems()
-  },
-
   watch: {
     activityId(nw, od) {
       if (nw && !od) {
@@ -63,6 +59,10 @@ export default {
     }
   },
 
+  created() {
+    this.getItems()
+  },
+
   methods: {
     getItems(id) {
       if (id || this.activityId) {

src/views/activity/components/VoteList.vue

@@ -0,0 +1,93 @@
+<template>
+  <div>
+    <h3>投票详情</h3>
+    <el-table
+      v-loading="listLoading"
+      :data="list"
+      element-loading-text="Loading"
+      border
+      fit
+      highlight-current-row
+      stripe
+    >
+      <el-table-column
+        type="index"
+        width="50"
+      />
+      <el-table-column label="投票时间">
+        <template slot-scope="scope">
+          {{ scope.row.createDate | toDayMini }}
+        </template>
+      </el-table-column>
+      <el-table-column label="头像">
+        <template slot-scope="scope">
+          <img :src="scope.row.personAvatar" width="64" alt="">
+        </template>
+      </el-table-column>
+      <el-table-column label="投票人" prop="personName" />
+      <el-table-column label="昵称" prop="personNickname" />
+      <el-table-column label="电话" prop="phone" />
+    </el-table>
+    <pagination
+      :total="page.total"
+      :size.sync="page.size"
+      :current.sync="page.current"
+      @change="handlePageChange"
+    />
+  </div>
+</template>
+
+<script>
+import { getVoteList } from '@/api/activity'
+
+export default {
+  props: {
+    activityId: {
+      type: Number,
+      default: 0
+    }
+  },
+  data() {
+    return {
+      list: null,
+      listLoading: true,
+      page: {
+        total: 0,
+        size: 10,
+        current: 1
+      }
+    }
+  },
+  watch: {
+    activityId(nw) {
+      this.fetchData(nw)
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData(id) {
+      if (!id && !this.activityId) {
+        return
+      }
+
+      this.listLoading = true
+      getVoteList(id || this.activityId, {
+        pageNum: this.page.current,
+        pageSize: this.page.size
+      }).then(res => {
+        this.list = res.records
+        this.page.total = res.total
+        this.listLoading = false
+      })
+    },
+
+    handlePageChange({ current, size }) {
+      this.page.current = current
+      this.page.size = size
+      this.fetchData()
+    }
+  }
+}
+</script>

src/views/activity/components/VoteRank.vue

@@ -3,7 +3,8 @@
     :show="show"
     :options="options"
     :data-source="source"
-    :loading="loading"></echarts>
+    :loading="loading"
+  />
 </template>
 
 <script>

src/views/customer/components/FilterForm.vue

@@ -0,0 +1,51 @@
+<template>
+  <el-form :inline="true" :model="formData" class="filter-form">
+    <el-form-item label="手机">
+      <el-input v-model="formData.phone" placeholder="手机" />
+    </el-form-item>
+    <el-form-item label="名称">
+      <el-input v-model="formData.name" placeholder="名称" />
+    </el-form-item>
+    <el-form-item style="margin-left: 36px">
+      <el-button type="primary" @click="handleSubmit">查询</el-button>
+      <el-button @click="handleReset">重置</el-button>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      formData: {
+        phone: undefined,
+        name: undefined,
+        nickname: undefined
+      }
+    }
+  },
+
+  methods: {
+    handleSubmit() {
+      this.$emit('search', this.formData)
+    },
+
+    handleReset() {
+      const def = Object.keys(this.formData).reduce((acc, key) => {
+        return {
+          ...acc,
+          [key]: undefined
+        }
+      }, {})
+      this.formData = def
+      this.$emit('reset', def)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.filter-form {
+  padding: 16px 0;
+}
+</style>

src/views/customer/index.vue

@@ -0,0 +1,148 @@
+<template>
+  <div class="app-container">
+    <div class="customer-header">
+      <FilterForm @search="handleSearch" @reset="handleSearch" />
+      <el-tooltip content="导出" placement="top">
+        <el-button type="primary" icon="el-icon-position" @click="handleExport" />
+      </el-tooltip>
+    </div>
+    <el-table
+      v-loading="listLoading"
+      :data="list"
+      element-loading-text="Loading"
+      border
+      fit
+      highlight-current-row
+      stripe
+    >
+      <el-table-column
+        type="index"
+        width="50"
+      />
+      <el-table-column label="头像">
+        <template slot-scope="scope">
+          <img :src="scope.row.avatar" width="64" alt="">
+        </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">
+          <el-tag
+            :type="scope.row.sex | sexTagFormat"
+            disable-transitions
+          >{{ scope.row.sex | sexFormat }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="时间">
+        <template slot-scope="scope">
+          {{ scope.row.createDate | toDayMini }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      :total="page.total"
+      :size.sync="page.size"
+      :current.sync="page.current"
+      @change="handlePageChange"
+    />
+  </div>
+</template>
+
+<script>
+import { getCustomerList } from '@/api/customer'
+
+export default {
+  components: {
+    FilterForm: () => import('./components/FilterForm')
+  },
+
+  filters: {
+    sexFormat(sex) {
+      if (sex === null || sex === undefined) {
+        return undefined
+      }
+
+      const sexMap = [
+        '未知',
+        '男',
+        '女'
+      ]
+      return sexMap[sex]
+    },
+
+    sexTagFormat(sex) {
+      if (sex === null || sex === undefined) {
+        return undefined
+      }
+
+      const sexMap = [
+        'info',
+        'success',
+        'danger'
+      ]
+      return sexMap[sex]
+    }
+  },
+
+  data() {
+    return {
+      list: null,
+      listLoading: true,
+      page: {
+        total: 0,
+        size: 10,
+        current: 1
+      },
+      filters: {
+        pageNum: 1,
+        pageSize: 10
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getCustomerList({
+        ...this.filters,
+        pageNum: this.page.current,
+        pageSize: this.page.size
+      }).then(res => {
+        this.list = res.records
+        this.page.total = res.total
+        this.listLoading = false
+      })
+    },
+
+    handleExport() {},
+
+    handlePageChange({ current, size }) {
+      this.page.current = current
+      this.page.size = size
+      this.fetchData()
+    },
+
+    handleSearch(searchParams) {
+      this.filters = {
+        ...this.filters,
+        ...searchParams,
+        pageNum: 1
+      }
+
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.customer-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+</style>

src/views/form/index.vue

@@ -1,85 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form ref="form" :model="form" label-width="120px">
-      <el-form-item label="Activity name">
-        <el-input v-model="form.name" />
-      </el-form-item>
-      <el-form-item label="Activity zone">
-        <el-select v-model="form.region" placeholder="please select your zone">
-          <el-option label="Zone one" value="shanghai" />
-          <el-option label="Zone two" value="beijing" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="Activity time">
-        <el-col :span="11">
-          <el-date-picker v-model="form.date1" type="date" placeholder="Pick a date" style="width: 100%;" />
-        </el-col>
-        <el-col :span="2" class="line">-</el-col>
-        <el-col :span="11">
-          <el-time-picker v-model="form.date2" type="fixed-time" placeholder="Pick a time" style="width: 100%;" />
-        </el-col>
-      </el-form-item>
-      <el-form-item label="Instant delivery">
-        <el-switch v-model="form.delivery" />
-      </el-form-item>
-      <el-form-item label="Activity type">
-        <el-checkbox-group v-model="form.type">
-          <el-checkbox label="Online activities" name="type" />
-          <el-checkbox label="Promotion activities" name="type" />
-          <el-checkbox label="Offline activities" name="type" />
-          <el-checkbox label="Simple brand exposure" name="type" />
-        </el-checkbox-group>
-      </el-form-item>
-      <el-form-item label="Resources">
-        <el-radio-group v-model="form.resource">
-          <el-radio label="Sponsor" />
-          <el-radio label="Venue" />
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="Activity form">
-        <el-input v-model="form.desc" type="textarea" />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" @click="onSubmit">Create</el-button>
-        <el-button @click="onCancel">Cancel</el-button>
-      </el-form-item>
-    </el-form>
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      form: {
-        name: '',
-        region: '',
-        date1: '',
-        date2: '',
-        delivery: false,
-        type: [],
-        resource: '',
-        desc: ''
-      }
-    }
-  },
-  methods: {
-    onSubmit() {
-      this.$message('submit!')
-    },
-    onCancel() {
-      this.$message({
-        message: 'cancel!',
-        type: 'warning'
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-.line{
-  text-align: center;
-}
-</style>
-

src/views/nested/menu1/index.vue

@@ -1,7 +0,0 @@
-<template>
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1">
-      <router-view />
-    </el-alert>
-  </div>
-</template>

src/views/nested/menu1/menu1-1/index.vue

@@ -1,7 +0,0 @@
-<template>
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1-1" type="success">
-      <router-view />
-    </el-alert>
-  </div>
-</template>

src/views/nested/menu1/menu1-2/index.vue

@@ -1,7 +0,0 @@
-<template>
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1-2" type="success">
-      <router-view />
-    </el-alert>
-  </div>
-</template>

src/views/nested/menu1/menu1-2/menu1-2-1/index.vue

@@ -1,5 +0,0 @@
-<template functional>
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1-2-1" type="warning" />
-  </div>
-</template>

src/views/nested/menu1/menu1-2/menu1-2-2/index.vue

@@ -1,5 +0,0 @@
-<template functional>
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1-2-2" type="warning" />
-  </div>
-</template>

src/views/nested/menu1/menu1-3/index.vue

@@ -1,5 +0,0 @@
-<template functional>
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 1-3" type="success" />
-  </div>
-</template>

src/views/nested/menu2/index.vue

@@ -1,5 +0,0 @@
-<template>
-  <div style="padding:30px;">
-    <el-alert :closable="false" title="menu 2" />
-  </div>
-</template>

src/views/news/Detail.vue

@@ -0,0 +1,203 @@
+<template>
+  <div class="app-container">
+    <el-form ref="newsForm" v-loading="loading.form" :model="form" :rules="rules" label-width="120px">
+      <el-form-item label="标题" prop="title">
+        <el-input v-model="form.title" />
+      </el-form-item>
+      <el-form-item label="发布人" prop="publisher">
+        <el-input v-model="form.publisher" />
+      </el-form-item>
+      <el-form-item label="发布时间" prop="publishDate">
+        <el-input v-model="form.publishDate" />
+      </el-form-item>
+      <el-form-item label="封面" prop="thumb">
+        <el-upload
+          v-loading="loading.thumb"
+          v-bind="uploadOption"
+          class="news-uploader"
+          :show-file-list="false"
+          :on-success="handleUploadThumbSuccess"
+          :before-upload="beforeThumbUpload"
+        >
+          <img v-if="form.thumb" :src="form.thumb" class="news-thumb">
+          <i v-else class="el-icon-plus avatar-uploader-icon" />
+        </el-upload>
+      </el-form-item>
+      <el-form-item label="详情" prop="content">
+        <markdown v-model="form.content" />
+      </el-form-item>
+      <el-form-item label="活动状态" prop="status">
+        <el-select v-model="form.status" placeholder="请选择">
+          <el-option label="未发布" :value="0" />
+          <el-option label="已发布" :value="1" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="handleSubmit">保 存</el-button>
+        <el-button @click="handleCancel">取 消</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import dayjs from 'dayjs'
+import { Message } from 'element-ui'
+import uploadOption from '@/utils/uploadOption'
+import { getNews, saveNews, updateNews } from '@/api/news'
+
+export default {
+  components: {
+    markdown: () => import('@/components/MarkdownEditor')
+  },
+
+  props: {
+    typeId: {
+      type: Number,
+      default: 0
+    }
+  },
+
+  data() {
+    return {
+      id: null,
+      loading: {
+        form: false,
+        thumb: false
+      },
+      uploadOption,
+      form: {
+        newsId: null,
+        title: null,
+        publisher: null,
+        publishDate: dayjs().format('YYYY-MM-DD'),
+        thumb: null,
+        content: null,
+        status: 0,
+        weight: 0
+      },
+      rules: {
+        title: [
+          { required: true, message: '请输入标题', trigger: 'blur' }
+        ],
+        publisher: [
+          { required: true, message: '请输入发布人', trigger: 'blur' }
+        ],
+        publishDate: [
+          { required: true, message: '请输入发布时间', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+
+  created() {
+    const { id } = this.$route.query
+    this.id = id
+    this.fetchData()
+  },
+
+  methods: {
+    fetchData() {
+      if (this.id) {
+        this.loading.form = true
+        getNews(this.id).then(res => {
+          this.form = res
+          this.loading.form = false
+        }).catch(err => {
+          console.error(err)
+          this.loading.form = false
+        })
+      }
+    },
+
+    handleSubmit() {
+      this.$refs.newsForm.validate(valid => {
+        if (valid) {
+          const data = {
+            ...this.form,
+            typeId: this.typeId
+          }
+
+          //
+          this.loading.form = true
+          if (this.id) {
+            updateNews(data).then(() => {
+              this.$message({ type: 'success', message: '更新成功' })
+              this.loading.form = false
+            }).catch(err => {
+              console.error(err)
+              this.loading.form = false
+            })
+          } else {
+            saveNews(data).then(res => {
+              this.$router.replace({ name: this.$route.name, params: { typeId: this.typeId }, query: { id: res.newsId }})
+              this.loading.form = false
+            }).catch(err => {
+              console.error(err)
+              this.loading.form = false
+            })
+          }
+        }
+      })
+    },
+
+    handleCancel() {
+      this.$router.go(-1)
+    },
+
+    beforeThumbUpload(file) {
+      // const isJPG = file.type === 'image/jpeg';
+      // const isLt2M = file.size / 1024 / 1024 < 2;
+
+      this.loading.thumb = true
+
+      return true
+    },
+
+    handleUploadThumbSuccess(res, file) {
+      this.loading.thumb = false
+
+      if (res.code !== 1000) {
+        Message({
+          message: res.message || 'Error',
+          type: 'error',
+          duration: 5 * 1000
+        })
+      } else {
+        this.form.thumb = res.data.url
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.news-uploader {
+  .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+
+    &:hover {
+      border-color: #409EFF;
+    }
+
+    .avatar-uploader-icon {
+      font-size: 28px;
+      color: #8c939d;
+      width: 178px;
+      height: 178px;
+      line-height: 178px;
+      text-align: center;
+    }
+  }
+}
+
+.news-thumb {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>

src/views/news/List.vue

@@ -0,0 +1,171 @@
+<template>
+  <div class="app-container">
+    <div class="news-header">
+      <FilterForm @search="handleSearch" @reset="handleSearch" />
+      <el-tooltip content="新增活动" placement="top">
+        <el-button type="primary" icon="el-icon-plus" @click="handleAdd" />
+      </el-tooltip>
+    </div>
+    <el-table
+      v-loading="listLoading"
+      :data="list"
+      element-loading-text="Loading"
+      border
+      fit
+      highlight-current-row
+      stripe
+    >
+      <el-table-column
+        type="index"
+        width="50"
+      />
+      <el-table-column label="创建时间">
+        <template slot-scope="scope">
+          {{ scope.row.createDate | toDayMini }}
+        </template>
+      </el-table-column>
+      <el-table-column label="标题" prop="title" />
+      <el-table-column label="封面">
+        <template slot-scope="scope">
+          <img :src="scope.row.thumb" width="64" alt="">
+        </template>
+      </el-table-column>
+      <el-table-column label="发布人" prop="publisher" />
+      <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>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      :total="page.total"
+      :size.sync="page.size"
+      :current.sync="page.current"
+      @change="handlePageChange"
+    />
+  </div>
+</template>
+
+<script>
+import { getNewsList } from '@/api/news'
+
+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]
+    }
+  },
+  props: {
+    typeId: {
+      type: Number,
+      default: 0
+    }
+  },
+
+  data() {
+    return {
+      list: null,
+      listLoading: true,
+      detailRouter: null,
+      page: {
+        total: 0,
+        size: 10,
+        current: 1
+      },
+      filters: {
+        pageNum: 1,
+        pageSize: 10
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+    this.detailRouter = `${this.$route.name}.detail`
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getNewsList({
+        ...this.filters,
+        typeId: this.typeId,
+        pageNum: this.page.current,
+        pageSize: this.page.size
+      }).then(res => {
+        this.list = res.records
+        this.page.total = res.total
+        this.listLoading = false
+      })
+    },
+
+    handlePageChange({ current, size }) {
+      this.page.current = current
+      this.page.size = size
+      this.fetchData()
+    },
+
+    handleAdd() {
+      this.$router.push({
+        name: this.detailRouter,
+        params: { typeId: this.typeId }
+      })
+    },
+
+    handleEdit(row) {
+      this.$router.push({
+        name: this.detailRouter,
+        params: { typeId: this.typeId },
+        query: { id: row.newsId }
+      })
+    },
+
+    handleSearch(searchParams) {
+      this.filters = {
+        ...this.filters,
+        ...searchParams,
+        pageNum: 1
+      }
+
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.news-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+</style>

src/views/news/components/FilterForm.vue

@@ -0,0 +1,53 @@
+<template>
+  <el-form :inline="true" :model="formData" class="filter-form">
+    <el-form-item label="标题">
+      <el-input v-model="formData.title" 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-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>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      formData: {
+        title: undefined,
+        status: undefined
+      }
+    }
+  },
+
+  methods: {
+    handleSubmit() {
+      this.$emit('search', this.formData)
+    },
+
+    handleReset() {
+      const def = Object.keys(this.formData).reduce((acc, key) => {
+        return {
+          ...acc,
+          [key]: undefined
+        }
+      }, {})
+      this.formData = def
+      this.$emit('reset', def)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.filter-form {
+  padding: 16px 0;
+}
+</style>

src/views/recommender/components/FilterForm.vue

@@ -0,0 +1,64 @@
+<template>
+  <el-form :inline="true" :model="formData" class="filter-form">
+    <el-form-item label="日期">
+      <el-date-picker v-model="formData.startDate" type="date" placeholder="起始日期" value-format="yyyy-MM-dd" />
+    </el-form-item>
+    <el-form-item label="-">
+      <el-date-picker v-model="formData.endDate" type="date" placeholder="截止日期" value-format="yyyy-MM-dd" />
+    </el-form-item>
+    <el-form-item label="手机">
+      <el-input v-model="formData.phone" placeholder="手机" />
+    </el-form-item>
+    <el-form-item label="名称">
+      <el-input v-model="formData.name" placeholder="名称" />
+    </el-form-item>
+    <el-form-item label="推荐人手机">
+      <el-input v-model="formData.recPhone" placeholder="推荐人手机" />
+    </el-form-item>
+    <el-form-item label="推荐人名称">
+      <el-input v-model="formData.recName" placeholder="推荐人名称" />
+    </el-form-item>
+    <el-form-item style="margin-left: 36px">
+      <el-button type="primary" @click="handleSubmit">查询</el-button>
+      <el-button @click="handleReset">重置</el-button>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      formData: {
+        phone: undefined,
+        name: undefined,
+        recPhone: undefined,
+        recName: undefined
+      }
+    }
+  },
+
+  methods: {
+    handleSubmit() {
+      this.$emit('search', this.formData)
+    },
+
+    handleReset() {
+      const def = Object.keys(this.formData).reduce((acc, key) => {
+        return {
+          ...acc,
+          [key]: undefined
+        }
+      }, {})
+      this.formData = def
+      this.$emit('reset', def)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.filter-form {
+  padding: 16px 0;
+}
+</style>

src/views/recommender/index.vue

@@ -0,0 +1,144 @@
+<template>
+  <div class="app-container">
+    <div class="recommender-header">
+      <FilterForm @search="handleSearch" @reset="handleSearch" />
+      <el-tooltip content="导出" placement="top">
+        <el-button type="primary" icon="el-icon-position" @click="handleExport" />
+      </el-tooltip>
+    </div>
+    <el-table
+      v-loading="listLoading"
+      :data="list"
+      element-loading-text="Loading"
+      border
+      fit
+      highlight-current-row
+      stripe
+    >
+      <el-table-column
+        type="index"
+        width="50"
+      />
+      <el-table-column label="时间">
+        <template slot-scope="scope">
+          {{ scope.row.createDate | toDayMini }}
+        </template>
+      </el-table-column>
+      <el-table-column label="手机" prop="phone" />
+      <el-table-column label="名称" prop="name" />
+      <el-table-column label="性别" align="center" width="200">
+        <template slot-scope="scope">
+          <el-tag
+            :type="scope.row.sex | sexTagFormat"
+            disable-transitions
+          >{{ scope.row.sex | sexFormat }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="推荐人手机" prop="recPhone" />
+      <el-table-column label="推荐人名称" prop="recName" />
+    </el-table>
+    <pagination
+      :total="page.total"
+      :size.sync="page.size"
+      :current.sync="page.current"
+      @change="handlePageChange"
+    />
+  </div>
+</template>
+
+<script>
+import { getRecommenderList } from '@/api/recommender'
+
+export default {
+  components: {
+    FilterForm: () => import('./components/FilterForm')
+  },
+
+  filters: {
+    sexFormat(sex) {
+      if (sex === null || sex === undefined) {
+        return undefined
+      }
+
+      const sexMap = [
+        '未知',
+        '男',
+        '女'
+      ]
+      return sexMap[sex]
+    },
+
+    sexTagFormat(sex) {
+      if (sex === null || sex === undefined) {
+        return undefined
+      }
+
+      const sexMap = [
+        'info',
+        'success',
+        'danger'
+      ]
+      return sexMap[sex]
+    }
+  },
+
+  data() {
+    return {
+      list: null,
+      listLoading: true,
+      page: {
+        total: 0,
+        size: 10,
+        current: 1
+      },
+      filters: {
+        pageNum: 1,
+        pageSize: 10
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getRecommenderList({
+        ...this.filters,
+        pageNum: this.page.current,
+        pageSize: this.page.size
+      }).then(res => {
+        this.list = res.records
+        this.page.total = res.total
+        this.listLoading = false
+      })
+    },
+
+    handleExport() {},
+
+    handlePageChange({ current, size }) {
+      this.page.current = current
+      this.page.size = size
+      this.fetchData()
+    },
+
+    handleSearch(searchParams) {
+      this.filters = {
+        ...this.filters,
+        ...searchParams,
+        pageNum: 1
+      }
+
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.recommender-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+</style>

src/views/rights/letter/Detail.vue

@@ -0,0 +1,11 @@
+<template>
+  <detail :type-id="2" />
+</template>
+
+<script>
+export default {
+  components: {
+    detail: () => import('@/views/news/Detail')
+  }
+}
+</script>

src/views/rights/letter/index.vue

@@ -0,0 +1,11 @@
+<template>
+  <list :type-id="2" />
+</template>
+
+<script>
+export default {
+  components: {
+    list: () => import('@/views/news/List')
+  }
+}
+</script>

src/views/rights/seasons/Detail.vue

@@ -0,0 +1,11 @@
+<template>
+  <detail :type-id="1" />
+</template>
+
+<script>
+export default {
+  components: {
+    detail: () => import('@/views/news/Detail')
+  }
+}
+</script>

src/views/rights/seasons/index.vue

@@ -0,0 +1,11 @@
+<template>
+  <list :type-id="1" />
+</template>
+
+<script>
+export default {
+  components: {
+    list: () => import('@/views/news/List')
+  }
+}
+</script>

src/views/table/index.vue

@@ -1,79 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-table
-      v-loading="listLoading"
-      :data="list"
-      element-loading-text="Loading"
-      border
-      fit
-      highlight-current-row
-    >
-      <el-table-column align="center" label="ID" width="95">
-        <template slot-scope="scope">
-          {{ scope.$index }}
-        </template>
-      </el-table-column>
-      <el-table-column label="Title">
-        <template slot-scope="scope">
-          {{ scope.row.title }}
-        </template>
-      </el-table-column>
-      <el-table-column label="Author" width="110" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.author }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="Pageviews" width="110" align="center">
-        <template slot-scope="scope">
-          {{ scope.row.pageviews }}
-        </template>
-      </el-table-column>
-      <el-table-column class-name="status-col" label="Status" width="110" align="center">
-        <template slot-scope="scope">
-          <el-tag :type="scope.row.status | statusFilter">{{ scope.row.status }}</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column align="center" prop="created_at" label="Display_time" width="200">
-        <template slot-scope="scope">
-          <i class="el-icon-time" />
-          <span>{{ scope.row.display_time }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-  </div>
-</template>
-
-<script>
-import { getList } from '@/api/table'
-
-export default {
-  filters: {
-    statusFilter(status) {
-      const statusMap = {
-        published: 'success',
-        draft: 'gray',
-        deleted: 'danger'
-      }
-      return statusMap[status]
-    }
-  },
-  data() {
-    return {
-      list: null,
-      listLoading: true
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.listLoading = true
-      getList().then(response => {
-        this.list = response.data.items
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>

src/views/tree/index.vue

@@ -1,78 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-input v-model="filterText" placeholder="Filter keyword" style="margin-bottom:30px;" />
-
-    <el-tree
-      ref="tree2"
-      :data="data2"
-      :props="defaultProps"
-      :filter-node-method="filterNode"
-      class="filter-tree"
-      default-expand-all
-    />
-
-  </div>
-</template>
-
-<script>
-export default {
-
-  data() {
-    return {
-      filterText: '',
-      data2: [{
-        id: 1,
-        label: 'Level one 1',
-        children: [{
-          id: 4,
-          label: 'Level two 1-1',
-          children: [{
-            id: 9,
-            label: 'Level three 1-1-1'
-          }, {
-            id: 10,
-            label: 'Level three 1-1-2'
-          }]
-        }]
-      }, {
-        id: 2,
-        label: 'Level one 2',
-        children: [{
-          id: 5,
-          label: 'Level two 2-1'
-        }, {
-          id: 6,
-          label: 'Level two 2-2'
-        }]
-      }, {
-        id: 3,
-        label: 'Level one 3',
-        children: [{
-          id: 7,
-          label: 'Level two 3-1'
-        }, {
-          id: 8,
-          label: 'Level two 3-2'
-        }]
-      }],
-      defaultProps: {
-        children: 'children',
-        label: 'label'
-      }
-    }
-  },
-  watch: {
-    filterText(val) {
-      this.$refs.tree2.filter(val)
-    }
-  },
-
-  methods: {
-    filterNode(value, data) {
-      if (!value) return true
-      return data.label.indexOf(value) !== -1
-    }
-  }
-}
-</script>
-