diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 4331dc0..7ccb05e 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -1,5 +1,9 @@
-import { constantRoutes } from '@/router'
-import { getRouters } from '@/api/menu'
+import {
+ constantRoutes
+} from '@/router'
+import {
+ getRouters
+} from '@/api/menu'
import Layout from '@/layout/index'
import ParentView from '@/components/ParentView';
@@ -20,7 +24,9 @@ const permission = {
},
actions: {
// 生成路由
- GenerateRoutes({ commit }) {
+ GenerateRoutes({
+ commit
+ }) {
return new Promise(resolve => {
// 向后端请求路由数据
getRouters().then(res => {
@@ -28,26 +34,26 @@ const permission = {
const rdata = JSON.parse(JSON.stringify(res.data))
const sidebarRoutes = filterAsyncRouter(sdata)
const rewriteRoutes = filterAsyncRouter(rdata, false, true)
-
- const first = sidebarRoutes?.[0]?.children?.[0]
+ const first = sidebarRoutes?. [0]?.children?. [0]
if (first) {
rewriteRoutes.unshift({
path: '',
component: Layout,
redirect: "index",
- children: [
- {
- path: "index",
- component: first.component,
- name: first.name,
- meta: first.meta
- },
- ]
+ children: [{
+ path: "index",
+ component: first.component,
+ name: first.name,
+ meta: first.meta
+ }, ]
})
- sidebarRoutes?.[0]?.children.shift();
+ sidebarRoutes?. [0]?.children.shift();
}
-
- rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true })
+ rewriteRoutes.push({
+ path: '*',
+ redirect: '/404',
+ hidden: true
+ })
commit('SET_ROUTES', rewriteRoutes)
commit('SET_SIDEBAR_ROUTERS', sidebarRoutes)
resolve(rewriteRoutes)
@@ -111,4 +117,4 @@ export const loadView = (view) => { // 路由懒加载
return (resolve) => require([`@/views/${view}`], resolve)
}
-export default permission
\ No newline at end of file
+export default permission
diff --git a/src/views/carddealer/carddealer/index.vue b/src/views/carddealer/carddealer/index.vue
index cfad1d1..17a77bf 100644
--- a/src/views/carddealer/carddealer/index.vue
+++ b/src/views/carddealer/carddealer/index.vue
@@ -46,10 +46,14 @@
- 添加码商
+ 添加码商
- 导出
+ 导出
- 删除
- 登录密码
- 支付密码
- 设备密码
- 修改佣金
- 修改押金
+ 删除
+ 登录密码
+ 支付密码
+ 设备密码
+ 修改佣金
+ 修改押金
修改固定押金
- 编辑
+ 编辑
- 登录白名单
- 下级
- 风控
- 通道
+ 登录白名单
+ 下级
+ 风控
+ 通道
diff --git a/src/views/carddealer/carddealer/pkCouponScopeRangeStoreList.vue b/src/views/carddealer/carddealer/pkCouponScopeRangeStoreList.vue
index bf8a707..ccecfa5 100644
--- a/src/views/carddealer/carddealer/pkCouponScopeRangeStoreList.vue
+++ b/src/views/carddealer/carddealer/pkCouponScopeRangeStoreList.vue
@@ -6,7 +6,8 @@
- 绑定通道
+ 绑定通道
@@ -24,7 +25,7 @@
{{ scope.row.rate + "%" + '+' + NumberDiv(scope.row.singleFee, 100),
- }}
+ }}
@@ -37,7 +38,7 @@
+ @change="switchStatusChange(scope.row)" v-hasPermi="['carddealer:carddealerChannel:editChannel']">
@@ -45,8 +46,10 @@
- 费率
- 删除
+ 费率
+ 删除
@@ -359,5 +362,4 @@ export default {
+}
diff --git a/src/views/carddealer/carddealerCard/index.vue b/src/views/carddealer/carddealerCard/index.vue
index 9d6b990..eb5b83c 100644
--- a/src/views/carddealer/carddealerCard/index.vue
+++ b/src/views/carddealer/carddealerCard/index.vue
@@ -57,7 +57,9 @@
+ @change="switchStatusChange(scope.row)" :disabled="scope.row.auditStatus != 1"
+ v-hasPermi="['carddealer:carddealerCard:edit']"
+ >
@@ -151,16 +153,28 @@
分配通道
+ v-if="scope.row.auditStatus == 1"
+ v-hasPermi="['carddealer:carddealerCard:allocationChannel']"
+ >分配通道
清除
- 删除
+ v-if="scope.row.auditStatus == 1"
+ v-hasPermi="['platform:statistics:clearCarddealerCardOutstanding']"
+ >清除
+ 删除
通过
+ v-if="scope.row.auditStatus == 0"
+ v-hasPermi="['carddealer:carddealerCard:edit']"
+ >通过
驳回
+ v-if="scope.row.auditStatus == 0"
+ v-hasPermi="['carddealer:carddealerCard:edit']"
+ >驳回
设置
+ v-if="scope.row.auditStatus == 1"
+ v-hasPermi="['carddealer:carddealerCard:edit']"
+ >设置
diff --git a/src/views/carddealer/carddealerDev/index.vue b/src/views/carddealer/carddealerDev/index.vue
index 54f9479..509ac51 100644
--- a/src/views/carddealer/carddealerDev/index.vue
+++ b/src/views/carddealer/carddealerDev/index.vue
@@ -60,13 +60,15 @@
-
+
{{ scope.row.status == 1 ? '禁用' : '启用' }}
- 删除
+ 删除
+ style="color: #006eff" v-hasPermi="['carddealer:carddealerDev:edit']">
{{ scope.row.isAutoStatus == 1 ? '禁用自动确认' : '启用自动确认' }}
diff --git a/src/views/login.vue b/src/views/login.vue
index 3cc7c70..e7e3a99 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -67,8 +67,6 @@
import { getCodeImg } from "@/api/login";
import Cookies from "js-cookie";
import { encrypt, decrypt } from '@/utils/jsencrypt'
-import { getRouters } from '@/api/menu'
-
export default {
name: "Login",
data() {
diff --git a/src/views/merchant/merchant/index.vue b/src/views/merchant/merchant/index.vue
index 6438913..bb86efe 100644
--- a/src/views/merchant/merchant/index.vue
+++ b/src/views/merchant/merchant/index.vue
@@ -35,7 +35,8 @@
- 新增商户
+ 新增商户
@@ -84,7 +85,7 @@
+ @change="switchStatusChange(scope.row, 'status')" v-hasPermi="['system:merchant:edit']">
@@ -111,19 +112,23 @@
- 商户删除
- 通道
+ 商户删除
+ 通道
- 登录密码
- 支付密码
+ 登录密码
+ 支付密码
- 余额
+ 余额
- 编辑
- 风控
+ 编辑
+ 风控
@@ -335,18 +340,21 @@
{{ form.googleCaptcha }}
- 重 置
+ 重 置
{{ form.md5Key }}
- 重 置
+ 重 置
@@ -468,8 +476,8 @@ export default {
form: {},
// 表单校验
rules: {
- whetherReviewApi:[{ required: true, message: "请选择是否api提单审核", trigger: "blur" }],
- whetherReview:[{ required: true, message: "请选择是否手动提单审核", trigger: "blur" }],
+ whetherReviewApi: [{ required: true, message: "请选择是否api提单审核", trigger: "blur" }],
+ whetherReview: [{ required: true, message: "请选择是否手动提单审核", trigger: "blur" }],
code: [{ required: true, message: "请输入谷歌验证码", trigger: "blur" }],
ipWhiteList: [{ required: true, message: "请输入IP", trigger: "blur" }],
payapiWhitelistIp: [{ required: true, message: "请输入代付IP", trigger: "blur" }],
diff --git a/src/views/order/TransferOrder/daifuSonOrder.vue b/src/views/order/TransferOrder/daifuSonOrder.vue
index 827900a..d5d6dfa 100644
--- a/src/views/order/TransferOrder/daifuSonOrder.vue
+++ b/src/views/order/TransferOrder/daifuSonOrder.vue
@@ -96,7 +96,7 @@
- 导出
+ 导出
@@ -169,17 +169,23 @@
min-width="100">
详情
+ style="color: #006eff" v-hasPermi="['order:TransferOrderSub:query']">详情
+ v-if="scope.row.orderStatus == 1"
+ v-hasPermi="['order:carddealerWithdrawOrder:closeOrderSub']"
+ >
关闭
+ v-if="scope.row.orderStatus == 2"
+ v-hasPermi="['order:carddealerWithdrawOrder:confirmPayment']"
+ >
确认付款
+ v-if="scope.row.orderStatus == 2"
+ v-hasPermi="['order:carddealerWithdrawOrder:orderRejection']"
+ >
驳回
- 导出
+ 导出
-
+
@@ -169,8 +169,8 @@ export default {
this.init();
},
methods: {
- // 预览图片
- previewImage(abUrl) {
+ // 预览图片
+ previewImage(abUrl) {
this.srcList[0] = abUrl;
},
// 凭证图片
@@ -216,7 +216,7 @@ export default {
orderNo: this.queryParams.pkCouponId,
orderSource: 4
}
- listTransferOrder(queryParams)
+ payMerchant.selectOrderSub(queryParams)
.then((response) => {
this.infoList = response.rows;
this.total = Number(response.total);
diff --git a/src/views/order/carddealerOrder/pkCouponScopeRangeStoreList2.vue b/src/views/order/carddealerOrder/pkCouponScopeRangeStoreList2.vue
index 6f23ec0..55cb1f5 100644
--- a/src/views/order/carddealerOrder/pkCouponScopeRangeStoreList2.vue
+++ b/src/views/order/carddealerOrder/pkCouponScopeRangeStoreList2.vue
@@ -53,15 +53,16 @@
+ v-if="scope.row.orderStatus == 1 || scope.row.orderStatus == 2"
+ v-hasPermi="['order:carddealerWithdrawOrder:closeOrderSub']">
关闭
+ v-if="scope.row.orderStatus == 2" v-hasPermi="['order:carddealerWithdrawOrder:confirmPayment']">
确认付款
+ v-if="scope.row.orderStatus == 2" v-hasPermi="['order:carddealerWithdrawOrder:orderRejection']">
驳回
diff --git a/src/views/order/carddealerOrder/readyOrder.vue b/src/views/order/carddealerOrder/readyOrder.vue
index fc0c821..c890203 100644
--- a/src/views/order/carddealerOrder/readyOrder.vue
+++ b/src/views/order/carddealerOrder/readyOrder.vue
@@ -38,7 +38,8 @@
- 导出
+ 导出
@@ -100,14 +101,25 @@
-
+
{{ scope.row.canRace == 1 ? '锁定' : '解锁' }}
- 分配
- 关闭
- 成功
- 详情
- 子单
+ 分配
+ 关闭
+ 成功
+ 详情
+ 子单
diff --git a/src/views/order/payOrder/csOrder.vue b/src/views/order/payOrder/csOrder.vue
index f04c8d4..ad5f12e 100644
--- a/src/views/order/payOrder/csOrder.vue
+++ b/src/views/order/payOrder/csOrder.vue
@@ -85,7 +85,7 @@
搜索
重置
- 导出
+ 导出
@@ -152,8 +152,8 @@
- 详情
- 详情
+ 超时支付
diff --git a/src/views/order/payOrder/index.vue b/src/views/order/payOrder/index.vue
index c4f6849..a4c9d0c 100644
--- a/src/views/order/payOrder/index.vue
+++ b/src/views/order/payOrder/index.vue
@@ -86,7 +86,7 @@
搜索
重置
- 导出
+ 导出
@@ -139,11 +139,11 @@
- 详情
+ 详情
超时支付
+ v-if="scope.row.orderStatus == 3" v-hasPermi="['order:payOrder:overtimePayment']">超时支付
通知
+ v-if="scope.row.orderStatus == 2" v-hasPermi="['order:payOrder:notify']">通知
diff --git a/src/views/order/payOrder/wwc.vue b/src/views/order/payOrder/wwc.vue
index 2da58dd..d447a27 100644
--- a/src/views/order/payOrder/wwc.vue
+++ b/src/views/order/payOrder/wwc.vue
@@ -86,7 +86,7 @@
搜索
重置
- 导出
+ 导出
@@ -152,9 +152,9 @@
- 详情
+ 详情
已收款
+ :disabled="scope.row.sameMark == 1" v-hasPermi="['order:payOrder:overtimePayment']">已收款
diff --git a/src/views/payTest/dfTest.vue b/src/views/payTest/dfTest.vue
index 26e88e3..7218949 100644
--- a/src/views/payTest/dfTest.vue
+++ b/src/views/payTest/dfTest.vue
@@ -52,7 +52,9 @@
- 拉测试单
+ 拉测试单
@@ -115,7 +117,9 @@
通知
+ style="color: #006eff"
+ v-hasPermi="['order:TransferOrder:notify']"
+ >通知
diff --git a/src/views/payTest/dsTest.vue b/src/views/payTest/dsTest.vue
index 4b420e5..67465c6 100644
--- a/src/views/payTest/dsTest.vue
+++ b/src/views/payTest/dsTest.vue
@@ -57,7 +57,8 @@
- 拉测试单
+ 拉测试单
@@ -116,10 +117,10 @@
- 详情
- 通知
+ 详情
+ 通知
diff --git a/src/views/platform/platformBankCard/index.vue b/src/views/platform/platformBankCard/index.vue
index fe968c8..7f49842 100644
--- a/src/views/platform/platformBankCard/index.vue
+++ b/src/views/platform/platformBankCard/index.vue
@@ -1,41 +1,45 @@
-
+
-
-
-
-
-
-
-
-
-
- 搜索
- 重置
-
+
+
+
+ 搜索
+ 重置
+
+
+
+
+ 添加收款卡
+
+
+
+
+
+
+
-
-
- 添加收款卡
-
-
-
-
-
@@ -58,15 +62,17 @@
+ @change="switchStatusChange(scope.row)" v-hasPermi="['platform:platformBankCard:edit']">
- 删除
- 编辑
+ 删除
+ 编辑
@@ -296,7 +302,7 @@ export default {
},
// 表单重置
reset() {
- this.imageUrl=null
+ this.imageUrl = null
this.form = {
id: null,
bankName: null,
@@ -361,7 +367,7 @@ export default {
maxAmount: maxAmount,
qrCode: this.form.qrCode,
remark: this.form.remark,
- id:this.form.id
+ id: this.form.id
}).then(response => {
this.msgSuccess("修改成功");
this.open = false;
diff --git a/src/views/platform/platformChannel/index.vue b/src/views/platform/platformChannel/index.vue
index da74be4..9e41143 100644
--- a/src/views/platform/platformChannel/index.vue
+++ b/src/views/platform/platformChannel/index.vue
@@ -25,7 +25,9 @@
搜索
重置
- 添加通道
+ 添加通道
@@ -86,15 +88,21 @@
+ @change="switchStatusChange(scope.row)"
+ v-hasPermi="['platform:platformChannel:edit']"
+ >
- 编辑
- 配置
+ 编辑
+ 配置
diff --git a/src/views/platform/platformWaterDetail/index.vue b/src/views/platform/platformWaterDetail/index.vue
index 742d3c9..c08a9cc 100644
--- a/src/views/platform/platformWaterDetail/index.vue
+++ b/src/views/platform/platformWaterDetail/index.vue
@@ -56,7 +56,9 @@
- 导出
+ 导出
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 搜索
- 重置
- 导出
-
-
统计是按照订单时间统计
-
-
-
-
+ class="flex form" style="position: relative">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+ 导出
+
+
统计是按照订单时间统计
-
-
+
@@ -164,20 +163,20 @@ export default {
};
},
$autoRefresh: {
- // 刷新间隔时间
- interval: 3000 * 10,
- // 立即执行一次
- immediate: false,
- // 被回调的函数, 不保证顺序执行
- handles: ["getList"],
- /**
- * 调用 handles 后的回调函数
- * 这个字段为数组类型, 数组中的每个元素都是一个函数, 在对应索引的 handle 执行后被调用
- */
- callbacks: [],
- // 是否启用调试模式
- debug: true,
- },
+ // 刷新间隔时间
+ interval: 3000 * 10,
+ // 立即执行一次
+ immediate: false,
+ // 被回调的函数, 不保证顺序执行
+ handles: ["getList"],
+ /**
+ * 调用 handles 后的回调函数
+ * 这个字段为数组类型, 数组中的每个元素都是一个函数, 在对应索引的 handle 执行后被调用
+ */
+ callbacks: [],
+ // 是否启用调试模式
+ debug: true,
+ },
created() {
this.addDate()
this.getList();
@@ -227,7 +226,7 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
- this.dateRange=[]
+ this.dateRange = []
this.resetForm("queryForm");
this.handleQuery();
},
diff --git a/测试kakapay.zip b/测试kakapay.zip
index 63aa8b5..a2bf690 100644
Binary files a/测试kakapay.zip and b/测试kakapay.zip differ