From 570948df2f11280406274778759c0f8867846aeb Mon Sep 17 00:00:00 2001 From: linju-json Date: Tue, 18 May 2021 11:37:23 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=A4=A7=E8=B0=83=E6=95=B4=EF=BC=8C?= =?UTF-8?q?=E5=8E=9F=E4=BA=91=E5=87=BD=E6=95=B0=E5=90=8D=E7=A7=B0=EF=BC=9A?= =?UTF-8?q?user-center=E6=94=B9=E5=90=8D=E5=8F=ABuni-id-cf?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +- changelog.md | 4 +- .../uni-quick-login/uni-quick-login.vue | 2 +- .../uni-send-sms-code/uni-send-sms-code.vue | 2 +- package.json | 4 +- .../login-page/phone-code/phone-code.vue | 2 +- .../login-page/pwd-login/pwd-login.vue | 86 +++++++++---------- .../login-page/pwd-retrieve/pwd-retrieve.vue | 8 +- .../ucenter/login-page/register/register.vue | 16 ++-- .../userinfo/bind-mobile/bind-mobile.vue | 4 +- pages/ucenter/userinfo/userinfo.vue | 2 +- .../{user-center => uni-id-cf}/index.js | 0 .../package-lock.json | 2 +- .../{user-center => uni-id-cf}/package.json | 2 +- 14 files changed, 70 insertions(+), 68 deletions(-) rename uniCloud-aliyun/cloudfunctions/{user-center => uni-id-cf}/index.js (100%) rename uniCloud-aliyun/cloudfunctions/{user-center => uni-id-cf}/package-lock.json (98%) rename uniCloud-aliyun/cloudfunctions/{user-center => uni-id-cf}/package.json (95%) diff --git a/README.md b/README.md index 15b54e2f..536d6062 100644 --- a/README.md +++ b/README.md @@ -95,7 +95,7 @@ uni-starter + uniCloud admin，应用开发从未如此简单快捷！ - 短信登陆： + 使用本功能需要在[DCloud开发者中心](https://dev.dcloud.net.cn/uniSms)开通并充值 + 教程参考[短信服务开通指南](https://ask.dcloud.net.cn/article/37534) - + 修改短信注册/登陆发生验证码的模板id，在文件`/uniCloud-aliyun/cloudfunctions/user-center/index.js` 搜索 `const templateId = '11753'` 替换为自己申请的模板id + + 修改短信注册/登陆发生验证码的模板id，在文件`/uniCloud-aliyun/cloudfunctions/uni-id-cf/index.js` 搜索 `const templateId = '11753'` 替换为自己申请的模板id - 一键登录： + [开通配置](https://dev.dcloud.net.cn/uniLogin) + [使用指南](https://uniapp.dcloud.io/univerify) @@ -301,7 +301,7 @@ uni-starter │ │ | | └─file.cert uni-id依赖的配置文件,假如你使用微信发红包功能，需要的证书文件就是放到这里 │ | | └───uni-id uni-id用户体系 详情 │ | ├─uni-analyse-searchhot 云端一体搜索模板依赖的云函数 详情 -│ | └─user-center 用户中心云函数，实现用户注册、修改密码、发送验证码、快捷登录（微信、短信、账户、一键登录） +│ | └─uni-id-cf 用户中心云函数，实现用户注册、修改密码、发送验证码、快捷登录（微信、短信、账户、一键登录） │ └──database 云数据目录 │ ├─db_init.json db_init.json初始化数据库文件，其中不再包含schema 详情 │ ├─opendb-app-versions.schema.json 应用版本，表结构文件 diff --git a/changelog.md b/changelog.md index 69614f48..6d6ac858 100644 --- a/changelog.md +++ b/changelog.md @@ -1,4 +1,6 @@ +## 1.0.2（2021-05-17） +添加 uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-id/config.json 文件 ## 1.0.1（2021-05-17） manifest.json 在小程序平台增加了一个配置项 betterScopedSlots，启用新的作用域插槽编译，用于支持作用域插槽内使用复杂表达式。 ## 1.0.0（2021-05-17） -第一版 +第一版 \ No newline at end of file diff --git a/components/uni-quick-login/uni-quick-login.vue b/components/uni-quick-login/uni-quick-login.vue index cba3b49e..6937252b 100644 --- a/components/uni-quick-login/uni-quick-login.vue +++ b/components/uni-quick-login/uni-quick-login.vue @@ -265,7 +265,7 @@ params, type }); - this.request('user-center/login_by_' + type, params, result => { + this.request('uni-id-cf/login_by_' + type, params, result => { console.log(result); if (result.code === 0) { if (type == 'univerify') { diff --git a/components/uni-send-sms-code/uni-send-sms-code.vue b/components/uni-send-sms-code/uni-send-sms-code.vue index 3b4bcebe..ee7046db 100644 --- a/components/uni-send-sms-code/uni-send-sms-code.vue +++ b/components/uni-send-sms-code/uni-send-sms-code.vue @@ -75,7 +75,7 @@ icon: 'none' }); - this.request('user-center/sendSmsCode', + this.request('uni-id-cf/sendSmsCode', { "mobile": this.phone, "type": this.codeType diff --git a/package.json b/package.json index 9ebd794e..f696263a 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "id": "uni-starter", "displayName": "uni-starter", - "version": "1.0.1", - "description": "集成了商用项目开发常见功能的项目模板", + "version": "1.0.2", + "description": "一个集成了商用项目开发常见功能的项目模板", "keywords": [ "uni-starter", "login", diff --git a/pages/ucenter/login-page/phone-code/phone-code.vue b/pages/ucenter/login-page/phone-code/phone-code.vue index ec66c370..f25be35f 100644 --- a/pages/ucenter/login-page/phone-code/phone-code.vue +++ b/pages/ucenter/login-page/phone-code/phone-code.vue @@ -42,7 +42,7 @@ }, methods: { submit(){ //完成并提交 - this.request('user-center/loginBySms', + this.request('uni-id-cf/loginBySms', { "mobile":this.phone, "code":this.code diff --git a/pages/ucenter/login-page/pwd-login/pwd-login.vue b/pages/ucenter/login-page/pwd-login/pwd-login.vue index 2093122f..f68e99e9 100644 --- a/pages/ucenter/login-page/pwd-login/pwd-login.vue +++ b/pages/ucenter/login-page/pwd-login/pwd-login.vue @@ -5,10 +5,10 @@ - - - - + + + + @@ -28,8 +28,8 @@ return { "password": "", "username": "", - "agree": false, - "captchaBase64":"", + "agree": false, + "captchaBase64":"", "captcha":"" } }, @@ -63,9 +63,9 @@ }); } // 下边是可以登录 - this.request('user-center/login', { + this.request('uni-id-cf/login', { "username": this.username, - "password": this.password, + "password": this.password, "captcha":this.captcha }, result => { console.log(result); @@ -73,32 +73,32 @@ this.loginSuccess(result) } else { if (result.needCaptcha) { - uni.showToast({ - title: result.msg, - icon: 'none' - }); + uni.showToast({ + title: result.msg, + icon: 'none' + }); this.createCaptcha() - }else{ - uni.showModal({ - title: '错误', - content: result.msg, - showCancel: false, - confirmText: '知道了' - }); + }else{ + uni.showModal({ + title: '错误', + content: result.msg, + showCancel: false, + confirmText: '知道了' + }); } } }) - }, - createCaptcha(){ - this.request( - 'user-center/createCaptcha', { - scene: "login" - }, - result => { - if (result.code === 0) { - this.captchaBase64 = result.captchaBase64 - } - }) + }, + createCaptcha(){ + this.request( + 'uni-id-cf/createCaptcha', { + scene: "login" + }, + result => { + if (result.code === 0) { + this.captchaBase64 = result.captchaBase64 + } + }) }, /* 前往注册 */ toRegister(e) { @@ -131,17 +131,17 @@ .toRegister { margin-top: 80px; width: 600rpx; - } - .captcha-box{ - flex-direction: row; - align-items: center; - justify-content: flex-end; - } - .captcha-img{ - margin:15px 15px 0 0; - width: 250rpx; - } - .captcha{ - width: 350rpx; } - + .captcha-box{ + flex-direction: row; + align-items: center; + justify-content: flex-end; + } + .captcha-img{ + margin:15px 15px 0 0; + width: 250rpx; + } + .captcha{ + width: 350rpx; + } + diff --git a/pages/ucenter/login-page/pwd-retrieve/pwd-retrieve.vue b/pages/ucenter/login-page/pwd-retrieve/pwd-retrieve.vue index 465e069a..f2fc7695 100644 --- a/pages/ucenter/login-page/pwd-retrieve/pwd-retrieve.vue +++ b/pages/ucenter/login-page/pwd-retrieve/pwd-retrieve.vue @@ -95,7 +95,7 @@ } ] } - } + } } }, computed: { @@ -120,7 +120,7 @@ }, onLoad(event) { if (event && event.phoneNumber) { - this.formData.phone = event.phoneNumber; + this.formData.phone = event.phoneNumber; } }, onReady() { @@ -135,7 +135,7 @@ submit() { this.$refs.form.submit() .then(res => { - this.request('user-center/resetPwdBySmsCode', { + this.request('uni-id-cf/resetPwdBySmsCode', { "mobile": this.formData.phone, "code": this.formData.code, "password": this.formData.pwd @@ -159,6 +159,6 @@ @import url("../common/login-page.css"); .content{ - padding-top: 36rpx; + padding-top: 36rpx; } diff --git a/pages/ucenter/login-page/register/register.vue b/pages/ucenter/login-page/register/register.vue index 092f1c59..90445c3e 100644 --- a/pages/ucenter/login-page/register/register.vue +++ b/pages/ucenter/login-page/register/register.vue @@ -32,7 +32,7 @@ import mixin from '../common/login-page.mixin.js'; 'password':'', 'pwd2':'' }, - rules, + rules, agree:false } }, @@ -43,12 +43,12 @@ import mixin from '../common/login-page.mixin.js'; /** * 触发表单提交 */ - submit() { - if(!this.agree){ - return uni.showToast({ - title: '你未同意隐私政策协议', - icon: 'none' - }); + submit() { + if(!this.agree){ + return uni.showToast({ + title: '你未同意隐私政策协议', + icon: 'none' + }); } uni.showLoading({ mask: true @@ -63,7 +63,7 @@ import mixin from '../common/login-page.mixin.js'; }) }, submitForm(value) { - this.request('user-center/register',value,result=>{ + this.request('uni-id-cf/register',value,result=>{ console.log(result); if(result.code === 0){ this.loginSuccess(result) diff --git a/pages/ucenter/userinfo/bind-mobile/bind-mobile.vue b/pages/ucenter/userinfo/bind-mobile/bind-mobile.vue index 66ec7ae9..14698941 100644 --- a/pages/ucenter/userinfo/bind-mobile/bind-mobile.vue +++ b/pages/ucenter/userinfo/bind-mobile/bind-mobile.vue @@ -48,7 +48,7 @@ */ submit() { console.log(this.formData); - this.request('user-center/bind_mobile_by_sms', { + this.request('uni-id-cf/bind_mobile_by_sms', { "mobile": this.formData.phone, "code": this.formData.code }, result=> { @@ -79,7 +79,7 @@ height: 50px; } - .input-box { + .input-box { width: 100%; margin-top: 16px; background-color: #f9f9f9; diff --git a/pages/ucenter/userinfo/userinfo.vue b/pages/ucenter/userinfo/userinfo.vue index 364dc544..c63e1fdd 100644 --- a/pages/ucenter/userinfo/userinfo.vue +++ b/pages/ucenter/userinfo/userinfo.vue @@ -69,7 +69,7 @@ "univerifyStyle": this.univerifyStyle, success: async e => { console.log(e.authResult); - this.request('user-center/bind_mobile_by_univerify', + this.request('uni-id-cf/bind_mobile_by_univerify', e.authResult, result=> { diff --git a/uniCloud-aliyun/cloudfunctions/user-center/index.js b/uniCloud-aliyun/cloudfunctions/uni-id-cf/index.js similarity index 100% rename from uniCloud-aliyun/cloudfunctions/user-center/index.js rename to uniCloud-aliyun/cloudfunctions/uni-id-cf/index.js diff --git a/uniCloud-aliyun/cloudfunctions/user-center/package-lock.json b/uniCloud-aliyun/cloudfunctions/uni-id-cf/package-lock.json similarity index 98% rename from uniCloud-aliyun/cloudfunctions/user-center/package-lock.json rename to uniCloud-aliyun/cloudfunctions/uni-id-cf/package-lock.json index bcc23fb8..df152b55 100644 --- a/uniCloud-aliyun/cloudfunctions/user-center/package-lock.json +++ b/uniCloud-aliyun/cloudfunctions/uni-id-cf/package-lock.json @@ -1,5 +1,5 @@ { - "name": "user-center", + "name": "uni-id-cf", "version": "1.0.0", "lockfileVersion": 2, "requires": true, diff --git a/uniCloud-aliyun/cloudfunctions/user-center/package.json b/uniCloud-aliyun/cloudfunctions/uni-id-cf/package.json similarity index 95% rename from uniCloud-aliyun/cloudfunctions/user-center/package.json rename to uniCloud-aliyun/cloudfunctions/uni-id-cf/package.json index 927edab7..d3c8e6de 100644 --- a/uniCloud-aliyun/cloudfunctions/user-center/package.json +++ b/uniCloud-aliyun/cloudfunctions/uni-id-cf/package.json @@ -1,5 +1,5 @@ { - "name": "user-center", + "name": "uni-id-cf", "version": "1.0.0", "description": "", "main": "index.js", -- GitLab