”修改bug“

App.vue

@@ -49,8 +49,8 @@
 
 				},
 			});
-
 			// #endif
+
 			uni.setStorageSync("extraData", option.referrerInfo.extraData);
 			// #ifdef MP-WEIXIN
 			//获取小程序更新机制兼容

package.json

@@ -12,8 +12,10 @@
   ],
   "dependencies": {
     "base64-js": "^1.5.1",
+    "cross-env": "^7.0.3",
     "echarts": "^5.4.2",
     "image-tools": "^1.4.0",
+    "increase-memory-limit": "^1.0.7",
     "js-base64": "^2.6.4",
     "sm-crypto": "^0.3.12",
     "text-decoding": "^1.0.0",

pages/bluetooth/bluetooth.vue

@@ -82,7 +82,9 @@
 		orderNum: 0,//消费明细 传orderNum说明去支付
 		payMoney: 0,//0 修复  1 支付
 		accountId: "",//对公账户名称
-		difference: "",//区分routeType5  1二次激活
+		difference: "",//区分routeType5  1二次激活  2余额补领
+		vehicleId: "",
+		refundBalance: ""
 	});
 	const deviceList = ref([]);
 	const connectPrefixName = ref(null);
@@ -132,6 +134,12 @@
 		if (option.difference) {
 			state.difference = option.difference;
 		}
+		if (option.vehicleId) {
+			state.vehicleId = option.vehicleId;
+		}
+		if (option.refundBalance) {
+			state.refundBalance = option.refundBalance;
+		}
 		console.log("传过来的参数", option)
 	});
 
@@ -580,6 +588,10 @@
 				uni.navigateTo({
 					url: "/subpackage/after-sale/activation-once-again/activation-once-again?status=true&state=true&id=" + state.id,
 				});
+			} else if (state.difference == "2") {
+				uni.navigateTo({
+					url: `/subpackage/after-sale/refund-order-balance/refund-order-balance?status=true&state=true&vehicleId=${state.vehicleId}&&id=${state.id}&&refundBalance=${state.refundBalance}`,
+				});
 			} else {
 				uni.$emit('bluetoothLink', { status: true })
 				uni.navigateBack({

pages/user/user.vue

@@ -44,7 +44,8 @@
 							<text class="type">待办</text>
 						</view>
 						<view class="panel-item" @click="goEquity()">
-							<view class="panel-text"><text class="num">{{state.equityNumber}}</text></view>
+							<!-- <view class="panel-text"><text class="num">{{state.equityNumber}}</text></view> -->
+							<view class="panel-text"><text class="num"></text></view>
 							<text class="type">权益</text>
 						</view>
 						<view class="panel-item" v-if="false">
@@ -435,11 +436,13 @@
 		})
 	}
 	const goEquity = () => {
-		if (state.equityNumber) {
-			navTo('/subpackage/after-sale/add-equity/equity-list')
-		} else {
-			msg("暂无购买权益记录")
-		}
+		// if (state.equityNumber) {
+		// navTo('/subpackage/after-sale/add-equity/equity-list')  //潘兵写的权益
+		navTo('/subpackage/service/equityList/equityList')
+
+		// } else {
+		// 	msg("暂无购买权益记录")
+		// }
 	}
 </script>
 <style>

subpackage/after-sale/activation/activate.vue

@@ -103,6 +103,7 @@
 		//获取订单详情
 		getOrderDetails(state.id);
 		console.log("state.transfer", state.transfer, state.transfer == 0, state.transfer == 1)
