修改bug

components/form-image/form-image.vue

@@ -145,7 +145,7 @@
 			count: {
 				/* 图片上传数量*/
 				type: Number,
-				default: 8,
+				default: 5,
 			},
 			showTxt: {
 				/* 是否显示上传图片文字*/
@@ -250,8 +250,8 @@
 						for (var i = 0; i < tempFilePaths.length; i++) {
 							uploadFile(tempFilePaths[i], "", "").then((data) => {
 								_this.imageList.push(data);
-								if (_this.imageList.length > 8) {
-									var newImg = _this.imageList.slice(0, 8)
+								if (_this.imageList.length > 5) {
+									var newImg = _this.imageList.slice(0, 5)
 									for (var k = 0; k < newImg.length; k++) {
 										newImg[k] = this.strReplace(newImg[k])
 									}

subpackage/after-sale/ETC-log-off/log-off-result.vue

@@ -3,10 +3,10 @@
 		<view class="content">
 			<image :src="`${$imgUrl}ETCcancellation/bg1.png`" mode=""></image>
 			<view class="title">
-				办理成功
+				待审核
 			</view>
 			<view class="">
-				您办理的卡签注销业务已完成
+				请到【查询服务】的【业务审核查询】查看进度
 			</view>
 		</view>
 	</view>
@@ -80,4 +80,4 @@
 		left: 50%;
 		transform: translate(-50%);
 	}
-</style>
+</style>

subpackage/after-sale/blacklist-query/list.vue

@@ -2,10 +2,8 @@
 	<view class="content">
 		<view class="list-item" v-for="(item,index) in state.tableData">
 			<view><text>卡号：</text><text>{{item.cardId}}</text></view>
-			<view><text>反白时间：</text><text>{{item.createTime}}</text></view>
-			<view><text>反白原因：</text><text>{{item.reasonOut}}</text></view>
 			<view><text>下黑时间：</text><text>{{item.creationTime}}</text></view>
-			<view><text>下黑原因：</text><text>{{item.reasonIn}}</text></view>
+			<view v-if="item.reasonIn"><text>下黑原因：</text><text>{{item.reasonIn}}</text></view>
 			<view><text>黑名单类型：</text><text>{{item.typeC}}</text></view>
 			<view><text>状态：</text><text>{{item.status == '1'?'在黑':'已反白'}}</text></view>
 		</view>

subpackage/after-sale/progress-query/progress-query-business.vue

@@ -29,6 +29,7 @@
 				<image class="right" src="../../../static/image/icon-back.png" mode=""></image>
 			</view>
 		</view>
+		<view class="uni-container" style="text-align: center;" v-if="state.noData">暂无数据</view>
 		<view class="bottom-line" v-if="state.flags">我是有底线的~~~</view>
 	</view>
 
@@ -59,7 +60,8 @@
 		vehiclePlateColor: "",
 		status: "",
 		statusArr: [], //AUDIT_STATUS
-		vehiclePlateColorArr: []
+		vehiclePlateColorArr: [],
+		noData: false
 
 	})
 	onLoad((option) => {
@@ -155,6 +157,11 @@
 			}
 			state.listData = getData
 			state.total = data.data.length
+			if (state.listData.length > 0) {
+				state.noData = false
+			} else {
+				state.noData = true
+			}
 			console.log("业务完成日志", state.listData, state.pageNo,)
 		});
 	}
@@ -188,13 +195,14 @@
 		padding: 0 20rpx 20rpx 20rpx;
 		box-sizing: border-box;
 		z-index: 999999;
+		height: 170rpx;
 	}
 
 	.content {
 		font-size: 32rpx;
 		padding: 20rpx 30rpx;
 		background-color: #EEF7F7;
-		min-height: 100vh;
+		min-height: calc(100vh - 40rpx);
 	}
 
 	.card {

subpackage/after-sale/transfer-page.vue

@@ -45,7 +45,8 @@
 	});
 	//type：1用户信息变更，2车辆信息变更3，异常上报，4卡签注销，5挂失，6设备更换，7退货，8解挂 ,
 	// 9有两个 1个是解除车牌占用  2个ETC设备更换车牌
