更新

BagStation/pages/makeOrder/makeOrder.vue

@@ -122,6 +122,7 @@
 				this.getSiteInfo(option.siteId)
 				this.activeCur = option.activeCur
 			}
+
 		},
 		methods: {
 			obtainUrlPathParameterTarget(url) {

BagStation/pages/makeOrder/orderPaying.vue

@@ -2,7 +2,7 @@
 	<view>
 		<cu-custom class="main-totextbar bg-main-oil" :isBack="true" bgColor="bg-main-oil">
 			<block slot="backText">返回</block>
-			<block slot="content">佰川收银台</block>
+			<block slot="content">清正源油收银台</block>
 		</cu-custom>
 		<view class="">
 			<view class="padding-xl text-center">
@@ -16,7 +16,8 @@
 			</view>
 			<view class=" radius my-shadow solid-top margin margin-top-0">
 				<view class="cu-list menu" v-if="!isCompany">
-					<view class="cu-item" v-show="order.wxPayStatus" @tap="selWX">
+					
+					<view class="cu-item" v-if="order.wxPayStatus && order.dispatchPaymentMethod !== 'JIAOLIANPAY'" @tap="selWX">
 						<view class="content">
 							<view class="text-left">
 								<view class="site-icon-sm">
@@ -33,6 +34,10 @@
 							</view>
 						</view>
 					</view>
+					
+					
+					
+					
 					<!-- <view class="cu-item" v-show="order.personalStatus" @tap="selectPersonCard(order.personalAccount)">
 						<view class="content">
 							<view class="text-left">
@@ -160,12 +165,15 @@
 					</view>
 				</view>
 			</view>
-			<view class="padding placeholder-hidden">
+		<!-- 	<view class="padding placeholder-hidden">
 				<button class="cu-btn block lg bg-main-oil" @tap="payOrder">立即支付</button>
 				<button class="cu-btn margin-top block lg " @tap="cancelOrder(order.orderSerialNumber)">取消订单</button>
-			</view>
+			</view> -->
 			<view class="padding fixed-bar-bottom">
-				<button class="cu-btn block lg bg-main-oil" @tap="payOrder">立即支付</button>
+				<jl-pay v-if="order.dispatchPaymentMethod === 'JIAOLIANPAY'" :orderNo="order.orderNo" :amount="order.resultAmount" :returnUrl="order.pagePath" @navigateTo="navigateTo">
+				  <button class="cu-btn block lg bg-main-oil" >立即支付</button>
+				</jl-pay>
+				<button v-else  class="cu-btn block lg bg-main-oil" @tap="payOrder">立即支付</button>
 				<button class="cu-btn margin-top block lg " @tap="cancelOrder(order.orderSerialNumber)">取消订单</button>
 			</view>
 		</view>
@@ -218,6 +226,13 @@
 			} else {
 				this.payMethod = oilItem.payMethod
 			}
+			
+			console.log('orderinfo',this.order)
+			if(this.order.dispatchPaymentMethod === 'JIAOLIANPAY') {
+				this.order.resultAmount = this.order.realAmount * 100
+			}
+			
+			console.log('fafafdfadsfasdf',this.order.wxPayStatus && this.order.dispatchPaymentMethod !== 'JIAOLIANPAY')
 
 		},
 		onShow() {
@@ -244,6 +259,20 @@
 			}
 		},
 		methods: {
+			navigateTo(e) {
+				if (e.detail.success) {
+				    // 支付成功操作
+					uni.redirectTo({
+						url: '/BagStation/pages/makeOrder/payResult?status=success&&payMethod=' +
+							this.payMethod
+					})
+				  } else {
+				   uni.showToast({
+				   	title: '支付失败，请重试',
+				   	icon: 'none'
+				   })
+				  }
+			},
 			timF(date) {
 				date = date.substring(0, 19)
 				date = date.replace(/-/g, '/')
@@ -304,19 +333,19 @@
 					// payChannel: 'WECHAT_MINIAPPS_PAYMENT', //微信小程序支付 WECHAT_APP_PAYMENT微信APP支付
 					// openId: uni.getStorageSync('openid'),
 					// unionId: uni.getStorageSync('unionid'),
-					// appId: 'wxc1d226ac9c5bea36',
+					// appId: 'wxf3d6c15e3b087447',
 					// payCode: 'WECHAT_ORDER_PAY_WECHAT', //APP填WECHAT_ORDER_PAY_APP，小程序填
 					// orderId: this.order.orderSerialNumber,
 					// payClient: 'XOIL_DRIVER_WECHAT_APPLET' //"支付端。安卓XOIL_DRIVER_ANDROID，小程序
 					payChannel: 'WECHAT_MINIAPPS_PAYMENT', //微信小程序支付 WECHAT_APP_PAYMENT微信APP支付
 					openId: uni.getStorageSync('openid'),
 					unionId: uni.getStorageSync('unionid'),
-					appId: 'wxc1d226ac9c5bea36',
+					appId: 'wxf3d6c15e3b087447',
 					payCode: 'WECHAT_ORDER_PAY_WECHAT', //APP填WECHAT_ORDER_PAY_APP，小程序填
 					orderId: this.order.orderSerialNumber,
 					payClient: 'XOIL_DRIVER_WECHAT_APPLET', //"支付端。安卓XOIL_DRIVER_ANDROID，小程序
 					userIp: (this.userIp ? this.userIp : "36.57.160.59"),
-					merchantNo: '10089145264'
+					merchantNo: '10090808247'
 				}
 
 				oilPayApi.aggregatePay(payData).then(res => {
@@ -329,7 +358,7 @@
 									title: res.msg
 								})
 								oilPayApi.wxPayIntegral({
-									appId: 'wxc1d226ac9c5bea36',
+									appId: 'wxf3d6c15e3b087447',
 									orderId: this.order.orderSerialNumber
 								})
 								uni.redirectTo({

BagStation/pages/routePlain/routePlain.vue

@@ -332,7 +332,7 @@
 				} else {
 					uni.showModal({
 						title:'请您登录',
-						content:"登录佰川加油才可以加油 |˛˙꒳​˙)♡",
+						content:"登录清正源油加油才可以加油 |˛˙꒳​˙)♡",
 						confirmText:'去登陆',
 						success: (res) => {
 							if(res.confirm){ 

BagStation/pages/stationDetail/stationDetail.vue

@@ -314,7 +314,7 @@
 				if(!user){
 					uni.showModal({
 						title: '请您登录',
-						content: "登录佰川加油才可以加油 |˛˙꒳​˙)♡",
+						content: "登录清正源油加油才可以加油 |˛˙꒳​˙)♡",
 						confirmText: '去登陆',
 						success: (res) => {
 							if (res.confirm) {