2023年10月7日16:53:12

composables/order/useOrderSkip.ts

@@ -11,7 +11,8 @@ export default function useOrderSkip() {
 		console.log('输出内容=====', orderInfo)
 		if (orderInfo.orderType === 'ISSUE') {
 			// #ifdef MP-WEIXIN
-			navTo(`/subpackage/orders/order-details-new?id=${orderInfo.id}&appraise=${orderInfo.appraise}`);
+			// navTo(`/subpackage/orders/order-details-new?id=${orderInfo.id}&appraise=${orderInfo.appraise}`);
+			navTo(`/subpackage/orders/order_payment?orderId=${orderInfo.orderId}&isValueCard=${orderInfo.isValueCard}`);
 			// #endif
 			// #ifdef MP-ALIPAY
 			navTo(`/subpackage/orders/order_payment?orderId=${orderInfo.orderId}&isValueCard=${orderInfo.isValueCard}`);
@@ -76,19 +77,13 @@ export default function useOrderSkip() {
 			url = '/subpackage/orders/car-release';
 		} else if (orderInfo.orderStep === OrderStatus.完成车辆信息上传 && orderInfo.isValueCard != 1) {
 			url = `/subpackage/orders/release-products`;
-		} else if (orderInfo.orderStep === OrderStatus.待加购权益 && orderInfo.isValueCard == 1) {
+		} else if (orderInfo.orderStep === OrderStatus.待加购权益 ) {
 			url = `/subpackage/orders/interestsList?orderId=${orderInfo.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`;
 			// uni.redirectTo({
 			//   url: `/subpackage/orders/choice-product?orderId=${val.orderId}`,
 			// });
 		} else {
-			// #ifdef MP-ALIPAY
-			url = `/subpackage/orders/sign-up-ali`;
-			// #endif
-			// #ifdef MP-WEIXIN
-			url = `/subpackage/orders/essential-information`;
-			// #endif
-
+			
 		}
 		console.log("url", url)
 		navTo(`${url}?orderId=${orderInfo.orderId}&clientFee=${orderInfo.amount}&id=${orderInfo.productId}&vehiclePlateColor=${orderInfo.vehiclePlateColor}&fromOrder=true&type=${orderInfo.type}&userType=${orderInfo.userType === 'PERSONAL_USER' ? '1' : '2'}`);

pages/bluetooth/bluetooth.vue

@@ -501,7 +501,34 @@
 			datas.setData("bluLinkStatus", true);
 			datas.setData("connectPrefixName", connectPrefixName.value);
 
+<<<<<<< HEAD
 			oks();
+=======
+			//routeType 1.激活（订单来）  2.圈存 （/pages/recharge/recharge来）3.信息重写 4.信息读取  5从哪里来回哪里去监听bluetoothLink
+			if (routeType.value == "1") {
+				uni.navigateTo({
+					url: "/subpackage/after-sale/activation/activate",
+				});
+			} else if (routeType.value == "2") {
+				uni.navigateTo({
+					url: `/pages/recharge/recharge?connectSuccess=1&&cardId=${state.cardId}&&fee=${state.fee}`,
+				});
+			} else if (routeType.value == "3") {
+
+			} else if (routeType.value == "4") {
+				uni.navigateTo({
+					url: "/subpackage/after-sale/deviceInfo/deviceInfo",
+				});
+			}
+			else if (routeType.value == "5") {
+				uni.$emit('bluetoothLink', { status: true })
+				// uni.navigateBack({
+				// 	delta: 1,
+				// })
+			} else {
+				return;
+			}
+>>>>>>> 24fd0d73864951b1036604add3def96861fc606e
 		} else {
 			alertF(res.msg);
 		}

pages/order/components/order-list-item-new.vue

@@ -49,14 +49,14 @@
 
 			</view>
 			<!-- 待支付 -->
-			<view class="btns" v-if="item.orderStep == OrderStatus.待加购权益&& item.isValueCard == 1">
+			<view class="btns" v-if="item.orderStep == OrderStatus.待加购权益">
 				<view class="btn btn-normal" @click.stop="gotoCancelOrder(item)">取消订单</view>
 				<view class="btn btn-primary" @click.stop="gotoEditUserOrUnitInfo(item)">加购权益</view>
 			</view>
-			<view class="btns" v-if="item.orderStep == OrderStatus.待加购权益&& item.isValueCard != 1">
+			<!-- <view class="btns" v-if="item.orderStep == OrderStatus.待加购权益&& item.isValueCard != 1">
 				<view class="btn btn-normal" @click.stop="gotoCancelOrder(item)">取消订单</view>
 				<view class="btn btn-primary" @click.stop="gotoOrderDetails(item)">支付</view>
-			</view>
+			</view> -->
 			<view class="btns" v-if="item.orderStep == OrderStatus.待支付2">
 				<view class="btn btn-normal" @click.stop="gotoCancelOrder(item)">取消订单</view>
 				<view class="btn btn-primary" @click.stop="gotoOrderDetails(item)">支付</view>

pages/recharge/recharge.vue

@@ -182,7 +182,7 @@ const selectConfirm = (item: any) => {
 		// #ifdef MP-WEIXIN
 		getOpenID();/*传参*/
 		// #endif
-		
+		console.log("开始option",option)
 		state.cardId = option.cardId;
 		state.connectSuccess = option.connectSuccess;
 		state.orderNum = getItem("orderNum");

subpackage/after-sale/activation-once-again/activation-once-again.vue

@@ -165,6 +165,7 @@
 	});
 
 	onLoad((option) => {
+		console.log('======重新激活开始======',option);
 		//请求订单详情
 		queryOrderDetail(option.id);	
 		
@@ -178,7 +179,10 @@
 				getObuId()
 			}
 			//移除监听
-			uni.$off('bluetoothLink')
+			console.log('======移除监听======',res)
+			
+			// uni.$off('bluetoothLink')
+			
 		})
 
 	})
