Merge branch 'dev-2.2.3' of http://120.26.58.240:8888/r/JYBIndependentFront...

wupengfei

6 天以前 8a82ce3065d6169480afb3403a4854fb64078c46

 src/views/BalanceManage/BalanceManage.vue

@@ -68,8 +68,22 @@
        </RewardInfoCard>
      </RewardInfoCardList>
      <ProTabs v-model="state.tabType" hasBorder class="reward-tabs">
        <ProTabPane lazy label="消费记录" name="Consume">
          <ConsumeRecordView></ConsumeRecordView>
        <ProTabPane lazy label="拨付记录" name="Payment">
          <PaymentRecordView></PaymentRecordView>
        </ProTabPane>
        <template v-if="sceneThree || sceneFour">
          <ProTabPane lazy label="奖励发放记录" name="RewardGrant">
            <RewardGrantRecordView></RewardGrantRecordView>
          </ProTabPane>
          <ProTabPane lazy label="充值记录" name="Recharge">
            <RechargeRecordView ref="rechargeRecordRef"></RechargeRecordView>
          </ProTabPane>
          <ProTabPane lazy label="消费记录" name="Consume">
            <ConsumeRecordView></ConsumeRecordView>
          </ProTabPane>
        </template>
        <ProTabPane lazy label="提现记录" name="Withdrawal" v-if="sceneTwo || sceneFour">
          <WithdrawalRecordView ref="withdrawalRecordRef"></WithdrawalRecordView>
        </ProTabPane>
      </ProTabs>
    </AppContainer>
@@ -84,6 +98,10 @@
import RewardInfoCardContentItem from '@/components/Reward/RewardInfoCardContentItem.vue';
import { setOSSLink, downloadFileByUrl, toThousand, addStarForString } from '@/utils';
import ConsumeRecordView from './components/ConsumeRecordView.vue';
import RechargeRecordView from './components/RechargeRecordView.vue';
import RewardGrantRecordView from './components/RewardGrantRecordView.vue';
import WithdrawalRecordView from './components/WithdrawalRecordView.vue';
import PaymentRecordView from './components/PaymentRecordView.vue';
import { useQuery } from '@tanstack/vue-query';
import { useUser } from '@/hooks';

@@ -96,9 +114,22 @@
  tabType: 'Consume',
};

const { user } = useUser();
const { userDetail } = useUser();
const state = reactive({ ...BaseState });

const sceneOne = computed(() => {
  return !userDetail.value?.suportPlatRecharge && !userDetail.value?.suportWithDraw;
});
const sceneTwo = computed(() => {
  return !userDetail.value?.suportPlatRecharge && userDetail.value?.suportWithDraw;
});
const sceneThree = computed(() => {
  return userDetail.value?.suportPlatRecharge && !userDetail.value?.suportWithDraw;
});
const sceneFour = computed(() => {
  return userDetail.value?.suportPlatRecharge && userDetail.value?.suportWithDraw;
});

const { isLoading, data: detail } = useQuery({
  queryKey: ['userServices/getUserAmountShow'],
  queryFn: async () => {