feats

package.json

@@ -18,7 +18,7 @@
     "axios": "0.18.1",
     "codemirror": "^5.56.0",
     "core-js": "^3.6.5",
-    "dayjs": "^1.8.32",
+    "dayjs": "^1.8.33",
     "element-ui": "2.13.2",
     "md5": "^2.3.0",
     "normalize.css": "7.0.0",

src/api/activity.js

@@ -16,6 +16,14 @@ export function getActivityList(params) {
   }))
 }
 
+export function updateActivity(data) {
+  return pureResponseData(request({
+    url: `/api/admin/activity/${data.activityId}`,
+    method: 'put',
+    data
+  }))
+}
+
 export function saveActivity(data) {
   return pureResponseData(request({
     url: '/api/admin/activity',

src/views/components/Activity/index.vue

@@ -53,6 +53,13 @@
     <el-form-item label="活动详情" prop="detail">
       <markdown v-model="form.detail" />
     </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-option label="已过期" :value="2" />
+      </el-select>
+    </el-form-item>
     <el-form-item label="分享标题" prop="shareTitle">
       <el-input v-model="form.shareTitle" />
     </el-form-item>
@@ -218,7 +225,6 @@ export default {
           }
 
           const [dt1, dt2] = transferBeginEndDay(data.startDate, data.endDate)
-          debugger
           data.startDate = dt1
           data.endDate = dt2
 
@@ -229,7 +235,6 @@ export default {
           const [dt5, dt6] = transferBeginEndDay(data.voteStart, data.voteEnd)
           data.voteStart = dt5
           data.voteEnd = dt6
-          debugger
           this.$emit('submit', data)
         }
       })

src/views/life/Warm/Detail.vue

@@ -7,7 +7,7 @@
 </template>
 
 <script>
-import { getActivity, saveActivity } from '@/api/activity'
+import { getActivity, updateActivity, saveActivity } from '@/api/activity'
 
 export default {
   components: {
@@ -16,13 +16,15 @@ export default {
 
   data() {
     return {
+      id: null,
       detail: null
     }
   },
 
   mounted() {
-    const { id } = this.$router.params
+    const { id } = this.$route.query
     if (id) {
+      this.id = id
       // eslint-disable-next-line no-return-assign
       getActivity(id).then(res => this.detail = res)
     }
@@ -30,9 +32,15 @@ export default {
 
   methods: {
     handleSubmit(data) {
-      saveActivity(data).then(res => {
-        this.$router.push({ name: 'warm.detail', params: { id: res.activityId }})
-      })
+      if (this.id) {
+        updateActivity(data).then(() => {
+          this.$message({ type: 'success', message: '更新成功' })
+        })
+      } else {
+        saveActivity(data).then(res => {
+          this.$router.push({ name: 'warm.detail', query: { id: res.activityId }})
+        })
+      }
     },
 
     handleCancel() {

src/views/life/Warm/index.vue

@@ -15,26 +15,22 @@
       highlight-current-row
       stripe
     >
-      <el-table-column align="center" label="ID" width="95">
-        <template slot-scope="scope">
-          {{ scope.$index + 1 }}
-        </template>
-      </el-table-column>
+      <el-table-column align="center" label="ID" width="100" prop="activityId" />
       <el-table-column label="活动时间">
         <template slot-scope="scope">
           {{ scope.row.startDate | toDayMini }} - {{ scope.row.endDate | toDayMini }}
         </template>
       </el-table-column>
       <el-table-column label="活动名称" prop="name" />
-      <el-table-column label="活动状态">
+      <el-table-column label="活动状态" align="center" width="200">
         <template slot-scope="scope">
           <el-tag
-            :type="scope.row.status === 1 ? 'primary' : 'info'"
+            :type="scope.row.status | statusTagFormat"
             disable-transitions
           >{{ scope.row.status | statusFormat }}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="操作">
+      <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>
@@ -74,6 +70,19 @@ export default {
         '已过期'
       ]
       return statusMap[status]
+    },
+
+    statusTagFormat(status) {
+      if (status === null || status === undefined) {
+        return undefined
+      }
+
+      const statusMap = [
+        'warning',
+        'success',
+        'info'
+      ]
+      return statusMap[status]
     }
   },
   data() {
@@ -118,7 +127,7 @@ export default {
     },
 
     handleEdit(row) {
-      this.$router.push({ name: 'warm.detail', params: { id: row.activityId }})
+      this.$router.push({ name: 'warm.detail', query: { id: row.activityId }})
     },
 
     handleSizeChange(size) {