@@ -356,12 +360,18 @@
 			.then(() => {
 				tools.hideLoadingAlert();
 				state.showPopup = true;
+				uni.navigateBack({
+					delta: 1,
+				})
 			});
+			
 	};
 	
 	
 	
 
+
+
 </script>
 
 <style>

subpackage/after-sale/activation/activate.vue

@@ -235,11 +235,8 @@
 		console.log('======获取OBU号======')
 		let cmdArray = [cmd.HOME_DIRECTORY, cmd.OBU_SYSTEM_FILE, cmd.RANDOM_NUMBER];
 		tools.showLoadingAlert("正在执行指令");
-		console.log('======cmdArray======', cmdArray)
 		bluetoothUtil.transCmd(cmdArray, "20", function(res) {
-			console.log('======cmdArray1======', cmdArray)
 			tools.hideLoadingAlert();
-			console.log('======cmdArray2======', cmdArray)
 			var status = res[1].substring(res[1].length - 4, res[1].length);
 
 			console.log('获取OBU号执行结果' + status, res)
@@ -255,8 +252,9 @@
 
 	//获取fileData
 	const getFileData = () => {
-		console.log(fileDataStrings);
+		console.log("======修改车辆信息0.1======",fileDataStrings);
 		//获取fileData 拼接字符串
+		
 		let res1 = AsciToHexString(fileDataStrings.vehiclePlate, 24); //车牌号
 		let res2 = IntegerToHexString(fileDataStrings.vehiclePlateColor, 4); //车牌颜色
 
@@ -721,11 +719,85 @@
 				// 		"&orderId=" +
 				// 		state.orderId,
 				// });
-				uni.navigateTo({
-					url: "/subpackage/after-sale/deviceInfo/deviceInfo",
-				});
+				bindCardAndObu();
+				
+			});
+	};
+	/**
+	 * 卡签绑定 请求
+	 */
+	const bindCardAndObu = () => {
+		console.log('======卡签绑定======')
+		tools.showLoadingAlert("加载中");
+		let options = {
+			type: 2, //type: 2,JSON格式提交数据(默认表单形式提交)
+			data: {
+				obuId: obu.obuId,
+				cardId: card.cardId,
+			}, //请求参数
+			method: "POST", //提交方式(默认POST)
+			showLoading: true, //是否显示加载中(默认显示)
+		};
+		//调用方式
+		request(IFCODE.bindCardAndObu, options)
+			.then((res) => {
+				tools.hideLoadingAlert();
+				let result = JSON.parse(res.bizContent);
+				console.log("写卡指令============", result)
+					tools.showLoadingAlert("执行指令中");
+					bluetoothUtil.transCmd(result.command.split(","), "10", function(res) {
+						tools.hideLoadingAlert();
+						let response = res.toString();
+						getCommandBackEnd(result.command, result.cosRecordId, response);
+						// uni.navigateTo({
+						// 	url: "/subpackage/after-sale/deviceInfo/deviceInfo",
+						// });
+					});
+			})
+			.catch((err) => {
+				console.log(err);
 			});
 	};
