From c4f1c1ea3b43bef344ce271ff274c4560d4a5768 Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Mon, 20 Oct 2025 16:00:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BagAuth/pages/login/oldLogin.vue           |   2 +-
 BagAuth/pages/login/register.vue           |   2 +-
 BagStation/pages/makeOrder/JXPayResult.vue | 143 +++++++++++++++++++++
 BagStation/pages/makeOrder/orderPaying.vue |  23 ++--
 pages.json                                 |   7 +
 5 files changed, 167 insertions(+), 10 deletions(-)
 create mode 100644 BagStation/pages/makeOrder/JXPayResult.vue

diff --git a/BagAuth/pages/login/oldLogin.vue b/BagAuth/pages/login/oldLogin.vue
index b5f1391..014774d 100644
--- a/BagAuth/pages/login/oldLogin.vue
+++ b/BagAuth/pages/login/oldLogin.vue
@@ -9,7 +9,7 @@
 				<view class="image login-bg">
 					<image :src="imgURL+'new-logo.png'" mode="widthFix"></image>
 					<view class="text-bold text-lg padding-top">
-						一路油你 百川加油
+						一路油你 清正源油加油
 					</view>
 					<view class="text-df text-grey padding-top-xs padding-bottom">
 						登录后加油更便捷
diff --git a/BagAuth/pages/login/register.vue b/BagAuth/pages/login/register.vue
index 17da211..382e936 100644
--- a/BagAuth/pages/login/register.vue
+++ b/BagAuth/pages/login/register.vue
@@ -9,7 +9,7 @@
 				<view class="image login-bg">
 					<image :src="imgURL+'new-logo.png'" mode="widthFix"></image>
 					<view class="text-bold text-lg padding-top">
-						一路油你 百川加油
+						一路油你 清正源油加油
 					</view>
 					<view class="text-df text-grey padding-top-xs padding-bottom">
 						注册为个人会员
