.

src/pages/index/components/User/index.jsx

@@ -46,7 +46,7 @@ export default (props) => {
   }
   return (
     <ScrollView scrollY style={{ height: '100%' }}>
-      <View className='personTip'>该账号归{person.nickName}pc用户名所属</View>
+      <View className='personTip'>该账号归{person.userName}所属</View>
       <View className='userHead' onClick={handleAccount}>
         <Image src={userBgi} className='userBgi' />
         <View className='headcontent' >

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

@@ -52,16 +52,19 @@ export default (props) => {
   }
   const handleOk = () => {
     toggleJob(job.jobId, { mode: true }).then(() => {
-      //目测有bug
-      getJobList({ pageNum: currentPage }).then(res => {
-        const lst = currentPage === 1 ? res.records || [] : jobList.concat(res.records || [])
-        //长列表加载当下一页没有数据时
-        if (res.records.length == 0 && currentPage != 1) {
-          setIsMore(true)
-          return
+      const list = [...jobList];
+      list.forEach(item => {
+        if (item.jobId == job.jobId) {
+          item.status = 1
         }
-        setJobList(lst)
-        onClose()
+      })
+      setJobList(list);
+      onClose()
+    }).catch(e=>{
+      console.log(e.message);
+      Taro.showToast({
+        title: '系统错误，请刷新小程序重试',
+        icon: 'none',
       })
     })
   }
@@ -73,19 +76,23 @@ export default (props) => {
     //正整数或两位小数
     if (!isNaN(area)) {
       overJob(job.jobId, { ...job, area: area }).then(() => {
-        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
+        Taro.showToast({
+          title: '恭喜完成作业',
+          icon: 'none',
+        })
+        const list = [...jobList];
+        list.forEach(item => {
+          if (item.jobId == job.jobId) {
+            item.status = 3
           }
-          setJobList(lst);
-          Taro.showToast({
-            title: '恭喜完成作业',
-            icon: 'none',
-          })
-          onOverClose()
+        })
+        setJobList(list);
+        onOverClose()
+      }).catch(e=>{
+        console.log(e.message);
+        Taro.showToast({
+          title: '系统错误，请刷新小程序重试',
+          icon: 'none',
         })
       })
     }
@@ -96,7 +103,7 @@ export default (props) => {
       })
     }
   }
-  useDidShow(() => {
+  const getList = () => {
     getJobList({ pageNum: currentPage }).then(res => {
       const lst = currentPage === 1 ? res.records || [] : jobList.concat(res.records || [])
       //长列表加载当下一页没有数据时
@@ -106,17 +113,12 @@ export default (props) => {
       }
       setJobList(lst)
     })
+  }
+  useDidShow(() => {
+    getList();
   })
   useEffect(() => {
-    getJobList({ pageNum: currentPage }).then(res => {
-      const lst = currentPage === 1 ? res.records || [] : jobList.concat(res.records || [])
-      //长列表加载当下一页没有数据时
-      if (res.records.length == 0 && currentPage != 1) {
-        setIsMore(true)
-        return
-      }
-      setJobList(lst)
-    })
+    getList();
   }, [currentPage])
   useEffect(() => {
     getBannerList({ position: 'bannerWorker' })

src/pages/userInfo/index.jsx

@@ -90,7 +90,7 @@ export default withLayout((props) => {
         <View className='userCell'>
           <View>用户名：</View>
           <View style={{ display: 'flex', opacity: 0.5, alignItems: 'center', height: '54px' }}>
-            <Input type='text' value='pc端用户名' disabled className='userName' />
+            <Input type='text' value={person.userName} disabled className='userName' />
           </View>
         </View>
         <View className='userCell'>