+	/**
+	 * 卡签绑定写卡指令返回 请求
+	 */
+	const getCommandBackEnd = (command, cosRecordId, response) => {
+		console.log('======卡签绑定循环写卡指令中======')
+		tools.showLoadingAlert("加载中");
+		let options = {
+			type: 2, //type: 2,JSON格式提交数据(默认表单形式提交)
+			data: {
+				cardId: card.cardId,
+				orderId: fileDataStrings.orderId,
+				command: command,
+				response: response,
+				cosRecordId: cosRecordId,
+				cosType: "4"
+			}, //请求参数
+			method: "POST", //提交方式(默认POST)
+			showLoading: true, //是否显示加载中(默认显示)
+		};
+	
+		//调用方式
+		request(IFCODE.writeCardBack, options)
+			.then((res) => {
+				tools.hideLoadingAlert();
+				let result = JSON.parse(res.bizContent);
+				console.log("写卡指令============", result)
+				if (result.orderStatus == 1 || result.orderStatus == "1") {
+					tools.showLoadingAlert("执行指令中");
+					bluetoothUtil.transCmd(result.command.split(","), "10", function(res) {
+						tools.hideLoadingAlert();
+						let response = res.toString();
+						getCommandBackEnd(result.command, cosRecordId, response);
+					});
+				} else {
+					uni.navigateTo({
+						url: "/subpackage/after-sale/deviceInfo/deviceInfo",
+					});
+				}
+			})
+	};
 </script>
 
 <style>

subpackage/after-sale/arrears/arrears.vue

@@ -237,7 +237,6 @@
 				val.checked = false;
 			})
 		}
-
 		console.log(state.suppleNoList, "支付集合");
 	}
 
@@ -356,7 +355,7 @@
 			 			  tradeNO: data.tranPackage,
 			 			  success: res => {
 			 			    console.log("支付成功", res);
-							const dataaa = stringToJson(res.bizContent);
+							
 							allPrice.value = 0
 							
 							const options = {

subpackage/after-sale/pin-code-deblocking/pin-code-confirm.vue

@@ -207,7 +207,16 @@
 					} else if (cosResponse == "9303") {
 						tools.showModalAlert("此卡pin已永久锁定！请联系客服进行换卡处理！", function successFunc() {});
 					} else {
-						getCommandBack(result.command, res.cosResponse, result.pinType);
+						console.log("卡执行指令结果",res)
+						let cosResponse = ""
+						for(let i = 0; i < res.length; i++){
+							if(i < res.length - 1 ){
+								cosResponse += res[i] + ","
+							}else{
+								cosResponse += res[i]
+							}
+						}
+						getCommandBack(result.command, cosResponse, result.pinType);
 					}
 				})
 			}

subpackage/orders/car-release.vue

@@ -271,7 +271,7 @@
 								// #endif
 								// #ifdef MP-WEIXIN
 								uni.redirectTo({
-									url: `/subpackage/orders/sign-up?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`,
+									url: `/subpackage/orders/interestsList?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`// url: `/subpackage/orders/sign-up?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`,
 								});
 								// #endif
 								

subpackage/orders/interestsList.vue

@@ -1,4 +1,4 @@
-<template>
+s<template>
 	<view class="content">
 		<view class="item" v-for="(item,index) in state.list" :key='index'>
 			<view class="title">

subpackage/orders/order_payment.vue

@@ -6,7 +6,7 @@
 			<image style="width: 100%; height: 170rpx; border-radius: 20rpx"
 				:src="`${$imgUrl}applyCard/product-bg.png`"></image>
 			<view class="item-value">
-				<image class="icon-tip" :src="`${$imgUrl}applyCard/alibaba.png`"></image>
+				<image class="icon-tip" :src="imageUrl"></image>
 				<view class="content">
 					<view class="title">
 						{{ item.payName }}
@@ -69,6 +69,7 @@
 	import { getItem, StorageKeys, setItem } from "@/utils/storage.ts";
 	import { msg } from "@/utils/utils";
 	const imgURL = `${fileURL}image/`;
+	let imageUrl = ""
 	// import { setItem } from "@/utils/storage";
 
 	let logo
