feats

src/pages/History/Item.jsx

@@ -6,13 +6,12 @@ import { useMemo } from 'react';
 export default (props) => {
   const { barData, person } = props;
 
-  const { tagShow, tagType, tagText } = useMemo(() => {
-    if (barData.reqStat !== '6') return { tagShow: false };
+  const { tagType, tagText } = useMemo(() => {
+    const hasReport = barData.reqStat === '6'
 
     return {
-      tagShow: true, 
-      tagType: 'success',
-      tagText: '阴性'
+      tagType: hasReport ? 'success' : undefined,
+      tagText: hasReport ? '阴性' : '报告未出',
      }
   }, [barData])
 
@@ -23,11 +22,9 @@ export default (props) => {
       </View>
       <View className='history-item-info'>
         <View>{person?.personName}</View>
-        <View>{barData.sampledDt}</View>
+        <View>{barData.sampledDt || <View style={{ color: 'red' }} >未采样</View>}</View>
         <View>
-        {
-          tagShow && <Tag size='large' type={tagType}>{tagText}</Tag>
-        }
+          <Tag size='large' type={tagType}>{tagText}</Tag>
         </View>
       </View>
     </View>

src/pages/History/index.jsx

@@ -1,7 +1,7 @@
 import { useEffect, useState } from 'react';
 import dayjs from 'dayjs';
 import { View } from '@tarojs/components'
-import { PowerScrollView } from '@antmjs/vantui';
+import { PowerScrollView, Empty } from '@antmjs/vantui';
 import { useModel } from '@/store';
 import { getBarcode } from '@/services/user';
 import Item from './Item';
@@ -10,15 +10,7 @@ import './style.less'
 
 export default (props) => {
   const { person } = useModel('userData')
-  const [loading, setLoading] = useState(false)
-  const [list, setList] = useState([
-    { barcode: '32013201', sampledDt: '2022-05-15', reqStat: '0' },
-    { barcode: '32013202', sampledDt: '2022-05-15', reqStat: '6' },
-    { barcode: '32013203', sampledDt: '2022-05-15', reqStat: '6' },
-    { barcode: '32013204', sampledDt: '2022-05-15', reqStat: '6' },
-    { barcode: '32013205', sampledDt: '2022-05-15', reqStat: '6' },
-    { barcode: '32013206', sampledDt: '2022-05-15', reqStat: '6' },
-  ])
+  const [list, setList] = useState([])
 
   useEffect(() => {
     if (person && person.personId) {
@@ -28,17 +20,23 @@ export default (props) => {
         endDate: today.format('YYYY-MM-DD'),
         idNo: person.idNo,
       }
-      setLoading(true)
+
       getBarcode(person.personId, params).then((res) => {
-        setList(res || [])
-        setLoading(false)
+        if (!res) {
+          setList([])
+        } else {
+          setList(JSON.parse(res))
+        }
       }).catch(err => {
         console.error(err)
-        setLoading(false)
       })
     }
   }, [person])
 
+  if (!list || !list.length) {
+    <Empty description='暂无数据' />
+  }
+
   return (
     <PowerScrollView
       className='barcode-history-list'

src/pages/index/components/QRItem.jsx

@@ -5,13 +5,13 @@ import { Tag } from "@antmjs/vantui"
 import './style.less'
 
 const TagStatus = {
-  0: '可采样',
-  1: '可采样',
-  2: '可采样',
-  3: '送出',
-  4: '接收',
-  5: '部分报告',
-  6: '确认报告',
+  '0': '可采样',
+  '1': '可采样',
+  '2': '可采样',
+  '3': '送出',
+  '4': '接收',
+  '5': '部分报告',
+  '6': '确认报告',
 }
 
 export default (props) => {

src/pages/index/index.jsx

@@ -63,7 +63,9 @@ export default (props) => {
         }
       })
     }
+  }, [person])
 
+  useEffect(() => {
     if (user && user.userId) {
       if (!person || !person.idNo) {
         setIdCardVisible(true)
@@ -71,7 +73,7 @@ export default (props) => {
         setIdCardVisible(false)
       }
     }
-  }, [person, user])
+  }, [user, person])
 
   return (
     <View className='index-page'>

src/services/user.js

@@ -42,5 +42,5 @@ export const setUserInfo = (data) => request('/person', { data, method: 'PUT' })
  */
 export const getBarcode = (id, params) => {
   const data = { queryStr : getQueryString(params) }
-  return request(`/person/${id}/barcode`, { data, method: 'GET' })
+  return request(`/person/${id}/barcode`, { data, pageLoading: true, method: 'POST' })
 }

src/store/userData.js

@@ -12,12 +12,6 @@ export default () => {
   const [deptName, setDeptName] = useState()
   const [formValue, setFormValue] = useState()
 
-
-
-
-
-
-
   const logins = (params) => {
     console.log('login');
 
@@ -29,25 +23,6 @@ export default () => {
       setPerson(taPerson);
       setUser(taUser);
       setSessionKey(skey);
-      // if (!res.person) {
-      //   console.log('没有身份证',);
-      //   Taro.showModal({
-      //     title: '提示',
-      //     content: '未添加个人信息!',
-      //     showCancel: false,
-      //     success: function (res) {
-      //       if (res.confirm) {
-      //         Taro.redirectTo({
-      //           url: '/pages/setUserInfo/index'
-      //         })
-
-      //       }
-      //     }
-      //   })
-
-      // } else {
-      //   console.log('有身份证',);
-      // }
     })
   }
   console.log("🚀 来自store的打印 person数据formValue", person, formValue)

src/utils/request.js

@@ -4,7 +4,7 @@ import { getQueryString } from './codeSegment'
 let appid
 
 export default (url, options) => {
-  const { params, skipError, header, ...leftOptions } = options || {}
+  const { params, skipError, header, pageLoading, ...leftOptions } = options || {}
   const queryStr = getQueryString(params)
 
   if (!appid) {
@@ -24,11 +24,21 @@ export default (url, options) => {
   }
 
   return new Promise((resolve, reject) => {
+    if (pageLoading) {
+      Taro.showLoading({
+        title: '请稍后...',
+      });
+    }
+
     Taro.request({
       ...leftOptions,
       url: nwUrl,
       header: nwHeader,
       success: (res) => {
+        if (pageLoading) {
+          Taro.hideLoading();
+        }
+
         const { code, message, data, token } = res.data
 
         if (token || data?.token) {
@@ -50,6 +60,10 @@ export default (url, options) => {
       },
 
       fail: (err) => {
+        if (pageLoading) {
+          Taro.hideLoading();
+        }
+
         console.error(err)
         const message = err.message || err.errMsg || err
         if (!skipError) {