From 7e8b2ef0804942de658b16f9eed2d3fbd01e865b Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 08 九月 2025 14:16:44 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/cMiniApp/src/subpackages/wallet/incomeDetail/incomeDetail.vue | 2
apps/cMiniApp/src/subpackages/wallet/incomeDetail/InnerPage.vue | 4 +-
apps/cMiniApp/src/pages/task/InnerPage.vue | 18 +++++----
apps/cMiniApp/src/subpackages/wallet/mineWallet/InnerPage.vue | 42 ++++++++++++++-------
4 files changed, 41 insertions(+), 25 deletions(-)
diff --git a/apps/cMiniApp/src/pages/task/InnerPage.vue b/apps/cMiniApp/src/pages/task/InnerPage.vue
index 052f54a..76512dc 100644
--- a/apps/cMiniApp/src/pages/task/InnerPage.vue
+++ b/apps/cMiniApp/src/pages/task/InnerPage.vue
@@ -67,14 +67,16 @@
<style lang="scss">
@import '@/styles/common.scss';
-.task-list-container {
- flex: 1;
- min-height: 0;
- display: flex;
- flex-direction: column;
-}
+.task-page-wrapper {
+ .task-list-container {
+ flex: 1;
+ min-height: 0;
+ display: flex;
+ flex-direction: column;
+ }
-.task-list {
- @include infiniteLoadingInTabBarPage;
+ .task-list {
+ @include infiniteLoadingInTabBarPage;
+ }
}
</style>
diff --git a/apps/cMiniApp/src/subpackages/wallet/incomeDetail/InnerPage.vue b/apps/cMiniApp/src/subpackages/wallet/incomeDetail/InnerPage.vue
index 23bf6c5..1c9c45c 100644
--- a/apps/cMiniApp/src/subpackages/wallet/incomeDetail/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/wallet/incomeDetail/InnerPage.vue
@@ -1,5 +1,5 @@
<template>
- <ProTabs
+ <!-- <ProTabs
v-model="queryState.status"
name="home-tab"
:showPaneContent="false"
@@ -11,7 +11,7 @@
<ProTabPane :title="`鍏ㄩ儴`" :pane-key="0"></ProTabPane>
<ProTabPane :title="`鏀跺叆`" :pane-key="1"></ProTabPane>
<ProTabPane :title="`鎻愮幇`" :pane-key="2"></ProTabPane>
- </ProTabs>
+ </ProTabs> -->
<List>
<IncomeDetailListItem :item="`鏀跺叆锛氾骏${toThousand(100)} 鎻愮幇锛氾骏${toThousand(200)}`">
<template #title>
diff --git a/apps/cMiniApp/src/subpackages/wallet/incomeDetail/incomeDetail.vue b/apps/cMiniApp/src/subpackages/wallet/incomeDetail/incomeDetail.vue
index 4e6bb85..9141308 100644
--- a/apps/cMiniApp/src/subpackages/wallet/incomeDetail/incomeDetail.vue
+++ b/apps/cMiniApp/src/subpackages/wallet/incomeDetail/incomeDetail.vue
@@ -1,5 +1,5 @@
<template>
- <PageLayout class="incomeDetail-page-wrapper" :title="'鏀舵敮鏄庣粏'">
+ <PageLayout class="incomeDetail-page-wrapper" :title="'鏀跺叆鏄庣粏'">
<InnerPage></InnerPage>
</PageLayout>
</template>
diff --git a/apps/cMiniApp/src/subpackages/wallet/mineWallet/InnerPage.vue b/apps/cMiniApp/src/subpackages/wallet/mineWallet/InnerPage.vue
index 986f7e9..d633350 100644
--- a/apps/cMiniApp/src/subpackages/wallet/mineWallet/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/wallet/mineWallet/InnerPage.vue
@@ -1,10 +1,17 @@
<template>
- <div class="mine-wallet-balance">
+ <!-- <div class="mine-wallet-balance">
<WithdrawMoneyCard :money="100" title="璐︽埛浣欓(鍏�)"></WithdrawMoneyCard>
<nut-button type="primary" class="mine-wallet-balance-btn" @click="goWithdraw">鎻愮幇</nut-button>
- </div>
+ </div> -->
<List>
<ListItem title="鏀跺叆鏄庣粏" @click="goIncomeDetail"> </ListItem>
+ <ListItem title="鏀粯瀹濊处鎴�" @click="goWithdraw">
+ <template #extra>
+ <div class="bind-bank-card">
+ {{ isBinding ? '宸茬粦瀹�' : '鏈粦瀹氥�佺珛鍗崇粦瀹�' }}
+ </div>
+ </template>
+ </ListItem>
</List>
</template>
@@ -47,23 +54,30 @@
<style lang="scss">
@import '@/styles/common.scss';
-.mine-wallet-balance {
- text-align: center;
- padding-bottom: 60px;
+.mineWallet-page-wrapper {
+ .mine-wallet-balance {
+ text-align: center;
+ padding-bottom: 60px;
- .mine-wallet-balance-item {
- font-size: 28px;
- font-weight: 500;
- margin-bottom: 40px;
-
- &.money {
- font-size: 48px;
+ .mine-wallet-balance-item {
+ font-size: 28px;
font-weight: 500;
+ margin-bottom: 40px;
+
+ &.money {
+ font-size: 48px;
+ font-weight: 500;
+ }
+ }
+
+ .mine-wallet-balance-btn {
+ width: 60%;
}
}
- .mine-wallet-balance-btn {
- width: 60%;
+ .bind-bank-card {
+ color: boleGetCssVar('text-color', 'regular');
+ font-size: 24px;
}
}
</style>
--
Gitblit v1.9.1