From 2ade2e4e681774a5c0b2bf944e58bb6220fba80f Mon Sep 17 00:00:00 2001 From: Wik-T <812952667@qq.com> Date: Thu, 12 Jan 2023 14:38:38 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=962.0=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2=E6=B1=87=E8=81=94=E9=80=9A?= =?UTF-8?q?=E5=B7=A5=E4=BC=9A=E5=8D=A1=202.=E4=BC=98=E5=8C=962.0=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E4=B8=AD=E5=BF=83=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/goods/refuel-confirm/refuel-confirm.vue | 56 +++++++------- pages/order/confirmation.vue | 15 ++-- pages/user/news/news.vue | 73 ++++++++++-------- pages/user/order_details/order_details.vue | 8 +- qianzhu-KFC/confirmOrder/confirmOrder.vue | 24 +++--- qianzhu-KFC/order-details/order-details.vue | 4 +- qianzhu-KFC/static/imgs/desloca.png | Bin 904 -> 6447 bytes .../unionComfirmation/unionComfirmation.vue | 30 ++++--- 8 files changed, 112 insertions(+), 98 deletions(-) diff --git a/pages/goods/refuel-confirm/refuel-confirm.vue b/pages/goods/refuel-confirm/refuel-confirm.vue index d5e7ae0..c3e266b 100644 --- a/pages/goods/refuel-confirm/refuel-confirm.vue +++ b/pages/goods/refuel-confirm/refuel-confirm.vue @@ -170,7 +170,7 @@ 油卡支付余额: {{oilPirce}}元 - + @@ -182,20 +182,19 @@ - - - - - 车队油卡余额: {{oilUserNoPrice}}元 - - - - + + + + + 车队油卡余额: {{oilUserNoPrice}}元 + + + + - + 车队油卡列表 @@ -249,7 +248,7 @@ {{items.discountName}} - 有效期:{{items.salesEndTime | timeFormat('yyyy-mm-dd hh:mm:ss')}} + 有效期:{{items.useEndTime | timeFormat('yyyy-mm-dd hh:mm:ss')}} @@ -400,6 +399,7 @@ } this.canUseDiscount(); this.oilPriceDiscountCompute(); + this.getHuiLianTongCardBalance(); uni.setStorage({ key: "user", data: res.return_data @@ -680,10 +680,21 @@ return; } if (this.paytype == '3' || this.paytype == '6' || this.paytype == '7') { + let cardNo; + if (this.paytype == 3) { + cardNo = this.user.hltCardNo.cardNo; + } + if (this.paytype == 6) { + cardNo = this.user.oilCard.cardNo; + } + if (this.paytype == 7) { + cardNo = this.oilUserno; + } let params = { "orderNo": this.orderNo, - "cardNo": this.user.hltCardNo.cardNo, - "password": this.PaymentPassword + "cardNo": cardNo, + "password": this.PaymentPassword, + "carLicensePlate": this.cardNoNumber } cardPay(params).then(res => { uni.hideLoading(); @@ -743,7 +754,7 @@ }, //获取选择支付方式 changeRiado() { - if (!this.user.isSetOilCard) { + if (!this.user.setHltCard) { uni.showToast({ icon: 'none', title: '当前账号还未绑定,前往绑定', @@ -926,7 +937,7 @@ }) return; } - if (!that.user.isSetOilCard) { + if (!that.user.setHltCard) { uni.showToast({ icon: 'none', title: '当前账号还未绑定,前往绑定', @@ -960,7 +971,7 @@ }) return; } - if (!that.user.isSetHltCard) { + if (!that.user.isSetOilCard) { uni.showToast({ icon: 'none', title: '当前账号还未绑定,前往绑定', @@ -978,15 +989,6 @@ that.$refs.paymentPassword.modalFun('show'); } - if (that.paytype == 'jifen') { - if (!that.user.isSetPayPwd) { - uni.navigateTo({ - url: '../../login/updatePas/updatePas' - }) - return; - } - that.$refs.paymentPassword.modalFun('show'); - } }, payRequest: function(self) { diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue index 9729471..96e6d8b 100644 --- a/pages/order/confirmation.vue +++ b/pages/order/confirmation.vue @@ -656,7 +656,13 @@ }) } }) - } else if (that.paytype == '3') { + } else if (that.paytype == '3') { + if (!that.user.isSetPayPwd) { + uni.navigateTo({ + url: '../login/updatePas/updatePas' + }) + return; + } if (that.tongCardPrice < that.paytheprice) { uni.showToast({ icon: 'none', @@ -665,12 +671,7 @@ }); return; } - if (!that.user.isSetPayPwd) { - uni.navigateTo({ - url: '../login/updatePas/updatePas' - }) - return; - } + if (!that.user.isSetHltCard) { uni.showToast({ icon: 'none', diff --git a/pages/user/news/news.vue b/pages/user/news/news.vue index 42492ed..40e6dd3 100644 --- a/pages/user/news/news.vue +++ b/pages/user/news/news.vue @@ -13,7 +13,7 @@ - + 服务通知 @@ -36,7 +36,7 @@ {{item.title}} - + ¥{{item.content | msgFormat('price')}} 交易对象 @@ -47,8 +47,8 @@ 交易时间 {{item.content | msgFormat('time') }} - 查看详情 + 查看详情 + @@ -86,10 +86,7 @@ newsTyplist: [], //消息类型 newsList: [], // 信内容 newstypeid: 1, //类型id - headerTop: '0px', - pageNum: 1, - pageSize: 10, - isNoMoreData: false, + headerTop: '0px' } }, filters: { @@ -102,14 +99,12 @@ onLoad() { // #ifdef H5 this.headerTop = '44px'; - // #endif - }, - onShow() { + // #endif this.getDictionaryByCodeType(); }, - onReachBottom() { - this.getMsgByList(); - }, + // onShow() { + // this.getDictionaryByCodeType(); + // }, methods: { //查询类型 getDictionaryByCodeType() { @@ -126,37 +121,49 @@ }, //切换 changeValue(item) { - this.pageNum = 1; - this.newsList = []; - this.isNoMoreData = false; + this.newsList = []; this.getMsgByList(item); }, //查询列表 - getMsgByList(item) { + getMsgByList(item) { this.newstypeid = item; - if (this.isNoMoreData) { - uni.hideLoading() - return false; - } - let pagenum = this.pageNum; let datas = { companyId: app.globalData.companyId, - type: item, - pageNum: this.pageNum, - pageSize: this.pageSize + type: item } getMsgByList(datas).then(res => { - if (res.return_code == '000000' && res.return_data.list != '') { - this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true; - if (res.return_data.total == (this.pageNum * this.pageSize)) { - this.isNoMoreData = true; - } - this.newsList = this.newsList.concat(res.return_data.list); - this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum; + if (res.return_code == '000000' && res.return_data != '') { + this.newsList = res.return_data; } else { this.newsList = []; } }) + }, + //根据类型跳转详情 + jumpDetails(item1) { + let lists = JSON.parse(item1); + if (lists.productType == 1 || lists.productType == 2 || lists.productType == 3) { + uni.navigateTo({ + url: '/qianzhu-KFC/order-details/order-details?id=' + lists.orderNo + }) + } else { + uni.navigateTo({ + url: '/pages/user/order_details/order_details?id=' + lists.orderNo + }) + } + }, + //客服信息 + jumporther(item){ + if(item.jumpType == 2){ + uni.navigateTo({ + url: '/pages/tabBar/order/webUrl/webUrl?url=' + item.content + }) + } + if(item.jumpType == 3){ + uni.navigateTo({ + url:item.content + }) + } } } } diff --git a/pages/user/order_details/order_details.vue b/pages/user/order_details/order_details.vue index ac2009a..7324a18 100644 --- a/pages/user/order_details/order_details.vue +++ b/pages/user/order_details/order_details.vue @@ -54,7 +54,8 @@ 微信支付 积分兑换 汇联通工会卡 - 汇联通银联支付工会卡 + 嗨森逛个人油卡 + 嗨森逛车队油卡 地址 @@ -142,8 +143,11 @@ - + 加油实付 ¥{{recinfo.payRealPrice}} + + + 实付 ¥{{recinfo.payRealPrice}} diff --git a/qianzhu-KFC/confirmOrder/confirmOrder.vue b/qianzhu-KFC/confirmOrder/confirmOrder.vue index fc73f9f..8e8f418 100644 --- a/qianzhu-KFC/confirmOrder/confirmOrder.vue +++ b/qianzhu-KFC/confirmOrder/confirmOrder.vue @@ -450,14 +450,15 @@ result = result1.toFixed(2); }) - // let resul2 = 0; + let resul2 = 0; let result3 = 0; this.orderList.forEach((good) => { - result3 += this.accMul(good.num, good.oldprice) + resul2 += this.accMul(good.num, good.oldprice); + result3 = resul2.toFixed(2); this.disconutprice = (result3 - result).toFixed(2); }) - this.orderPrice = result3; + this.orderPrice = result3; this.totalprice = result; this.payPrice = result; }, @@ -807,7 +808,14 @@ }) } }) - } else if (that.paytype == '3') { + } else if (that.paytype == '3') { + if (!that.user.isSetPayPwd) { + uni.navigateTo({ + url: '../../pages/login/updatePas/updatePas' + }) + that.thirdCancelOrder(); + return; + } if (that.tongCardPrice < that.payPrice) { uni.showToast({ icon: 'none', @@ -817,13 +825,7 @@ that.thirdCancelOrder(); return; } - if (!that.user.isSetPayPwd) { - uni.navigateTo({ - url: '../../pages/login/updatePas/updatePas' - }) - that.thirdCancelOrder(); - return; - } + if (!that.user.isSetHltCard) { uni.showToast({ icon: 'none', diff --git a/qianzhu-KFC/order-details/order-details.vue b/qianzhu-KFC/order-details/order-details.vue index 29d1a09..6246753 100644 --- a/qianzhu-KFC/order-details/order-details.vue +++ b/qianzhu-KFC/order-details/order-details.vue @@ -11,10 +11,10 @@ - - + --> {{typeText[orderList.orderStatus]}} diff --git a/qianzhu-KFC/static/imgs/desloca.png b/qianzhu-KFC/static/imgs/desloca.png index 9cc9addac0434eec3417aef292a48f7b17d7e47c..a7c4fe1f1a3087ce591cc5e2781cbc76f5f854f4 100644 GIT binary patch literal 6447 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 JPDHLkV1janH-Z2F literal 904 zcmV;319$w1P)Px&LPRmdwzUg&*%9(&mLlq8|T==|AOn+SLB!uy$wJ$AZq|>5jjuAgNan4x$jI{Y^G#p z1icS$xgBCQ15yCsOPF#(D{4ixNgz)X_}NTx+YepG2LFrR1p0jb%s6p`RC(^r%WLm? z-uIZENIe0Pw5yZDhkK3>HTJ#6j7H!I_S+=|A?eSk? zYkqHt0s<`E;X%f7_ux>yQ9B&$-!CFNqLEN@dT_&2O#(PQ!K$+WYk%6^3fgU;BFu>t z^7oYjln;CShwg-6+=v9L(t;je`FDVMY+bPWQ4){zK64cAjdxoK;!4M_xbL$702)2z zUmS$+MWZu#?`#>K5=wYo%XS}0|48cv3^(^p#pG75#;uRvW8vYRvW9LdR2ZG1wX=cm z3HYEVRCNGAy`;oGIdXj}#&O$x(56y4Y3@1~_-ZF0T}Ef{x!J%%0PW7)%)Ki=_HU$3 zl~`w-4l;FH@2*f+^5Wm;zJIfbY^QYGjsw=^Fl2fGy6Y*)Og9p!7*9inzOCO2g zYsU3X!#F;k_F=DBQQ};<*jWRLN2|$KsU7csAyWXN<8h+{UoccHz&l2M9lH5%bmy- zsCoh(5$SdTTO*OsH4B{vy$_Y;!=_FNq>*vwJBHD8^{?ZX-6Af&0;old+o#9Z7MEwM zl - + @@ -644,8 +644,8 @@ title: '支付成功' }) uni.reLaunch({ - url: '../Phone-recharge-details/Phone-recharge-details?id=' + - that.orderId + url: '../../pages/user/order_details/order_details?id=' + + this.orderId }) }, fail: function(err) { @@ -668,7 +668,13 @@ }) } }) - } else if (that.paytype == '3') { + } else if (that.paytype == '3') { + if (!that.user.isSetPayPwd) { + uni.navigateTo({ + url: '../../pages/login/updatePas/updatePas' + }) + return; + } if (that.tongCardPrice < that.payPrice) { uni.showToast({ icon: 'none', @@ -677,12 +683,7 @@ }); return; } - if (!that.user.isSetPayPwd) { - uni.navigateTo({ - url: '../../pages/login/updatePas/updatePas' - }) - return; - } + if (!that.user.isSetHltCard) { uni.showToast({ icon: 'none', @@ -739,8 +740,7 @@ if (res.return_code == '000000') { this.orderId = res.return_data.orderNo; uni.reLaunch({ - url: '../Phone-recharge-details/Phone-recharge-details?id=' + - this.orderId + url: '../../pages/user/order_details/order_details?id=' + this.orderId }) return; } @@ -770,8 +770,7 @@ title: '支付成功' }) uni.reLaunch({ - url: '../Phone-recharge-details/Phone-recharge-details?id=' + - this.orderId + url: '../../pages/user/order_details/order_details?id=' + this.orderId }) return; } @@ -825,8 +824,7 @@ title: '支付成功' }) uni.reLaunch({ - url: '../Phone-recharge-details/Phone-recharge-details?id=' + - that.orderId + url: '../../pages/user/order_details/order_details?id=' +that.orderId }) }, cancel: function(r) {