feats

src/components/ScrollPage/style.module.less

@@ -1,11 +1,10 @@
 .box {
   display: flex;
+  height: calc(100%-100px);
   .page {
     flex: 1;
-    height: 100%;
   }
   .button {
-    flex: none;
     height: 100px;
   }
 }

src/layouts/index.jsx

@@ -13,7 +13,7 @@ export default (props) => {
 
   const { person, user } = useModel('user');
 
-  const conatinerClass = `${laySty['page-conatiner']} ${tabBar ? laySty['with-tabbar'] : ''} ${className}`;
+  const containerClass = `${laySty['page-conatiner']} ${tabBar ? laySty['with-tabbar'] : ''} ${className}`;
 
   React.useEffect(() => {
     if (person && !user) {
@@ -30,7 +30,7 @@ export default (props) => {
     <View className={laySty['page-wrapper']}>
       <Notify id="vanNotify" />
       <NavLoading loading={loading} />
-      <View className={conatinerClass} style={style}>
+      <View className={containerClass} style={style}>
         {
           !person && (
             <View className={laySty.loading}>

src/pages/check/edit/index.jsx

@@ -37,11 +37,10 @@ export default (props) => {
   });
 
   const [showLocType, setShowLocType] = React.useState(false);
-  const [evaluationPage, setEvaluationPage] = React.useState(true);
+  const [evaluationPage, setEvaluationPage] = React.useState(false);
   const [evaluationPage2, setEvaluationPage2] = React.useState(false);
-  const [evaluationPage3, setEvaluationPage3] = React.useState(false);
-  const [scrollPage, setScrollPage] = React.useState(false);
-
+  const [evaluationPage3, setEvaluationPage3] = React.useState(true);
+  console.log('fff', evaluationPage3);
   const onLocTypeChange = (_, it) => {
     setFormData({
       ...formData,
@@ -66,17 +65,19 @@ export default (props) => {
   const onChangePage2 = () => {
     setEvaluationPage2(false);
     setEvaluationPage3(true);
+    console.log('ff', evaluationPage3);
   }
 
+
+
   const onChangePage3 = () => {
     setEvaluationPage3(false);
-    setScrollPage(true);
   }
 
   return (
     <>
       <Page>
-        {
+        {/* {
           evaluationPage && (<>
             <LocType
               show={showLocType}
@@ -172,81 +173,77 @@ export default (props) => {
                 </View>
               </View>
             </View>)
-        }
+        } */}
 
         {
           evaluationPage3 && (
-            <ScrollPage>
-              <CellGroup>
-                <Cell title="测评内容" border={false} size="large" style={{ paddingBottom: '0px' }} />
-                <View style={{ padding: 'var(--main-space)', paddingTop: '0px' }}>
-                  <View style={{ padding: 'var(--main-space)', fontSize: '14px', color: 'var(--main-bg-color)' }}>
-                    垃圾乱扔，乱张贴（具体标准），测评结果：<Input type="text" style={{ width: '45px', display: 'inline-block', verticalAlign: 'middle' }} />处。（此处填写数字）
+            <>
+              <ScrollPage>
+                <CellGroup>
+                  <Cell title="测评内容" border={false} size="large" style={{ paddingBottom: '0px' }} />
+                  <View style={{ padding: 'var(--main-space)', paddingTop: '0px' }}>
+                    <View style={{ padding: 'var(--main-space)', fontSize: '14px', color: 'var(--main-bg-color)' }}>
+                      垃圾乱扔，乱张贴（具体标准），测评结果：<Input type="text" style={{ width: '45px', display: 'inline-block', verticalAlign: 'middle' }} />处。（此处填写数字）
+                    </View>
                   </View>
-                </View>
-              </CellGroup>
-
-              <CellGroup>
-                <Cell title="评测标准" border={false} size="large" />
-                <Row>
-                  <Col offset="2" span="20">
-                    <Cell
-                      title="
+                </CellGroup>
+
+                <CellGroup>
+                  <Cell title="评测标准" border={false} size="large" />
+                  <Row>
+                    <Col offset="2" span="20">
+                      <Cell
+                        title="
                     (1)每看到1处垃圾乱扔(1平方米以内的垃圾算作1处)计为1处;
                     (2)每看到1处乱张贴乱涂写乱刻画《1平米内出现的算作1 处在统一设置的信息栏中张贴的小广告不算作失分点)计为1处;
                     (3)每看到建筑物外立面的1处大面积破损污损《高3米以上、宽2米以上)计为1处。"
-                      border={false}
-                      style={{ paddingTop: '0px' }}
-                    />
-                  </Col>
-                </Row>
-              </CellGroup>
-
-              <CellGroup style={{ marginTop: '20px' }}>
-                <Cell title="拍照" border={false} size="large" />
-
-                <Cell
-                  renderTitle={
-                    <Uploader
-                      value={formData.attachList}
-                      disabled={readOnly}
-                      onChange={e => setFieldChange('attachList', e)}
-                    />
-                  }
-                />
-              </CellGroup>
-
-              <CellGroup style={{ marginTop: '20px', padding: 'var(--main-space)' }}>
-                <Row>
-                  <Col offset="1" span="10">
-                    <Button
-                      type="primary"
-                      block
-                    >
-                      上一题
-                    </Button>
-                  </Col>
-                  <Col offset="2" span="10">
-                    <Button
-                      type="primary"
-                      block
-                      onClick={onChangePage3}
-                    >
-                      下一题
-                    </Button>
-                  </Col>
-                </Row>
-              </CellGroup>
-            </ScrollPage>)
-        }
-      </Page >
-      <View>
-        {
-          scrollPage && (
-            <ScrollPage />
+                        border={false}
+                        style={{ paddingTop: '0px' }}
+                      />
+                    </Col>
+                  </Row>
+                </CellGroup>
+
+                <CellGroup style={{ marginTop: '20px' }}>
+                  <Cell title="拍照" border={false} size="large" />
+
+                  <Cell
+                    renderTitle={
+                      <Uploader
+                        value={formData.attachList}
+                        disabled={readOnly}
+                        onChange={e => setFieldChange('attachList', e)}
+                      />
+                    }
+                  />
+                </CellGroup>
+
+                <CellGroup style={{ marginTop: '20px', padding: 'var(--main-space)' }}>
+                  <Row>
+                    <Col offset="1" span="10">
+                      <Button
+                        type="primary"
+                        block
+                      >
+                        上一题
+                      </Button>
+                    </Col>
+                    <Col offset="2" span="10">
+                      <Button
+                        type="primary"
+                        block
+                      // onClick={onChangePage3}
+                      >
+                        下一题
+                      </Button>
+                    </Col>
+                  </Row>
+                </CellGroup>
+              </ScrollPage>
+            </>
           )
         }
-      </View>
+      </Page >
     </>
   )
 }