From dba48d95ade5f4cebb7dace1e9940eba2c4126bb Mon Sep 17 00:00:00 2001
From: blak-kong <546598185@qq.com>
Date: Tue, 19 Mar 2024 20:08:58 +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                                   |   5 +
 src/components/bluetoot/connection/fr200.js   |   5 +-
 .../device-connection-popup.tsx               |  34 ++++-
 src/custom-tab-bar/index.tsx                  |  11 +-
 .../pages/instrument/instrument.tsx           |  74 ++++++++--
 src/instrument/pages/instrument/intro.tsx     |   2 +-
 src/moduleIOT/pages/iotCarePlan/FR200.tsx     | 129 ++++++-----------
 src/moduleIOT/pages/iotCarePlan/WL200.tsx     |   4 +-
 .../iotCarePlan/components/Footer/FR200.tsx   | 109 +++++---------
 src/pages/consultant/consultant.tsx           |   2 +-
 src/pages/entry/entry.tsx                     |   6 +-
 src/pages/index/index.tsx                     | 134 ++++++++++--------
 src/pages/register/register.tsx               |   4 +-
 src/store/features/instrument.js              |  30 +++-
 src/store/index.js                            |   2 +
 src/utils/request.js                          |   2 +-
 16 files changed, 293 insertions(+), 260 deletions(-)

