diff --git a/baseapp.config.js b/baseapp.config.js
index 706a274414ff0f55ade3d85f341507658e94c8f5..43d68646865f3b2e156a618956c6c1c7eb452042 100644
--- a/baseapp.config.js
+++ b/baseapp.config.js
@@ -18,7 +18,7 @@ module.exports = {
"/uni_modules/uni-news-favorite/pages/uni-news-favorite/list",
"/pages/ucenter/edit/uploadCutImageToUnicloud"
],
- "login": ["univerify", "smsCode", "username", "weixin", "apple"] //默认就是短信验证码登陆
+ "login": [ "smsCode","univerify", "username", "weixin", "apple"] //默认就是短信验证码登陆
},
"about": {
"appName": "base-app",
diff --git a/common/extiLogin.js b/common/extiLogin.js
new file mode 100644
index 0000000000000000000000000000000000000000..17ab4c3d59ffe239d921c96f9b306b6f292c3ebe
--- /dev/null
+++ b/common/extiLogin.js
@@ -0,0 +1,25 @@
+export default function(result){
+ uni.showToast({
+ title: '登陆成功',
+ icon: 'none'
+ });
+ console.log('登陆成功',result);
+ uni.setStorageSync('uni_id_uid', result.uid)
+ uni.setStorageSync('uni_id_token', result.token)
+ uni.setStorageSync('uni_id_token_expired', result.tokenExpired)
+ //delete result.userInfo.token
+ // this.setUserInfo(result.userInfo)
+
+ var delta = 0//判断需要返回几层
+ let pages = getCurrentPages();
+ // console.log(pages);
+ pages.forEach((page,index)=>{
+ // console.log(pages[pages.length-index-1].route.split('/')[2]);
+ pages[pages.length-index-1].route.split('/')
+ if(pages[pages.length-index-1].route.split('/')[2] == 'login-page'){
+ delta ++
+ }
+ })
+ // console.log('判断需要返回几层',delta);
+ uni.navigateBack({delta})
+}
\ No newline at end of file
diff --git a/components/send-sms-code/send-sms-code.vue b/components/send-sms-code/send-sms-code.vue
index 9c56d173734adb37d0c77a770adf5f7391ebd279..41947e35c846afdfda5e38904530259997d3c470 100644
--- a/components/send-sms-code/send-sms-code.vue
+++ b/components/send-sms-code/send-sms-code.vue
@@ -79,8 +79,8 @@
{
"mobile": this.phone,
"type": this.codeType
- },(data,result)=>{
- console.log(data,result);
+ },result=>{
+ console.log(result);
uni.showToast({
title: "短信验证码发送成功",
icon: 'none'
diff --git a/components/uni-agreements/uni-agreements.vue b/components/uni-agreements/uni-agreements.vue
new file mode 100644
index 0000000000000000000000000000000000000000..200f1f5f7dd5d22315493b1ad252dc7e7ccf887c
--- /dev/null
+++ b/components/uni-agreements/uni-agreements.vue
@@ -0,0 +1,46 @@
+
+
+ 登陆即表示同意
+
+ {{agreement.title}}
+ 和
+
+
+
+
+
+
+
diff --git a/components/uni-quick-login/uni-quick-login.vue b/components/uni-quick-login/uni-quick-login.vue
index 077a8df41ed09212d2793e068196b16624098b1d..aa2c79040d71e4ef259cd4b383a170170441dcaf 100644
--- a/components/uni-quick-login/uni-quick-login.vue
+++ b/components/uni-quick-login/uni-quick-login.vue
@@ -120,7 +120,7 @@
}),
getRoute(n = 0) {
let pages = getCurrentPages();
- console.log('route-pages-length', pages.length);
+ // console.log('route-pages-length', pages.length);
if (n > pages.length) {
return ''
}
@@ -211,7 +211,7 @@
},
quickLogin(params, type) { //联网验证登陆
console.log(params, type);
- this.request('user-center/login_by_' + type, params, (data, result) => {
+ this.request('user-center/login_by_' + type, params, result => {
console.log(result);
if (result.code === 0) {
if (type == 'univerify') {
@@ -251,7 +251,10 @@
.quick-login-box {
flex-direction: row;
width: 750rpx;
- justify-content: space-around;
+ justify-content: space-around;
+ position: fixed;
+ bottom: 10rpx;
+ left: 0;
}
.item {
diff --git a/js_sdk/request.js b/js_sdk/request.js
index ffadc8ffd49639708da9d1c3e1f8a98fb532f851..06e79c1ed1fa31a8e3ead336ffde130cb470a554 100644
--- a/js_sdk/request.js
+++ b/js_sdk/request.js
@@ -23,7 +23,7 @@ export default function request(name,params,callback=false,{showLoading=false,lo
const {result:{data,code}} = e
console.log(data,code);
resolve(e)
- return callback(data,e.result,e)
+ return callback(e.result,e)
},
fail(err){
reject(err)
diff --git a/pages.json b/pages.json
index f4098a88d0e73e2275983e6dadfa8f10e1c952ec..cc705931d7d46f03e652923186a2b8d827a9e9f0 100644
--- a/pages.json
+++ b/pages.json
@@ -100,25 +100,26 @@
// #endif
}
- }, {
- "path": "pages/ucenter/agree-list/agree-list",
- "style": {
- "navigationBarTitleText": "政策与协议"
- }
-
- }, {
- "path": "pages/ucenter/agree-list/privacy/privacy",
- "style": {
- "navigationBarTitleText": "隐私政策"
- }
+ },
+ // {
+ // "path": "pages/ucenter/agree-list/agree-list",
+ // "style": {
+ // "navigationBarTitleText": "政策与协议"
+ // }
- }, {
- "path": "pages/ucenter/agree-list/service/service",
- "style": {
- "navigationBarTitleText": "服务协议"
- }
+ // }, {
+ // "path": "pages/ucenter/agree-list/privacy/privacy",
+ // "style": {
+ // "navigationBarTitleText": "隐私政策"
+ // }
- }, {
+ // }, {
+ // "path": "pages/ucenter/agree-list/service/service",
+ // "style": {
+ // "navigationBarTitleText": "服务协议"
+ // }
+ // },
+ {
"path": "uni_modules/uni-upgrade-center-app/pages/upgrade-popup",
"style": {
"disableScroll": true,
diff --git a/pages/ucenter/agree-list/agree-list.nvue b/pages/ucenter/----agree-list/agree-list.nvue
similarity index 100%
rename from pages/ucenter/agree-list/agree-list.nvue
rename to pages/ucenter/----agree-list/agree-list.nvue
diff --git a/pages/ucenter/agree-list/privacy/privacy.html b/pages/ucenter/----agree-list/privacy/privacy.html
similarity index 100%
rename from pages/ucenter/agree-list/privacy/privacy.html
rename to pages/ucenter/----agree-list/privacy/privacy.html
diff --git a/pages/ucenter/agree-list/privacy/privacy.vue b/pages/ucenter/----agree-list/privacy/privacy.vue
similarity index 100%
rename from pages/ucenter/agree-list/privacy/privacy.vue
rename to pages/ucenter/----agree-list/privacy/privacy.vue
diff --git a/pages/ucenter/agree-list/service/service.html b/pages/ucenter/----agree-list/service/service.html
similarity index 100%
rename from pages/ucenter/agree-list/service/service.html
rename to pages/ucenter/----agree-list/service/service.html
diff --git a/pages/ucenter/agree-list/service/service.vue b/pages/ucenter/----agree-list/service/service.vue
similarity index 100%
rename from pages/ucenter/agree-list/service/service.vue
rename to pages/ucenter/----agree-list/service/service.vue
diff --git a/pages/ucenter/edit/bind-mobile/bind-mobile.vue b/pages/ucenter/edit/bind-mobile/bind-mobile.vue
index 0cc472a64d8d7ab42c02cedfd2949d07d5c17bd1..dfcc7a71aff105b2c7a946c53064092f14eee827 100644
--- a/pages/ucenter/edit/bind-mobile/bind-mobile.vue
+++ b/pages/ucenter/edit/bind-mobile/bind-mobile.vue
@@ -51,7 +51,7 @@
this.request('user-center/bind_mobile_by_sms', {
"mobile": this.formData.phone,
"code": this.formData.code
- }, (data, result) => {
+ }, result=> {
console.log(result);
this.setUserInfo({"mobile":result.mobile})
uni.showToast({
diff --git a/pages/ucenter/edit/edit.vue b/pages/ucenter/edit/edit.vue
index 5a16f7ee9fe2509446df515ff77317b3bc213359..ecd12b6a35d9f089697e68c8e46003fd57f56470 100644
--- a/pages/ucenter/edit/edit.vue
+++ b/pages/ucenter/edit/edit.vue
@@ -71,7 +71,7 @@
console.log(e.authResult);
this.request('user-center/bind_mobile_by_univerify',
e.authResult,
- (data, result) =>
+ result=>
{
console.log(result);
if(result.code===0){
diff --git a/pages/ucenter/login-page/common/login-page.css b/pages/ucenter/login-page/common/login-page.css
new file mode 100644
index 0000000000000000000000000000000000000000..8b0b13675d3ecf7182130496cc67d77f19ecec37
--- /dev/null
+++ b/pages/ucenter/login-page/common/login-page.css
@@ -0,0 +1,43 @@
+.content{
+ padding:0 50rpx;
+ width: 750rpx;
+ flex: 1;
+}
+.input-box{
+ padding:0 15px;
+ margin-top: 15px;
+ background-color: #F8F8F8;
+ border-radius: 6px;
+ font-size: 28rpx;
+}
+.get-code{
+ margin: 0;
+ margin-top:15px;
+ background-color: #007aff;
+ color: #FFFFFF;
+}
+.input-box,.get-code{
+ height: 50px;
+ line-height: 50px;
+}
+.title{
+ text-align: center;
+ padding-bottom: 5px;
+}
+.tip{
+ color: #666666;
+ font-size: 26rpx;
+ margin: 6px 0;
+}
+.easyinput{
+ background-color: #F8F8F8;
+}
+.send-btn{
+ height: 85rpx;
+ width: 100%;
+ margin-top:15px;
+ border-radius: 6rpx;
+}
+.link{
+ color: #04498c;
+}
\ No newline at end of file
diff --git a/pages/ucenter/login-page/common/login-page.mixin.js b/pages/ucenter/login-page/common/login-page.mixin.js
new file mode 100644
index 0000000000000000000000000000000000000000..6b161253c7fa2ff16062ab1b3577d512b3b00d3c
--- /dev/null
+++ b/pages/ucenter/login-page/common/login-page.mixin.js
@@ -0,0 +1,15 @@
+import {mapMutations} from 'vuex';
+import loginSuccess from './loginSuccess.js';
+let mixin = {
+ methods:{
+ ...mapMutations({
+ setUserInfo: 'user/login'
+ }),
+ loginSuccess(result){
+ loginSuccess(result)
+ delete result.userInfo.token
+ this.setUserInfo(result.userInfo)
+ }
+ }
+}
+export default mixin
\ No newline at end of file
diff --git a/pages/ucenter/login-page/common/loginPage.css b/pages/ucenter/login-page/common/loginPage.css
index bf95a2ff1d3e3cd7479930a0bcbd6212fa86f481..4cb2d43e77a30b9fe95a2585b57f49a8d8233a2b 100644
--- a/pages/ucenter/login-page/common/loginPage.css
+++ b/pages/ucenter/login-page/common/loginPage.css
@@ -27,10 +27,6 @@ page {
}
.content {
- /* #ifndef APP-NVUE */
- display: flex;
- /* #endif */
- width: 630rpx;
flex-direction: column;
}
diff --git a/pages/ucenter/login-page/common/loginSuccess.js b/pages/ucenter/login-page/common/loginSuccess.js
index f94c54a9d5b30d7de62a5df72f65c6e1819d8b73..17ab4c3d59ffe239d921c96f9b306b6f292c3ebe 100644
--- a/pages/ucenter/login-page/common/loginSuccess.js
+++ b/pages/ucenter/login-page/common/loginSuccess.js
@@ -12,14 +12,14 @@ export default function(result){
var delta = 0//判断需要返回几层
let pages = getCurrentPages();
- console.log(pages);
+ // console.log(pages);
pages.forEach((page,index)=>{
- console.log(pages[pages.length-index-1].route.split('/')[2]);
+ // console.log(pages[pages.length-index-1].route.split('/')[2]);
pages[pages.length-index-1].route.split('/')
if(pages[pages.length-index-1].route.split('/')[2] == 'login-page'){
delta ++
}
})
- console.log('判断需要返回几层',delta);
+ // console.log('判断需要返回几层',delta);
uni.navigateBack({delta})
}
\ No newline at end of file
diff --git a/pages/ucenter/login-page/index/index copy.vue b/pages/ucenter/login-page/index/index copy.vue
new file mode 100644
index 0000000000000000000000000000000000000000..f311ad6f94c4487e8302f881eef0b4616b6f8da4
--- /dev/null
+++ b/pages/ucenter/login-page/index/index copy.vue
@@ -0,0 +1,153 @@
+
+
+
+
+
+ 登陆后即可展示自己
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 未注册的手机号验证通过后将自动注册
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/ucenter/login-page/index/index.vue b/pages/ucenter/login-page/index/index.vue
index 46860591632117d323fdb1cbed8ebca42739b01a..a80c27103a55049810c70816a807fd0cd213f77d 100644
--- a/pages/ucenter/login-page/index/index.vue
+++ b/pages/ucenter/login-page/index/index.vue
@@ -1,66 +1,40 @@
-
-
-
-
- 登陆后即可展示自己
-
-
-
-
-
-
-
-
-
-
-
-
-
- 未注册的手机号验证通过后将自动注册
-
-
-
-
-
+
+
+ 登陆后即可展示自己
+
+
+
+
+ 未注册的手机号验证通过后将自动注册
-
-
diff --git a/pages/ucenter/login-page/phone-code/phone-code.vue b/pages/ucenter/login-page/phone-code/phone-code.vue
index 9a65636d8855e89851360c2238de0ba57ac1d93d..c38e21ba143135d0c5e4be2b64a1228ced1d58b1 100644
--- a/pages/ucenter/login-page/phone-code/phone-code.vue
+++ b/pages/ucenter/login-page/phone-code/phone-code.vue
@@ -1,108 +1,61 @@
-
-
-
-
- 请输入验证码
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 请输入验证码
+ {{tipText}}
+
+
+
+
+
+
+
+
+
-
-
-
diff --git a/pages/ucenter/login-page/pwd-login/pwd-login copy.vue b/pages/ucenter/login-page/pwd-login/pwd-login copy.vue
new file mode 100644
index 0000000000000000000000000000000000000000..1b766952994da88e477519bb19d32faf4d2acc8f
--- /dev/null
+++ b/pages/ucenter/login-page/pwd-login/pwd-login copy.vue
@@ -0,0 +1,146 @@
+
+
+
+
+
+ 用户名密码登录
+
+
+
+
+
+
+
+
+ {{currenPhoneArea}}
+
+
+
+
+
+
+
+
+
+
+
+ 忘记密码
+ 注册账号
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/ucenter/login-page/pwd-login/pwd-login.vue b/pages/ucenter/login-page/pwd-login/pwd-login.vue
index 1b766952994da88e477519bb19d32faf4d2acc8f..3cf7958dbda28b243d51f7d71baacfff334888a1 100644
--- a/pages/ucenter/login-page/pwd-login/pwd-login.vue
+++ b/pages/ucenter/login-page/pwd-login/pwd-login.vue
@@ -1,120 +1,71 @@
-
-
-
-
-
- 用户名密码登录
-
-
-
-
-
-
-
-
- {{currenPhoneArea}}
-
-
-
-
-
-
-
-
-
-
-
- 忘记密码
- 注册账号
-
-
-
-
+
+
+
+ 用户名密码登录
+
+
+
+
+
+
+ 忘记密码
+ 注册账号
+
+