Skip to content

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

format

parent aef6745e
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 140 deletions
pages/photo/photo.js
View file @ 6a4ba013
// pages/photo/photo.js // pages/photo/photo.js
import { Jade } from "../../jade/index" import {
const log =require("../../utils/log.js") Jade
} from "../../jade/index"
const log = require("../../utils/log.js")
// import {Log} from "../../utils/log" // import {Log} from "../../utils/log"
Page({ Page({
...@@ -10,11 +12,11 @@ Page({ ...@@ -10,11 +12,11 @@ Page({
data: { data: {
}, },
successCallBack:function(res4){ successCallBack: function (res4) {
const data = res4.data; const data = res4.data;
wx.setStorageSync('user', data) wx.setStorageSync('user', data)
wx.setStorageSync('user_token', data.token) wx.setStorageSync('user_token', data.token)
log.info(res4,"---------getUserInfo=success") log.info(res4, "---------getUserInfo=success")
// Jade.UserManager.setUser(data) // Jade.UserManager.setUser(data)
// Jade.UserManager.setToken(data.token) // Jade.UserManager.setToken(data.token)
Jade.UserManager.authRequest({ Jade.UserManager.authRequest({
...@@ -25,7 +27,7 @@ Page({ ...@@ -25,7 +27,7 @@ Page({
} else { } else {
wx.setStorageSync('baby', null) wx.setStorageSync('baby', null)
} }
log.info(result,"---------authRequest=success") log.info(result, "---------authRequest=success")
wx.redirectTo({ wx.redirectTo({
url: '/pages/takePhoto/takePhoto', url: '/pages/takePhoto/takePhoto',
}) })
...@@ -37,7 +39,7 @@ Page({ ...@@ -37,7 +39,7 @@ Page({
wx.showToast({ wx.showToast({
title: '获取信息失败', title: '获取信息失败',
icon: 'none', icon: 'none',
duration:2000 duration: 2000
}) })
// if (options && options.success) { // if (options && options.success) {
// options.success(result) // options.success(result)
...@@ -45,10 +47,10 @@ Page({ ...@@ -45,10 +47,10 @@ Page({
} }
}) })
}, },
goIndex(){ goIndex() {
// wx.setStorageSync('user', data) // wx.setStorageSync('user', data)
// wx.setStorageSync('user_token', data.token) // wx.setStorageSync('user_token', data.token)
if(wx.getStorageSync('user')&&wx.getStorageSync('user_token')){ if (wx.getStorageSync('user') && wx.getStorageSync('user_token')) {
wx.redirectTo({ wx.redirectTo({
url: '/pages/takePhoto/takePhoto', url: '/pages/takePhoto/takePhoto',
}) })
...@@ -57,164 +59,91 @@ Page({ ...@@ -57,164 +59,91 @@ Page({
wx.showModal({ wx.showModal({
title: '登录弹窗', title: '登录弹窗',
content: '使用小程序前，请登录并授权小程序获取您的信息', content: '使用小程序前，请登录并授权小程序获取您的信息',
success (res1) { success(res1) {
if (res1.confirm) { if (res1.confirm) {
wx.login({ wx.login({
success: res2 => { success: res2 => {
console.log(res2); console.log(res2);
log.info(res2,"---------登录") log.info(res2, "---------登录")
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: res2.code, code: res2.code,
}, },
success: res4 => { success: res4 => {
const data = res4.data; const data = res4.data;
wx.setStorageSync('user', data) wx.setStorageSync('user', data)
wx.setStorageSync('user_token', data.token) wx.setStorageSync('user_token', data.token)
log.info(res4,"---------getUserInfo=success") log.info(res4, "---------getUserInfo=success")
// Jade.UserManager.setUser(data) // Jade.UserManager.setUser(data)
// Jade.UserManager.setToken(data.token) // Jade.UserManager.setToken(data.token)
Jade.UserManager.authRequest({ Jade.UserManager.authRequest({
url: Jade.getUrl("babies.json"), url: Jade.getUrl("babies.json"),
success: (result) => { success: (result) => {
if (typeof result.data === "object") { if (typeof result.data === "object") {
wx.setStorageSync('baby', result.data) wx.setStorageSync('baby', result.data)
} else { } else {
wx.setStorageSync('baby', null) wx.setStorageSync('baby', null)
}
log.info(result,"---------authRequest=success")
wx.redirectTo({
url: '/pages/takePhoto/takePhoto',
})
},
fail: err => {
wx.showToast({
title: '获取信息失败',
icon: 'none',
duration:2000
})
// if (options && options.success) {
// options.success(result)
// }
}
})
} }
}) log.info(result, "---------authRequest=success")
// console.log(res,"---------登录"); wx.redirectTo({
// var code = res2.code url: '/pages/takePhoto/takePhoto',
// if(wx.getUserProfile){ })
// wx.getUserProfile({
// // withCredentials: true, },
// success: res => { fail: err => {
// log.info(res,"---------getUserInfo") wx.showToast({
// console.log('getUserInfo',res) title: '获取信息失败',
// wx.request({ icon: 'none',
// url: Jade.getUrl("users/sign_in.json"), duration: 2000
// 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({
// url: '/pages/photo/photo',
// })
// }
// })
// }
// })
// }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) {
log.error(res1,"---------登录-cancel") log.error(res1, "---------登录-cancel")
wx.showToast({ wx.showToast({
title: '您已拒绝授权', title: '您已拒绝授权',
icon: 'none', icon: 'none',
duration:10000, duration: 10000,
complete:function(){ complete: function () {
wx.redirectTo({ wx.redirectTo({
url: '/pages/photo/photo', url: '/pages/photo/photo',
}) })
} }
}) })
} }
} }
}) })
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function (options) { onLoad: function (options) {
// let userInfo=wx.getStorageSync('userInfo') // let userInfo=wx.getStorageSync('userInfo')
// console.log(userInfo,"---------"); // console.log(userInfo,"---------");
// if(!userInfo){ // if(!userInfo){
// wx.getUserProfile({ // wx.getUserProfile({
// desc:"授权并使用", // desc:"授权并使用",
// lang: "zh_CN", // lang: "zh_CN",
// success:(res)=>{ // success:(res)=>{
// console.log("123",res); // console.log("123",res);
// } // }
// }) // })
// } // }
}, },
/** /**
......
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