diff --git a/src/app.tsx b/src/app.tsx
index 0e4335e..3302307 100644
--- a/src/app.tsx
+++ b/src/app.tsx
@@ -37,6 +37,11 @@ class App extends Component<PropsWithChildren> {
   onError(error) {
     console.log("error 错误捕获", error);
   }
+  onUnload() {
+    console.log("App onUnload");
+    Taro.removeStorageSync("isScan"); // 扫码弹窗显示完后，不需要再判断是否扫码
+    Taro.removeStorageSync("serial"); // 扫码弹窗显示完后，删除缓存的扫码序列号
+  }
 
   // 对应 onShow
   componentDidShow() {}
diff --git a/src/components/bluetoot/connection/fr200.js b/src/components/bluetoot/connection/fr200.js
index 52fa2a5..981801f 100644
--- a/src/components/bluetoot/connection/fr200.js
+++ b/src/components/bluetoot/connection/fr200.js
@@ -59,8 +59,10 @@ export const fr200DeviceControlCommand = {
   /**
    *   '进入水分测试模式' = 'switchTestMode',
    *   '启动水分测试模式' = 'startTestMode',
+   *
    *    face: "01", 面部
-   *    eyes: "02", 脸部
+   *    eyes: "02", 眼部
+   *
    *    nasolabialFold: "03", 法令纹
    *    mandibularLine: "04", 下颌线
    *    led: "05",            led
@@ -68,6 +70,7 @@ export const fr200DeviceControlCommand = {
    *    maskPenetration: "07",面膜促渗
    *    essence: "08",        精华模式
    *    headLiftingPro: "09", 抬头纹Pro
+   *
    *    neck: "0A",           颈纹
    *    partition: "11",      分区模式 废弃VM1001
    *    ignore: "255",        不改变/无模式
diff --git a/src/components/bluetoot/device-connection-popup/device-connection-popup.tsx b/src/components/bluetoot/device-connection-popup/device-connection-popup.tsx
index 2eab03c..76be28a 100644
--- a/src/components/bluetoot/device-connection-popup/device-connection-popup.tsx
+++ b/src/components/bluetoot/device-connection-popup/device-connection-popup.tsx
@@ -86,6 +86,7 @@ export default class DeviceConnectPopup extends Component<any, any> {
       error,
       isDisconnect,
     } = this.props;
+    console.log("data connection", data, data.bluetoothConnecting);
 
     return (
       <Block>
@@ -113,7 +114,16 @@ export default class DeviceConnectPopup extends Component<any, any> {
               </View>
               <View className="device-popup-content-box">
                 {!this.isImage(data.bluetoothConnecting) ? (
-                  <Video className="videos" src={data.bluetoothConnecting} />
+                  <Video
+                    className="videos"
+                    autoplay
+                    loop
+                    objectFit="cover"
+                    enablePlayGesture
+                    showFullscreenBtn={false}
+                    playBtnPosition="center"
+                    src={encodeURIComponent(data.bluetoothConnecting)}
+                  />
                 ) : (
                   <Image
                     className="images"
@@ -199,7 +209,16 @@ export default class DeviceConnectPopup extends Component<any, any> {
               </View>
               <View className="device-popup-content-box">
                 {!this.isImage(data.bluetoothClosed) ? (
-                  <Video className="videos" src={data.bluetoothClosed} />
+                  <Video
+                    className="videos"
+                    autoplay
+                    loop
+                    objectFit="cover"
+                    enablePlayGesture
+                    showFullscreenBtn={false}
+                    playBtnPosition="center"
+                    src={data.bluetoothClosed}
+                  />
                 ) : (
                   <Image
                     className="images"
@@ -239,7 +258,16 @@ export default class DeviceConnectPopup extends Component<any, any> {
               </View>
               <View className="device-popup-content-box">
                 {!this.isImage(data.bluetoothConnectFail) ? (
-                  <Video className="videos" src={data.bluetoothConnectFail} />
+                  <Video
+                    className="videos"
+                    autoplay
+                    loop
+                    objectFit="cover"
+                    enablePlayGesture
+                    showFullscreenBtn={false}
+                    playBtnPosition="center"
+                    src={data.bluetoothConnectFail}
+                  />
                 ) : (
                   <Image
                     className="images"
diff --git a/src/custom-tab-bar/index.tsx b/src/custom-tab-bar/index.tsx
index 0a63b96..ea25ad2 100644
--- a/src/custom-tab-bar/index.tsx
+++ b/src/custom-tab-bar/index.tsx
@@ -71,11 +71,12 @@ export default class Index extends Component {
     console.log("url", url);
     this.setSelected(index);
 
-    if (url === "pages/index/index") {
-      Taro.reLaunch({ url: "/" + url });
-    } else {
-      Taro.switchTab({ url: "/" + url });
-    }
+    Taro.switchTab({ url: "/" + url });
+    // if (url === "pages/index/index") {
+    //   Taro.reLaunch({ url: "/" + url });
+    // } else {
+    //   Taro.switchTab({ url: "/" + url });
+    // }
   }
 
   setSelected(idx: number) {
diff --git a/src/instrument/pages/instrument/instrument.tsx b/src/instrument/pages/instrument/instrument.tsx
index bf0c88e..dc05fee 100644
--- a/src/instrument/pages/instrument/instrument.tsx
+++ b/src/instrument/pages/instrument/instrument.tsx
@@ -4,6 +4,15 @@ import { Component, PropsWithChildren, useEffect, useState } from "react";
 
 // import { InstrumentInfo } from "../../utils/Interface";
 
+/*** redux ***/
+import { connect } from "react-redux";
+import {
+  setInstrument,
+  setSerial,
+  setInstrumentName,
+} from "@/store/features/instrument";
+/*** redux end ***/
+
 import Taro from "@tarojs/taro";
 // 引入 Swiper, SwiperItem 组件
 import {
@@ -32,7 +41,7 @@ import NoDataComponent from "@/components/base/nodata";
 
 import "./instrument.less";
 
-export default class Instrument extends Component<any, any> {
+class Instrument extends Component<any, any> {
   constructor(props) {
     super(props);
     this.state = {
@@ -283,6 +292,7 @@ export default class Instrument extends Component<any, any> {
       let instrumentInfo = data.data;
       // 更新扫码进入仪器信息
       this.setState({ instrumentInfo: instrumentInfo });
+      this.props.setInstrument(instrumentInfo);
     }
   };
   /**删除扫码缓存*/
@@ -301,7 +311,6 @@ export default class Instrument extends Component<any, any> {
     let res = await InstrumentInfo.isBindingSerial({
       serial: instrumentInfo.serial,
     });
-    console.log("isBindingSerial", res);
     if (res.data.code === 201) {
       // 绑定
       this.setState({ isExchangeBinding: false, isVisibleBinding: true });
@@ -324,6 +333,7 @@ export default class Instrument extends Component<any, any> {
     let { channelInfo } = this.state;
 
     await this.getInstrumentInfoBySerial(channelInfo.serialCode);
+
     let res = await InstrumentInfo.manualCodeBinding({
       serial: channelInfo.serialCode,
       serialImage: channelInfo.serialImage,
@@ -334,7 +344,12 @@ export default class Instrument extends Component<any, any> {
     let code = Number(res.code); // 强制类型转换
     setTimeout(() => {
       if (code === 200) {
-        this.openBindingVisible();
+        // this.openBindingVisible();
+        msg("绑定成功");
+        setTimeout(() => {
+          setStorageSync("instrument_detail", JSON.stringify(channelInfo));
+          this.getInstrumentIntroInfo(channelInfo.id);
+        }, 500);
       } else if (code === 202) {
         this.changeBindBox();
       } else if (code === 203) {
@@ -364,15 +379,12 @@ export default class Instrument extends Component<any, any> {
 
     Taro.hideLoading();
     let code = Number(res.data.code);
-    console.log("scanCodeBinding code", code);
     setTimeout(() => {
-      console.log("scanCodeBinding code", code, code === 204);
       if (code === 200) {
-        msg("绑定成功");
-        setTimeout(() => {
-          setStorageSync("instrument_detail", JSON.stringify(channelInfo));
-          go("/instrument/pages/instrument/intro?id=" + channelInfo.id);
-        }, 1000);
+        Taro.setStorageSync("isScan", true);
+        Taro.setStorageSync("serial", channelInfo.serialCode);
+        Taro.switchTab({ url: "/pages/index/index" });
+        // this.openBindingVisible();
       } else if (res.data.code === 202) {
         this.changeBindBox();
       } else if (res.data.code === 203) {
@@ -401,10 +413,10 @@ export default class Instrument extends Component<any, any> {
       if (res.data.code === 200) {
         this.setState({ isVisibleBinding: false });
         msg("绑定成功");
-        setStorageSync("instrument_detail", JSON.stringify(channelInfo));
         setTimeout(() => {
-          go("/instrument/pages/instrument/intro?id=" + channelInfo.id);
-        }, 1000);
+          setStorageSync("instrument_detail", JSON.stringify(channelInfo));
+          this.getInstrumentIntroInfo(channelInfo.id);
+        }, 500);
       } else if (res.data.code === 202) {
         this.changeBindBox();
       } else if (res.data.code === 203) {
@@ -431,6 +443,24 @@ export default class Instrument extends Component<any, any> {
     this.closeBinding();
     if (data.code === 200) {
       msg("换绑成功");
+      setTimeout(() => {
+        setStorageSync("instrument_detail", JSON.stringify(channelInfo));
+        this.getInstrumentIntroInfo(channelInfo.id);
+      }, 500);
+    }
+  };
+
+  /** 获取设备介绍页信息:绑定判断是否存在介绍信息，如果存在则跳转，不存在则回到首页 */
+  getInstrumentIntroInfo = async (id) => {
+    let res = await InstrumentInfo.instructionInfo({
+      instrumentId: id,
+    });
+    if (res.data.code === 200) {
+      if (res.data.data.length > 0) {
+        go("/instrument/pages/instrument/intro??customBack=true&id=" + id);
+      } else {
+        Taro.switchTab({ url: "/pages/index/index" });
+      }
     }
   };
 
@@ -470,7 +500,7 @@ export default class Instrument extends Component<any, any> {
   }
 
   customBack = () => {
-    Taro.reLaunch({ url: "/pages/index/index" });
+    Taro.switchTab({ url: "/pages/index/index" });
   };
 
   // 打开绑定弹窗
@@ -772,3 +802,19 @@ export default class Instrument extends Component<any, any> {
     );
   }
 }
+
+const mapStateToProps = (state) => ({
+  storeInstrument: state.instrument,
+});
+const mapDispatchToProps = (dispatch) => ({
+  setSerial(data) {
+    dispatch(setSerial(data));
+  },
+  setInstrumentName(data) {
+    dispatch(setInstrumentName(data));
+  },
+  setInstrument(data) {
+    dispatch(setInstrument(data));
+  },
+});
+export default connect(mapStateToProps, mapDispatchToProps)(Instrument);
diff --git a/src/instrument/pages/instrument/intro.tsx b/src/instrument/pages/instrument/intro.tsx
index 6fbad48..bc3f58b 100644
--- a/src/instrument/pages/instrument/intro.tsx
+++ b/src/instrument/pages/instrument/intro.tsx
@@ -132,7 +132,7 @@ class Intro extends Component<any, any> {
   customBack = () => {
     let customBack = this.$instance.router?.params?.customBack;
     if (customBack) {
-      Taro.reLaunch({ url: "/pages/index/index" });
+      Taro.switchTab({ url: "/pages/index/index" });
       return;
     }
     back();
diff --git a/src/moduleIOT/pages/iotCarePlan/FR200.tsx b/src/moduleIOT/pages/iotCarePlan/FR200.tsx
index 19c376d..9fe3ad3 100644
--- a/src/moduleIOT/pages/iotCarePlan/FR200.tsx
+++ b/src/moduleIOT/pages/iotCarePlan/FR200.tsx
@@ -10,7 +10,7 @@ import React, {
   useState,
 } from "react";
 
-// import Echarts from "./components/Echart/index";
+import Echarts from "./components/Echart/index";
 import Gears from "./components/Gears/index";
 import {
   Block,
@@ -40,8 +40,8 @@ import ConnectionBluetoot from "@/components/bluetoot/connection";
 /* 本页组件 */
 import ElectricityView from "./components/ElectricityView/index";
 import ModeListView from "./components/ModeList/FR200";
-import ModeContent from "./components/ModeContent/FR200";
 import Footer from "./components/Footer/FR200";
+import WaterTest from "./components/WaterTest/index";
 /* 本页组件 END */
 
 import { go, getStorageSync, setStorageSync, msg } from "@/utils/traoAPI";
@@ -86,20 +86,7 @@ const MODE_WORKING_ENUM = {
 };
 
 // 不同模式启动前的倒计时时间
-let CountDownTime = {
-  powerfulSoothing: 6,
-  Stability: 3,
-  Brighten: 3,
-  FirmSkin: 3,
-  MaskCustom: 6,
-  BrightenStand: 6,
-  FirmSkinStand: 6,
-  SmallpoxSoothingPro: 6,
-  SmallpoxSoothing: 4,
-  MixNursePro: 6,
-  MixNurse: 4,
-  ScalpCare: 6,
-};
+let CountDownTime = {};
 
 let DeviceSyncData = {
   totalWorkingMinutes: 0,
@@ -145,7 +132,7 @@ class IotCarePlanFR200 extends Component<any, any> {
       /** 连接设备 End */
 
       /** 护理过程 */
-      isStandStatus: false, // 当前模式是否舱体/支架模式
+      isRuningTest: false, // 是否正在测试
       isShowStepTips: false, // 是否显示介绍步骤弹窗
       isConnectionBlutoot: true, // 是否已连接蓝牙
       isShowNurse: true, // 是否开始并显示护理 FR200默认已经开始准备护理
@@ -197,8 +184,6 @@ class IotCarePlanFR200 extends Component<any, any> {
       // 上一次护理记录未生成，是否继续连接设备
       isShowReReadRecordConnect: false,
 
-      // 按钮是否不可运行:FR200不可禁用
-      isFooterBtnDisabled: false,
       // isFirstEntryMode: false, // 模式首次打开
 
       isShowHistoryMsg: false, // 是否显示正在同步历史
@@ -374,7 +359,6 @@ class IotCarePlanFR200 extends Component<any, any> {
       isConnectionBlutoot: false, // 断开蓝牙
       // isShowCountdown: false, // 关闭倒计时，防止倒计时还在运行
     });
-    this.footerIsDisabled();
   };
 
   GetModeList = async (id) => {
@@ -478,10 +462,15 @@ class IotCarePlanFR200 extends Component<any, any> {
     // 开发中，暂时允许直接切换
     // 每次切换模式时清空一下历史数据
     this.changeItemUpdateFR200NursingHistory();
-    this.stepNext(); // 如果切换模式，则不执行开始逻辑
-    setTimeout(() => {
-      this.onNursingTap("switch");
-    }, 800);
+    this.stepNext(); // 仅切换模式，不执行开始逻辑
+
+    // FR200水分测试不可自动运行，需手动点击开始测试，手动启动检测
+    // 其他模式可以自动运行
+    if (data.modeType !== "moistureTest") {
+      setTimeout(() => {
+        this.onNursingTap("switch");
+      }, 800);
+    }
   };
   /** 设备运行中切换模式 */
   modeRuningChange() {
@@ -579,19 +568,15 @@ class IotCarePlanFR200 extends Component<any, any> {
   };
   /** 开始护理按钮：点击开始，页面进行到下一步 */
   onStartNurse = async () => {
-    // 如果检查通过，可运行，则执行下一步
-    if (!this.footerIsDisabled()) {
-      this.stepNext();
+    this.stepNext();
 
-      setTimeout(() => {
-        this.onNursingTap();
-        // 倒计时弹窗: 倒计时完成后，自动开始，并判断弹窗
-        let downNum = CountDownTime[this.state.ActiveModeItem.modeType] || 3;
-        this.showCountdownFun(downNum, () => {});
-      }, 500);
+    setTimeout(() => {
+      this.onNursingTap();
+      // 倒计时弹窗: 倒计时完成后，自动开始，并判断弹窗
+      let downNum = CountDownTime[this.state.ActiveModeItem.modeType] || 3;
+      this.showCountdownFun(downNum, () => {});
+    }, 500);
 
-      return;
-    }
     // 如果检查失败，则报错
     this.onEmitErrorTips();
   };
@@ -605,10 +590,7 @@ class IotCarePlanFR200 extends Component<any, any> {
       let { ActiveModeItem } = this.state;
 
       // 按钮不可点击时，提示报错
-      let isDisabled = this.footerIsDisabled();
-      if (isDisabled) {
-        this.showTips("检测到您的设备没有紧贴肌肤，请紧贴肌肤后重新尝试");
-      }
+      this.showTips("检测到您的设备没有紧贴肌肤，请紧贴肌肤后重新尝试");
     });
   };
 
@@ -1231,7 +1213,7 @@ class IotCarePlanFR200 extends Component<any, any> {
    */
   onNursingTap(type = "") {
     // 如果已禁止运行，则停止执行后续逻辑
-    if (this.state.isFooterBtnDisabled) return;
+    if (this.state.isRuningTest) return;
     // 防止多次点击
     if (this.state.hadClickStart) return;
     this.setState({
@@ -1359,22 +1341,9 @@ class IotCarePlanFR200 extends Component<any, any> {
       this.workJsonStatus.workMode
     );
 
-    this.setState({
-      isFooterBtnDisabled: false,
-    });
     if (this.workJsonStatus.workMode) {
       // FR200可能要判断是否水分测试 Test
-      console.log("this.workJsonStatus.workMode", this.workJsonStatus.workMode);
-      if (this.workJsonStatus.workMode.indexOf("Stand") > -1) {
-        console.log(
-          "this.workJsonStatus.workMode",
-          this.workJsonStatus.workMode
-        );
-        this.setState({
-          isStandStatus: true,
-        });
-        setTimeout(() => this.footerIsDisabled(), 100);
-      }
+      // console.log("现在运行的模式：", this.workJsonStatus.workMode);
     }
 
     // 2.判断是否已存在缓存的护理记录：如果没有历史，则缓存
@@ -1813,7 +1782,7 @@ class IotCarePlanFR200 extends Component<any, any> {
     this.setState({
       isConnectShow: false,
     });
-    Taro.reLaunch({ url: "/pages/index/index" });
+    Taro.switchTab({ url: "/pages/index/index" });
   };
 
   // 手动护理模式切换：提示是否保存护理
@@ -1874,24 +1843,8 @@ class IotCarePlanFR200 extends Component<any, any> {
   };
   /** 初次护理信息弹窗 END */
 
-  /**
-   * @name 设备运行开关按钮是否禁用
-   * @description 判断所选模式与设备连接状态是否一致
-   * @returns 返回true则禁用
-   */
-  footerIsDisabled = () => {
-    // 默认不禁用，FR200无法禁用
-    let isFooterBtnDisabled = false;
-
-    // this.setState({
-    //   isFooterBtnDisabled: isFooterBtnDisabled,
-    // });
-
-    return isFooterBtnDisabled; // 数据更新有延迟，返回用于判断
-  };
-
   customBack = () => {
-    Taro.reLaunch({ url: "/pages/index/index" });
+    Taro.switchTab({ url: "/pages/index/index" });
   };
 
   onModeLockOpen = async () => {
@@ -1935,7 +1888,7 @@ class IotCarePlanFR200 extends Component<any, any> {
       isFirstTipShow,
       nurseInfo,
       isShowReReadRecordSave,
-      isFooterBtnDisabled,
+      isRuningTest,
       isShowHistoryMsg,
       isModeLock,
     } = this.state;
@@ -2168,30 +2121,30 @@ class IotCarePlanFR200 extends Component<any, any> {
               />
             )}
 
-            {ActiveModeItem.combineData && (
-              <ModeContent
-                isShowNurse={isShowNurse}
-                ActiveModeItem={ActiveModeItem}
-                ModeStepIndex={ModeStepIndex}
-              />
+            {(ActiveModeItem.modeType === "face" ||
+              ActiveModeItem.modeType === "eyes") && <Echarts></Echarts>}
+
+            {(ActiveModeItem.modeType === "maskPenetration" ||
+              ActiveModeItem.modeType === "essence") && (
+              <Gears
+                onEmitMinus={this.handleMinus}
+                onEmitAdd={this.handleAdd}
+                GearData={GearData}
+              ></Gears>
             )}
 
-            {/* <Echarts></Echarts> */}
-            <Gears
-              onEmitMinus={this.handleMinus}
-              onEmitAdd={this.handleAdd}
-              GearData={GearData}
-            ></Gears>
+            {ActiveModeItem.modeType === "moistureTest" && (
+              <WaterTest></WaterTest>
+            )}
           </View>
 
           <Footer
-            isDisabled={isFooterBtnDisabled}
-            isShowNurse={isShowNurse}
+            currentWorkMode={ActiveModeItem.modeType}
+            isRuningTest={isRuningTest}
             isStopNurse={isStopNurse}
             onEmitStartNurse={this.onStartNurse}
             onEmitSwitchChange={this.onSwitchChange}
             onEmitEndPlan={this.onEndPlan}
-            onEmitErrorTips={this.onEmitErrorTips}
           />
         </View>
       </Block>
diff --git a/src/moduleIOT/pages/iotCarePlan/WL200.tsx b/src/moduleIOT/pages/iotCarePlan/WL200.tsx
index 3444020..7a641bb 100644
--- a/src/moduleIOT/pages/iotCarePlan/WL200.tsx
+++ b/src/moduleIOT/pages/iotCarePlan/WL200.tsx
@@ -1945,7 +1945,7 @@ class IotCarePlanWL200 extends Component<any, any> {
     this.setState({
       isConnectShow: false,
     });
-    Taro.reLaunch({ url: "/pages/index/index" });
+    Taro.switchTab({ url: "/pages/index/index" });
   };
 
   // 手动护理模式切换：提示是否保存护理
@@ -2056,7 +2056,7 @@ class IotCarePlanWL200 extends Component<any, any> {
     console.log("出发", e);
   };
   customBack = () => {
-    Taro.reLaunch({ url: "/pages/index/index" });
+    Taro.switchTab({ url: "/pages/index/index" });
   };
 
   onModeLockOpen = async () => {
diff --git a/src/moduleIOT/pages/iotCarePlan/components/Footer/FR200.tsx b/src/moduleIOT/pages/iotCarePlan/components/Footer/FR200.tsx
index 89cf8d3..218a1b1 100644
--- a/src/moduleIOT/pages/iotCarePlan/components/Footer/FR200.tsx
+++ b/src/moduleIOT/pages/iotCarePlan/components/Footer/FR200.tsx
@@ -2,115 +2,72 @@ import { Block, View, Image, Text, CoverView } from "@tarojs/components";
 import "./FR200.less";
 
 interface Props {
-  isShowNurse: boolean;
+  // isShowNurse: boolean;
+  currentWorkMode: string; // 当前工作模式
   isStopNurse: boolean;
-  isDisabled: boolean; // 是否禁用开始暂停按钮：模式与连接设备是否一致
+  isRuningTest: boolean; // 是否在运行测试
   onEmitStartNurse: Function; // 每次点击item，回调事件和数据给父组件
   onEmitSwitchChange: Function;
   onEmitEndPlan: Function;
-  onEmitErrorTips: Function; // 不可点击，提示错误
 }
 function Index({
-  isShowNurse,
+  currentWorkMode,
   isStopNurse,
-  isDisabled,
+  isRuningTest,
   onEmitStartNurse,
   onEmitSwitchChange,
   onEmitEndPlan,
-  onEmitErrorTips,
 }: Props) {
   const onStartNurse = () => {
     onEmitStartNurse();
   };
 
   const onSwitchChange = () => {
-    if (!isDisabled) {
-      onEmitSwitchChange();
-    }
+    onEmitSwitchChange();
   };
 
   const onEndPlan = () => {
     onEmitEndPlan();
   };
 
-  const onErrorTips = () => {
-    onEmitErrorTips();
-  };
-
   return (
     <Block>
       <View className="iot-footer">
-        {!isShowNurse && (
+        {currentWorkMode === "moistureTest" && (
           <Block>
-            {isDisabled ? (
-              <View className="btn btn-disable" onClick={onStartNurse}>
-                开始护理
+            {!isRuningTest ? (
+              <View className="btn " onClick={onStartNurse}>
+                启动检测
               </View>
             ) : (
-              <View className="btn" onClick={onStartNurse}>
-                开始护理
-              </View>
+              <View className="btn">检测中...</View>
             )}
           </Block>
         )}
 
-        {isShowNurse && (
+        {currentWorkMode !== "moistureTest" && (
           <View className="switch-btn-box">
-            {!isDisabled && (
-              <View className="btn-item border-right" onClick={onSwitchChange}>
-                {isStopNurse ? (
-                  <Block>
-                    <Image
-                      className="btn-icon"
-                      src={require("@/img/iot/start_nurse.png")}
-                      mode="aspectFill"
-                    />
-                    <Text className="btn-text">启动光照</Text>
-                  </Block>
-                ) : (
-                  <Block>
-                    <Image
-                      className="btn-icon"
-                      src={require("@/img/iot/pause_nurse.png")}
-                      mode="aspectFill"
-                    />
-                    <Text className="btn-text">暂停光照</Text>
-                  </Block>
-                )}
-              </View>
-            )}
-            {isDisabled && (
-              <View
-                className="btn-item border-right btn-disable"
-                onClick={onErrorTips}
-              >
-                {isStopNurse ? (
-                  <Block>
-                    <Image
-                      className="btn-icon"
-                      style="color: #ccc"
-                      src={require("@/img/iot/start_nurse.png")}
-                      mode="aspectFill"
-                    />
-                    <Text className="btn-text" style="color: #ccc">
-                      启动光照
-                    </Text>
-                  </Block>
-                ) : (
-                  <Block>
-                    <Image
-                      className="btn-icon"
-                      style="color: #ccc"
-                      src={require("@/img/iot/pause_nurse.png")}
-                      mode="aspectFill"
-                    />
-                    <Text className="btn-text" style="color: #ccc">
-                      暂停光照
-                    </Text>
-                  </Block>
-                )}
-              </View>
-            )}
+            <View className="btn-item border-right" onClick={onSwitchChange}>
+              {isStopNurse ? (
+                <Block>
+                  <Image
+                    className="btn-icon"
+                    src={require("@/img/iot/start_nurse.png")}
+                    mode="aspectFill"
+                  />
+                  <Text className="btn-text">启动光照</Text>
+                </Block>
+              ) : (
+                <Block>
+                  <Image
+                    className="btn-icon"
+                    src={require("@/img/iot/pause_nurse.png")}
+                    mode="aspectFill"
+                  />
+                  <Text className="btn-text">暂停光照</Text>
+                </Block>
+              )}
+            </View>
 
             <View className="btn-item" onClick={onEndPlan}>
               <Image
diff --git a/src/pages/consultant/consultant.tsx b/src/pages/consultant/consultant.tsx
index 78735c2..f5ee3ad 100644
--- a/src/pages/consultant/consultant.tsx
+++ b/src/pages/consultant/consultant.tsx
@@ -41,7 +41,7 @@ export default class Consultant extends Component<any, any> {
   customBack = () => {
     let customBack = this.$instance.router?.params?.customBack;
     if (customBack) {
-      Taro.reLaunch({ url: "/pages/index/index" });
+      Taro.switchTab({ url: "/pages/index/index" });
       return;
     }
     back();
diff --git a/src/pages/entry/entry.tsx b/src/pages/entry/entry.tsx
index 5834bcd..7ce1980 100644
--- a/src/pages/entry/entry.tsx
+++ b/src/pages/entry/entry.tsx
@@ -75,7 +75,7 @@ class Entry extends Component<any, any> {
       let detail = JSON.parse(MpSplashDetail_type1);
       let list = detail.filter((item: any) => item.fileSuffix === "images");
       if (list.length === 0) {
-        Taro.reLaunch({ url: "/pages/index/index" });
+        Taro.switchTab({ url: "/pages/index/index" });
         return;
       }
       let welcomeList = list.map((item) => {
@@ -87,7 +87,7 @@ class Entry extends Component<any, any> {
       });
       this.setState({ welcomeList });
     } else {
-      Taro.reLaunch({ url: "/pages/index/index" });
+      Taro.switchTab({ url: "/pages/index/index" });
     }
   }
 
@@ -114,7 +114,7 @@ class Entry extends Component<any, any> {
     }
   }
   toHomePage() {
-    Taro.reLaunch({ url: "/pages/index/index" });
+    Taro.switchTab({ url: "/pages/index/index" });
   }
 
   onFinish(event) {
diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx
index fb767e5..06e5579 100644
--- a/src/pages/index/index.tsx
+++ b/src/pages/index/index.tsx
@@ -1,4 +1,5 @@
 import classnames from "classnames";
+setSerial;
 import dayjs from "dayjs";
 import Taro from "@tarojs/taro";
 import { Component } from "react";
@@ -16,6 +17,11 @@ import { Popup } from "@antmjs/vantui";
 import { connect } from "react-redux";
 import { userRefresh, tokenRefresh } from "@/store/features/userInfo";
 import { setIndexFlag } from "@/store/features/globalStore";
+import {
+  setInstrument,
+  setSerial,
+  setInstrumentName,
+} from "@/store/features/instrument";
 /*** redux end ***/
 
 /** 自定义组件 **/
@@ -59,8 +65,6 @@ import {
 // const log = require("@/utils/log");
 
 class Index extends Component<any, any> {
-  $instance: any = Taro.getCurrentInstance();
-
   constructor(props) {
     super(props);
     this.state = {
@@ -117,10 +121,10 @@ class Index extends Component<any, any> {
         createBy: null,
         createTime: "2024-01-19 17:46:10",
         exportFields: [],
-        id: 4,
-        instrumentId: 82,
+        id: 0,
+        instrumentId: 0,
         instrumentIdArray: null,
-        instrumentName: "研发测试FR380",
+        instrumentName: "",
         instrumentSerialIdList: [],
         queryInstrumentIds: null,
         remark: null,
@@ -154,9 +158,28 @@ class Index extends Component<any, any> {
     };
   }
 
-  async onLoad() {
+  async onLoad(options) {
+    console.log("onLoad options", options);
+    if (options) {
+      if (options?.q) {
+        Taro.setStorageSync("isScan", true);
+        let url = options.q;
+        let _url = decodeURIComponent(url);
+        if (_url.indexOf("?")) {
+          let ids = _url.split("?");
+          if (ids.length > 1) {
+            let serial = ids[1];
+            Taro.setStorageSync("serial", serial);
+          }
+        }
+        console.log("Taro.getCurrentInstance()", Taro.getCurrentInstance());
+        Taro.reLaunch({ url: "/pages/index/index" }); // 链接扫码进入，需要清空router，重置地址栏参数防止bug
+      }
+    }
     // 仅非扫码进入页面时，校验跳转欢迎页
-    if (!this.$instance.router?.params?.q) {
+    let $instance: any = Taro.getCurrentInstance();
+    console.log("$instance", $instance);
+    if (!$instance.router?.params?.q) {
       const isFirst = Taro.getStorageSync("isWelcome");
       if (!isFirst) {
         go("/pages/initiate/initiate");
@@ -168,20 +191,22 @@ class Index extends Component<any, any> {
 
   componentWillUnmount() {
     // 页面卸载监听
-    Taro.offAppHide((res) => {});
-    this.$instance = null;
+    Taro.offAppHide((res) => {
+      console.log("页面卸载监听 offAppHide");
+    });
   }
 
   componentDidShow() {
-    const tabbar = Taro.getTabBar<CustomTabBar>(this.$instance.page);
-    tabbar?.setSelected(0);
-    console.log(
-      this.state.instrumentInfo,
-      "查看",
-      this.state.instrumentList,
-      Taro.getStorageSync("skipRegister")
-    );
     const handleAsyncLogic = async () => {
+      // tabbar icon切换
+      let $instance: any = Taro.getCurrentInstance();
+      const tabbar = Taro.getTabBar<CustomTabBar>($instance.page);
+      tabbar?.setSelected(0);
+      // 扫码仪器数据同步
+      this.setState({
+        instrumentInfo: this.props.storeInstrument,
+      });
+
       // 判断是否跳过了注册
       if (Taro.getStorageSync("skipRegister")) {
         await this.EquipmentNo(); // 扫码序列号查询：注册后才调用，因为扫码未注册直接跳转注册页
@@ -189,7 +214,9 @@ class Index extends Component<any, any> {
         Taro.removeStorageSync("skipRegister");
       } else {
         // 已注册且非跳过,正常执行逻辑
-        this.showInit();
+        setTimeout(() => {
+          this.showInit();
+        });
       }
     };
     handleAsyncLogic();
@@ -213,40 +240,13 @@ class Index extends Component<any, any> {
 
   showInit = async () => {
     // 判断是否登录
-    this.$instance = Taro.getCurrentInstance();
     let mobile = Taro.getStorageSync("mobile");
     if (mobile) {
       this.setState({ isRegisterBoolean: true });
     }
-    // 非扫码进入小程序，需判断是否跳转欢迎页；扫码进入小程序，先缓存序列号，再检测隐私弹窗
-    let serial = Taro.getStorageSync("serial");
-    console.log(this.$instance, "2222", serial);
-    let url = this.$instance.router?.params?.q || "";
-    if (!url) {
-      // 非扫码或扫码已跳转的返回进入
-      const isFirst = Taro.getStorageSync("isWelcome");
-      if (isFirst || serial) {
-        // 如果是扫码进来的,不需要进入介绍页也弹鉴权弹窗
-        this.checkShowPrivacyPopup();
-      }
-    } else {
-      // 扫码进入
-      Taro.setStorageSync("isScan", true);
-      // 是否可以运行扫码逻辑:每次扫码后设为真,
-      Taro.setStorageSync("isScanRun", true);
-      if (url) {
-        let _url = decodeURIComponent(url);
 
-        if (_url.indexOf("?")) {
-          let ids = _url.split("?");
-          if (ids.length > 1) {
-            let serial = ids[1];
-            Taro.setStorageSync("serial", serial);
-          }
-        }
-      }
-      this.checkShowPrivacyPopup();
-    }
+    // 直接检查隐私弹窗
+    this.checkShowPrivacyPopup();
   };
 
   // 检测是否弹出隐私协议
@@ -283,7 +283,6 @@ class Index extends Component<any, any> {
   // 查看设备序号与仪器
   EquipmentNo = async () => {
     let serial = Taro.getStorageSync("serial"); // 扫码可能跳转注册页，所以先缓存
-
     let { data } = await InstrumentInfo.getInstrumentInfoBySerial({
       serial: serial,
     });
@@ -292,6 +291,7 @@ class Index extends Component<any, any> {
       let instrumentInfo = data.data;
       // 更新扫码进入仪器信息
       this.setState({ instrumentInfo: instrumentInfo });
+      this.props.setInstrument(instrumentInfo);
 
       // 1有效 0无效
       // if (instrumentInfo.validStatus === 0) {
@@ -341,13 +341,11 @@ class Index extends Component<any, any> {
       // 防止逻辑出错没有token
       await this.onlyLogin();
     }
-    console.log("initPageData", Taro.getStorageSync("serial"));
     // 如果是扫码且已有token则跳转
-    if (Taro.getStorageSync("serial")) {
-      console.log(mobile, "mobile");
-
-      // 如果已注册绑定手机号不用跳转
+    let serial = Taro.getStorageSync("serial");
+    if (serial) {
       if (!mobile) {
+        // 如果未注册绑定手机号，就去注册
         setTimeout(() => {
           go("/pages/register/register");
         }, 300);
@@ -652,9 +650,12 @@ class Index extends Component<any, any> {
   };
   // 根据扫码的序列号获取仪器信息
   getInstrumentInfoBySerial = async () => {
-    let url = this.$instance.router?.params?.q || "";
+    let $instance: any = Taro.getCurrentInstance();
+    let url = $instance.router?.params?.q || "";
     let isScan = Taro.getStorageSync("isScan"); // 判断是否扫码进入
     let serial = Taro.getStorageSync("serial"); // 扫码可能跳转注册页，所以先缓存
+    if (!serial) return;
+
     if (url || isScan) {
       let { data } = await InstrumentInfo.getInstrumentInfoBySerial({
         serial: serial,
@@ -740,6 +741,7 @@ class Index extends Component<any, any> {
     let { data } = await InstrumentInfo.binding({
       serial: instrumentInfo.serial,
     });
+    console.log("bindingInstrument", data);
     Taro.hideLoading();
     this.closeBinding();
     this.removeScanFun();
@@ -773,13 +775,12 @@ class Index extends Component<any, any> {
     }
   };
 
-  /** 获取设备介绍页信息 */
+  /** 获取设备介绍页信息:绑定判断是否存在介绍信息，如果存在则跳转，不存在则回到首页 */
   getInstrumentIntroInfo = async (id) => {
     let res = await InstrumentInfo.instructionInfo({
       instrumentId: id,
     });
     if (res.data.code === 200) {
-      console.log("res.data.data", res.data.data);
       if (res.data.data.length > 0) {
         go("/instrument/pages/instrument/intro??customBack=true&id=" + id);
       } else {
@@ -798,11 +799,14 @@ class Index extends Component<any, any> {
     let { data } = await InstrumentInfo.exchangeBinding({
       serial: instrumentInfo.serial,
     });
-    console.log("exchangeBinding", data);
     Taro.hideLoading();
     this.closeBinding();
-    if (data.code !== 200) {
-      //todo
+    if (data.code === 200) {
+      msg("换绑成功");
+      setTimeout(() => {
+        setStorageSync("instrument_detail", JSON.stringify(instrumentInfo));
+        this.getInstrumentIntroInfo(instrumentInfo.id);
+      }, 500);
     }
   };
   // 仪器绑定失败弹窗
@@ -840,6 +844,7 @@ class Index extends Component<any, any> {
 
   // 跳转仪器介绍页
   goNursing = (item) => {
+    console.log("connectInstrument", item);
     // 仅开发者工具调试使用
     const platform = Taro.getSystemInfoSync().platform;
     if (platform === "devtools") {
@@ -1444,6 +1449,7 @@ const mapStateToProps = (state) => ({
   background: state.navigation.background,
   mobile: state.userInfo.mobile,
   isShowIndexFlag: state.globalStore.isShowIndexFlag,
+  storeInstrument: state.instrument,
 });
 const mapDispatchToProps = (dispatch) => ({
   userRefresh(data) {
@@ -1455,6 +1461,14 @@ const mapDispatchToProps = (dispatch) => ({
   setIndexFlag(data) {
     dispatch(setIndexFlag(data));
   },
+  setSerial(data) {
+    dispatch(setSerial(data));
+  },
+  setInstrumentName(data) {
+    dispatch(setInstrumentName(data));
+  },
+  setInstrument(data) {
+    dispatch(setInstrument(data));
+  },
 });
 export default connect(mapStateToProps, mapDispatchToProps)(Index);
-// instrumentId
diff --git a/src/pages/register/register.tsx b/src/pages/register/register.tsx
index b5fec9d..0fb4dd2 100644
--- a/src/pages/register/register.tsx
+++ b/src/pages/register/register.tsx
@@ -52,12 +52,12 @@ class Register extends Component<any, any> {
 
   onSkip = () => {
     // 返回首页尽量清空路由记录,防止扫码参数bug扰乱逻辑
-    Taro.reLaunch({ url: "/pages/index/index" });
+    Taro.switchTab({ url: "/pages/index/index" });
   };
   skipRegister() {
     // 跳过注册
     Taro.setStorageSync("skipRegister", true);
-    Taro.reLaunch({ url: "/pages/index/index" });
+    Taro.switchTab({ url: "/pages/index/index" });
   }
   onDisagreeTap = () => {
     // 关闭小程序
diff --git a/src/store/features/instrument.js b/src/store/features/instrument.js
index aad8658..8a6f822 100644
--- a/src/store/features/instrument.js
+++ b/src/store/features/instrument.js
@@ -22,14 +22,38 @@ const instrumentReducer = createSlice({
     updateBy: null,
     updateTime: null,
     validStatus: 1, // 1有效，0无效
+
+    // scanData: {
+    //   name: "", // 扫码名字
+    //   code: "", // 扫码序列号
+    //   isChange: false, // 是否换绑
+    // },
   },
+
   reducers: {
     setInstrument(state, { payload }) {
-      console.log("payload", payload);
-      state = JSON.parse(JSON.stringify(payload));
+      state.bindingStatus = payload.bindingStatus;
+      state.id = payload.id;
+      state.instrumentId = payload.instrumentId;
+      state.instrumentIdArray = payload.instrumentIdArray;
+      state.instrumentName = payload.instrumentName;
+      state.instrumentSerialIdList = payload.instrumentSerialIdList;
+      state.queryInstrumentIds = payload.queryInstrumentIds;
+      state.remark = payload.remark;
+      state.serial = payload.serial;
+      state.source = payload.source;
+      state.status = payload.status;
+      state.validStatus = payload.validStatus;
+    },
+    setSerial(state, { payload }) {
+      state.serial = payload;
+    },
+    setInstrumentName(state, { payload }) {
+      state.instrumentName = payload;
     },
   },
 });
 
-export const { setInstrument } = instrumentReducer.actions;
+export const { setInstrument, setSerial, setInstrumentName } =
+  instrumentReducer.actions;
 export default instrumentReducer.reducer;
diff --git a/src/store/index.js b/src/store/index.js
index 75e90f5..7f9e973 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -6,6 +6,7 @@ import userInfoReducer from "./features/userInfo";
 import globalStoreReducer from "./features/globalStore";
 import otherSettingReducer from "./features/otherSetting";
 import deviceInfoReducer from "./features/deviceInfo";
+import instrumentReducer from "./features/instrument";
 
 const store = configureStore({
   reducer: {
@@ -16,6 +17,7 @@ const store = configureStore({
     globalStore: globalStoreReducer,
     otherSetting: otherSettingReducer,
     deviceInfo: deviceInfoReducer,
+    instrument: instrumentReducer,
   },
 });
 
diff --git a/src/utils/request.js b/src/utils/request.js
index 2adf0de..82f98a1 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -27,7 +27,7 @@ export const Ajax = (params) => {
   //   mask: true,
   // });
 
-  const whiteListLoading = [""]; // loading
+  const whiteListLoading = []; // loading
 
   // 防止多次点击
   const requestUrlList = global_requestUrlList;