From 0b848318eddfd8e02617fe647f13fd71d4291bd8 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 12 Dec 2022 13:17:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A8=E8=AE=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/api.js                      |  4 ++--
 src/views/moreActive/MoreActive.vue | 29 +++++++++--------------------
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/src/api/api.js b/src/api/api.js
index 9358e99..a44d761 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -15,8 +15,8 @@ export const ROUTER_CHAPTER_LIST = '/stu/router/chapterList'
 export const ROUTER_LIST = '/stu/router/list post'
 export const ROUTER_PROCESS = '/stu/router/process'
 export const ROUTER_UNCOMPLETE_LIST = '/stu/router/unCompleteTaskList'
-export const TAS_ACTIVITY_DETAIL = '/stu/task/activity/detail'
-export const TASK_ACTIVITY_SIGN = '/stu/task/activity/sign'
+export const TAS_ACTIVITY_DETAIL = '/activity'
+export const TASK_ACTIVITY_SIGN = '/activitySubmit/updateActivitySignInStatus post'
 export const TASK_BROADCAST_COMMIT = '/stu/task/broadcast/commit'
 export const TASK_BROADCAST_DETAIL = '/stu/task/broadcast/detail'
 export const TASK_BROADCAST_SIGN = '/stu/task/broadcast/sign'
diff --git a/src/views/moreActive/MoreActive.vue b/src/views/moreActive/MoreActive.vue
index 9387653..968cc95 100644
--- a/src/views/moreActive/MoreActive.vue
+++ b/src/views/moreActive/MoreActive.vue
@@ -21,10 +21,10 @@
     <div class="bascinfo">
       <div style="margin-left: 46px">
         <!--        <div class="title">【其他活动】管理者进阶腾飞班 - 专属线下活动</div>-->
-        <div class="title">{{ data.detail?.workName }}</div>
+        <div class="title">{{ data?.activityName }}</div>
         <div class="time" style="margin-top: 26px">
           <img width="15px" height="17px" src="../../assets/image/time.png"/>
-          <div style="margin-left: 8px">{{ data.detail?.createTime }}</div>
+          <div style="margin-left: 8px">{{ data?.createTime }}</div>
         </div>
         <div class="time" style="margin-top: 23px">
           <img
@@ -32,10 +32,10 @@
               height="18px"
               src="../../assets/image/position.png"
           />
-          <div style="margin-left: 8px">{{ data.detail?.workEnclosureAddress }}</div>
+          <div style="margin-left: 8px">{{ data?.activityAddress }}</div>
         </div>
       </div>
-      <div class="btn" v-if="!data.signFlag" @click="signClick">签到</div>
+      <div class="btn" v-if="!data.activityFlag" @click="signClick">签到</div>
     </div>
     <!-- 基本信息 -->
 
@@ -54,7 +54,7 @@
               <div class="box"></div>
             </div>
             <div style="display: flex; align-items: center">
-              <div class="content" v-html="data.detail?.workRequirement"></div>
+              <div class="content" v-html="data?.activityExplain"></div>
             </div>
           </div>
         </div>
@@ -70,17 +70,7 @@
         </div>
         <!--        todo #活动任务详情 活动公告没有-->
         <div class="content">
-          为拓宽人民群众的表达途径、畅听民意，及时了解
-          和解决人民群众反映强烈的公共法律服务问题，我
-          局将在浈江区公共法律服务中心开展领导干部接待
-          活动，现将2022年8月的活动安排公告如下：<br/>
-          一、接待时间 <br/>
-          工作日上午9:00-12:00。<br/>
-          二、接待地点<br/>
-          浈江区公共法律服务中心（浈江区新韶镇乐土路3号
-          曲仁田螺冲党群服务中心一楼）。<br/>
-          三、接待受理范围 <br/>（一）听取人民群众对公共法律服务工作的批评和
-          意见建议。 <br/>（二）解答或接收公共法律服务相关业务咨询。<br/>
+          {{ data.activityNotice }}
         </div>
       </div>
     </div>
@@ -93,12 +83,11 @@
 import {TAS_ACTIVITY_DETAIL, TASK_ACTIVITY_SIGN} from "@/api/api";
 import {request, useRequest} from "@/api/request";
 
-const {data} = useRequest(TAS_ACTIVITY_DETAIL, {})
+const {data} = useRequest(TAS_ACTIVITY_DETAIL, {activityId: 22})
 
 const signClick = (tab, event) => {
-  request(TASK_ACTIVITY_SIGN, {}).then(res => {
-    console.log(22)
-    data.value.signFlag = 1
+  request(TASK_ACTIVITY_SIGN, {activitySubmitId:data.activityId,signInStatus:1}).then(res => {
+    data.value.activityFlag = 1
   })
 };
 </script>