@@ -15,61 +15,56 @@ var wxRequest = require('wxRequest.js')
1515var Api = require ( 'api.js' ) ;
1616var app = getApp ( ) ;
1717module . exports = {
18- //获取用户信息和openid
19- getUsreInfo : function ( userInfoDetail ) {
20- var wxLogin = wxApi . wxLogin ( ) ;
21- var jscode = '' ;
22-
23- wxLogin ( ) . then ( response => {
24- jscode = response . code
25- if ( userInfoDetail == null )
26- {
27- var userInfo = wxApi . wxGetUserInfo ( ) ;
28- return userInfo ( ) ;
29- }
30- else
31- {
32- return userInfoDetail ;
33- }
34-
35-
36- } ) .
37- //获取用户信息
38- then ( response => {
39- console . log ( response . userInfo ) ;
40- console . log ( "成功获取用户信息(公开信息)" ) ;
41- app . globalData . userInfo = response . userInfo ;
42- app . globalData . isGetUserInfo = true ;
18+ //获取用户信息和openid
19+ getUsreInfo : function ( userInfoDetail ) {
20+ var wxLogin = wxApi . wxLogin ( ) ;
21+ var jscode = '' ;
4322
44- var data = {
45- js_code : jscode ,
46- encryptedData : response . encryptedData ,
47- iv : response . iv ,
48- avatarUrl : response . userInfo . avatarUrl ,
49- nickname : response . userInfo . nickName
50- }
51- this . getOpenId ( data ) ;
52- } ) . catch ( function ( error ) {
53- console . log ( 'error: ' + error . errMsg ) ;
54- } )
55- } ,
56- getOpenId ( data )
57- {
58- var url = Api . getOpenidUrl ( ) ;
59- var postOpenidRequest = wxRequest . postRequest ( url , data ) ;
60- //获取openid
61- postOpenidRequest . then ( response => {
62- if ( response . data . status == '200' ) {
63- //console.log(response.data.openid)
64- console . log ( "openid 获取成功" ) ;
65- app . globalData . openid = response . data . openid ;
66- app . globalData . isGetOpenid = true ;
23+ wxLogin ( ) . then ( response => {
24+ jscode = response . code
25+ if ( userInfoDetail == null ) {
26+ var userInfo = wxApi . wxGetUserInfo ( ) ;
27+ return userInfo ( ) ;
28+ } else {
29+ return userInfoDetail ;
30+ }
6731
68- }
69- else {
70- console . log ( response ) ;
71- }
72- } )
73- }
32+
33+ } ) .
34+ //获取用户信息
35+ then ( response => {
36+ console . log ( response . userInfo ) ;
37+ console . log ( "成功获取用户信息(公开信息)" ) ;
38+ app . globalData . userInfo = response . userInfo ;
39+ app . globalData . isGetUserInfo = true ;
40+
41+ var data = {
42+ js_code : jscode ,
43+ encryptedData : response . encryptedData ,
44+ iv : response . iv ,
45+ avatarUrl : response . userInfo . avatarUrl ,
46+ nickname : response . userInfo . nickName
47+ }
48+ this . getOpenId ( data ) ;
49+ } ) . catch ( function ( error ) {
50+ console . log ( 'error: ' + error . errMsg ) ;
51+ } )
52+ } ,
53+ getOpenId ( data ) {
54+ var url = Api . getOpenidUrl ( ) ;
55+ var postOpenidRequest = wxRequest . postRequest ( url , data ) ;
56+ //获取openid
57+ postOpenidRequest . then ( response => {
58+ if ( response . data . status == '200' ) {
59+ //console.log(response.data.openid)
60+ console . log ( "openid 获取成功" ) ;
61+ app . globalData . openid = response . data . openid ;
62+ app . globalData . isGetOpenid = true ;
63+
64+ } else {
65+ console . log ( response ) ;
66+ }
67+ } )
68+ } ,
7469
7570}
0 commit comments