From f3abdcc830eb6c9d145b5feeb12cfaf06a8f4d87 Mon Sep 17 00:00:00 2001
From: hukai <huzhengen@163.com>
Date: Mon, 5 Jul 2021 17:22:08 +0800
Subject: [PATCH 1/2] get current task

---
 src/views/dashboard/components/NewTask.vue | 41 ++++++++++++++++++----
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/src/views/dashboard/components/NewTask.vue b/src/views/dashboard/components/NewTask.vue
index 82e396f..b8eaeb1 100644
--- a/src/views/dashboard/components/NewTask.vue
+++ b/src/views/dashboard/components/NewTask.vue
@@ -1,10 +1,10 @@
 <template>
-  <a-card :hoverable="true" title="新手任务">
-    <h3>创建店铺</h3>
-    <p>注册有赞账号，并成功创建店铺，即算完成任务</p>
+  <a-card :hoverable="true" :title="taskData.taskCategoryName">
+    <h3>{{ taskData.title }}</h3>
+    <p>{{ taskData.description }}</p>
     <a-row type="flex" justify="space-between" align="bottom">
       <a-col :span="4">
-        <p class="height-100">奖励：+5 有赞币</p>
+        <p class="height-100">奖励：+{{taskData.timeMoney}} 有赞币</p>
       </a-col>
       <a-col :span="4" align="right">
         <p class="height-80">
@@ -16,12 +16,39 @@
   </a-card>
 </template>
 
-<script>
-import { defineComponent } from 'vue'
+<script lang="ts">
+import { defineComponent, reactive } from 'vue'
+import request from '@/utils/request'
 
 export default defineComponent({
   setup() {
-    return {}
+    let taskData = reactive({
+      createTime: '',
+      description: '',
+      id: 0,
+      taskCategoryId: 0,
+      taskCategoryName: '',
+      timeMoney: 0,
+      title: '',
+      updateTime: '',
+      weight: 0,
+    })
+
+    request.get('/api/task/getCurrent').then((res) => {
+      taskData.createTime = res.createTime
+      taskData.description = res.description
+      taskData.id = res.id
+      taskData.taskCategoryId = res.taskCategoryId
+      taskData.taskCategoryName = res.taskCategoryName
+      taskData.timeMoney = res.timeMoney
+      taskData.title = res.title
+      taskData.updateTime = res.updateTime
+      taskData.weight = res.weight
+    })
+
+    return {
+      taskData,
+    }
   },
 })
 </script>
-- 
Gitee


From 47aa988410dbffa83e4f4156ae7323ddb8e74d95 Mon Sep 17 00:00:00 2001
From: hukai <huzhengen@163.com>
Date: Mon, 5 Jul 2021 17:32:29 +0800
Subject: [PATCH 2/2] let -> const

---
 src/views/dashboard/components/NewTask.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/dashboard/components/NewTask.vue b/src/views/dashboard/components/NewTask.vue
index b8eaeb1..38b86a4 100644
--- a/src/views/dashboard/components/NewTask.vue
+++ b/src/views/dashboard/components/NewTask.vue
@@ -22,7 +22,7 @@ import request from '@/utils/request'
 
 export default defineComponent({
   setup() {
-    let taskData = reactive({
+    const taskData = reactive({
       createTime: '',
       description: '',
       id: 0,
-- 
Gitee