diff --git a/src/router/index.js b/src/router/index.js index 0c99a6c..ad21255 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -84,6 +84,11 @@ const routes = [ component: () => import('@/views/order/MerchantOrder.vue'), meta: { title: '商家订单' } }, + { + path: 'order/deal-config', + component: () => import('@/views/order/OrderDealConfig.vue'), + meta: { title: '成交与自动结算' } + }, { path: 'order/detail/:id', component: () => import('@/views/order/Detail.vue'), @@ -323,6 +328,11 @@ const routes = [ component: () => import('@/views/club/RechargePageCopy.vue'), meta: { title: '充值页文案' } }, + { + path: 'miniapp/role-agreement', + component: () => import('@/views/miniapp/RoleAgreement.vue'), + meta: { title: '角色协议' } + }, // ========== 店铺管理(原有) ========== { path: 'shop/list', diff --git a/src/utils/club-context.js b/src/utils/club-context.js index 83d6864..d5dbbbf 100644 --- a/src/utils/club-context.js +++ b/src/utils/club-context.js @@ -133,6 +133,8 @@ const KEFU_MENU_ROWS = [ { page_id: 'assessment.record', parent_id: 'assessment', path: '/assessment/record', sort_order: 23, perm_codes: ['kaohepeizhi'] }, { page_id: 'order.platform', parent_id: 'order', path: '/order/platform', sort_order: 31, perm_codes: ['002ab'] }, { page_id: 'order.merchant', parent_id: 'order', path: '/order/merchant', sort_order: 32, perm_codes: ['002ac', '002ab', '003aa'] }, + { page_id: 'order.deal-config', parent_id: 'order', path: '/order/deal-config', sort_order: 33, perm_codes: ['002ab', '002ac', '003aa'] }, + { page_id: 'order.merchant', parent_id: 'order', path: '/order/merchant', sort_order: 32, perm_codes: ['002ac', '002ab', '003aa'] }, { page_id: 'cross-platform.order', parent_id: 'cross-platform', path: '/cross-order', sort_order: 41, perm_codes: ['003aa'] }, { page_id: 'cross-platform.settings', parent_id: 'cross-platform', path: '/cross-settings', sort_order: 42, perm_codes: ['003aa'] }, { page_id: 'cross-platform.data', parent_id: 'cross-platform', path: '/cross-data', sort_order: 43, perm_codes: ['003aa'] }, @@ -166,6 +168,7 @@ const KEFU_MENU_ROWS = [ { page_id: 'miniapp.dashou-exam', parent_id: 'miniapp', path: '/miniapp/dashou-exam', sort_order: 117, perm_codes: ['dsks666', '8080a'] }, { page_id: 'miniapp.rank-reward', parent_id: 'miniapp', path: '/miniapp/rank-reward', sort_order: 118, perm_codes: ['phbj666', '8080a'] }, { page_id: 'miniapp.recharge-copy', parent_id: 'miniapp', path: '/miniapp/recharge-copy', sort_order: 119, perm_codes: ['8080a'] }, + { page_id: 'miniapp.role-agreement', parent_id: 'miniapp', path: '/miniapp/role-agreement', sort_order: 120, perm_codes: ['xycfg001', '8080a'] }, { page_id: 'miniapp.withdraw-settings', parent_id: 'miniapp', path: '/withdraw/settings', sort_order: 114, perm_codes: ['5500a', '5500b', '5500c'] }, { page_id: 'shop.list', parent_id: 'shop', path: '/shop/list', sort_order: 121, perm_codes: ['999a', '999b', '999c', '999d', '999e'] }, { page_id: 'shop.withdraw', parent_id: 'shop', path: '/shop/withdraw-apply', sort_order: 122, perm_codes: ['999a', '999b', '999c', '999d', '999e'] }, @@ -177,13 +180,13 @@ const KEFU_MENU_PARENT_IDS = { admin: ['admin.role', 'admin.data-scope', 'admin.club-config', 'admin.order-grab-share', 'admin.user', 'admin.operation-log'], finance: ['finance.bankuai', 'finance.data', 'finance.fund-freeze-config', 'finance.fund-freeze-ledger', 'finance.fund-risk-stats'], assessment: ['assessment.examiner', 'assessment.config', 'assessment.record'], - order: ['order.platform', 'order.merchant'], + order: ['order.platform', 'order.merchant', 'order.deal-config'], 'cross-platform': ['cross-platform.order', 'cross-platform.settings', 'cross-platform.data', 'cross-platform.pre'], user: ['user.player', 'user.guanli', 'user.shangjia', 'user.zuzhang', 'user.identity-tag'], withdraw: ['withdraw.audit', 'withdraw.data', 'withdraw.settings'], product: ['product.list', 'product.type-zone', 'product.turntable', 'product.data', 'product.fake-orders'], member: ['member.list', 'member.data'], - miniapp: ['miniapp.carousel', 'miniapp.assets', 'miniapp.popup', 'miniapp.leixing', 'miniapp.kaohe-tags', 'miniapp.dashou-exam', 'miniapp.rank-reward', 'miniapp.recharge-copy', 'miniapp.withdraw-settings'], + miniapp: ['miniapp.carousel', 'miniapp.assets', 'miniapp.popup', 'miniapp.leixing', 'miniapp.kaohe-tags', 'miniapp.dashou-exam', 'miniapp.rank-reward', 'miniapp.recharge-copy', 'miniapp.role-agreement', 'miniapp.withdraw-settings'], shop: ['shop.list', 'shop.withdraw', 'shop.products'], }; @@ -429,6 +432,10 @@ export const JITUAN_API = { fundFreezeConfig: '/jituan/houtai/fund-freeze-config', fundFreezeLedger: '/jituan/houtai/fund-freeze-ledger', fundFreezeRisk: '/jituan/houtai/fund-freeze-risk', + roleAgreement: '/jituan/houtai/role-agreement', + orderDealConfig: '/jituan/houtai/order-deal-config', + merchantDealStat: '/jituan/houtai/merchant-deal-stat', + dashouDealStat: '/jituan/houtai/dashou-deal-stat', paymentChannelManage: '/jituan/houtai/payment-channel-manage', clubCertUpload: '/jituan/houtai/club-cert-upload', memberList: '/jituan/houtai/hthqhylb', diff --git a/src/views/Layout.vue b/src/views/Layout.vue index ab94d87..c9c4297 100644 --- a/src/views/Layout.vue +++ b/src/views/Layout.vue @@ -57,6 +57,7 @@ 平台订单 商家订单 + 成交与自动结算 @@ -156,6 +157,7 @@ 打手接单考试 排行榜奖励 充值页文案 + 角色协议 提现与收款设置 diff --git a/src/views/order/OrderDealConfig.vue b/src/views/order/OrderDealConfig.vue new file mode 100644 index 0000000..1f9c984 --- /dev/null +++ b/src/views/order/OrderDealConfig.vue @@ -0,0 +1,165 @@ + + + + +