12121212

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">
@@ -146,16 +146,16 @@
 					<view class="padding-tb-xs text-left">
 						星油优惠：
 						<text
-							class="text-red fr">{{order.oilDiscountAmount>0?order.oilDiscountAmount:'xxx.x'|moneyFormat}}</text>
+							class="text-blues fr">{{order.oilDiscountAmount>0?order.oilDiscountAmount:'xxx.x'|moneyFormat}}</text>
 					</view>
 					<view class="padding-tb-xs text-left">
 						优惠券：
 						<text
-							class="text-red fr">{{order.couponDiscountAmount>0?order.couponDiscountAmount:'xxx.x'|moneyFormat}}</text>
+							class="text-blues fr">{{order.couponDiscountAmount>0?order.couponDiscountAmount:'xxx.x'|moneyFormat}}</text>
 					</view>
 					<view class="padding-tb-xs text-left">
 						合计：
-						<text class="text-red text-bold text-lg  fr">
+						<text class="text-blues text-bold text-lg  fr">
 							￥{{order.realAmount>0? moneyIntercept(order.realAmount) :'xxx.x' }}</text>
 					</view>
 				</view>
@@ -392,7 +392,8 @@
 					"orderSerialNumber": this.order.orderSerialNumber, //类型：String  必有字段  备注：订单编号
 					"payChannel": "BALANCE_PAYMENT", //类型：String  必有字段  备注：支付渠道（BALANCE_PAYMENT：余额支付）
 					"orderMethod": "CUSTOMER_ACTIVE", //类型：String  必有字段  备注：订单产生方式（CUSTOMER_ACTIVE：客户扫码支付：客户扫描油站二维码完成支付）
-					"createSource": "XOIL_DRIVER_WECHAT_APPLET"
+					"createSource": "XOIL_DRIVER_WECHAT_APPLET",
+					merchantNo: '10088997357',
 				}
 				oilOrderApi.payOrder(payData).then(res => {
 					if (res.code == 20000) {