From 9e5a47d90455c4770815d32899f660b53fc27110 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 22 五月 2025 13:26:09 +0800
Subject: [PATCH] Merge branch 'dev-ui' of http://120.26.58.240:8888/r/LifePaymentFront into dev-ui
---
packages/components/src/views/userAccount/EditElectricUserAccount.vue | 6
packages/components/src/views/Mine/ApplyAgentView.vue | 66 +++++++++++++
packages/components/src/views/Order/OrderApplyRefundView.vue | 10 +
apps/taro/src/app.config.ts | 7 +
packages/components/src/views/userAccount/EditPhoneUserAccount.vue | 6
apps/taro/src/subpackages/my/applyAgent/applyAgent.config.ts | 3
packages/components/src/views/Mine/Dashboard.vue | 56 -----------
apps/taro/src/components/PageFooter/PageFooter.vue | 16 +-
apps/taro/src/constants/router.ts | 1
apps/taro/src/subpackages/order/orderApplyRefund/orderApplyRefund.vue | 2
apps/taro/src/components/PageFooter/PageFooterBtn.vue | 7 +
apps/taro/src/subpackages/order/orderApplyRefund/InnerPage.vue | 19 +++
apps/taro/src/subpackages/userAccount/editElectricUserAccount/InnerPage.vue | 14 ++
apps/taro/src/subpackages/my/applyAgent/applyAgent.vue | 24 ++++
apps/taro/src/subpackages/userAccount/editPhoneUserAccount/InnerPage.vue | 13 ++
packages/components/src/views/userAccount/EditGasUserAccount.vue | 6
packages/components/src/views/RechargeResultView/RechargeResultView.vue | 1
17 files changed, 176 insertions(+), 81 deletions(-)
diff --git a/apps/taro/src/app.config.ts b/apps/taro/src/app.config.ts
index 5aebc7f..cf6f3af 100644
--- a/apps/taro/src/app.config.ts
+++ b/apps/taro/src/app.config.ts
@@ -111,7 +111,12 @@
},
{
root: 'subpackages/my',
- pages: ['shareQrcode/shareQrcode', 'dashboard/dashboard', 'promotionQrcode/promotionQrcode'],
+ pages: [
+ 'shareQrcode/shareQrcode',
+ 'dashboard/dashboard',
+ 'applyAgent/applyAgent',
+ 'promotionQrcode/promotionQrcode',
+ ],
},
],
// preloadRule: {
diff --git a/apps/taro/src/components/PageFooter/PageFooter.vue b/apps/taro/src/components/PageFooter/PageFooter.vue
index e10f059..0567019 100644
--- a/apps/taro/src/components/PageFooter/PageFooter.vue
+++ b/apps/taro/src/components/PageFooter/PageFooter.vue
@@ -52,21 +52,21 @@
}
.page-footer-inner {
- padding: 24px 0;
+ padding: 24px boleGetCssVar('size', 'body-padding-h');
width: 100%;
display: flex;
box-sizing: border-box;
align-items: center;
}
- &.isOnlyAction {
+ /* &.isOnlyAction {
.page-footer-inner {
- padding: 16px 0;
+ padding: 20px 0;
align-items: flex-start;
}
- }
+ } */
- .is-button-footer {
+ /* .is-button-footer {
display: flex;
width: 100%;
height: 100%;
@@ -96,9 +96,9 @@
box-shadow: 0px 3px 7px 0px rgba(240, 67, 73, 0.35);
}
}
- }
+ } */
- .common-page-footer {
+ /* .common-page-footer {
display: flex;
width: 100%;
height: 100%;
@@ -172,6 +172,6 @@
margin: 0;
margin-left: 20px;
}
- }
+ } */
}
</style>
diff --git a/apps/taro/src/components/PageFooter/PageFooterBtn.vue b/apps/taro/src/components/PageFooter/PageFooterBtn.vue
index 204c530..3115fc1 100644
--- a/apps/taro/src/components/PageFooter/PageFooterBtn.vue
+++ b/apps/taro/src/components/PageFooter/PageFooterBtn.vue
@@ -21,12 +21,15 @@
.page-footer-btn {
flex: 1;
- min-width: 0;
+ width: 100%;
height: 88px;
font-size: 32px;
- margin: 0 28px;
border-radius: 44px;
+ & + .page-footer-btn {
+ margin-left: 28px;
+ }
+
&.nut-button--plain {
border-width: 1px;
}
diff --git a/apps/taro/src/constants/router.ts b/apps/taro/src/constants/router.ts
index 4364eba..b51edce 100644
--- a/apps/taro/src/constants/router.ts
+++ b/apps/taro/src/constants/router.ts
@@ -26,4 +26,5 @@
shareQrcode = '/subpackages/my/shareQrcode/shareQrcode',
promotionQrcode = '/subpackages/my/promotionQrcode/promotionQrcode',
dashboard = '/subpackages/my/dashboard/dashboard',
+ applyAgent = '/subpackages/my/applyAgent/applyAgent',
}
diff --git a/apps/taro/src/subpackages/my/applyAgent/applyAgent.config.ts b/apps/taro/src/subpackages/my/applyAgent/applyAgent.config.ts
new file mode 100644
index 0000000..305fdb1
--- /dev/null
+++ b/apps/taro/src/subpackages/my/applyAgent/applyAgent.config.ts
@@ -0,0 +1,3 @@
+export default definePageConfig({
+ disableScroll: true,
+});
diff --git a/apps/taro/src/subpackages/my/applyAgent/applyAgent.vue b/apps/taro/src/subpackages/my/applyAgent/applyAgent.vue
new file mode 100644
index 0000000..7f06d32
--- /dev/null
+++ b/apps/taro/src/subpackages/my/applyAgent/applyAgent.vue
@@ -0,0 +1,24 @@
+<template>
+ <PageLayout title="绔嬪嵆鐢宠" class="applyAgent-page-wrapper" hasBgColor :needAuth="false">
+ <ContentScrollView hasPaddingTop style="background-color: transparent">
+ <!-- <OrderApplyRefundView
+ :id="id"
+ @submitApplyRefund="submitApplyRefund"
+ ref="orderApplyRefundViewRef"
+ /> -->
+ </ContentScrollView>
+ <PageFooter>
+ <PageFooterBtn type="primary" @click="handleSubmit">鎻愪氦鐢宠</PageFooterBtn>
+ </PageFooter>
+ </PageLayout>
+</template>
+
+<script setup lang="ts">
+import { PageLayout } from '@/components';
+
+defineOptions({
+ name: 'applyAgent',
+});
+
+function handleSubmit() {}
+</script>
diff --git a/apps/taro/src/subpackages/order/orderApplyRefund/InnerPage.vue b/apps/taro/src/subpackages/order/orderApplyRefund/InnerPage.vue
index afc98aa..43b7221 100644
--- a/apps/taro/src/subpackages/order/orderApplyRefund/InnerPage.vue
+++ b/apps/taro/src/subpackages/order/orderApplyRefund/InnerPage.vue
@@ -1,13 +1,21 @@
<template>
- <ContentScrollView :paddingH="false">
- <OrderApplyRefundView :id="id" @submitApplyRefund="submitApplyRefund" />
+ <ContentScrollView hasPaddingTop style="background-color: transparent">
+ <OrderApplyRefundView
+ :id="id"
+ @submitApplyRefund="submitApplyRefund"
+ ref="orderApplyRefundViewRef"
+ />
</ContentScrollView>
+ <PageFooter>
+ <PageFooterBtn type="primary" @click="handleSubmit">鎻愪氦</PageFooterBtn>
+ </PageFooter>
</template>
<script setup lang="ts">
import Taro from '@tarojs/taro';
import { OrderApplyRefundView } from '@life-payment/components';
import { goBack } from '@/utils';
+import type { ComponentExposed } from 'vue-component-type-helpers';
defineOptions({
name: 'InnerPage',
@@ -16,6 +24,13 @@
const router = Taro.useRouter();
const id = router.params?.id ?? '';
+const orderApplyRefundViewRef =
+ useTemplateRef<ComponentExposed<typeof OrderApplyRefundView>>('orderApplyRefundViewRef');
+
+function handleSubmit() {
+ orderApplyRefundViewRef.value?.handleSubmit?.();
+}
+
function submitApplyRefund() {
goBack();
}
diff --git a/apps/taro/src/subpackages/order/orderApplyRefund/orderApplyRefund.vue b/apps/taro/src/subpackages/order/orderApplyRefund/orderApplyRefund.vue
index cb04f8d..a37ac12 100644
--- a/apps/taro/src/subpackages/order/orderApplyRefund/orderApplyRefund.vue
+++ b/apps/taro/src/subpackages/order/orderApplyRefund/orderApplyRefund.vue
@@ -1,5 +1,5 @@
<template>
- <PageLayout title="鐢宠閫�娆�" class="orderApplyRefund-page-wrapper" hasBorder>
+ <PageLayout title="鐢宠閫�娆�" class="orderApplyRefund-page-wrapper" hasBgColor>
<InnerPage />
</PageLayout>
</template>
diff --git a/apps/taro/src/subpackages/userAccount/editElectricUserAccount/InnerPage.vue b/apps/taro/src/subpackages/userAccount/editElectricUserAccount/InnerPage.vue
index 55f4e12..e756d29 100644
--- a/apps/taro/src/subpackages/userAccount/editElectricUserAccount/InnerPage.vue
+++ b/apps/taro/src/subpackages/userAccount/editElectricUserAccount/InnerPage.vue
@@ -1,13 +1,17 @@
<template>
<ContentScrollView hasPaddingTop style="background-color: transparent">
- <EditElectricUserAccount :id="id" @success="handleSuccess" />
+ <EditElectricUserAccount :id="id" @success="handleSuccess" ref="editElectricUserAccountRef" />
</ContentScrollView>
+ <PageFooter>
+ <PageFooterBtn type="primary" @click="handleSave">淇濆瓨</PageFooterBtn>
+ </PageFooter>
</template>
<script setup lang="ts">
import Taro from '@tarojs/taro';
import { EditElectricUserAccount } from '@life-payment/components';
import { goBack } from '@/utils';
+import type { ComponentExposed } from 'vue-component-type-helpers';
defineOptions({
name: 'InnerPage',
@@ -16,6 +20,14 @@
const router = Taro.useRouter();
const id = router.params?.id ?? '';
+const editElectricUserAccountRef = useTemplateRef<ComponentExposed<typeof EditElectricUserAccount>>(
+ 'editElectricUserAccountRef'
+);
+
+function handleSave() {
+ editElectricUserAccountRef.value?.handleSave?.();
+}
+
function handleSuccess() {
goBack();
}
diff --git a/apps/taro/src/subpackages/userAccount/editPhoneUserAccount/InnerPage.vue b/apps/taro/src/subpackages/userAccount/editPhoneUserAccount/InnerPage.vue
index 8ba66c5..31f400e 100644
--- a/apps/taro/src/subpackages/userAccount/editPhoneUserAccount/InnerPage.vue
+++ b/apps/taro/src/subpackages/userAccount/editPhoneUserAccount/InnerPage.vue
@@ -1,13 +1,17 @@
<template>
<ContentScrollView hasPaddingTop style="background-color: transparent">
- <EditPhoneUserAccount :id="id" @success="handleSuccess" />
+ <EditPhoneUserAccount :id="id" @success="handleSuccess" ref="editPhoneUserAccountRef" />
</ContentScrollView>
+ <PageFooter>
+ <PageFooterBtn type="primary" @click="handleSave">淇濆瓨</PageFooterBtn>
+ </PageFooter>
</template>
<script setup lang="ts">
import Taro from '@tarojs/taro';
import { EditPhoneUserAccount } from '@life-payment/components';
import { goBack } from '@/utils';
+import type { ComponentExposed } from 'vue-component-type-helpers';
defineOptions({
name: 'InnerPage',
@@ -16,6 +20,13 @@
const router = Taro.useRouter();
const id = router.params?.id ?? '';
+const editPhoneUserAccountRef =
+ useTemplateRef<ComponentExposed<typeof EditPhoneUserAccount>>('editPhoneUserAccountRef');
+
+function handleSave() {
+ editPhoneUserAccountRef.value?.handleSave?.();
+}
+
function handleSuccess() {
goBack();
}
diff --git a/packages/components/src/views/Mine/ApplyAgentView.vue b/packages/components/src/views/Mine/ApplyAgentView.vue
new file mode 100644
index 0000000..518e578
--- /dev/null
+++ b/packages/components/src/views/Mine/ApplyAgentView.vue
@@ -0,0 +1,66 @@
+<template>
+ <div></div>
+</template>
+
+<script setup lang="ts">
+import {
+ Form as NutForm,
+ FormItem as NutFormItem,
+ Input as NutInput,
+ Textarea as NutTextarea,
+} from '@nutui/nutui-taro';
+import { FormRules } from '@nutui/nutui-taro/dist/types/__VUE/form/types';
+import { reactive, ref, computed } from 'vue';
+import {
+ useLifeRechargeContext,
+ LifeRechargeConstants,
+ RefundUserLifePayOrderInput,
+} from '@life-payment/core-vue';
+import { useQueryClient } from '@tanstack/vue-query';
+
+defineOptions({
+ name: 'ApplyAgentView',
+});
+
+const emit = defineEmits<{
+ (e: 'submit'): void;
+}>();
+
+const form = reactive({
+ refundApplyRemark: '',
+});
+
+const rules = reactive<FormRules>({
+ refundApplyRemark: [{ required: true, message: '璇疯緭鍏ラ��娆惧師鍥�' }],
+});
+
+const { blLifeRecharge } = useLifeRechargeContext();
+
+const formRef = ref<any>(null);
+
+function handleSubmit() {
+ if (!formRef.value) return;
+ formRef.value.validate().then(({ valid, errors }: any) => {
+ if (valid) {
+ refundUserLifePayOrder();
+ }
+ });
+}
+
+const queryClient = useQueryClient();
+
+async function refundUserLifePayOrder() {
+ try {
+ let params = {
+ userId: blLifeRecharge.accountModel.userId,
+ refundApplyRemark: form.refundApplyRemark,
+ };
+ let res = await blLifeRecharge.services.refundUserLifePayOrder(params);
+ emit('submit');
+ } catch (error) {}
+}
+
+defineExpose({
+ handleSubmit,
+});
+</script>
diff --git a/packages/components/src/views/Mine/Dashboard.vue b/packages/components/src/views/Mine/Dashboard.vue
index 2dbf5c5..3d624ad 100644
--- a/packages/components/src/views/Mine/Dashboard.vue
+++ b/packages/components/src/views/Mine/Dashboard.vue
@@ -1,60 +1,4 @@
<template>
- <!-- <NutGrid :gutter="10" :column-num="3" square class="dashboard-view">
- <NutGridItem>
- <div class="pro-statistics-wrapper">
- <div class="pro-statistics-title">绱鏀舵</div>
- <div class="pro-statistics-content">
- {{ toThousand(topStatistics?.accumulatedReceipts ?? 0) }}
- </div>
- </div>
- </NutGridItem>
- <NutGridItem>
- <div class="pro-statistics-wrapper">
- <div class="pro-statistics-title">鏄ㄦ棩鏀舵</div>
- <div class="pro-statistics-content">
- {{ toThousand(topStatistics?.receiptsYesterday ?? 0) }}
- </div>
- </div>
- </NutGridItem>
- <NutGridItem>
- <div class="pro-statistics-wrapper">
- <div class="pro-statistics-title">绱鏀剁泭</div>
- <div class="pro-statistics-content">
- {{ toThousand(topStatistics?.accumulatedIncome ?? 0) }}
- </div>
- </div>
- </NutGridItem>
- <NutGridItem>
- <div class="pro-statistics-wrapper">
- <div class="pro-statistics-title">绱涓嬪崟</div>
- <div class="pro-statistics-content">{{ topStatistics?.accumulatedOrders ?? 0 }}</div>
- </div>
- </NutGridItem>
- <NutGridItem>
- <div class="pro-statistics-wrapper">
- <div class="pro-statistics-title">鏄ㄦ棩涓嬪崟</div>
- <div class="pro-statistics-content">{{ topStatistics?.ordersNumYesterday ?? 0 }}</div>
- </div>
- </NutGridItem>
- <NutGridItem>
- <div class="pro-statistics-wrapper">
- <div class="pro-statistics-title">鏄ㄦ棩鎴愬姛</div>
- <div class="pro-statistics-content">{{ topStatistics?.yesterdaySuccess ?? 0 }}</div>
- </div>
- </NutGridItem>
- <NutGridItem>
- <div class="pro-statistics-wrapper">
- <div class="pro-statistics-title">绱鐢ㄦ埛</div>
- <div class="pro-statistics-content">{{ topStatistics?.accumulatedUsers ?? 0 }}</div>
- </div>
- </NutGridItem>
- <NutGridItem>
- <div class="pro-statistics-wrapper">
- <div class="pro-statistics-title">鏄ㄦ棩娲昏穬</div>
- <div class="pro-statistics-content">{{ topStatistics?.yesterdayActiveUsers ?? 0 }}</div>
- </div>
- </NutGridItem>
- </NutGrid> -->
<div class="dashboard-view">
<Chunk title="鏍稿績鏁版嵁">
<DashboardLargeCell class="dashboard-large-cell1">
diff --git a/packages/components/src/views/Order/OrderApplyRefundView.vue b/packages/components/src/views/Order/OrderApplyRefundView.vue
index 3b5574c..126d5c0 100644
--- a/packages/components/src/views/Order/OrderApplyRefundView.vue
+++ b/packages/components/src/views/Order/OrderApplyRefundView.vue
@@ -4,7 +4,7 @@
ref="formRef"
:rules="rules"
label-position="top"
- class="order-bill-recharge phone"
+ class="order-bill-recharge phone chunk-form"
>
<NutFormItem class="bole-form-item" prop="refundApplyRemark" required>
<NutTextarea
@@ -18,13 +18,13 @@
>
</NutTextarea>
</NutFormItem>
- <div class="common-content">
+ <!-- <div class="common-content">
<nut-button class="recharge-button" type="primary" @click="handleSubmit">
<div class="recharge-button-inner">
<div class="recharge-button-text">鎻愪氦</div>
</div>
</nut-button>
- </div>
+ </div> -->
</NutForm>
</template>
@@ -95,4 +95,8 @@
});
} catch (error) {}
}
+
+defineExpose({
+ handleSubmit,
+});
</script>
diff --git a/packages/components/src/views/RechargeResultView/RechargeResultView.vue b/packages/components/src/views/RechargeResultView/RechargeResultView.vue
index db7a64a..fb4271c 100644
--- a/packages/components/src/views/RechargeResultView/RechargeResultView.vue
+++ b/packages/components/src/views/RechargeResultView/RechargeResultView.vue
@@ -23,6 +23,7 @@
import { LifeRechargeConstants } from '@life-payment/core-vue';
import { CustomerServiceTips, OssAssets } from '../../constants';
import Result from '../../components/Result/Result.vue';
+import { Button as NutButton } from '@nutui/nutui-taro';
defineOptions({
name: 'RechargeResultView',
diff --git a/packages/components/src/views/userAccount/EditElectricUserAccount.vue b/packages/components/src/views/userAccount/EditElectricUserAccount.vue
index a99795e..61f1830 100644
--- a/packages/components/src/views/userAccount/EditElectricUserAccount.vue
+++ b/packages/components/src/views/userAccount/EditElectricUserAccount.vue
@@ -14,13 +14,13 @@
</NutTextarea>
</NutFormItem>
</ElectricBillRechargeBaseForm>
- <div class="chunk-form-actions">
+ <!-- <div class="chunk-form-actions">
<NutButton class="recharge-button" type="primary" @click="handleSave">
<div class="recharge-button-inner">
<div class="recharge-button-text">淇濆瓨</div>
</div>
</NutButton>
- </div>
+ </div> -->
</LoadingLayout>
</template>
@@ -122,4 +122,6 @@
emit('success');
} catch (error) {}
}
+
+defineExpose({ handleSave });
</script>
diff --git a/packages/components/src/views/userAccount/EditGasUserAccount.vue b/packages/components/src/views/userAccount/EditGasUserAccount.vue
index b75859b..a160e14 100644
--- a/packages/components/src/views/userAccount/EditGasUserAccount.vue
+++ b/packages/components/src/views/userAccount/EditGasUserAccount.vue
@@ -25,13 +25,13 @@
</NutTextarea>
</NutFormItem>
</GasBillRechargeBaseForm>
- <div class="chunk-form-actions">
+ <!-- <div class="chunk-form-actions">
<NutButton class="recharge-button" type="primary" @click="handleSave">
<div class="recharge-button-inner">
<div class="recharge-button-text">淇濆瓨</div>
</div>
</NutButton>
- </div>
+ </div> -->
</LoadingLayout>
</template>
@@ -132,4 +132,6 @@
emit('success');
} catch (error) {}
}
+
+defineExpose({ handleSave });
</script>
diff --git a/packages/components/src/views/userAccount/EditPhoneUserAccount.vue b/packages/components/src/views/userAccount/EditPhoneUserAccount.vue
index 2e718b0..68a7e39 100644
--- a/packages/components/src/views/userAccount/EditPhoneUserAccount.vue
+++ b/packages/components/src/views/userAccount/EditPhoneUserAccount.vue
@@ -14,13 +14,13 @@
</NutTextarea>
</NutFormItem>
</PhoneBillRechargeBaseForm>
- <div class="chunk-form-actions">
+ <!-- <div class="chunk-form-actions">
<NutButton class="recharge-button" type="primary" @click="handleSave">
<div class="recharge-button-inner">
<div class="recharge-button-text">淇濆瓨</div>
</div>
</NutButton>
- </div>
+ </div> -->
</LoadingLayout>
</template>
@@ -111,4 +111,6 @@
emit('success');
} catch (error) {}
}
+
+defineExpose({ handleSave });
</script>
--
Gitblit v1.9.1