From 0e96a9be41bf5fdab4ff1a5f7463b8e069ec5667 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com> Date: Thu, 8 Aug 2024 17:53:31 +0800 Subject: [PATCH] =?UTF-8?q?API=E6=94=B6=E8=B4=B9=E5=BB=BA=E8=A1=A8?= =?UTF-8?q?=E3=80=81=E9=83=A8=E5=88=86=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/app/access.js | 8 ++ src/assets/icons/svg/bank.svg | 2 +- src/assets/styles/ruoyi.scss | 11 ++ src/utils/constants.js | 18 +++ src/utils/mixins.js | 18 ++- src/views/mch/access/index.vue | 67 ++++------ .../components/MchRechargeCountReport.vue | 1 + src/views/mch/index/index.vue | 16 +-- src/views/ss/access/index.vue | 12 +- src/views/ss/apiPrice/index.vue | 122 +++++++----------- src/views/system/recharge/detail.vue | 17 ++- src/views/system/recharge/index.vue | 22 +++- 12 files changed, 170 insertions(+), 144 deletions(-) diff --git a/src/api/app/access.js b/src/api/app/access.js index 5843188..a460f8f 100644 --- a/src/api/app/access.js +++ b/src/api/app/access.js @@ -24,3 +24,11 @@ export function appResetAccess(accessId) { method: 'put' }) } + +// 删除密钥对 +export function mchDelAccess(accessId) { + return request({ + url: `/app/access/${accessId}`, + method: 'delete' + }) +} diff --git a/src/assets/icons/svg/bank.svg b/src/assets/icons/svg/bank.svg index 151ffa8..96e5b15 100644 --- a/src/assets/icons/svg/bank.svg +++ b/src/assets/icons/svg/bank.svg @@ -1 +1 @@ - + diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss index acb2d0e..88410cd 100644 --- a/src/assets/styles/ruoyi.scss +++ b/src/assets/styles/ruoyi.scss @@ -302,3 +302,14 @@ background: linear-gradient(180deg, #e2f3ff -3%, #b8e1ff 100%); } } + +.el-scrollbar { + width: 100%; // 宽度可以设置也可以不设置 因为宽度默认就是填充满父级元素的内容区 + height: 100%; // 必须设置el-scrollbar的高度 + .el-scrollbar__wrap { // 实际上我们的内容是放在这个div下面的 + // height: 100%; // 渲染出来的div.el-scrollbar__wrap默认会添加height:100%的属性。我们可以设置为105%来隐藏元素水平滚动条 + height: 100%; + overflow: scroll; + overflow-x:auto; + } +} diff --git a/src/utils/constants.js b/src/utils/constants.js index 37811bf..536cc19 100644 --- a/src/utils/constants.js +++ b/src/utils/constants.js @@ -34,3 +34,21 @@ export const StoreApplyStatus = { AUDIT_PASS: "2", // 审核通过 AUDIT_FAIL: "3" // 审核不通过 } + +/** + * API收费标准类型 + */ +export const ApiPriceType = { + YEAR: { + type: "1", + unit: "年" + }, + MONTH: { + type: "2", + unit: "月" + }, + COUNT: { + type: "3", + unit: "次" + }, +} diff --git a/src/utils/mixins.js b/src/utils/mixins.js index e68a313..57bd4bc 100644 --- a/src/utils/mixins.js +++ b/src/utils/mixins.js @@ -1,4 +1,4 @@ -import { views } from '@/utils/constants' +import { ApiPriceType, views } from '@/utils/constants' export const $view = { props: { @@ -88,3 +88,19 @@ export const $withdrawServiceType = { } } } + +// API收费标准 +export const $apiPriceType = { + computed: { + // 单位 + apiPriceTypeUnit() { + return (type) => { + let key = Object.keys(ApiPriceType).find(key => ApiPriceType[key].type === type); + if (key) { + return ApiPriceType[key].unit; + } + return ""; + } + } + } +} diff --git a/src/views/mch/access/index.vue b/src/views/mch/access/index.vue index 4425e08..1ab7a37 100644 --- a/src/views/mch/access/index.vue +++ b/src/views/mch/access/index.vue @@ -25,38 +25,6 @@ @click="handleAdd" >申请秘钥 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -65,6 +33,10 @@ + + + + @@ -110,13 +81,15 @@ 取 消 + +