Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into dev

src/pages/face_report/face_report.tsx

@@ -21,6 +21,7 @@ export default class Index extends Component<any, any> {
   constructor(props) {
     super(props);
     this.state = {
+      reportShow:true,
       name: "template模板页",
       statistics: {},
       recordList: [],
@@ -250,7 +251,15 @@ delImg(i) {
       return minute + "分" + second + "秒";
     }
   }
-  async onLoad() {
+  async onLoad(options) {
+    let Bool = JSON.parse(options?.report)  
+    console.log('传过来的东西',options,Bool);
+    if(!Bool ){
+      this.setState({
+        reportShow:Bool
+      })
+    }
+    
     this.getRouteId();
     this.getClockStatistics()
   }
@@ -266,7 +275,7 @@ delImg(i) {
   };
 
   render() {
-    let { name, statistics, recordList, recordData, show,clockStatistics,punchInInfo,monthTime } = this.state;
+    let { name, statistics, recordList, recordData, show,clockStatistics,punchInInfo,monthTime,reportShow } = this.state;
     return (
       <Block>
         <Navbar isBack titleSlot="护理报告"></Navbar>
@@ -385,17 +394,18 @@ delImg(i) {
             </View>
           ))}
         </View>
-
-        <View className="footer flex aitems">
-          <View className="btn" onClick={this.setShow.bind(this, true)}>前往打卡</View>
-          <View className="text flex aitems">
-            <View onClick={this.GoIndex}>跳过</View>
-            <Image
-              src={require("../../img/right.png")}
-              mode="aspectFill"
-            ></Image>
-          </View>
-        </View>
+       {reportShow  ? (
+         <View className="footer flex aitems">
+         <View className="btn" onClick={this.setShow.bind(this, true)}>前往打卡</View>
+         <View className="text flex aitems">
+           <View onClick={this.GoIndex}>跳过</View>
+           <Image
+             src={require("../../img/right.png")}
+             mode="aspectFill"
+           ></Image>
+         </View>
+       </View>
+       ): null}
         <Popup show={show} onClose={() => this.setState({ show: false })}>
           <View className="popBox">
             <Image

src/pages/recording/recording.tsx

@@ -293,7 +293,8 @@ export default class Recording extends Component<any, any> {
   };
   //  跳转到护理报告
   toReport(id, recordId) {
-    go("/pages/face_report/face_report?id=" + id + "&recordId=" + recordId);
+    let report =false
+    go("/pages/face_report/face_report?id=" + id + "&recordId=" + recordId+ "&report=" + report );
   }
   // 上传图片
   handleChooseImage() {