From 2906f19e0a12bea81dae5c360b591ee491d81f26 Mon Sep 17 00:00:00 2001
From: caoliancun <572275724@qq.com>
Date: Sun, 19 Feb 2023 23:08:47 +0800
Subject: [PATCH] 12121
---
.../pages/login/components/loginBottom.vue | 2 +-
BagStation/pages/components/price-tab.vue | 4 ++++
BagStation/pages/makeOrder/orderPaying.vue | 4 ++--
components/site-item/site-item.vue | 5 +++-
pages/tabbar/home/home.vue | 24 -------------------
5 files changed, 11 insertions(+), 28 deletions(-)
diff --git a/BagAuth/pages/login/components/loginBottom.vue b/BagAuth/pages/login/components/loginBottom.vue
index 2dfbe9f..59674ad 100644
--- a/BagAuth/pages/login/components/loginBottom.vue
+++ b/BagAuth/pages/login/components/loginBottom.vue
@@ -8,7 +8,7 @@
我已阅读并同意
- 《用户协议》和《隐私政策》
+ 《用户协议》和《隐私政策》
diff --git a/BagStation/pages/components/price-tab.vue b/BagStation/pages/components/price-tab.vue
index 9903800..4bfb7e2 100644
--- a/BagStation/pages/components/price-tab.vue
+++ b/BagStation/pages/components/price-tab.vue
@@ -89,6 +89,10 @@
}
}
},
+ created() {
+
+ },
+
methods: {
tabSelect(e) {
this.TabCur = e.currentTarget.dataset.id;
diff --git a/BagStation/pages/makeOrder/orderPaying.vue b/BagStation/pages/makeOrder/orderPaying.vue
index 3b71599..9ca8b28 100644
--- a/BagStation/pages/makeOrder/orderPaying.vue
+++ b/BagStation/pages/makeOrder/orderPaying.vue
@@ -316,7 +316,7 @@
orderId: this.order.orderSerialNumber,
payClient: 'XOIL_DRIVER_WECHAT_APPLET', //"支付端。安卓XOIL_DRIVER_ANDROID,小程序
userIp: (this.userIp?this.userIp:"36.57.160.59") ,
- merchantNo:'10088997357'
+ merchantNo:'10089027856'
}
oilPayApi.aggregatePay(payData).then(res => {
@@ -393,7 +393,7 @@
"payChannel": "BALANCE_PAYMENT", //类型:String 必有字段 备注:支付渠道(BALANCE_PAYMENT:余额支付)
"orderMethod": "CUSTOMER_ACTIVE", //类型:String 必有字段 备注:订单产生方式(CUSTOMER_ACTIVE:客户扫码支付:客户扫描油站二维码完成支付)
"createSource": "XOIL_DRIVER_WECHAT_APPLET",
- merchantNo: '10088997357',
+ merchantNo: '10089027856',
}
oilOrderApi.payOrder(payData).then(res => {
if (res.code == 20000) {
diff --git a/components/site-item/site-item.vue b/components/site-item/site-item.vue
index dce4f7b..e061c24 100644
--- a/components/site-item/site-item.vue
+++ b/components/site-item/site-item.vue
@@ -24,7 +24,7 @@
{{item.oilProductCode}}
- ¥{{item.personalPrice|moneyFormat}}
+ ¥{{item.personalPriceZp|moneyFormat}}
@@ -82,6 +82,9 @@
audioUrl:''
}
},
+ created() {
+ console.log(this.siteItem,'-----------------')
+ },
methods: {
},
diff --git a/pages/tabbar/home/home.vue b/pages/tabbar/home/home.vue
index 8ed9477..5eb9c3e 100644
--- a/pages/tabbar/home/home.vue
+++ b/pages/tabbar/home/home.vue
@@ -106,30 +106,6 @@
-
-