一只狗申请时默认选中

src/pages/index/index.jsx

@@ -7,7 +7,7 @@ import PageLoading from '@/components/PageLoading'
 import withBasic from '@/layouts/withBasic'
 
 import { useModel } from '@/store'
-import { getApplicationList, getBannerList } from '@/services/dogAPI'
+import { getApplicationList, getBannerList,getDogCardList } from '@/services/dogAPI'
 import MenuItem from './components/MenuItem'
 
 import './style.less'
@@ -22,7 +22,7 @@ const ml16 = {
 }
 
 const IndexPage = (props) => {
-  const { pets, cards } = useModel('userData')
+  const { pets, cards,setCards } = useModel('userData')
   const [totalApplyNum, setTotalApplyNum] = useState(0)
   const [noticeList, setNoticeList] = useState([])
   const [bannerList, setBannerList] = useState([])
@@ -42,6 +42,9 @@ const IndexPage = (props) => {
     getBannerList().then(res => {
       setBannerList(res)
     })
+    getDogCardList().then(res=>{
+      setCards(res.records)
+    })
   }, [])
 
   const goNoticeList = (e) => {

src/pages/setDogLicense/index.jsx

@@ -1,34 +1,27 @@
-import { View, Text, RadioGroup, Picker, Image, Input, Radio, Label, ScrollView, Slot } from '@tarojs/components'
-import Taro, { useDidShow, useRouter } from '@tarojs/taro';
 import { useEffect, useState } from 'react';
+import { View, RadioGroup, Picker, Input, Radio, Label } from '@tarojs/components'
+import Taro, { useDidShow, useRouter } from '@tarojs/taro';
 import Form from '@/components/Form';
 import FormItem from '@/components/Form/FormItem';
 import AuthProfile from '@/components/Authorize/AuthProfile';
-import { addDogList, addlication, getDogInfo } from '@/services/dogAPI';
+import Button from '@/components/Button';
+import { addDogList, addlication, getDogInfo, getCardLicenseInfo } from '@/services/dogAPI';
 import { handleFile } from '@/utils/request';
 import { useModel } from '@/store';
-import Button from '../../components/Button';
-
 import './style.less'
-import { getCardLicenseInfo } from '../../services/dogAPI';
 
 export default (props) => {
-  const { dogs, person } = useModel('userData')
+  const { dogs, setDogs, person } = useModel('userData')
   const [formData, setFormData] = useState()
-  const values = useRouter();
-  // const { petId } = value.params
 
   const [dogDate, setDogDate] = useState({ immunizationDate: null, petBirthday: null, petSex: [], petType: [] })
-  const [mainDog, setMainDog] = useState([])
-  const [dogStatus, setDogStatus] = useState(true)
+  //狗证详情
   const [renewalAndReissue, setRenewalAndReissue] = useState()
 
   const router = useRouter()
   const applyType = router.params.type || 'first'
   useEffect(() => {
     switch (applyType) {
-      // case 'first':
-      // break;
       case 'renewal':
         Taro.setNavigationBarTitle({
           title: '证件续期'
@@ -39,53 +32,48 @@ export default (props) => {
           title: '证件补办'
         })
         break;
-
-
       default:
         break;
     }
-
   }, [applyType])
   useDidShow(() => {
-    addDogList().then((res) => {
-      setMainDog(res.records)
-    })
-  }, [])
+    if (dogs) {
+      if (dogs.length == 1) {
+        getDetail(dogs[0])
+      }
+    } else {
+      addDogList().then((res) => {
+        setDogs(res.records)
+        if (res.records && res.records.length == 1) {
+          getDetail(res.records[0])
+        }
+      })
+    }
+  }, [dogs])
 
 
   const getDogInfoFunction = (petId) => {
-
     getDogInfo(petId).then((e) => {
       setFormData(e)
       const sex = [{ value: e?.sex, text: e?.sex == 1 ? '雄' : '雌' }];
       const petType = [{ value: 0, name: e?.petType }];
-
       setDogDate({ ...dogDate, petBirthday: e?.birthday, petSex: sex, petType: petType, })
-      console.log('test', e);
-
     })
   }
-  const getMainDogChange = (value) => {
-    console.log("🚀 ~ file: index.jsx ~ line 34 ~ getMainDogChange ~ value", value)
-    const valuess = value.detail.data
-    const { petId } = valuess
-    setRenewalAndReissue({ ...renewalAndReissue, ...valuess })
-
+  const getDetail = (val) => {
+    const { petId } = val
+    setRenewalAndReissue({ ...renewalAndReissue, ...val })
     if (applyType == 'renewal' || applyType == 'reissue') {
-      setDogStatus(false)
       getDogInfoFunction(petId)
       getCardLicenseInfo(petId).then((res) => {
-        console.log('狗子证件有效期', res);
         setRenewalAndReissue({ ...renewalAndReissue, ...res })
       })
     }
     if (applyType == 'first') {
       getCardLicenseInfo(petId).then((res) => {
         if (!res) {
-          setDogStatus(false)
           getDogInfoFunction(petId)
         } else {
-          setDogStatus(true)
           Taro.showModal({
             title: '提示',
             content: '当前狗狗已有证件，请勿重复申请！',
@@ -99,17 +87,16 @@ export default (props) => {
               }
             }
           })
-
-
         }
       })
     }
-
+  }
+  const getMainDogChange = (value) => {
+    const valuess = value.detail.data
+    getDetail(valuess);
   }
 
   const onDateChange = (type, value) => {
-    console.log('dogDate', dogDate);
-
     switch (type) {
       case 'petSex':
         setDogDate({ ...dogDate, petSex: value })
@@ -199,17 +186,13 @@ export default (props) => {
               }
             }
           })
-
-
         }
       })
-
     }
-
   }
 
   const rules = {
-    petName: [{ required: true, message: '请填写狗狗名称' }],
+    petId: [{ required: true, message: '请填写狗狗名称' }],
     petSex: [{ type: 'number', required: true, message: '请填写狗狗性别' }],
     petBirthday: [{ required: true, message: '请选择狗狗生日' }],
     petColor: [{ required: true, message: '请选择狗狗毛色' }],
@@ -254,7 +237,7 @@ export default (props) => {
               }
 
               <FormItem title='狗狗名称' required>
-                <s-picker name='petName' rangeKey='name' rangeValue='value' range={mainDog} value={formData?.name} onChange={getMainDogChange} />
+                <s-picker name='petId' rangeKey='name' rangeValue='petId' range={dogs} value={formData?.petId} onChange={getMainDogChange} />
               </FormItem>
               <FormItem title='狗狗性别' required>
                 <s-picker name='petSex' rangeKey='text' rangeValue='value' range={dogDate.petSex} value={formData?.sex} />

src/services/dogAPI.js

@@ -76,7 +76,7 @@ export const setDogInfo = (id, data) => request(`/pet/${id}`, { data, method: 'P
 
 
 /**
- * 狗狗证件
+ * 狗狗证件列表
  * @param {*} data
  * @returns
  */
@@ -91,7 +91,7 @@ export const getDogCardInfo = (id, data) => request(`/card/${id}`, { data, metho
 
 
 /**
- * 狗狗证件
+ * 申请列表
  * @param {*} data
  * @returns
  */