diff --git a/pages.json b/pages.json index c86f1a1..820c8aa 100644 --- a/pages.json +++ b/pages.json @@ -7,7 +7,7 @@ { "path": "pages/index/index", "style": { - "navigationBarTitleText": "首页" + "navigationBarTitleText": "今日计划" } }, { @@ -206,23 +206,23 @@ "borderStyle": "white", "list": [ { - "pagePath": "pages/index/index", - "iconPath": "static/tab/home.png", - "selectedIconPath": "static/tab/home_cur.png", - "text": "首页" - }, - { - "pagePath": "pages/index/list", + "pagePath": "pages/index/planList", "iconPath": "static/tab/list.png", "selectedIconPath": "static/tab/list_cur.png", "text": "计划" }, { - "pagePath": "pages/my/index", - "iconPath": "static/tab/my.png", - "selectedIconPath": "static/tab/my_cur.png", - "text": "我的" + "pagePath": "pages/index/index", + "iconPath": "static/tab/home.png", + "selectedIconPath": "static/tab/home_cur.png", + "text": "首页" }, + // { + // "pagePath": "pages/my/index", + // "iconPath": "static/tab/my.png", + // "selectedIconPath": "static/tab/my_cur.png", + // "text": "我的" + // }, { "pagePath": "pages/user/index", "iconPath": "static/tab/my.png", diff --git a/pages/index/planList.vue b/pages/index/planList.vue index 36b05e2..6e585f8 100644 --- a/pages/index/planList.vue +++ b/pages/index/planList.vue @@ -8,19 +8,15 @@ :border-bottom="false" > - + + - + 05-21 1天前 @@ -67,7 +67,11 @@ - + 05-21 1天前 @@ -90,13 +94,27 @@ export default { data() { return { activeTab: "completed", + + maxDate: "2049-12-31", + + showCalendar: false, + dateRange: "", }; }, created() {}, methods: { + toggleDate() { + this.showCalendar = !this.showCalendar; + }, switchTab(tab) { this.activeTab = tab; }, + + changeDate(e) { + console.log('333',e); + + this.dateRange = e; + }, }, }; @@ -122,7 +140,7 @@ export default { position: relative; transition: all 0.3s; position: relative; - z-index: 999; + z-index: 1; .label { font-size: 28rpx; diff --git a/pages/user/index.vue b/pages/user/index.vue index 891464b..7719197 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -3,11 +3,11 @@ - 登录/注册 - + 张三 + - + {{ item.content }} + @@ -64,9 +70,10 @@ export default { cellList: [ { - title: "单位信息", + title: "任职周期", icon: "/static/images/icon-unit.png", - path: "/pages/user/unitInfo/index", + path: "", + content: "2025-01-01~2025-12-31", }, { title: "版本信息",