+
 	})
 
 	const card = reactive({
@@ -324,6 +325,7 @@
 
 			let res3 = IntegerToHexString(fileDataStrings.type, 2); //类型
 			let userTypeNumber = fileDataStrings.userType == 'PERSONAL_USER' ? 1 : 2
+			console.log("userTypeNumber", userTypeNumber)
 			let res4 = IntegerToHexString(userTypeNumber, 2); //用户类型
 			let res5 = IntegerToHexString(fileDataStrings.outlineL, 4); //车辆尺寸 长
 			let res6 = IntegerToHexString(fileDataStrings.outlineW, 2); //车辆尺寸 宽

subpackage/after-sale/refund-order-balance/refund-order-balance.vue

@@ -113,15 +113,30 @@
 	/*视图进入后操作*/
 	onLoad((option) => {
 		state.vehicleId = option.vehicleId
-
+		if (option.id) {
+			state.id = option.id
+		}
+		if (option.refundBalance) {
+			state.refundBalance = option.refundBalance
+		}
+		if (option.status) {
+			queryRefundAction().then(val => {
+				state.list = val.data
+				getCardId()
+			})
+		} else {
+			queryRefundAction().then(val => {
+				state.list = val.data
+			})
+		}
 		//根据车牌查询信息
-		queryRefundAction().then(val => {
-			state.list = val.data
-		})
-		/*监听蓝牙回调*/
-		uni.$on('bluetoothLink', function (status) {
-			getCardId()
-		})
+		// queryRefundAction().then(val => {
+		// 	state.list = val.data
+		// })
+		// /*监听蓝牙回调*/
+		// uni.$on('bluetoothLink', function (status) {
+		// 	getCardId()
+		// })
 	});
 
 	onUnload(() => {
@@ -146,7 +161,7 @@
 			//链接蓝牙
 			state.id = val.orderId
 			uni.navigateTo({
-				url: `/pages/bluetooth/bluetooth?routeType=5`,
+				url: `/pages/bluetooth/bluetooth?routeType=5&&vehicleId=${state.vehicleId}&&difference=2&&id=${val.orderId}&&refundBalance=${val.refundBalance}`,
 			});
 		}
 	}
@@ -257,7 +272,22 @@
 						console.log("value============", value)
 						uanConfirmAction(value)
 					} else {
-						msg("圈存初始化指令验证失败, 重新初始化");
+						// 一直写，写到成功为止
+						let cmdArrTwo = value.command.split(",")
+						bluetoothUtil.transCmd(cmdArrTwo, "10", function (res) {
+							console.log(value);
+							var valueResponse = res.toString();
+							console.log(response);
+							var applyDic = {
+								command: value.command,
+								cosResponse: valueResponse,
+								rechargeId: value.rechargeId,
+							};
+							quanApplyAction(applyDic).then((applyValue) => {
+								uanConfirmAction(applyValue)
+							});
+						})
+						// msg("圈存初始化指令验证失败, 重新初始化");
 					}
 				});
 

subpackage/orders/order_payment.vue

@@ -360,8 +360,6 @@
 					state.dataArray[i].payStatusName = '未知'
 				}
 			}
-
-
 			console.log("state.dataArray", state.dataArray)
 		});
 	});

subpackage/personal-center/address.vue

@@ -145,7 +145,7 @@
 		show: false,
 		addressArray: undefined,
 	});
