From adcf52bbacf014ffc89b774546b27d12102f0099 Mon Sep 17 00:00:00 2001 From: 15820893422 <1978476055@qq.com> Date: Sun, 28 Apr 2024 16:10:43 +0800 Subject: [PATCH] edit --- src/api/merchant.js | 6 +++ src/filters/commFilter.js | 5 ++- src/utils/index.js | 26 +++++++++++- .../merchant/list/handle/merEditForm.vue | 3 ++ src/views/merchant/list/index.vue | 8 +++- src/views/order/list/index.vue | 5 ++- src/views/order/refund/index.vue | 24 ++++++++++- src/views/setting/systemLog/index.vue | 42 ++++++++++++++++++- 8 files changed, 111 insertions(+), 8 deletions(-) diff --git a/src/api/merchant.js b/src/api/merchant.js index 1324bac..49fbfff 100644 --- a/src/api/merchant.js +++ b/src/api/merchant.js @@ -74,6 +74,12 @@ export function merchantDeleteApi(id) { export function merchantDeleteForm(id) { return request.get(`system/merchant/delete/${id}/form`) } +/** + * @description 商户列表 -- 缴费(表单) + */ +export function merchantPayForm(id) { + return request.get(`margin/offline_money/${id}/form`) +} /** * @description 商户列表 -- 修改开启状态 */ diff --git a/src/filters/commFilter.js b/src/filters/commFilter.js index cb9e353..bf39785 100644 --- a/src/filters/commFilter.js +++ b/src/filters/commFilter.js @@ -166,13 +166,14 @@ export function cancelOrderStatusFilter(status) { export function orderPayType(type) { const typeMap = { - '0': '余额支付', + '0': '消费券支付', '1': '微信支付', '2': '小程序', '3': '微信支付', '4': '支付宝', '5': '支付宝扫码', - '6': '微信扫码' + '6': '微信扫码', + '7': '铸源星支付' } return typeMap[type] } diff --git a/src/utils/index.js b/src/utils/index.js index 368d3d5..f016c71 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -51,7 +51,31 @@ export function parseTime(time, cFormat) { }) return time_str } - +/** + * @param {json} json + * @returns {string} + */ +export function syntaxHighlight(json) { + if (typeof json != 'string') { + json = JSON.stringify(json, undefined, 2); + } + json = json.replace(/&/g, '&').replace(//g, '>'); + return json.replace(/("(\\u[a-zA-Z0-9]{4}|\\[^u]|[^\\"])*"(\s*:)?|\b(true|false|null)\b|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?)/g, function (match) { + var cls = 'number'; + if (/^"/.test(match)) { + if (/:$/.test(match)) { + cls = 'key'; + } else { + cls = 'string'; + } + } else if (/true|false/.test(match)) { + cls = 'boolean'; + } else if (/null/.test(match)) { + cls = 'null'; + } + return '' + match + ''; + }); +} /** * @param {number} time * @param {string} option diff --git a/src/views/merchant/list/handle/merEditForm.vue b/src/views/merchant/list/handle/merEditForm.vue index cfb1d92..961c168 100644 --- a/src/views/merchant/list/handle/merEditForm.vue +++ b/src/views/merchant/list/handle/merEditForm.vue @@ -236,6 +236,7 @@ - + - + + + + +