Commit bd458e35 by 高淑倩

code

parent 6ac43b1e
...@@ -69,10 +69,10 @@ wxService.page({ ...@@ -69,10 +69,10 @@ wxService.page({
}, },
startmessage(e){ startmessage(e){
console.log('startmessage', e) // console.log('startmessage', e)
}, },
completemessage(e){ completemessage(e){
console.log('completemessage', e) // console.log('completemessage', e)
}, },
// 获取邀请奖励图片 // 获取邀请奖励图片
getShareImg() { getShareImg() {
......
...@@ -37,4 +37,4 @@ ...@@ -37,4 +37,4 @@
<!-- 底部补充高度 防止被遮盖 --> <!-- 底部补充高度 防止被遮盖 -->
<view class="bottom-fixed" style="padding-bottom:{{paddingBottom}}"></view> <view class="bottom-fixed" style="padding-bottom:{{paddingBottom}}"></view>
<!--联系我 客服ID--> <!--联系我 客服ID-->
<cell bind:startmessage='startmessage' bind:completemessage="completemessage" plugid='plugid' /> <cell bind:startmessage='startmessage' bind:completemessage="completemessage" plugid='c9918b9af349c100b285d1b9a4d19ec6' />
\ No newline at end of file \ No newline at end of file
...@@ -278,9 +278,11 @@ function getUserInfoByBtn(userInfo) { ...@@ -278,9 +278,11 @@ function getUserInfoByBtn(userInfo) {
return wxService.Promise.reject(userInfo.errMsg) return wxService.Promise.reject(userInfo.errMsg)
} }
return wxService.login().then((res) => { return wxService.login().then((res) => {
console.log('code', res)
logger.log(' wx getUserInfoByBtn success res --->', res) logger.log(' wx getUserInfoByBtn success res --->', res)
return Promise.all([Promise.resolve(userInfo), Promise.resolve(res)]) return Promise.all([Promise.resolve(userInfo), Promise.resolve(res)])
}).then((res) => { }).then((res) => {
logger.log(' wx _userInfo success res --->', res) logger.log(' wx _userInfo success res --->', res)
wx.setStorageSync('_userInfo', res[0].userInfo) wx.setStorageSync('_userInfo', res[0].userInfo)
wx.setStorageSync('_wechatInfo', res[0]) wx.setStorageSync('_wechatInfo', res[0])
...@@ -290,7 +292,11 @@ function getUserInfoByBtn(userInfo) { ...@@ -290,7 +292,11 @@ function getUserInfoByBtn(userInfo) {
icon: 'none', icon: 'none',
mask: true mask: true
}) })
return wxService.post(`/member/minaLogin`, { const currentEnv = wx.getStorageSync('_qyWeChat')
let currentLoginUrl = currentEnv ? `/member/qiyeweixin/minaLogin` : `/member/minaLogin`
console.log('登陆', currentLoginUrl)
return wxService.post(`${currentLoginUrl}`, {
code: res[1].code, code: res[1].code,
wechatInfo: res[0], wechatInfo: res[0],
brandId: app.globalData.brandId, brandId: app.globalData.brandId,
......
...@@ -164,7 +164,8 @@ class WXService extends Http { ...@@ -164,7 +164,8 @@ class WXService extends Http {
console.log('全局', currentEnv) console.log('全局', currentEnv)
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
// 企业 wx.qy.login // 企业 wx.qy.login
currentEnv ? wx.qy.login : wx.login({ if (currentEnv) {
wx.qy.login({
success: (res) => { success: (res) => {
resolve(res) resolve(res)
wx.setStorageSync('_loginCode', res.code) wx.setStorageSync('_loginCode', res.code)
...@@ -173,6 +174,17 @@ class WXService extends Http { ...@@ -173,6 +174,17 @@ class WXService extends Http {
reject(res) reject(res)
} }
}) })
} else {
wx.login({
success: (res) => {
resolve(res)
wx.setStorageSync('_loginCode', res.code)
},
fail: (res) => {
reject(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