更新

2023-06-14 10:14:22 +08:00
parent d32d9687f0
commit b49578295d
3 changed files with 119 additions and 116 deletions
--- a/BagStation/pages/makeOrder/orderPaying.vue
+++ b/BagStation/pages/makeOrder/orderPaying.vue
@@ -149,46 +149,46 @@
 				<view class="padding" v-if='type == "oil"'>
 					<view class="padding-bottom-xs margin-bottom-xs dashed-bottom">
 						<view class="padding-tb-xs text-left" @tap="onCopy(order.orderSerialNumber)">
-							订单编号：
+							订单编号
 							<text class="fr">{{order.orderSerialNumber?order.orderSerialNumber:''}} <text
 									class="cuIcon-copy padding-left-xs"></text></text>
 						</view>
 					</view>
 					<view class="padding-tb-xs text-left">
-						油站：
+						油站
 						<view class="fr">{{order.siteName?order.siteName:''}}
 							<!-- <text v-if="order.siteLevel" class="cu-tag  text-xs tag-red" style="margin-left: 20px;">{{order.siteLevel}}级</text> -->
 						</view>
 					</view>
 					<view class="padding-tb-xs text-left">
-						油品油枪：
+						油品油枪
 						<text
 							class="fr nowrap">{{order.oilsCode?order.oilsCode+' ':''}}&{{ order.gunName?order.gunName+'号枪': order.oilsBar?order.oilsBar+'号枪':'未选择油枪'}}</text>
 					</view>
 					<view class="padding-tb-xs  text-left">
-						加油升数：
-						<text class="fr">{{order.volume?order.volume :'xxx.x' | moneyFormath}} L</text>
+						加油升数
+						<text class="fr">约{{order.volume?order.volume :'xxx.x' | moneyFormath}} L</text>
 					</view>
 					<view class="dashed-top margin-top-xs padding-top-sm">
 						<view class="padding-tb-xs text-left">
-							加油金额：
+							加油金额
 							<!-- <text
 								class="fr">{{order.oilDiscountAmount>0?order.realAmount+order.oilDiscountAmount:order.realAmount|moneyFormat}}</text> -->
 							<text class="fr">{{ moneyIntercept(order.xoilAmountGun )}}</text>
 						</view>
 					</view>
 					<view class="padding-tb-xs text-left">
-						星油优惠：
+						星油优惠
 						<!-- order.oilDiscountAmount>0?order.oilDiscountAmount:'xxx.x'|moneyFormat -->
 						<text class="text-red fr">{{ moneyIntercept(order.oilDiscountAmount)}}</text>
 					</view>
 					<view class="padding-tb-xs text-left">
-						优惠券：
+						优惠券
 						<text
 							class="text-red 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">{{order.realAmount>0? '￥'+ order.realAmount:'xxx.x'|}}</text>
 					</view>
@@ -196,19 +196,19 @@
 				<view class="padding" v-if='type == "urea"'>
 					<view class="padding-bottom-xs margin-bottom-xs dashed-bottom">
 						<view class="padding-tb-xs text-left" @tap="onCopy(order.orderId)">
-							订单编号：
+							订单编号
 							<text class="fr">{{order.orderId?order.orderId:''}} <text
 									class="cuIcon-copy padding-left-xs"></text></text>
 						</view>
 					</view>
 					<view class="padding-tb-xs text-left">
-						油站：
+						油站
 						<view class="fr">{{order.siteName?order.siteName:''}}
 							<!-- <text v-if="order.siteLevel" class="cu-tag  text-xs tag-red" style="margin-left: 20px;">{{order.siteLevel}}级</text> -->
 						</view>
 					</view>
 					<view class="padding-tb-xs text-left">
-						加注类型：
+						加注类型
 						<text class="fr nowrap">{{order.formats | ureaFormats }}</text>
 					</view>
 					<view class="padding-tb-xs formats_box" v-if='order.formats == "2"'>
@@ -222,11 +222,11 @@
 						</view>
 					</view>
 					<view class="padding-tb-xs  text-left" v-if='order.formats != "2"'>
-						加注量：
+						加注量
 						<text class="fr">{{order.oldRealLiter?order.oldRealLiter :'xxx.x'  }}</text>
 					</view>
 					<view class="padding-tb-xs text-left">
