diff --git a/agentApp/pages.json b/agentApp/pages.json index b58fe17..3962549 100644 --- a/agentApp/pages.json +++ b/agentApp/pages.json @@ -94,6 +94,55 @@ } + }, + { + "path" : "pages/user-orders/user-orders", + "style" : + { + "navigationBarTitleText" : "", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/withdrawal-history/withdrawal-history", + "style" : + { + "navigationBarTitleText" : "提现历史", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/withdrawal-management/withdrawal-management", + "style" : + { + "navigationBarTitleText" : "提现管理", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/scan-code/scan-code", + "style" : + { + "navigationBarTitleText" : "", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/queuing-information/queuing-information", + "style" : + { + "navigationBarTitleText" : "用户排队信息", + "navigationBarBackgroundColor": "#fff", + "navigationBarTextStyle": "black" + } + }, + { + "path" : "pages/account-opened/account-opened", + "style" : + { + "navigationBarTitleText" : "用户提现", + "enablePullDownRefresh" : false + } } diff --git a/agentApp/pages/account-opened/account-opened.vue b/agentApp/pages/account-opened/account-opened.vue new file mode 100644 index 0000000..135ac07 --- /dev/null +++ b/agentApp/pages/account-opened/account-opened.vue @@ -0,0 +1,301 @@ + + + + + 提现历史 + + + + + ¥ + + + 458.00 + + + + 可提现 + + + + + + 总体现:¥500.00 + + + + + + + 待入账:1000元 + + + + + + 提现中:458元 + + + + + + + + 支付宝账户 + + + + + + + 提现账户 + + + + 159****6532 + + + 修改 + + + + + + 可提现金额 + + + + ¥458.00 + + + + + + + 提现 + + + + + + + + + + + diff --git a/agentApp/pages/allpages/index.vue b/agentApp/pages/allpages/index.vue index b2e156e..3e8b464 100644 --- a/agentApp/pages/allpages/index.vue +++ b/agentApp/pages/allpages/index.vue @@ -4,6 +4,7 @@ 商户登录 商户主页 用户相关 + 用户订单 用户支付页面 用户支付页面2 代理商相关 diff --git a/agentApp/pages/merchant-index/index.vue b/agentApp/pages/merchant-index/index.vue index 9dbf190..62d516e 100644 --- a/agentApp/pages/merchant-index/index.vue +++ b/agentApp/pages/merchant-index/index.vue @@ -10,7 +10,7 @@ - + ¥ 394.00 @@ -83,7 +83,7 @@ - 已退款 + 退款 @@ -97,7 +97,22 @@ - + diff --git a/agentApp/pages/user-orders/user-orders.vue b/agentApp/pages/user-orders/user-orders.vue new file mode 100644 index 0000000..fdfa1df --- /dev/null +++ b/agentApp/pages/user-orders/user-orders.vue @@ -0,0 +1,309 @@ + + + + + + + 提现管理 + + + + ¥ + 458.00 + + 可提现 + + + + 待入账:¥200.00 + + + + 最近排队信息 + + + + 李姐烧烤(普罗旺斯店): + 购买时排队10,当前2 + + + 李姐烧烤(青秀万达店): + 购买时排队200,当前48 + + + + 查看更多 + + + + + + + + 订单编号 22398983498 + + + + + + 李姐烧烤(普罗旺斯店) + 金额:¥450.00 + 订单时间:2023-10-24 20:39:56 + + + + + 订单编号 22398983498 + + + + + + 李姐烧烤(普罗旺斯店) + 金额:¥450.00 + 订单时间:2023-10-24 20:39:56 + + + + + 订单编号 22398983498 + + + + + + 李姐烧烤(普罗旺斯店) + 金额:¥450.00 + 订单时间:2023-10-24 20:39:56 + + + + + + + + + + + + diff --git a/agentApp/pages/withdrawal-history/withdrawal-history.vue b/agentApp/pages/withdrawal-history/withdrawal-history.vue new file mode 100644 index 0000000..1de2a0c --- /dev/null +++ b/agentApp/pages/withdrawal-history/withdrawal-history.vue @@ -0,0 +1,128 @@ + + + + + + + + 流水号: 139812983213 + + + 提现成功 + + + 2023-11-28 15:45:39 + + + + -¥458.00 + + + + + + 流水号: 139812983213 + + + 提现成功 + + + 2023-11-28 15:45:39 + + + + -¥458.00 + + + + + + 流水号: 139812983213 + + + 提现成功 + + + 2023-11-28 15:45:39 + + + + -¥458.00 + + + + + + 流水号: 139812983213 + + + 提现成功 + + + 2023-11-28 15:45:39 + + + + -¥458.00 + + + + + + + + + diff --git a/agentApp/pages/withdrawal-management/withdrawal-management.vue b/agentApp/pages/withdrawal-management/withdrawal-management.vue new file mode 100644 index 0000000..bfc9e43 --- /dev/null +++ b/agentApp/pages/withdrawal-management/withdrawal-management.vue @@ -0,0 +1,222 @@ + + + + + 提现历史 + + + + + ¥ + + + 458.00 + + + + 可提现 + + + + + + 总提现:¥500.00 + + + + + + + 待入账:1000元 + + + + + + 提现中:458元 + + + + + + + + 支付宝账户 + + + + + 去开通 + + + + + + + + + + + + diff --git a/agentApp/static/page/merchant-account-opening-bg.png b/agentApp/static/page/merchant-account-opening-bg.png new file mode 100644 index 0000000..f370d60 Binary files /dev/null and b/agentApp/static/page/merchant-account-opening-bg.png differ