提交

components/form-builder/form-builder.vue

@@ -235,12 +235,7 @@
 				<view class="divider" v-if="item.divider"></view>
 			</view>
 		</view>
-		<view v-if="config.submitName=='申请换货'" class="message">
-			<view><text class="red">*</text>设备更换需将原设备寄回</view>
-			<view>寄回信息：</view>
-			<view>收件人：ETC售后 联系电话：18798751224（此电话仅用于ETC售后收取快递，如需咨询业务请致电4008008787）</view>
-			<view>寄回地址：贵州省贵阳市云岩区普天广场11楼</view>
-		</view>
+
 		<view class="subBtn">
 			<submit-button :title="config ? config.submitName : '提交'" form-type="submit"
 				@submit="formSubmit"></submit-button>

pages/index/index.vue

@@ -209,7 +209,6 @@
 			</filter>
 		</view>
 	</view>
-	<button @click="dingyue">订阅</button>
 </template>
 
 <script setup lang="ts">
@@ -629,15 +628,6 @@
 		}
 		// #endif
 	}
-	const dingyue = () => {
-		uni.requestSubscribeMessage({
-			tmplIds: ['zPVvoFmSckOrC-M_JE6FUTQo8FmVH7O8i-RO1z2SWQQ'],
-			success(res) {
-				console.log("通知用户消息订阅", res)
-				console.log("getItem(StorageKeys.OpenId)", getItem(StorageKeys.OpenId))
-			}
-		})
-	}
 </script>
 
 <style>

subpackage/after-sale/activation/activate.vue

@@ -130,7 +130,7 @@
 		vehiclePlate: "",
 		vehiclePlateColor: "",
 		vin: "",
-		wheelCount: "",
+		wheelCount: 0,
 		isJH: ""
 	});
 	const disabled = ref(false);
@@ -158,7 +158,7 @@
 		outlineL: 0, //外廓 长
 		outlineW: 0, //外廓 宽
 		outlineH: 0, //外廓 高
-		wheelCount: "", //车轮数
+		wheelCount: 0, //车轮数
 		vehicleIdNo: "", //车牌号
 		vehiclePlateColorStr: "",
 		customerTel: "",
@@ -235,7 +235,7 @@
 				fileDataStrings.vehicleEngineNum = orderInfo.vehicleEngineNum;
 				fileDataStrings.axleCount = parseInt(orderInfo.vehicleAxleCount); //轴数
 				fileDataStrings.engineNum = orderInfo.vehicleVin; //发动机
-				fileDataStrings.type = parseInt(orderInfo.vehicleType); //类型
+				fileDataStrings.type = parseInt(orderInfo.type); //类型
 				fileDataStrings.vehiclePlate = orderInfo.vehiclePlate; //车牌
 				fileDataStrings.vehiclePlateColor = orderInfo.vehiclePlateColor; //车牌颜色
 				fileDataStrings.vehicleDimensions = orderInfo.vehicleDimensions;
@@ -289,18 +289,17 @@
 			showLoading: true, //是否显示加载中(默认显示)
 		}).then((les) => {
 			let result = stringToJson(les.bizContent);
-			console.log(les, '=========123')
 			let res1 = result.gbkFileData; //车牌号
 			let res2 = IntegerToHexString(fileDataStrings.vehiclePlateColor, 4); //车牌颜色
 
-			let res3 = IntegerToHexString(1, 2); //类型
-
-			let res4 = IntegerToHexString(1, 2); //用户类型
+			let res3 = IntegerToHexString(fileDataStrings.type, 2); //类型
+			let userTypeNumber = fileDataStrings.userType == 'PERSONAL_USER' ? 1 : 2
+			let res4 = IntegerToHexString(userTypeNumber, 2); //用户类型
 			let res5 = IntegerToHexString(fileDataStrings.outlineL, 4); //车辆尺寸 长
 			let res6 = IntegerToHexString(fileDataStrings.outlineW, 2); //车辆尺寸 宽
 			let res7 = IntegerToHexString(fileDataStrings.outlineH, 2); //车辆尺寸 高
 			let res8 = IntegerToHexString(4, 2); //获取轮数
-			let res9 = IntegerToHexString(4, 2); //轴数
+			let res9 = IntegerToHexString(fileDataStrings.axleCount, 2); //轴数
 
 			let res10 = IntegerToHexString(null, 4); //轴距32
 			let res11 = IntegerToHexString(fileDataStrings.approvedCount, 6); //核载人数
@@ -309,7 +308,7 @@
 
 			// let res12 = JSON.parse(res.bizContent).gbkFileData; //车编号
 			let res13 = AsciToHexString(fileDataStrings.vehicleEngineNum, 32); //发动机
-
+			console.log(les, '=========123', )
 			fun(res1 + res2 + res3 + res4 + res5 + res6 + res7 + res8 + res9 + res10 + res11 + res12 + res13);
 		})
 	};
