From 3e4e4f78b7207a2caa1c6b29b1ceeb47b6d4df6c Mon Sep 17 00:00:00 2001 From: Wik-T <812952667@qq.com> Date: Fri, 18 Feb 2022 09:35:00 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=85=85=E5=80=BC=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E7=9A=84=E5=80=BC=202.=E4=BF=AE=E6=94=B9=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/confirmation.vue | 35 +++-- pages/tabBar/user/user.vue | 8 +- pages/user/deposit/deposit.vue | 42 ++--- .../mineCouponsDestails.vue | 43 +++--- pages/user/minePromotion/minePromotion.vue | 14 +- .../unionComfirmation/unionComfirmation.vue | 145 +++++++++--------- 6 files changed, 156 insertions(+), 131 deletions(-) diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue index 8bf7691..85814af 100644 --- a/pages/order/confirmation.vue +++ b/pages/order/confirmation.vue @@ -90,8 +90,8 @@ - - 支付方式 + + 支付方式 积分充值 @@ -227,8 +227,8 @@ jumpType: '', tongCardPrice: 0, storeId: '', - isDiscont: false, - coupondiscountid:'' + isDiscont: false, + coupondiscountid: '' }; }, @@ -310,14 +310,14 @@ }, radioChanges(item) { if (this.memDiscountId == item.highDiscount.id) { // 如果已经选中，则取消选中 - this.memDiscountId = ''; + this.memDiscountId = ''; this.coupondiscountid = ''; this.paytheprice = this.couponList.discountPrice; this.deductionPrice = '0.00'; this.isDiscont = false; } else { // 否则进行选中赋值 this.isDiscont = true; - this.memDiscountId = item.highDiscount.id; + this.memDiscountId = item.highDiscount.id; this.coupondiscountid = item.id; if (item.highDiscount.discountType == 1) { //满减价格 @@ -731,7 +731,13 @@ duration: 4000 }); }); - }, + }, + //跳转积分充值 + jumpdeposits(){ + uni.navigateTo({ + url:'../user/deposit/deposit' + }) + } } } @@ -917,7 +923,7 @@ align-items: center; .sum { - width: 50%; + width: 68%; font-size: 18px; margin-right: 10upx; display: flex; @@ -930,7 +936,7 @@ } .btn { - padding: 0 50rpx; + padding: 0 45rpx; height: 80rpx; background-color: #0083f5; color: #fff; @@ -943,6 +949,17 @@ } } + .jfrecharge { + background-color: #0083f5; + padding: 5px 20rpx; + color: #fff; + margin-left: 50%; + justify-content: center; + align-items: center; + font-size: 30rpx; + border-radius: 40rpx; + } + .goods-list { width: 100%; padding: 0; diff --git a/pages/tabBar/user/user.vue b/pages/tabBar/user/user.vue index aff063f..530bfb8 100644 --- a/pages/tabBar/user/user.vue +++ b/pages/tabBar/user/user.vue @@ -24,18 +24,18 @@ diff --git a/pages/user/deposit/deposit.vue b/pages/user/deposit/deposit.vue index 32078e1..9d376aa 100644 --- a/pages/user/deposit/deposit.vue +++ b/pages/user/deposit/deposit.vue @@ -36,17 +36,6 @@ - @@ -85,11 +74,11 @@ data() { return { inputAmount: '', //金额 - amountList: [10, 50, 100], //预设3个可选快捷金额 + amountList: [100, 200, 300, 500, 800, 1000], //预设3个可选快捷金额 paytype: 'wxpay', //支付类型 user: "", imagewxUrl: app.globalData.imageWxImg, - imgadres:'wxpay.png' + imgadres: 'wxpay.png' }; }, onLoad() { @@ -126,7 +115,7 @@ title: '正在提交订单...' }) let goods = { - "identificationCode":app.globalData.identificationCode, + "identificationCode": app.globalData.identificationCode, "highChildOrderList": [{ "goodsType": 2, "goodsId": app.globalData.userInfo.id, @@ -214,10 +203,10 @@ jweixin.chooseWXPay({ appId: self.return_data.appId, timestamp: self.return_data - .timeStamp, // 支付签名时间戳，注意微信jssdk中的所有使用timestamp字段均为小写。但最新版的支付后台生成签名使用的timeStamp字段名需大写其中的S字符 + .timeStamp, // 支付签名时间戳，注意微信jssdk中的所有使用timestamp字段均为小写。但最新版的支付后台生成签名使用的timeStamp字段名需大写其中的S字符 nonceStr: self.return_data.nonceStr, // 支付签名随机串，不长于 32 位 package: self.return_data - .package, // 统一支付接口返回的prepay_id参数值，提交格式如：prepay_id=***） + .package, // 统一支付接口返回的prepay_id参数值，提交格式如：prepay_id=***） signType: 'MD5', // 签名方式，默认为'SHA1'，使用新版支付需传入'MD5' paySign: self.return_data.sign, // 支付签名 success: function(res) { @@ -271,19 +260,22 @@ width: 100%; .list { - display: flex; + display: flow-root; justify-content: space-between; padding: 20upx 0; .box { width: 30%; - height: 120upx; + height: 120rpx; + float: left; + margin-left: 3.333%; + margin-top: 20px; display: flex; justify-content: center; align-items: center; - border-radius: 10upx; - box-shadow: 0upx 5upx 20upx rgba(0, 0, 0, 0.05); - font-size: 36upx; + border-radius: 10rpx; + box-shadow: 0rpx 5rpx 20rpx rgba(0, 0, 0, 0.05); + font-size: 36rpx; background-color: #f1f1f1; color: 333; @@ -295,14 +287,14 @@ } .num { - margin-top: 10upx; + margin-top: 20upx; display: flex; justify-content: flex-end; align-items: center; .text { padding-right: 10upx; - font-size: 30upx; + font-size: 40upx; } .input { @@ -315,7 +307,7 @@ input { margin: 0 20upx; height: 60upx; - font-size: 30upx; + font-size: 40upx; color: #0083f5; justify-content: flex-end; align-items: center; @@ -395,4 +387,4 @@ } } } - + diff --git a/pages/user/mineCouponsDestails/mineCouponsDestails.vue b/pages/user/mineCouponsDestails/mineCouponsDestails.vue index cc7c5de..ea02994 100644 --- a/pages/user/mineCouponsDestails/mineCouponsDestails.vue +++ b/pages/user/mineCouponsDestails/mineCouponsDestails.vue @@ -43,13 +43,16 @@ - 视频教程 + + 临时通知 + + - @@ -72,14 +75,15 @@ imagewxUrl: app.globalData.imageWxImg, imgadres: 'noorder.png', imagedess1: '/CMS/html/11641540903873.mp4', + imagedess2: '/CMS/html/notice1.png', pageNum: 1, pageSize: 10, isNoMoreData: false, couponsDetails: '', salesEndTime: '', couponId: '', - videourl: '' ,//视频地址 - isplayvideo: false //视频播放 + videourl: '', //视频地址 + isplayvideo: false //视频播放 } }, filters: { @@ -150,10 +154,10 @@ // uni.navigateTo({ // url: '../../goods/goods?id='+e // }); - }, - //播放视频 - playvideo(){ - this.isplayvideo = true; + }, + //播放视频 + playvideo() { + this.isplayvideo = true; } } } @@ -226,16 +230,17 @@ background-color: red; color: #FFFFFF; border-radius: 0px; - } - .btnplay{ - width: 120px; - text-align: center; - height: 40px; - line-height: 40px; - color: #FFFFFF; - background-color: #089bf5; - border-radius: 5px; - margin-left: 5%; - margin-top: 20px; + } + + .btnplay { + width: 120px; + text-align: center; + height: 40px; + line-height: 40px; + color: #FFFFFF; + background-color: #089bf5; + border-radius: 5px; + margin-left: 5%; + margin-top: 20px; } diff --git a/pages/user/minePromotion/minePromotion.vue b/pages/user/minePromotion/minePromotion.vue index a07bf28..350abac 100644 --- a/pages/user/minePromotion/minePromotion.vue +++ b/pages/user/minePromotion/minePromotion.vue @@ -18,12 +18,12 @@ 今日流水 - + @@ -100,7 +100,7 @@ - + @@ -267,11 +267,15 @@ couponList:[], //兑换码数据 couponCont:[], //卡券数据 tabs: ["销售码", "兑换码"], //切换操作 - current: 0, //默认 + current: 1, //默认 } }, onLoad() { - this.getAgentCount(1); + // this.getAgentCount(1); + // this.getAgentConvertCodeCount(); + }, + onShow() { + this.getAgentCount(1); this.getAgentConvertCodeCount(); }, methods: { diff --git a/subPages/unionComfirmation/unionComfirmation.vue b/subPages/unionComfirmation/unionComfirmation.vue index 0bee959..7bea7b2 100644 --- a/subPages/unionComfirmation/unionComfirmation.vue +++ b/subPages/unionComfirmation/unionComfirmation.vue @@ -80,7 +80,7 @@ - + @@ -181,8 +181,8 @@ rechargeModel: '', agentKey: '', objectId: '', - OrderPreList: [], - reType:'' //充值类型 + OrderPreList: [], + reType: '' //充值类型 }; }, @@ -193,8 +193,8 @@ this.rechargeContent = options.rechargeContent; this.rechargeModel = options.rechargeModel; this.agentKey = options.agentKey; - this.objectId = options.objectId; - this.reType = options.rechargeType; + this.objectId = options.objectId; + this.reType = options.rechargeType; }, onShow() { let that = this; @@ -269,7 +269,7 @@ if (item.discountType == 1) { //满减价格 this.deductionPrice = item.discountPrice; - this.payPrice = this.paytheprice- this.deductionPrice; + this.payPrice = this.paytheprice - this.deductionPrice; } else if (item.discountType == 2) { //抵扣价格 @@ -319,8 +319,9 @@ } }); }, - toPay() { - if (this.paytype == '') { + toPay() { + let that = this; + if (that.paytype == '') { uni.showToast({ title: '请选择支付方式', icon: 'none', @@ -328,36 +329,42 @@ }) return; } - uni.showLoading({ - title: '提交订单中...' - }) - let params = { - "memDiscountId": this.memDiscountId, - "orderPrice": this.orderPrice, - "payPrice": this.payPrice, - "rechargeContent": this.rechargeContent, - "rechargeModel": this.rechargeModel, - "agentKey": this.agentKey, - "objectId": this.objectId, - "identificationCode": app.globalData.identificationCode - } - addOrderPay(params).then(res => { - if (res.return_code == '000000') { - uni.hideLoading(); - this.orderId = res.return_data.id; + uni.requestSubscribeMessage({ + tmplIds: ['ZO6kC3oJv0zj9QzL0htsF-mM9vAElcgPZEcUGglxsoU'], + success(res) { + uni.showLoading({ + title: '提交订单中...' + }) let params = { - "orderId": res.return_data.id, - "openId": app.globalData.openId + "memDiscountId": that.memDiscountId, + "orderPrice": that.orderPrice, + "payPrice": that.payPrice, + "rechargeContent": that.rechargeContent, + "rechargeModel": that.rechargeModel, + "agentKey": that.agentKey, + "objectId": that.objectId, + "identificationCode": app.globalData.identificationCode } - this.orderToUNionPay(params); - } else { - uni.hideLoading(); - uni.showToast({ - title: res.return_msg, - icon: 'none', - duration: 2000 - }); - } + addOrderPay(params).then(res => { + if (res.return_code == '000000') { + uni.hideLoading(); + that.orderId = res.return_data.id; + let params = { + "orderId": res.return_data.id, + "openId": app.globalData.openId + } + that.orderToUNionPay(params); + } else { + uni.hideLoading(); + uni.showToast({ + title: res.return_msg, + icon: 'none', + duration: 2000 + }); + } + }) + }, + fail(res) {}, }) }, //获取选择支付方式 @@ -432,21 +439,21 @@ }) } }) - } else if (that.paytype == 'jinbi') { - if (that.user.gold < that.payPrice * 100) { - uni.showToast({ - icon: 'none', - title: '积分不足', - duration: 2000, - success() { - setTimeout(() => { - uni.navigateTo({ - url: '../../pages/user/deposit/deposit' - }) - }, 1000) - } - }); - return; + } else if (that.paytype == 'jinbi') { + if (that.user.gold < that.payPrice * 100) { + uni.showToast({ + icon: 'none', + title: '积分不足', + duration: 2000, + success() { + setTimeout(() => { + uni.navigateTo({ + url: '../../pages/user/deposit/deposit' + }) + }, 1000) + } + }); + return; } if (!that.user.isSetPayPwd) { uni.navigateTo({ @@ -455,14 +462,14 @@ return; } that.$refs.paymentPassword.modalFun('show'); - } else if (that.paytype == 'gonghuika') { - if (that.tongCardPrice < that.payPrice) { - uni.showToast({ - icon: 'none', - title: '工会卡余额不足', - duration: 2000, - }); - return; + } else if (that.paytype == 'gonghuika') { + if (that.tongCardPrice < that.payPrice) { + uni.showToast({ + icon: 'none', + title: '工会卡余额不足', + duration: 2000, + }); + return; } if (!that.user.isSetPayPwd) { uni.navigateTo({ @@ -541,16 +548,16 @@ "orderId": this.orderId, "cardNo": this.user.hltCardNo.cardNo, "password": this.PaymentPassword - } + } hltUnionCardPayUnion(params).then(res => { uni.hideLoading(); - if (res.return_code == '000000') { - uni.showToast({ - title: '支付成功' - }) - uni.reLaunch({ - url: '../Phone-recharge-details/Phone-recharge-details?id=' + - this.orderId + if (res.return_code == '000000') { + uni.showToast({ + title: '支付成功' + }) + uni.reLaunch({ + url: '../Phone-recharge-details/Phone-recharge-details?id=' + + this.orderId }) return; } @@ -562,8 +569,8 @@ } uni.showToast({ title: res.return_msg, - icon: 'none', - duration:2000 + icon: 'none', + duration: 2000 }) })