xyvcard-settle 0.0.55 → 0.0.57

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,7 +1,7 @@
1
1
  import { deepMerge as vs, RedirectPage as Ss, Layout as ze, ProfilePage as Ds, Error401Page as Ys, Error404Page as Os, routerRef as Ts, addViteMenus as xs, i18n as bs } from "jmash-core";
2
2
  import { createRouter as Ns, createWebHistory as Ps } from "vue-router";
3
- import { mchtLogin as Rs } from "xyvcard-merchant";
4
- import "xyvcard-agent";
3
+ import "xyvcard-merchant";
4
+ import { agentloginPage as Rs } from "xyvcard-agent";
5
5
  const Ws = {
6
6
  // 交易流水
7
7
  payTrade: {
@@ -43,7 +43,9 @@ const Ws = {
43
43
  description: "收款备注",
44
44
  qrcodeNo: "码牌编号",
45
45
  payTimeRequired: "请选择支付时间范围",
46
- needAtLeastOneCondition: "请至少选择一个查询条件"
46
+ needAtLeastOneCondition: "请至少选择一个查询条件",
47
+ outOrderNo: "商户订单号",
48
+ outOrderNoRead: "请输入商户订单号"
47
49
  },
48
50
  // 支付交易商户/代理商汇总统计;
49
51
  settleTradeAnalysis: {
@@ -2701,7 +2703,7 @@ const Ii = {
2701
2703
  formatDate: Li
2702
2704
  };
2703
2705
  }
2704
- }, Hi = [], $i = () => import("./index-B3iittmi.mjs"), qi = () => import("./index-CVEOIlcb.mjs"), Bi = () => import("./index-UpMheR8A.mjs"), Ui = () => import("./index-DAXtcEHB.mjs"), Ai = [
2706
+ }, Hi = [], $i = () => import("./index-B3iittmi.mjs"), qi = () => import("./index-CVEOIlcb.mjs"), Ui = () => import("./index-UpMheR8A.mjs"), Bi = () => import("./index-B3pERT61.mjs"), Ai = [
2705
2707
  {
2706
2708
  path: "/redirect",
2707
2709
  component: ze,
@@ -2717,8 +2719,8 @@ const Ii = {
2717
2719
  path: "/login",
2718
2720
  // component: LoginPage,
2719
2721
  // component: pintaiLogin,
2720
- // component: agentloginPage,
2721
2722
  component: Rs,
2723
+ // component: mchtLogin,
2722
2724
  meta: { hidden: !0 }
2723
2725
  },
2724
2726
  {
@@ -2744,8 +2746,8 @@ const Ii = {
2744
2746
  {
2745
2747
  path: "/dashboard",
2746
2748
  // component: DashboardPage,
2749
+ // component: merchantHomePage,
2747
2750
  component: Ui,
2748
- // component: agentHomePage,
2749
2751
  // component: pintaiHomePage,
2750
2752
  name: "Dashboard",
2751
2753
  // 用于 keep-alive, 必须与SFC自动推导或者显示声明的组件name一致
@@ -2778,16 +2780,16 @@ const Ii = {
2778
2780
  scrollBehavior: () => ({ left: 0, top: 0 })
2779
2781
  });
2780
2782
  Ts.value = Ei;
2781
- const Vi = /* @__PURE__ */ Object.assign({ "./views/payment/agentHomePage/index.vue": () => import("./index-UpMheR8A.mjs"), "./views/payment/agentHomePage/merchant.vue": () => import("./merchant-D3ctdb_L.mjs"), "./views/payment/agentHomePage/pay.vue": () => import("./pay-DE3hsH6b.mjs"), "./views/payment/agentHomePage/payPal.vue": () => import("./payPal-BxEHOKHE.mjs"), "./views/payment/agentHomePage/sale.vue": () => import("./sale-lKDJnhcE.mjs"), "./views/payment/agentHomePage/trend.vue": () => import("./trend-D__Df_wF.mjs"), "./views/payment/history-pay-trade/index.vue": () => import("./index-C6IvQBy0.mjs"), "./views/payment/instHomePage/index.vue": () => import("./index-CVEOIlcb.mjs"), "./views/payment/instHomePage/pay.vue": () => import("./pay-D5948kuF.mjs"), "./views/payment/instHomePage/payPal.vue": () => import("./payPal-FS5kDoPy.mjs"), "./views/payment/instHomePage/trend.vue": () => import("./trend-CD-Orlre.mjs"), "./views/payment/instsLogin/index.vue": () => import("./index-B3iittmi.mjs"), "./views/payment/merchantHomePage/index.vue": () => import("./index-DAXtcEHB.mjs"), "./views/payment/merchantHomePage/trend.vue": () => import("./trend-DCJoR00O.mjs").then((e) => e.t), "./views/payment/pay-trade-personal/index.vue": () => import("./index-CVrtwq6W.mjs"), "./views/payment/pay-trade/index.vue": () => import("./index-LT7qO1_c.mjs"), "./views/payment/settle-trade-analysis/index.vue": () => import("./index-Cw3Bhtc2.mjs"), "./views/payment/settle-trade-merchant-personal/index.vue": () => import("./index-BmSUfSfV.mjs"), "./views/payment/settle-trade-merchant/index.vue": () => import("./index-BeU6u9hH.mjs"), "./views/payment/settle-trade-receipt-personal/history.vue": () => import("./history-DWaN_Nrb.mjs"), "./views/payment/settle-trade-receipt-personal/index.vue": () => import("./index-D8LRYlta.mjs"), "./views/payment/settle-trade-receipt-personal/today.vue": () => import("./today-BU8dRQhE.mjs"), "./views/payment/settle-trade-receipt/history.vue": () => import("./history-CMyJKuis.mjs"), "./views/payment/settle-trade-receipt/index.vue": () => import("./index-ZwyAUTzX.mjs"), "./views/payment/settle-trade-receipt/today.vue": () => import("./today-DO4wIwlZ.mjs") }), Ji = {
2783
+ const Vi = /* @__PURE__ */ Object.assign({ "./views/payment/agentHomePage/index.vue": () => import("./index-UpMheR8A.mjs"), "./views/payment/agentHomePage/merchant.vue": () => import("./merchant-D3ctdb_L.mjs"), "./views/payment/agentHomePage/pay.vue": () => import("./pay-DE3hsH6b.mjs"), "./views/payment/agentHomePage/payPal.vue": () => import("./payPal-BxEHOKHE.mjs"), "./views/payment/agentHomePage/sale.vue": () => import("./sale-lKDJnhcE.mjs"), "./views/payment/agentHomePage/trend.vue": () => import("./trend-D__Df_wF.mjs"), "./views/payment/history-pay-trade/index.vue": () => import("./index-B02mQtzb.mjs"), "./views/payment/instHomePage/index.vue": () => import("./index-CVEOIlcb.mjs"), "./views/payment/instHomePage/pay.vue": () => import("./pay-D5948kuF.mjs"), "./views/payment/instHomePage/payPal.vue": () => import("./payPal-FS5kDoPy.mjs"), "./views/payment/instHomePage/trend.vue": () => import("./trend-CD-Orlre.mjs"), "./views/payment/instsLogin/index.vue": () => import("./index-B3iittmi.mjs"), "./views/payment/merchantHomePage/index.vue": () => import("./index-B3pERT61.mjs"), "./views/payment/merchantHomePage/trend.vue": () => import("./trend-DCJoR00O.mjs").then((e) => e.t), "./views/payment/pay-trade-personal/index.vue": () => import("./index-DGZio-jj.mjs"), "./views/payment/pay-trade/index.vue": () => import("./index-BTI3XFDd.mjs"), "./views/payment/settle-trade-analysis/index.vue": () => import("./index-D09KMqNV.mjs"), "./views/payment/settle-trade-merchant-personal/index.vue": () => import("./index-BmSUfSfV.mjs"), "./views/payment/settle-trade-merchant/index.vue": () => import("./index-BeU6u9hH.mjs"), "./views/payment/settle-trade-receipt-personal/history.vue": () => import("./history-DWaN_Nrb.mjs"), "./views/payment/settle-trade-receipt-personal/index.vue": () => import("./index-D8LRYlta.mjs"), "./views/payment/settle-trade-receipt-personal/today.vue": () => import("./today-BU8dRQhE.mjs"), "./views/payment/settle-trade-receipt/history.vue": () => import("./history-CMyJKuis.mjs"), "./views/payment/settle-trade-receipt/index.vue": () => import("./index-ZwyAUTzX.mjs"), "./views/payment/settle-trade-receipt/today.vue": () => import("./today-DO4wIwlZ.mjs") }), Ji = {
2782
2784
  install(e) {
2783
2785
  xs(Vi, 7), Fs(bs), e.use(Ii);
2784
2786
  }
2785
2787
  };
2786
2788
  export {
2787
- Bi as a,
2789
+ Ui as a,
2788
2790
  $i as b,
2789
2791
  l as h,
2790
- Ui as m,
2792
+ Bi as m,
2791
2793
  qi as p,
2792
2794
  Ji as s
2793
2795
  };
package/dist/index.mjs CHANGED
@@ -1,5 +1,5 @@
1
1
  import "jmash-core";
2
- import { a as o, s as t, m as i, p as s, b as g } from "./index-C8tSWVoy.mjs";
2
+ import { a as o, s as t, m as i, p as s, b as g } from "./index-KKhBDhLB.mjs";
3
3
  export {
4
4
  o as agentHomePage,
5
5
  t as default,
@@ -64,12 +64,12 @@ export interface PaymentTradePage extends EntityPage {
64
64
  totalDto: PaymentTradeModelTotal;
65
65
  }
66
66
  export interface PaymentTradeModelTotal extends EntityTotal {
67
- totalSize: number;
68
- totalAmount?: number;
67
+ orderCount?: number;
68
+ orderAmount?: number;
69
69
  tradeAmount?: number;
70
70
  paidOrder?: number;
71
71
  paidAmount?: number;
72
- discountAmount?: number;
72
+ orderDiscountAmount?: number;
73
73
  refundOrder?: number;
74
74
  refundAmount?: string;
75
75
  }
@@ -64,12 +64,12 @@ export interface MyPaymentTradePage extends EntityPage {
64
64
  totalDto: MyPaymentTradeModelTotal;
65
65
  }
66
66
  export interface MyPaymentTradeModelTotal extends EntityTotal {
67
- totalSize: number;
68
- totalAmount?: number;
67
+ orderCount?: number;
68
+ orderAmount?: number;
69
69
  tradeAmount?: number;
70
70
  paidOrder?: number;
71
71
  paidAmount?: number;
72
- discountAmount?: number;
72
+ orderDiscountAmount?: number;
73
73
  refundOrder?: number;
74
74
  refundAmount?: string;
75
75
  }
@@ -10,6 +10,7 @@ export interface SettleAgentTradeAnalysisReq extends EntityReq {
10
10
  analysisTimeEnd?: string;
11
11
  marketBy?: string;
12
12
  tokenExt?: string;
13
+ outOrderNo?: string;
13
14
  }
14
15
  export interface SettleAgentTradeAnalysisModel extends EntityModel {
15
16
  analysisTime?: string;
@@ -39,6 +39,8 @@ declare const _default: {
39
39
  qrcodeNo: string;
40
40
  payTimeRequired: string;
41
41
  needAtLeastOneCondition: string;
42
+ outOrderNo: string;
43
+ outOrderNoRead: string;
42
44
  };
43
45
  settleTradeAnalysis: {
44
46
  merchantNo: string;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "xyvcard-settle",
3
- "version": "0.0.55",
3
+ "version": "0.0.57",
4
4
  "private": false,
5
5
  "module": "dist/index.mjs",
6
6
  "types": "dts/src/index.d.ts",
@@ -23,14 +23,14 @@
23
23
  "element-plus": "^2.9.10",
24
24
  "jmash-core": "^0.1.13",
25
25
  "jmash-dict": "^0.1.4",
26
- "jmash-rbac": "^0.1.18",
26
+ "jmash-rbac": "^0.1.21",
27
27
  "pinia": "^2.3.1",
28
28
  "vue": "^3.5.13",
29
29
  "vue-i18n": "^9.14.4",
30
30
  "vue-router": "^4.5.1",
31
- "xyvcard-agent": "0.0.49",
31
+ "xyvcard-agent": "0.0.50",
32
32
  "xyvcard-insts": "0.0.40",
33
- "xyvcard-merchant": "0.0.57"
33
+ "xyvcard-merchant": "0.0.65"
34
34
  },
35
35
  "devDependencies": {
36
36
  "@eslint/js": "^9.14.0",