From acb1e72a57f95ba6f7aa553df38f2ac444c059e6 Mon Sep 17 00:00:00 2001
From: Jruome <2559028966@qq.com>
Date: Tue, 20 Jun 2023 15:58:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=20=E9=80=80?=
=?UTF-8?q?=E6=AC=BE=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
yudao-ui-admin/src/api/shop/rechargeOrder.js | 8 +
.../src/views/shop/refundOrder/index.vue | 368 ++++++++++++++++++
yudao-ui-app/pages/member_record/index.vue | 333 ++++++++++------
3 files changed, 597 insertions(+), 112 deletions(-)
create mode 100644 yudao-ui-admin/src/views/shop/refundOrder/index.vue
diff --git a/yudao-ui-admin/src/api/shop/rechargeOrder.js b/yudao-ui-admin/src/api/shop/rechargeOrder.js
index e3a5a3da0..b79182286 100644
--- a/yudao-ui-admin/src/api/shop/rechargeOrder.js
+++ b/yudao-ui-admin/src/api/shop/rechargeOrder.js
@@ -1,5 +1,13 @@
import request from '@/utils/request'
+// 添加备注
+export function adminRemark(data) {
+ return request({
+ url: '/shop/recharge-order/adminRemark',
+ method: 'post',
+ data: data
+ })
+}
// 获取商户
export function getTenantList(data) {
diff --git a/yudao-ui-admin/src/views/shop/refundOrder/index.vue b/yudao-ui-admin/src/views/shop/refundOrder/index.vue
new file mode 100644
index 000000000..9db190686
--- /dev/null
+++ b/yudao-ui-admin/src/views/shop/refundOrder/index.vue
@@ -0,0 +1,368 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.parentOrganizationName }}
+ -{{ scope.row.nickname }}
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.applyTime) }}
+
+
+
+
+ {{ parseTime(scope.row.applySucceedTime) }}
+
+
+
+
+
+ 添加备注
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/yudao-ui-app/pages/member_record/index.vue b/yudao-ui-app/pages/member_record/index.vue
index 20b781461..31ef1fc5d 100644
--- a/yudao-ui-app/pages/member_record/index.vue
+++ b/yudao-ui-app/pages/member_record/index.vue
@@ -1,7 +1,8 @@
-
+
@@ -12,86 +13,186 @@
{{list[item.refundStatus]}}
-
+
日期:{{$util.timestampToTime(item.stringCreateTime)}}
充值档次:{{item.grade}}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+