更新

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

@@ -385,6 +385,39 @@
 				</view>
 			</view>
 		</view>
+		
+		<view class="cu-modal bottom-modal " :class="showPlicePhoto">
+	
+			<view class="cu-dialog bg-white">
+				<view class="cu-bar bg-white justify-end">
+					<view class="content"></view>
+					<view class="action" @tap="showPlicePhoto=''">
+						<text class="cuIcon-close text-red"></text>
+					</view>
+				</view>
+				
+			<view style="height: 1000rpx;">
+				<view style="margin: 100rpx 0;">
+					<uni-icons type="clear" size="80" color="#f56c6c"></uni-icons>
+					<view>
+						<text style="color: #d9001b;font-size: 30rpx;font-weight: bold;">识别失败!</text>
+					</view>
+					
+				</view>
+				<view style="margin: 60rpx 0;">
+					<button @tap="srcPhoto" style="width: 60%;background-color: #409EFF;color: #ffffff;">重新拍照</button>
+				</view>
+				<view style="margin: 60rpx 0;">
+					<button style="width: 60%;background-color: #F59A23;color: #ffffff;" @click="manualInput">手动输入车牌号</button>
+				</view>
+			</view>
+			</view>
+		</view>
+		<uni-popup ref="inputDialog" type="dialog">
+			<uni-popup-dialog mode="input" title="请输入车牌号" value="" :before-close="true"
+				placeholder="请输入" @close="inputClose" @confirm="inputConfirm"></uni-popup-dialog>
+		</uni-popup>
+	
 	</view>
 </template>
 
@@ -525,7 +558,9 @@
 				realMoney: '',
 				xoilAmountGun: '',
 				plateNumberOcr:'',
-				plateNumberOcrShow:false
+				plateNumberOcrShow:false,
+				showPlicePhoto:'',
+				plateNumberImages:''
 			}
 		},
 		created() {
@@ -622,6 +657,25 @@
 			}
 		},
 		methods: {
+			manualInput(){
+				this.showPlicePhoto=''
+				this.$refs.inputDialog.open()
+			},
+			inputClose(){
+				this.$refs.inputDialog.close()
+			},
+			inputConfirm(val){
+				if(val){
+					this.plateNumberOcr = val
+					this.$refs.inputDialog.close()
+				}else{
+					uni.showToast({
+						title: '请输入车牌号',
+						icon: 'none'
+					})
+				}
+				
+			},
 			getCompanyConfig(companyId){
 				if(companyId){
 					user.getCompanyConfigByCompanyId(companyId).then(res=>{
@@ -635,6 +689,7 @@
 				}
 			},
 			srcPhoto(){
+				this.showPlicePhoto=''
 				let _that = this
 				uni.chooseImage({
 					count: 1, //默认9
@@ -663,9 +718,16 @@
 							success(e) {
 								uni.hideLoading()
 								let obj = JSON.parse(e.data)
-								 _that.plateNumberOcr = obj.data.carNo
+								if(obj.data&&obj.data.carNo){
+									 _that.plateNumberOcr = obj.data.carNo
+									 _that.plateNumberImages = obj.data.imgUrl
+								}else{
+									_that.plateNumberOcr = ''
+									_that.showPlicePhoto = 'show'
+								}
 							},fail(res){
 								uni.hideLoading()
+								_that.showPlicePhoto = 'show'
 							}
 						})
 
@@ -1212,6 +1274,13 @@
 						'xoilAmountGun': this.vol
 					}
 				} else {
+					if(!this.plateNumberOcr){
+						uni.showToast({
+							icon: 'none',
+							title: '请上传车牌照片'
+						})
+						return
+					}
 					if(this.plateNumberOcrShow == true){
 						var orderData = {
 						amountGun: this.activeChannelCode == 'TY' ? this.ty.realMoney : '',
@@ -1221,6 +1290,7 @@
 						orderSource: "WECHAT_MINIAPPS", //类型：String  必有字段  备注：订单来源（WECHAT_MINIAPPS）
 						plateNumber: this.plateNumberOcrShow == true ? this.plateNumberOcr : this
 							.plateNumber, //类型：String  必有字段  备注：车牌号
+						plateNumberImages: this.plateNumberImages, // 车牌照片地址
 						siteUserName: this.jober, //类型：String  必有字段  备注：加油员
 						oilsBar: this.oilBar, //类型：Number  必有字段  备注：油枪
 						volume: this.activeChannelCode == 'TY' ? this.tyRes.liter : this