From 62a9e3e64da42d171568633a81557fc5f55d2c14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=99=93=E7=90=AA?= Date: Tue, 9 Aug 2022 16:29:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=94=9F=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LearunApp-2.2.0/common/mixins.js | 8 +- .../LearunApp-2.2.0/pages.json | 2 + .../LearunApp-2.2.0/pages/login.vue | 13 + .../LearunApp-2.2.0/pages/my/newpassword.vue | 74 +++++ .../LearunApp-2.2.0/pages/my/password.vue | 31 +- .../LearunApp-2.2.0/pages/weixinLogin.vue | 305 ++++++++++++++++++ .../LearunApp-2.2.0/static/wx.png | Bin 0 -> 6576 bytes 7 files changed, 424 insertions(+), 9 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my/newpassword.vue create mode 100644 Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/weixinLogin.vue create mode 100644 Learun.Framework.Ultimate V7/LearunApp-2.2.0/static/wx.png diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js index 13979b12e..0ce3af699 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js @@ -673,7 +673,13 @@ export default { return null } - + if(result.data.code!=200){ + uni.showToast({ + title: result.data.info, + icon: 'none' + }) + return null + } return result.data.data }, diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json index 4b65384fe..0a9045007 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json @@ -26,6 +26,7 @@ // 登录/注册页 { "path": "pages/login", "style": { "navigationStyle": "custom", "disableScroll": true } }, + { "path": "pages/weixinLogin", "style": { "navigationStyle": "custom", "disableScroll": true } }, { "path": "pages/signup", "style": { "navigationBarTitleText": "注册账号", "disableScroll": true } }, // 消息(tabBar #2) @@ -52,6 +53,7 @@ { "path": "pages/my/contact", "style": { "navigationBarTitleText": "我的联系方式" } }, { "path": "pages/my/qrcode", "style": { "navigationBarTitleText": "我的二维码" } }, { "path": "pages/my/password", "style": { "navigationBarTitleText": "更改密码" } }, + { "path": "pages/my/newpassword", "style": { "navigationBarTitleText": "设置密码" } }, { "path": "pages/my/learun", "style": { diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/login.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/login.vue index fda52e4db..1a00cdd6c 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/login.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/login.vue @@ -32,6 +32,10 @@ 登 录 + + 新生首次登录 + + @@ -266,6 +270,15 @@ page { margin-top: 20rpx; } } + + .otherLogin{ + display: flex; + justify-content: right; + .textBtn{ + width: 100px; + color: #606266; + } + } .more { margin-top: 30rpx; diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my/newpassword.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my/newpassword.vue new file mode 100644 index 000000000..352a037d0 --- /dev/null +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my/newpassword.vue @@ -0,0 +1,74 @@ + + + + diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my/password.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my/password.vue index 44e93e744..549312ab2 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my/password.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my/password.vue @@ -4,7 +4,9 @@ - + + 新密码必须8-20位同时包含1.[大小写字母]、2.[数字]、3.[特殊符号!@#$%^&*] + 确认修改 @@ -29,10 +31,15 @@ export default { this.CONFIRM('操作失败', '旧密码输入不正确,请重新确认') return } - if (newPwd.length < 6 || newPwd.length > 16) { - this.CONFIRM('操作失败', '新密码不符合要求,请修改后重试') - return - } + // if (newPwd.length < 6 || newPwd.length > 16) { + // this.CONFIRM('操作失败', '新密码不符合要求,请修改后重试') + // return + // } + var reg = /^(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[!@#$%^&*,\.])[0-9a-zA-Z!@#$%^&*,\.]{8,20}$/; + if( !reg.test(newPwd) ){ + this.CONFIRM('操作失败', '新密码不符合要求,请修改后重试') + return + } if (newPwd !== confirmPwd) { this.CONFIRM('操作失败', '新密码和确认密码输入不一致,请修改') return @@ -41,12 +48,12 @@ export default { const success = await this.HTTP_POST( '/user/modifypw', { - newpassword: this.md5(newPwd), - oldpassword: this.md5(oldPwd) + newpassword: this.MD5(newPwd), + oldpassword: this.MD5(oldPwd) }, '未能成功修改密码' ) - + console.log(success) if (!success) { return } @@ -57,3 +64,11 @@ export default { } } + diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/weixinLogin.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/weixinLogin.vue new file mode 100644 index 000000000..1fc46575a --- /dev/null +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/weixinLogin.vue @@ -0,0 +1,305 @@ + + + + + + + diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/static/wx.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/static/wx.png new file mode 100644 index 0000000000000000000000000000000000000000..9ac3b948126fd171c2d7934755dbe32a3e7b0f5d GIT binary patch literal 6576 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