准备合并

src/app.tsx

@@ -27,8 +27,8 @@ class App extends Component<PropsWithChildren> {
     // 每次进入小程序，删除可能残留的同步状态
     Taro.removeStorageSync("isSyncHistory");
 
-    // go("/pages/instrument_clickin_upload/index");
+    // go("/instrument/pages/instrument_clickin_upload/index");
-    // go("/pages/instrument/intro");
+    // go("/instrument/pages/instrument/intro");
     // Taro.switchTab({
     //   url: "/pages/user/user",
     // });

src/instrument/pages/instrument/intro.tsx

@@ -174,7 +174,7 @@ class Intro extends Component<any, any> {
     if (this.state.connectInstrument.type === 1) {
       //非IOT
       setTimeout(() => {
-        go("/pages/instrumentClickinUpload/index");
+        go("/instrument/pages/instrumentClickinUpload/index");
       }, 10);
     } else {
       Taro.getSystemInfo({

src/pages/index/index.tsx

@@ -847,7 +847,14 @@ class Index extends Component<any, any> {
     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<any, any> {
     if (this.state.connectInstrument.type === 1) {
       //非IOT
       setTimeout(() => {
-        go("/pages/instrumentClickinUpload/index");
+        go("/instrument/pages/instrumentClickinUpload/index");
       }, 10);
     } else {
       Taro.getSystemInfo({

src/recoding/pages/recording/recording.tsx

@@ -464,10 +464,10 @@ export default class Recording extends Component<any, any> {
               >
                 <Image
                   className="products_cover"
-                  src={require("@/img/test/1706692819894.jpg")}
+                  src={item.banner}
                   mode="aspectFit"
                 ></Image>
-                <View className="products_title">画质抗老射频仪</View>
+                <View className="products_title">{item.name}</View>
               </View>
             ))}
           </ScrollView>