diff --git a/config/config.js b/config/config.js index 18be5cc..19a00f8 100755 --- a/config/config.js +++ b/config/config.js @@ -308,7 +308,8 @@ var config = { activitySign:"/wxActivityJoin/sign", activityList: "/wxActivityJoin/list", //获取未支付的订单 - getUnPaidOrder: "/order/getUnPaidOrder" + getUnPaidOrder: "/order/getUnPaidOrder", + getCouponOrderByPassword:'/couponPassword/getCouponOrderByPassword' }, weapp: { AppId: weappId diff --git a/pages/exchange/exchange.js b/pages/exchange/exchange.js index 16d61ae..fd71a2b 100644 --- a/pages/exchange/exchange.js +++ b/pages/exchange/exchange.js @@ -11,64 +11,85 @@ Page({ data: { navigationBarHeight }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - }, // 兑换 exchange(e){ - + let that = this; + let code = e.detail.value.code; + let formId = e.detail.formId; + if (!code){ + wx.showToast({ + title: '请输入兑换码', + icon:"none", + duration:2500 + }) + return; + } + that.checkPhoneStatus(e.detail.value.code,formId = e.detail.formId); + }, + checkPhoneStatus: function (password, formId) { + let that = this; + Http.get({ + url: config.api.checkPhoneStatus, + data: {} + }) + .then(res => { + that.getCouponOrderByPassword(password, formId); + }) + .catch(err => { + if (err.code == 11005) { + /** + * 手机号没有授权,将值传到用户手机号授权的页面 + * + */ + wx.redirectTo({ + url: "/pages/getphoneInfo/index", + }) + } else { + wx.showToast({ + title: err.message, + icon: 'none', + duration: 2500 + }) + } + }) + }, + getCouponOrderByPassword(password, formId) { + let that = this; + Http.post({ + url: config.api.getCouponOrderByPassword, + data: { + password: password, + formId: formId + } + }) + .then(res => { + wx.showModal({ + title: '兑换成功', + content: '消费卡已发放到"我的卡包"', + showCancel: true, + cancelText: "知道了", + cancelColor: '', + confirmText: "去查看", + confirmColor: '#FD832D', + success: function (res) { + if (res.cancel) { + //点击取消,默认隐藏弹框 + } else { + wx.redirectTo({ + url: '/pages/cardorder/index/index', + }) + } + }, + fail: function (res) { },//接口调用失败的回调函数 + complete: function (res) { },//接口调用结束的回调函数(调用成功、失败都会执行) + }) + }) + .catch(err => { + wx.showToast({ + title: err.message, + icon: 'none', + duration: 2000 + }) + }) } }) \ No newline at end of file diff --git a/pages/exchange/exchange.wxml b/pages/exchange/exchange.wxml index 7b46d75..05e3e4b 100644 --- a/pages/exchange/exchange.wxml +++ b/pages/exchange/exchange.wxml @@ -1,8 +1,10 @@ - - - - +
+ + + + +
如何获取兑换码? 1.实体卡卡密可刮开卡背面涂层查看; diff --git a/pages/exchange/exchange.wxss b/pages/exchange/exchange.wxss index fb08ea9..08a4c4a 100644 --- a/pages/exchange/exchange.wxss +++ b/pages/exchange/exchange.wxss @@ -1,11 +1,13 @@ /* pages/exchange/exchange.wxss */ .section{ - display: flex; padding: 0 20rpx; +} +.section{ + display: flex; flex: 5; } -.section input{ - flex: 4; +.section input{ + flex: 3; border: 1px solid #ccc; border-radius: 10rpx; height: 70rpx; @@ -14,7 +16,7 @@ padding-left: 20rpx; margin-right: 10rpx; } -.section button{ +.section button{ flex: 1; height: 74rpx; line-height: 74rpx; diff --git a/utils/imgurl.js b/utils/imgurl.js index 2376654..bb7c9ea 100644 --- a/utils/imgurl.js +++ b/utils/imgurl.js @@ -586,7 +586,7 @@ module.exports = { 'name': '拼团小图标' }, 'duihuan': { - 'url': baseUrl + 'duihuan.png', + 'url': baseUrl + 'exchange01.png', 'name': '兑换小图标' }, 'wangmeimeibargin':{