From 9ff61ef0d6ecfaadc240085630c71081d0e88b3d Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Thu, 3 Jun 2021 16:16:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=91=E6=88=98=E8=B5=9B?=
 =?UTF-8?q?=E5=AD=A3=E6=8E=92=E5=90=8D=E5=A5=96=E5=8A=B1=E7=9A=84=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/activity.ts         |  2 +-
 src/views/activity/edit.vue |  2 +-
 src/views/exam/edit.vue     | 52 +++++++++++++++++++++++++++----------
 3 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/src/api/activity.ts b/src/api/activity.ts
index 590cf22..b80b451 100644
--- a/src/api/activity.ts
+++ b/src/api/activity.ts
@@ -33,7 +33,7 @@ export interface IActivityData {
 }
 
 export const defaultRewardData: IRewardData = {
-  count: 0,
+  count: 1,
   type: 0
 }
 
diff --git a/src/views/activity/edit.vue b/src/views/activity/edit.vue
index b75e697..0ff0390 100644
--- a/src/views/activity/edit.vue
+++ b/src/views/activity/edit.vue
@@ -477,7 +477,7 @@ export default class extends Vue {
   private tempTagView?: ITagView
 
   private dialogType = 'new'
-  private record: IRewardData = {}
+  private record: IRewardData = {type: 0}
   private dialogVisible = false
   private modalRules = {
     rank: [{ required: true, message: '请输入排名', trigger: 'blur' }
diff --git a/src/views/exam/edit.vue b/src/views/exam/edit.vue
index 254b01c..8adc26a 100644
--- a/src/views/exam/edit.vue
+++ b/src/views/exam/edit.vue
@@ -285,7 +285,7 @@
           label-width="120px"
           label-position="left"
       >
-        <el-form-item label="分数" prop="rank">
+        <el-form-item label="分数" prop="rank" v-if="record.type!==2">
           <el-input
               v-model="record.rank"
               placeholder="分数"
@@ -293,7 +293,23 @@
               style="width: 30%"
           />
         </el-form-item>
-
+        <el-form-item label="排名" prop="rank" v-if="record.type===2">
+          第
+          <el-input
+              v-model="record.rank"
+              placeholder="排名"
+              type="number"
+              style="width: 30%"
+          />
+          名至
+          <el-input
+              v-model="record.rankEnd"
+              placeholder="可不填"
+              type="number"
+              style="width: 30%"
+          />
+          名
+        </el-form-item>
         <el-form-item label="奖励" prop="coupon">
           <el-select
               v-model="record.coupon"
@@ -310,17 +326,18 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="累积奖励" prop="type">
-          <el-switch
-              style="display: block"
+        <el-form-item label="奖励类型" prop="type">
+          <el-select
               v-model="record.type"
-              active-color="#13ce66"
-              inactive-color="#ff4949"
-              :active-value="1"
-              :inactive-value="0"
-              active-text="累计"
-              inactive-text="单局">
-          </el-switch>
+              placeholder="选择奖励类型"
+              name="type"
+              required
+              class="w100"
+          >
+            <el-option :value="0" label="单局积分">单局积分</el-option>
+            <el-option :value="1" label="累计积分">累计积分</el-option>
+            <el-option :value="2" label="累计排名">累计排名</el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="数量" prop="count">
           <el-input
@@ -422,7 +439,7 @@ export default class extends Vue {
   private tempTagView?: ITagView
 
   private dialogType = 'new'
-  private record: IRewardData = {}
+  private record: IRewardData = { type: 0, count: 1 }
   private dialogVisible = false
   private modalRules = {
     rank: [{ required: true, message: '请输入分数', trigger: 'blur' }
@@ -644,7 +661,14 @@ export default class extends Vue {
   }
 
   private formatRewardType(row: number, column: number, cellValue: number, index: number) {
-    return cellValue === 1 ? '累计' : '单局'
+    switch (cellValue) {
+      case 0:
+        return '单局积分'
+      case 1:
+        return '累计积分'
+      case 2:
+        return '累计排名'
+    }
   }
 
   private formatRank(row: number, column: number, cellValue: string, index: number) {