-						合计：
+						合计
 						<text
 							class="text-red text-bold text-lg  fr">{{order.oldRealAmount>0? '￥'+ order.oldRealAmount:'xxx.x'|}}</text>
 					</view>
@@ -312,14 +312,16 @@
 		computed: {
 			companyList() {
 				if (this.isCompany) {
-					let filterData = this.order.companyAccounts.filters(item => item.companyType != 5)
+					let companyAccounts =  this.order.companyAccounts || []
+					let filterData = companyAccounts.filter(item => item.companyType != 5)
 					return filterData
 				}
 			},
 			companyOtherList() {
 				if (this.isCompany) {
 					// return this.order.otherAccounts
-					let filterData = this.order.otherAccounts.filter(item => item.companyType != 5)
+					let otherAccounts =  this.order.otherAccounts || []
+					let filterData = otherAccounts.filter(item => item.companyType != 5)
 					let target = this.sortParticulars(filterData,'balance')
 					return target
 				}
--- a/BagStation/pages/makeOrder/payResult.vue
+++ b/BagStation/pages/makeOrder/payResult.vue
@@ -52,28 +52,28 @@
 			<view class="padding" style="padding-bottom: 200px;">
 				<view class="padding-bottom-xs margin-bottom-xs dashed-bottom">
 					<view class="padding-tb-xs text-left" @tap="onCopy(order.orderSerialNumber)">
-						订单编号：
+						订单编号
 						<text class="fr">{{order.orderSerialNumber?order.orderSerialNumber:''}} <text
 								class="cuIcon-copy padding-left-xs"></text></text>

 					</view>
 				</view>
 				<view class="padding-tb-xs text-left">
-					油站：
+					油站
 					<text class="fr">{{order.siteName?order.siteName:''}}</text>
 				</view>
 				<view class="padding-tb-xs text-left">
-					油品油枪：
+					油品油枪
 					<text class="fr nowrap">
 						{{order.oilsCode?order.oilsCode+' ':''}}&{{ order.gunName?order.gunName+'号枪': order.oilsBar?order.oilsBar+'号枪':'未选择油枪'}}
 					</text>
 				</view>
 				<view class="padding-tb-xs  text-left">
-					加油升数：
-					<text class="fr">{{order.volume?order.volume :'未输入' | moneyFormath}} L</text>
+					加油升数
+					<text class="fr">{{order.volume?'约':''}}{{order.volume?order.volume :'未输入' | moneyFormath}} L</text>
 				</view>
 				<view class="padding-tb-xs  text-left">
-					加油员：
+					加油员
 					<text class="fr">{{order.siteUserName}}</text>
 				</view>
 				<!-- <view class="padding-tb-xs flex  text-left">
@@ -87,40 +87,40 @@
 				</view> -->
 				<view class="dashed-top margin-top-xs padding-top-sm">
 					<view class="padding-tb-xs text-left">
-						加油金额：
+						加油金额
 						<!-- {{order.oilDiscountAmount>0?order.realAmount+order.oilDiscountAmount:order.realAmount|moneyFormat}} -->
 						<!-- <text class="fr">{{order.realPriceAmount |moneyFormat}}</text> -->
-						<text class="fr">{{order.xoilAmountGun |moneyFormat}}</text>
+						<text class="fr">约{{order.xoilAmountGun |moneyFormat}}</text>
 					</view>
 				</view>
 				<view class="padding-tb-xs text-left">
-					星油优惠：
+					星油优惠
 					<text
 						class="text-red 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>
 				</view>

 				<view class="padding-tb-xs text-left">
-					合计：
+					合计
 					<text
 						class="text-red text-bold text-lg fr">{{order.realAmount>0?'￥'+order.realAmount:'xxx.x'}}</text>
 				</view>
 				<view class="dashed-top margin-top-xs padding-top-sm">
 					<view class="padding-tb-xs text-left">
-						加油车牌：
+						加油车牌
 						<text class=" fr">{{order.plateNumber}}</text>
 					</view>
 				</view>
 				<view class="padding-tb-xs text-left">
-					加油司机：
+					加油司机
 					<text class=" fr">{{user.customerCode}}</text>
 				</view>
 				<view class="padding-tb-xs text-left">
-					油卡性质：
+					油卡性质
 					<!-- <text class=" fr">{{order.couponDiscountAmount>0?order.couponDiscountAmount:'xxx.x'|moneyFormat}}</text> -->
 					<text class="fr">企业</text>
 				</view>