diff --git a/app.json b/app.json index 02cd417..225597d 100644 --- a/app.json +++ b/app.json @@ -32,13 +32,17 @@ "pages/activityDetail/activityDetail", "pages/activity/activity", "pages/newsDetail/newsDetail", - "pages/newsList/newsList" + "pages/newsList/newsList", + "pages/myActivity/myActivity", + "pages/myVolunteerTeam/myVolunteerTeam", + "pages/myVolunteerActivity/myVolunteerActivity", + "pages/serviceActivityDetail/serviceActivityDetail" ], "window": { "backgroundTextStyle": "light", - "navigationBarBackgroundColor": "#9F1512", + "navigationBarBackgroundColor": "#ffffff", "navigationBarTitleText": "日喀则市数字文化云", - "navigationBarTextStyle": "white" + "navigationBarTextStyle": "black" }, "tabBar": { "color": "#BBBBBB", diff --git a/app.wxss b/app.wxss index 06c6fc9..e69de29 100644 --- a/app.wxss +++ b/app.wxss @@ -1,10 +0,0 @@ -/**app.wxss**/ -.container { - height: 100%; - display: flex; - flex-direction: column; - align-items: center; - justify-content: space-between; - padding: 200rpx 0; - box-sizing: border-box; -} diff --git a/images/activity-on.png b/images/activity-on.png index 1921173..d4985ab 100644 Binary files a/images/activity-on.png and b/images/activity-on.png differ diff --git a/images/activity.png b/images/activity.png index 3890866..7d43536 100644 Binary files a/images/activity.png and b/images/activity.png differ diff --git a/images/center-activity.png b/images/center-activity.png new file mode 100644 index 0000000..2744645 Binary files /dev/null and b/images/center-activity.png differ diff --git a/images/center-img.png b/images/center-img.png new file mode 100644 index 0000000..c987f3e Binary files /dev/null and b/images/center-img.png differ diff --git a/images/center-on.png b/images/center-on.png index c6113bb..390c341 100644 Binary files a/images/center-on.png and b/images/center-on.png differ diff --git a/images/center-order.png b/images/center-order.png new file mode 100644 index 0000000..129ba13 Binary files /dev/null and b/images/center-order.png differ diff --git a/images/center-team-activity.png b/images/center-team-activity.png new file mode 100644 index 0000000..55924af Binary files /dev/null and b/images/center-team-activity.png differ diff --git a/images/center-team.png b/images/center-team.png new file mode 100644 index 0000000..81ae925 Binary files /dev/null and b/images/center-team.png differ diff --git a/images/center.png b/images/center.png index a2171f0..2874e13 100644 Binary files a/images/center.png and b/images/center.png differ diff --git a/images/culture-map.png b/images/culture-map.png new file mode 100644 index 0000000..e5671f4 Binary files /dev/null and b/images/culture-map.png differ diff --git a/images/culture-on.png b/images/culture-on.png index bed0091..9966b6c 100644 Binary files a/images/culture-on.png and b/images/culture-on.png differ diff --git a/images/culture-slide.png b/images/culture-slide.png deleted file mode 100644 index 44e6963..0000000 Binary files a/images/culture-slide.png and /dev/null differ diff --git a/images/culture.png b/images/culture.png index 5154da1..11876b6 100644 Binary files a/images/culture.png and b/images/culture.png differ diff --git a/images/database.png b/images/database.png new file mode 100644 index 0000000..2782a09 Binary files /dev/null and b/images/database.png differ diff --git a/images/index-on.png b/images/index-on.png index 11bb6f1..a04e687 100644 Binary files a/images/index-on.png and b/images/index-on.png differ diff --git a/images/index.png b/images/index.png index 6c08973..7b315a9 100644 Binary files a/images/index.png and b/images/index.png differ diff --git a/images/login-bg.png b/images/login-bg.png deleted file mode 100644 index cc87a61..0000000 Binary files a/images/login-bg.png and /dev/null differ diff --git a/images/man.png b/images/man.png new file mode 100644 index 0000000..9428a0d Binary files /dev/null and b/images/man.png differ diff --git a/images/people-b.png b/images/people-b.png new file mode 100644 index 0000000..69a25f0 Binary files /dev/null and b/images/people-b.png differ diff --git a/images/phone-b.png b/images/phone-b.png new file mode 100644 index 0000000..31d39a1 Binary files /dev/null and b/images/phone-b.png differ diff --git a/images/phone-g.png b/images/phone-g.png new file mode 100644 index 0000000..a3e8c07 Binary files /dev/null and b/images/phone-g.png differ diff --git a/images/play.png b/images/play.png index ab4c6ca..aade38b 100644 Binary files a/images/play.png and b/images/play.png differ diff --git a/images/position-b.png b/images/position-b.png new file mode 100644 index 0000000..fec9a7f Binary files /dev/null and b/images/position-b.png differ diff --git a/images/row-icon-1.png b/images/row-icon-1.png new file mode 100644 index 0000000..935d2f1 Binary files /dev/null and b/images/row-icon-1.png differ diff --git a/images/row-icon-2.png b/images/row-icon-2.png new file mode 100644 index 0000000..3dc8399 Binary files /dev/null and b/images/row-icon-2.png differ diff --git a/images/row-icon-3.png b/images/row-icon-3.png new file mode 100644 index 0000000..d129522 Binary files /dev/null and b/images/row-icon-3.png differ diff --git a/images/row-icon-4.png b/images/row-icon-4.png new file mode 100644 index 0000000..dca9737 Binary files /dev/null and b/images/row-icon-4.png differ diff --git a/images/row-icon-5.png b/images/row-icon-5.png new file mode 100644 index 0000000..5031ca1 Binary files /dev/null and b/images/row-icon-5.png differ diff --git a/images/row-icon-6.png b/images/row-icon-6.png new file mode 100644 index 0000000..ad4cdf0 Binary files /dev/null and b/images/row-icon-6.png differ diff --git a/images/row-icon-7.png b/images/row-icon-7.png new file mode 100644 index 0000000..e21ae2d Binary files /dev/null and b/images/row-icon-7.png differ diff --git a/images/row-icon-8.png b/images/row-icon-8.png new file mode 100644 index 0000000..1f27c6a Binary files /dev/null and b/images/row-icon-8.png differ diff --git a/images/selected-l.png b/images/selected-l.png deleted file mode 100644 index e2dccf4..0000000 Binary files a/images/selected-l.png and /dev/null differ diff --git a/images/selected-r.png b/images/selected-r.png deleted file mode 100644 index 13d9275..0000000 Binary files a/images/selected-r.png and /dev/null differ diff --git a/images/tab1.png b/images/tab1.png index ca72309..6c919e9 100644 Binary files a/images/tab1.png and b/images/tab1.png differ diff --git a/images/tab2.png b/images/tab2.png index 4a1a40d..3674872 100644 Binary files a/images/tab2.png and b/images/tab2.png differ diff --git a/images/tab3.png b/images/tab3.png index 38ea9ba..767504b 100644 Binary files a/images/tab3.png and b/images/tab3.png differ diff --git a/images/tab4.png b/images/tab4.png index cd01619..25470b9 100644 Binary files a/images/tab4.png and b/images/tab4.png differ diff --git a/images/tab5.png b/images/tab5.png index 3d8f906..333f3e6 100644 Binary files a/images/tab5.png and b/images/tab5.png differ diff --git a/images/tab6.png b/images/tab6.png index 22c3870..11973f2 100644 Binary files a/images/tab6.png and b/images/tab6.png differ diff --git a/images/tab7.png b/images/tab7.png index 4d22afd..2730bc2 100644 Binary files a/images/tab7.png and b/images/tab7.png differ diff --git a/images/tab8.png b/images/tab8.png new file mode 100644 index 0000000..98ba246 Binary files /dev/null and b/images/tab8.png differ diff --git a/images/tab9.png b/images/tab9.png new file mode 100644 index 0000000..c675e15 Binary files /dev/null and b/images/tab9.png differ diff --git a/images/team-activity.png b/images/team-activity.png new file mode 100644 index 0000000..55924af Binary files /dev/null and b/images/team-activity.png differ diff --git a/images/time-g.png b/images/time-g.png new file mode 100644 index 0000000..7d0a0be Binary files /dev/null and b/images/time-g.png differ diff --git a/images/upload-team-avatar.png b/images/upload-team-avatar.png new file mode 100644 index 0000000..c4533c2 Binary files /dev/null and b/images/upload-team-avatar.png differ diff --git a/images/upload-xc.png b/images/upload-xc.png new file mode 100644 index 0000000..5661deb Binary files /dev/null and b/images/upload-xc.png differ diff --git a/images/user-avatar.png b/images/user-avatar.png deleted file mode 100644 index f8e61a9..0000000 Binary files a/images/user-avatar.png and /dev/null differ diff --git a/images/venue-on.png b/images/venue-on.png index b03315d..e33acc7 100644 Binary files a/images/venue-on.png and b/images/venue-on.png differ diff --git a/images/venue.png b/images/venue.png index 125f968..2c991fa 100644 Binary files a/images/venue.png and b/images/venue.png differ diff --git a/images/venueall.png b/images/venueall.png index 0c985ad..06187ae 100644 Binary files a/images/venueall.png and b/images/venueall.png differ diff --git a/images/volunteer-register.png b/images/volunteer-register.png new file mode 100644 index 0000000..4ae767b Binary files /dev/null and b/images/volunteer-register.png differ diff --git a/images/volunteer-team.png b/images/volunteer-team.png new file mode 100644 index 0000000..6184dc3 Binary files /dev/null and b/images/volunteer-team.png differ diff --git a/images/woman.png b/images/woman.png new file mode 100644 index 0000000..d867a7c Binary files /dev/null and b/images/woman.png differ diff --git a/images/work-time.png b/images/work-time.png new file mode 100644 index 0000000..79e08f0 Binary files /dev/null and b/images/work-time.png differ diff --git a/pages/activity/activity.wxml b/pages/activity/activity.wxml index c1644db..da3c954 100644 --- a/pages/activity/activity.wxml +++ b/pages/activity/activity.wxml @@ -6,18 +6,21 @@ - - - - {{item.activityTitle}} - 报名中 + 报名中 报名人数已满 停止报名 进行中 直接进入 已结束 + + + + {{item.activityTitle}} + + + + {{item.activityStartTime}}至{{item.activityEndTime}} - {{item.activityStartTime}}至{{item.activityEndTime}} \ No newline at end of file diff --git a/pages/activity/activity.wxss b/pages/activity/activity.wxss index 0e9e5ff..c5fadf2 100644 --- a/pages/activity/activity.wxss +++ b/pages/activity/activity.wxss @@ -4,7 +4,7 @@ } .activity-box{ margin-bottom: 20rpx; - box-shadow:0px 0px 17rpx 0px rgba(0,0,0,0.1); + box-shadow: 0px 2px 8px 0px rgba(35, 24, 21, 0.1); border-radius: 10rpx; overflow: hidden; } @@ -47,26 +47,36 @@ justify-content: space-between; } .activity-title{ - width: 70%; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; font-size: 32rpx; color: #242424; line-height: 40rpx; + font-weight: bold; } .sign{ - background: rgba(159,21,18,.1); - color: #9F1512; - border-radius: 10rpx; - padding: 0 20rpx; + position: absolute; + top:0; + right: 0; + background: linear-gradient(90deg, rgba(21, 113, 250, 0.97), rgba(21, 183, 250, 0.97)); + color: #fff; + border-top-left-radius: 0; + border-top-right-radius: 10rpx; + border-bottom-left-radius: 20rpx; + border-bottom-right-radius: 0; + padding: 5rpx 20rpx; line-height: 40rpx; font-size: 28rpx; } .date{ margin-top: 10rpx; font-size: 24rpx; - color: #242424; + color: #999; +} +.date image{ + width: 20rpx; + height: 20rpx; } .area{ position: fixed; @@ -87,5 +97,5 @@ font-size: 30rpx; } .area-box.active{ - color: #9F1512; + color: #125CE1; } \ No newline at end of file diff --git a/pages/activityDetail/activityDetail.wxml b/pages/activityDetail/activityDetail.wxml index 7b5dca2..72fcbba 100644 --- a/pages/activityDetail/activityDetail.wxml +++ b/pages/activityDetail/activityDetail.wxml @@ -7,19 +7,17 @@ {{dataMap.activityTitle}} + + {{dataMap.activityStartTime}}至{{dataMap.activityEndTime}} + - + 活动人数： {{dataMap.activityUserNum }} - - 活动时间： - {{dataMap.activityStartTime}}至{{dataMap.activityEndTime}} - - - + 活动地址： {{dataMap.activityAddress }} diff --git a/pages/activityDetail/activityDetail.wxss b/pages/activityDetail/activityDetail.wxss index 8808df0..571c9a0 100644 --- a/pages/activityDetail/activityDetail.wxss +++ b/pages/activityDetail/activityDetail.wxss @@ -6,20 +6,27 @@ swiper { height: 100%; } .activity-detail{ - position: absolute; - left: 0; - right: 0; - top: 430rpx; + padding: 0 30rpx; + box-sizing: border-box; + position: relative; + width: 710rpx; + margin: -50rpx auto 20rpx; background: #fff; border-radius:30rpx 30rpx 0px 0px; overflow: hidden; padding-bottom: 120rpx; + box-shadow: 0px 2px 8px 0px rgba(35, 24, 21, 0.1); } -.activity-title, .activity-info{ - padding: 30rpx; +.activity-title{ + padding: 30rpx 0; font-size: 32rpx; - color: #242424; - border-bottom: 5px solid #FBFBFB; + color: #122939; + font-weight: bold; +} +.activity-info{ + padding: 30rpx 0; + font-size: 32rpx; + color: #122939; } .activity-text{ line-height: 35rpx; @@ -29,19 +36,19 @@ swiper { .activity-text:last-child{ margin-bottom: 0; } -.activity-info image{ - width: 35rpx; - height: 35rpx; +.people{ + width: 24rpx; + height: 20rpx; + margin-right: 10rpx; +} +.position{ + width: 20rpx; + height: 24rpx; margin-right: 10rpx; - vertical-align: middle; - margin-top: -5rpx; } .activity-text text{ color: #BBBBBB; } -.activity-container{ - padding: 30rpx; -} .part{ margin-bottom: 30rpx; } @@ -49,11 +56,10 @@ swiper { margin-bottom: 0; } .part-title{ - border-left: 3px solid #9F1512; - color: #242424; - padding-left: 10rpx; - font-size: 30rpx; + color: #122939; + font-size: 32rpx; margin-bottom: 10rpx; + font-weight: bold; } .part-content{ font-size: 28rpx; @@ -88,4 +94,8 @@ swiper { align-items: center; font-size: 30rpx; color: #fff; +} +.activity-date{ + font-size: 28rpx; + color: #999; } \ No newline at end of file diff --git a/pages/activityDialog/activityDialog.wxml b/pages/activityDialog/activityDialog.wxml index 48a8c04..a0ac26f 100644 --- a/pages/activityDialog/activityDialog.wxml +++ b/pages/activityDialog/activityDialog.wxml @@ -1,8 +1,8 @@ - + 暂无评论 - + @@ -10,7 +10,7 @@