Skip to content

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

log

parent f4dc5257
Hide 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,78 +61,121 @@ Page({ ...@@ -26,78 +61,121 @@ 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,"---------登录"); wx.request({
var code = res2.code url: Jade.getUrl("users/sign_in.json"),
wx.getUserInfo({ method: 'POST',
withCredentials: true, data: {
success: res => { code: res2.code,
log.info(res,"---------getUserInfo") },
// console.log('getUserInfo') success: res4 => {
wx.request({ const data = res4.data;
url: Jade.getUrl("users/sign_in.json"), wx.setStorageSync('user', data)
method: 'POST', wx.setStorageSync('user_token', data.token)
data: { log.info(res4,"---------getUserInfo=success")
code: code, // Jade.UserManager.setUser(data)
user_info: res.userInfo, // Jade.UserManager.setToken(data.token)
encrypted_data: res.encryptedData, Jade.UserManager.authRequest({
iv: res.iv url: Jade.getUrl("babies.json"),
}, success: (result) => {
success: res4 => { if (typeof result.data === "object") {
const data = res4.data; wx.setStorageSync('baby', result.data)
wx.setStorageSync('user', data) } else {
wx.setStorageSync('user_token', data.token) wx.setStorageSync('baby', null)
log.info(res4,"---------getUserInfo=success") }
// Jade.UserManager.setUser(data) log.info(result,"---------authRequest=success")
// Jade.UserManager.setToken(data.token) wx.redirectTo({
Jade.UserManager.authRequest({ url: '/pages/takePhoto/takePhoto',
url: Jade.getUrl("babies.json"), })
success: (result) => {
if (typeof result.data === "object") { },
wx.setStorageSync('baby', result.data) fail: err => {
} else { wx.showToast({
wx.setStorageSync('baby', null) title: '获取信息失败',
icon: 'none',
duration:2000
})
// if (options && options.success) {
// options.success(result)
// }
} }
log.info(result,"---------authRequest=success") })
wx.redirectTo({ }
url: '/pages/takePhoto/takePhoto', })
}) // console.log(res,"---------登录");
// if (options && options.success) { // var code = res2.code
// options.success(result) // if(wx.getUserProfile){
// } // wx.getUserProfile({
}, // // withCredentials: true,
fail: err => { // success: res => {
wx.showToast({ // log.info(res,"---------getUserInfo")
title: '获取信息失败', // console.log('getUserInfo',res)
icon: 'none', // wx.request({
duration:2000 // url: Jade.getUrl("users/sign_in.json"),
}) // method: 'POST',
// if (options && options.success) { // data: {
// options.success(result) // 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: '登录失败', // fail: err => {
icon: 'none', // console.log(err);
duration:2000, // log.error(err,"---------登录-fail")
complete:function(){ // wx.showToast({
wx.redirectTo({ // title: '登录失败fail',
url: '/pages/photo/photo', // 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