diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx
index f964cd4..ccb37ee 100644
--- a/src/pages/index/index.tsx
+++ b/src/pages/index/index.tsx
@@ -184,9 +184,19 @@ class Index extends Component<any, any> {
   }
 
   componentDidHide() {
-    this.wl200UpgradeErrorFun();
-    Taro.closeBluetoothAdapter();
-    setStorageSync("isDisconnectUpdate", true); // 已断开更新
+    this.closeUpgradeBox();
+  }
+
+  /**
+   * 关闭升级弹窗
+   * 如果升级中，则在熄屏时，强制关闭
+   * */
+  closeUpgradeBox() {
+    if (this.state.isShowVersionUpgrading) {
+      this.wl200UpgradeErrorFun();
+      Taro.closeBluetoothAdapter();
+      setStorageSync("isDisconnectUpdate", true); // 已断开更新
+    }
   }
 
   showInit = async () => {
diff --git a/src/pages/recording/recording.tsx b/src/pages/recording/recording.tsx
index 5574c57..1488878 100644
--- a/src/pages/recording/recording.tsx
+++ b/src/pages/recording/recording.tsx
@@ -59,6 +59,7 @@ export default class Recording extends Component<any, any> {
         clockImageList: [],
         clockContent: "",
       },
+      clockContent: "",
     };
   }
 
@@ -110,7 +111,8 @@ export default class Recording extends Component<any, any> {
           clockImageList: res.data.data.clockImg,
           clockContent: res.data.data.clockContent,
         };
-        this.setState({ punchInInfo });
+        let clockContent = res.data.data.clockContent;
+        this.setState({ punchInInfo, clockContent });
       }
     }
   }
@@ -174,7 +176,8 @@ export default class Recording extends Component<any, any> {
   handleTextareaInput(e) {
     const punchInInfo = this.state.punchInInfo;
     punchInInfo.clockContent = e.detail.value;
-    this.setState({ punchInInfo });
+    let clockContent = e.detail.value;
+    this.setState({ punchInInfo, clockContent });
   }
   // 打开/关闭弹窗
   setShow(show: boolean) {
@@ -330,6 +333,7 @@ export default class Recording extends Component<any, any> {
       monthTime,
       show,
       punchInInfo,
+      clockContent,
     } = this.state;
     return (
       <Block>
@@ -660,11 +664,11 @@ export default class Recording extends Component<any, any> {
                   placeholder="请记录一下今天的护理心得吧"
                   maxlength={120}
                   onInput={this.handleTextareaInput.bind(this)}
-                  value={punchInInfo.clockContent}
+                  value={clockContent}
                 ></Textarea>
               </View>
               <View className="tip">
-                {"（" + (punchInInfo.clockContent.length || 0) + "/120）"}
+                {"（" + (clockContent.length || 0) + "/120）"}
               </View>
             </View>
             <View className="popbtnbox flex aitems jcenter">