diff --git a/src/pages/instrumentClickinUpload/index.tsx b/src/pages/instrumentClickinUpload/index.tsx
index b0dbcde..0f5a208 100644
--- a/src/pages/instrumentClickinUpload/index.tsx
+++ b/src/pages/instrumentClickinUpload/index.tsx
@@ -55,6 +55,7 @@ export default class InstrumentClickInUpload extends Component<any, any> {
         secondClockImg: null,
         thirdClockImg: null,
       },
+      clockcontents:'',
       // 现在选中的数据
       currentInfo: {
         modeVideo: "",
@@ -260,7 +261,15 @@ export default class InstrumentClickInUpload extends Component<any, any> {
   videoLoadedMetaData = async () => {};
 
   handleTextareaInput = async (e) => {
+<<<<<<< HEAD
     this.setState({ punchInInfo: { clockContent: e.detail.value } });
+=======
+      const punchInInfo = this.state.punchInInfo;
+      punchInInfo.clockContent = e.detail.value;
+      let clockcontents = e.detail.value;
+      this.setState({ punchInInfo, clockcontents });
+      // this.setState({ punchInInfo:{...punchInInfo,clockContent: e.detail.value} });
+>>>>>>> qsj
   };
 
   onModeLockOpen = async () => {
@@ -291,6 +300,7 @@ export default class InstrumentClickInUpload extends Component<any, any> {
       punchInInfo,
       isTipShow,
       currentInfo,
+      clockcontents,
       modeInfo,
       nurseInfo,
       isModeLock,
@@ -471,10 +481,10 @@ export default class InstrumentClickInUpload extends Component<any, any> {
               </View>
               <View className="content">
                 <Textarea
-                  placeholder-className="placeholder"
+                  placeholder-className="placeh和给g'holder"
                   maxlength={100}
                   onInput={this.handleTextareaInput}
-                  value={punchInInfo.clockContent}
+                  value={clockcontents}
                   placeholder="请记录一下今天打卡的心得吧~"
                 ></Textarea>
                 {/* {tipshow && (