From a9adb4f5f4628321eed16852f15ae1a54752ba20 Mon Sep 17 00:00:00 2001 From: Wik-T <812952667@qq.com> Date: Wed, 2 Nov 2022 14:30:16 +0800 Subject: [PATCH 1/6] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E9=A2=86=E5=88=B8?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 ++- pages/goods/externalCoupon/externalCoupon.vue | 14 +++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index cd00a03..8732631 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ unpackage/ -.hbuilderx/launch.json \ No newline at end of file +.hbuilderx/launch.json +node_modules \ No newline at end of file diff --git a/pages/goods/externalCoupon/externalCoupon.vue b/pages/goods/externalCoupon/externalCoupon.vue index e46c9a3..df421d3 100644 --- a/pages/goods/externalCoupon/externalCoupon.vue +++ b/pages/goods/externalCoupon/externalCoupon.vue @@ -16,7 +16,12 @@ - + + 去使用 @@ -109,9 +114,9 @@ } else { this.userInfo = 1; } - }, - fail() { - this.userInfo = 1; + }, + fail() { + this.userInfo = 1; } }); @@ -334,7 +339,6 @@ } .coupne-btn { - background-color: red; color: #FFFFFF; } From 5792bde6060c0b1b30e99c2751a85fbf2f52ee7a Mon Sep 17 00:00:00 2001 From: Wik-T <812952667@qq.com> Date: Fri, 18 Nov 2022 15:26:00 +0800 Subject: [PATCH 2/6] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=9C=8D?= =?UTF-8?q?=E7=94=B5=E8=AF=9D=E6=96=87=E6=A1=88=202.=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=AE=9A=E4=BD=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/goods/externalCoupon/externalCoupon.vue | 25 ++-- pages/order/confirmation.vue | 49 +++---- pages/tabBar/category/category.vue | 6 +- pages/tabBar/home/home.vue | 121 +++++++++++------- pages/tabBar/user/user.vue | 6 +- 5 files changed, 122 insertions(+), 85 deletions(-) diff --git a/pages/goods/externalCoupon/externalCoupon.vue b/pages/goods/externalCoupon/externalCoupon.vue index df421d3..f7b19dd 100644 --- a/pages/goods/externalCoupon/externalCoupon.vue +++ b/pages/goods/externalCoupon/externalCoupon.vue @@ -17,11 +17,11 @@ - + v-if="userInfo != 1 && couponsDetails.highDiscountAgentCode.status == 1" + @click="receiveDiscount">点击领取 + 去使用 @@ -261,9 +261,18 @@ //商品跳转 toGoods(e) { if (app.globalData.userInfo) { - uni.navigateTo({ - url: '../../order/confirmation?id=' + e - }) + if (app.globalData.openId) { + uni.navigateTo({ + url: '../../order/confirmation?id=' + e + }) + } else { + uni.showToast({ + icon: 'none', + title: '网络异常，请稍后重试', + duration: 2000 + }) + } + } else { uni.showToast({ icon: 'none', diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue index 5903071..502c77d 100644 --- a/pages/order/confirmation.vue +++ b/pages/order/confirmation.vue @@ -87,14 +87,14 @@ - - - - 邀请码 - - - - + + + + 邀请码 + + + + @@ -103,6 +103,18 @@ + + + 微信支付 + + + + + + + @@ -115,18 +127,7 @@ - - - 微信支付 - - - - - - + v-if="couponList.payType == 1 || couponList.payType == 2 || couponList.payType==3"> 汇联通工会卡可用余额: {{tongCardPrice}}元 @@ -138,8 +139,8 @@ - - + + + + + + + 车队油卡余额: {{oilUserNoPrice}}元 + + + + + + + + 车队油卡列表 + + + + {{item.cardNo}}({{item.contactName}}) + + + + + + + + 车牌号 + + + + + + 11111{{cardNoNumber}} + + + + + + 重要说明 @@ -239,7 +280,10 @@ addOrder, cancelOrder, oilPriceDiscountCompute, - getRebateIntegral + getRebateIntegral, + getUserCardList, + fleetOilCardPay, + getCardListByCardNo } from '../../../Utils/Api.js'; import ssPaymentPassword from '../../../components/sanshui-payment-password/index.vue'; import wybPopup from '../../../components/wyb-popup/wyb-popup.vue'; @@ -278,7 +322,13 @@ availIntegal: 0, // 可用积分 gasOrderList: '', //存的订单信息 rebateIntegral: '', //返回积分 - Integrastu: 1 //返积分状态 + Integrastu: 1, //返积分状态 + oilUserCardlist: '', //油卡列表 + oilUserno: '', //油卡卡号 + contactName: '', //油卡联系人 + oilUserNoPrice: '', //油卡余额 + UserCard: '', //车牌号列表 + cardNoNumber: '', // 车牌号 } }, onLoad(e) { @@ -292,6 +342,7 @@ this.priceValue[1] = 0; this.reload(); this.calculatepayPrice(); + this.getUserCardList(); }, methods: { findUser() { @@ -312,6 +363,40 @@ } }); }, + //查询油卡包列表 + getUserCardList() { + let datas = { + type: 3 + } + getUserCardList(datas).then(res => { + if (res.return_code == '000000') { + this.oilUserCardlist = res.return_data; + this.oilUserno = res.return_data[0].cardNo; + this.contactName = res.return_data[0].contactName; + this.oilUserNoPrice = res.return_data[0].balance; + this.getCardListByCardNo(res.return_data[0].cardNo); + } + }); + }, + //查询车牌号列表 + getCardListByCardNo(item) { + let datas = { + cardNo: item + } + getCardListByCardNo(datas).then(res => { + if (res.return_code == '000000' && res.return_data != '') { + this.UserCard = res.return_data; + this.cardNoNumber = res.return_data[0].carLicensePlate; + } else { + this.UserCard = ''; + this.cardNoNumber = ''; + } + }); + }, + //选择车牌号 + bindUserCard(e) { + this.cardNoNumber = this.UserCard[e.target.value].carLicensePlate; + }, //支付返利积分 getRebateIntegral() { let datas = { @@ -442,7 +527,7 @@ this.payPrice = Math.abs(parseFloat(this.orderPrice - (parseFloat(this.priceValue[1] / 100).toFixed( 2)) - this .deductionPrice).toFixed(2)); - } + } this.getRebateIntegral(); }, rechangeload() { @@ -476,7 +561,7 @@ this.paytype = ''; } else { this.isUse = true; - } + } this.getRebateIntegral(); }, @@ -550,12 +635,15 @@ }) return; } - if (this.paytype == 'jifen') { + if (this.paytype == 'fleettruck') { let params = { "orderId": this.orderNo, - "password": this.PaymentPassword + "password": this.PaymentPassword, + "cardNo": this.oilUserno, + "carLicensePlate": this.cardNoNumber, + } - orderToGoldPay(params).then(res => { + fleetOilCardPay(params).then(res => { uni.hideLoading(); if (res.return_code == '000000') { uni.showToast({ @@ -674,6 +762,13 @@ }) }, + //车队油卡 + changeRiado1(item) { + this.oilUserno = item.cardNo; + this.contactName = item.contactName; + this.oilUserNoPrice = item.balance; + this.getCardListByCardNo(item.cardNo); + }, //获取选择支付方式 changeRiado() { // if (!this.user.isSetHltCard && this.paytype == 'gonghuika') { @@ -735,10 +830,28 @@ }) return; } - if (this.orderNo) { - this.orderToPay(); + // if (this.orderNo) { + // this.orderToPay(); + // return; + // } + + if (this.paytype == 'fleettruck') { + let that = this; + uni.showModal({ + title: '温馨提示', + content: '是否使用当前 ' + that.contactName + ' 车队油卡', + success: function(res) { + if (res.confirm) { + that.addorders(); + } + } + }) return; } + this.addorders(); + }, + //下单整合 + addorders() { uni.showLoading({ title: '提交订单中...' }) @@ -881,6 +994,15 @@ that.$refs.paymentPassword.modalFun('show'); } + if (that.paytype == 'fleettruck') { + if (!that.user.isSetPayPwd) { + uni.navigateTo({ + url: '../../login/updatePas/updatePas' + }) + return; + } + that.$refs.paymentPassword.modalFun('show'); + } if (that.paytype == 'oilcard') { if (!that.user.isSetPayPwd) { uni.navigateTo({ @@ -1084,4 +1206,18 @@ // margin-left: 10px; } } + + .username { + width: calc(100% - 100upx); + height: 100upx; + display: flex; + align-items: center; + border-bottom: 1px solid #f6f6f6; + padding: 8upx 20upx; + + .namecont { + color: #666666; + width: 28%; + } + } From ddb554c491d808dd7e819cc00959ef1a6a236f7e Mon Sep 17 00:00:00 2001 From: Wik-T <812952667@qq.com> Date: Fri, 30 Dec 2022 09:38:57 +0800 Subject: [PATCH 5/6] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E5=AE=9E=E7=89=A9?= =?UTF-8?q?=E5=95=86=E5=93=81=202.=E6=96=B0=E5=A2=9E=E8=BD=A6=E9=98=9F?= =?UTF-8?q?=E6=B2=B9=E5=8D=A1=E6=94=AF=E4=BB=98=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/goods/refuel-confirm/refuel-confirm.vue | 2 +- pages/order/confirmation.vue | 29 +- pages/user/order_details/order_details.vue | 356 ++++++++++-------- .../coupon-packge-details.vue | 2 +- subPages/lottery/lottery.vue | 6 +- 5 files changed, 225 insertions(+), 170 deletions(-) diff --git a/pages/goods/refuel-confirm/refuel-confirm.vue b/pages/goods/refuel-confirm/refuel-confirm.vue index 27894f4..ebb1c92 100644 --- a/pages/goods/refuel-confirm/refuel-confirm.vue +++ b/pages/goods/refuel-confirm/refuel-confirm.vue @@ -369,7 +369,7 @@ type: 3 } getUserCardList(datas).then(res => { - if (res.return_code == '000000') { + if (res.return_code == '000000' && res.return_data !='') { this.oilUserCardlist = res.return_data; this.oilUserno = res.return_data[0].cardNo; this.contactName = res.return_data[0].contactName; diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue index 61dbb4c..506154f 100644 --- a/pages/order/confirmation.vue +++ b/pages/order/confirmation.vue @@ -95,6 +95,23 @@ + + + + 联系人 + + + + 联系电话 + + + + 联系地址 + + + + + @@ -244,7 +261,10 @@ coupondiscountid: '', orderDetails: '', //订单详情 payGold: '', //积分数 - identificationCode: '' //渠道商 + identificationCode: '', //渠道商 + contactPepole: '', //联系人 + contactPhone: '', //联系电话 + contactAddress: '' //联系地址 }; }, onLoad(option) { @@ -458,7 +478,12 @@ "goodsId": this.couponId, "saleCount": 1, "storeId": this.storeId - }] + }], + "postData": { + "address": this.contactAddress, + "user": this.contactPepole, + "phone": this.contactPhone + } } addOrder(goods).then(res => { uni.hideLoading(); diff --git a/pages/user/order_details/order_details.vue b/pages/user/order_details/order_details.vue index bb691f8..dcf699e 100644 --- a/pages/user/order_details/order_details.vue +++ b/pages/user/order_details/order_details.vue @@ -14,9 +14,11 @@ - + - + {{rec.goodsName}} @@ -73,9 +75,9 @@ 混合 - - - 油卡 + + + 油卡 @@ -97,9 +99,9 @@ 银联支付 - - - 嗨森逛油卡 + + + 嗨森逛油卡 @@ -110,8 +112,7 @@ ￥{{recinfo.totalPrice}} - + {{(recinfo.totalPrice * 10 * 10).toFixed(0)}} @@ -123,8 +124,7 @@ ￥{{recinfo.payPrice}} - + {{(recinfo.payPrice* 10 * 10).toFixed(0)}} @@ -136,8 +136,7 @@ ￥{{recinfo.payRealPrice}} - + {{(recinfo.payRealPrice * 10 * 10).toFixed(0)}} @@ -149,18 +148,17 @@ ￥{{recinfo.deductionPrice}} - + {{(recinfo.deductionPrice * 10 * 10).toFixed(0)}} - - - - 积分抵扣 : - - - ￥{{(recinfo.payGold / 100).toFixed(2)}} - + + + + 积分抵扣 : + + + ￥{{(recinfo.payGold / 100).toFixed(2)}} + @@ -193,112 +191,135 @@ {{recinfo.refusalRefundContent}} - - - - 完成时间 : - - - {{recinfo.finishTime | formatDate('-')}} - - - - - 预约订单详情 - - - - 预约状态 : - - - 预约中 - - - 预约成功 - - - 预约完成 - - - 预约失败 - - - 预约取消 - - + - 预约订单号 : + 联系人 : - {{preByOrderInfo.preOrderNo}} + {{materialData.user}} - + - 预约门店 : + 联系电话 : - {{preByOrderInfo.opUserName}} + {{materialData.phone}} - + - 到店地点 : + 联系地址 : - {{preByOrderInfo.reachAddress}} - - - - - 到店时间 : - - - {{preByOrderInfo.reachTime | formatDate('-')}} - - - - - 预约失败说明 : + {{materialData.address}} - - {{preByOrderInfo.statusFailDesc}} - - - - - 预约取消说明 : - - - {{preByOrderInfo.statusCancelDesc}} - - - - - 预约备注 : - - - {{preByOrderInfo.preUserRemark}} - - - - - - - - 预约完成 - - - + + + + 完成时间 : + + + {{recinfo.finishTime | formatDate('-')}} + + + + + 预约订单详情 + + + + 预约状态 : + + + 预约中 + + + 预约成功 + + + 预约完成 + + + 预约失败 + + + 预约取消 + + + + + 预约订单号 : + + + {{preByOrderInfo.preOrderNo}} + + + + + 预约门店 : + + + {{preByOrderInfo.opUserName}} + + + + + 到店地点 : + + + {{preByOrderInfo.reachAddress}} + + + + + 到店时间 : + + + {{preByOrderInfo.reachTime | formatDate('-')}} + + + + + 预约失败说明 : + + + {{preByOrderInfo.statusFailDesc}} + + + + + 预约取消说明 : + + + {{preByOrderInfo.statusCancelDesc}} + + + + + 预约备注 : + + + {{preByOrderInfo.preUserRemark}} + + + + + + + + 预约完成 + + + 合计: ￥{{recinfo.payPrice}} - + {{recinfo.payPrice*100}} @@ -312,8 +333,8 @@