diff --git a/public/index.html b/public/index.html index 80c65d1..9b7626f 100644 --- a/public/index.html +++ b/public/index.html @@ -14,6 +14,7 @@
+ diff --git a/src/api/activity.js b/src/api/activity.js index 6d8982d..163b0ec 100644 --- a/src/api/activity.js +++ b/src/api/activity.js @@ -9,3 +9,10 @@ export function addActivityRecord(data) { data }) } +export function detail(id) { + return request({ + url: `/actual/base/communityActivity/detail/${id}`, + method: 'get', + + }) +} diff --git a/src/api/demand.js b/src/api/demand.js index d494614..d7a64cf 100644 --- a/src/api/demand.js +++ b/src/api/demand.js @@ -53,4 +53,4 @@ export function icEventOldProcess(data) { method: 'post', data }) -} +} \ No newline at end of file diff --git a/src/api/user.js b/src/api/user.js index 503ae0f..d16b2e0 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -124,18 +124,26 @@ export function getWxmpEventAndDemandMessageList(params) { }) } // 获取组织树 -export function getAllOrgTreeList(params) { +export function getAllOrgTreeList(data) { return request({ url: `/gov/org/customerAgencyTree/getAllOrgTreeList`, - method: 'get', - params + method: 'post', + data }) } //获取可享服务 -export function myCommonsService(params) { +export function myCommonsService(data) { return request({ url: `/actual/base/residentBaseInfo/myCommonsService`, method: 'post', - params + data }) -} \ No newline at end of file +} +//获取可享服务详情 +export function icServiceWarmRecord(data) { + return request({ + url: `/governance/icServiceWarmRecord/detail`, + method: 'post', + data + }) +} diff --git a/src/assets/css/index.less b/src/assets/css/index.less index fa68d0f..948dcbe 100644 --- a/src/assets/css/index.less +++ b/src/assets/css/index.less @@ -278,6 +278,11 @@ body #app { .font-bold{ font-weight: bold; } +.text{ + &-right{ + text-align: right; + } +} .bot_btn{ position: fixed; bottom: 0; diff --git a/src/assets/images/discusion/left-bg.png b/src/assets/images/discusion/left-bg.png new file mode 100644 index 0000000..54290fd Binary files /dev/null and b/src/assets/images/discusion/left-bg.png differ diff --git a/src/assets/images/discusion/right-bg.png b/src/assets/images/discusion/right-bg.png new file mode 100644 index 0000000..70ab235 Binary files /dev/null and b/src/assets/images/discusion/right-bg.png differ diff --git a/src/views/Enjoyableservices/index.vue b/src/views/Enjoyableservices/index.vue index 954035d..55c21ff 100644 --- a/src/views/Enjoyableservices/index.vue +++ b/src/views/Enjoyableservices/index.vue @@ -3,16 +3,16 @@
-
+
{{ item.status? "进行中":"已结束" }} {{ item.status? "进行中":"已结束" }} -
{{ item.date }}
+
{{ item.startDate }}
{{ item.title }}
享受服务条件：
-
{{ item.context }}
+
{{ item.resiSearchTagName }}
@@ -24,14 +24,7 @@ import { myCommonsService } from '@/api/user' export default{ data(){ return{ - EnjoyableList:[ - {status:0, date:'2024-05-08 09:30',title:'鞠源社区为退役待就业的军人提供就业岗位。', - context:'退役军人 40-60岁'}, - {status:1, date:'2024-05-08 09:30',title:'鞠源社区为退役待就业的军人提供就业岗位。', - context:'退役军人 40-60岁'}, - {status:2, date:'2024-05-08 09:30',title:'鞠源社区为退役待就业的军人提供就业岗位。', - context:'退役军人 40-60岁'}, - ], + EnjoyableList:[], finished: false, loading: true, showRegister: false, diff --git a/src/views/activity/detail.vue b/src/views/activity/detail.vue index e0f4e0f..4a25d26 100644 --- a/src/views/activity/detail.vue +++ b/src/views/activity/detail.vue @@ -44,7 +44,7 @@