diff --git a/src/api/ss/mchApply.js b/src/api/ss/mchApply.js index a7cdbdd..53f373b 100644 --- a/src/api/ss/mchApply.js +++ b/src/api/ss/mchApply.js @@ -42,3 +42,16 @@ export function delMchApply(applyId) { method: 'delete' }) } + +// 审核商家合作申请 +export function verifyMchApply(applyId, pass, remark) { + return request({ + url: `/ss/mchApply/${applyId}/verify`, + method: 'put', + params: { + applyId, + pass, + remark + } + }) +} diff --git a/src/assets/icons/svg/apply.svg b/src/assets/icons/svg/apply.svg new file mode 100644 index 0000000..6dca18b --- /dev/null +++ b/src/assets/icons/svg/apply.svg @@ -0,0 +1 @@ + diff --git a/src/components/Business/SmUser/smUserDialog.vue b/src/components/Business/SmUser/smUserDialog.vue index 9328586..0607c75 100644 --- a/src/components/Business/SmUser/smUserDialog.vue +++ b/src/components/Business/SmUser/smUserDialog.vue @@ -55,7 +55,7 @@ export default { searchForm: { pageNum: 1, pageSize: 10, - ...this.search + ...this.query }, total: 0, row: null, @@ -79,7 +79,7 @@ export default { type: String, default: '选择用户' }, - search: { + query: { type: Object, default: () => ({}) }, @@ -91,7 +91,7 @@ export default { code: null, pageNum: 1, pageSize: 10, - ...this.search, + ...this.query, } if (this.initSelect) { diff --git a/src/components/SimpleVerifyDialog/index.vue b/src/components/SimpleVerifyDialog/index.vue new file mode 100644 index 0000000..de7b3b4 --- /dev/null +++ b/src/components/SimpleVerifyDialog/index.vue @@ -0,0 +1,105 @@ + + + + + diff --git a/src/views/ss/mchApply/detail.vue b/src/views/ss/mchApply/detail.vue new file mode 100644 index 0000000..ccaa7ae --- /dev/null +++ b/src/views/ss/mchApply/detail.vue @@ -0,0 +1,104 @@ + + + + + diff --git a/src/views/ss/mchApply/index.vue b/src/views/ss/mchApply/index.vue index 9122ef4..739e389 100644 --- a/src/views/ss/mchApply/index.vue +++ b/src/views/ss/mchApply/index.vue @@ -25,10 +25,10 @@ @keyup.enter.native="handleQuery" /> - + @@ -68,25 +68,23 @@ + + + - - - - - @@ -101,8 +99,8 @@ - - + + @@ -114,9 +112,6 @@ - - - @@ -179,7 +174,7 @@ export default { mobile: null, content: null, callback: null, - verifyBy: null, + verifyName: null, verifyTime: null, verifyRemark: null, }, @@ -211,6 +206,11 @@ export default { created() { this.getList(); }, + computed: { + isView() { + return this.title === '查看商家合作申请'; + } + }, methods: { /** 查询商家合作申请列表 */ getList() { @@ -278,6 +278,14 @@ export default { this.title = "修改商家合作申请"; }); }, + handleView(row) { + this.$router.push({ + path: '/mch/mchApply/detail', + query: { + applyId: row.applyId, + } + }) + }, /** 提交按钮 */ submitForm() { this.$refs["form"].validate(valid => { diff --git a/src/views/ss/store/index.vue b/src/views/ss/store/index.vue index 03c72f3..5109a00 100644 --- a/src/views/ss/store/index.vue +++ b/src/views/ss/store/index.vue @@ -124,7 +124,7 @@ - + @@ -246,6 +246,11 @@ export default { }; }, computed: { + userQuery() { + return { + isMch: true, + } + }, formatBusinessTime: { set(val) { this.form.businessTimeStart = val[0]; diff --git a/src/views/system/smUser/index.vue b/src/views/system/smUser/index.vue index 773ed6f..8fdc12a 100644 --- a/src/views/system/smUser/index.vue +++ b/src/views/system/smUser/index.vue @@ -234,7 +234,7 @@ export default { pageSize: 10, userName: null, nickName: null, - userType: '01', + isMch: true, phonenumber: null, sex: null, status: null, @@ -350,7 +350,7 @@ export default { }, /** 查看按钮操作 */ handleSee(row) { - this.$router.push({path: '/smUser/detail', query: {userId: row.userId}}) + this.$router.push({path: '/mch/detail', query: {userId: row.userId}}) }, /** 修改按钮操作 */ handleUpdate(row) { diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue index be20719..d671f0f 100644 --- a/src/views/system/tenant/index.vue +++ b/src/views/system/tenant/index.vue @@ -224,7 +224,7 @@ export default { pageSize: 10, userName: null, nickName: null, - userType: '00', + isMch: false, phonenumber: null, sex: null, status: null,