@@ -90,50 +91,7 @@
 		});
 	}
 	const savaHandle = (val) => {
-		// console.log("vAL", val)
-		// setItem("clientFee", val.clientFee);
-		// setItem("promoteId", val.promoteId);
-		// setItem("isValueCard", val.isValueCard);
-		// state.isSign = val.isSign;
-		// // 判断是几张卡
-		// console.log("val.cardTypeArr.split(", ")", val.cardTypeArr.split(","))
-		// // if (val.promoteName.indexOf('选装') != -1) {
-		// // 	if (val.cardTypeArr.split(",")[0] == "记账卡") {
-		// // 		state.isValueCard = 2
-		// // 	} else if (val.cardTypeArr.split(",")[0] == '储值卡') {
-		// // 		state.isValueCard = 1
-		// // 	} else {
-		// // 		state.isValueCard = 3
-		// // 	}
-		// // 	uni.redirectTo({
-		// // 		url: `/subpackage/orders/verify/verify-phone/verify-phone?promoteId=${getItem("promoteId")}&userType=${state.userType}&type=${state.type}&isValueCard=${state.isValueCard}`,
-		// // 	});
-		// // 	return
-		// // }
-
-		// if (val.cardTypeArr.split(",").length == 1) {
-		// 	if (val.cardTypeArr.split(",")[0] == "记账卡") {
-		// 		state.isValueCard = 2
-		// 	} else if (val.cardTypeArr.split(",")[0] == '储值卡') {
-		// 		state.isValueCard = 1
-		// 	} else {
-		// 		state.isValueCard = 3
-		// 	}
-		// 	uni.redirectTo({
-		// 		url: `/subpackage/orders/essential-information?promoteId=${getItem("promoteId")}&userType=${state.userType}&type=${state.type}&isValueCard=${state.isValueCard}`,
-		// 	});
-		// } else {
-		// 	state.radiolist1 = [];
-		// 	// 处理卡的数据
-		// 	for (var i = 0; i < val.cardTypeArr.split(",").length; i++) {
-		// 		const obj = {};
-		// 		obj["name"] = val.cardTypeArr.split(",")[i];
-		// 		obj["disabled"] = false;
-		// 		state.radiolist1.push(obj)
-		// 	}
-		// 	state.choiceCardShow = true;
-		// 	console.log("state.radiolist1", state.radiolist1)
-		// }
+
 		if (val.payStatus === 'UNPAY') {
 			 // #ifdef MP-ALIPAY
 			 
@@ -188,12 +146,81 @@
 			 });
 			 	
 			 // #endif
+			// #ifdef MP-WEIXIN
+			// if (!state.openid) {
+			// 	getOpenID();
+			
+			// }
+			uni.login({
+				provider: "weixin",
+				success: function (e) {
+					uni.request({
+						url: `https://api.weixin.qq.com/sns/jscode2session?appid=${wechatAppID}&secret=${wechatSecret}&js_code=${e.code}&grant_type=authorization_code`,
+						success: (res: any) => {
+							const options = {
+								type: 2,
+								data: {
+									orderId:state.orderId,
+									wxOpenid: res.data.openid,
+									payType:val.payType
+								},
+								method: "POST",
+								showLoading: true,
+							};
+							request(PAYMENTORDERAPPLY, options).then((res) => {
+								const data = stringToJson(res.bizContent);
+								uni.requestPayment({
+									provider: "wxpay",
+									orderInfo: "",
+									timeStamp: data.timestamp,
+									nonceStr: data.noncestr,
+									package: data.wxPackage ?data.wxPackage: "",
+									signType: data.signType,
+									paySign: data.sign,
+									success: function (e) {
+										console.log("支付成功", res);
+										refresh();
+									},
+									fail: function (err) {
+										confirm(err, () => {}, "支付失败", false);
+									},
+								});
+							});
+						},
+					});
+				},
+			});
+
+			
+			// #endif
 		}
 	};
