Merge branch 'master' of http://192.168.40.220/dmc/jz_applet

pages/bluetooth/device-active-step3.vue

@@ -75,6 +75,7 @@ const datas = require("../../static/etcUtil/datas.js");
 const bluetoothUtil = require("../../static/etcUtil/index.js");
 
 const state = reactive({
+	cardId:'',
   showPopup: false, //显示激活成功提示
   curDeviceId: "", //当前选中的设备ID
   deviceList: [
@@ -107,13 +108,17 @@ let device: DeviceType = reactive({
   prefixName: "", //前缀名称
   selected: false, //判断点击次数
   _name: "", //中文名称
+  
 });
 
+
+
 onReady(() => {
   load();
 });
 onLoad((option) => {
   routeType.value = option.routeType ? option.routeType : "1";
+  state.cardId = option.cardId
 });
 
 /*
@@ -531,7 +536,7 @@ const connectSuccess = (res) => {
       });
     } else if (routeType.value == "2") {
       uni.navigateTo({
-        url: "/pages/recharge/recharge?connectSuccess=1",
+        url: `/pages/recharge/recharge?connectSuccess=1&&cardId=${state.cardId}`,
       });
     } else {
       return;

pages/recharge/recharge.vue

@@ -105,6 +105,8 @@
 		getOpenID();
 		/*传参*/
 		state.cardId = option.cardId
+		console.log(state.cardId);
+		console.log('888888888')
 		state.connectSuccess = option.connectSuccess
 		state.orderNum = getItem("orderNum")
 		if (state.connectSuccess === '1') {
@@ -134,7 +136,7 @@
 
 						//链接蓝牙
 						uni.navigateTo({
-							url: `/pages/bluetooth/device-active-step3?routeType=2`,
+							url: `/pages/bluetooth/device-active-step3?routeType=2&&cardId=${state.cardId}`
 						});
 					} else {
 						console.log(`进行充值申请`)
@@ -157,7 +159,7 @@
 			} else {
 				//走蓝牙进行修复
 				uni.navigateTo({
-					url: `/pages/bluetooth/device-active-step3?routeType=2`,
+					url: `/pages/bluetooth/device-active-step3?routeType=2&&cardId=${state.cardId}`,
 				});
 
 			}
@@ -621,7 +623,7 @@
 			if (data.tradeState === 'SUCCESS')
 
 				uni.navigateTo({
-					url: `/pages/bluetooth/device-active-step3?routeType=2`,
+					url: `/pages/bluetooth/device-active-step3?routeType=2&&cardId=${state.cardId}`
 				});
 
 			console.log(data)