feats

src/components/layout/index.jsx

@@ -15,7 +15,7 @@ export default (props) => {
     ]
 
     const url = tabPage[index];
-    Taro.redirectTo({ url });
+    Taro.reLaunch({ url });
   }
 
   return (

src/pages/index/index.jsx

@@ -3,15 +3,19 @@ import Taro from '@tarojs/taro';
 import { View } from '@tarojs/components';
 import Uploader from '@/components/Uploader';
 import Layout from '@/components/layout';
-import { Button, Form, FormItem, Radio, RadioGroup, Icon, Field } from '@antmjs/vantui';
-import { saveBind } from '@/services/bind';
+import { NoticeBar, Button, Form, FormItem, Radio, RadioGroup, Icon, Field } from '@antmjs/vantui';
+import { saveBind, updateBind, getBoundDetail } from '@/services/bind';
 import useRequest from '@/utils/useRequest';
 import './index.less'
 
 export default (props) => {
   const form = Form.useForm();
+  const { params } = Taro.useRouter();
+  const { id } = params;
+  const [disabled, setDisabled] = React.useState(false);
 
   const [loading, request] = useRequest(saveBind);
+  const [loading2, request2] = useRequest(updateBind);
 
   const onScan = () => {
     Taro.scanCode({
@@ -27,16 +31,38 @@ export default (props) => {
   const onFinish = (errs, values) => {
     console.log(errs, values);
     if (!errs) {
-      request(values).then(res => {
-        Taro.switchTab({
-          url: '/pages/mine/index',
+      if (id) {
+        request2(id, values).then(res => {
+          Taro.reLaunch({
+            url: '/pages/mine/index',
+          });
         });
-      });
+      } else  {
+        request(values).then(res => {
+          Taro.reLaunch({
+            url: '/pages/mine/index',
+          });
+        });
+      }
     }
   }
 
+  React.useEffect(() => {
+    if (id) {
+      getBoundDetail(id).then(res => {
+        form.setFields(res);
+
+        // 如果已经入库, 禁止编辑
+        setDisabled(res.status === 1);
+      })
+    }
+  }, [id])
+
   return (
     <Layout active={0}>
+      {
+        disabled && <NoticeBar text="车辆信息已入库, 禁止编辑" />
+      }      
       <Form className="bind-form" form={form} onFinish={onFinish}>
         <FormItem
           required
@@ -90,7 +116,6 @@ export default (props) => {
           <Field placeholder="请输入" clearable />
         </FormItem>
         <FormItem
-          required
           label="身 份 证"
           name="idCard"
           validateTrigger="onBlur"
@@ -102,7 +127,8 @@ export default (props) => {
             block
             type="primary"
             formType="submit"
-            loading={loading}
+            loading={loading || loading2}
+            disabled={disabled}
           >
             提交
           </Button>

src/pages/mine/components/Item.jsx

@@ -4,7 +4,7 @@ import { Row, Col, Image, Icon } from '@antmjs/vantui';
 import './style.less'
 
 export default (props) => {
-  const { data } = props;
+  const { data, onClick } = props;
 
   return (
     <View className="device-card">
@@ -15,7 +15,7 @@ export default (props) => {
           src={data?.machineryThumb}
         />
       </View>
-      <View className="device-card-body">        
+      <View className="device-card-body" onClick={onClick}>        
         <Row>
           <Col span={16}>
             <View className="device-card-title">{ data?.machineryName }</View>

src/pages/mine/components/List.jsx

@@ -53,9 +53,9 @@ export default (props) => {
       scrollDirection === 'forward' &&
       // 5 = (列表高度 / 单项列表高度)
       // 100 = 滚动提前加载量，可根据样式情况调整
-      scrollOffset > ((dataLen - Math.ceil(height / itemSize) ) * itemSize + 100)
+      scrollOffset > ((dataLen - Math.floor(height / itemSize) ) * itemSize - 50)
     ) {
-      queryData({ pageNum: pageInfo.current + 1 , pageSize: 10 })
+      queryData({ pageNum: pageInfo.current + 1 , pageSize: 6 })
     }
   }
 

src/services/bind.js

@@ -1,5 +1,8 @@
 import request from "@/utils/request";
 
 export const saveBind = data => request('/tcBind', { method: 'post', data });
+export const updateBind = (id, data) => request(`/tcBind/${id}`, { method: 'put', data });
 
 export const getBoundList = params => request('/tcBind', { params });
+
+export const getBoundDetail = id => request(`/tcBind/${id}`);