From 17caebabf7a6a529b7039c71e21e5a324e31ea20 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 27 九月 2024 16:23:42 +0800
Subject: [PATCH] 代理新功能完善

---
 src/main/resources/static/admin/order-list.html |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/static/admin/order-list.html b/src/main/resources/static/admin/order-list.html
index 991c2f2..d7dbf64 100644
--- a/src/main/resources/static/admin/order-list.html
+++ b/src/main/resources/static/admin/order-list.html
@@ -57,10 +57,11 @@
 					<div class="layui-inline">
 						<input type="text" name="endDate" placeholder="缁撴潫鏃ユ湡" autocomplete="off" class="layui-input">
 					</div>
-
+					<div class="layui-inline">
 					<button class="layui-btn layui-btn-normal" lay-submit lay-filter="search" id="search">鎼滅储</button>
 					<button class="layui-btn layui-btn-normal layui-btn-xs" lay-submit lay-filter="download"
 						id="download">涓嬭浇</button>
+					</div>
 				</div>
 			</form>
 			<div class="layui-form" id="table-list">
@@ -222,6 +223,17 @@
 										"distributedClientInfo.account"]
 								}
 							},
+                            {
+                                field: 'key',
+                                title: '鍙d护',
+                                width: 150,
+                                templet: '<textarea readonly>{{d.key}}</textarea>'
+                            },
+                            {
+                                field: 'payMerchant',
+                                title: '鍟嗗',
+                                width: 150
+                            },
 							{
 								field: 'distributedTime',
 								title: '鏀粯璁惧鍒嗛厤鏃堕棿',
@@ -242,12 +254,7 @@
 								title: '鏀粯鎴愬姛鏃堕棿',
 								width: 170,
 							},
-							{
-								field: 'key',
-								title: '鍙d护',
-								width: 150,
-								templet: '<textarea readonly>{{d.key}}</textarea>'
-							},
+
 							{
 								field: '',
 								title: '鎿嶄綔',

--
Gitblit v1.8.0