From f6452c96de64843827e21ff8238a534e402e8065 Mon Sep 17 00:00:00 2001 From: yvan.ni <765199919@qq.com> Date: Mon, 9 Nov 2020 18:23:41 +0800 Subject: [PATCH] 预存的功能的优化 --- components/qr_code/qr_code.wxml | 7 ++++--- components/qr_code/qr_code.wxss | 8 ++++++-- packageA/pages/chongzhi/chongzhi.js | 61 ++++++++++++++++++++++++++----------------------------------- packageA/pages/chongzhi/chongzhi.json | 3 ++- packageA/pages/chongzhi/chongzhi.wxml | 28 +++++++++++++--------------- packageA/pages/chongzhiDetails/chongzhiDetails.js | 179 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------ packageA/pages/chongzhiDetails/chongzhiDetails.wxml | 44 ++++++++++++++++++++++++-------------------- packageA/pages/chongzhiDetails/chongzhiDetails.wxss | 2 ++ pages/user/deposit/prepaid/prepaid.js | 5 +++++ pages/user/deposit/prepaid/prepaid.wxml | 4 ++-- 10 files changed, 215 insertions(+), 126 deletions(-) diff --git a/components/qr_code/qr_code.wxml b/components/qr_code/qr_code.wxml index 5aa0ec7..216c4fa 100644 --- a/components/qr_code/qr_code.wxml +++ b/components/qr_code/qr_code.wxml @@ -11,14 +11,15 @@ {{object.val}} - - {{object.content}} + + {{object.content}} 有效时间：{{object.now}} 至 {{object.validay}} 使用说明: 仅{{object.name}}使用 使用说明: 全场通用 - + {{object.code}} + diff --git a/components/qr_code/qr_code.wxss b/components/qr_code/qr_code.wxss index c4eb9e2..50d62ba 100644 --- a/components/qr_code/qr_code.wxss +++ b/components/qr_code/qr_code.wxss @@ -78,11 +78,11 @@ letter-spacing:6rpx; /* 二维码边框*/ .qrcode_rim { width: 550rpx; - height:544rpx; + height:544rpx; display:flex; flex-direction:column; position: absolute; -left: 74rpx; +left: 75rpx; } .qrcode{ @@ -125,4 +125,8 @@ margin-top: -5.5rpx; .flex{ display: flex; justify-content:center; +} + +.code_show{ + text-align: center;position: relative; left: -20rpx; } \ No newline at end of file diff --git a/packageA/pages/chongzhi/chongzhi.js b/packageA/pages/chongzhi/chongzhi.js index d4fa7af..93191c3 100644 --- a/packageA/pages/chongzhi/chongzhi.js +++ b/packageA/pages/chongzhi/chongzhi.js @@ -1,12 +1,6 @@ // packageA//pages/chongzhi/chongzhi.js const app = getApp(); - -// var e = function(e) { -// return e && e.__esModule ? e : { -// default: e -// }; -// }(require("../../../utils/LoadMore.js")); - +var util = require('../../../utils/util.js'); Page({ @@ -34,8 +28,9 @@ Page({ */ onLoad: function (options) { - console.log('userInfo',app.globalData.userInfo); + var self = this; + this.getData(true,'/api/weshop/users/pageNewVIPAddMoney',{ store_id: app.globalData.userInfo.store_id, user_id: app.globalData.userInfo.user_id, @@ -57,13 +52,7 @@ Page({ }); }, - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, - + /** * 生命周期函数--监听页面显示 */ @@ -72,20 +61,6 @@ Page({ }, /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - - }, - - /** * 页面相关事件处理函数--监听用户下拉动作 */ onPullDownRefresh: function () { @@ -150,8 +125,7 @@ Page({ this.setData({ saveData: data }); - } - + } this.getData(true,'/api/weshop/users/pageNewVIPAddMoney',data); }, @@ -197,12 +171,21 @@ Page({ }, - viewDetails(e) { - let id = e.target.dataset.id; - // console.log('eeeeeeeeeee', id); - app.goto('../chongzhiDetails/chongzhiDetails?id=' + id); + goDetails(e) { + let id = e.currentTarget.dataset.id; + app.goto('../chongzhiDetails/chongzhiDetails?id=' + id+"&type=1"); }, + viewDetails(e){ + var index=e.currentTarget.dataset.index; + var WriteOffCode=this.data.list[index].WriteOffCode; + + var qrcode = this.selectComponent("#qrcode"); //组件的id + var code=util.base64_encode(WriteOffCode + '|' + util.formatTime()); + var e={is_fw:1,val:code,code:WriteOffCode} + qrcode.open(e); + + }, // 检测上拉滚动到底部 // scrollToLower: function (requestData, callback) { @@ -228,4 +211,12 @@ Page({ // this.getData(false, requestData, callback); // }; // }, + + + bind_err:function(e){ + var _errImg = e.target.dataset.errorimg; + var _errObj = {}; + _errObj[_errImg] = "/miniapp/images/default_g_img.gif"; + this.setData(_errObj); + } }) \ No newline at end of file diff --git a/packageA/pages/chongzhi/chongzhi.json b/packageA/pages/chongzhi/chongzhi.json index 470dab9..dd864e1 100644 --- a/packageA/pages/chongzhi/chongzhi.json +++ b/packageA/pages/chongzhi/chongzhi.json @@ -2,6 +2,7 @@ "navigationBarTitleText": "充值有礼", "enablePullDownRefresh": false, "usingComponents": { - "nodata": "/components/nodata/nodata" + "nodata": "/components/nodata/nodata", + "qrcode":"/components/qr_code/qr_code" } } \ No newline at end of file diff --git a/packageA/pages/chongzhi/chongzhi.wxml b/packageA/pages/chongzhi/chongzhi.wxml index 6972c43..d50d3e6 100644 --- a/packageA/pages/chongzhi/chongzhi.wxml +++ b/packageA/pages/chongzhi/chongzhi.wxml @@ -10,9 +10,8 @@ - - - + + @@ -29,18 +28,17 @@ - - 立即使用 + + 立即使用 - - - - - - 暂无数据 - - - + + + + 暂无数据 + + - \ No newline at end of file + + + \ No newline at end of file diff --git a/packageA/pages/chongzhiDetails/chongzhiDetails.js b/packageA/pages/chongzhiDetails/chongzhiDetails.js index 64b10ac..3b8c97c 100644 --- a/packageA/pages/chongzhiDetails/chongzhiDetails.js +++ b/packageA/pages/chongzhiDetails/chongzhiDetails.js @@ -1,8 +1,7 @@ // packageA//pages/chongzhiDetails/chongzhiDetails.js var util = require('../../../utils/util.js'); - -const app = getApp(); - +const app = getApp(),os = app.globalData.setting; + Page({ /** @@ -11,39 +10,57 @@ Page({ data: { showCode: false, result: null, + show_img:null, + url: app.globalData.setting.imghost, + type:0, //0是立即充值 1是购买后的 }, /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { - const self = this; - app.request.get('/api/weshop/users/getBuyaddmoneyactDetails', { + + const self = this; + if(options.type) + self.setData({type:options.type}); + + var UserInfo=app.globalData.userInfo; + if(!UserInfo) { + getApp().goto("/pages/togoin/togoin"); + return false; + } + + getApp().request.promiseGet("/api/weshop/ad/list",{ + data:{store_id:os.stoid,enabled:1,pid:601} + }).then(res=>{ + if(res.data.code==0){ + self.setData({show_img:res.data.data[0].ad_code}); + } + }) + + var api="/api/weshop/users/getAddmoneyactDetails"; + if(options.type==1){ + api="/api/weshop/users/getBuyaddmoneyactDetails"; + } + + app.request.get(api, { data: { Id:options.id, - store_id:1, - user_id:6519826, + store_id:os.stoid, + user_id: UserInfo.user_id , }, success: function (res) { self.setData({ result: res.data.data }); - - console.log('33333333--->', ); + }, }); - - + // this.data.result.WriteOffCode }, - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, - + /** * 生命周期函数--监听页面显示 */ @@ -52,20 +69,6 @@ Page({ }, /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - - }, - - /** * 页面相关事件处理函数--监听用户下拉动作 */ onPullDownRefresh: function () { @@ -86,20 +89,100 @@ Page({ }, - onUse() { - - - if(this.data.showCode) { - this.setData({ - showCode: false - }); - } else { - this.setData({ - showCode: true - }); - - var qrcode = this.selectComponent("#qrcode"); //组件的id - qrcode.open(util.base64_encode(this.data.result.WriteOffCode + '|' + util.formatTime())); - }; - } + onUse() { + var qrcode = this.selectComponent("#qrcode"); //组件的id + var code=util.base64_encode(this.data.result.WriteOffCode + '|' + util.formatTime()); + var e={is_fw:1,val:code,code:this.data.result.WriteOffCode} + qrcode.open(e); + }, + + + bind_err:function(e){ + var _errImg = e.target.dataset.errorimg; + var _errObj = {}; + _errObj[_errImg] = "/miniapp/images/default_g_img.gif"; + this.setData(_errObj); + }, + + //-- 确定充值 -- + go_buy: function(e) { + + var money = e.target.dataset.money; + var advance = e.target.dataset.advance; + this.recharge(money, advance); + }, + //确定接口 + async recharge(money, advancek) { + console.log(money, "有进来吗银行卡", advancek); + var user_id = getApp().globalData.user_id; + var store_id = os.stoid; + var recharge_type = 6; + var buynum = 1; + console.log(money, "有进来吗预存劵", advancek, user_id, store_id ); + var e = this, + perpaid = ""; + await getApp().request.promiseGet("/api/weshop/users/getPay", { + data: { + account: money, + yucun_id: advancek, + user_id: user_id, + store_id: store_id, + recharge_type: recharge_type, + buynum: buynum , + } + }).then(res => { + console.log(res); + + + var msg = res.data.data; + var parentSn = msg.order_sn; + var store_id = os.stoid; + getApp().request.post("/api/weshop/order/pay/createRechargeOrder", { + data: { + parentSn: parentSn, + store_id: store_id + }, + success: function (su) { + console.log("su是什么",su); + var n=su.data.data; + console.log("su是什么", su); + + e.weixinPay(n, + function () { + e.jumpPaymentPage(); + }, function () { + getApp().showWarning("支付失败"); + }) + } + }) + }) + }, + //------支付成功页面-------- + jumpPaymentPage: function () { + wx.redirectTo({ + url:"msg/msg", + }); + }, + + //------调起支付框-------- + weixinPay: function (n, success, fail) { + wx.requestPayment({ + timeStamp: String(n.timeStamp), + nonceStr: n.nonceStr, + package: n.packageValue, + signType: n.signType, + paySign: n.paySign, + success: function (n) { + console.log(n), getApp().showSuccess("支付成功！"); + "function" == typeof success && success(); + wx.redirectTo({ + url: "../deposit/deposit" + }); + }, + fail: function (n) { + console.log(n), "requestPayment:fail" == n.errMsg ? getApp().showWarning("支付失败") : "requestPayment:fail cancel" == n.errMsg ? getApp().showWarning("您已取消支付") : getApp().showWarning("支付失败：" + n.errMsg.substr("requestPayment:fail ".length)), + "function" == typeof fail && fail(); + } + }); + }, }) \ No newline at end of file diff --git a/packageA/pages/chongzhiDetails/chongzhiDetails.wxml b/packageA/pages/chongzhiDetails/chongzhiDetails.wxml index ece0066..c4b2603 100644 --- a/packageA/pages/chongzhiDetails/chongzhiDetails.wxml +++ b/packageA/pages/chongzhiDetails/chongzhiDetails.wxml @@ -1,10 +1,10 @@ - - - - + + @@ -12,10 +12,17 @@ 你的美丽我来缔造 - + - - + + + + + + + + + {{item.GiveName}} @@ -23,23 +30,20 @@ 数量：{{item.Qty}} - - - + - - 立即使用 - - - - - - - 核销码：{{result.WriteOffCode}} - + + 立即充值 + + 立即使用 + 已核销 + + + diff --git a/packageA/pages/chongzhiDetails/chongzhiDetails.wxss b/packageA/pages/chongzhiDetails/chongzhiDetails.wxss index 9edcbd7..16ffd3f 100644 --- a/packageA/pages/chongzhiDetails/chongzhiDetails.wxss +++ b/packageA/pages/chongzhiDetails/chongzhiDetails.wxss @@ -79,6 +79,8 @@ text-align: center; } +.avatar image{ width: 100%; height: 100%;} + .icon-meirong2 { color: white; font-size: 64rpx; diff --git a/pages/user/deposit/prepaid/prepaid.js b/pages/user/deposit/prepaid/prepaid.js index c595141..01e5427 100644 --- a/pages/user/deposit/prepaid/prepaid.js +++ b/pages/user/deposit/prepaid/prepaid.js @@ -160,5 +160,10 @@ Page({ }) console.log("bb"); + }, + + go_detail:function(e){ + var id=e.currentTarget.dataset.id; + getApp().goto('/packageA/pages/chongzhiDetails/chongzhiDetails?id=' + id); } }) diff --git a/pages/user/deposit/prepaid/prepaid.wxml b/pages/user/deposit/prepaid/prepaid.wxml index 3c956e3..9732375 100644 --- a/pages/user/deposit/prepaid/prepaid.wxml +++ b/pages/user/deposit/prepaid/prepaid.wxml @@ -5,7 +5,7 @@ - + {{perpaid.ItemName}} 充{{perpaid.BeginSum}}送{{perpaid.NewSum}}元 充值送大礼 > @@ -13,7 +13,7 @@ 备注： {{perpaid.ItemName}} 立即充值 + data-advance="{{perpaid.AdvanceItemId}}" data-money="{{perpaid.NewSum}}">立即充值 立即充值 -- libgit2 0.21.4