|
@@ -1,7 +1,7 @@
|
|
|
// h5授权
|
|
|
export function authorizeH5(mallid, groupId, urls, callback) {
|
|
|
const value = uni.getStorageSync('member');
|
|
|
- console.log('授权后的会员号', value)
|
|
|
+ console.log('授权后的会员号', value)
|
|
|
if (value) {
|
|
|
callback()
|
|
|
} else {
|
|
@@ -27,9 +27,9 @@ export function authorizeH5(mallid, groupId, urls, callback) {
|
|
|
})
|
|
|
}
|
|
|
},
|
|
|
- fail: (err) => {
|
|
|
- console.log('------err', err)
|
|
|
- }
|
|
|
+ fail: (err) => {
|
|
|
+ console.log('------err', err)
|
|
|
+ }
|
|
|
});
|
|
|
}
|
|
|
}
|
|
@@ -51,7 +51,7 @@ export function getCode(mallid, groupId, urls, callback, appid, componentAppid)
|
|
|
`https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appid}&redirect_uri=${urlNow}&response_type=code&scope=${scope}&state=STATE&component_appid=${componentAppid}#wechat_redirect`;
|
|
|
window.location.href = url;
|
|
|
} else {
|
|
|
- console.log('-------------code授权成功')
|
|
|
+ console.log('-------------code授权成功')
|
|
|
// 发送code
|
|
|
this.$postCode(mallid, groupId, urls, callback, code)
|
|
|
}
|
|
@@ -68,13 +68,13 @@ function getUrlCode(name) {
|
|
|
// 发送code 获取会员信息
|
|
|
export function postCode(mallid, groupId, urls, callback, code) {
|
|
|
// // const app = getApp()
|
|
|
- const app = {}
|
|
|
+ const app = {}
|
|
|
var datas = {
|
|
|
mallid: mallid,
|
|
|
groupId: groupId,
|
|
|
scope: 'snsapi_userinfo',
|
|
|
code,
|
|
|
- source: '2'
|
|
|
+ source: '2'
|
|
|
}
|
|
|
this.$md(datas)
|
|
|
uni.request({
|
|
@@ -84,23 +84,23 @@ export function postCode(mallid, groupId, urls, callback, code) {
|
|
|
header: JSON.parse(uni.getStorageSync('handleUser')),
|
|
|
success: (res) => {
|
|
|
if (res.data.code == 0) {
|
|
|
- console.log('-----------code0获取会员信息', res.data.data)
|
|
|
+ console.log('-----------code0获取会员信息', res.data.data)
|
|
|
//res里面包含用户信息 openid等
|
|
|
app.globalData.member = res.data.data.member
|
|
|
app.globalData.wxMember = res.data.data.wxMember
|
|
|
app.globalData.userInfo = res.data.data.userinfo || {}
|
|
|
- uni.setStorage({
|
|
|
- key: 'wxMember',
|
|
|
- data: JSON.stringify(res.data.data.wxMember),
|
|
|
- success: function() {
|
|
|
- console.log('userinfo-success');
|
|
|
- }
|
|
|
- });
|
|
|
+ uni.setStorage({
|
|
|
+ key: 'wxMember',
|
|
|
+ data: JSON.stringify(res.data.data.wxMember),
|
|
|
+ success: function () {
|
|
|
+ console.log('userinfo-success');
|
|
|
+ }
|
|
|
+ });
|
|
|
// 存储会员信息
|
|
|
uni.setStorage({
|
|
|
key: 'member',
|
|
|
data: JSON.stringify(res.data.data.member),
|
|
|
- success: function() {
|
|
|
+ success: function () {
|
|
|
console.log('userinfo-success');
|
|
|
}
|
|
|
});
|
|
@@ -117,7 +117,7 @@ export function postCode(mallid, groupId, urls, callback, code) {
|
|
|
uni.setStorage({
|
|
|
key: 'userinfo',
|
|
|
data: JSON.stringify(res.data.data.userinfo),
|
|
|
- success: function() {
|
|
|
+ success: function () {
|
|
|
console.log('userinfo-success');
|
|
|
}
|
|
|
});
|
|
@@ -125,14 +125,14 @@ export function postCode(mallid, groupId, urls, callback, code) {
|
|
|
const value = uni.getStorageSync('userinfo');
|
|
|
if (value) {
|
|
|
var openId = JSON.parse(value).openid
|
|
|
- app.globalData.openId = openId
|
|
|
- uni.setStorageSync('openId', openId)
|
|
|
+ app.globalData.openId = openId
|
|
|
+ uni.setStorageSync('openId', openId)
|
|
|
console.log('openId', openId)
|
|
|
}
|
|
|
} catch (e) {
|
|
|
// error
|
|
|
}
|
|
|
- console.log('授权后的会员号0')
|
|
|
+ console.log('授权后的会员号0')
|
|
|
callback()
|
|
|
} else if (res.data.code == 1005) {
|
|
|
console.log('-----------code1005获取会员信息', res.data.data)
|
|
@@ -140,7 +140,7 @@ export function postCode(mallid, groupId, urls, callback, code) {
|
|
|
uni.setStorage({
|
|
|
key: 'userinfo',
|
|
|
data: JSON.stringify(res.data.data.userinfo),
|
|
|
- success: function() {
|
|
|
+ success: function () {
|
|
|
console.log('userinfo-success');
|
|
|
}
|
|
|
});
|
|
@@ -148,25 +148,25 @@ export function postCode(mallid, groupId, urls, callback, code) {
|
|
|
const value = uni.getStorageSync('userinfo');
|
|
|
if (value) {
|
|
|
var openId = JSON.parse(value).openid //openid
|
|
|
- app.globalData.openId = openId
|
|
|
- uni.setStorageSync('openId', openId)
|
|
|
+ app.globalData.openId = openId
|
|
|
+ uni.setStorageSync('openId', openId)
|
|
|
}
|
|
|
} catch (e) {
|
|
|
// error
|
|
|
}
|
|
|
- console.log('---------注册登录')
|
|
|
- // 仅限于集字页面的判断
|
|
|
- console.log('仅限于集字页面的查看分享人手机号判断执行的回调...', this.$getLocationValue(urls, 'sharePhone'))
|
|
|
- if (this.$getLocationValue(urls, 'sharePhone')) {
|
|
|
- console.log('-----------有分享sharePhone', urls)
|
|
|
- callback()
|
|
|
- } else {
|
|
|
- // 注册登录
|
|
|
- window.location.href = this.$baseURLH5 + 'index.html#/pages/loginPubilc/loginH5?url='+encodeURIComponent(JSON.stringify(urls))
|
|
|
- }
|
|
|
- // window.location.href = this.$baseURLH5 + 'index.html#/pages/loginPubilc/loginH5?url='+encodeURIComponent(JSON.stringify(urls))
|
|
|
+ console.log('---------注册登录')
|
|
|
+ // 仅限于集字页面的判断
|
|
|
+ console.log('仅限于集字页面的查看分享人手机号判断执行的回调...', this.$getLocationValue(urls, 'sharePhone'))
|
|
|
+ if (this.$getLocationValue(urls, 'sharePhone')) {
|
|
|
+ console.log('-----------有分享sharePhone', urls)
|
|
|
+ callback()
|
|
|
+ } else {
|
|
|
+ // 注册登录
|
|
|
+ window.location.href = this.$baseURLH5 + 'index.html#/pages/loginPubilc/loginH5?url=' + encodeURIComponent(JSON.stringify(urls))
|
|
|
+ }
|
|
|
+ // window.location.href = this.$baseURLH5 + 'index.html#/pages/loginPubilc/loginH5?url='+encodeURIComponent(JSON.stringify(urls))
|
|
|
} else if (res.data.code == 1006) {
|
|
|
- console.log('-----------code1006获取会员信息', res.data.data)
|
|
|
+ console.log('-----------code1006获取会员信息', res.data.data)
|
|
|
// 有会员查活动
|
|
|
try {
|
|
|
const member = uni.getStorageSync('member');
|