zhengyiming
3 天以前 7e8b2ef0804942de658b16f9eed2d3fbd01e865b
Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
4个文件已修改
26 ■■■■ 已修改文件
apps/cMiniApp/src/pages/task/InnerPage.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/wallet/incomeDetail/InnerPage.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/wallet/incomeDetail/incomeDetail.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/wallet/mineWallet/InnerPage.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/pages/task/InnerPage.vue
@@ -67,6 +67,7 @@
<style lang="scss">
@import '@/styles/common.scss';
.task-page-wrapper {
.task-list-container {
  flex: 1;
  min-height: 0;
@@ -77,4 +78,5 @@
.task-list {
  @include infiniteLoadingInTabBarPage;
}
}
</style>
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>
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>
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,6 +54,7 @@
<style lang="scss">
@import '@/styles/common.scss';
.mineWallet-page-wrapper {
.mine-wallet-balance {
  text-align: center;
  padding-bottom: 60px;
@@ -66,4 +74,10 @@
    width: 60%;
  }
}
  .bind-bank-card {
    color: boleGetCssVar('text-color', 'regular');
    font-size: 24px;
  }
}
</style>