From 970c6eac795dbf792e3c4a44b1fc5894d8fe92ff Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Mon, 11 Oct 2021 16:00:49 +0800 Subject: [PATCH] no message --- api/ztb.js | 2 ++ pages/index/index.js | 14 ++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/api/ztb.js b/api/ztb.js index 6c33b68..1a39829 100644 --- a/api/ztb.js +++ b/api/ztb.js @@ -104,6 +104,7 @@ const getMessageNumber = () => mGet(`/message-center/message/get/unread-number`, const getMemberExpenseList = () => mGet(`/recycle-service/member/get/member-expense-list`, null, zconfig) const getMemberInfo = () => mGet(`/recycle-service/user/get/member-info`, null, zconfig) const buyMemberInfo = (params) => mPost(`/recycle-service/member/buy/member`, params, zconfig) +const receiveMember = (params) => mPost(`/recycle-service/member/get/member`, params, zconfig) const createTradeOrder = (params) => mPost(`/recycle-service/create/order-trade`, params, zconfig) const getStoreOrderInfo = (id) => mGet(`/recycle-service/get/store-order-trade-details/${id}`, null, zconfig) const getUserOrderInfo = (id) => mGet(`/recycle-service/get/user-order-trade-details/${id}`, null, zconfig) @@ -214,6 +215,7 @@ export { getMessageNumber, getMemberExpenseList, getMemberInfo, + receiveMember, buyMemberInfo, createTradeOrder, getStoreOrderInfo, diff --git a/pages/index/index.js b/pages/index/index.js index 2ff1d82..8689b4d 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 } from "../../api/ztb" +import { zconfig, loginToken, getBaseInfo, getPopupInfo, hasGetMemberInfo, receiveMember } from "../../api/ztb" import { pconfig } from "../../api/payment" import { mconfig } from "../../api/moment" const util = require('../../utils/util') @@ -99,7 +99,7 @@ Page({ this.setData({ landInfo: {otherType: 10, picUrl: '/assets/popup/send-member.png'} }) } else { hasGetMemberInfo().then(result => { - if (!result.data && !result.data.hasGetMember &&!this.data.landInfo) { + 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'} }) } else { @@ -287,10 +287,16 @@ Page({ return } 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('领取会员失败,请下次登录重新领取') + }) } 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 {