扫码打开小程序并开锁功能

ebike-user/pages/user/home/home.vue

@@ -183,7 +183,7 @@
 	let arrBikeData = [];
 	const showBikeInfo = ref(false);
 	const bikeData = ref({});
-	const onLoadData = ref(null)
+	const onLoadData = ref({})
 	let ismount = false;
 	let arrSiteData = []
 
@@ -201,6 +201,7 @@
 			console.log("p===>" + JSON.stringify(p))
 			onLoadData.value = p;
 		} else if (query.number) {
+			console.log("query" + JSON.stringify(query))
 			onLoadData.value['number'] = query.number;
 			onLoadData.value['_tbScancodeApproach_'] = query._tbScancodeApproach_;
 		}
@@ -219,16 +220,10 @@
 				if (!oUser) {
 					tologin();
 				}
-				map.addOrder(onLoadData.value["number"], (res) => {
+				map.addOrder(onLoadData.value["number"], false, (res) => {
 					console.log("00000000000000000000", res);
-					if (!res) {
+					if (res) {
-						setTimeout(() => {
-							bikeCode = null;
 						getOrder();
-						}, 1000);
-						return;
-					} else {
-						showWorn.value = true;
 					}
 				})
 			}

ebike-user/pages/user/login/wx_login.vue

@@ -63,7 +63,7 @@
 	const agreed = ref([{
 		value: true // true 表示选中
 	}]);
-	const onLoadData = ref(null)
+	const onLoadData = ref({})
 	import {
 		onLoad
 	} from '@dcloudio/uni-app';
@@ -242,11 +242,12 @@
 				let url = "/pages/user/home/home"
 				let q = "";
 				if (onLoadData.value) {
-					url += '?number=' + onLoadData.value['number'] + "&_tbScancodeApproach_=scan"
+					url += '?number=' + onLoadData.value['number'] + "&_tbScancodeApproach_=" + onLoadData.value[
+						'_tbScancodeApproach_']
 				}
 				setTimeout(() => {
 					uni.navigateTo({
-						url: "/pages/user/home/home"
+						url: url
 					})
 				}, 500);
 			}

ebike-user/pages/user/scan/scancode.vue

@@ -91,7 +91,7 @@
 		const options = getUrlParams(result);
 		bikeCode = options["number"];
 		if (type == "ride") {
-			addOrder(bikeCode, (res) => {
+			addOrder(bikeCode, true, (res) => {
 				console.log("00000000000000000000", res);
 				if (!res) {
 					setTimeout(() => {

ebike-user/utils/usermap.js

@@ -1,6 +1,7 @@
 import config from "./config.js";
 import {
-	showModelMessage,jkcBaseDecode
+	showModelMessage,
+	jkcBaseDecode
 } from "./tools.js";
 import {
 	callOrdereApi
@@ -78,7 +79,7 @@ export function addLine(scolor, arrPoints) {
 }
 
 //创建订单
-export function addOrder(bikeCode,  callback) {
+export function addOrder(bikeCode, jumpFlag, callback) {
 	const oUser = JSON.parse(jkcBaseDecode(uni.getStorageSync("wechat_user")));
 	if (!oUser) {
 		uni.navigateTo({
@@ -92,10 +93,10 @@ export function addOrder(bikeCode,  callback) {
 		userId,
 		bikeCode
 	}
-	saveRide(params, 1, callback)
+	saveRide(params, 1, jumpFlag, callback)
 }
 
-function saveRide(params, icnt, callback) {
+function saveRide(params, icnt, jumpFlag, callback) {
 	callOrdereApi("userOrders/saveRide", params, "post").then(res => {
 		const {
 			code,
@@ -111,12 +112,13 @@ function saveRide(params, icnt, callback) {
 			return;
 		}
 		if (callback) callback(true);
+		if (jumpFlag) {
 			setTimeout(() => {
 				uni.navigateTo({
 					url: "/pages/user/home/home"
 				})
 			}, 1000)
-		
+		}
 	})
 }