From 707d995dcf0603f9a3ba9443921eb5480cb3f383 Mon Sep 17 00:00:00 2001 From: j1ack <1209452658@qq.com> Date: Wed, 22 Mar 2023 09:56:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/form.js | 120 +++- src/layout/components/Navbar.vue | 3 +- src/utils/request.js | 38 +- .../pay/payAgentUser/payAgentUserList.vue | 42 +- .../pkCouponScopeRangeStoreList2.vue | 531 ++++++++++++++++++ src/views/pay/payAgentUser/rate.vue | 8 +- src/views/pay/payOrder/payBalanceRecord.vue | 4 +- src/views/pay/payOrder/payDaiFuWater.vue | 32 +- .../pay/payOrder/payDailiDivideDetail.vue | 1 + src/views/pay/payOrder/payMoneyWater.vue | 35 +- src/views/pay/payTest/payCode.vue | 9 +- 测试.zip | Bin 4475822 -> 0 bytes 12 files changed, 749 insertions(+), 74 deletions(-) create mode 100644 src/views/pay/payAgentUser/pkCouponScopeRangeStoreList2.vue delete mode 100644 测试.zip diff --git a/src/api/form.js b/src/api/form.js index 521f64b..a14e8e0 100644 --- a/src/api/form.js +++ b/src/api/form.js @@ -11,13 +11,13 @@ import { * */ export const common_api = { - // 查询所有代理商 - selectAgentListAll: () => { - return request({ - url: '/system/user/selectAgentListAll', - method: 'get', - }) - }, + // 查询所有代理商 + selectAgentListAll: () => { + return request({ + url: '/system/user/selectAgentListAll', + method: 'get', + }) + }, // 所有国家 getAllNation: () => { return request({ @@ -65,6 +65,14 @@ export const common_api = { }, }) }, + // 查询所有支付通道列表 + payConfigAll: (query) => { + return request({ + url: '/pay/payConfig/all', + method: 'get', + params: query, + }) + }, } @@ -179,8 +187,9 @@ export const payAgentUser = { //修改商户费率 updateRate: (data) => { return request({ - url: '/store/store/updateRate?' + qs.stringify(data), + url: '/store/store/updateRate?', method: 'PUT', + data:data, headers: { Authorization: "Bearer " + getToken(), }, @@ -252,16 +261,16 @@ export const payAgentUser = { }) }, - // 分配用户代理商 - assignAgents: (data) => { - return request({ - url: '/system/user/assignAgents?'+qs.stringify(data), - method: 'post', - headers: { - Authorization: "Bearer " + getToken(), - }, - }) -}, + // 分配用户代理商 + assignAgents: (data) => { + return request({ + url: '/system/user/assignAgents?' + qs.stringify(data), + method: 'post', + headers: { + Authorization: "Bearer " + getToken(), + }, + }) + }, } @@ -383,7 +392,7 @@ export const manual_recharge_list = { // 内充流水审核提交 manual_recharge_audit_save: (data) => { return request({ - url: '/record/manual_recharge_audit_save?'+qs.stringify(data), + url: '/record/manual_recharge_audit_save?' + qs.stringify(data), method: 'post', }) }, @@ -546,8 +555,59 @@ export const platform_payment_list = { * 资金清算模块 */ export const payMoneyCalcu = { - // 人工修改余额接口 - updateBalance: (data) => { + // 代理渠道资金明细查看 + agentUpdateCapitalChannel: (query) => { + return request({ + url: '/order/agentUpdateCapitalChannel?' + qs.stringify(query), + method: 'get', + }) + }, + // 获取代理虚拟资金户 + getAgentUserCapitalAccountDetail: (query) => { + return request({ + url: '/order/getAgentUserCapitalAccountDetail', + method: 'get', + params: query, + headers: { + Authorization: "Bearer " + getToken(), + }, + }) + }, + // 获取代理资金管理金额 + agentAmountCount: (query) => { + return request({ + url: '/order/agentAmountCount', + method: 'get', + params: query, + headers: { + Authorization: "Bearer " + getToken(), + }, + }) + }, + // 代理-提交单笔代付申请 + agentPaymentSave: (data) => { + return request({ + url: '/order/agentPaymentSave?' + qs.stringify(data), + method: 'post', + headers: { + Authorization: "Bearer " + getToken(), + }, + }) + }, + // 获取代理资金列表 + agentCapitalList: (query) => { + return request({ + url: '/order/agentCapitalList', + method: 'get', + params: query, + headers: { + Authorization: "Bearer " + getToken(), + }, + }) + }, + + // 人工修改余额接口 + updateBalance: (data) => { return request({ url: '/order/updateBalance?' + qs.stringify(data), method: 'post', @@ -1220,13 +1280,13 @@ export const payBankManual = { * 代付银行 */ export const payBankPayment = { - // 批量导入模板 - downloadManualTemplate: (query) => { - return request({ - url: '/system/config/configKey/payment.masterplate', - method: 'get', - }) - }, + // 批量导入模板 + downloadManualTemplate: (query) => { + return request({ + url: '/system/config/configKey/payment.masterplate', + method: 'get', + }) + }, // 批量添加代付银行 batchimport: (data) => { return request({ @@ -1345,7 +1405,7 @@ export const pkUpdateBalanceRecord = { * 代理分成详细列表 */ - export const agentDivideList = { +export const agentDivideList = { // 查询线下转卡订单流水列表 listInfo: (query) => { return request({ @@ -1354,4 +1414,4 @@ export const pkUpdateBalanceRecord = { params: query, }) }, -} \ No newline at end of file +} diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 20fcabb..1dd531f 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -94,7 +94,6 @@ export default { }, methods: { toggleSideBar() { - console.log(1) this.$store.dispatch('app/toggleSideBar') }, async logout() { @@ -104,7 +103,7 @@ export default { type: 'warning' }).then(() => { this.$store.dispatch('LogOut').then(() => { - location.href = '/index'; + location.href = "/login"; }) }).catch(() => { }); } diff --git a/src/utils/request.js b/src/utils/request.js index 43e36b9..1e2f16e 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -103,7 +103,7 @@ service.interceptors.response.use(res => { // }); // } store.dispatch('LogOut').then(() => { - location.href = '/index'; + location.href = "/login"; }) return Promise.reject('无效的会话，或者会话已过期，请重新登录。') } else if (code === 500) { @@ -128,23 +128,25 @@ service.interceptors.response.use(res => { } }, error => { - console.log('err' + error) - let { - message - } = error; - if (message == "Network Error") { - message = "后端接口连接异常"; - } else if (message.includes("timeout")) { - message = "系统接口请求超时"; - } else if (message.includes("Request failed with status code")) { - message = "系统接口" + message.substr(message.length - 3) + "异常"; - } - Message({ - message: message, - type: 'error', - duration: 5 * 1000 - }) - return Promise.reject(error) + setTimeout(() => { + console.log('err' + error) + let { + message + } = error; + if (message == "Network Error") { + message = "后端接口连接异常"; + } else if (message.includes("timeout")) { + message = "系统接口请求超时"; + } else if (message.includes("Request failed with status code")) { + message = "系统接口" + message.substr(message.length - 3) + "异常"; + } + Message({ + message: message, + type: 'error', + duration: 5 * 1000 + }) + return Promise.reject(error) + }, 500); } ) diff --git a/src/views/pay/payAgentUser/payAgentUserList.vue b/src/views/pay/payAgentUser/payAgentUserList.vue index f1341a9..b7a927c 100644 --- a/src/views/pay/payAgentUser/payAgentUserList.vue +++ b/src/views/pay/payAgentUser/payAgentUserList.vue @@ -160,12 +160,12 @@ @click="handleAdd('新增商户', 'store', scope.row)" v-if="scope.row.userType != 'store'" v-hasPermi="['system:user:saveStoreOragent']">新增下级商户 + 代付 + 分配代理商 - - - 查看密钥 {{ detailInfoList.nationName }} - + {{ detailInfoList.nationSymbol }}
- {{ detailInfoList.storeNo }} 复制 + {{ detailInfoList.storeNo }} 复制 - {{ detailInfoList.storeKey }} 复制 + {{ detailInfoList.storeKey }} 复制 {{ detailInfoList.agentCount }} @@ -339,7 +341,7 @@ {{ detailInfoList.parentName }} - +
@@ -394,6 +396,14 @@
+ + + + + + @@ -402,7 +412,7 @@ import { common_api, payAgentUser } from "@/api/form"; import { resetUserPwd } from "@/api/system/user"; import Editor from "@/components/Editor"; import { getToken } from "@/utils/auth"; -import pkCouponScopeRangeStoreList from "./pkCouponScopeRangeStoreList"; +import pkCouponScopeRangeStoreList from "./pkCouponScopeRangeStoreList2"; import pwd from "./pwd"; export default { @@ -563,12 +573,18 @@ export default { }, }, methods: { - copy(value){ + // 查看资金列表 + handleView(row) { + this.pkCouponStore = row; + this.pkCouponStoreId = row.userId; + this.pkCouponScopeRangeParkingStoreOpen = true; + }, + copy(value) { this.$copyText(value).then(message => { - this.$message.success('Copied!') - }).catch(err => { - this.$message.error('Copy failed!') - }) + this.$message.success('Copied!') + }).catch(err => { + this.$message.error('Copy failed!') + }) }, change() { this.$forceUpdate() diff --git a/src/views/pay/payAgentUser/pkCouponScopeRangeStoreList2.vue b/src/views/pay/payAgentUser/pkCouponScopeRangeStoreList2.vue new file mode 100644 index 0000000..2864465 --- /dev/null +++ b/src/views/pay/payAgentUser/pkCouponScopeRangeStoreList2.vue @@ -0,0 +1,531 @@ + + + + + + \ No newline at end of file diff --git a/src/views/pay/payAgentUser/rate.vue b/src/views/pay/payAgentUser/rate.vue index c9e3a20..562adcb 100644 --- a/src/views/pay/payAgentUser/rate.vue +++ b/src/views/pay/payAgentUser/rate.vue @@ -326,13 +326,13 @@ export default { payAgentUser .updateRate({ // 入金 - spis: JSON.stringify(dataIns), + spis: dataIns, // 出金 - spos: JSON.stringify(dataOuts), + spos: dataOuts, // 代理 - agents: JSON.stringify(dataAgents), + agents: dataAgents, // 代理出金 - agentOuts: JSON.stringify(agentOuts) + agentOuts: agentOuts }) .then((response) => { this.msgSuccess("编辑成功"); diff --git a/src/views/pay/payOrder/payBalanceRecord.vue b/src/views/pay/payOrder/payBalanceRecord.vue index 473361d..3b52411 100644 --- a/src/views/pay/payOrder/payBalanceRecord.vue +++ b/src/views/pay/payOrder/payBalanceRecord.vue @@ -42,11 +42,11 @@ - + 搜索 重置 diff --git a/src/views/pay/payOrder/payDaiFuWater.vue b/src/views/pay/payOrder/payDaiFuWater.vue index 9ba7152..9f70f64 100644 --- a/src/views/pay/payOrder/payDaiFuWater.vue +++ b/src/views/pay/payOrder/payDaiFuWater.vue @@ -11,7 +11,7 @@
- + + + + + + + + + +