.

src/pages/index/components/OverPop/index.jsx

@@ -0,0 +1,24 @@
+import { View, Input, Button } from "@tarojs/components"
+import { Popup } from "@antmjs/vantui";
+import './style.less'
+
+export default (props) => {
+  const { showOver, onOverClose, area, setArea, handleOverOk } = props
+  const handleArea = (e) => {
+    console.log(666)
+    setArea(e.detail.value)
+  }
+  return (
+    <Popup
+      show={showOver}
+      onClose={onOverClose}
+      className='tanchuang2'
+    >
+      <View className='bankInput'>
+        <View className='header'>作业面积：</View>
+        <Input className='body' type='digit' placeholder='请输入本次作业的面积' value={area} onBlur={handleArea} />
+      </View>
+      <Button className='btn' onClick={handleOverOk}>确认</Button>
+    </Popup>
+  )
+}

src/pages/index/components/OverPop/style.less

@@ -0,0 +1,37 @@
+.tanchuang2{
+  text-align: center;
+  font-size: 34px;
+  font-weight: 800;
+  color: #323232;
+  width: calc(100vw - 60px);
+  padding: 80px 30px;
+  box-shadow: 0px 0px 44px 0px rgba(0, 0, 0, 0.08);
+  border-radius: 40px;
+  .bankInput{
+    border: 2px solid #F2F2F2;
+    border-radius: 40px;
+    display: flex;
+    align-items: center;
+    padding: 36px 30px;
+    box-sizing: border-box;
+    .header{
+      font-weight: 500;
+      color: #333;
+      flex: none;
+    }
+    .body{
+      flex: 1;
+      font-size: 32px;
+      font-weight: 400;
+    }
+  }
+  .btn{
+    width: 200px;
+    height: 88px;
+    background: linear-gradient(0deg, #00AE39, #A0E067);
+    border-radius: 34px;
+    font-size: 32px;
+    color: #FFFFFF;  
+    margin-top: 50px;  
+  }
+}

src/pages/index/components/order/index.jsx

@@ -12,6 +12,7 @@ import positionImg from '@/assets/comm/position.png'
 import searchImg from '@/assets/comm/search.png'
 import orderImg from '@/assets/comm/orderList.png'
 import PositionImg from '@/assets/job/positionImg.png'
+import OverPop from '../OverPop'
 import './style.less'
 
 
@@ -63,35 +64,33 @@ export default (props) => {
       })
     })
   }
