From 4aeeb146b92fc5d8f710f93d7bcab11393a6d2a9 Mon Sep 17 00:00:00 2001 From: xxm Date: Thu, 3 Nov 2022 23:03:49 +0800 Subject: [PATCH 01/12] =?UTF-8?q?fix=20=E4=B8=80=E4=BA=9B=E5=B0=8F?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/userAssist.js | 2 +- .../RoleSelectModal/BRoleSelectModal.vue | 8 ++-- .../UserSelectModal/BUserSelectModal.vue | 8 ++-- src/views/account/security/EmailEdit.vue | 1 - src/views/account/security/PhoneBind.vue | 2 +- .../modules/bpm/instance/InstanceList.vue | 22 +++++----- src/views/modules/bpm/model/BpmModelList.vue | 30 +++++++------- .../modules/bpm/model/BpmModelNodeList.vue | 40 +++++++++---------- src/views/modules/bpm/task/DoneTaskList.vue | 20 +++++----- src/views/modules/bpm/task/TodoTaskList.vue | 20 +++++----- .../demo/data/encrypt/DataEncryptDemoList.vue | 14 +++---- .../demo/data/perm/DataPermDemoList.vue | 14 +++---- .../data/sensitive/DataSensitiveDemoList.vue | 22 +++++----- .../modules/demo/query/SuperQueryDemoList.vue | 26 ++++++------ .../modules/develop/codegen/CodeGenList.vue | 14 +++---- .../develop/dynamicform/DynamicFormList.vue | 14 +++---- .../dynamicsource/DynamicDataSourceList.vue | 20 +++++----- .../modules/develop/file/FileUploadList.vue | 16 ++++---- src/views/modules/goods/brand/BrandList.vue | 18 ++++----- .../modules/goods/category/CategoryList.vue | 12 +++--- src/views/modules/goods/goods/GoodsList.vue | 20 +++++----- .../goods/parameter/ParameterGroupList.vue | 14 +++---- .../modules/goods/parameter/ParameterList.vue | 24 +++++------ .../modules/goods/spec/SpecificationList.vue | 18 ++++----- .../modules/notice/mail/MailConfigList.vue | 30 +++++++------- .../notice/site/receive/SiteMessageList.vue | 16 ++++---- .../notice/site/sender/SiteMessageList.vue | 22 +++++----- .../modules/notice/template/TemplateList.vue | 18 ++++----- .../modules/office/myapply/MyApplyList.vue | 22 +++++----- .../modules/office/mydone/MyDoneList.vue | 20 +++++----- .../modules/office/mytodo/MyTodoList.vue | 20 +++++----- .../channel/alipay/AliPayConfigList.vue | 28 ++++++------- .../channel/wechat/WeChatConfigList.vue | 26 ++++++------ .../payment/notify/PayNotifyRecordList.vue | 22 +++++----- .../payment/order/payment/PaymentList.vue | 28 ++++++------- .../payment/order/refund/RefundRecordList.vue | 24 +++++------ .../modules/payment/voucher/VoucherList.vue | 28 ++++++------- .../payment/wallet/list/UserSelectModal.vue | 6 +-- .../payment/wallet/list/WalletList.vue | 18 ++++----- .../payment/wallet/list/WalletLogList.vue | 18 ++++----- .../starter/log/DataVersionLogList.vue | 16 ++++---- .../modules/starter/log/LoginLogList.vue | 30 +++++++------- .../modules/starter/log/OperateLogList.vue | 26 ++++++------ .../modules/starter/quartz/QuartzJobList.vue | 22 +++++----- .../starter/quartz/QuartzJobLogList.vue | 20 +++++----- .../modules/system/client/ClientList.vue | 22 +++++----- .../modules/system/client/LoginTypeList.vue | 26 ++++++------ src/views/modules/system/dept/DeptList.vue | 12 +++--- .../modules/system/dict/DictItemList.vue | 14 +++---- src/views/modules/system/dict/DictList.vue | 16 ++++---- src/views/modules/system/menu/MenuList.vue | 22 +++++----- .../modules/system/menu/ResourcePermList.vue | 16 ++++---- .../modules/system/online/OnlineUserList.vue | 18 ++++----- .../modules/system/param/SystemParamList.vue | 24 +++++------ src/views/modules/system/path/PathList.vue | 26 ++++++------ src/views/modules/system/role/RoleList.vue | 14 +++---- .../modules/system/scope/DataScopeList.vue | 18 ++++----- .../modules/system/scope/UserScopeModal.vue | 6 +-- src/views/modules/system/user/UserList.vue | 22 +++++----- .../dingtalk/config/DingTalkConfigList.vue | 20 +++++----- .../dingtalk/robot/DingRobotConfigList.vue | 22 +++++----- .../wechat/article/WeChatArticleSelect.vue | 6 +-- .../third/wechat/media/WeChatMediaList.vue | 12 +++--- .../third/wechat/media/WeChatMediaSelect.vue | 6 +-- .../third/wechat/menu/WeChatMenuList.vue | 16 ++++---- .../wechat/template/WeChatTemplateList.vue | 20 +++++----- .../wecom/robot/WeComRobotConfigList.vue | 16 ++++---- 67 files changed, 616 insertions(+), 617 deletions(-) diff --git a/src/api/system/userAssist.js b/src/api/system/userAssist.js index 264f954..96b18d6 100644 --- a/src/api/system/userAssist.js +++ b/src/api/system/userAssist.js @@ -112,7 +112,7 @@ export function sendCurrentEmailChangeCaptcha () { */ export function validateCurrentEmailChangeCaptcha (captcha) { return axios({ - url: `/user/validateCurrentEmailChangeCaptcha`, + url: `/user/validateCurrentChangeEmailCaptcha`, method: 'get', params: { captcha } }) diff --git a/src/components/Bootx/RoleSelectModal/BRoleSelectModal.vue b/src/components/Bootx/RoleSelectModal/BRoleSelectModal.vue index 77f091a..b95c051 100644 --- a/src/components/Bootx/RoleSelectModal/BRoleSelectModal.vue +++ b/src/components/Bootx/RoleSelectModal/BRoleSelectModal.vue @@ -27,10 +27,10 @@ :radio-config="radioConfig" :loading="loading" :data="tableData"> - - - - + + + + - - - - + + + + { - console.log(valid) if (!valid) { sendEmailChangeCaptcha(this.form.email).then(() => { this.$message.info('发送验证码成功') diff --git a/src/views/account/security/PhoneBind.vue b/src/views/account/security/PhoneBind.vue index 27b598a..cb0d16d 100644 --- a/src/views/account/security/PhoneBind.vue +++ b/src/views/account/security/PhoneBind.vue @@ -139,7 +139,7 @@ export default { data ? callback() : callback('验证码错误') }, /** - * 发送验证码 绑定邮箱 + * 发送验证码 绑定手机 */ sendPhoneCaptcha () { this.$refs.form.validateField(['phone'], async valid => { diff --git a/src/views/modules/bpm/instance/InstanceList.vue b/src/views/modules/bpm/instance/InstanceList.vue index 57cdf1f..efcfe23 100644 --- a/src/views/modules/bpm/instance/InstanceList.vue +++ b/src/views/modules/bpm/instance/InstanceList.vue @@ -20,25 +20,25 @@ :loading="loading" :data="tableData" > - - - - - - + + + + + + - - - - + + + + - + - - - - - - + + + + + + - - + + - - + + - - - - + + + + - + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - + - - - - - - - - - + + + + + + + + + - + - - - - - - - - - + + + + + + + + + - + - - - - - - + + + + + + - + - - - - - - + + + + + + - + - - - - - - - - - - + + + + + + + + + + - + - - - - + + + + - - - - - + + + + + - - - + + + - + - - - - - - + + + + + + - + - - - - - - + + + + + + - + - - - - - - - - - + + + + + + + + + - + - - - - - - - + + + + + + + - + - - - - + + + + - - - - + + + + - + - - + + - - - + + + - + diff --git a/src/views/modules/goods/goods/GoodsList.vue b/src/views/modules/goods/goods/GoodsList.vue index 8c79d38..785875a 100644 --- a/src/views/modules/goods/goods/GoodsList.vue +++ b/src/views/modules/goods/goods/GoodsList.vue @@ -21,18 +21,18 @@ :loading="loading" :data="tableData" > - - - - - + + + + + - - - - + + + + - + - - - - - - + + + + + + - + - - - + + + - - - + + + - - - - - + + + + + - + - - - + + + - - - - - + + + + + - + - - - - - - - - - + + + + + + + + + - - + + - - - + + + - + - - + + - - - + + + - - + + - + - - + + - - + + - - + + - - - - + + + + - + - - - - - + + + + + - - - + + + - + - - - - - - + + + + + + - - - - + + + + - + - - - - - - - - - + + + + + + + + + - + - - - - - - - - - + + + + + + + + + - + - - - - - + + + + + - - - - + + + + - - + + - - + + - + - - - - - + + + + + - - + + - - + + - - - + + + - + - - - - + + + + - - + + - - - - + + + + - + - - - - - - + + + + + + - - + + - - + + - - - + + + - + - - + + - - - - - - - + + + + + + + - - + + - + - - - - - - - - + + + + + + + + - - + + - - - + + + - + - - - + + + - - - - - + + + + + - - - + + + - + - - + + - - - + + + - - - + + + - + - - - - - - - + + + + + + + - + - - - + + + - - - + + + - - + + - - - - - - + + + + + + - + - - - - - + + + + + - - + + - - - - - + + + + + - + - - - - - - + + + + + + - - - - + + + + - + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - + + - - - - + + + + - + - - - - + + + + - - + + - - + + - - - - + + + + - + - - + + - - - + + + - + - - - - - - + + + + + + - + - - - - + + + + - - - + + + - + - - - + + + - - - - - + + + + + - - + + - + diff --git a/src/views/modules/system/menu/ResourcePermList.vue b/src/views/modules/system/menu/ResourcePermList.vue index 89ec7c9..c6af603 100644 --- a/src/views/modules/system/menu/ResourcePermList.vue +++ b/src/views/modules/system/menu/ResourcePermList.vue @@ -26,17 +26,17 @@ :loading="loading" :data="tableData" > - - - - + + + + - - - + + + - + diff --git a/src/views/modules/system/online/OnlineUserList.vue b/src/views/modules/system/online/OnlineUserList.vue index 897b0c8..6454e77 100644 --- a/src/views/modules/system/online/OnlineUserList.vue +++ b/src/views/modules/system/online/OnlineUserList.vue @@ -15,17 +15,17 @@ :loading="loading" :data="tableData" > - - - - - - + + + + + + - - + + - + - - - - - + + + + + - - + + - - - - + + + + - + - - - - - - + + + + + + - - + + - - - - + + + + - + - - - - - - + + + + + + - + - - - - + + + + - - - - + + + + - + - - - + + + diff --git a/src/views/modules/system/user/UserList.vue b/src/views/modules/system/user/UserList.vue index b25a0fb..db7a150 100644 --- a/src/views/modules/system/user/UserList.vue +++ b/src/views/modules/system/user/UserList.vue @@ -50,23 +50,23 @@ :loading="loading" :data="tableData"> - - - - - + + + + + - - + + - - - + + + - + - - - - - + + + + + - - - - + + + + - + - - - - - + + + + + - - - - - + + + + + - + - - - + + + - - - - - + + + + + - + - - - + + + - - - + + + - - - - + + + + - + - - - - - - - - - + + + + + + + + + - + - - - - - - - + + + + + + + - + Date: Fri, 4 Nov 2022 19:56:19 +0800 Subject: [PATCH 02/12] =?UTF-8?q?style=20=E8=B4=A6=E5=8F=B7=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E5=91=BD=E5=90=8D=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/user.js | 4 ++-- src/views/account/bind/Binding.vue | 19 +++++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/api/system/user.js b/src/api/system/user.js index 9518c41..cc07d17 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -142,11 +142,11 @@ export function bindThird (obj) { /** * 解除用户绑定三方开放平台 */ -export function unbindThird (clientCode) { +export function unbindThird (loginType) { return axios({ url: `/user/third/unbind`, method: 'post', - params: { clientCode } + params: { loginType } }) } diff --git a/src/views/account/bind/Binding.vue b/src/views/account/bind/Binding.vue index 80ad58b..3665363 100644 --- a/src/views/account/bind/Binding.vue +++ b/src/views/account/bind/Binding.vue @@ -99,10 +99,10 @@ export default { /** * 绑定账号 */ - bindThird (clientCode) { - this.currentClientCode = clientCode - const url = process.env.VUE_APP_API_BASE_URL + `/auth/third/toLoginUrl/${clientCode}` - window.open(url, `login ${clientCode}`, 'height=600, width=500, top=0, left=0, toolbar=no, menubar=no, scrollbars=no, resizable=no,location=n o, status=no') + bindThird (loginType) { + this.currentLoginType = loginType + const url = process.env.VUE_APP_API_BASE_URL + `/auth/third/toLoginUrl/${loginType}` + window.open(url, `login ${loginType}`, 'height=600, width=500, top=0, left=0, toolbar=no, menubar=no, scrollbars=no, resizable=no,location=n o, status=no') // 监听回调 window.addEventListener('message', this.bindThirdCallback, false) @@ -118,7 +118,7 @@ export default { this.loading = true bindThird({ ...data, - clientCode: this.currentClientCode + loginType: this.currentLoginType }).then(() => { this.$message.success('绑定成功') }).finally(() => { @@ -145,14 +145,13 @@ export default { /** * 解绑账号 */ - unBindThird (clientCode) { + unBindThird (loginType) { const that = this this.$confirm({ - title: '是否解除绑定的第三方平台账号', - okText: '确定', - cancelText: '取消', + title: '警告', + content: '是否解除绑定的第三方平台账号', onOk: async function () { - await unbindThird(clientCode) + await unbindThird(loginType) that.init() } }) -- Gitee From e41754106574d04d762cfee900db84ae94f4e1c0 Mon Sep 17 00:00:00 2001 From: xxm Date: Sun, 6 Nov 2022 01:06:32 +0800 Subject: [PATCH 03/12] =?UTF-8?q?style=20=E5=8E=BB=E9=99=A4=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/account/bind/WeChatQrBind.vue | 1 - src/views/user/Register.vue | 1 - 2 files changed, 2 deletions(-) diff --git a/src/views/account/bind/WeChatQrBind.vue b/src/views/account/bind/WeChatQrBind.vue index 38ad1ea..28ca21d 100644 --- a/src/views/account/bind/WeChatQrBind.vue +++ b/src/views/account/bind/WeChatQrBind.vue @@ -20,7 +20,6 @@