diff --git a/src/assets/css/index.less b/src/assets/css/index.less index eb3209d..74d70a3 100644 --- a/src/assets/css/index.less +++ b/src/assets/css/index.less @@ -25,6 +25,7 @@ body #app { align-items: center; :nth-child(1){ font-family:pingfang-bold; + font-size: 17px; } :nth-child(2){ color: #B4B4B4; @@ -94,7 +95,7 @@ body #app { &-top5{ margin-top: 5px; } - &-bottom{ + &-bottom5{ margin-bottom: 5px; } &-right10{ @@ -109,6 +110,9 @@ body #app { &-top18{ margin-top: 18px; } + &-bot50{ + margin-bottom: 50px; + } } .p{ @@ -174,6 +178,9 @@ body #app { width: 20px; height: 20px; } + &_round{ + border-radius: 5px; + } } .font-size13{ font-size: 13px; @@ -187,3 +194,11 @@ body #app { .font-bold{ font-weight: bold; } +.bot_btn{ + position: fixed; + bottom: 0; + left: 0; + background: #ffffff; + width: 100%; + right: 0; +} diff --git a/src/assets/images/icons/add.png b/src/assets/images/icons/add.png new file mode 100644 index 0000000..555816a Binary files /dev/null and b/src/assets/images/icons/add.png differ diff --git a/src/assets/images/icons/del.png b/src/assets/images/icons/del.png new file mode 100644 index 0000000..dfb37f4 Binary files /dev/null and b/src/assets/images/icons/del.png differ diff --git a/src/assets/images/icons/share.png b/src/assets/images/icons/share.png new file mode 100644 index 0000000..b010b3c Binary files /dev/null and b/src/assets/images/icons/share.png differ diff --git a/src/plugins/vant.js b/src/plugins/vant.js index b45ecb4..11d79fa 100644 --- a/src/plugins/vant.js +++ b/src/plugins/vant.js @@ -26,7 +26,8 @@ import { Search, Swipe, SwipeItem, - NoticeBar + NoticeBar, + CellGroup } from 'vant' Vue.use(Button) @@ -54,4 +55,5 @@ Vue.use(Button) .use(Search) .use(Swipe) .use(SwipeItem) - .use(NoticeBar) \ No newline at end of file + .use(NoticeBar) + .use(CellGroup) \ No newline at end of file diff --git a/src/router/router.config.js b/src/router/router.config.js index fd7bf41..cd1f57b 100644 --- a/src/router/router.config.js +++ b/src/router/router.config.js @@ -78,11 +78,20 @@ export const constantRouterMap = [ name: 'selectAgency', component: () => import('@/views/selectAgency'), meta: { title: '选择所在社区', keepAlive: false } - } - ,{ + },{ path: '/houseQR', name: 'houseQR', component: () => import('@/views/houseQR'), meta: { title: '电子门牌', keepAlive: false } + },{ + path: '/activity', + name: 'activity', + component: () => import('@/views/activity'), + meta: { title: '社区活动', keepAlive: false } + },{ + path: '/activityDetail', + name: 'activityDetail', + component: () => import('@/views/activity/detail'), + meta: { title: '活动详情', keepAlive: false } } ] diff --git a/src/views/activity/detail.vue b/src/views/activity/detail.vue new file mode 100644 index 0000000..595bd96 --- /dev/null +++ b/src/views/activity/detail.vue @@ -0,0 +1,92 @@ + + + + + diff --git a/src/views/activity/index.vue b/src/views/activity/index.vue new file mode 100644 index 0000000..8c6b0af --- /dev/null +++ b/src/views/activity/index.vue @@ -0,0 +1,105 @@ + + + + + diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 24834f1..909602e 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -56,21 +56,21 @@
社区活动 - 更多 + 更多
-
- +
+
-
{{ item.title }}
+
{{ item.activityName }}
地点:{{ item.address }}
-
时间:{{ item.date }}
+
时间:{{ item.startTime }}
- 报名人数: {{ item.resiNum }}/{{ item.total }}人 + 报名人数: {{ item.participants }}/{{ item.participants }}人
报名 + @click="handelClickJump('activity')" :disabled="item.online !== 1">报名
@@ -135,24 +135,7 @@ export default { path: 'service' } ], - activityList: [ - { - title: '社区活动测试测试测试时杀死还是上海市普陀区金沙江路', - address: '上海市普陀区金沙江路 1518 弄上海市普陀区金沙江路', - date: '2021-09-22', - imgSrc: require('@/assets/images/zhishu1.png'), - resiNum: 10, - total: 50 - }, - { - title: '社区活动测试测试测试时杀死还是上海市普陀区金沙江路', - address: '上海市普陀区金沙江路 1518 弄上海市普陀区金沙江路', - date: '2021-09-22', - imgSrc: require('@/assets/images/zhishu1.png'), - resiNum: 10, - total: 50 - } - ], + activityList: [], eventList: [ { total: 100, @@ -190,7 +173,7 @@ export default { } let res = await communityActivity(parm) if (res) { - console.log(res); + this.activityList = res.list } }, handelClickJump(path) {