From bac7430d16c42b6635cb1ea2e286aeda71680a8c Mon Sep 17 00:00:00 2001 From: js199000126 <528892601@qq.com> Date: Fri, 26 May 2023 15:37:31 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8B=89=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-ui-app/config/app.js | 4 ++-- yudao-ui-app/pages/users/order_list/index.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/yudao-ui-app/config/app.js b/yudao-ui-app/config/app.js index 605d8d33c..06c5429ab 100644 --- a/yudao-ui-app/config/app.js +++ b/yudao-ui-app/config/app.js @@ -1,6 +1,6 @@ -let domain = process.env.APP_BASE_URL -// let domain = 'http://192.168.1.188:48080' +// let domain = process.env.APP_BASE_URL +let domain = 'http://192.168.1.188:48080' // let domain = 'http://api.cyywl.top' module.exports = { diff --git a/yudao-ui-app/pages/users/order_list/index.vue b/yudao-ui-app/pages/users/order_list/index.vue index 88a6bf9a2..3366ba938 100644 --- a/yudao-ui-app/pages/users/order_list/index.vue +++ b/yudao-ui-app/pages/users/order_list/index.vue @@ -157,7 +157,7 @@ }; }, computed: mapGetters(['isLogin', 'userInfo']), - onLoad() { + onLoad(option) { this.loadmore() }, onShow() { From c5a16c07f978c1c09bcbfe4d4249eb2919028d7f Mon Sep 17 00:00:00 2001 From: perry <292303709@qq.com> Date: Fri, 26 May 2023 17:56:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E7=A0=81=E7=99=BB=E5=BD=95=E5=8D=B3=E6=B3=A8=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/member/service/auth/MemberAuthServiceImpl.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java index 2bfe917b5..1e8827f19 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java @@ -97,12 +97,7 @@ public class MemberAuthServiceImpl implements MemberAuthService { smsCodeApi.useSmsCode(AuthConvert.INSTANCE.convert(reqVO, SmsSceneEnum.MEMBER_LOGIN.getScene(), userIp)); // 获得获得注册用户 - // 校验账号是否存在 - MemberUserDO user = userService.getUserByMobile(reqVO.getMobile()); - if (user == null) { - createLoginLog(null, reqVO.getMobile(), LoginLogTypeEnum.LOGIN_SMS, LoginResultEnum.BAD_CREDENTIALS); - throw exception(AUTH_LOGIN_BAD_CREDENTIALS); - } + MemberUserDO user = userService.createUserIfAbsent(reqVO.getMobile(),reqVO.getMobile(), userIp,reqVO.getPromoterId()); // 校验是否禁用 if (ObjectUtil.notEqual(user.getStatus(), CommonStatusEnum.ENABLE.getStatus())) { createLoginLog(user.getId(), reqVO.getMobile(), LoginLogTypeEnum.LOGIN_SMS, LoginResultEnum.USER_DISABLED); From 532b9f1d47093d62657244953cbb559d7770e795 Mon Sep 17 00:00:00 2001 From: js199000126 <528892601@qq.com> Date: Fri, 26 May 2023 17:58:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-ui-app/config/app.js | 4 +-- yudao-ui-app/pages/users/order_list/index.vue | 26 ++++++++++++++++--- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/yudao-ui-app/config/app.js b/yudao-ui-app/config/app.js index 06c5429ab..605d8d33c 100644 --- a/yudao-ui-app/config/app.js +++ b/yudao-ui-app/config/app.js @@ -1,6 +1,6 @@ -// let domain = process.env.APP_BASE_URL -let domain = 'http://192.168.1.188:48080' +let domain = process.env.APP_BASE_URL +// let domain = 'http://192.168.1.188:48080' // let domain = 'http://api.cyywl.top' module.exports = { diff --git a/yudao-ui-app/pages/users/order_list/index.vue b/yudao-ui-app/pages/users/order_list/index.vue index 3366ba938..a98282365 100644 --- a/yudao-ui-app/pages/users/order_list/index.vue +++ b/yudao-ui-app/pages/users/order_list/index.vue @@ -1,11 +1,11 @@