修改bug

manifest.json

@@ -52,7 +52,7 @@
 	"quickapp": {},
 	/* 小程序特有相关 */
 	"mp-weixin": {
-		"appid": "wx8fba957179c1329a",
+		"appid": "wxa2d9acdd1054e69b",
 		"setting": {
 			"urlCheck": false,
 			"checkSiteMap": false,

pages/service/service.vue

@@ -121,7 +121,12 @@
 			}
 		}
 		console.log("lastArr", lastArr)
+		if (state.searchVal) {
+			tableSelectIndex.value = 0
+		}
 		menuShow.list = lastArr
+
+		console.log("menuShow.list", menuShow.list, tableSelectIndex.value)
 	}
 	const queryMenuConfigAction = () => {
 		var data = {

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

@@ -52,8 +52,16 @@
 			const data = stringToJson(res.bizContent);
 			const getData = data.blackCards;
 			const newData = []
+			// 只要在黑的  和 1 2 3不展示
+			// LOSS("卡挂失",1){},
+			// HANG_WITHOUT_CARD("无卡挂起",2){},
+			// CANCEL_WITHOUT_CARD("无卡注销",3){},
+			// OVERDRAW("账户透支",4){},
+			// AGENCY_BLACK("合作机构黑名单",5){},
+			// VEHICLE_TYPE_NOTMATCH("车型不符",6){},
+			// CARD_BALANCE_INSUFFICIENT("储值卡余额不足",7){},
 			for (var i = 0; i < getData.length; i++) {
-				if (getData[i]['status'] == '1') {
+				if (getData[i]['status'] == '1' && (getData[i]['type'] == 4 || getData[i]['type'] == 5 || getData[i]['type'] == 6 || getData[i]['type'] == 7)) {
 					newData.push(getData[i])
 				}
 			}

subpackage/after-sale/cancell-refund/cancell-refund.vue

@@ -256,6 +256,11 @@
 		display: inline-block;
 	}
 
+	.list-item>view>view>text:last-child {
+		width: 75%;
+		display: inline-block;
+	}
+
 	.bottom-line {
 		text-align: center;
 		margin: 30rpx 0;

subpackage/after-sale/deviceInfo/deviceInfo.vue

@@ -263,7 +263,9 @@
 						if (str2 == "9000") {
 							if (res[1].length > 108) {
 								card.userName = HexToStrig(res[1].substring(4, 44)); //姓名
-								card.idNum = HexToStrig(res[1].substring(44, 108)); //身份证号码					
+								card.userName = card.userName[0] + '*'.repeat(card.userName.length - 1)
+								card.idNum = HexToStrig(res[1].substring(44, 108)).replace(/^\d{14}/,
+									'**************'); //身份证号码					
 
 
 								//获取是否有优惠

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

@@ -8,8 +8,7 @@
 			<view><text>订单ID：</text><text>{{state.params['orderId']}}</text></view>
 			<view><text>业务类型：</text><text>{{state.params['businessTypeC']}}</text></view>
 			<view><text>用户名称：</text><text>{{state.params['customerName']}}</text></view>
-			<view><text>是否逾期：</text><text>{{state.params['over']?'逾期':"未逾期"}}</text>
-			</view>
+			<!-- <view><text>是否逾期：</text><text>{{state.params['over']?'逾期':"未逾期"}}</text></view> -->
 			<view><text>状态：</text><text>{{state.params['statusC']}}</text></view>
 			<view v-if="state.params['reason']"><text>原因：</text><text>{{state.params['reason']}}</text></view>
 			<view><text>申请时间：</text><text>{{state.params['insertTime']}}</text>

subpackage/after-sale/replace-equipment/cancellation-contract.vue

@@ -119,13 +119,6 @@
 	// 单选
 	const radioChange = (n) => {
 		console.log("radioChange", n);
-		// if (n == '卡退费') {
-		// 	flag.value = true
-		// 	console.log(flag.value);
-		// } else {
-		// 	flag.value = false
-		// 	console.log(flag.value);
-		// }
 	};
 
 	// // 提交

subpackage/after-sale/replace-equipment/form.vue

@@ -213,19 +213,41 @@
 	},
 
 	]);
-	// 单选数据列表
-	const radiolist1 = reactive([{
-		name: "寄回",
-		val: "1",
-	},
-	]);
+
 
 	const radiolist2 = reactive([{
 		name: "邮寄",
 		val: "1",
 	},
 	]);
+	// 单选数据列表
+	const radiolist1 = reactive([]);
+	onLoad((option) => {
+		params.orderId = option.orderId
+		params.id = option.id
+		if (option.damageMode == "0") {
+			var data = {
+				name: "寄回",
+				val: "1",
+			}
+			var data1 = {
+				name: "不寄回",
+				val: "0",
+			}
+			radiolist1.push(data)
+			radiolist1.push(data1)
+		} else {
+			var data = {
+				name: "寄回",
+				val: "1",
+			}
+			radiolist1.push(data)
+		}
+		console.log("radiolist1.value", radiolist1.value)
+		getexpresslist();
+		getAddressList();
 
+	});
 	const goToAddAddress = () => {
 		uni.navigateTo({
 			url: "/subpackage/orders/addAddress",
@@ -272,7 +294,6 @@
 		};
 		return new Promise(async (resolve, reject) => {
 			const res = await request(changeCardQueryCancle, options);
-			// const data = stringToJson(res.bizContent);
 			console.log("取消申请成功", data)
 			msg('取消申请成功');
 			setTimeout(() => {
@@ -307,13 +328,7 @@
 		form.courierCompany = e[0].value;
 		console.log(e[0].value);
 	};
-	onLoad((option) => {
-		params.orderId = option.orderId
-		params.id = option.id
-		getexpresslist();
-		getAddressList();
 
-	});
 	onShow(() => {
 		getexpresslist();
 		getAddressList();

subpackage/after-sale/replace-equipment/replace-equipment-confirm.vue

@@ -222,8 +222,6 @@
 </style>
 <style lang="scss" scoped>
 	.selectCar-box {
-		// width: 100%;
-		// height: 100%;
 		padding: 30rpx;
 
 		.title {

subpackage/after-sale/replace-equipment/verification.vue

@@ -293,10 +293,11 @@
 		// 		`/subpackage/after-sale/replace-equipment/form?orderId=${params.orderId}&&id=${apply.data.id}`
 		// 	)
 		// } else {
+		console.log("form.damageMode", form.damageMode)
 		queryCckChangejzCardAction().then(val => {
 			console.log("val888888", val.id)
 			navTo(
-				`/subpackage/after-sale/replace-equipment/form?orderId=${params.orderId}&&id=${val.id}`
+				`/subpackage/after-sale/replace-equipment/form?orderId=${params.orderId}&&id=${val.id}&&damageMode=${form.damageMode}`
 			)
 		})
 		// }

subpackage/orders/car-release.vue

@@ -634,7 +634,7 @@
 			type: 2,
 			data: {
 				vehicleId: state.form.vehicleId,
-				// vehicleId: "贵ZAAA44_0",
+				// vehicleId: "贵ZAAA47_0",
 			},
 			method: "POST",
 			showLoading: true,
@@ -646,12 +646,6 @@
 			if (data.data) {
 				writeMsg(data.data)
 			}
-			// state.form.userPosImgUrl = data.customerPosImgUrl;
-			// state.form.userNegImgUrl = data.customerNegImgUrl;
-			// state.form.userName = data.customerName;
-			// state.form.userIdNum = data.customerIdNum;
-			// state.form.address = data.customerAddress;
-			// state.form.tel = data.customerTel;
 		})
 	}
 	const writeMsg = (allData) => {

subpackage/personal-center/search/etcFlowingWater.vue

@@ -30,10 +30,10 @@
 				:class="item.status === 3 ? ' card-info finished' : 'card-info'">
 				<view class="info-wrap">
 					<view class="info-left">
-						<view class="info-left-text">
+						<!-- <view class="info-left-text">
 							<text class="label">单号:</text>
 							<text class="val">{{item.listNo}}</text>
-						</view>
+						</view> -->
 						<view>
 							<text class="label">卡号:</text>
 							<text class="val">{{item.cardId}}</text>
@@ -51,7 +51,7 @@
 				</view>
 				<view class="card-text-wrap">
 					<view class="text-box">
-						<text class="name-text">{{item.enName}}</text>
+						<text class="name-text">{{item.enStationName}}</text>
 						<text
 							class="time-text">{{item.enTime.substring(item.enTime.length -8 ,item.enTime.length-3)}}</text>
 						<text class="date-text">{{item.enTime.substring(0,10)}}</text>
@@ -61,7 +61,7 @@
 						<image class="d-img" :src="`${$imgUrl}order/arrowCard.png`"></image>
 					</view>
 					<view class="text-box">
-						<text class="name-text">{{item.exName}}</text>
+						<text class="name-text">{{item.exStationName}}</text>
 						<text
 							class="time-text">{{item.exTime.substring(item.exTime.length -8 ,item.exTime.length-3)}}</text>
 						<text class="date-text">{{item.exTime.substring(0,10)}}</text>
@@ -164,15 +164,14 @@
 		search(2)
 	})
 	const search = (val) => {
-		if (dataTime.startDate == "开始时间") {
-			msg('请选择开始时间');
-			return;
-		}
-		if (dataTime.endDate == "结束时间") {
-			msg('请选择结束时间');
-			return;
-		}
-		getPpassBillCount()
+		// if (dataTime.startDate == "开始时间") {
+		// 	msg('请选择开始时间');
+		// 	return;
+		// }
+		// if (dataTime.endDate == "结束时间") {
+		// 	msg('请选择结束时间');
+		// 	return;
+		// }
 		if (val == 1) {
 			state.pageNo = 1
 		}
@@ -183,8 +182,8 @@
 			type: 2,
 			data: {
 				cardId: state.cardId,
-				beforeDate: dataTime.startDate,
-				afterDate: dataTime.endDate,
+				beforeDate: dataTime.startDate == "开始时间" ? "" : dataTime.startDate,
+				afterDate: dataTime.endDate == "结束时间" ? "" : dataTime.endDate,
 				pageNo: state.pageNo,
 				pageSize: state.pageSize,
 			},
@@ -197,7 +196,7 @@
 			console.log(result);
 			state.list = [...state.list, ...stringToJson(res.bizContent).data]
 			console.log(result.data);
-
+			getPpassBillCount()
 		})
 
 	}
@@ -206,8 +205,8 @@
 			type: 2,
 			data: {
 				cardId: state.cardId,
-				starDate: dataTime.startDate,
-				endDate: dataTime.endDate,
+				starDate: dataTime.startDate == "开始时间" ? "" : dataTime.startDate,
+				endDate: dataTime.endDate == "结束时间" ? "" : dataTime.endDate,
 			},
 			method: "POST",
 			showLoading: true,
@@ -261,8 +260,8 @@
 			type: 2,
 			data: {
 				cardId: state.cardId,
-				beforeDate: dataTime.startDate,
-				afterDate: dataTime.endDate,
+				beforeDate: dataTime.startDate == "开始时间" ? "" : dataTime.startDate,
+				afterDate: dataTime.endDate == "结束时间" ? "" : dataTime.endDate,
 				vehiclePlate: state.vehicleId.split('_')[0],
 				vehiclePlateColor: state.vehicleId.split('_')[1]
 			},