|
@@ -1,4 +1,4 @@
|
|
|
-import { _decorator, Component, Label, Node, ProgressBar, sys } from 'cc';
|
|
|
+import { _decorator, Component, error, Label, Node, ProgressBar, sys } from 'cc';
|
|
|
import { getOpenidMessage, getTestUserListMessage, sysMessage, UserData } from '../../../data/data';
|
|
|
import { gameManager } from '../gameManager';
|
|
|
import { http } from '../../http';
|
|
@@ -43,16 +43,18 @@ export class loading_view extends Component {
|
|
|
if(user_data==null){
|
|
|
user_data = new UserData;
|
|
|
}
|
|
|
- let formData = {"openid":user_data.user_id,"avatarUrl": ""}
|
|
|
+ let formData = {"openid":user_data.user_id,"platform":user_data.platform,"avatarUrl": ""}
|
|
|
let login_call_back = ()=>{
|
|
|
// console.log("formData",formData)
|
|
|
http.run_post(http.get_login(),formData,(err,data)=>{
|
|
|
+ // console.log('login_data=',data)
|
|
|
if(!err){
|
|
|
let _data = JSON.parse(data);
|
|
|
if(_data.code==config.MSG_CODE.SUCCESS){
|
|
|
user_data.user_id = _data.content.openid
|
|
|
user_data.id = _data.content.id
|
|
|
user_data.token = _data.content.token;
|
|
|
+ user_data.platform = _data.content.platform;
|
|
|
if(_data.content.unlock_levels.length<=0||user_data.unlock_levels==undefined){
|
|
|
user_data.unlock_levels = []
|
|
|
}
|
|
@@ -80,12 +82,13 @@ export class loading_view extends Component {
|
|
|
success(res) {
|
|
|
let code = res.code;
|
|
|
let anonymousCode = res.anonymousCode;
|
|
|
- console.log("code",code,anonymousCode)
|
|
|
+ console.log("tt_code",code,anonymousCode)
|
|
|
http.run_post(http.get_dyopen_id(),{"code":code,"anonymous_code":anonymousCode},(err,data)=>{
|
|
|
let _data:getOpenidMessage = JSON.parse(data)
|
|
|
if(_data.code===config.MSG_CODE.SUCCESS){
|
|
|
user_data.user_id = _data.content.openid;
|
|
|
formData.openid = _data.content.openid;
|
|
|
+ formData.platform = 'douyin'
|
|
|
console.log("_data",_data)
|
|
|
login_call_back();
|
|
|
}
|
|
@@ -93,27 +96,35 @@ export class loading_view extends Component {
|
|
|
})
|
|
|
},
|
|
|
fail(res) {
|
|
|
- console.log(`login 调用失败`);
|
|
|
+ console.log(`tt_login 调用失败:`,res);
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
else if(sys.platform==sys.Platform.WECHAT_GAME){
|
|
|
- // console.log('WECHAT_GAME WECHAT_GAME WECHAT_GAME')
|
|
|
- // user_data.user_id = "微信小游戏123";
|
|
|
- // formData.openid = user_data.user_id;
|
|
|
- // login_call_back();
|
|
|
wx.login({
|
|
|
success(res) {
|
|
|
- console.log('wx_login success:',res)
|
|
|
+ let code = res.code;
|
|
|
+ console.log("wx_code",code)
|
|
|
+ http.run_post(http.get_wxopen_id(),{"code": code}, (err,data)=> {
|
|
|
+ let _data:getOpenidMessage = JSON.parse(data)
|
|
|
+ if(_data.code===config.MSG_CODE.SUCCESS){
|
|
|
+ user_data.user_id = _data.content.openid;
|
|
|
+ formData.openid = _data.content.openid;
|
|
|
+ formData.platform = 'wx'
|
|
|
+ console.log("_data",data)
|
|
|
+ login_call_back();
|
|
|
+ }
|
|
|
+ })
|
|
|
},
|
|
|
fali(err) {
|
|
|
- console.log('wx_login err:',err)
|
|
|
+ console.log('wx_login 调用失败:',err)
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
else{
|
|
|
user_data.user_id = "123";
|
|
|
formData.openid = user_data.user_id;
|
|
|
+ formData.platform = ''
|
|
|
login_call_back();
|
|
|
}
|
|
|
|