提交

composables/order/useOrderSkip.ts

@@ -10,12 +10,18 @@ import { jump } from "@/datas/9901Jump.js";
 import { deviceType } from "@/utils/network/difference";
 export default function useOrderSkip() {
 	const gotoOrderDetailsPay = (orderInfo) => {
-		// #ifdef MP-WEIXIN
-		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}`);
-		// #endif
+		if (orderInfo.deviceType == deviceType) {
+			const params = encodeURIComponent(JSON.stringify(orderInfo))
+			jump("11", params)
+		} else {
+			// #ifdef MP-WEIXIN
+			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}`);
+			// #endif
+		}
+		
 	}
 	//根据订单类型 跳转到不同的订单详情页面
 	const gotoOrderDetails = (orderInfo, isWeiXin) => {

pages.json

@@ -1906,8 +1906,8 @@
 			"root": "subpackage/carPark",
 			"plugins": {
 			  "issuer-plugin": {
-			   // "version": "1.0.0",
-			   "version": "dev-3da805266820ceca7a39f12d30d6edd2",
+			   "version": "dev-45a0e383d75ce8d9a2e14a3c4e3e31e2",
+			   // "version": "1.0.1",
 			   "provider": "wxa2d9acdd1054e69b"
 			  }
 			 },

subpackage/after-sale/activation/operation-tips.vue

@@ -66,53 +66,48 @@
 	})
 
 	const gotoNextStep = () => {
-		uni.getSetting({
+		uni.openBluetoothAdapter({
 			success(res) {
-				console.log(res.authSetting)
-				if (res.authSetting['scope.bluetooth'] == true) {
-					uni.openBluetoothAdapter()
-					noticeUser(() => {
-						console.log("11111")
-						/* 判断是否打开蓝牙 */
-						uni.getBluetoothAdapterState({
-							success(res) {
-								console.log("2222", res)
-								//如果res.avaliable==false 说明没打开蓝牙 反之则打开
-								if (res.available == false) {
-									uni.showToast({
-										title: '请打开手机蓝牙',
-										icon: "error",
-										duration: 2000
-									})
-									return
-								} else {
-									navTo(`/subpackage/after-sale/activation/operation-upload?transfer=${transfer}`)
-								}
-							}
-						})
-					});
-				}else{
-					uni.showModal({
-						title: '提示',
-						content: '请打开蓝牙权限',
-						success: function (res) {
-							if (res.confirm) {
-								uni.openSetting({
-								  success(res) {
-									  console.log("2222")
-								    console.log(res.authSetting)
-								  }
-								});
-							} else if (res.cancel) {
-								console.log('用户点击取消');
+				noticeUser(() => {
+					console.log("11111")
+					/* 判断是否打开蓝牙 */
+					uni.getBluetoothAdapterState({
+						success(res) {
+							console.log("2222", res)
+							//如果res.avaliable==false 说明没打开蓝牙 反之则打开
+							if (res.available == false) {
+								uni.showToast({
+									title: '请打开手机蓝牙',
+									icon: "error",
+									duration: 2000
+								})
+								return
+							} else {
+								navTo(`/subpackage/after-sale/activation/operation-upload?transfer=${transfer}`)
 							}
 						}
-					});
-				}
+					})
+				});
+			},
+			fail(err){
+				uni.showModal({
+					title: '提示',
+					content: '请打开蓝牙权限',
+					success: function (res) {
+						if (res.confirm) {
+							uni.openSetting({
+							  success(res) {
+								  console.log("2222")
+								console.log(res.authSetting)
+							  }
+							});
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
 			}
 		})
-
-
 	}
 </script>