跳绳音乐结束

App.vue

@@ -5,9 +5,9 @@
 		},
 		onLaunch: function() {
 			this.checkForUpdates()
-			// uni.switchTab({
+			uni.switchTab({
-			// 	url: "/pages/index/index"
+				url: "/pages/index/index"
-			// })
+			})
 			console.log('App Launch')
 		},
 		onShow: function() {

pages/devices/PCT01.vue

@@ -108,7 +108,7 @@
 				that.$store.commit("changeBluetooth", res.available);
 			})
 		},
-		onBackPress() {
+		onBackPress(options) {
 			let that = this
 			that.handleEnd()
 			innerAudioContext.stop();
@@ -174,13 +174,13 @@
 			isStart: function() {
 				let that = this
 				if (that.isStart) {
-					that.handleAudio(1)
+					that.handleAudio()
 					console.log("11111111")
 				}
 			}
 		},
 		methods: {
-			handleAudio(ind) {
+			handleAudio() {
 				innerAudioContext.autoplay = true;
 				innerAudioContext.loop = true;
 				innerAudioContext.src = '/static/flight.mp3';
@@ -284,6 +284,7 @@
 								success: function(res) {
 									if (res.cancel) {
 										that.handleEnd()
+										innerAudioContext.stop();
 									}
 								},
 							})

pages/skip/skip.vue

@@ -157,6 +157,7 @@
 		},
 		onLoad(options) {
 			let that = this
+			console.log('options', options)
 			// 首页进入
 			if (options && options.acd_id) {
 				that.acd_id = options.acd_id
@@ -173,10 +174,9 @@
 				that.serviceId = data.serviceId
 				that.write = data.write
 				that.notify = data.notify
-				that.islink = 1
+				that.islink = !that.isConnected ? -1 : 1
 				that.notifyBLECharacteristicValue()
 			}
-			console.log('options', options)
 			that.$store.dispatch("getSkipResult", {
 				aud_id: uni.getStorageSync('userid')
 			})
@@ -203,13 +203,20 @@
 		},
 		onBackPress(options) {
 			let that = this
+			that.islink = -1
 			clearTimeout(myTime);
 			that.isConnection = false
 			that.$Bluetooth.closeBluetoothAdapter()
 			that.$Bluetooth.stopBluetoothDevicesDiscovery()
 			that.$store.commit("changeBluetooth", false);
 			that.$store.commit("changeConnected", false);
-			console.log("skip页面返回onBackPress005", options)
+			setTimeout(() => {
+				uni.switchTab({
+					url: '/pages/index/index'
+				})
+			}, 300)
+			console.log("返回首页")
+			return true
 		},
 		watch: {
 			devicesList() {
@@ -223,10 +230,10 @@
 			},
 			isConnected() {
 				let that = this
-				if (!that.isBluetoothTyle) {
+				if (!that.isConnected) {
 					that.islink = -1
 				}
-				// that.isConnection = that.isConnected
+				that.isConnection = that.isConnected
 				console.log("蓝牙是否连接", that.isConnected)
 			},
 			isBluetoothTyle() {

uni.scss

@@ -1,78 +1,3 @@
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-
-/**
- * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
- */
-
-/* 颜色变量 */
-/* 行为相关颜色 */
-$uni-color-primary: #007aff;
-$uni-color-success: #4cd964;
-$uni-color-warning: #f0ad4e;
-$uni-color-error: #dd524d;
-
-/* 文字基本颜色 */
-$uni-text-color:#333;//基本色
-$uni-text-color-inverse:#fff;//反色
-$uni-text-color-grey:#999;//辅助灰色，如加载更多的提示信息
-$uni-text-color-placeholder: #808080;
-$uni-text-color-disable:#c0c0c0;
-
-/* 背景颜色 */
-$uni-bg-color:#ffffff;
-$uni-bg-color-grey:#f8f8f8;
-$uni-bg-color-hover:#f1f1f1;//点击状态颜色
-$uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色
-
-/* 边框颜色 */
-$uni-border-color:#c8c7cc;
-
-/* 尺寸变量 */
-
-/* 文字尺寸 */
-$uni-font-size-sm:12px;
-$uni-font-size-base:14px;
-$uni-font-size-lg:16;
-
-/* 图片尺寸 */
-$uni-img-size-sm:20px;
-$uni-img-size-base:26px;
-$uni-img-size-lg:40px;
-
-/* Border Radius */
-$uni-border-radius-sm: 2px;
-$uni-border-radius-base: 3px;
-$uni-border-radius-lg: 6px;
-$uni-border-radius-circle: 50%;
-
-/* 水平间距 */
-$uni-spacing-row-sm: 5px;
-$uni-spacing-row-base: 10px;
-$uni-spacing-row-lg: 15px;
-
-/* 垂直间距 */
-$uni-spacing-col-sm: 4px;
-$uni-spacing-col-base: 8px;
-$uni-spacing-col-lg: 12px;
-
-/* 透明度 */
-$uni-opacity-disabled: 0.3; // 组件禁用态的透明度
-
-/* 文章场景相关 */
-$uni-color-title: #2C405A; // 文章标题颜色
-$uni-font-size-title:20px;
-$uni-color-subtitle: #555555; // 二级标题颜色
-$uni-font-size-subtitle:26px;
-$uni-color-paragraph: #3F536E; // 文章段落颜色
-$uni-font-size-paragraph:15px;
 /* 主题色 */
 $maincolor:linear-gradient(to right, #477EFF, #39D9C9);
 $btncolor:#FEC407;