From 5bbe958729f26e33c189325c5cbf4a4f035efa16 Mon Sep 17 00:00:00 2001 From: quantulr <35954003+quantulr@users.noreply.github.com> Date: Thu, 31 Aug 2023 16:24:37 +0800 Subject: [PATCH] deploy --- miniprogram/api/login.ts | 5 +- miniprogram/app.json | 2 +- miniprogram/app.ts | 23 +++++-- miniprogram/assets/login_bg.jpg | Bin 0 -> 46345 bytes .../components/statistics-card/index.wxml | 4 +- miniprogram/pages/add-finance/add-finance.ts | 21 ++++++ .../pages/add-finance/add-finance.wxml | 4 +- miniprogram/pages/add-stock/add-stock.json | 3 - miniprogram/pages/add-stock/add-stock.ts | 2 + miniprogram/pages/add-stock/add-stock.wxml | 2 +- miniprogram/pages/index/index.json | 6 +- miniprogram/pages/index/index.scss | 31 +++++++++ miniprogram/pages/index/index.ts | 64 +++++++++++++++--- miniprogram/pages/index/index.wxml | 25 ++++++- miniprogram/pages/login/login.json | 8 ++- miniprogram/pages/login/login.scss | 59 ++++++++++++++-- miniprogram/pages/login/login.ts | 21 +++--- miniprogram/pages/login/login.wxml | 23 +++++-- miniprogram/pages/logs/logs.json | 6 -- miniprogram/pages/logs/logs.scss | 1 - miniprogram/pages/logs/logs.ts | 19 ------ miniprogram/pages/logs/logs.wxml | 6 -- miniprogram/pages/logs/logs.wxss | 8 --- miniprogram/pages/stock/stock.scss | 4 +- miniprogram/pages/stock/stock.ts | 21 +++++- miniprogram/pages/stock/stock.wxml | 16 +++-- miniprogram/utils/number.wxs | 7 ++ miniprogram/utils/request.ts | 6 +- miniprogram/utils/settings.ts | 14 +++- miniprogram/utils/utils.wxs | 7 ++ project.config.json | 2 +- typings/index.d.ts | 2 + 32 files changed, 317 insertions(+), 105 deletions(-) create mode 100644 miniprogram/assets/login_bg.jpg delete mode 100644 miniprogram/pages/logs/logs.json delete mode 100644 miniprogram/pages/logs/logs.scss delete mode 100644 miniprogram/pages/logs/logs.ts delete mode 100644 miniprogram/pages/logs/logs.wxml delete mode 100644 miniprogram/pages/logs/logs.wxss create mode 100644 miniprogram/utils/number.wxs create mode 100644 miniprogram/utils/utils.wxs diff --git a/miniprogram/api/login.ts b/miniprogram/api/login.ts index ffb5cd0..2148fcc 100644 --- a/miniprogram/api/login.ts +++ b/miniprogram/api/login.ts @@ -11,7 +11,10 @@ export const login = (data: LoginForm) => data, }); -export const getInfo = () => +export const getInfo = (token?: string) => httpClient.request({ url: "/getInfo", + header: { + Authorization: token ? `Bearer ${token}` : undefined, + }, }); diff --git a/miniprogram/app.json b/miniprogram/app.json index 504a097..60d1943 100644 --- a/miniprogram/app.json +++ b/miniprogram/app.json @@ -1,7 +1,6 @@ { "pages": [ "pages/index/index", - "pages/logs/logs", "pages/add-finance/add-finance", "pages/login/login", "pages/stock/stock", @@ -45,5 +44,6 @@ "t-tab-panel": "tdesign-miniprogram/tab-panel/tab-panel", "t-cell-group": "tdesign-miniprogram/cell-group/cell-group" }, + "lazyCodeLoading": "requiredComponents", "sitemapLocation": "sitemap.json" } \ No newline at end of file diff --git a/miniprogram/app.ts b/miniprogram/app.ts index 7dd2bd4..a6b76b8 100644 --- a/miniprogram/app.ts +++ b/miniprogram/app.ts @@ -1,17 +1,26 @@ -import { getToken } from "./utils/settings"; +import { getInfo } from "./api/login"; +import { getToken, getUserInfo } from "./utils/settings"; // app.ts App({ globalData: { authToken: undefined, - permissions:[] + permissions: undefined, + user: undefined, + }, + + loadUserInfo(token: string) { + getInfo(token).then((resp: any) => { + const { user, permissions } = resp; + this.globalData.user = user; + this.globalData.permissions = permissions; + console.log(this.globalData); + }); }, onLaunch() { - // 展示本地存储能力 - const logs = wx.getStorageSync("logs") || []; - logs.unshift(Date.now()); - wx.setStorageSync("logs", logs); - this.globalData.authToken = getToken(); + const token = getToken(); + this.globalData.authToken = token; + this.loadUserInfo(token); // 登录 wx.login({ success: (res) => { diff --git a/miniprogram/assets/login_bg.jpg b/miniprogram/assets/login_bg.jpg new file mode 100644 index 0000000000000000000000000000000000000000..847285a9bf966eae3c966836f4062b91337b48fe GIT binary patch literal 46345 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 as=4`^^qOQXhh%8BGsIT>SxxWX(*FUfmYCfD literal 0 HcmV?d00001 diff --git a/miniprogram/components/statistics-card/index.wxml b/miniprogram/components/statistics-card/index.wxml index bbdb252..50a291b 100644 --- a/miniprogram/components/statistics-card/index.wxml +++ b/miniprogram/components/statistics-card/index.wxml @@ -1,7 +1,9 @@ + - {{value.value}} + {{number.formatAmount(value.value)}}万元 + {{value.value}} {{value.label}} \ No newline at end of file diff --git a/miniprogram/pages/add-finance/add-finance.ts b/miniprogram/pages/add-finance/add-finance.ts index 61cea22..bd28520 100644 --- a/miniprogram/pages/add-finance/add-finance.ts +++ b/miniprogram/pages/add-finance/add-finance.ts @@ -1,6 +1,7 @@ import Message from "tdesign-miniprogram/message/index"; import { getDict } from "../../api/dict"; import { addFinance, getFinanceInfo, updateFinance } from "../../api/finance"; +import { getInfo } from "../../api/login"; // pages/add-affairs/add-affairs.ts const dayjs = require("dayjs"); @@ -9,6 +10,7 @@ Page({ * 页面的初始数据 */ data: { + permissions: [], defaultTime: dayjs(dayjs().format("YYYY-MM-DD")).valueOf(), types: [], form: { @@ -56,6 +58,23 @@ Page({ [`form.date`]: e.detail.value, }); }, + loadUserInfo() { + const permissions = getApp().globalData.permissions; + + if (permissions) { + this.setData({ + permissions, + }); + } else { + const token = getApp().globalData.authToken; + getInfo(token).then((resp: any) => { + this.setData({ + permissions: resp.permissions, + }); + getApp().globalData.permissions = resp.permissions; + }); + } + }, getTypeLabel(dictValue: string) { // @ts-ignore return this.data.types.find((item: any) => item.value === dictValue)?.label; @@ -117,6 +136,7 @@ Page({ } } }, + handleSubmitFinance() { const { form } = this.data; const result = this.validate(); @@ -208,6 +228,7 @@ Page({ this.getFinanceDetail(option.financeId); } this.getTypeOptions(); + this.loadUserInfo(); }, /** diff --git a/miniprogram/pages/add-finance/add-finance.wxml b/miniprogram/pages/add-finance/add-finance.wxml index 3f4d0e2..e855435 100644 --- a/miniprogram/pages/add-finance/add-finance.wxml +++ b/miniprogram/pages/add-finance/add-finance.wxml @@ -2,6 +2,7 @@ + @@ -10,14 +11,13 @@ - + 确认提交 - diff --git a/miniprogram/pages/add-stock/add-stock.json b/miniprogram/pages/add-stock/add-stock.json index 4f9b502..683496d 100644 --- a/miniprogram/pages/add-stock/add-stock.json +++ b/miniprogram/pages/add-stock/add-stock.json @@ -1,11 +1,8 @@ { "usingComponents": { - "t-popup": "tdesign-miniprogram/popup/popup", "t-input": "tdesign-miniprogram/input/input", "t-upload": "tdesign-miniprogram/upload/upload", "t-picker": "tdesign-miniprogram/picker/picker", - "t-cascader": "tdesign-miniprogram/cascader/cascader", - "t-tree-select": "tdesign-miniprogram/tree-select/tree-select", "t-picker-item": "tdesign-miniprogram/picker-item/picker-item", "t-date-time-picker": "tdesign-miniprogram/date-time-picker/date-time-picker" } diff --git a/miniprogram/pages/add-stock/add-stock.ts b/miniprogram/pages/add-stock/add-stock.ts index 5e28c3d..8083d97 100644 --- a/miniprogram/pages/add-stock/add-stock.ts +++ b/miniprogram/pages/add-stock/add-stock.ts @@ -70,6 +70,8 @@ Page({ [`form.${field}`]: e.detail.value, }); if (field === "total") { + console.log(e.detail); + if ( parseInt(e.detail.value) > this.data.stockLimit && this.data.form.type == 2 diff --git a/miniprogram/pages/add-stock/add-stock.wxml b/miniprogram/pages/add-stock/add-stock.wxml index 28ba19f..c0571b5 100644 --- a/miniprogram/pages/add-stock/add-stock.wxml +++ b/miniprogram/pages/add-stock/add-stock.wxml @@ -24,7 +24,7 @@ - + 确认提交 diff --git a/miniprogram/pages/index/index.json b/miniprogram/pages/index/index.json index 6a2698a..56bea81 100644 --- a/miniprogram/pages/index/index.json +++ b/miniprogram/pages/index/index.json @@ -1,9 +1,9 @@ { "usingComponents": { "t-fab": "tdesign-miniprogram/fab/fab", - "t-collapse": "tdesign-miniprogram/collapse/collapse", - "t-collapse-panel": "tdesign-miniprogram/collapse-panel/collapse-panel", - "statistics-card": "/components/statistics-card" + "t-swipe-cell": "tdesign-miniprogram/swipe-cell/swipe-cell", + "statistics-card": "/components/statistics-card", + "t-dialog": "tdesign-miniprogram/dialog/dialog" }, "enablePullDownRefresh": true } \ No newline at end of file diff --git a/miniprogram/pages/index/index.scss b/miniprogram/pages/index/index.scss index 1c16786..2cf8998 100644 --- a/miniprogram/pages/index/index.scss +++ b/miniprogram/pages/index/index.scss @@ -85,6 +85,37 @@ page { animation: shake-crazy 1s infinite linear; } } + .t-swipe-cell__right { + view { + height: 100%; + } + } + .finance-list { + .left-icon { + width: 48rpx; + height: 48rpx; + border-radius: 50%; + display: flex; + justify-content: center; + align-items: center; + color: #fff; + } + .btn-wrapper { + // height: 100%; + .btn { + display: inline-flex; + justify-content: center; + align-items: center; + width: 140rpx; + height: 100%; + color: white; + } + + .delete-btn { + background-color: #e34d59; + } + } + } .to-login { height: 40vh; display: flex; diff --git a/miniprogram/pages/index/index.ts b/miniprogram/pages/index/index.ts index 9ec46dc..6452138 100644 --- a/miniprogram/pages/index/index.ts +++ b/miniprogram/pages/index/index.ts @@ -4,6 +4,7 @@ import { getFinanceList, getStatistics, } from "../../api/finance"; +import { getInfo } from "../../api/login"; // pages/index/index.ts Page({ @@ -11,29 +12,35 @@ Page({ * 页面的初始数据 */ data: { + showConfirmDelete: false, + permissions: [], queryParams: { pageNum: 1, pageSize: 10, }, - authToken: undefined, + authToken: null, statistics: { amount: { label: "账户余额", value: 0, + type: "money", }, income: { label: "当月入账", value: 0, + type: "money", }, expenditure: { label: "当月出账", value: 0, + type: "money", }, }, loading: false, total: 0, completed: false, deleteIndex: -1, + deleteId: null, list: [], types: [], }, @@ -71,9 +78,9 @@ Page({ async getStatisticsDetail() { const resp: any = await getStatistics(); this.setData({ - ['statistics.amount.value']: resp.data.amount, - ['statistics.income.value']: resp.data.income, - ['statistics.expenditure.value']: resp.data.expenditure, + ["statistics.amount.value"]: resp.data.amount, + ["statistics.income.value"]: resp.data.income, + ["statistics.expenditure.value"]: resp.data.expenditure, }); }, handleAddAffairs() { @@ -102,9 +109,26 @@ Page({ }); }); }, + showDeleteDialog(e: any) { + console.log(e.currentTarget.dataset); + + const { financeId } = e.currentTarget.dataset; + this.setData({ + showConfirmDelete: true, + deleteId: financeId, + }); + }, + closeDialog() { + this.setData({ + showConfirmDelete: false, + }); + }, handleLongTap(e: any) { - console.log(e); - const { deleteIndex } = this.data; + const { deleteIndex, permissions } = this.data; + // @ts-ignore + if (!permissions.includes("finance:detail:remove")) { + return; + } const index = parseInt(e.currentTarget.dataset.index); let resultIndex; @@ -117,12 +141,14 @@ Page({ deleteIndex: resultIndex, }); }, - handleDeleteFinance(e: any) { - const { financeId } = e.currentTarget.dataset; - deleteFinance(financeId).then(() => { + handleDeleteFinance() { + const { deleteId } = this.data; + if (!deleteId) return; + // @ts-ignore + deleteFinance(deleteId).then(() => { const { list } = this.data; this.setData({ - list: list.filter((el: any) => el.financeId !== financeId), + list: list.filter((el: any) => el.financeId !== deleteId), deleteIndex: -1, }); }); @@ -140,6 +166,23 @@ Page({ url: "/pages/login/login", }); }, + loadUserInfo() { + const permissions = getApp().globalData.permissions; + + if (permissions) { + this.setData({ + permissions, + }); + } else { + const token = getApp().globalData.authToken; + getInfo(token).then((resp: any) => { + this.setData({ + permissions: resp.permissions, + }); + getApp().globalData.permissions = resp.permissions; + }); + } + }, loadPageData() { const authToken = getApp().globalData.authToken; this.setData({ @@ -165,6 +208,7 @@ Page({ */ onShow() { this.loadPageData(); + this.loadUserInfo(); }, /** diff --git a/miniprogram/pages/index/index.wxml b/miniprogram/pages/index/index.wxml index d926794..2e9a617 100644 --- a/miniprogram/pages/index/index.wxml +++ b/miniprogram/pages/index/index.wxml @@ -2,11 +2,28 @@ + - + - + + + + + + {{item.type=='finance_type_income'?'入':item.type=='finance_type_expenditure'?'出':''}} + + {{times.formatDate(item.date) || "-"}} | {{item.oppositeCompany}} + {{item.type=='finance_type_income'?'+':item.type=='finance_type_expenditure'?'-':''}}{{item.amount}} + + + 删除 + + + + + + + \ No newline at end of file diff --git a/miniprogram/pages/login/login.json b/miniprogram/pages/login/login.json index 8835af0..f0b924a 100644 --- a/miniprogram/pages/login/login.json +++ b/miniprogram/pages/login/login.json @@ -1,3 +1,9 @@ { - "usingComponents": {} + "usingComponents": { + "t-navbar": "tdesign-miniprogram/navbar/navbar", + "t-image": "tdesign-miniprogram/image/image", + "t-avatar": "tdesign-miniprogram/avatar/avatar" + }, + "navigationBarTitleText": "个人中心", + "navigationStyle": "custom" } \ No newline at end of file diff --git a/miniprogram/pages/login/login.scss b/miniprogram/pages/login/login.scss index 1f481a9..808cb05 100644 --- a/miniprogram/pages/login/login.scss +++ b/miniprogram/pages/login/login.scss @@ -1,11 +1,56 @@ /* pages/login/login.wxss */ -.login{ - height: 100vh; +.t-navbar__placeholder { + --td-navbar-padding-top: 0; + --td-navbar-height: 0; +} +.t-navbar__content { + --td-navbar-bg-color: rgba(0, 0, 0, 0); +} +.nav-title { + color: #ffffff; +} +.login-container { display: flex; - flex-direction: column; - justify-content: center; align-items: center; - .login-button{ - margin-top: 60rpx; + width: 100%; + aspect-ratio: 3/2; + position: relative; + overflow: hidden; + border-radius: 0 0 50% 50% / 0 0 4% 4%; + .login-bg { + position: absolute; + left: 0; + top: 0; } -} \ No newline at end of file + .avatar_login { + margin-left: 64rpx; + display: flex; + align-items: center; + + .login-button { + margin-left: 24rpx; + &.t-button--primary { + --td-button-primary-text-color: #ffffff; + } + } + } + .vip-card { + position: absolute; + left: 50%; + bottom: 0; + transform: translateX(-50%); + width: 80%; + height: 80rpx; + background-color: #ccb88d; + border-radius: 24rpx 24rpx 0 0; + color: #ffffff; + display: flex; + align-items: center; + text { + margin-left: 32rpx; + } + } +} +.options-container { + margin-top: 32rpx; +} diff --git a/miniprogram/pages/login/login.ts b/miniprogram/pages/login/login.ts index af32198..272b752 100644 --- a/miniprogram/pages/login/login.ts +++ b/miniprogram/pages/login/login.ts @@ -1,4 +1,4 @@ -import { login } from "../../api/login"; +import { getInfo, login } from "../../api/login"; import { setToken } from "../../utils/settings"; // pages/login/login.ts @@ -7,25 +7,28 @@ Page({ * 页面的初始数据 */ data: { - authToken: undefined, + authToken: null, }, loginWithWeChat(e: any) { login({ code: e.detail.code, }).then((response: any) => { + this.setData({ + authToken: response.token, + }); setToken(response.token); - // setToken(response.token); - wx.switchTab({ - url: "/pages/index/index", + getInfo(response.token).then((resp: any) => { + getApp().globalData.permissions = resp.permissions; }); }); }, - handleLogout(){ + handleLogout() { this.setData({ - authToken: undefined - }) - setToken(undefined) + authToken: null, + }); + getApp().globalData.permissions = undefined; + setToken(undefined); }, /** * 生命周期函数--监听页面加载 diff --git a/miniprogram/pages/login/login.wxml b/miniprogram/pages/login/login.wxml index 2460ae0..33caa13 100644 --- a/miniprogram/pages/login/login.wxml +++ b/miniprogram/pages/login/login.wxml @@ -1,7 +1,22 @@ -