diff --git a/package-lock.json b/package-lock.json index 5ee691a..b8f24bd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,6 +22,12 @@ "@dcloudio/uni-mp-weixin": "3.0.0-4000820240401001", "@dcloudio/uni-mp-xhs": "3.0.0-4000820240401001", "@dcloudio/uni-quickapp-webview": "3.0.0-4000820240401001", + "@fullcalendar/core": "^6.1.15", + "@fullcalendar/daygrid": "^6.1.15", + "@fullcalendar/interaction": "^6.1.15", + "@fullcalendar/list": "^6.1.15", + "@fullcalendar/timegrid": "^6.1.15", + "@fullcalendar/vue3": "^6.1.15", "@jridgewell/sourcemap-codec": "^1.4.15", "@qiun/wx-ucharts": "2.5.0-20230101", "@ttou/uview-typings": "^2.0.5", @@ -2868,6 +2874,58 @@ "node": ">=12" } }, + "node_modules/@fullcalendar/core": { + "version": "6.1.15", + "resolved": "http://npm.ezbim.cn:3038/@fullcalendar/core/-/core-6.1.15.tgz", + "integrity": "sha512-BuX7o6ALpLb84cMw1FCB9/cSgF4JbVO894cjJZ6kP74jzbUZNjtwffwRdA+Id8rrLjT30d/7TrkW90k4zbXB5Q==", + "dependencies": { + "preact": "~10.12.1" + } + }, + "node_modules/@fullcalendar/daygrid": { + "version": "6.1.15", + "resolved": "http://npm.ezbim.cn:3038/@fullcalendar/daygrid/-/daygrid-6.1.15.tgz", + "integrity": "sha512-j8tL0HhfiVsdtOCLfzK2J0RtSkiad3BYYemwQKq512cx6btz6ZZ2RNc/hVnIxluuWFyvx5sXZwoeTJsFSFTEFA==", + "peerDependencies": { + "@fullcalendar/core": "~6.1.15" + } + }, + "node_modules/@fullcalendar/interaction": { + "version": "6.1.15", + "resolved": "http://npm.ezbim.cn:3038/@fullcalendar/interaction/-/interaction-6.1.15.tgz", + "integrity": "sha512-DOTSkofizM7QItjgu7W68TvKKvN9PSEEvDJceyMbQDvlXHa7pm/WAVtAc6xSDZ9xmB1QramYoWGLHkCYbTW1rQ==", + "peerDependencies": { + "@fullcalendar/core": "~6.1.15" + } + }, + "node_modules/@fullcalendar/list": { + "version": "6.1.15", + "resolved": "http://npm.ezbim.cn:3038/@fullcalendar/list/-/list-6.1.15.tgz", + "integrity": "sha512-U1bce04tYDwkFnuVImJSy2XalYIIQr6YusOWRPM/5ivHcJh67Gm8CIMSWpi3KdRSNKFkqBxLPkfZGBMaOcJYug==", + "peerDependencies": { + "@fullcalendar/core": "~6.1.15" + } + }, + "node_modules/@fullcalendar/timegrid": { + "version": "6.1.15", + "resolved": "http://npm.ezbim.cn:3038/@fullcalendar/timegrid/-/timegrid-6.1.15.tgz", + "integrity": "sha512-61ORr3A148RtxQ2FNG7JKvacyA/TEVZ7z6I+3E9Oeu3dqTf6M928bFcpehRTIK6zIA6Yifs7BeWHgOE9dFnpbw==", + "dependencies": { + "@fullcalendar/daygrid": "~6.1.15" + }, + "peerDependencies": { + "@fullcalendar/core": "~6.1.15" + } + }, + "node_modules/@fullcalendar/vue3": { + "version": "6.1.15", + "resolved": "http://npm.ezbim.cn:3038/@fullcalendar/vue3/-/vue3-6.1.15.tgz", + "integrity": "sha512-ctfTICGrNEIj7gmLHQcUYe0WzDTSW5Vd9hyOnVChxPU75AZU9WqdDMkHwJYnfNxNhT6QQuiMHq/qsRRd5zQwOw==", + "peerDependencies": { + "@fullcalendar/core": "~6.1.15", + "vue": "^3.0.11" + } + }, "node_modules/@intlify/core-base": { "version": "9.1.9", "resolved": "https://registry.npmmirror.com/@intlify/core-base/-/core-base-9.1.9.tgz", @@ -10787,6 +10845,15 @@ "resolved": "https://registry.npmmirror.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==" }, + "node_modules/preact": { + "version": "10.12.1", + "resolved": "http://npm.ezbim.cn:3038/preact/-/preact-10.12.1.tgz", + "integrity": "sha512-l8386ixSsBdbreOAkqtrwqHwdvR35ID8c3rKPa8lCWuO86dBi32QWHV4vfsZK1utLLFMvw+Z5Ad4XLkZzchscg==", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/preact" + } + }, "node_modules/pretty-format": { "version": "27.5.1", "resolved": "http://npm.ezbim.cn:3038/pretty-format/-/pretty-format-27.5.1.tgz", diff --git a/package.json b/package.json index cbb224d..35aa7cc 100644 --- a/package.json +++ b/package.json @@ -55,6 +55,12 @@ "@dcloudio/uni-mp-weixin": "3.0.0-4000820240401001", "@dcloudio/uni-mp-xhs": "3.0.0-4000820240401001", "@dcloudio/uni-quickapp-webview": "3.0.0-4000820240401001", + "@fullcalendar/core": "^6.1.15", + "@fullcalendar/daygrid": "^6.1.15", + "@fullcalendar/interaction": "^6.1.15", + "@fullcalendar/list": "^6.1.15", + "@fullcalendar/timegrid": "^6.1.15", + "@fullcalendar/vue3": "^6.1.15", "@jridgewell/sourcemap-codec": "^1.4.15", "@qiun/wx-ucharts": "2.5.0-20230101", "@ttou/uview-typings": "^2.0.5", diff --git a/src/api/invest/accountAnalysis.js b/src/api/invest/accountAnalysis.js index 23a66ff..42d168c 100644 --- a/src/api/invest/accountAnalysis.js +++ b/src/api/invest/accountAnalysis.js @@ -53,3 +53,13 @@ export function getCreditReportInfo(query) { params: query }) } + + +// 首页--日历展示事件 +export function getAccountCalendarInfo(query) { + return request({ + url: '/invest/analysis/getAccountCalendarInfo', + method: 'get', + params: query + }) +} diff --git a/src/pages.json b/src/pages.json index 20cadff..17405b8 100644 --- a/src/pages.json +++ b/src/pages.json @@ -17,10 +17,16 @@ "navigationBarTitleText": "登录" } }, + { + "path": "pages/calendar/index", + "style": { + "navigationBarTitleText": "首页" + } + }, { "path": "pages/index", "style": { - "navigationBarTitleText": "智聪科技记账平台", + "navigationBarTitleText": "资产总览", "navigationStyle": "custom" } }, @@ -30,6 +36,7 @@ "navigationBarTitleText": "工作台" } }, + { "path": "pages/statistic/index", "style": { @@ -795,11 +802,18 @@ "borderStyle": "white", "backgroundColor": "#ffffff", "list": [ + + { + "pagePath": "pages/calendar/index", + "iconPath": "static/images/tabbar/work.png", + "selectedIconPath": "static/images/tabbar/work_.png", + "text": "首页" + }, { "pagePath": "pages/index", - "iconPath": "static/images/tabbar/home.png", - "selectedIconPath": "static/images/tabbar/home_.png", - "text": "首页" + "iconPath": "static/images/tabbar/assets.png", + "selectedIconPath": "static/images/tabbar/assets_.png", + "text": "资产总览" }, { "pagePath": "pages/work/index", diff --git a/src/pages/calendar/index.vue b/src/pages/calendar/index.vue new file mode 100644 index 0000000..46ecf0c --- /dev/null +++ b/src/pages/calendar/index.vue @@ -0,0 +1,263 @@ + + + + diff --git a/src/pages/login.vue b/src/pages/login.vue index ff4346d..cd674f9 100644 --- a/src/pages/login.vue +++ b/src/pages/login.vue @@ -108,7 +108,7 @@ function loginSuccess(result) { // 设置用户信息 userStore.getInfo().then(res => { uni.switchTab({ - url: '/pages/index' + url: '/pages/calendar/index' }); }) } diff --git a/src/static/images/tabbar/assets.png b/src/static/images/tabbar/assets.png new file mode 100644 index 0000000..de1019f Binary files /dev/null and b/src/static/images/tabbar/assets.png differ diff --git a/src/static/images/tabbar/assets_.png b/src/static/images/tabbar/assets_.png new file mode 100644 index 0000000..972e368 Binary files /dev/null and b/src/static/images/tabbar/assets_.png differ diff --git a/yarn.lock b/yarn.lock index 1b2bc37..5df762e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1453,6 +1453,40 @@ "resolved" "https://registry.npmmirror.com/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz" "version" "0.17.19" +"@fullcalendar/core@^6.1.15", "@fullcalendar/core@~6.1.15": + "integrity" "sha512-BuX7o6ALpLb84cMw1FCB9/cSgF4JbVO894cjJZ6kP74jzbUZNjtwffwRdA+Id8rrLjT30d/7TrkW90k4zbXB5Q==" + "resolved" "http://npm.ezbim.cn:3038/@fullcalendar/core/-/core-6.1.15.tgz" + "version" "6.1.15" + dependencies: + "preact" "~10.12.1" + +"@fullcalendar/daygrid@^6.1.15", "@fullcalendar/daygrid@~6.1.15": + "integrity" "sha512-j8tL0HhfiVsdtOCLfzK2J0RtSkiad3BYYemwQKq512cx6btz6ZZ2RNc/hVnIxluuWFyvx5sXZwoeTJsFSFTEFA==" + "resolved" "http://npm.ezbim.cn:3038/@fullcalendar/daygrid/-/daygrid-6.1.15.tgz" + "version" "6.1.15" + +"@fullcalendar/interaction@^6.1.15": + "integrity" "sha512-DOTSkofizM7QItjgu7W68TvKKvN9PSEEvDJceyMbQDvlXHa7pm/WAVtAc6xSDZ9xmB1QramYoWGLHkCYbTW1rQ==" + "resolved" "http://npm.ezbim.cn:3038/@fullcalendar/interaction/-/interaction-6.1.15.tgz" + "version" "6.1.15" + +"@fullcalendar/list@^6.1.15": + "integrity" "sha512-U1bce04tYDwkFnuVImJSy2XalYIIQr6YusOWRPM/5ivHcJh67Gm8CIMSWpi3KdRSNKFkqBxLPkfZGBMaOcJYug==" + "resolved" "http://npm.ezbim.cn:3038/@fullcalendar/list/-/list-6.1.15.tgz" + "version" "6.1.15" + +"@fullcalendar/timegrid@^6.1.15": + "integrity" "sha512-61ORr3A148RtxQ2FNG7JKvacyA/TEVZ7z6I+3E9Oeu3dqTf6M928bFcpehRTIK6zIA6Yifs7BeWHgOE9dFnpbw==" + "resolved" "http://npm.ezbim.cn:3038/@fullcalendar/timegrid/-/timegrid-6.1.15.tgz" + "version" "6.1.15" + dependencies: + "@fullcalendar/daygrid" "~6.1.15" + +"@fullcalendar/vue3@^6.1.15": + "integrity" "sha512-ctfTICGrNEIj7gmLHQcUYe0WzDTSW5Vd9hyOnVChxPU75AZU9WqdDMkHwJYnfNxNhT6QQuiMHq/qsRRd5zQwOw==" + "resolved" "http://npm.ezbim.cn:3038/@fullcalendar/vue3/-/vue3-6.1.15.tgz" + "version" "6.1.15" + "@intlify/core-base@9.1.9": "integrity" "sha512-x5T0p/Ja0S8hs5xs+ImKyYckVkL4CzcEXykVYYV6rcbXxJTe2o58IquSqX9bdncVKbRZP7GlBU1EcRaQEEJ+vw==" "resolved" "https://registry.npmmirror.com/@intlify/core-base/-/core-base-9.1.9.tgz" @@ -5730,6 +5764,11 @@ "picocolors" "^1.0.0" "source-map-js" "^1.2.0" +"preact@~10.12.1": + "integrity" "sha512-l8386ixSsBdbreOAkqtrwqHwdvR35ID8c3rKPa8lCWuO86dBi32QWHV4vfsZK1utLLFMvw+Z5Ad4XLkZzchscg==" + "resolved" "http://npm.ezbim.cn:3038/preact/-/preact-10.12.1.tgz" + "version" "10.12.1" + "pretty-format@^27.5.1": "integrity" "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==" "resolved" "http://npm.ezbim.cn:3038/pretty-format/-/pretty-format-27.5.1.tgz" @@ -6784,7 +6823,7 @@ "@vue/language-core" "1.8.27" "semver" "^7.5.4" -"vue@^2.0.0 || >=3.0.0", "vue@^2.6.14 || ^3.2.0", "vue@^3.0.0", "vue@^3.0.0-0 || ^2.6.0", "vue@^3.2.0", "vue@^3.2.25", "vue@3.4.23": +"vue@^2.0.0 || >=3.0.0", "vue@^2.6.14 || ^3.2.0", "vue@^3.0.0", "vue@^3.0.0-0 || ^2.6.0", "vue@^3.0.11", "vue@^3.2.0", "vue@^3.2.25", "vue@3.4.23": "integrity" "sha512-X1y6yyGJ28LMUBJ0k/qIeKHstGd+BlWQEOT40x3auJFTmpIhpbKLgN7EFsqalnJXq1Km5ybDEsp6BhuWKciUDg==" "resolved" "http://npm.ezbim.cn:3038/vue/-/vue-3.4.23.tgz" "version" "3.4.23"