Skip to content

X
xinya_mini
Commit aef6745e authored by xwq's avatar xwq
Browse files
Options

log

parent f4dc5257
Show whitespace changes
Inline Side-by-side
Showing with 148 additions and 70 deletions
pages/photo/photo.js
View file @ aef6745e
...@@ -9,6 +9,41 @@ Page({ ...@@ -9,6 +9,41 @@ Page({
*/ */
data: { data: {
},
successCallBack:function(res4){
const data = res4.data;
wx.setStorageSync('user', data)
wx.setStorageSync('user_token', data.token)
log.info(res4,"---------getUserInfo=success")
// Jade.UserManager.setUser(data)
// Jade.UserManager.setToken(data.token)
Jade.UserManager.authRequest({
url: Jade.getUrl("babies.json"),
success: (result) => {
if (typeof result.data === "object") {
wx.setStorageSync('baby', result.data)
} else {
wx.setStorageSync('baby', null)
}
log.info(result,"---------authRequest=success")
wx.redirectTo({
url: '/pages/takePhoto/takePhoto',
})
// if (options && options.success) {
// options.success(result)
// }
},
fail: err => {
wx.showToast({
title: '获取信息失败',
icon: 'none',
duration:2000
})
// if (options && options.success) {
// options.success(result)
// }
}
})
}, },
goIndex(){ goIndex(){
// wx.setStorageSync('user', data) // wx.setStorageSync('user', data)
...@@ -26,22 +61,13 @@ Page({ ...@@ -26,22 +61,13 @@ Page({
if (res1.confirm) { if (res1.confirm) {
wx.login({ wx.login({
success: res2 => { success: res2 => {
console.log(res2);
log.info(res2,"---------登录") log.info(res2,"---------登录")
// console.log(res,"---------登录");
var code = res2.code
wx.getUserInfo({
withCredentials: true,
success: res => {
log.info(res,"---------getUserInfo")
// console.log('getUserInfo')
wx.request({ wx.request({
url: Jade.getUrl("users/sign_in.json"), url: Jade.getUrl("users/sign_in.json"),
method: 'POST', method: 'POST',
data: { data: {
code: code, code: res2.code,
user_info: res.userInfo,
encrypted_data: res.encryptedData,
iv: res.iv
}, },
success: res4 => { success: res4 => {
const data = res4.data; const data = res4.data;
...@@ -62,9 +88,7 @@ Page({ ...@@ -62,9 +88,7 @@ Page({
wx.redirectTo({ wx.redirectTo({
url: '/pages/takePhoto/takePhoto', url: '/pages/takePhoto/takePhoto',
}) })
// if (options && options.success) {
// options.success(result)
// }
}, },
fail: err => { fail: err => {
wx.showToast({ wx.showToast({
...@@ -79,25 +103,79 @@ Page({ ...@@ -79,25 +103,79 @@ Page({
}) })
} }
}) })
}, // console.log(res,"---------登录");
fail: err => { // var code = res2.code
log.error(err,"---------登录-fail") // if(wx.getUserProfile){
wx.showToast({ // wx.getUserProfile({
title: '登录失败', // // withCredentials: true,
icon: 'none', // success: res => {
duration:2000, // log.info(res,"---------getUserInfo")
complete:function(){ // console.log('getUserInfo',res)
wx.redirectTo({ // wx.request({
url: '/pages/photo/photo', // url: Jade.getUrl("users/sign_in.json"),
}) // method: 'POST',
} // data: {
}) // code: code,
// user_info: res.userInfo,
// encrypted_data: res.encryptedData,
// iv: res.iv
// },
// success: res4 => {
// this.successCallBack(res4)
// }
// })
// },
// fail: err => {
// console.log(err);
// log.error(err,"---------登录-fail")
// wx.showToast({
// title: '登录失败fail',
// icon: 'none',
// duration:2000,
// complete:function(){
// wx.redirectTo({ // wx.redirectTo({
// url: '/pages/photo/photo', // url: '/pages/photo/photo',
// }) // })
// wx.onLoad() // }
} // })
}) // }
// })
// }else{
// wx.getUserInfo({
// withCredentials: true,
// success: res => {
// log.info(res,"---------getUserInfo")
// console.log('getUserInfo',res)
// wx.request({
// url: Jade.getUrl("users/sign_in.json"),
// method: 'POST',
// data: {
// code: code,
// user_info: res.userInfo,
// encrypted_data: res.encryptedData,
// iv: res.iv
// },
// success: res4 => {
// this.successCallBack(res4)
// }
// })
// },
// fail: err => {
// log.error(err,"---------登录-fail")
// wx.showToast({
// title: '登录失败',
// icon: 'none',
// duration:2000,
// complete:function(){
// wx.redirectTo({
// url: '/pages/photo/photo',
// })
// }
// })
// }
// })
// }
} }
}) })
} else if (res1.cancel) { } else if (res1.cancel) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment