From 44d2c6cd66f782e59a1c8ede8e026c9e364032da Mon Sep 17 00:00:00 2001 From: ren Date: Sat, 29 Mar 2025 09:55:01 +0800 Subject: [PATCH] =?UTF-8?q?eslint=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 3 +- src/utils/http/axios/index.ts | 39 ++--- src/views/daxpay/cashier/Cashier.vue | 38 ++++- src/views/daxpay/result/PayFail.vue | 230 ++++++++++++++------------- 4 files changed, 177 insertions(+), 133 deletions(-) diff --git a/.env.development b/.env.development index 77b0d7b..68ae6a8 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,8 @@ VITE_PORT=9100 VITE_PUBLIC_PATH=/ # 跨域代理，可以配置多个，请注意不要换行 - VITE_PROXY=[["/server","http://localhost:19999"]] + VITE_PROXY=[["/server","http://daxpay-api.test.yibeiguangnian.cn/"]] +# VITE_PROXY=[["/server","https://pay1.bootx.cn/"]] # API 接口地址 VITE_GLOB_API_URL= diff --git a/src/utils/http/axios/index.ts b/src/utils/http/axios/index.ts index 04cfb70..ff74ef9 100644 --- a/src/utils/http/axios/index.ts +++ b/src/utils/http/axios/index.ts @@ -1,19 +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 { 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 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 @@ -55,7 +55,7 @@ const transform: AxiosTransform = { throw new Error('请求出错，请稍候重试') } // 这里 code，result，message为 后台统一的字段，需要修改为项目自己的接口返回格式 - const { code, msg, data } = result + const { code, msg } = result // 请求成功 const hasSuccess = result && Reflect.has(result, 'code') && code === ResultEnum.SUCCESS // 是否显示提示信息 @@ -83,6 +83,7 @@ const transform: AxiosTransform = { } // 接口请求成功，直接返回相应结果 + // eslint-disable-next-line eqeqeq if (code == ResultEnum.SUCCESS) { return result } @@ -99,8 +100,7 @@ const transform: AxiosTransform = { config.url = `${urlPrefix}${config.url}` } - if (!isUrlStr && apiUrl && isString(apiUrl)) { - } + if (!isUrlStr && apiUrl && isString(apiUrl)) { /* empty */ } const params = config.params || {} const data = config.data || false if (config.method?.toUpperCase() === RequestEnum.GET) { @@ -116,6 +116,7 @@ const transform: AxiosTransform = { } else { if (!isString(params)) { + // eslint-disable-next-line ts/no-unused-expressions formatDate && formatRequestDate(params) if ( Reflect.has(config, 'data') @@ -165,8 +166,8 @@ const transform: AxiosTransform = { title: '网络异常', message: '请检查您的网络连接是否正常', }) - .then(() => {}) - .catch(() => {}) + .then(() => { }) + .catch(() => { }) return Promise.reject(error) } } diff --git a/src/views/daxpay/cashier/Cashier.vue b/src/views/daxpay/cashier/Cashier.vue index a6727da..fa9bc13 100644 --- a/src/views/daxpay/cashier/Cashier.vue +++ b/src/views/daxpay/cashier/Cashier.vue @@ -34,14 +34,12 @@

请选择支付方式

- - + +

{{ item.name }}

推荐 @@ -73,7 +71,7 @@ - - - \ No newline at end of file + + .payPrice { + display: flex; + gap: 0.315rem; + align-items: center; + + .unit { + font-size: 0.75rem; + transform: translateY(0.525rem); + } + + .price { + font-size: 2rem; + font-weight: 700; + } + } + + .payMessBox { + width: 100%; + padding: 0px 1.25rem; + display: flex; + flex-direction: column; + gap: 0.625rem; + + .payMessItem { + width: 100%; + display: flex; + justify-content: space-between; + + .itemTitle { + font-size: 1rem; + color: #797d81; + } + + .itemContent { + font-size: 1rem; + font-weight: 500; + font-size: '微软雅黑'; + } + } + } + + .payBtnBox { + width: 90%; + margin: 0 auto; + background-color: #e74e4e; + color: #fff; + height: 3.25rem; + position: absolute; + bottom: 3.75rem; + text-align: center; + line-height: 3.25rem; + border-radius: 0.625rem; + } +} +