diff --git a/src/utils/http/axios/index.ts b/src/utils/http/axios/index.ts index 90222eb..04cfb70 100644 --- a/src/utils/http/axios/index.ts +++ b/src/utils/http/axios/index.ts @@ -1,23 +1,19 @@ // axios配置 可自行根据项目进行更改,只需更改该文件即可,其他文件可以不动 -import type { AxiosResponse } from 'axios' -import axios from 'axios' -import { showDialog, showFailToast } from 'vant' -import { VAxios } from './Axios' -import type { AxiosTransform } from './axiosTransform' -import { checkStatus } from './checkStatus' -import { formatRequestDate, joinTimestamp } from './helper' -import type { CreateAxiosOptions, RequestOptions } from './types' -import { ContentTypeEnum, RequestEnum, ResultEnum } from '@/enums/httpEnum' -import { PageEnum } from '@/enums/pageEnum' -import { useGlobSetting } from '@/hooks/setting' +import type { AxiosResponse } from "axios"; +import axios from "axios"; +import { showDialog, showFailToast } from "vant"; +import { VAxios } from "./Axios"; +import type { AxiosTransform } from "./axiosTransform"; +import { checkStatus } from "./checkStatus"; +import { formatRequestDate, joinTimestamp } from "./helper"; +import type { CreateAxiosOptions, RequestOptions } from "./types"; +import { ContentTypeEnum, RequestEnum, ResultEnum } from "@/enums/httpEnum"; +import { useGlobSetting } from "@/hooks/setting"; -import { isString } from '@/utils/is/' -import { deepMerge, isUrl } from '@/utils' -import { setObjToUrlParams } from '@/utils/urlUtils' - -import router from '@/router' -import { storage } from '@/utils/Storage' -import type { Result } from '#/axios' +import { isString } from "@/utils/is/"; +import { deepMerge, isUrl } from "@/utils"; +import { setObjToUrlParams } from "@/utils/urlUtils"; +import type { Result } from "#/axios"; const globSetting = useGlobSetting() const urlPrefix = globSetting.urlPrefix @@ -87,12 +83,11 @@ const transform: AxiosTransform = { } // 接口请求成功,直接返回相应结果 - if (code==ResultEnum.SUCCESS) { + if (code == ResultEnum.SUCCESS) { return result } // 接口请求错误,统一提示错误信息 这里逻辑可以根据项目进行修改 - const errorMsg = msg - throw new Error(errorMsg) + throw new Error(msg) }, // 请求之前处理config @@ -214,7 +209,7 @@ function createAxios(opt?: Partial) { // 是否返回原生响应头 比如:需要获取响应头时使用该属性 isReturnNativeResponse: false, // 需要对返回数据进行处理 - isTransformResponse: true, + isTransformResponse: false, // post请求的时候添加参数到url joinParamsToUrl: false, // 格式化提交参数时间 diff --git a/src/views/daxpay/cashier/Cashier.api.ts b/src/views/daxpay/cashier/Cashier.api.ts index 0eb585a..5b3e951 100644 --- a/src/views/daxpay/cashier/Cashier.api.ts +++ b/src/views/daxpay/cashier/Cashier.api.ts @@ -14,7 +14,7 @@ export function getOrderAndConfig(orderNo) { /** * 发起支付 */ -export function payOrder(data:payParam){ +export function payOrder(data: payParam) { return http.request>({ url: '/unipay/gateway/pay', method: 'POST', @@ -22,7 +22,6 @@ export function payOrder(data:payParam){ }) } - /** * 收银台配置 */ @@ -49,7 +48,7 @@ export interface GatewayOrder { description?: string /** 金额(元) */ amount?: number - expiredTime?: string; + expiredTime?: string } /** * 聚合支付配置信息 @@ -100,26 +99,26 @@ export interface CashierConfig { /** * 支付配置项参数 */ -export interface payParam{ +export interface payParam { // 订单号 - orderNo?:string, - //支付配置项ID - itemId?:number, + orderNo?: string + // 支付配置项ID + itemId?: number // 唯一标识 - openId?:string, + openId?: string // 付款码 - anthCode?:string, -} + anthCode?: string +} /** * 支付配置项参数返回值 */ -export interface payConfig{ +export interface payConfig { // 商户订单号 - bizOrderNo?:string, + bizOrderNo?: string // 订单号 - orderNo?:string, - //支付状态 - status?:string, - //支付参数体 - payBody?:string -} \ No newline at end of file + orderNo?: string + // 支付状态 + status?: string + // 支付参数体 + payBody?: string +} diff --git a/src/views/daxpay/cashier/Cashier.vue b/src/views/daxpay/cashier/Cashier.vue index a9de1f3..a6727da 100644 --- a/src/views/daxpay/cashier/Cashier.vue +++ b/src/views/daxpay/cashier/Cashier.vue @@ -3,7 +3,9 @@
-
{{ orderAndConfig.order.amount }} 元
+
+ {{ orderAndConfig.order.amount }} 元 +
剩余支付时间 @@ -12,13 +14,17 @@ {{ orderTime.currentSeconds }}
-
标题:
+
+ 标题: +
{{ orderAndConfig.order.title }}
-
订单编号:
+
+ 订单编号: +
{{ orderAndConfig.order.orderNo }}
@@ -34,151 +40,155 @@ @click="payTypeClick(item)" >
- - + +

{{ item.name }}

推荐
- +
-
+
支付¥{{ orderAndConfig.order.amount }}
-
+
支付¥{{ orderAndConfig.order.amount }}
-
+
- -
处理中,请耐心等待
+ +
+ 处理中,请耐心等待 +