diff --git a/agentApp/common/api.js b/agentApp/common/api.js
index 648876b..412f327 100644
--- a/agentApp/common/api.js
+++ b/agentApp/common/api.js
@@ -63,6 +63,8 @@ const agentConfig = function() {
export const agentSmsLogin = (params) => http.post(baseUrl + '/api/agent/smsLogin', params)
export const agentAccountInfo = (params) => http.post(baseUrl + '/api/agent/accountInfo', params, agentConfig())
+export const agentMerchantList = (params) => http.post(baseUrl + '/api/agent/merchantList', params, agentConfig())
+export const agentOrderList = (params) => http.post(baseUrl + '/api/agent/orderList', params, agentConfig())
export const agentFillAlipayAccount = (params) => http.post(baseUrl + '/api/agent/fillAlipayAccount', params, agentConfig())
export const agentWithdraw = (params) => http.post(baseUrl + '/api/agent/withdraw', params, agentConfig())
export const agentWithdrawList = (params) => http.post(baseUrl + '/api/agent/withdrawList', params, agentConfig())
diff --git a/agentApp/pages/index/index.vue b/agentApp/pages/index/index.vue
index 1499289..3e29bd7 100644
--- a/agentApp/pages/index/index.vue
+++ b/agentApp/pages/index/index.vue
@@ -32,107 +32,41 @@
{{accountInfo.id}}
+
+ 商户数量:
+
+
+ {{accountInfo.merchant_count}}
+
- 提现信息
+ 订单列表
-
-
-
- 用户提现流水号
-
-
- 22398983498
-
+
+
+ 暂无订单
-
-
- 提现金额
-
-
-
- ¥458.00
+
+ 订单编号 {{order.out_trade_no}}
+
+
+
-
-
-
-
- 分成比例
-
-
- 5%
-
-
-
-
- 状态
-
-
- 到账
-
-
-
-
- 时间
-
-
- 2023-11-24 15:45:56
-
-
-
-
-
-
-
- 用户提现流水号
-
-
- 22398983498
-
-
-
-
- 提现金额
-
-
-
- ¥458.00
+
+ {{order.merchant.name}}
+ 金额:¥{{order.amount}}
+ 收益:¥{{order.agent_income}}
+ 订单时间:{{order.paid_at}}
-
-
- 分成比例
-
-
- 5%
-
-
-
-
- 状态
-
-
- 到账
-
-
-
-
- 时间
-
-
- 2023-11-24 15:45:56
-
-
-
-
-
- 下拉加载更多
+
+ {{ hasMore ? '加载更多数据...' : '已加载完毕' }}
@@ -142,22 +76,43 @@