更新

BagStation/pages/components/price-select-tab.vue

@@ -238,7 +238,7 @@
 						<view class="" v-if="activeChannelCode!='TY'">
 							<view class="padding-tb-xs margin-bottom text-left">
 								加油升数： 
-								<text class="fr">{{vlom?vlom :'' | moneyVolm}}  L </text>
+								<text class="fr">{{vlom?'约' :''}}{{vlom?vlom :'' | moneyVolm}}  L </text>
 							</view>
 							<view class=" dashed-top margin-top padding-top text-left">
 								加油金额：

BagStation/pages/stationDetail/stieQr.vue

@@ -55,10 +55,10 @@
 		<view class="margin margin-top-lg  radius bg-white">
 			<view class="padding text-center">
 				<text class="text-black">
-					请提醒加油员使用 
+					请提醒加油员使用
 					<text class="text-red">
 						“ {{showtitles}} ”
-					</text> 
+					</text>
 					进行订单核销
 				</text>
 			</view>
@@ -183,11 +183,11 @@
 			// console.log('进入siteQr',option)
 			let oilItem = uni.getStorageSync('oilItem')
 			// console.log(oilItem)
-			this.showtitles = oilItem.listTag 
+			this.showtitles = oilItem.listTag
 		},
 		data() {
 			return {
-				showtitles:"",
+				showtitles: "",
 				isCompany: uni.getStorageSync('accountStatus'),
 				activeCardIndex: 0,
 				showThreeSites: false,
@@ -205,7 +205,7 @@
 				posName: '',
 				secondChannelCode: '',
 				timeinterval: '',
-				otherUser:'',
+				otherUser: '',
 				customerId: uni.getStorageSync('user').userCode
 			}
 		},
@@ -235,12 +235,12 @@
 			},
 			cards() {
 				if (this.cardList.length) {
-					let staging = this.cardList.filter(item => item.companyType != 5)
-					let target = this.sortHandler(staging)
-					target.forEach((e) => {
-						e.companyName =  e.companyName + '('+( e.companyType==0?`柴油账户:${e.balance}元`:e.companyType==1?`汽油账户:${e.balance}元`:e.companyType==2?`LNG账户:${e.balance}元`:`尿素:${e.balance}元`) + ')'
+					this.cardList.forEach((e) => {
+						e.companyName = e.companyName + '(' + (e.companyType == 0 ? `柴油账户:${e.balance}元` : e
+							.companyType == 1 ? `汽油账户:${e.balance}元` : e.companyType == 2 ?
+							`LNG账户:${e.balance}元` : `尿素:${e.balance}元`) + ')'
 					})
-					return target
+					return this.cardList
 				}
 			},
 		},
@@ -250,12 +250,12 @@
 		onLoad(option) {
 			let oilItem = uni.getStorageSync('oilItem')
 			let otherUserInfo = uni.getStorageSync('otherUserInfo')
-			if(otherUserInfo){
+			if (otherUserInfo) {
 				this.otherUser = 'kl'
 			}
 			this.otherUserInfo = otherUserInfo
 			// console.log('+++++',option)
-			this.showtitles = oilItem.listTag 
+			this.showtitles = oilItem.listTag
 			this.siteId = option.siteId
 			this.activeChannelCode = option.activeChannelCode
 			this.secondChannelCode = option.secondChannelCode
@@ -348,12 +348,16 @@
 			getUserCard() {
 				// console.log('%c look that ↓','color:red;font-size:50px')
 				// console.log(uni.getStorageSync('oilItem'),'*-*-*-*-')
-				accountApi.getNewUserAccount({siteId:uni.getStorageSync('oilItem').siteId}).then(res => {
+				accountApi.getNewUserAccount({
+					siteId: uni.getStorageSync('oilItem').siteId
+				}).then(res => {
 					if (res.code == 20000) {
-						this.cardList = res.data
-						if (this.cardList.length > 0) {
+						if (this.cardList.length) {
+							let staging = res.data.filter(item => item.companyType != 5)
+							let target = this.sortHandler(staging)
+							this.cardList = target
 							// this.getMoneyDetail(this.cardList[0])
-						}
+						} else this.cardList = []
 					}
 				})
 			},