+	const getOpenID = () => {
+		uni.login({
+			provider: "weixin",
+			success: function (e) {
+				uni.request({
+					url: `https://api.weixin.qq.com/sns/jscode2session?appid=${wechatAppID}&secret=${wechatSecret}&js_code=${e.code}&grant_type=authorization_code`,
+					success: (res: any) => {
+						state.openid = res.data.openid;
+					},
+				});
+			},
+		});
+	};
 	const refresh = () =>{
+		let source = ""
+		// #ifdef MP-ALIPAY
+			source ="ALI"
+		// #endif
+		// #ifdef MP-WEIXIN
+			source ="WECHAT"
+			// getOpenID();
+		// #endif
+		
 		var data = {
 			orderId: state.orderId,
-			source: 'ALI'  //请求方来源
+			source: source   //请求方来源
 		};
 		const options = {
 			type: 2,
@@ -209,9 +236,8 @@
 			// console.log(typeof(data));
 			if(data.paymentStatus == 'ALLSUCCESS'){
 				gotoEditUserOrUnitInfo()
-				// uni.redirectTo({
-				// 	url: `/subpackage/orders/sign-up-ali?orderId=${state.orderId}`,
-				// });
+				
+				
 			}
 			state.dataArray = data.datas;
 			// HANDLE("办理费",1){},
@@ -264,6 +290,17 @@
 	onLoad((option : any) => {
 		state.orderId = option.orderId;
 		state.isValueCard = option.isValueCard;
+		let source = ""
+	
+		// #ifdef MP-ALIPAY
+			imageUrl = imgURL + "applyCard/alibaba.png";
+			source ="ALI"
+			
+		// #endif
+		// #ifdef MP-WEIXIN
+			imageUrl = imgURL + "applyCard/wechat.png";
+			source ="WECHAT"
+		// #endif
 		// state.userType = option.userType;
 		// state.vehiclePlateColor = option.vehiclePlateColor;
 		// state.userType = option.userType;
@@ -286,10 +323,19 @@
 			console.log(data);
 			// console.log(typeof(data));
 			if(data.paymentStatus == 'ALLSUCCESS'){
-				gotoEditUserOrUnitInfo(state)
+				// gotoEditUserOrUnitInfo()
 				// uni.redirectTo({
 				// 	url: `/subpackage/orders/sign-up-ali?orderId=${state.orderId}`,
 				// });
+				if(state.isValueCard != 1 ){
+					uni.redirectTo({
+						url: `/subpackage/orders/release-products?orderId=${state.orderId}`,
+					});
+				}else{
+					uni.switchTab({
+						url: "/pages/order/order"
+					})
+				}
 			}
 			state.dataArray = data.datas;
 			// HANDLE("办理费",1){},
@@ -365,22 +411,15 @@
 		});
 	};
 const gotoEditUserOrUnitInfo = () => {
-		let url = '';
-		if (state.isValueCard != 1) {
-			url = `/subpackage/orders/release-products`;
-		} else {
-			// #ifdef MP-ALIPAY
-				url = `/subpackage/orders/sign-up-ali`;
-			// #endif
-			// #ifdef MP-WEIXIN
-				url = `/subpackage/orders/essential-information`;
-			// #endif
-
+		if(state.isValueCard != 1 ){
+			uni.redirectTo({
+				url: `/subpackage/orders/release-products?orderId=${state.orderId}`,
+			});
+		}else{
+			uni.switchTab({
+				url: "/pages/order/order"
+			})
 		}
-		console.log("url", url)
-		uni.redirectTo({
-			url: `${url}?orderId=${state.orderId}`,
-		});
 	}
 	const state = reactive({
 		isValueCard: 1, //卡的类型

subpackage/orders/sign-up.vue

@@ -142,9 +142,9 @@ const savaHandle = () => {
         // uni.navigateTo({
         //   url: `/subpackage/orders/product-detail?orderId=${state.orderId}&&clientFee=${state.clientFee}&&id=${state.id}`,
         // });
-		uni.navigateTo({
-			url:`/subpackage/orders/interestsList?orderId=${state.orderId}&&clientFee=${state.clientFee}&&id=${state.id}`
-		});
+		uni.switchTab({
+			url: "/pages/order/order"
+		})
       } else if (data.userState === "PAUSED") {
         msg("已暂停车主服务");
         return;

utils/node-model/text-decoding/src/lib/TextEncoder.js

@@ -38,11 +38,12 @@ export default class TextEncoder {
     } else {
       // Standard behavior.
       this._encoding = getEncoding('utf-8')
-
+	// #ifdef MP-WEIXIN
       if (label !== undefined && 'console' in global) {
         console.warn('TextEncoder constructor called with encoding label, '
                       + 'which is ignored.')
       }
+	  // #endif
     }
   }
   get encoding() {