diff --git a/assets/popup/no-zige.png b/assets/popup/no-zige.png index f1f94cb..33729b5 100644 Binary files a/assets/popup/no-zige.png and b/assets/popup/no-zige.png differ diff --git a/pages/index/index.js b/pages/index/index.js index 8689b4d..9369c25 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -1,5 +1,5 @@ import { config, getUserInfo } from "../../api/user" -import { zconfig, loginToken, getBaseInfo, getPopupInfo, hasGetMemberInfo, receiveMember } from "../../api/ztb" +import { zconfig, loginToken, getBaseInfo, getPopupInfo, receiveMember } from "../../api/ztb" import { pconfig } from "../../api/payment" import { mconfig } from "../../api/moment" const util = require('../../utils/util') @@ -98,7 +98,7 @@ Page({ if(!app.globalData.userInfo){ this.setData({ landInfo: {otherType: 10, picUrl: '/assets/popup/send-member.png'} }) } else { - hasGetMemberInfo().then(result => { + receiveMember().then(result => { if (result.data && result.data.hasGetMember && !this.data.landInfo) { if(result.data.type === 1){ this.setData({ landInfo: {otherType: 11, picUrl: '/assets/popup/eighty-member.png'} }) @@ -289,14 +289,7 @@ Page({ if(this.data.landInfo.otherType == 10){ util.navigateTo('/pages/login/index') } else if(this.data.landInfo.otherType == 11){ - wx.showLoading({ title: '领取中', mask: true }) - receiveMember().then(res => { - wx.hideLoading() - util.showToast('会员领取成功') - }).catch(err => { - wx.hideLoading() - util.showToast('领取会员失败,请下次登录重新领取') - }) + util.navigateTo('/pages/ztbvip/index') } else if (this.data.landInfo.redirectInfo.targetView == 'showH5') { util.navigateTo('/pages/html/html/index?link=' + this.data.landInfo.redirectInfo.params.id + '?title=' + this.data.landInfo.title) } else {