ad

src/app.config.js

@@ -7,6 +7,8 @@ export default {
     'pages/setDogLicense/index',
     'pages/dogLicenseList/index',
     'pages/LicenseInfo/index',
+    'pages/dogList/index',
+    'pages/setDogInfo/index',
   ],
   window: {
     backgroundTextStyle: 'light',

src/pages/dogLicenseList/index.jsx

@@ -1,8 +1,18 @@
 import { View, ScrollView, Image } from '@tarojs/components'
-import Taro from '@tarojs/taro';
+import Taro, { useDidShow } from '@tarojs/taro';
+import { useState } from 'react';
+import { getDogCardList } from '../../services/dogAPI';
 import './style.less'
 
 export default (props) => {
+  const [dogCardList, setDogCardList] = useState([])
+
+  useDidShow(() => {
+    getDogCardList().then((e) => {
+      setDogCardList(e.records)
+
+    })
+  })
 
   const goDogList = () => {
     console.log('e',);
@@ -12,49 +22,18 @@ export default (props) => {
       url: '/pages/LicenseInfo/index'
     })
   }
-  const List = [
-    {
-      img: 'https://tse1-mm.cn.bing.net/th/id/R-C.20cb4bf5b22ca1b67f69ea29fb2af8fc?rik=XCvrM0gKEAHIVA&riu=http%3a%2f%2fnews.hainan.net%2fEditor%2fimg%2f201410%2f20141023%2fbig%2f2014102320332887_4718693.jpg&ehk=GnaUVphTAgEeLq%2b2rPn8qJnONF3aIPUKuw%2bVaECvyZo%3d&risl=&pid=ImgRaw&r=0',
-      dogNmae: '王小狗',
-      dogNum: 202221588650021,
-    },
-    {
-      img: 'https://tse1-mm.cn.bing.net/th/id/R-C.20cb4bf5b22ca1b67f69ea29fb2af8fc?rik=XCvrM0gKEAHIVA&riu=http%3a%2f%2fnews.hainan.net%2fEditor%2fimg%2f201410%2f20141023%2fbig%2f2014102320332887_4718693.jpg&ehk=GnaUVphTAgEeLq%2b2rPn8qJnONF3aIPUKuw%2bVaECvyZo%3d&risl=&pid=ImgRaw&r=0',
-      dogNmae: '王小狗',
-      dogNum: 202221588650021,
-    }, {
-      img: 'https://tse1-mm.cn.bing.net/th/id/R-C.20cb4bf5b22ca1b67f69ea29fb2af8fc?rik=XCvrM0gKEAHIVA&riu=http%3a%2f%2fnews.hainan.net%2fEditor%2fimg%2f201410%2f20141023%2fbig%2f2014102320332887_4718693.jpg&ehk=GnaUVphTAgEeLq%2b2rPn8qJnONF3aIPUKuw%2bVaECvyZo%3d&risl=&pid=ImgRaw&r=0',
-      dogNmae: '王小狗',
-      dogNum: 202221588650021,
-    }, {
-      img: 'https://tse1-mm.cn.bing.net/th/id/R-C.20cb4bf5b22ca1b67f69ea29fb2af8fc?rik=XCvrM0gKEAHIVA&riu=http%3a%2f%2fnews.hainan.net%2fEditor%2fimg%2f201410%2f20141023%2fbig%2f2014102320332887_4718693.jpg&ehk=GnaUVphTAgEeLq%2b2rPn8qJnONF3aIPUKuw%2bVaECvyZo%3d&risl=&pid=ImgRaw&r=0',
-      dogNmae: '王小狗',
-      dogNum: 202221588650021,
-    }, {
-      img: 'https://tse1-mm.cn.bing.net/th/id/R-C.20cb4bf5b22ca1b67f69ea29fb2af8fc?rik=XCvrM0gKEAHIVA&riu=http%3a%2f%2fnews.hainan.net%2fEditor%2fimg%2f201410%2f20141023%2fbig%2f2014102320332887_4718693.jpg&ehk=GnaUVphTAgEeLq%2b2rPn8qJnONF3aIPUKuw%2bVaECvyZo%3d&risl=&pid=ImgRaw&r=0',
-      dogNmae: '王小狗',
-      dogNum: 202221588650021,
-    }, {
-      img: 'https://tse1-mm.cn.bing.net/th/id/R-C.20cb4bf5b22ca1b67f69ea29fb2af8fc?rik=XCvrM0gKEAHIVA&riu=http%3a%2f%2fnews.hainan.net%2fEditor%2fimg%2f201410%2f20141023%2fbig%2f2014102320332887_4718693.jpg&ehk=GnaUVphTAgEeLq%2b2rPn8qJnONF3aIPUKuw%2bVaECvyZo%3d&risl=&pid=ImgRaw&r=0',
-      dogNmae: '王小狗',
-      dogNum: 202221588650021,
-    }, {
-      img: 'https://tse1-mm.cn.bing.net/th/id/R-C.20cb4bf5b22ca1b67f69ea29fb2af8fc?rik=XCvrM0gKEAHIVA&riu=http%3a%2f%2fnews.hainan.net%2fEditor%2fimg%2f201410%2f20141023%2fbig%2f2014102320332887_4718693.jpg&ehk=GnaUVphTAgEeLq%2b2rPn8qJnONF3aIPUKuw%2bVaECvyZo%3d&risl=&pid=ImgRaw&r=0',
-      dogNmae: '王小狗',
-      dogNum: 202221588650021,
-    },
-  ]
+
   const widgetView = (value) => {
     return (
       <View className='user-box-DogListCard' onClick={goLicenseInfo}>
         <View className='user-box-DogListCard-DogImage'>
           {/* <ViewIcon icon='morentouxiang' size={50} color='#FBD804' /> */}
-          <Image src={value.img} />
+          <Image src={value.petImg1} />
         </View>
 
         <View className='user-box-DogListCard-DogImage'>
-          <View>姓名：{value.dogNmae}</View>
-          <View>证件号：{value.dogNum}</View>
+          <View>姓名：{value.petName}</View>
+          <View>证件号：{value.cardNo}</View>
         </View>
         <View className='user-box-DogListCard-right' >
           <View style={{ paddingRight: '5px' }}>
@@ -69,10 +48,9 @@ export default (props) => {
   return (
     <ScrollView scrollY style={{ height: '100vh' }}>
       {
-        List.map((item, index) => {
+        dogCardList.map((item, index) => {
           return (
             widgetView(item)
-
           )
         })
       }

src/pages/dogList/index.config.js

@@ -0,0 +1,11 @@
+export default {
+  navigationBarTitleText: '我的狗狗',
+  disableScroll: true,
+  navigationBarBackgroundColor: "#FBD804",
+  navigationBarTextStyle: "black",
+  backgroundColor: "#FBD804",
+  usingComponents: {
+
+  }
+
+}

src/pages/dogList/index.jsx

@@ -0,0 +1,70 @@
+import { View, ScrollView, Image, Button } from '@tarojs/components'
+import Taro, { useDidShow } from '@tarojs/taro';
+import ViewIcon from '../../components/ViewIcon';
+import { useEffect, useState } from 'react';
+import './style.less'
+import { addDogList } from '../../services/dogAPI';
+import { useModel } from '../../store';
+
+export default (props) => {
+  const { dogs, person, setDogs } = useModel('userData')
+  const [dogList, setDogList] = useState([])
+
+  const goDogList = () => {
+    console.log('e',);
+  }
+  const goLicenseInfo = (id) => {
+    Taro.navigateTo({
+      url: `/pages/setDogInfo/index?petId=${id}`
+    })
+  }
+  useDidShow(() => {
+    addDogList().then((e) => {
+      setDogList(e.records)
+      setDogs(e.records)
+
+    })
+  })
+
+
+
+  const widgetView = (value) => {
+    return (
+      <View className='user-box-addDog' onClick={() => goLicenseInfo(value.petId)}>
+        <View className='user-box-addDog-DogImage'>
+          {/* <ViewIcon icon='morentouxiang' size={50} color='#FBD804' /> */}
+          <Image src={value.image} />
+        </View>
+
+        <View className='user-box-addDog-DogImage'>
+          <View>姓名：{value.name}</View>
+          <View>犬种：{value.petType}</View>
+        </View>
+        <View className='user-box-addDog-rightDog' >
+          <View style={{ paddingRight: '5px' }}>
+            <ViewIcon icon='bianji' size={17} color='#2f2f2f' />
+          </View>
+          修改狗狗
+        </View>
+      </View>
+    )
+  }
+
+  return (
+    <ScrollView scrollY style={{ height: '100vh' }}>
+      {
+        dogList.map((item, index) => {
+          return (
+            widgetView(item)
+
+          )
+        })
+      }
+
+      <View slot='button' style={{ margin: '4em 0 2em 0' }} onClick={goLicenseInfo}>
+        <Button style={{ width: '50vw', backgroundColor: '#fbd804', borderRadius: '40px', color: '#000', border: '0px' }} class='weui-btn' type='primary' loading={false} formType='submit'>+ 添加狗狗</Button>
+      </View>
+    </ScrollView>
+  )
+}
+

src/pages/dogList/style.less

@@ -0,0 +1,35 @@
+.user-box-addDog {
+  background-color: #fff;
+  display: flex;
+  align-items: center;
+  padding: 25px 15px;
+  margin: 20px auto;
+  border-bottom-right-radius: 15px;
+  border-bottom-left-radius: 15px;
+  &-DogImage {
+    margin-left: 20px;
+    height: 130px;
+    line-height: 60px;
+    > Image {
+      width: 125px;
+      height: 125px;
+      border-radius: 10px;
+    }
+    > View:nth-child(1) {
+      font-size: 30px;
+      font-weight: 600;
+    }
+    > View:nth-child(2) {
+      color: rgb(175, 175, 175);
+      font-size: 25px;
+    }
+  }
+  &-rightDog {
+    display: flex;
+    align-items: center;
+    text-align: center;
+    font-size: 25px;
+    position: absolute;
+    right: 4vw;
+  }
+}

src/pages/main/index.jsx

@@ -1,18 +1,35 @@
 import { View, Text, Image } from '@tarojs/components'
 import Taro from '@tarojs/taro';
+import { useEffect, useState } from 'react';
 import ViewIcon from '../../components/ViewIcon';
+import { useModel } from '../../store';
 
 
 import './style.less'
 
 export default (props) => {
+  const { dogs, person, setDogs } = useModel('userData')
 
+  const [useInfo, setUseInfo] = useState()
+
+  useEffect(() => {
+    if (person) {
+      setUseInfo(person)
+    }
+  }, [person])
   const goDogList = () => {
-    console.log('e',);
+    Taro.navigateTo({
+      url: '/pages/dogList/index'
+    })
+  }
+  const goDogApplyList = () => {
+    Taro.navigateTo({
+      // url: '/pages/setUser/index'
+    })
   }
-  const goSetUser = (e) => {
+  const goSetUser = (personId) => {
     Taro.navigateTo({
-      url: '/pages/setUser/index'
+      url: `/pages/setUser/index?personId=${personId}`
     })
   }
   return (
@@ -23,10 +40,10 @@ export default (props) => {
         </View>
 
         <View className='user-box-Card-NameCard'>
-          <View>王王王</View>
+          <View>{useInfo?.nickName}</View>
           <View>文明养狗，遵纪守法</View>
         </View>
-        <View className='user-box-Card-right' onClick={goSetUser}>
+        <View className='user-box-Card-right' onClick={() => { goSetUser(useInfo?.personId) }}>
           <View style={{ paddingRight: '5px' }}>
             <ViewIcon icon='bianji' size={19} color='#2f2f2f' />
           </View>
@@ -38,7 +55,7 @@ export default (props) => {
         <mp-cell link hover>
           <View className='iconCell'>
             <ViewIcon icon='dingdan' size={22} />
-            <View onClick={goDogList} style='padding-left:5px;width:80%'>申请列表</View>
+            <View onClick={goDogApplyList} style='padding-left:5px;width:80%'>申请列表</View>
           </View>
         </mp-cell>
       </mp-cells>

src/pages/setDogInfo/index.jsx

@@ -1,22 +1,71 @@
 import { View, Button, Form, Text, RadioGroup, Picker, Image, Input, Radio, Label, ScrollView } from '@tarojs/components'
 import Taro from '@tarojs/taro';
-import { useState } from 'react';
+import { useState, useEffect } from 'react';
+import { addDogInfo, getDogInfo, setDogInfo } from '../../services/dogAPI';
+import { uploadFile } from '../../utils/request';
 import './style.less'
 
 export default (props) => {
   const [dogDate, setDogDate] = useState({ birthday: '请选择生日', sex: '请选择性别', petType: '请选择犬种' })
   const [imgUrl, setImgUrl] = useState()
+  const [formData, setFormData] = useState()
+  const petId = Taro.getCurrentInstance().router.params.petId
+
+  useEffect(() => {
+    if (petId) {
+      getDogInfo(petId).then((e) => {
+        setFormData(e)
+        setDogDate(e)
+        setImgUrl(e.image)
+
+      })
+    }
+  }, [petId])
 
   const formSubmit = (res) => {
     console.log('formVlue', res);
+    const value = res.detail.value
+    if (petId) {
+      console.log('y ID',);
+      setDogInfo(petId, { ...value, ...dogDate, image: imgUrl }).then((e) => {
+        Taro.showToast({
+          title: '修改成功',
+          icon: 'none',
+          duration: 1000
+        })
+        setTimeout(() => {
+          Taro.navigateBack({
+            delta: 1
+          })
+        }, 600);
+      })
+    } else {
+      console.log('没有ID',);
+      addDogInfo({ ...value, ...dogDate, image: imgUrl }).then((e) => {
+        Taro.showToast({
+          title: '保存成功',
+          icon: 'none',
+          duration: 1000
+        })
+        setTimeout(() => {
+          Taro.navigateBack({
+            delta: 1
+          })
+        }, 600);
+
+      })
+    }
+
   }
   const onDateChange = (type, value) => {
     switch (type) {
       case 'petSex':
-        setDogDate({ ...dogDate, petSex: selector[value] })
+        setDogDate({ ...dogDate, sex: value - 0 + 1 })
+        console.log("🚀 ~ file: index.jsx ~ line 38 ~ handleSetUser ~ value", value, dogDate)
+
         break;
       case 'petBirthday':
-        setDogDate({ ...dogDate, petBirthday: value })
+        setDogDate({ ...dogDate, birthday: value })
         break;
       case 'petType':
         setDogDate({ ...dogDate, petType: dogType[value].text })//value 01  text 文字
@@ -39,9 +88,7 @@ export default (props) => {
 
   ]
 
-
   const addImage = () => {
-
     Taro.chooseImage({
       count: 1, // 默认9
       sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
@@ -49,7 +96,11 @@ export default (props) => {
       success: function (res) {
         // 返回选定照片的本地文件路径列表，tempFilePath可以作为img标签的src属性显示图片
         var tempFilePaths = res.tempFilePaths
-        setImgUrl(tempFilePaths[0])
+        console.log('dogImage', tempFilePaths[0]);
+        uploadFile(res.tempFilePaths[0]).then((res2) => {
+          console.log("🚀 ~ file: index.jsx ~ line 61 ~ uploadFile ~ res2", res2)
+          setImgUrl(res2)
+        })
       },
       fail () {
         Taro.showToast({
@@ -69,16 +120,16 @@ export default (props) => {
   return (
     <ScrollView scrollY style={{ height: '100vh' }}>
       <View class='page' >
-        <Form onSubmit={formSubmit}  >
-          <mp-form  >
+        <Form onSubmit={formSubmit}    >
+          <mp-form models={formData}  >
             <mp-cells title=''>
-              <mp-cell title='宠物名称' extClass=''>
-                <Input name='name' placeholder='请输入宠养区域' />
+              <mp-cell title='狗狗名称' extClass=''>
+                <Input value={formData?.name} name='name' placeholder='请输入狗狗名称' />
               </mp-cell>
-              <mp-cell title='宠物性别' extClass=''>
+              <mp-cell title='狗狗性别' extClass=''>
                 <Picker name='sex' mode='selector' range={selector} onChange={(e) => { onDateChange('petSex', e.detail.value) }}>
                   <View className='picker'>
-                    {dogDate.petSex}
+                    {dogDate.sex == 1 ? '雄' : dogDate.sex == 2 ? '雌' : dogDate.sex}
                   </View>
                 </Picker>
               </mp-cell>
@@ -92,26 +143,23 @@ export default (props) => {
               <mp-cell title='生日' extClass=''>
                 <Picker name='birthday' mode='date' onChange={(e) => { onDateChange('petBirthday', e.detail.value) }}>
                   <View className='picker'>
-                    {dogDate.petBirthday}
+                    {dogDate.birthday}
                   </View>
                 </Picker>
               </mp-cell>
               <mp-cell title='毛色' extClass=''>
-                <Input name='color' placeholder='请输入宠养区域' />
+                <Input name='color' placeholder='请输入毛色' value={formData?.color} />
               </mp-cell>
-              <mp-cell title='宠物照片' extClass=''>
+              <mp-cell title='狗狗照片' extClass=''>
                 {
-                  !imgUrl.image ?
-                    <View className='addImage' onClick={addImage} >
+                  !imgUrl ?
+                    <View className='addDogImage' onClick={addImage} >
                       <Text>+</Text>
                     </View>
                     :
-                    <Image className='dogImg1' name='image' src={imgUrl.img1} onClick={addImage} />
+                    <Image className='dogImage' name='image' src={imgUrl} onClick={addImage} />
                 }
-
               </mp-cell>
-
-
             </mp-cells>
           </mp-form>
           <View slot='button' style={{ margin: '4em 0 2em 0' }}>

src/pages/setDogInfo/style.less

@@ -0,0 +1,18 @@
+.addDogImage {
+  width: 100px;
+  height: 100px;
+  border: 1px dashed #666;
+  display: flex;
+  align-items: center;
+  > Text {
+    text-align: center;
+    margin: 0 auto;
+    font-size: 60px;
+    font-weight: bold;
+  }
+}
+
+.dogImage {
+  width: 200px;
+  height: 150px;
+}

src/pages/setDogLicense/index.config.js

@@ -8,7 +8,8 @@ export default {
     "mp-cells": "weui-miniprogram/cells/cells",
     "mp-cell": "weui-miniprogram/cell/cell",
     "mp-form-page": "weui-miniprogram/form-page/form-page",
-    "mp-form": "weui-miniprogram/form/form"
+    "mp-form": "weui-miniprogram/form/form",
+    "mp-dialog": "weui-miniprogram/dialog/dialog"
   }
 
 }

src/pages/setDogLicense/index.jsx

@@ -1,13 +1,28 @@
 import { View, Button, Form, Text, RadioGroup, Picker, Image, Input, Radio, Label, ScrollView } from '@tarojs/components'
-import Taro from '@tarojs/taro';
-import { useState } from 'react';
-import { addDogInfo } from '../../services/dogAPI';
+import Taro, { useDidShow } from '@tarojs/taro';
+import { useState, useEffect } from 'react';
+import { addlication } from '../../services/dogAPI';
+import { useModel } from '../../store';
 
 import './style.less'
 
 export default (props) => {
+  const { dogs, person, setDogs } = useModel('userData')
+
   const [dogDate, setDogDate] = useState({ petBirthday: '请选择生日', petSex: '请选择性别', petType: '请选择犬种' })
   const [imgUrl, setImgUrl] = useState({ img1: null, immunization: null })
+  const [showDialog, setShowDialog] = useState(false)
+
+  useDidShow(() => {
+    if (dogs.length == 0 || person.phone == null) {
+      console.log('不可以', dogs);
+      setShowDialog(true)
+
+    }
+  }, [dogs, person])
+
+
+
 
 
   const onDateChange = (type, value) => {
@@ -26,6 +41,25 @@ export default (props) => {
     }
 
   }
+  const handleDialog = () => {
+    console.log('handleDialog',);
+    if (dogs.length == 0 && person.phone == null) {
+      //如果 人 狗都没有维护，那么先维护人的。回到这个页面后，必定只有狗没维护 跳 狗
+
+      Taro.navigateTo({
+        url: '/pages/setUser/index'
+      })
+      setShowDialog(false)
+
+    } else {
+      Taro.navigateTo({
+        url: '/pages/setDogInfo/index'
+      })
+      setShowDialog(false)
+
+    }
+  }
+  const buttons = [{ text: '确定' }]
   const selector = ['雄', '雌']
   const dogType = [
     {
@@ -100,37 +134,40 @@ export default (props) => {
   const formSubmit = e => {
     console.log(e)
     const value = e.detail.value
-    addDogInfo({ ...value, ...dogDate, ...imgUrl }).then((res) => {
+    addlication({ ...value, ...dogDate, ...imgUrl }).then((res) => {
       console.log('dogInfo xinwe', res);
+      Taro.showToast({
+        title: '保存成功',
+        icon: 'none',
+        duration: 1000
+      })
+      setTimeout(() => {
+        Taro.navigateBack({
+          delta: 1
+        })
+      }, 600);
     })
   }
 
   const formReset = e => {
     console.log(e)
   }
-  const rules = [
-    {
-      name: 'name',
-      rules: { required: true, message: '请填写收货人姓名' },
-    },
-    {
-      name: 'telNumber',
-      rules: [{ required: true, message: '请填写收货人电话' }, { mobile: true, message: '电话格式不对' }]
-    },
-  ]
+
   return (
-    <ScrollView scrollY style={{
-      height: '100vh'
-    }}
-    >
+    <ScrollView scrollY style={{ height: '100vh' }} >
+      <mp-dialog show={showDialog} title='提示' maskClosable={false} buttons={buttons} onButtonTap={handleDialog} >
+        <View>
+          请先添加本人信息或狗狗信息
+        </View>
+      </mp-dialog>
       <View class='page' >
         <Form onSubmit={formSubmit} onReset={formReset} >
-          <mp-form rules={rules} >
+          <mp-form  >
             <mp-cells title=''>
-              <mp-cell title='宠物名称' extClass=''>
-                <Input name='petName' placeholder='请输入宠养区域' />
+              <mp-cell title='狗狗名称' extClass=''>
+                <Input name='petName' placeholder='请输入狗狗名称' />
               </mp-cell>
-              <mp-cell title='宠物性别' extClass=''>
+              <mp-cell title='狗狗性别' extClass=''>
                 <Picker name='petSex' mode='selector' range={selector} onChange={(e) => { onDateChange('petSex', e.detail.value) }}>
                   <View className='picker'>
                     {dogDate.petSex}
@@ -152,9 +189,9 @@ export default (props) => {
                 </Picker>
               </mp-cell>
               <mp-cell title='毛色' extClass=''>
-                <Input name='petColor' placeholder='请输入宠养区域' />
+                <Input name='petColor' placeholder='请输入毛色' />
               </mp-cell>
-              <mp-cell title='宠物照片' extClass=''>
+              <mp-cell title='狗狗照片' extClass=''>
                 {
                   !imgUrl.img1 ?
                     <View className='addImage' onClick={() => addImage('img1')} >

src/pages/setUser/index.jsx

@@ -1,13 +1,22 @@
 import { View, Button, Form, Text, Image, Picker, Switch, Input, Radio, Label, ScrollView } from '@tarojs/components'
 import Taro from '@tarojs/taro';
-import { useState } from 'react';
-import { setPerson } from '../../services/dogAPI';
+import { useEffect, useState } from 'react';
+import { setPersons } from '../../services/dogAPI';
+import { useModel } from '../../store';
+import { uploadFile } from '../../utils/request';
 
 import './style.less'
 
 export default (props) => {
+  const { setPerson, person, setDogs } = useModel('userData')
   // const [imgUrl, setImgUrl] = useState()
   const [userInfo, setUserInfo] = useState({ cardImg1: null, sex: '请选择性别' })
+  useEffect(() => {
+    if (person) {
+      setUserInfo(person)
+
+    }
+  }, [person])
 
   const userSex = [
     {
@@ -26,33 +35,33 @@ export default (props) => {
 
   }
   const formSubmit = e => {
+    const formData = e.detail.value
     console.log(e)
-    const value = e.detail.value
-    Taro.showToast({
-      title: '保存成功',
-      icon: 'none',
-      duration: 1000
-    })
-    Taro.navigateBack({
-      delta: 1
-    })
-    // setPerson({ ...value, ...userInfo }).then((e) => {
-    //   console.log('e', e);
 
-    // })
+    // setPerson
+    setPersons({ ...userInfo, ...formData, sex: userSex[formData.sex].value, }).then((e) => {
+      console.log('e', e);
+      setPerson(e)
+      Taro.showToast({
+        title: '保存成功',
+        icon: 'none',
+        duration: 1000
+      })
+      setTimeout(() => {
+        Taro.navigateBack({
+          delta: 1
+        })
+      }, 600);
+    })
   }
 
 
   const handleSetUser = (type, value) => {
-    console.log("🚀 ~ file: index.jsx ~ line 38 ~ handleSetUser ~ value", value)
     // console.log(e)
     if (type == 'sex') {
-      if (value == 0) {
-        setUserInfo({ ...userInfo, sex: 1 })
+      setUserInfo({ ...userInfo, sex: userSex[value].value })
+      console.log("🚀 ~ file: index.jsx ~ line 38 ~ handleSetUser ~ value", value)
 
-      } else {
-        setUserInfo({ ...userInfo, sex: 2 })
-      }
     } else {
       Taro.chooseImage({
         count: 1, // 默认9
@@ -61,7 +70,11 @@ export default (props) => {
         success: function (res) {
           // 返回选定照片的本地文件路径列表，tempFilePath可以作为img标签的src属性显示图片
           var tempFilePaths = res.tempFilePaths
-          setUserInfo({ ...userInfo, cardImg1: tempFilePaths[0] })
+          uploadFile(tempFilePaths[0]).then((res2) => {
+            console.log("🚀 ~ file: index.jsx ~ line 61 ~ uploadFile ~ res2", res2)
+            setUserInfo({ ...userInfo, cardImg1: res2 })
+
+          })
         },
         fail () {
           Taro.showToast({
@@ -84,21 +97,21 @@ export default (props) => {
           <mp-form  >
             <mp-cells title=' '>
               <mp-cell title='姓名' extClass=''>
-                <Input name='nickName' placeholder='请输入姓名' />
+                <Input name='nickName' placeholder='请输入姓名' value={person?.nickName} />
               </mp-cell>
               <mp-cell title='性别' extClass=''>
                 {/* <Input name='sex' placeholder='请输入卡号' /> */}
-                <Picker name='sex' mode='selector' range={userSex} rangeKey='text' onChange={(e) => { handleSetUser('sex', e.detail.value - 0) }}>
+                <Picker name='sex' mode='selector' rangeKey='text' range={userSex} onChange={(e) => { handleSetUser('sex', e.detail.value) }}>
                   <View className='picker'>
                     {userInfo.sex == 1 ? '男' : userInfo.sex == 2 ? '女' : userInfo.sex}
                   </View>
                 </Picker>
               </mp-cell>
               <mp-cell title='手机号' extClass=''>
-                <Input name='phone' type='number' placeholder='请输入手机号' maxlength={11} />
+                <Input name='phone' type='number' placeholder='请输入手机号' maxlength={11} value={person?.phone} />
               </mp-cell>
               <mp-cell title='身份证号' extClass=''>
-                <Input name='idCard' placeholder='请输入身份证号' type='idcard' maxlength={18} />
+                <Input name='idCard' placeholder='请输入身份证号' type='idcard' maxlength={18} value={person?.idCard} />
               </mp-cell>
               <mp-cell title='身份证图片' extClass=''>
                 {
@@ -118,7 +131,7 @@ export default (props) => {
           </View>
         </Form>
       </View>
-    </ScrollView>
+    </ScrollView >
   )
 }
 

src/services/dogAPI.js

@@ -15,13 +15,64 @@ export const login = (data) => request('/login', { data, method: 'POST' })
  * @param {*} data
  * @returns
  */
-export const setPerson = (data) => request('/person', { data, method: 'PUT' })
+export const setPersons = (data) => request('/person', { data, method: 'PUT' })
 
 
 
 /**
- * 狗狗信息维护
+ * 办卡
  * @param {*} data
  * @returns
  */
-export const addDogInfo = (data) => request('/application', { data, method: 'POST' })
+export const addlication = (data) => request('/application', { data, method: 'POST' })
+
+
+
+/**
+ * 狗狗列表
+ * @param {*} data
+ * @returns
+ */
+export const addDogList = (data) => request('/pet', { data, method: 'GET' })
+
+
+
+/**
+ * 添加狗狗
+ * @param {*} data
+ * @returns
+ */
+export const addDogInfo = (data) => request('/pet', { data, method: 'POST' })
+
+
+/**
+ * 狗狗详情
+ * @param {*} data
+ * @returns
+ */
+export const getDogInfo = (id, data) => request(`/pet/${id}`, { data, method: 'GET' })
+
+/**
+ * 修改狗狗
+ * @param {*} data
+ * @returns
+ */
+export const setDogInfo = (id, data) => request(`/pet/${id}`, { data, method: 'PUT' })
+
+
+
+
+
+/**
+ * 狗狗证件
+ * @param {*} data
+ * @returns
+ */
+export const getDogCardList = (id, data) => request(`/card`, { data, method: 'GET' })
+
+/**
+* 证件详情
+* @param {*} data
+* @returns
+*/
+export const getDogCardInfo = (id, data) => request(`/card/${id}`, { data, method: 'GET' })

src/store/userData.js

@@ -5,7 +5,7 @@ import { login } from "../services/dogAPI"
 
 
 export default () => {
-  const [user, setUser] = useState()
+  const [dogs, setDogs] = useState([])
   const [person, setPerson] = useState()
   const [sessionKey, setSessionKey] = useState()
 
@@ -13,19 +13,19 @@ export default () => {
     console.log('login');
 
     login(params).then((res) => {
-
-      const { person: taPerson, sessionKey: skey, user: taUser } = res;
+      const { person: taPerson, sessionKey: skey, user: taUser, pets: taPets } = res;
       // taPerson.phone = null
-
       setPerson(taPerson);
-      setUser(taUser);
+      setDogs(taPets);
       setSessionKey(skey);
+      console.log(taPets, dogs);
+
     })
   }
 
   return {
-    user,
-    setUser,
+    dogs,
+    setDogs,
 
     person,
     setPerson,

src/utils/request.js

@@ -2,6 +2,7 @@ import Taro from '@tarojs/taro'
 import { getQueryString } from './codeSegment.js'
 
 let appid
+const logger = Taro.getRealtimeLogManager()
 
 export default (url, options) => {
   const { params, skipError, header, ...leftOptions } = options || {}
@@ -63,3 +64,54 @@ export default (url, options) => {
     })
   })
 }
+
+
+
+export function uploadFile (filePath) {
+
+  const authToken = Taro.getStorageSync('token')
+  const tokenHeader = authToken ? { 'Authorization': authToken } : {}
+
+  return new Promise((resolve, reject) => {
+    Taro.uploadFile({
+      // eslint-disable-next-line no-undef
+      url: `${HOST}/api/wx/image`,
+      filePath,
+      name: 'file',
+      header: tokenHeader,
+      success: (res) => {
+        if (res.errMsg === 'uploadFile:ok') {
+          const { code, message, data, token } = JSON.parse(res.data)
+
+          if (token || data?.token) {
+            Taro.setStorage({ key: 'token', data: token || data?.token })
+          }
+          if (code === 1000) {
+            resolve(data)
+          } else {
+            console.error(res)
+            logger.error("上传文件失败")
+            logger.error(res)
+            reject(message?.indexOf('java') > -1 ? '系统内部错误' : message)
+          }
+        } else {
+          console.error(res)
+
+          logger.error("上传文件失败")
+          logger.error(res)
+
+          reject(res.errMsg)
+        }
+      },
+      fail: (err) => {
+        console.error(err)
+
+        logger.error("上传文件失败")
+        logger.error(err)
+
+        const message = err.message || err.errMsg || err
+        reject(message)
+      }
+    })
+  })
+}