From 9363bb5f991d112040bda8fe1b935b854f629a0e Mon Sep 17 00:00:00 2001 From: blak-kong <546598185@qq.com> Date: Tue, 19 Mar 2024 11:33:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=86=E5=A4=87=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app.tsx | 4 ++-- src/instrument/pages/instrument/intro.tsx | 2 +- src/pages/index/index.tsx | 11 +++++++++-- src/recoding/pages/recording/recording.tsx | 4 ++-- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/app.tsx b/src/app.tsx index fbadf61..0e4335e 100644 --- a/src/app.tsx +++ b/src/app.tsx @@ -27,8 +27,8 @@ class App extends Component { // 每次进入小程序,删除可能残留的同步状态 Taro.removeStorageSync("isSyncHistory"); - // go("/pages/instrument_clickin_upload/index"); - // go("/pages/instrument/intro"); + // go("/instrument/pages/instrument_clickin_upload/index"); + // go("/instrument/pages/instrument/intro"); // Taro.switchTab({ // url: "/pages/user/user", // }); diff --git a/src/instrument/pages/instrument/intro.tsx b/src/instrument/pages/instrument/intro.tsx index f152e7f..6fbad48 100644 --- a/src/instrument/pages/instrument/intro.tsx +++ b/src/instrument/pages/instrument/intro.tsx @@ -174,7 +174,7 @@ class Intro extends Component { if (this.state.connectInstrument.type === 1) { //非IOT setTimeout(() => { - go("/pages/instrumentClickinUpload/index"); + go("/instrument/pages/instrumentClickinUpload/index"); }, 10); } else { Taro.getSystemInfo({ diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx index c02499b..859d440 100644 --- a/src/pages/index/index.tsx +++ b/src/pages/index/index.tsx @@ -847,7 +847,14 @@ class Index extends Component { if (platform === "devtools") { setStorageSync("instrument_detail", item); this.setState({ connectInstrument: item }); - setTimeout(() => this.goIot()); + if (item.type === 1) { + //非IOT + setTimeout(() => { + go("/instrument/pages/instrumentClickinUpload/index"); + }, 10); + } else { + setTimeout(() => this.goIot()); + } return; } @@ -875,7 +882,7 @@ class Index extends Component { if (this.state.connectInstrument.type === 1) { //非IOT setTimeout(() => { - go("/pages/instrumentClickinUpload/index"); + go("/instrument/pages/instrumentClickinUpload/index"); }, 10); } else { Taro.getSystemInfo({ diff --git a/src/recoding/pages/recording/recording.tsx b/src/recoding/pages/recording/recording.tsx index 64f9047..7c43693 100644 --- a/src/recoding/pages/recording/recording.tsx +++ b/src/recoding/pages/recording/recording.tsx @@ -464,10 +464,10 @@ export default class Recording extends Component { > - 画质抗老射频仪 + {item.name} ))}