Commit f5abf9f7 by 赵雅纹

Merge branch 'feature-zyw' into 'dev'

Feature zyw

See merge request !20
parents e43eb651 56cf9ad9
...@@ -113,7 +113,7 @@ App({ ...@@ -113,7 +113,7 @@ App({
loginFirst: false, loginFirst: false,
imageUrl:"", //图片地址 imageUrl:"", //图片地址
isFullSucreen: false, // 当前设备是否为 FullSucreen isFullSucreen: false, // 当前设备是否为 FullSucreen
// brandId: 2005, brandId: 2005,
brandId: 1001, // brandId: 1001,
} }
}) })
...@@ -43,19 +43,13 @@ Component({ ...@@ -43,19 +43,13 @@ Component({
//立即兑换 //立即兑换
query() {}, query() {},
_getUserInfo(res = {}) { _getUserInfo(res = {}) {
if(!this.data.checkAll) {
wx.showToast({
title: '请同意会员规则',
icon: 'none'
})
return false
}
this.setData({ this.setData({
isAuthorization: false isAuthorization: false
}) })
const userInfo = res.detail || {} const userInfo = res.detail || {}
if (res.detail.userInfo) { if (res.detail.userInfo) {
utils.getUserInfoByBtn(userInfo).then( (data = {} ) => { utils.getUserInfoByBtn(userInfo).then( (data = {} ) => {
console.log('----',data)
const {token} = data const {token} = data
wx.setStorageSync('_accreditUserInfo', userInfo) wx.setStorageSync('_accreditUserInfo', userInfo)
wx.hideNavigationBarLoading() wx.hideNavigationBarLoading()
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<view class='auth-shop'> <view class='auth-shop'>
广东7-Eleven申请获取授权,用于会员服务 广东7-Eleven申请获取授权,用于会员服务
</view> </view>
<button type='primary' bindgetuserinfo="_getUserInfo" open-type='getUserInfo' class='agree' >同意</button> <button type='primary' bindgetuserinfo="_getUserInfo" open-type='getUserInfo' class='agree' disabled='{{!checkAll}}'>同意</button>
<view class='rule-wrap'> <view class='rule-wrap'>
<view class='agree-rule'> <view class='agree-rule'>
<view class="agree-icon"><icon size="18" type="{{checkAll ? 'success' : 'circle'}}" bindtap="checkAll"></icon></view> <view class="agree-icon"><icon size="18" type="{{checkAll ? 'success' : 'circle'}}" bindtap="checkAll"></icon></view>
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<button type="primary" plain='false' bindtap="handleTtoActiveMemebr">激活立享会员特权</button> <button type="primary" plain='false' bindtap="handleTtoActiveMemebr">激活立享会员特权</button>
</view>--> </view>-->
<view wx:if='{{!memberActivateStatus}}' class="member-unActive"> <view wx:if='{{!memberActivateStatus}}' class="member-unActive" bindtap="handleTtoActiveMemebr">
<text class="un-active-btn" bindtap="handleTtoActiveMemebr">激活立享会员特权</text> <text class="un-active-btn" >激活立享会员特权</text>
</view> </view>
<view wx:if='{{memberActivateStatus}}' class="activation-content activation-bg {{true ? 'user-content' : ''}}" style="{{personData.backgroundImageUrl ? 'background-image: url('+ personData.backgroundImageUrl +');' : 'background-image: url(' + baseUrl + ');'}}"> <view wx:if='{{memberActivateStatus}}' class="activation-content activation-bg {{true ? 'user-content' : ''}}" style="{{personData.backgroundImageUrl ? 'background-image: url('+ personData.backgroundImageUrl +');' : 'background-image: url(' + baseUrl + ');'}}">
......
...@@ -37,31 +37,37 @@ Component({ ...@@ -37,31 +37,37 @@ Component({
}, },
preview(e) { preview(e) {
const {appid, path} = e.currentTarget.dataset const {appid, path} = e.currentTarget.dataset
const {memberActivateStatus} = wx.getStorageSync('_baseUserInfo')
// 获取当前帐号信息 // 获取当前帐号信息
const accountInfo = utils.getAccountInfo() const accountInfo = utils.getAccountInfo()
const userInfo = wx.getStorageSync('_baseUserInfo') const userInfo = wx.getStorageSync('_baseUserInfo')
if (userInfo){ if (userInfo){
// 是当前小程序 直接跳转
if(accountInfo.miniProgram.appId == appid){ if(accountInfo.miniProgram.appId == appid){
wxService.router(`${path}`) if (!memberActivateStatus){
} else { wxService.openCard()
// 跳转其他小程序 }else{
wx.navigateToMiniProgram({ wxService.router(`${path}`)
appId: appid, }
path: `${path}`, } else {
success: e => { // 跳转其他小程序
console.log(e) wx.navigateToMiniProgram({
}, appId: appid,
fail: e => { path: `${path}`,
console.log(e) success: e => {
}, console.log(e)
complete: e => { },
console.log(e) fail: e => {
}, console.log(e)
}) },
complete: e => {
console.log(e)
},
})
} }
// 是当前小程序 直接跳转
}else{ }else{
console.log('222')
this.setData({ this.setData({
isAuthorization: true isAuthorization: true
}) })
......
const PROJECT_ENV = 'dev' // 生产 prod, 测试 dev, 预生产 pre const PROJECT_ENV = 'pre' // 生产 prod, 测试 dev, 预生产 pre
const needMock = '' // const needMock = '' //
// appid_dev_wx wxc3b64b09b1d3dfc2 // appid_dev_wx wxc3b64b09b1d3dfc2
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "2.6.6", "libVersion": "2.6.6",
"appid": "wxc3b64b09b1d3dfc2", "appid": "wx358b56af62edbde1",
"projectname": "7-Eleven", "projectname": "7-Eleven",
"debugOptions": { "debugOptions": {
"hidedInDevtools": [] "hidedInDevtools": []
......
...@@ -148,7 +148,7 @@ class Http { ...@@ -148,7 +148,7 @@ class Http {
content: '请求数据超时' content: '请求数据超时'
}) })
} }
if(error.msg){ if (error.msg && error.msg !='该用户尚未登录'){
wx.showToast({ wx.showToast({
title: `${error.msg}`, title: `${error.msg}`,
icon: 'none' icon: 'none'
......
...@@ -47,38 +47,25 @@ class WXService extends Http { ...@@ -47,38 +47,25 @@ class WXService extends Http {
this.setPageLoadStatus() this.setPageLoadStatus()
wx.hideLoading() wx.hideLoading()
}).catch(res => { }).catch(res => {
console.log('res', res) console.log(res)
if (res.state === 401) { if (res.msg === '该用户尚未登录') {
// this.openCard() wx.setStorageSync('token', '')
var _this = this var _this = this
wx.showModal({ let userInfo = wx.getStorageSync('_baseUserInfo')
title: '温馨提示', _this.login().then(result=>{
content: '登录已过期,请重新登录', if(result.code){
success(res) { _this.post(`/member/minaLogin`, {
if (res.confirm) { code: result.code,
let userInfo = wx.getStorageSync('_baseUserInfo') wechatInfo: userInfo,
_this.login().then(result=>{ brandId: 2005,
if(result.code){ }).then(response=>{
_this.post(`/member/minaLogin`, { let dataResp = response.data.data
code: result.code, wx.setStorageSync('token', dataResp.token)
wechatInfo: userInfo, wx.setStorageSync('_baseUserInfo', dataResp)
brandId: 2005, })
}).then(data=>{
const { token } = data
if (token) {
wx.setStorageSync('token', token)
} else {
wx.setStorageSync('token', '')
}
wx.setStorageSync('_baseUserInfo', data)
})
}
})
} else if (res.cancel) {
}
} }
}) })
} else if (res.state === 402) { } else if (res.state === 402) {
return this.getUserInfo().then(() => { return this.getUserInfo().then(() => {
if (!this.getUserInfoLimitCount) { if (!this.getUserInfoLimitCount) {
...@@ -508,6 +495,7 @@ class WXService extends Http { ...@@ -508,6 +495,7 @@ class WXService extends Http {
if(memberActivateStatus) { if(memberActivateStatus) {
resolve(baseUserInfo) resolve(baseUserInfo)
} else { } else {
console.log('开卡', baseUserInfo)
return this.navigateToMiniProgram({ return this.navigateToMiniProgram({
biz: baseUserInfo.biz, biz: baseUserInfo.biz,
encrypt_card_id: baseUserInfo.encryptCardId, encrypt_card_id: baseUserInfo.encryptCardId,
......
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