From 03047a382e6f0f1945be32e28fd65e6b31817dfa Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 24 二月 2025 17:52:47 +0800
Subject: [PATCH] fix: 对接
---
packages/components/src/components/Radio/Radio.vue | 6 +-
packages/components/src/views/electricBillRecharge/electricBillRecharge.vue | 26 ++++++++----
apps/taro/src/components/Tabs/ProTabs.vue | 2
packages/components/src/views/PhoneBillRecharge/PhoneBillRecharge.vue | 47 +++++++++++++----------
apps/taro/src/pages/mine/index.config.ts | 4 --
packages/components/src/components/Dialog/ConfirmDialog.vue | 2 +
apps/taro/src/pages/home/index.config.ts | 2 -
apps/taro/config/index.js | 6 +-
apps/taro/config/staging.js | 2
apps/taro/public/logo-v.png | 0
packages/components/src/views/RechargeResultView/RechargeResultView.vue | 2
packages/components/src/views/RechargeGrid/RechargeGrid.vue | 1
12 files changed, 55 insertions(+), 45 deletions(-)
diff --git a/apps/taro/config/index.js b/apps/taro/config/index.js
index c2239e3..fbd1d2e 100644
--- a/apps/taro/config/index.js
+++ b/apps/taro/config/index.js
@@ -223,9 +223,9 @@
},
},
},
- // htmlPluginOption: {
- // favicon: './logo-v.png',
- // },
+ htmlPluginOption: {
+ favicon: './public/logo-v.png',
+ },
webpackChain(chain, webpack) {
chain.plugin('unplugin-auto-import').use(
AutoImport({
diff --git a/apps/taro/config/staging.js b/apps/taro/config/staging.js
index 788fbe2..37ffd64 100644
--- a/apps/taro/config/staging.js
+++ b/apps/taro/config/staging.js
@@ -4,7 +4,7 @@
env: {
// BASE_URL: '"https://testrlywx.boleyuma.com"',
BASE_URL: '"https://api.81812333.com"',
- BASE_URL_H5: '"http://118.178.252.28:8743"',
+ BASE_URL_H5: '"http://118.178.252.28:8742"',
BASE_URL_JX: '"https://api.jx818.com"',
OSS_URL: '"https://waterdroptest2.oss-cn-hangzhou.aliyuncs.com/"',
diff --git a/apps/taro/src/logo-v.png b/apps/taro/public/logo-v.png
similarity index 100%
rename from apps/taro/src/logo-v.png
rename to apps/taro/public/logo-v.png
Binary files differ
diff --git a/apps/taro/src/components/Tabs/ProTabs.vue b/apps/taro/src/components/Tabs/ProTabs.vue
index b2c7c8c..6fe046e 100644
--- a/apps/taro/src/components/Tabs/ProTabs.vue
+++ b/apps/taro/src/components/Tabs/ProTabs.vue
@@ -132,7 +132,7 @@
const titles: Ref<Title[]> = ref([]);
const renderTitles = (vnodes: VNode[]) => {
vnodes.forEach((vnode: VNode, index: number) => {
- let type = vnode.type;
+ let type = vnode?.type;
type = (type as any).name || type;
if (type === 'nut-tab-pane' || type === 'ProTabPane') {
let title = new Title();
diff --git a/apps/taro/src/pages/home/index.config.ts b/apps/taro/src/pages/home/index.config.ts
index eaecd79..305fdb1 100644
--- a/apps/taro/src/pages/home/index.config.ts
+++ b/apps/taro/src/pages/home/index.config.ts
@@ -1,5 +1,3 @@
export default definePageConfig({
- navigationStyle: 'custom',
disableScroll: true,
- navigationBarTextStyle: 'white',
});
diff --git a/apps/taro/src/pages/mine/index.config.ts b/apps/taro/src/pages/mine/index.config.ts
index fc5601f..305fdb1 100644
--- a/apps/taro/src/pages/mine/index.config.ts
+++ b/apps/taro/src/pages/mine/index.config.ts
@@ -1,7 +1,3 @@
export default definePageConfig({
- navigationBarTitleText: 'Mine',
- usingComponents: {},
disableScroll: true,
- navigationBarTextStyle: 'white',
- enableShareAppMessage: true,
});
diff --git a/packages/components/src/components/Dialog/ConfirmDialog.vue b/packages/components/src/components/Dialog/ConfirmDialog.vue
index 886942e..38a1b2b 100644
--- a/packages/components/src/components/Dialog/ConfirmDialog.vue
+++ b/packages/components/src/components/Dialog/ConfirmDialog.vue
@@ -19,6 +19,8 @@
</template>
<script setup lang="ts">
+import { Dialog as NutDialog } from '@nutui/nutui-taro';
+
defineOptions({
name: 'ConfirmDialog',
});
diff --git a/packages/components/src/components/Radio/Radio.vue b/packages/components/src/components/Radio/Radio.vue
index cba0b16..5c30253 100644
--- a/packages/components/src/components/Radio/Radio.vue
+++ b/packages/components/src/components/Radio/Radio.vue
@@ -1,15 +1,15 @@
<template>
- <Radio class="bl-radio">
+ <NutRadio class="bl-radio">
<template #default><slot /> </template>
<template #checkedIcon>
<IconFont name="checked" color="var(--bole-color-primary)" />
</template>
- </Radio>
+ </NutRadio>
</template>
<script setup lang="ts">
import { IconFont } from '@nutui/icons-vue-taro';
-import { Radio } from '@nutui/nutui-taro';
+import { Radio as NutRadio } from '@nutui/nutui-taro';
defineOptions({
name: 'bl-radio',
diff --git a/packages/components/src/views/PhoneBillRecharge/PhoneBillRecharge.vue b/packages/components/src/views/PhoneBillRecharge/PhoneBillRecharge.vue
index ba06048..eaa5392 100644
--- a/packages/components/src/views/PhoneBillRecharge/PhoneBillRecharge.vue
+++ b/packages/components/src/views/PhoneBillRecharge/PhoneBillRecharge.vue
@@ -1,46 +1,46 @@
<template>
- <Form
+ <NutForm
:model-value="form"
ref="formRef"
:rules="rules"
label-position="top"
class="order-bill-recharge phone"
>
- <FormItem label="閫夋嫨杩愯惀鍟�:" class="bole-form-item" prop="ispCode" required>
- <RadioGroup v-model="form.ispCode" direction="horizontal" @change="changeIspCode">
+ <NutFormItem label="閫夋嫨杩愯惀鍟�:" class="bole-form-item" prop="ispCode" required>
+ <NutRadioGroup v-model="form.ispCode" direction="horizontal" @change="changeIspCode">
<BlRadio
:label="key"
v-for="(val, key) in BlLifeRecharge.constants.IspCodeText"
:key="key"
>{{ val }}</BlRadio
>
- </RadioGroup>
- </FormItem>
- <FormItem label="鍏呭�兼墜鏈哄彿" class="bole-form-item" prop="phone" required>
- <Input
+ </NutRadioGroup>
+ </NutFormItem>
+ <NutFormItem label="鍏呭�兼墜鏈哄彿" class="bole-form-item" prop="phone" required>
+ <NutInput
v-model.trim="form.phone"
class="bole-input-text"
placeholder="璇峰～鍐欐偍闇�瑕佸厖鍊肩殑鎵嬫満鍙风爜"
type="text"
/>
- </FormItem>
- <FormItem
+ </NutFormItem>
+ <NutFormItem
label="濮撳悕"
class="bole-form-item"
prop="name"
required
v-if="form.ispCode === BlLifeRecharge.constants.IspCode.dianxin"
>
- <Input
+ <NutInput
v-model.trim="form.name"
class="bole-input-text"
placeholder="璇峰～鍐欐偍鐨勫鍚�"
type="text"
/>
- </FormItem>
- <FormItem label="閫夋嫨鍏呭�奸噾棰�" class="bole-form-item" prop="parValue" required>
- <RadioGroup v-model="form.parValue" direction="horizontal" class="parValue-radio-group">
- <Radio
+ </NutFormItem>
+ <NutFormItem label="閫夋嫨鍏呭�奸噾棰�" class="bole-form-item" prop="parValue" required>
+ <NutRadioGroup v-model="form.parValue" direction="horizontal" class="parValue-radio-group">
+ <NutRadio
:label="Number(item)"
:key="item"
shape="button"
@@ -60,9 +60,9 @@
</div>
<div class="discountTag">{{ lifePayPhoneRate * 100 }}鎶�</div>
</div>
- </Radio>
- </RadioGroup>
- </FormItem>
+ </NutRadio>
+ </NutRadioGroup>
+ </NutFormItem>
<div class="common-content">
<nut-button class="recharge-button" type="primary" @click="handleSubmit">
<div class="recharge-button-inner">
@@ -80,11 +80,18 @@
<ConfirmDialogInfoItem label="瀹炰粯閲戦" :content="`锟�${realParValue}`" danger />
</template>
</ConfirmDialog>
- </Form>
+ </NutForm>
</template>
<script setup lang="ts">
-import { Form, FormItem, RadioGroup, Radio, Input, Button as NutButton } from '@nutui/nutui-taro';
+import {
+ Form as NutForm,
+ FormItem as NutFormItem,
+ RadioGroup as NutRadioGroup,
+ Radio as NutRadio,
+ Input as NutInput,
+ Button as NutButton,
+} from '@nutui/nutui-taro';
import { FormRules } from '@nutui/nutui-taro/dist/types/__VUE/form/types';
import { reactive, ref, computed } from 'vue';
import BlRadio from '../../components/Radio/Radio.vue';
@@ -113,7 +120,7 @@
});
const form = reactive({
- ispCode: BlLifeRecharge.constants.IspCode.yidong,
+ ispCode: '',
phone: '',
parValue: 0,
name: '',
diff --git a/packages/components/src/views/RechargeGrid/RechargeGrid.vue b/packages/components/src/views/RechargeGrid/RechargeGrid.vue
index 93d9cf3..86daf29 100644
--- a/packages/components/src/views/RechargeGrid/RechargeGrid.vue
+++ b/packages/components/src/views/RechargeGrid/RechargeGrid.vue
@@ -14,7 +14,6 @@
<script setup lang="ts">
import MainCell from '../../components/Layout/MainCell.vue';
import { Grid, GridItem } from '@nutui/nutui-taro';
-import { Dongdong } from '@nutui/icons-vue-taro';
import IconFreePhone from '../../../assets/icon-free-phone.png';
import IconFreeDian from '../../../assets/icon-free-dian.png';
diff --git a/packages/components/src/views/RechargeResultView/RechargeResultView.vue b/packages/components/src/views/RechargeResultView/RechargeResultView.vue
index f439b89..87727a2 100644
--- a/packages/components/src/views/RechargeResultView/RechargeResultView.vue
+++ b/packages/components/src/views/RechargeResultView/RechargeResultView.vue
@@ -14,7 +14,7 @@
</template>
<script setup lang="ts">
-import { LifeRechargeConstants } from '../../utils';
+import { LifeRechargeConstants } from '@life-payment/core-vue';
defineOptions({
name: 'RechargeResultView',
diff --git a/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue b/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue
index 4dbf304..55fc42a 100644
--- a/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue
+++ b/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue
@@ -1,5 +1,5 @@
<template>
- <Form
+ <NutForm
:model-value="form"
ref="formRef"
:rules="rules"
@@ -30,7 +30,7 @@
/>
</FormItem>
<FormItem label="鐢电綉鎴峰彿" class="bole-form-item" prop="electricAccount" required>
- <Input
+ <NutInput
v-model.trim="form.electricAccount"
class="bole-input-text"
placeholder="璇疯緭鍏�13浣嶆暟瀛楃紪鍙�"
@@ -44,7 +44,7 @@
prop="sixID"
required
>
- <Input
+ <NutInput
v-model.trim="form.sixID"
class="bole-input-text"
placeholder="璇疯緭鍏ヨ韩浠借瘉鍚庡叚浣�"
@@ -58,8 +58,8 @@
prop="parValue"
required
>
- <RadioGroup v-model="form.parValue" direction="horizontal" class="parValue-radio-group">
- <Radio
+ <NutRadioGroup v-model="form.parValue" direction="horizontal" class="parValue-radio-group">
+ <NutRadio
:label="Number(item)"
:key="item"
shape="button"
@@ -79,8 +79,8 @@
</div>
<div class="discountTag">{{ lifePayElectricRate * 100 }}鎶�</div>
</div>
- </Radio>
- </RadioGroup>
+ </NutRadio>
+ </NutRadioGroup>
</FormItem>
<div class="common-content">
<nut-button class="recharge-button" type="primary" @click="handleSubmit">
@@ -106,11 +106,18 @@
鍚屼竴鐢佃垂璐︽埛鍦ㄥ厖鍊兼湡闂达紝鏈埌璐﹀墠鍒囧嬁鍦ㄥ叾浠栦换浣曞钩鍙板啀娆″厖鍊笺�傚洜姝ら�犳垚鐨勮祫閲戞崯澶遍』鐢ㄦ埛鑷鎵挎媴锛侊紒锛�
</template>
</ConfirmDialog>
- </Form>
+ </NutForm>
</template>
<script setup lang="ts">
-import { Form, FormItem, RadioGroup, Radio, Input, Button as NutButton } from '@nutui/nutui-taro';
+import {
+ Form as NutForm,
+ FormItem,
+ RadioGroup as NutRadioGroup,
+ Radio as NutRadio,
+ Input as NutInput,
+ Button as NutButton,
+} from '@nutui/nutui-taro';
import { FormRules } from '@nutui/nutui-taro/dist/types/__VUE/form/types';
import { reactive, ref, computed, watch } from 'vue';
import {
@@ -175,6 +182,7 @@
const { blLifeRecharge } = useLifeRechargeContext();
const rules = reactive<FormRules>({
+ province: [{ required: true, message: '璇烽�夋嫨鎵�鍦ㄥ煄甯�' }],
electricAccountType: [{ required: true, message: '璇烽�夋嫨鐢佃垂绫诲瀷' }],
electricAccount: [{ required: true, message: '璇疯緭鍏ョ數缃戞埛鍙�' }],
sixID: [{ required: true, message: '璇疯緭鍏ヨ韩浠借瘉鍚庡叚浣�' }],
--
Gitblit v1.9.1