-	const addressSelected = (val: any) => {
+	const addressSelected = (val : any) => {
 		console.log(val);
 		state.data = {
 			...state.data,
@@ -167,9 +167,6 @@
 	};
 
 	const nextAction = () => {
-		console.log("下一步");
-		console.log(state.data);
-
 		const options = {
 			type: 2,
 			data: state.data,
@@ -180,16 +177,15 @@
 			console.log(res);
 			const result = stringToJson(res.bizContent);
 			if (result?.orderId) {
-				// console.log(888888888);
 				navTo("/subpackage/orders/order-details-obu?id=" + result.orderId)
 			} else if (res.statusCode == 600) {
 				msg(res.errorMsg)
-				setTimeout(()=>{
+				setTimeout(() => {
 					uni.switchTab({
 						url: "/pages/order/order"
 					})
-				},2000)	
-							
+				}, 2000)
+
 
 			} else {
 				msg("信息提交错误")
@@ -221,8 +217,6 @@
 			margin-bottom: 30rpx;
 		}
 
-		.car-input {}
-
 		.chepai-lane {
 			margin-top: 60rpx;
 			margin-bottom: 20rpx;
@@ -366,4 +360,4 @@
 			line-height: 80rpx;
 		}
 	}
-</style>
+</style>

subpackage/personal-center/car-submit-record.vue

@@ -24,9 +24,11 @@
 				</view>
 			</view>
 			<view class="btns" v-if="item.handleStatus === 4 || item.handleStatus === 5">
-				<view class="btn btn-primary as-gravity-center" @click="btnClick(item)" v-if="item.handleStatus === 4">增补OBU
+				<view class="btn btn-primary as-gravity-center" @click="btnClick(item)" v-if="item.handleStatus === 4">
+					增补OBU
 				</view>
-				<view class="btn btn-primary as-gravity-center" @click="btnClick(item)" v-if="item.handleStatus === 5">增补OBU
+				<view class="btn btn-primary as-gravity-center" @click="btnClick(item)" v-if="item.handleStatus === 5">
+					增补OBU
 				</view>
 			</view>
 		</view>
@@ -61,68 +63,65 @@
 	import {
 		getVehiclePlateColor
 	} from "@/datas/vehiclePlateColor.js";
-	
+
 	import payUndertake from "./components/popup-pay-undertake";
 
 	const state = reactive({
 		//显示支付承诺弹窗
 		showPayPopup: false,
-		deptId:0,
+		deptId: 0,
 		//记录列表 status: 1-审核中 2-制卡中 3-待支付 4-待激活 5-已完成
 		list: [],
 	});
-	onLoad((option)=>{
-		state.deptId = option.deptId?option.deptId:null;
+	onLoad((option) => {
+		state.deptId = option.deptId ? option.deptId : null;
 		getListByDeptId(state.deptId)
 	})
-	const btnClick = (item:any) => {
+	const btnClick = (item : any) => {
 		console.log(item);
 		//去增补OBU
-		if (item.handleStatus === 4||item.handleStatus === 5) {
-			navTo("/subpackage/personal-center/address?deptId="+item.funitID+"&vehicleId="+item.fvehPlateNo+"_"+item.fvehPlateColor);
-		} 
+		if (item.handleStatus === 4 || item.handleStatus === 5) {
+			navTo("/subpackage/personal-center/address?deptId=" + item.funitID + "&vehicleId=" + item.fvehPlateNo + "_" + item.fvehPlateColor);
+		}
 	};
-	
-	const cardType = (type:number)=>{
 
-		if(type==51){
+	const cardType = (type : number) => {
+
+		if (type == 51) {
 			return "制式警车卡";
-		}else if(type == 52){
+		} else if (type == 52) {
 			return "路政执法卡";
-		}else if(type == 53){
+		} else if (type == 53) {
 			return "应急通行卡";
-		}else if(type == 55){
+		} else if (type == 55) {
 			return "国安特通卡";
-		}else{
+		} else {
 			return "未知卡类型";
 		}
 
 	}
-	
+
 	/* 搜索 */
-	const getListByDeptId = (id:number) =>{
-		if(!state.deptId){
+	const getListByDeptId = (id : number) => {
+		if (!state.deptId) {
 			msg("请输入搜索关键字");
 			return
 		}
-		 // msg(state.searchInput);
-		 const options = {
-		 	type: 2,
-		 	data: {
-		 		deptId: id,
-				// vehiclePlate:"贵ZJJ99警",
-				// vehiclePlateColor:3
-		 	},
-		 	method: "POST",
-		 	showLoading: true,
-		 };
-		 request(gongWuCheTiJiaoJiLu, options).then((res) => {
-			 // console.log(res.bizContent);
-			 const result = stringToJson(res.bizContent)
-			 if(result.vehicleS && result.vehicleS.length >0){
-				 state.list = result.vehicleS
-			 }	
-		 })
+		// msg(state.searchInput);
+		const options = {
+			type: 2,
+			data: {
+				deptId: id,
+			},
+			method: "POST",
+			showLoading: true,
+		};
+		request(gongWuCheTiJiaoJiLu, options).then((res) => {
+			const result = stringToJson(res.bizContent)
+			if (result.vehicleS && result.vehicleS.length > 0) {
+				state.list = result.vehicleS
+			}
+		})
 	}
 </script>
 
@@ -268,4 +267,4 @@
 		border: 1px solid #dcdcdc;
 		color: #333;
 	}
-</style>
+</style>

utils/network/api.js

@@ -129,7 +129,6 @@ export const getLogistics = "30"; //获取所有的快递公司信息
 export const editOrderAddr = '164'; //订单修改收货地址
 export const orderReturn = '165'; //订单申请退货
 export const orderExchange = '167'; //订单申请换货
-// export const orderExchangeApply = '888'; //8.100.ASS-换货/换卡签申请接口
 export const outletList = '168'; //根据机构号获取服务网点信息
 export const orderEvaluate = '169'; //评价订单
 export const orderEvaluateTag = '170'; //获取服务评价标签