From ef99f9377cc872b7c2f63402abe115ddf460c937 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E5=95=A6C=E6=A2=A6?= <15709267061@163.com> Date: Mon, 21 Apr 2025 15:19:28 +0800 Subject: [PATCH] update --- src/components/XConfirmModal.vue | 1 + src/components/XDateTime.vue | 15 ++-- src/components/XTag.vue | 37 ++++++++++ src/hooks/useTableQuery.js | 13 +++- src/pages.json | 21 ++++++ src/pages/incomeLog/index.vue | 119 +++++++++++++++++++++++++++++- src/pages/user/index.vue | 4 +- src/pages/wallet/index.vue | 6 +- src/pages/walletLog/index.vue | 98 +++++++++++++++++++++++- src/pages/withdrawalLog/index.vue | 91 ++++++++++++++++++++++- src/scss/global.scss | 4 + src/static/icons/ZFBICON.png | Bin 0 -> 6430 bytes src/static/icons/drop-down.svg | 1 + src/static/icons/setting.png | Bin 0 -> 1004 bytes 14 files changed, 392 insertions(+), 18 deletions(-) create mode 100644 src/components/XTag.vue create mode 100644 src/static/icons/ZFBICON.png create mode 100644 src/static/icons/drop-down.svg create mode 100644 src/static/icons/setting.png diff --git a/src/components/XConfirmModal.vue b/src/components/XConfirmModal.vue index 0c361ea..9c4d907 100644 --- a/src/components/XConfirmModal.vue +++ b/src/components/XConfirmModal.vue @@ -85,5 +85,6 @@ const success = () => { font-size: 14px; font-weight: 400; letter-spacing: 0; + text-align: center; } diff --git a/src/components/XDateTime.vue b/src/components/XDateTime.vue index 6f3e3a5..baf3e0a 100644 --- a/src/components/XDateTime.vue +++ b/src/components/XDateTime.vue @@ -2,10 +2,14 @@ import timeIcon from "../static/icons/time.png"; const modalValue = defineModel(); -const {placeholder} = defineProps({ +const {placeholder, fields} = defineProps({ placeholder: { type: String, default: "请选择时间", + }, + fields: { + type: String, + default: 'day' } }); @@ -15,12 +19,13 @@ const success = ({detail: {value}}) => { diff --git a/src/components/XTag.vue b/src/components/XTag.vue new file mode 100644 index 0000000..02638ab --- /dev/null +++ b/src/components/XTag.vue @@ -0,0 +1,37 @@ + + + + + diff --git a/src/hooks/useTableQuery.js b/src/hooks/useTableQuery.js index 8ec072b..a671112 100644 --- a/src/hooks/useTableQuery.js +++ b/src/hooks/useTableQuery.js @@ -1,4 +1,4 @@ -import {ref, reactive, watch} from 'vue'; +import {reactive, ref, watch} from 'vue'; /** * @@ -41,6 +41,7 @@ function useTableQuery({ callback && callback({ ...data, rows: data.rows.map(v => ({...v, key: v.id})), + current: pagination.current }); } finally { loading.value = false; @@ -48,8 +49,12 @@ function useTableQuery({ } const initFetchData = async () => { - pagination.current = 1; - pagination.total = 0; + if (pagination.current === 1) { + fetchData().then(); + } else { + pagination.current = 1; + pagination.total = 0; + } } watch( @@ -60,7 +65,7 @@ function useTableQuery({ if (watchParameter) watch( () => parameter, - () => fetchData(), + () => initFetchData(), {deep: true} ); diff --git a/src/pages.json b/src/pages.json index e46ffbd..fb3dede 100644 --- a/src/pages.json +++ b/src/pages.json @@ -134,6 +134,27 @@ "navigationBarTitleText": "消息推送", "navigationStyle": "custom" } + }, + { + "path": "pages/withdrawalLog/index", + "style": { + "navigationBarTitleText": "提现记录", + "navigationStyle": "custom" + } + }, + { + "path": "pages/walletLog/index", + "style": { + "navigationBarTitleText": "变动记录", + "navigationStyle": "custom" + } + }, + { + "path": "pages/incomeLog/index", + "style": { + "navigationBarTitleText": "收益记录", + "navigationStyle": "custom" + } } ], "globalStyle": { diff --git a/src/pages/incomeLog/index.vue b/src/pages/incomeLog/index.vue index 321c417..3195774 100644 --- a/src/pages/incomeLog/index.vue +++ b/src/pages/incomeLog/index.vue @@ -1,11 +1,128 @@ - diff --git a/src/pages/user/index.vue b/src/pages/user/index.vue index e7299c1..edce0f1 100644 --- a/src/pages/user/index.vue +++ b/src/pages/user/index.vue @@ -87,11 +87,11 @@ const tabs = [ - + 提现记录 - + 变动记录 diff --git a/src/pages/wallet/index.vue b/src/pages/wallet/index.vue index 7d43173..af625be 100644 --- a/src/pages/wallet/index.vue +++ b/src/pages/wallet/index.vue @@ -68,21 +68,21 @@ const withdrawal = async () => { - + 变动记录 - + 提现记录 - + 收益记录 diff --git a/src/pages/walletLog/index.vue b/src/pages/walletLog/index.vue index 8107758..3ed5713 100644 --- a/src/pages/walletLog/index.vue +++ b/src/pages/walletLog/index.vue @@ -1,7 +1,103 @@ - + diff --git a/src/scss/global.scss b/src/scss/global.scss index 849639b..6917735 100644 --- a/src/scss/global.scss +++ b/src/scss/global.scss @@ -64,6 +64,10 @@ $primary-color: #2D5CF6; font-size: 28rpx; } +.test-32r { + font-size: 32rpx; +} + .test-36r { font-size: 36rpx; } diff --git a/src/static/icons/ZFBICON.png b/src/static/icons/ZFBICON.png new file mode 100644 index 0000000000000000000000000000000000000000..6d0ea8524f63e4550de52ebe0b55c6a4140fd84a GIT binary patch literal 6430 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 KwOSQ;`2PYFh7F1U literal 0 HcmV?d00001 diff --git a/src/static/icons/drop-down.svg b/src/static/icons/drop-down.svg new file mode 100644 index 0000000..5aa2a67 --- /dev/null +++ b/src/static/icons/drop-down.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/static/icons/setting.png b/src/static/icons/setting.png new file mode 100644 index 0000000000000000000000000000000000000000..97133f3e083e5be808f60c1173f4e87d4cf936b9 GIT binary patch literal 1004 zcmV>U-mvkx9nmmB{Tv|GTq)SM=gylAkRfS5jI zij=vCh!i4iegN#xL1&8C#e%?KfHfggs?~PS%y$G7QHn(M`Q>S!vp3}^SF7zF%)3;5 z$6TIXpPOX;R7C*DF&qF|qDzi`vhfd(>mq04&sgV6s$%P00p`&&1{xyzX(~>>)|F@n zph>a8G=AunX>4{$I+C~Jq4cfS-i$TH+IJ{w!b-_F@~rTi&v*d1Uv4f_WOB@9_XRLR zEd!NA&ub_`Kmq1LP=PmG3~7ljsu!7e)oKgr0JDUBcw85`C}PQixsFz1-bsl)Gro0h z_ELz17M#=TbHfPsDRn_(lp5{z+2w#657$a^ zOlaeLYrh?Kl&Ml13C(d+{PQb(}g3O z7Auz|(Gp$dHZe2A^UKpd^Z<^zjHxFU`BS+~Y9}>p(ECmbm^av=A|`AXas=4jO3wT| zSA68p0UhTMK6~!`JX<_Nff2@9pQ!(H)L>^c*1mN@DEG*CEqwa8)u1mnysRXApEd*x z1x8S5aS98wW1#hBp-vOJNp#ROV}|o7Q`{J6jhP$_#kFlSdp3QbC9hASy&oeAvlT0> zR&@Fat~iDZ6sZFPQLRp*4H{uGI_qvIwwdl_N(7~1n0+VZ6Ae}^9r30-<0d@$Ds#bH zw?tz@Jk5sWDJc;{CGYxPYepg@Xa1jceV>!K0J7)*iyY-YzkmJx`t3U*a?sjU(I2`0 a_3;n*x|>F;==Ep-0000