|
@@ -24,7 +24,10 @@ Page({
|
|
|
player_type:0,
|
|
|
signinfo:{},
|
|
|
avatarUrl: defaultAvatarUrl,
|
|
|
- userName:'',
|
|
|
+ nickName:'',
|
|
|
+ openid:'',
|
|
|
+ unionid:'',
|
|
|
+
|
|
|
},
|
|
|
|
|
|
/**
|
|
@@ -37,11 +40,11 @@ Page({
|
|
|
player_type:options.player_type
|
|
|
})
|
|
|
}
|
|
|
- $api.getsignup().then(res=>{
|
|
|
- this.setData({
|
|
|
- signinfo:res.data.data
|
|
|
- })
|
|
|
- })
|
|
|
+ // $api.getsignup().then(res=>{
|
|
|
+ // this.setData({
|
|
|
+ // signinfo:res.data.data
|
|
|
+ // })
|
|
|
+ // })
|
|
|
},
|
|
|
onShow: function () {
|
|
|
wx.hideHomeButton();
|
|
@@ -96,7 +99,7 @@ Page({
|
|
|
|
|
|
nameChange(e){
|
|
|
this.setData({
|
|
|
- userName: e.detail.value
|
|
|
+ nickName: e.detail.value
|
|
|
})
|
|
|
},
|
|
|
|
|
@@ -124,39 +127,12 @@ Page({
|
|
|
},
|
|
|
/**登陆 */
|
|
|
login: function () {
|
|
|
- var _this=this;
|
|
|
- wx.getUserProfile({
|
|
|
- desc: '用于完善会员资料',
|
|
|
- success: res=> {
|
|
|
- //获取基本信息
|
|
|
- console.log(res.userInfo)
|
|
|
-
|
|
|
- var data = {
|
|
|
- nickName: res.userInfo.nickName,
|
|
|
- avatarUrl: res.userInfo.avatarUrl,
|
|
|
- usercode: this.data.usercode
|
|
|
- }
|
|
|
-
|
|
|
- if(data.nickName == "微信用户" | data.nickName == ""){
|
|
|
- _this.setData({
|
|
|
- status:10,
|
|
|
- })
|
|
|
- } else{
|
|
|
- _this.wxlogin(data)
|
|
|
- }
|
|
|
- }
|
|
|
- })
|
|
|
+ this.islogin();
|
|
|
|
|
|
},
|
|
|
|
|
|
register(e){
|
|
|
- var data = {
|
|
|
- nickName: this.data.userName,
|
|
|
- avatarUrl: this.data.avatarUrl,
|
|
|
- usercode: this.data.usercode
|
|
|
- }
|
|
|
-
|
|
|
- if(data.avatarUrl == defaultAvatarUrl){
|
|
|
+ if(this.data.avatarUrl == defaultAvatarUrl){
|
|
|
wx.showToast({
|
|
|
icon: 'none',
|
|
|
title: '请选择头像',
|
|
@@ -164,7 +140,7 @@ Page({
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- if(data.nickName == ''){
|
|
|
+ if(this.data.nickName == ''){
|
|
|
wx.showToast({
|
|
|
icon: 'none',
|
|
|
title: '请输入昵称',
|
|
@@ -172,16 +148,15 @@ Page({
|
|
|
return
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
- this.wxlogin(data)
|
|
|
+ this.wxlogin()
|
|
|
},
|
|
|
-
|
|
|
- wxlogin(data){
|
|
|
+
|
|
|
+ islogin(){
|
|
|
var _this=this;
|
|
|
wx.showLoading({
|
|
|
title: '正在登陆',
|
|
|
})
|
|
|
+
|
|
|
wx.login({
|
|
|
success(res) {
|
|
|
//获取code
|
|
@@ -196,35 +171,15 @@ Page({
|
|
|
wx.hideLoading();
|
|
|
return;
|
|
|
}
|
|
|
- data.openid = res.data.data.openid;
|
|
|
- $api.login(data)
|
|
|
- .then(res=>{
|
|
|
- //登录成功
|
|
|
-
|
|
|
- wx.setStorage({
|
|
|
- key: 'userInfo',
|
|
|
- data: res.data.data,
|
|
|
- })
|
|
|
-
|
|
|
- //老用户直接进入系统
|
|
|
-
|
|
|
- if(res.data.data.role != 0){
|
|
|
- wx.switchTab({
|
|
|
- url: '../index/index',
|
|
|
- })
|
|
|
-
|
|
|
- return;
|
|
|
- }
|
|
|
|
|
|
- //新用户选择报名
|
|
|
- _this.setData({
|
|
|
- status:3,
|
|
|
- player_type:0
|
|
|
- })
|
|
|
+ _this.setData({
|
|
|
+ openid:res.data.data.openid,
|
|
|
+ unionid:res.data.data.unionid,
|
|
|
+ })
|
|
|
+
|
|
|
+ $api.isUserLogin({openid:res.data.data.openid,unionid:res.data.data.unionid})
|
|
|
+ .then(res=>{
|
|
|
wx.hideLoading();
|
|
|
- wx.setNavigationBarTitle({
|
|
|
- title: '',
|
|
|
- })
|
|
|
if (res.data.code != 0) {
|
|
|
wx.showToast({
|
|
|
icon: 'none',
|
|
@@ -232,7 +187,21 @@ Page({
|
|
|
})
|
|
|
return;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
+ //有登录
|
|
|
+ if(res.data.data.id){
|
|
|
+ _this.setData({
|
|
|
+ nickName:res.data.data.username,
|
|
|
+ avatarUrl:res.data.data.avatar,
|
|
|
+ })
|
|
|
+ _this.wxlogin()
|
|
|
+
|
|
|
+ } else{
|
|
|
+ _this.setData({
|
|
|
+ status:10,
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
})
|
|
|
.catch(err=>{
|
|
|
wx.hideLoading();
|
|
@@ -246,6 +215,60 @@ Page({
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
+ wxlogin(){
|
|
|
+ var _this=this;
|
|
|
+ wx.showLoading({
|
|
|
+ title: '正在登陆',
|
|
|
+ })
|
|
|
+ var udata = {};
|
|
|
+ udata.openid = this.data.openid;
|
|
|
+ udata.unionid = this.data.unionid;
|
|
|
+ udata.nickName = this.data.nickName;
|
|
|
+ udata.avatarUrl = this.data.avatarUrl;
|
|
|
+
|
|
|
+ $api.login(udata)
|
|
|
+ .then(res=>{
|
|
|
+ //登录成功
|
|
|
+ wx.hideLoading();
|
|
|
+ if (res.data.code != 0) {
|
|
|
+ wx.showToast({
|
|
|
+ icon: 'none',
|
|
|
+ title: res.data.message,
|
|
|
+ })
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ wx.setStorage({
|
|
|
+ key: 'userInfo',
|
|
|
+ data: res.data.data,
|
|
|
+ })
|
|
|
+
|
|
|
+ //老用户直接进入系统
|
|
|
+ if(res.data.data.role != 0){
|
|
|
+ app.globalData.follow = 1
|
|
|
+ wx.switchTab({
|
|
|
+ url: '../index/index',
|
|
|
+ })
|
|
|
+
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ //新用户选择报名
|
|
|
+ _this.setData({
|
|
|
+ status:3,
|
|
|
+ player_type:0
|
|
|
+ })
|
|
|
+
|
|
|
+ wx.setNavigationBarTitle({
|
|
|
+ title: '',
|
|
|
+ })
|
|
|
+
|
|
|
+ })
|
|
|
+ .catch(err=>{
|
|
|
+ wx.hideLoading();
|
|
|
+ })
|
|
|
+ },
|
|
|
+
|
|
|
login1(){
|
|
|
logindata.phone=this.data.phone
|
|
|
logindata.phcode=this.data.phcode
|