From 850d7c9ad93eb155f67ccf1b379cf59e9affcdbc Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Wed, 16 Mar 2022 09:31:01 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=9B=A2=E6=B2=B9=E8=AE=A1?=
=?UTF-8?q?=E7=AE=97=E6=96=B9=E5=BC=8F=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=9B=A2?=
=?UTF-8?q?=E6=B2=B9=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F=E7=A7=AF=E5=88=86?=
=?UTF-8?q?=E6=94=AF=E4=BB=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 16 ++++++++--------
pages/goods/refuel-confirm/refuel-confirm.vue | 18 ++++++++++++++----
pages/goods/refuel-details/refuel-details.vue | 10 +++++++++-
pages/order/confirmation.vue | 12 +++++++++---
pages/user/order_details/order_details.vue | 8 ++++----
pages/user/order_list/order_list.vue | 2 +-
6 files changed, 45 insertions(+), 21 deletions(-)
diff --git a/App.vue b/App.vue
index c50acc1..eb2a24c 100644
--- a/App.vue
+++ b/App.vue
@@ -5,15 +5,15 @@
// brestUrl: 'http://192.168.3.4:9302/brest',
// imgUrl: 'https://192.168.3.4:9301/filesystem/',
//正式
- // url: 'https://hsg.dctpay.com/crest',
- // imgUrl: 'https://hsg.dctpay.com/filesystem/',
- // brestUrl : 'https://hsg.dctpay.com/brest',
- // imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/',
+ url: 'https://hsg.dctpay.com/crest',
+ imgUrl: 'https://hsg.dctpay.com/filesystem/',
+ brestUrl : 'https://hsg.dctpay.com/brest',
+ imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/',
//测试
- url: 'https://hsgcs.dctpay.com/crest',
- brestUrl : 'https://hsgcs.dctpay.com/brest',
- imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
- imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/',
+ // url: 'https://hsgcs.dctpay.com/crest',
+ // brestUrl : 'https://hsgcs.dctpay.com/brest',
+ // imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
+ // imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/',
userInfo: "",
brestUserInfo : '',
openId: '',
diff --git a/pages/goods/refuel-confirm/refuel-confirm.vue b/pages/goods/refuel-confirm/refuel-confirm.vue
index 2ebcbdf..59cb8ef 100644
--- a/pages/goods/refuel-confirm/refuel-confirm.vue
+++ b/pages/goods/refuel-confirm/refuel-confirm.vue
@@ -36,7 +36,7 @@
支付方式
-
+
+
+
+
+
+ 积分支付
+
+
+
+
+
-
+
重要说明
diff --git a/pages/goods/refuel-details/refuel-details.vue b/pages/goods/refuel-details/refuel-details.vue
index 8d5f6c6..c229ded 100644
--- a/pages/goods/refuel-details/refuel-details.vue
+++ b/pages/goods/refuel-details/refuel-details.vue
@@ -284,12 +284,20 @@
},
//失去焦点算价格和油升
Listeningfocus() {
+ //原来计算方式
this.litre = parseFloat(this.inputMoney / this.priceOfficial).toFixed(2);
this.totalPrice = parseFloat(this.inputMoney / this.priceOfficial * this.priceVip).toFixed(2);
if (this.priceVip != this.priceOfficial) {
let gbprice = parseFloat(this.litre * this.priceOfficial).toFixed(2);
- this.discountPrice = parseFloat(gbprice - this.totalPrice).toFixed(0);
+ this.discountPrice = parseFloat(gbprice - this.totalPrice).toFixed(1);
}
+ //目前计算方式
+ // this.litre = parseFloat(this.inputMoney / this.priceGun).toFixed(2);
+ // this.totalPrice = parseFloat(this.inputMoney / this.priceGun * this.priceVip).toFixed(2);
+ // if (this.priceVip != this.priceGun) {
+ // let gbprice = parseFloat(this.litre * this.priceGun).toFixed(2);
+ // this.discountPrice = parseFloat(gbprice - this.totalPrice).toFixed(0);
+ // }
},
//跳转手机授权
jumpPhone(){
diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue
index 5f679f4..467c15d 100644
--- a/pages/order/confirmation.vue
+++ b/pages/order/confirmation.vue
@@ -228,7 +228,8 @@
tongCardPrice: 0,
storeId: '',
isDiscont: false,
- coupondiscountid: ''
+ coupondiscountid: '',
+ orderDetails:'' //订单详情
};
},
@@ -414,7 +415,11 @@
duration: 2000
})
return;
- }
+ }
+ if(this.orderDetails){
+ this.orderToPay(this.orderDetails);
+ return;
+ }
uni.showLoading({
title: '提交订单中...'
})
@@ -441,7 +446,8 @@
// .highChildOrderList[0].ext1
// })
this.jumpType = res.return_data.highChildOrderList[0].ext1;
- this.orderId = res.return_data.id;
+ this.orderId = res.return_data.id;
+ this.orderDetails = res.return_data;
this.orderToPay(res.return_data);
} else {
uni.hideLoading();
diff --git a/pages/user/order_details/order_details.vue b/pages/user/order_details/order_details.vue
index 20cfaa1..b381d52 100644
--- a/pages/user/order_details/order_details.vue
+++ b/pages/user/order_details/order_details.vue
@@ -106,7 +106,7 @@
- {{recinfo.totalPrice*100}}
+ {{recinfo.totalPrice * 10 * 10}}
@@ -119,7 +119,7 @@
- {{recinfo.payPrice*100}}
+ {{recinfo.payPrice* 10 * 10}}
@@ -132,7 +132,7 @@
- {{recinfo.payRealPrice*100}}
+ {{recinfo.payRealPrice * 10 * 10}}
@@ -145,7 +145,7 @@
- {{recinfo.deductionPrice*100}}
+ {{recinfo.deductionPrice * 10 * 10}}
diff --git a/pages/user/order_list/order_list.vue b/pages/user/order_list/order_list.vue
index d2ba5c7..00d588f 100644
--- a/pages/user/order_list/order_list.vue
+++ b/pages/user/order_list/order_list.vue
@@ -71,7 +71,7 @@
- {{row.payPrice*100}}
+ {{row.payPrice * 10 * 10}}
{{typeText[row.orderStatus]}}