@@ -854,9 +853,13 @@
 
 
 					// #ifdef MP-WEIXIN
-					uni.navigateTo({
-						url: "/subpackage/after-sale/deviceInfo/deviceInfo",
-					});
+					msg("激活成功")
+					setTimeout(() => {
+						uni.navigateTo({
+							url: "/subpackage/after-sale/deviceInfo/deviceInfo",
+						});
+					}, 2000)
+
 					// #endif
 				}
 			})

subpackage/after-sale/card-Renewal/renewal-confirm.vue

@@ -461,14 +461,14 @@
 			let res1 = result.gbkFileData; //车牌号
 			let res2 = IntegerToHexString(fileDataStrings.vehiclePlateColor, 4); //车牌颜色
 
-			let res3 = IntegerToHexString(1, 2); //类型
-
-			let res4 = IntegerToHexString(1, 2); //用户类型
+			let res3 = IntegerToHexString(fileDataStrings.type, 2); //类型
+			let userTypeNumber = fileDataStrings.userType == 'PERSONAL_USER' ? 1 : 2
+			let res4 = IntegerToHexString(userTypeNumber, 2); //用户类型
 			let res5 = IntegerToHexString(fileDataStrings.outlineL, 4); //车辆尺寸 长
 			let res6 = IntegerToHexString(fileDataStrings.outlineW, 2); //车辆尺寸 宽
 			let res7 = IntegerToHexString(fileDataStrings.outlineH, 2); //车辆尺寸 高
 			let res8 = IntegerToHexString(4, 2); //获取轮数
-			let res9 = IntegerToHexString(4, 2); //轴数
+			let res9 = IntegerToHexString(fileDataStrings.axleCount, 2); //轴数
 
 			let res10 = IntegerToHexString(null, 4); //轴距32
 			let res11 = IntegerToHexString(fileDataStrings.approvedCount, 6); //核载人数

subpackage/after-sale/deviceInfo/deviceInfo.vue

@@ -18,10 +18,10 @@
 				<view class="cell-left">车辆类型</view>
 				<view class="cell-right">{{ card.type }}</view>
 			</view>
-			<view class="cell">
+			<!-- <view class="cell">
 				<view class="cell-left">车辆用户类型</view>
 				<view class="cell-right">{{ card.v_userType }}</view>
-			</view>
+			</view> -->
 			<view class="cell">
 				<view class="cell-left">车牌号</view>
 				<view class="cell-right">{{ card.vehiclePlate }}</view>
@@ -238,6 +238,7 @@
 					card.version = res[2].substring(18, 19) >= 4 ? "4x" : "2x";
 					card.money = res[3].substring(0, 8);
 					card.v_userType = parseInt(res[2].substring(80, 82), 16);