-	// 20 设备升级  21增补OBU设备  22卡续期 23欠费补缴  24余额补领  25公务车发行  26补卡额  27解锁卡
+	// 20 设备升级  21增补OBU设备  22卡续期 23欠费补缴  24余额补领  25公务车发行  26补卡额  27解锁卡  28激活  29通行流水 30黑名单查询
+	// 31发票   32月结单查询
 
 	onLoad((options) => {
 		state.type = options.type
@@ -56,7 +57,6 @@
 		state.userIdNum = options.userIdNum
 		state.mobile = options.mobile
 		console.log("options", options)
-		// state.vehicleId = "贵ZXCV32_0"
 		silentLogin().then(() => {
 			quanCheckActionTrue().then((item : any) => {
 				console.log("item====", item, item.data.length)
@@ -67,6 +67,11 @@
 					jump()
 				} else {
 					msg('暂无车辆')
+					setTimeout(() => {
+						uni.switchTab({
+							url: "/pages/index/index"
+						})
+					}, 1500)
 				}
 
 			})
@@ -143,24 +148,27 @@
 		} else if (state.type == "5" || state.type == "8") {
 			navTo(`/subpackage/after-sale/card-loss-reporting/cardloss-confirm?id=${state.id}`)
 		} else if (state.type == "9" && state.name == '解除车牌占用') {
-			navTo('/subpackage/after-sale/card-deactivation-activation/deactivation-activation-confirm')
+			navTo('/subpackage/after-sale/rescind-carId/rescind-carId-select')
 		} else if (state.type == "20") {
-			searchVehicleInfoQuery().then((item : any) => {
-				console.log("====", item.vehicles[0])
-				state.customerId = item.vehicles[0]['customerId']
-				state.vehiclePlate = item.vehicles[0]['vehiclePlate']
-				state.vehiclePlateColor = item.vehicles[0]['vehiclePlateColor']
-				isWorkOrder().then((item : any) => {
-					console.log("查询是否有工单", item)
-					if (item.data) {
-						if (item.data[0]['status'] == '0') {
-							navTo(`/subpackage/after-sale/equipment-upgrade/upgrade-confirm?id=${state.id}&workId=${item.data[0]['id']}`)
-						}
-					} else {
-						msg('暂无工单')
-					}
-				})
+			uni.switchTab({
+				url: "/pages/user/user"
 			})
+			// searchVehicleInfoQuery().then((item : any) => {
+			// 	console.log("====", item.vehicles[0])
+			// 	state.customerId = item.vehicles[0]['customerId']
+			// 	state.vehiclePlate = item.vehicles[0]['vehiclePlate']
+			// 	state.vehiclePlateColor = item.vehicles[0]['vehiclePlateColor']
+			// 	isWorkOrder().then((item : any) => {
+			// 		console.log("查询是否有工单", item)
+			// 		if (item.data) {
+			// 			if (item.data[0]['status'] == '0') {
+			// 				navTo(`/subpackage/after-sale/equipment-upgrade/upgrade-confirm?id=${state.id}&workId=${item.data[0]['id']}`)
+			// 			}
+			// 		} else {
+			// 			msg('暂无工单')
+			// 		}
+			// 	})
+			// })
 		} else if (state.type == "21") {
 			navTo(`/subpackage/after-sale/additional-equipment/additional-equipment-confirm?id=${state.id}`)
 		} else if (state.type == "22") {
@@ -179,6 +187,22 @@
 			navTo(`/subpackage/orders/flowingWater?vehicleId=${state.vehicleId}`)
 		} else if (state.type == "27") {
 			navTo(`/subpackage/after-sale/pin-code-deblocking/pin-code-confirm?id=${state.id}`)
+		} else if (state.type == "28") {
+			navTo(`/subpackage/personal-center/install-activation-order`)
+		} else if (state.type == "29") {
+			navTo(`/subpackage/personal-center/search/select-card?vehicleId=${state.vehicleId}`)
+		} else if (state.type == "30") {
+			var vehiclePlate = state.vehicleId.split("_")[0]
+			var vehiclePlateColor = state.vehicleId.split("_")[1]
+			navTo(`/subpackage/after-sale/blacklist-query/list?vehiclePlate=${vehiclePlate}&vehiclePlateColor=${vehiclePlateColor}`)
+		} else if (state.type == "31") {
+			navTo(`/subpackage/orders/invoiceApply/Invoice-mannager`)
+		} else if (state.type == "32") {
+			navTo(`/subpackage/after-sale/month-statement/month-statement-query-list?vehicleId=${state.vehicleId}`)
+		} else if (state.type == "33") {
+			var vehiclePlate = state.vehicleId.split("_")[0]
+			var vehiclePlateColor = state.vehicleId.split("_")[1]
+			navTo(`/subpackage/after-sale/progress-query/progress-query-business?vehiclePlate=${vehiclePlate}&vehiclePlateColor=${vehiclePlateColor}`)
 		}
 	}
 

subpackage/orders/invoiceApply/invoice-content.vue

@@ -108,7 +108,8 @@
 		ordersArr: [],
 		checked: false,
 		checkedAll: false,
-		flags: false
+		flags: false,
+		customerIdNum: ""
 	})
 	onLoad((option) => {
 		state.type = option.type
@@ -133,6 +134,7 @@
 			const data = stringToJson(res.bizContent);
 			console.log(data, "用户信息");
 			state.userMobile = data.customerTel
+			state.customerIdNum = data.customerIdNum
 			if (state.type == 1) {
 				etcOrder(1)
 			}
@@ -206,7 +208,7 @@
 		}
 		const params = encodeURIComponent(JSON.stringify(newArr))
 		if (state.ordersArr.length >= 1) {
-			navTo(`/subpackage/orders/invoiceApply/invoice-step1?type=${state.type}&&ordersArr=${params}&&userMobile=${state.userMobile}`)
+			navTo(`/subpackage/orders/invoiceApply/invoice-step1?type=${state.type}&&ordersArr=${params}&&userMobile=${state.userMobile}&&customerIdNum=${state.customerIdNum}`)
 		} else {
 			msg("请选择订单开票")
 		}

subpackage/orders/invoiceApply/invoice-step1.vue

@@ -15,7 +15,7 @@
 					<view class="from_item">
 						<text><text style="color: red;">*</text>车辆所有人证件号后6位：</text>
 						<view style="display: flex;">
-							<u-input v-model="state.subIdentNo" class="input" maxlength="6" type="number" />
+							<u-input v-model="state.subIdentNo" class="input" maxlength="6" type="number" disabled />
 						</view>
 					</view>
 				</u-form-item>
@@ -54,6 +54,7 @@
 		let ordersArr = JSON.parse(decodeURIComponent(option.ordersArr))
 		state.type = option.type
 		state.userMobile = option.userMobile
+		state.subIdentNo = option.customerIdNum.slice(-6)
 		console.log("ordersArr", ordersArr)
 		for (var i = 0; i < ordersArr.length; i++) {
 			let obj = {}
@@ -90,11 +91,12 @@
 		};
 		request(ETCProductInvoiceApi, options).then((res) => {
 			const data = stringToJson(res.bizContent);
-			msg("开票成功")
+			msg("开票申请成功")
 			setTimeout(() => {
-				uni.navigateBack({
-					delta: 3
-				})
+				// uni.navigateBack({
+				// 	delta: 3
+				// })
+				navTo(`/subpackage/orders/invoiceApply/invoiceList?userMobile=${state.userMobile}`)
 			}, 1500)
 			console.log(data, "通行");
 		});
@@ -114,12 +116,9 @@
 		};
 		request(flowServiceFee, options).then((res) => {
 			const data = stringToJson(res.bizContent);
-			msg("开票成功")
-
+			msg("开票申请成功")
 			setTimeout(() => {
-				uni.navigateBack({
-					delta: 3
-				})
+				navTo(`/subpackage/orders/invoiceApply/invoiceList?userMobile=${state.userMobile}`)
 			}, 1500)
 			console.log(data, "通行");
 		});

subpackage/orders/invoiceApply/invoiceList.vue

@@ -19,7 +19,7 @@
 		</view>
 	</view>
 
-	<view class="listbox">
+	<view class="listbox" v-if="state.data.length>0">
 		<view class="card-no-active" v-for="(item,index) in state.data">
 			<view class="head">
 				<!-- <image :src="`${$imgUrl}order/icon-star-green.png`" mode=""></image> -->
@@ -42,7 +42,9 @@
 		</view>
 		<!-- <view class="bottom-line" v-if="state.flags">我是有底线的~~~</view> -->
 	</view>
-
+	<view v-else class="listbox" style="text-align: center;font-size: 32rpx;">
+		暂无数据
+	</view>
 </template>
 
 <script setup lang="ts">
@@ -79,6 +81,7 @@
 	})
 	onLoad((options) => {
 		state.userMobile = options.userMobile
+		query(1)
 	})
 	const search = () => {
 		query(1)

subpackage/personal-center/car-message-change.vue

@@ -35,10 +35,10 @@
 		<view class="shibie-wrapper">
 			<view class="title"> 识别内容如下 </view>
 			<u-form label-width="230" :model="state.form" ref="uForm">
-				<u-form-item label="姓名">
+				<!-- <u-form-item label="姓名">
 					<u-input v-model="state.form.userName" placeholder='请输入姓名' :disabled="state.isEnableOCRData"
 						maxlength="20" @input="replaceInput" />
-				</u-form-item>
+				</u-form-item> -->
 				<u-form-item label="身份证号">
 					<u-input placeholder='请输入身份证' type="idcard" v-model="state.form.userIdNum"
 						:disabled="state.isEnableOCRData" maxlength="18" />

subpackage/personal-center/vehicle-information.vue

@@ -1,5 +1,5 @@
 <template>
-	<view v-if="state.list.length!=0">
+	<view v-if="state.list.length!=0" style="padding-bottom:30rpx ;">
 		<view class="car-item" v-for="(item,index) in state.list">
 			<image :src="`${$imgUrl}che.png`" class="car-pic" @click="carDetails(item)"></image>
 			<view class="car-info" @click="carDetails(item)">