-  const handleArea = (e) => {
-    setArea(e.detail.value)
-  }
   const onOverClose = () => {
     setArea()
     setShowOver(false)
   }
   const handleOverOk = () => {
+    console.log(999999)
     //正整数或两位小数
     const test2 = /^\d+(\.\d{1,2})?$/.test(area)
     if (test2) {
-      overJob(job.jobId,{...job,area:area}).then(res=>{
-        Taro.showToast({
-          title: '恭喜完成作业',
-          icon: 'none',
-        })
-        getJobList({ pageNum: currentPage }).then(res2 => {
-          const lst = currentPage === 1 ? res2.records || [] : jobList.concat(res2.records || [])
-          //长列表加载当下一页没有数据时
-          if (res2.records.length == 0 && currentPage != 1) {
-            setIsMore(true)
-            return
-          }
-          setJobList(lst)
+      // overJob(job.jobId, { ...job, area: area }).then(res => {
+      //   Taro.showToast({
+      //     title: '恭喜完成作业',
+      //     icon: 'none',
+      //   })
+      //   getJobList({ pageNum: currentPage }).then(res2 => {
+      //     const lst = currentPage === 1 ? res2.records || [] : jobList.concat(res2.records || [])
+      //     //长列表加载当下一页没有数据时
+      //     if (res2.records.length == 0 && currentPage != 1) {
+      //       setIsMore(true)
+      //       return
+      //     }
+      //     setJobList(lst)
           onOverClose()
-        })
-      })
+        // })
+      // })
     }
-    else{
+    else {
       Taro.showToast({
         title: '请输入正确的面积整数或最多两位小数',
         icon: 'none',
@@ -175,17 +174,7 @@ export default (props) => {
           <View>{address}</View>
           <Button className='btn' onClick={handleOk}>确认</Button>
         </Popup>
-        <Popup
-          show={showOver}
-          onClose={onOverClose}
-          className='tanchuang2'
-        >
-          <View className='bankInput'>
-            <View className='header'>作业面积：</View>
-            <Input className='body' type='digit' placeholder='请输入本次作业的面积' value={area} onBlur={handleArea} />
-          </View>
-          <Button className='btn' onClick={handleOverOk}>确认</Button>
-        </Popup>
+        <OverPop showOver={showOver} onOverClose={onOverClose} area={area} setArea={setArea} handleOverOk={handleOverOk} />
       </ScrollView>
     </View>
   )

src/pages/index/components/order/style.less

@@ -143,42 +143,6 @@
       margin-top: 100px;  
     }
   }
-  .tanchuang2{
-    text-align: center;
-    font-size: 34px;
-    font-weight: 800;
-    color: #323232;
-    width: calc(100vw - 60px);
-    padding: 80px 30px;
-    box-shadow: 0px 0px 44px 0px rgba(0, 0, 0, 0.08);
-    border-radius: 40px;
-    .bankInput{
-      border: 2px solid #F2F2F2;
-      border-radius: 40px;
-      display: flex;
-      align-items: center;
-      padding: 36px 30px;
-      box-sizing: border-box;
-      .header{
-        font-weight: 500;
-        color: #333;
-        flex: none;
-      }
-      .body{
-        flex: 1;
-        font-size: 32px;
-        font-weight: 400;
-      }
-    }
-    .btn{
-      width: 200px;
-      height: 88px;
-      background: linear-gradient(0deg, #00AE39, #A0E067);
-      border-radius: 34px;
-      font-size: 32px;
-      color: #FFFFFF;  
-      margin-top: 50px;  
-    }
-  }
+  
 }
 

src/pages/index/index.jsx

@@ -24,7 +24,6 @@ export default withLayout((props) => {
   let { tab } = router.params
   const { location, setLocation, setAddress } = useModel('location')
   const { person } = useModel('person')
-  const [currentTab, setCurrentTab] = useState(0)
   const handleClick = (val) => {
     if (!person.phone && val != 0) {
       Taro.navigateTo({url:`/pages/Login/index?tab=${val}`})
@@ -51,41 +50,36 @@ export default withLayout((props) => {
       })
     }
   }, [])
-  useEffect(() => {
-    if (tab) {
-      setCurrentTab(tab - 0)
-    }
-  }, [tab])
   return (
     <View className='page-index'>
       <View className='index-navbar'>
-        <CustomNav home title={currentTab == 0 ? '首页' : currentTab == 1 ? '订单列表' : '我的'} />
+        <CustomNav home title={(!tab||tab==0) ? '首页' : tab == 1 ? '订单列表' : '我的'} />
       </View>
       <View className='index-container'>
-        {currentTab == 0 && <Order />}
-        {currentTab == 1 && <Job />}
-        {currentTab == 2 && <User />}
+        {(!tab||tab==0) && <Order />}
+        {tab == 1 && <Job />}
+        {tab == 2 && <User />}
       </View>
       <View className='index-tabbar'>
         <View
-          className={['tabberItem', currentTab == 0 ? "activeTabber" : '']}
+          className={['tabberItem', (!tab||tab==0) ? "activeTabber" : '']}
           onClick={() => handleClick(0)}
         >
-          <Image className='tabberImg' src={currentTab == 0 ? indexActive : indexImg}></Image>
+          <Image className='tabberImg' src={(!tab||tab==0) ? indexActive : indexImg}></Image>
           <View className='text'>首页</View>
         </View>
         <View
-          className={['tabberItem', currentTab === 1 ? "activeTabber" : '']}
+          className={['tabberItem', tab === 1 ? "activeTabber" : '']}
           onClick={() => handleClick(1)}
         >
-          <Image className='tabberImg' src={currentTab == 1 ? jobActive : job}></Image>
+          <Image className='tabberImg' src={tab == 1 ? jobActive : job}></Image>
           <View className='text'>订单列表</View>
         </View>
         <View
-          className={['tabberItem', currentTab === 2 ? "activeTabber" : '']}
+          className={['tabberItem', tab === 2 ? "activeTabber" : '']}
           onClick={() => handleClick(2)}
         >
-          <Image className='tabberImg' src={currentTab == 2 ? userActive : user}></Image>
+          <Image className='tabberImg' src={tab == 2 ? userActive : user}></Image>
           <View className='text'>个人中心</View>
         </View>
       </View>