+					console.log("card.v_userType", card.v_userType)
 					card.vehiclePlate = HexToStrig(res[2].substring(56, 80));
 					if (res[2].substring(18, 19) >= 4) {
 						card.type = getVehicleType(parseInt(res[2].substring(84, 86), 16));
@@ -340,7 +341,8 @@
 							console.log("===========", obu.num, res[1].substring(0, res[1].length - 4))
 							decryptObuVehicleInfo(obu.num, res[1].substring(0, res[1].length - 4),
 								function(res) {
-									console.log("obu信息", res, res.substring(44, 48));
+									console.log("obu信息", res, res.substring(44, 48), "车轴数", res
+										.substring(42, 44));
 									obu.approvedCount = HexToInt(res.substring(48, 54));
 									obu.axleCount = HexToInt(res.substring(42, 44));
 									obu.axleDistance = HexToInt(res.substring(44, 48));

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

@@ -408,14 +408,14 @@
 			let res1 = result.gbkFileData; //车牌号
 			let res2 = IntegerToHexString(fileDataStrings.vehiclePlateColor, 4); //车牌颜色
 
-			let res3 = IntegerToHexString(1, 2); //类型
-
-			let res4 = IntegerToHexString(1, 2); //用户类型
+			let res3 = IntegerToHexString(fileDataStrings.type, 2); //类型
+			let userTypeNumber = fileDataStrings.userType == 'PERSONAL_USER' ? 1 : 2
+			let res4 = IntegerToHexString(userTypeNumber, 2); //用户类型
 			let res5 = IntegerToHexString(fileDataStrings.outlineL, 4); //车辆尺寸 长
 			let res6 = IntegerToHexString(fileDataStrings.outlineW, 2); //车辆尺寸 宽
 			let res7 = IntegerToHexString(fileDataStrings.outlineH, 2); //车辆尺寸 高
 			let res8 = IntegerToHexString(4, 2); //获取轮数
-			let res9 = IntegerToHexString(4, 2); //轴数
+			let res9 = IntegerToHexString(fileDataStrings.axleCount, 2); //轴数
 
 			let res10 = IntegerToHexString(null, 4); //轴距32
 			let res11 = IntegerToHexString(fileDataStrings.approvedCount, 6); //核载人数

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

@@ -30,25 +30,6 @@
 						</radio-group>
 					</view>
 				</u-form-item>
-
-				<!-- 	<u-form-item prop="phone">
-					<view class="from_item" style="background-color: #f7f7f7">
-						<text><text style="color: red"></text>手机号：</text>
-						<u-input v-model="form.mobile" :disabled="true" class="input" />
-					</view>
-				</u-form-item>
-				<u-form-item prop="code">
-					<view class="from_item">
-						<text><text style="color: red"></text>验证码：</text>
-						<u-input v-model="form.code" placeholder="请输入验证码" class="input" />
-						<view class="hint2">
-							<view class="green">{{ codeDuration === 0 ? "" : codeDuration }}</view>
-							<view class="grey" @click="getCode">{{
-						    codeDuration === 0 ? "发送验证码" : "秒后可重发"
-						  }}</view>
-						</view>
-					</view>
-				</u-form-item> -->
 			</view>
 		</u-form>
 		<view style="margin: 30rpx;" v-if="state.isPicture">
@@ -58,10 +39,7 @@
 		</view>
 
 		<view class="btn-wrapper">
-			<!-- <button class="default button" v-if="apply.data.status" @click="changeCardQueryCancleAction()"
-				type="default">撤回申请</button> -->
-			<!-- <button class="submit button" v-if="apply.data.status === 'APPLY'||!apply.data.status" @click="toPage()"
-				type="default">下一步填写资料</button> -->
+
 			<button class="submit button" v-if="apply.data.status === 'APPLY'||!apply.data.status" @click="toPage()"
 				type="default">下一步填写资料</button>
 		</view>
@@ -203,11 +181,6 @@
 		params.cardId = option.cardId
 		params.orderId = option.orderId
 
-		// changeCardQueryAction().then(val => {
-		// 	console.log(val);
-		// 	apply.data = val;
-		// 	apply.data.status = val.status;
-		// })
 	});
 
 	onShow(() => {
@@ -216,8 +189,6 @@
 	const select = (e) => {
 		console.log('选择文件：', e)
 		uploadFile(e.tempFilePaths[0], "", "").then((data) => {
-			// state.form.vehBodyUrl = data;
-			// const data = stringToJson(res.bizContent);
 			const imgArr = state.imageList
 			imgArr.push(data)
 			state.imageList = imgArr;
@@ -283,13 +254,7 @@
 			}
 
 		})
-		// return new Promise(async (resolve, reject) => {
-		// 	const res = await request(changeCardQuery, options);
-		// 	const data = stringToJson(res.bizContent);
-		// 	resolve(data);
-		// }).catch((error) => {
-		// 	reject(error);
-		// });
+
 	}
 
 	//撤销订单
@@ -336,11 +301,7 @@
 		};
 		return new Promise(async (resolve, reject) => {
 			const res = await request(changeCardApply, options);
-			// if (res.bizContent.indexOf("/") !== -1) {
-			// 	var resultData = stringToJson(res.bizContent);
-			// } else {
 			var resultData = res.bizContent
-			// }
 			console.log("data88888", JSON.parse(resultData))
 			resolve(JSON.parse(resultData));
 		}).catch((error) => {
@@ -350,19 +311,6 @@
 
 	//下一步
 	const toPage = () => {
-		// myForm.value.validate((valid) => {
-		// 	if (valid) {
-		// 		const options = {
-		// 			type: 2,
-		// 			data: {
-		// 				mobile: form.mobile,
-		// 				code: form.code
-		// 			},
-		// 			method: "POST",
-		// 			showLoading: true,
-		// 		};
-		// 		request(checkCode, options)
-		// 			.then(() => {
 		console.log("sdkchkdscn", apply.data)
 		if (apply.data.status === 'APPLY') {
 
@@ -370,40 +318,14 @@
 				`/subpackage/after-sale/replace-equipment/form?orderId=${params.orderId}&&id=${apply.data.id}`
 			)
 		} else {
-			// if (form.applyTypeName === '卡') {
-			// 	form.applyType = 'EXCHANGE_CARD'
-			// } else if (form.applyTypeName === 'OBU') {
-			// 	form.applyType = 'EXCHANGE_OBU'
-			// } else if (form.applyTypeName === '卡和OBU') {
-			// 	form.applyType = 'EXCHANGE_ALL'
-			// }
-			// if (form.damageModeName === '人为损坏') {
-			// 	form.damageMode = '0'
-			// } else if (form.damageModeName === '自然损坏') {
-			// 	form.damageMode = '1'
-			// }
-
 			queryCckChangejzCardAction().then(val => {
 				console.log("val888888", val.id)
-				// if(!val.id){
-				// 	msg("已存在对应的申请单");
-				// }else{
 				navTo(
 					`/subpackage/after-sale/replace-equipment/form?orderId=${params.orderId}&&id=${val.id}`
 				)
-				// }
-
 			})
 		}
 
-		// 		})
-		// 		.catch((err) => {
-		// 			console.log(err);
-		// 		});
-		// } else {
-		// 	console.log("验证未通过");
-		// }
-		// });
 	};
 </script>
 

subpackage/orders/apply-ex-goods-step1.vue

@@ -1,20 +1,8 @@
 <template>
-	<!-- <navBar title="补办ETC卡"></navBar> -->
 	<view class="oderPage">
 		<u-form :model="form" ref="myForm" :error-type="errorType">
 			<view class="from">
-				<!-- <u-form-item prop="operation">
-					<view class="from_item">
-						<text><text style="color: red;">*</text>注销方式：</text>
-						<u-radio-group v-model="form.operation">
-							<u-radio :customStyle="{marginBottom: '8px'}" activeColor="#2CE242"
-								v-for="(item, index) in radiolist1" :key="index" :label="item.name" :name="item.name"
-								@change="radioChange">
-								{{item.disabled}}
-							</u-radio>
-						</u-radio-group>
-					</view>
-				</u-form-item> -->
+
 				<u-form-item prop="applyType">
 					<view class="from_item">
 						<text><text style="color: red;">*</text>申请类型：</text>
@@ -31,6 +19,12 @@
 				</u-form-item>
 			</view>
 		</u-form>
+		<view class="message">
+			<view><text class="red">*</text>设备更换需将原设备寄回</view>
+			<view>寄回信息：</view>
+			<view>收件人：ETC售后 联系电话：18798751224（此电话仅用于ETC售后收取快递，如需咨询业务请致电4008008787）</view>
+			<view>寄回地址：贵州省贵阳市云岩区普天广场11楼</view>
+		</view>
 		<button class="submit" @click="submit">下一步</button>
 		<!-- 自提网点弹窗 -->
 		<view>
@@ -85,36 +79,11 @@
 	const index = ref('-1');
 	const columnsOld = ["换货-换卡签"]
 	const columns = [
-		// 	{
-		// 	label: '换货-换卡',
-		// 	// 其他属性值
-		// 	id: 'CARD'
-		// },
-		// {
-		// 	label: '换货-换签',
-		// 	// 其他属性值
-		// 	id: 'OBU'
-		// },
 		{
 			label: '换货-换卡签',
 			// 其他属性值
 			id: 'ALL'
 		},
-		// {
-		// 	label: '换卡签-换卡',
-		// 	// 其他属性值
-		// 	id: 'EXCHANGE_CARD'
-		// },
-		// {
-		// 	label: '换卡签-换签',
-		// 	// 其他属性值
-		// 	id: 'EXCHANGE_OBU'
-		// },
-		// {
-		// 	label: '换卡签-换卡签',
-		// 	// 其他属性值
-		// 	id: 'EXCHANGE_ALL'
-		// },
 	]
 	const bindPickerChange = (e) => {
 		console.log('picker发送选择改变，携带值为', e.detail.value)
@@ -135,17 +104,6 @@
 		myForm.value.setRules(rules)
 	})
 
-	// 单选数据列表
-	const radiolist1 = reactive([{
-		name: 1,
-		disabled: '有卡注销'
-	},
-	{
-		name: 2,
-		disabled: '无卡注销'
-	},
-	])
-
 	let show = ref(false)
 
 	// 打开地区先择器
@@ -270,4 +228,15 @@
 		margin: 26px auto;
 		font-size: 32rpx;
 	}
