diff --git a/pages.json b/pages.json index 7853156..c86f1a1 100644 --- a/pages.json +++ b/pages.json @@ -40,6 +40,13 @@ "navigationBarTitleText": "计划列表" } }, + { + "path": "pages/index/uploadPhoto", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "上传图片" + } + }, { "path": "pages/my/index", "style": { diff --git a/pages/index/planList.vue b/pages/index/planList.vue index 4c85a11..1dee9a6 100644 --- a/pages/index/planList.vue +++ b/pages/index/planList.vue @@ -3,39 +3,76 @@ - 424242 + + + + - + 已完成计划 12 - + 未完成计划 - 5 + 12 - + - - + + 05-21 + 1天前 - - 校门A区教学楼 - + + + 校门A区教学楼 + + + + 北大门右侧操场跑道/南广场升旗台/A区第二食堂3楼 + - - 北大门右侧操场跑道/南广场升旗台/A区第二食堂3楼 + + + + + 05-21 + 1天前 + + + + 校门A区教学楼 + + + + 北大门右侧操场跑道/南广场升旗台/A区第二食堂3楼 + @@ -45,10 +82,16 @@ @@ -56,34 +99,115 @@ export default { .content { height: 100vh; background: #f7f8fc; - .selectTab{ - padding: 42rpx 90rpx; + .selectTab { display: flex; - justify-content: space-between; - // background: ; - .tab-item{ - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - width: 50%; - background: #fff; - .label{ + background: linear-gradient(to right, #383edd, #4874f6); + border-radius: 16rpx; + padding: 32rpx; + margin: 0 32rpx 32rpx; + + .tab-item { + flex: 1; + text-align: center; + position: relative; + transition: all 0.3s; + position: relative; + z-index: 999; + + .label { font-size: 28rpx; - color: #333; + color: rgba(255, 255, 255, 0.8); + margin-bottom: 8rpx; } - .count{ - font-size: 24rpx; - color: #999; + + .count { + font-size: 36rpx; + color: #ffffff; + font-weight: 500; + } + + &.active { + .label { + color: #ffffff; + font-weight: 500; + } + + &::after { + content: ""; + position: absolute; + bottom: -46rpx; + left: 50%; + transform: translateX(-50%) rotate(45deg); + width: 32rpx; + height: 32rpx; + background: #383edd; + border-radius: 10rpx; + z-index: 1; + } + + &::before { + content: ""; + position: absolute; + bottom: -34rpx; + left: 50%; + transform: translateX(-50%); + width: 8rpx; + height: 8rpx; + background: #ffffff; + border-radius: 4rpx; + z-index: 2; + } } } } .planList { padding: 0 32rpx; .plan-item { + border-radius: 16rpx; margin-top: 32rpx; - padding: 32rpx; - background: #fff; + background: linear-gradient( + to bottom, + #edf2ff 0%, + #fafcff 30%, + #ffffff 100% + ); + .plan-header { + display: flex; + align-items: center; + justify-content: flex-start; + gap: 20rpx; + padding: 20rpx; + border-bottom: 1px solid #f2f2f2; + } + .plan-content { + padding: 20rpx; + padding-bottom: 32rpx; + &-top { + display: flex; + justify-content: space-between; + align-items: center; + .place { + font-size: 32rpx; + color: #333; + } + } + &-main { + margin-top: 32rpx; + background-color: #f3f3f3; + padding: 32rpx; + border-radius: 16rpx; + } + } + } + &.activeList { + .plan-item { + background: linear-gradient( + to bottom, + #fef7ec 0%, + #fffdfa 30%, + #ffffff 100% + ); + } } } } diff --git a/pages/index/uploadPhoto.vue b/pages/index/uploadPhoto.vue new file mode 100644 index 0000000..cef8479 --- /dev/null +++ b/pages/index/uploadPhoto.vue @@ -0,0 +1,238 @@ + + + + + diff --git a/pages/user/index.vue b/pages/user/index.vue index cea8c18..761186e 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -68,17 +68,17 @@ export default { cellList: [ { title: "单位信息", - icon: "/static/images/pos-icon.png", + icon: "/static/images/icon-unit.png", path: "/pages/user/unitInfo/index", }, { title: "版本信息", - icon: "/static/images/pos-icon.png", + icon: "/static/images/icon-info.png", path: "/pages/user/versionInfo/index", }, { title: "注销", - icon: "/static/images/pos-icon.png", + icon: "/static/images/icon-logout.png", path: "", }, ], diff --git a/static/iconfont/more.svg b/static/iconfont/more.svg new file mode 100644 index 0000000..e933d9f --- /dev/null +++ b/static/iconfont/more.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/images/icon-date.png b/static/images/icon-date.png new file mode 100644 index 0000000..455faf4 Binary files /dev/null and b/static/images/icon-date.png differ diff --git a/static/images/icon-info.png b/static/images/icon-info.png new file mode 100644 index 0000000..a329ac0 Binary files /dev/null and b/static/images/icon-info.png differ diff --git a/static/images/icon-logout.png b/static/images/icon-logout.png new file mode 100644 index 0000000..0c9cf31 Binary files /dev/null and b/static/images/icon-logout.png differ diff --git a/static/images/icon-unit.png b/static/images/icon-unit.png new file mode 100644 index 0000000..6f62b38 Binary files /dev/null and b/static/images/icon-unit.png differ diff --git a/static/images/message-error.png b/static/images/message-error.png new file mode 100644 index 0000000..5d42890 Binary files /dev/null and b/static/images/message-error.png differ diff --git a/static/images/message-success.png b/static/images/message-success.png new file mode 100644 index 0000000..da020b3 Binary files /dev/null and b/static/images/message-success.png differ