版本1.2.3

components/OrderOil.vue

@@ -127,7 +127,6 @@
 					oilPrice: this.selected.xkPrice ? this.selected.xkPrice : this.selected.lvPrice,
 					gunId: this.gunId + 1,
 					realPay: this.money.realPay
-
 				}
 				console.log('被选中的', data5)
 				this.$emit('confirmVol', data5)

components/oil-menu-item.vue

@@ -50,6 +50,16 @@
 						className2: 'btn-red',
 					})
 				}
+				if (this.oilItem.xkCompanyPrice) {
+					this.price.push({
+						price: this.oilItem.xkCompanyPrice,
+						color: 'red',
+						name: '企业油价',
+						className1: 'red',
+						className2: 'btn-red',
+					})
+				}
+				
 				if (this.oilItem.wjyPrice) {
 					this.price.push({
 						price: this.oilItem.wjyPrice,

components/order-item.vue

@@ -11,6 +11,8 @@
 				<view class="flex-treble" @tap="copyId(item.orderID)">
 					{{item.orderID}}<text class="flex-sub padding-left-sm text-right cuIcon-copy text-lg text-red">
 					</text>
+
+
 				</view>
 				<view class="flex-sub text-right cuIcon-right" @tap="toDetails(item.orderID)">
 				</view>
@@ -33,7 +35,8 @@
 							<image class="icon icon-desc  " :src="baseURL+'static/img/oil-time.png'" alt />
 
 							<text class="padding-left-xs">
-								{{item.createDatetime.substring(0,19)}}
+								{{item.createDatetime.substring(0, 10)}}
+
 							</text>
 						</view>
 						<view class="bottom text-left">
@@ -47,9 +50,11 @@
 				</view>
 			</view>
 			<view class="margin-top-sm flex justify-between">
-				<view class="text-gray text-df">{{item.createDatetime.substring(0, 10)}}</view>
+				<view class="text-gray text-df">
+					{{item.createDatetime.substring(0,19)}}</view>
 				<view>
 					<text class="color-000 text-lg total-money">￥{{item.realamount|numberFilter}}</text>
+					<!-- <text v-show="item.orderType!='9'&&item.orderType!='0'" class="text-sm text-orange">(分单)</text> -->
 				</view>
 			</view>
 		</view>

components/plate-number-picker/plate-number-picker.vue

@@ -1,25 +1,29 @@
 <template>
-	<view class="cu-modal bottom-modal" :class="modalName">
+	<view class="cu-modal bottom-modal " :class="modalName">
 		<view class="cu-dialog">
-			<view class="cu-bar bg-white">
+			<view class="cu-bar bg-white solid-top shadow-top">
 				<view class="action text-green" @tap="hideModal">确定</view>
 				<view class="action text-blue" @tap="deleteInput">删除</view>
 			</view>
 			<view class="padding-xs">
 				<view class="grid " v-if="showPlateList">
 					<view class="padding-sm margin-xs solid bg-white" v-for="item in ChineseList" @tap="select(item)" :key="item.id">
-						<text>
+						<text class="text-lg">
 							{{item.name}}
 						</text>
 					</view>
 				</view>
 				<view class="grid " v-if="showInputList">
 					<view class="padding-sm margin-xs solid bg-white" v-for="item in inputList" @tap="selectText(item)" :key="item.id">
-						<text>
+						<text class="text-lg">
 							{{item.name}}
 						</text>
 					</view>
-					<text @tap="onDeleteInput" class="cuIcon-close"></text>
+					<view class="padding-sm  margin-xs solid bg-orange light" @tap="clearAll">
+						<text>
+							重输
+						</text>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -323,7 +327,22 @@
 				]
 			}
 		},
+		watch: {
+			plateText: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					this.plateText = newVal
+					if(!newVal){
+						this.showPlateList = true
+						this.showInputList = false
+					}
+				},
+			}
+		},
 		methods: {
+			clearAll() {
+				this.$emit('clearAll')
+			},
 			select(item) {
 				this.$emit('selectName', item.name)
 			},
@@ -349,4 +368,8 @@
 	.cu-modal {
 		background: transparent;
 	}
+
+	.shadow-top {
+		box-shadow: 0px -3px 0px rgba(26, 26, 26, 0.1);
+	}
 </style>