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 0000000..6d0ea85 Binary files /dev/null and b/src/static/icons/ZFBICON.png differ 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 0000000..97133f3 Binary files /dev/null and b/src/static/icons/setting.png differ