diff --git a/BagStation/pages/makeOrder/JXPayResult.vue b/BagStation/pages/makeOrder/JXPayResult.vue
new file mode 100644
index 0000000..7230dbd
--- /dev/null
+++ b/BagStation/pages/makeOrder/JXPayResult.vue
@@ -0,0 +1,143 @@
+<template>
+	<view>
+		<cu-custom class="main-totextbar bg-main-oil" :isBack="true" bgColor="bg-main-oil">
+			<block slot="backText">返回</block>
+			<block slot="content">支付结果</block>
+		</cu-custom>
+		<view style="background-color: #F9F9F9;height: calc(100vh - 140rpx);">
+			<view style="text-align: center;font-size: 28rpx;color: #000000;opacity: 0.49;margin-top: 20rpx;">
+				请告知加油员使用江投能源支付
+			</view>
+			<view style="text-align: center;margin: 60rpx 0;">
+				<image src="https://xoil-public.oss-cn-beijing.aliyuncs.com/miniProgram/xingyou/jt-logo.png"
+					style="width: 220rpx;height: 160rpx;"></image>
+			</view>
+			<view style="text-align: center;color: #000000;font-weight: bold;">
+				<view style="font-size: 64rpx;">-{{order.xoilAmountGun |moneyFormat}}</view>
+				<view style="font-size: 40rpx;" v-if="status=='success'">交易成功</view>
+				<view style="font-size: 40rpx;color: #FF0000;" v-if="status!='success'">交易失败</view>
+			</view>
+			<view style="margin-top: 100rpx;padding: 0 30rpx;font-size: 28rpx; font-weight: bold;">
+	
+				<view style="background-color: #fff;border-radius: 20rpx;">
+					<view class="padding-tb-xs  text-left paddingLR">
+						油站
+						<text class="fr">{{order.siteName || ''}} L</text>
+					</view>
+					<view class="padding-tb-xs text-left paddingLR">
+						订单号
+						<text class="fr">{{order.orderSerialNumber?order.orderSerialNumber:''}}</text>
+
+					</view>
+				<view class="padding-tb-xs  text-left paddingLR">
+					油品类型
+					<text class="fr">
+						{{order.oilsCode?order.oilsCode+' ':''}}
+						<!-- <text>{{order.oilProductType=="DIESEL"?'柴油':order.oilProductType=="PETROL"?'汽油':order.oilProductType=="GAS"?'天然汽':''}}</text> -->
+						<text v-if="order.oilsBar">({{order.oilsBar?order.oilsBar+'号枪':'未选择油枪'}})</text>
+					</text>
+				</view>
+				<view class="padding-tb-xs  text-left paddingLR">
+					加油升数
+					<text class="fr">{{order.volume?order.volume :'未输入' | moneyFormath}} L</text>
+				</view>
+				<view class="padding-tb-xs  text-left paddingLR">
+					单价
+					<text class="fr">{{order.sitePrice?order.sitePrice :'' | moneyFormath}} 元/L</text>
+				</view>
+				<view class="padding-tb-xs text-left paddingLR">
+					交易金额
+					<text class="fr" style="color: #FF0000;">￥{{order.xoilAmountGun |moneyFormat}}</text>
+				</view>
+				</view>
+					
+			</view>
+			<!-- <view style="display: flex;margin-top: 60rpx;">
+				<button class="btnJX" @tap="backToOrderList">查看订单</button>
+				<button class="btnJX" @tap="backToIndex">返回首页</button>
+			</view> -->
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import toilApi from '@/api/toil.js'
+	import oilSiteApi from '@/api/oil-site.js'
+	export default {
+		data() {
+			const now = new Date()
+			return {
+				status: "",
+				textstatus: '正在支付中',
+				status: 'fail',
+				order: uni.getStorageSync('orderMade')
+			}
+		},
+		onLoad(option) {
+			let _that = this
+			if (option.status == 'success') {
+				if (option.status == 'success') {
+					this.textstatus = '支付成功'
+					this.status = option.status
+				} else {
+					this.textstatus = '支付失败'
+					this.status = option.status
+				}
+				return
+			}
+			if (option.status == 'fail') {
+				this.textstatus = '支付失败'
+				this.status = option.status
+				return
+			}
+		},
+		methods: {
+			backToOrderList() {
+				uni.redirectTo({
+					url: `/BagStation/orderDetail/orderDetail?id=${this.order.orderSerialNumber}`
+				})
+			},
+			backToIndex() {
+				uni.switchTab({
+					url: '/pages/tabbar/home/home'
+				})
+			}
+		},
+
+		filters: {
+			moneyFormath(value) {
+				if (value != 'xxx.x') {
+					let number = value.toFixed(2)
+					return number
+				} else {
+					return value
+				}
+			},
+			moneyFormat(value) {
+				if (value != 'xxx.x') {
+					let realAmount = (parseInt(value * 100) / 100).toFixed(2)
+					return realAmount
+				} else {
+					return value
+				}
+			},
+		},
+	}
+</script>
+
+<style>
+	.btnJX {
+		width: 180rpx;
+		height: 60rpx;
+		border-radius: 20rpx;
+		background-color: #2E53B2;
+		color: #fff;
+		font-size: 32rpx;
+		line-height: 60rpx;
+		padding: 2rpx;
+	}
+	.paddingLR{
+		padding: 20rpx 40rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/BagStation/pages/makeOrder/orderPaying.vue b/BagStation/pages/makeOrder/orderPaying.vue
index 906652e..8416ba5 100644
--- a/BagStation/pages/makeOrder/orderPaying.vue
+++ b/BagStation/pages/makeOrder/orderPaying.vue
@@ -357,14 +357,22 @@
 								uni.showToast({
 									title: res.msg
 								})
-								oilPayApi.wxPayIntegral({
-									appId: 'wxf3d6c15e3b087447',
-									orderId: this.order.orderSerialNumber
-								})
+								// oilPayApi.wxPayIntegral({
+								// 	appId: 'wxf3d6c15e3b087447',
+								// 	orderId: this.order.orderSerialNumber
+								// })
+								if (res.data.secondChannelCode == 'JX_INVEST') {
+									uni.redirectTo({
+										url: '/BagStation/pages/makeOrder/JXPayResult?status=success&&payMethod=' +
+											this.payMethod
+									})
+								}else {
 								uni.redirectTo({
 									url: '/BagStation/pages/makeOrder/payResult?status=success&&payMethod=' +
 										this.payMethod
 								})
+								}
+							
 							}
 						})
 					} else {
@@ -406,11 +414,10 @@
 						setTimeout(() => {
 							uni.redirectTo({
 								url: '/BagStation/pages/makeOrder/payResult?status=success&&payMethod=' +
-									this.payMethod,
-								fail: (err) => {
-									// console.log(err)
-								}
+									this.payMethod
 							})
+						
+							
 						}, 1000)
 
 					} else {
diff --git a/pages.json b/pages.json
index 8185a84..6bc4422 100644
--- a/pages.json
+++ b/pages.json
@@ -249,6 +249,13 @@
 						"enablePullDownRefresh": false
 					}
 
+				},{
+					"path": "pages/makeOrder/JXPayResult",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+
 				}, {
 					"path": "orderDetail/orderDetail",
 					"style": {