diff --git a/src/views/daxpay/h5/code/alipay/AlipayCashierCode.vue b/src/views/daxpay/h5/code/alipay/AlipayCashierCode.vue index 46e41ff..0e71648 100644 --- a/src/views/daxpay/h5/code/alipay/AlipayCashierCode.vue +++ b/src/views/daxpay/h5/code/alipay/AlipayCashierCode.vue @@ -1,61 +1,35 @@ @@ -63,17 +37,9 @@ import { onMounted, ref } from 'vue' import { useRoute } from 'vue-router' import { showNotify } from 'vant' -import type { - CashierPayParam, - ChannelCashierConfigResult, -} from '../CashierCode.api' -import { - cashierPay, - getCashierInfo, - getMchName, -} from '../CashierCode.api' - -import { AggregateEnum, CashierTypeEnum } from "@/enums/daxpay/DaxPayEnum"; +import type { CashierPayParam, ChannelCashierConfigResult } from '../CashierCode.api' +import { cashierPay, getCashierInfo, getMchName } from '../CashierCode.api' +import { AggregateEnum, CashierTypeEnum } from '@/enums/daxpay/DaxPayEnum' import router from '@/router' import { useKeyboard } from '@/hooks/daxpay/useKeyboard' @@ -97,16 +63,20 @@ onMounted(() => { * 初始化数据 */ function initData() { - getCashierInfo(AggregateEnum.ALI, appId as string).then(({ data }) => { - cashierInfo.value = data - }).catch((res) => { - router.push({ name: 'ErrorResult', query: { msg: res.message } }) - }) - getMchName(mchNo as string).then(({ data }) => { - mchName.value = data - }).catch((res) => { - router.push({ name: 'ErrorResult', query: { msg: res.message } }) - }) + getCashierInfo(AggregateEnum.ALI, appId as string) + .then(({ data }) => { + cashierInfo.value = data + }) + .catch((res) => { + router.push({ name: 'ErrorResult', query: { msg: res.message } }) + }) + getMchName(mchNo as string) + .then(({ data }) => { + mchName.value = data + }) + .catch((res) => { + router.push({ name: 'ErrorResult', query: { msg: res.message } }) + }) } /** @@ -126,12 +96,11 @@ function pay() { description: description.value, mchNo, } as CashierPayParam - cashierPay(from) - .then(({ data }) => { - loading.value = false - // 跳转到H5/付款码支付页面 - location.replace(data.payBody) - }) + cashierPay(from).then(({ data }) => { + loading.value = false + // 跳转到H5/付款码支付页面 + location.replace(data.payBody) + }) } @@ -141,25 +110,57 @@ function pay() { :deep(.van-key--blue) { background: @color; } + .container { - background-color: @color; + background: linear-gradient(to bottom, #1e90ff, #1e90ff, #ffffff); // 从蓝色渐变到白色 width: 100%; - padding: 10px; + padding: 40px; + height: 40%; border-radius: 10px; text-align: center; color: white; + + .payName { + margin: 5px 0; + font-size: 16px; + + .paytext { + font-size: 20px; + margin-left: 5px; + font-weight: 600; + } + } + .amount-display { background-color: white; color: @color; border-radius: 20px; padding: 20px; margin: 20px 0; - } - .amount-display p { - margin: 5px 0; + display: flex; + gap: 1.875rem; + align-items: center; + + p { + font-size: 32px; + } + + .title { + font-size: 20px; + } } } -.remark { - color: @color; + +.notes { + width: 100%; + height: 10%; + display: flex; + justify-content: center; + align-items: center; + + .remark { + color: @color; + cursor: pointer; + } }