+
+	.red {
+		color: red;
+		margin-right: 10rpx;
+	}
+
+	.message {
+		font-size: 30rpx;
+		margin-top: 30rpx;
+		padding: 0 20rpx;
+	}
 </style>

subpackage/orders/apply-ex-goods.vue

@@ -478,7 +478,9 @@
 						"您申办的ETC订单已申请换货",
 						() => {
 							uni.$emit("refreshOrder");
-							uni.navigateBack();
+							uni.navigateBack({
+								delta: 2
+							})
 						},
 						"申请成功",
 						false

subpackage/orders/essential-information.vue

@@ -261,6 +261,17 @@
 		state.show = false;
 	};
 	const nextAction = () => {
+		uni.requestSubscribeMessage({
+			tmplIds: ['Uo2y_eF53CZt7vffE-5ktKQ7WxUhX8n5GVqVlmykmDE'],
+			complete(res) {
+				console.log("通知用户消息订阅", res)
+				nextActionRequest()
+			}
+		})
+
+
+	};
+	const nextActionRequest = () => {
 		if (!state.data.vehiclePlate) {
 			msg("请输入申办车牌");
 			return;
@@ -337,8 +348,7 @@
 				msg(item.data.data.canSubmitMsg);
 			}
 		})
-
-	};
+	}
 	//按照订单阶段去跳转
 	const orderGoAction = () => {
 		var orderParmas = {

subpackage/orders/order-details-new.vue

@@ -455,7 +455,8 @@
 							<view class="btn space"
 								v-if="( state.orderInfo.isProduct==1 && state.orderInfo.isService==1) ">
 								已评价</view>
-							<view class="btn space" v-else @click.stop="gotoEvaluateProduct(state.orderInfo)">去评价</view>
+							<view class="btn-green" v-else @click.stop="gotoEvaluateProduct(state.orderInfo)">去评价产品
+							</view>
 						</view>
 					</view>
 					<view v-if="state.isWeiXin==2">
@@ -465,7 +466,7 @@
 								已评价
 							</view>
 							<view class='evaluation' v-else>
-								<view class="btn space" @click.stop="gotoEvaluateSalesman(state.orderInfo)">去评价
+								<view class="btn-green" @click.stop="gotoEvaluateSalesman(state.orderInfo)">去评价
 								</view>
 							</view>
 						</view>