From bd82469633b7397ba56f0a2fbc4997e6da1415ad Mon Sep 17 00:00:00 2001
From: bootx <xxm1995@outlook.com>
Date: Wed, 4 Dec 2024 22:43:07 +0800
Subject: [PATCH] =?UTF-8?q?refactor(daxpay):=20=E4=BC=98=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=BB=93=E6=9E=84=E5=92=8C=E7=B1=BB=E5=9E=8B=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=20-=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E5=92=8C=E7=BC=A9=E8=BF=9B=EF=BC=8C=E6=8F=90=E9=AB=98?=
 =?UTF-8?q?=E5=8F=AF=E8=AF=BB=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/daxpay/checkout/CheckoutPay.api.ts  |  2 +-
 src/views/daxpay/checkout/CheckoutPay.vue     | 33 +++++++++++--------
 .../checkout/wechat/WechatAggregate.vue       | 21 ++++++------
 3 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/src/views/daxpay/checkout/CheckoutPay.api.ts b/src/views/daxpay/checkout/CheckoutPay.api.ts
index 0cfa901..f264f20 100644
--- a/src/views/daxpay/checkout/CheckoutPay.api.ts
+++ b/src/views/daxpay/checkout/CheckoutPay.api.ts
@@ -7,7 +7,7 @@ import type { PayResult } from '@/views/daxpay/cashier/CashierCode.api'
  * 获取收银台订单和配置信息
  */
 export function getOrderAndConfig(orderNo, checkoutType) {
-  return http.request({
+  return http.request<Result<CheckoutOrderAndConfigResult>>({
     url: '/unipay/checkout/getOrderAndConfig',
     method: 'GET',
     params: {
diff --git a/src/views/daxpay/checkout/CheckoutPay.vue b/src/views/daxpay/checkout/CheckoutPay.vue
index 862c536..26b0fc1 100644
--- a/src/views/daxpay/checkout/CheckoutPay.vue
+++ b/src/views/daxpay/checkout/CheckoutPay.vue
@@ -16,12 +16,14 @@
       <van-field label="标题" :model-value="orderAndConfig.order.title" readonly />
       <van-field label="订单号" :model-value="orderAndConfig.order.bizOrderNo" readonly />
       <van-field label="支付号" :model-value="orderAndConfig.order.orderNo" readonly />
-      <van-field label="描述" rows="2"  type="textarea" :model-value="orderAndConfig.order.description" readonly />
+      <van-field label="描述" rows="2" type="textarea" :model-value="orderAndConfig.order.description" readonly />
     </van-cell-group>
 
-    <van-cell-group inset :title="group.name" v-for="group in orderAndConfig.groupConfigs" :key="group.id">
+    <van-cell-group v-for="group in orderAndConfig.groupConfigs" :key="group.id" inset :title="group.name">
       <van-space direction="vertical" fill>
-        <van-button @click="pay(config)" type="primary" v-for="config in group.items" :key="config.id" block>{{ config.name }}</van-button>
+        <van-button v-for="config in group.items" :key="config.id" type="primary" block @click="pay(config)">
+          {{ config.name }}
+        </van-button>
       </van-space>
     </van-cell-group>
   </div>
@@ -30,13 +32,16 @@
 <script setup lang="ts">
 import { useRoute } from 'vue-router'
 import { onMounted, ref } from 'vue'
-import {
+import type {
   CheckoutItemConfigResult,
   CheckoutOrderAndConfigResult,
-  checkoutPay,
-  CheckoutPayParam
+  CheckoutPayParam,
 } from './CheckoutPay.api'
-import { getOrderAndConfig } from './CheckoutPay.api'
+import {
+  checkoutPay
+  , getOrderAndConfig,
+} from './CheckoutPay.api'
+
 import { CheckoutTypeEnum } from '@/enums/daxpay/DaxPayEnum'
 import router from '@/router'
 
@@ -52,7 +57,6 @@ const orderAndConfig = ref<CheckoutOrderAndConfigResult>({
   groupConfigs: [],
 })
 
-
 /**
  * 初始化
  */
@@ -68,7 +72,7 @@ async function initData() {
   await getOrderAndConfig(orderNo, CheckoutTypeEnum.H5).then(({ data }) => {
     orderAndConfig.value = data
   }).catch((res) => {
-    router.push({ name: 'ErrorResult', query: { msg: res.message }, replace: true  })
+    router.push({ name: 'ErrorResult', query: { msg: res.message }, replace: true })
   })
   // 判断是否自动升级为聚合控制台
   if (orderAndConfig.value.config.h5AutoUpgrade) {
@@ -87,7 +91,8 @@ function goAggregate() {
   }
   else if (ua.includes('Alipay')) {
     router.push({ path: `/aggregate/alipay/${orderNo}`, replace: true })
-  } else {
+  }
+  else {
     show.value = true
   }
 }
@@ -95,13 +100,13 @@ function goAggregate() {
 /**
  * 发起支付
  */
-function pay(config: CheckoutItemConfigResult){
+function pay(config: CheckoutItemConfigResult) {
   loading.value = true
   const from = {
-    orderNo: orderNo,
-    itemId: config.id
+    orderNo,
+    itemId: config.id,
   } as CheckoutPayParam
-  checkoutPay(from).then(({data}) => {
+  checkoutPay(from).then(({ data }) => {
     loading.value = false
     // 跳转到支付页面
     location.replace(data.payBody)
diff --git a/src/views/daxpay/checkout/wechat/WechatAggregate.vue b/src/views/daxpay/checkout/wechat/WechatAggregate.vue
index 454541a..f1991fc 100644
--- a/src/views/daxpay/checkout/wechat/WechatAggregate.vue
+++ b/src/views/daxpay/checkout/wechat/WechatAggregate.vue
@@ -16,9 +16,9 @@
       <van-field label="标题" :model-value="aggregateInfo.order.title" readonly />
       <van-field label="订单号" :model-value="aggregateInfo.order.bizOrderNo" readonly />
       <van-field label="支付号" :model-value="aggregateInfo.order.orderNo" readonly />
-      <van-field label="描述" rows="2"  type="textarea" :model-value="aggregateInfo.order.description" readonly />
+      <van-field label="描述" rows="2" type="textarea" :model-value="aggregateInfo.order.description" readonly />
     </van-cell-group>
-    <van-submit-bar safe-area-inset-bottom :price="(aggregateInfo.order.amount || 0)*100" button-text="支付" @submit="pay" />
+    <van-submit-bar safe-area-inset-bottom :price="(aggregateInfo.order.amount || 0) * 100" button-text="支付" @submit="pay" />
   </div>
 </template>
 
@@ -28,11 +28,12 @@ import { useRoute } from 'vue-router'
 
 import { CheckoutAggregateEnum } from '@/enums/daxpay/DaxPayEnum'
 import router from '@/router'
-import {
-  AggregateOrderAndConfigResult, aggregatePay, CheckoutAggregatePayParam,
-  CheckoutAuthCodeParam,
-} from '@/views/daxpay/checkout/CheckoutPay.api'
-import { auth, generateAuthUrl, getAggregateConfig } from '@/views/daxpay/checkout/CheckoutPay.api'
+import type {
+  AggregateOrderAndConfigResult, CheckoutAggregatePayParam,
+  CheckoutAuthCodeParam} from '@/views/daxpay/checkout/CheckoutPay.api';
+import { aggregatePay
+ auth, generateAuthUrl, getAggregateConfig } from '@/views/daxpay/checkout/CheckoutPay.api'
+
 
 import type { WxJsapiSignResult } from '@/views/daxpay/cashier/CashierCode.api'
 
@@ -72,7 +73,7 @@ function init() {
       const url = res.data
       location.replace(url)
     }).catch((res) => {
-      router.push({ name: 'ErrorResult', query: { msg: res.message }, replace: true  })
+      router.push({ name: 'ErrorResult', query: { msg: res.message }, replace: true })
     })
   }
   else {
@@ -91,14 +92,14 @@ async function initData() {
   getAggregateConfig(orderNo, CheckoutAggregateEnum.WECHAT).then(({ data }) => {
     aggregateInfo.value = data
   }).catch((res) => {
-    router.push({ name: 'ErrorResult', query: { msg: res.message }, replace: true  })
+    router.push({ name: 'ErrorResult', query: { msg: res.message }, replace: true })
   })
 
   // 认证获取OpenId
   await auth(authParam.value).then(({ data }) => {
     openId.value = data.openId as string
   }).catch((res) => {
-    router.push({ name: 'ErrorResult', query: { msg: res.message }, replace: true  })
+    router.push({ name: 'ErrorResult', query: { msg: res.message }, replace: true })
   })
   // 判断是否自动拉起支付
   if (aggregateInfo.value.aggregateConfig.autoLaunch) {