|
@@ -19,6 +19,9 @@ Page({
|
|
|
page = `${page}?id=${options.id}`
|
|
|
}
|
|
|
|
|
|
+ if (options.page == 'pages/resume/resume') {
|
|
|
+ page = `${page}?type=${options.type}`
|
|
|
+ }
|
|
|
|
|
|
this.setData({
|
|
|
fromPage: page
|
|
@@ -74,29 +77,57 @@ Page({
|
|
|
onShareAppMessage: function () {
|
|
|
|
|
|
},
|
|
|
- getInfo : async function(e){
|
|
|
- const _self = this
|
|
|
- let userInfo = e.detail.userInfo
|
|
|
- userInfo['encryptedData'] = e.detail.encryptedData
|
|
|
- userInfo['iv'] = e.detail.iv
|
|
|
- let info = await app.wxLogin(userInfo);
|
|
|
-
|
|
|
- _self.setData({
|
|
|
- hasUserInfo: true,
|
|
|
- userInfo: info,
|
|
|
- })
|
|
|
|
|
|
- if(_self.data.fromPage=="pages/sociology/sociology" || _self.data.fromPage=="pages/school/school"){
|
|
|
- wx.switchTab({
|
|
|
- url: '/'+_self.data.fromPage,
|
|
|
- })
|
|
|
- }else{
|
|
|
- wx.redirectTo({
|
|
|
- url: '/'+_self.data.fromPage,
|
|
|
- })
|
|
|
- }
|
|
|
+ getUserProfile: function(e){
|
|
|
+ var _self=this;
|
|
|
+ wx.getUserProfile({
|
|
|
+ desc: '用于完善会员资料', // 声明获取用户个人信息后的用途,后续会展示在弹窗中,请谨慎填写
|
|
|
+ success: (res) => {
|
|
|
+ console.log(res);
|
|
|
+ // res.userInfo['encryptedData'] = res.encryptedData
|
|
|
+ // res.userInfo['iv'] = res.iv
|
|
|
+ app.wxLogin(res.userInfo).then(function(){
|
|
|
+
|
|
|
+ if(_self.data.fromPage=="pages/sociology/sociology" || _self.data.fromPage=="pages/school/school"){
|
|
|
+ wx.switchTab({
|
|
|
+ url: '/'+_self.data.fromPage,
|
|
|
+ })
|
|
|
+ }else{
|
|
|
+ wx.redirectTo({
|
|
|
+ url: '/'+_self.data.fromPage,
|
|
|
+ })
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ )
|
|
|
+
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
+ // getInfo : async function(e){
|
|
|
+ // const _self = this
|
|
|
+ // let userInfo = e.detail.userInfo
|
|
|
+ // userInfo['encryptedData'] = e.detail.encryptedData
|
|
|
+ // userInfo['iv'] = e.detail.iv
|
|
|
+ // let info = await app.wxLogin(userInfo);
|
|
|
+
|
|
|
+ // _self.setData({
|
|
|
+ // hasUserInfo: true,
|
|
|
+ // userInfo: info,
|
|
|
+ // })
|
|
|
+
|
|
|
+ // if(_self.data.fromPage=="pages/sociology/sociology" || _self.data.fromPage=="pages/school/school"){
|
|
|
+ // wx.switchTab({
|
|
|
+ // url: '/'+_self.data.fromPage,
|
|
|
+ // })
|
|
|
+ // }else{
|
|
|
+ // wx.redirectTo({
|
|
|
+ // url: '/'+_self.data.fromPage,
|
|
|
+ // })
|
|
|
+ // }
|
|
|
|
|
|
- console.log(_self.data.fromPage)
|
|
|
+ // console.log(_self.data.fromPage)
|
|
|
|
|
|
- }
|
|
|
+ // }
|
|
|
})
|