add. componen

src/pages/ApplicationList/components/AppliCard/index.jsx

@@ -0,0 +1,74 @@
+import { ScrollView, View, Image, Button } from '@tarojs/components'
+import Taro from '@tarojs/taro';
+
+import './style.less'
+
+export default (props) => {
+  const { onClick, } = props;
+
+
+  return (
+    <View className='ApplicationListBox'>
+      <View className='ApplicationListBox-CardBox'>
+
+        <View className='ApplicationListBox-CardBox-headerTop'>
+          狗狗姓名
+          <View className='ApplicationListBox-CardBox-headerTop-right'>
+            <View>我的二狗子</View>
+
+            <Image src='https://gss0.baidu.com/7Po3dSag_xI4khGko9WTAnF6hhy/zhidao/pic/item/48540923dd54564e953f5e6cbede9c82d1584f08.jpg' />
+          </View>
+        </View>
+        {/* 状态
+
+待付款 
+审核中 > 驳回 点击去修改  /退款
+驳回原因
+
+待发卡
+已完成 
+
+        狗名字
+        时间
+        方式
+        状态
+        单号+快递公司
+*/}
+
+        <View className='ApplicationListBox-CardBox-content'>
+          <View>申请时间</View>
+          <View>2022-05-06 12:36</View>
+        </View>
+        <View className='ApplicationListBox-CardBox-content'>
+          <View>审领方式</View>
+          <View>邮寄</View>
+        </View>
+        <View className='ApplicationListBox-CardBox-content'>
+          <View>状态</View>
+          <View>已完成</View>
+        </View>
+        <View className='ApplicationListBox-CardBox-content'>
+          <View>邮政快递</View>
+          <View>3200222000</View>
+        </View>
+        <View>
+
+          <View className='ApplicationListBox-CardBox-refuse'>
+            <View>驳回原因</View>
+            <View>因地区政策原因，疫苗报告失效，请重新填写申请信息。</View>
+          </View>
+          <View style={{ margin: '0.5em 0 0.2em 0' }}>
+            <Button
+              style={{ width: '135px', height: '35px', fontSize: '14px', backgroundColor: '#fbd804', borderRadius: '40px', color: '#000', border: '0px' }}
+              class='weui-btn' type='primary'
+              loading={false}
+              onClick={onClick}
+            >重新填写</Button>
+          </View>
+        </View>
+
+      </View>
+
+    </View>
+  )
+}

src/pages/ApplicationList/components/AppliCard/style.less

@@ -0,0 +1,72 @@
+// #858B9C
+.ApplicationListBox {
+  background-color: white;
+  padding: 30px 30px;
+  margin-top: 3vw;
+  // font-family: "Trebuchet MS", "Lucida Sans Unicode", "Lucida Grande",
+  //   "Lucida Sans", Arial, sans-serif;
+
+  &-CardBox {
+    width: 90%;
+    background-color: #f9fafb;
+    border-radius: 20px;
+
+    padding: 20px 20px;
+    margin: 0 auto;
+    &-headerTop {
+      display: flex;
+      align-items: center;
+      border-bottom: 1px solid rgba(219, 219, 219, 0.603);
+      padding-bottom: 30px;
+      justify-content: space-between;
+      // font-weight: 600;
+      font-size: 30px;
+
+      &-right {
+        display: flex;
+        flex-flow: row-reverse;
+        align-items: center;
+        color: #41485d;
+        > Image {
+          width: 45px;
+          height: 45px;
+          border-radius: 50%;
+          margin: 0 10px;
+        }
+      }
+    }
+
+    &-content {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      margin: 20px auto;
+      // font-weight: 600;
+      font-size: 30px;
+      > View:nth-child(1) {
+        color: #858b9c;
+      }
+      > View:nth-child(2) {
+        color: #41485d;
+      }
+    }
+    &-refuse {
+      border-top: 1px solid rgba(219, 219, 219, 0.603);
+      display: flex;
+      font-size: 30px;
+      text-align: left;
+      margin-top: 30px;
+      padding-top: 15px;
+
+      > View:nth-child(1) {
+        width: 180px;
+        color: #858b9c;
+      }
+      > View:nth-child(2) {
+        color: #41485d;
+        font-size: 27px;
+        text-align: right;
+      }
+    }
+  }
+}

src/pages/ApplicationList/index.jsx

@@ -1,8 +1,8 @@
 import { ScrollView, View, Image, Button } from '@tarojs/components'
 import Taro from '@tarojs/taro';
-import { useState } from 'react';
-import { useEffect } from 'react';
+import { useState, useEffect } from 'react';
 import { getOrder } from '../../services/dogAPI';
+import AppliCard from './components/AppliCard';
 import './style.less'
 
 export default (props) => {
@@ -28,200 +28,10 @@ export default (props) => {
 
   return (
     <ScrollView scrollY style={{ height: '100vh' }}>
-      <View className='ApplicationListBox'>
-        <View className='ApplicationListBox-CardBox'>
-
-          <View className='ApplicationListBox-CardBox-headerTop'>
-            狗狗姓名
-            <View className='ApplicationListBox-CardBox-headerTop-right'>
-              <View>我的二狗子</View>
-
-              <Image src='https://gss0.baidu.com/7Po3dSag_xI4khGko9WTAnF6hhy/zhidao/pic/item/48540923dd54564e953f5e6cbede9c82d1584f08.jpg' />
-            </View>
-          </View>
-          {/* 状态
-
-待付款 
-审核中 > 驳回 点击去修改  /退款
-驳回原因
-
-待发卡
-已完成 
-
-        狗名字
-        时间
-        方式
-        状态
-        单号+快递公司
-*/}
-
-          <View className='ApplicationListBox-CardBox-content'>
-            <View>申请时间</View>
-            <View>2022-05-06 12:36</View>
-          </View>
-          <View className='ApplicationListBox-CardBox-content'>
-            <View>审领方式</View>
-            <View>邮寄</View>
-          </View>
-          <View className='ApplicationListBox-CardBox-content'>
-            <View>状态</View>
-            <View>已完成</View>
-          </View>
-          <View className='ApplicationListBox-CardBox-content'>
-            <View>邮政快递</View>
-            <View>3200222000</View>
-          </View>
-        </View>
-
-      </View>
-      <View className='ApplicationListBox'>
-        <View className='ApplicationListBox-CardBox'>
-
-          <View className='ApplicationListBox-CardBox-headerTop'>
-            狗狗姓名
-            <View className='ApplicationListBox-CardBox-headerTop-right'>
-              <View>我的二狗子</View>
-
-              <Image src='https://gss0.baidu.com/7Po3dSag_xI4khGko9WTAnF6hhy/zhidao/pic/item/48540923dd54564e953f5e6cbede9c82d1584f08.jpg' />
-            </View>
-          </View>
-          {/* 状态
-
-待付款 
-审核中 > 驳回 点击去修改  /退款
-驳回原因
-
-待发卡
-已完成 
-
-        狗名字
-        时间
-        方式
-        状态
-        单号+快递公司
-*/}
-
-          <View className='ApplicationListBox-CardBox-content'>
-            <View>申请时间</View>
-            <View>2022-05-06 12:36</View>
-          </View>
-          <View className='ApplicationListBox-CardBox-content'>
-            <View>审领方式</View>
-            <View>邮寄</View>
-          </View>
-          <View className='ApplicationListBox-CardBox-content'>
-            <View>状态</View>
-            <View>已完成</View>
-          </View>
-          <View className='ApplicationListBox-CardBox-content'>
-            <View>邮政快递</View>
-            <View>3200222000</View>
-          </View>
-        </View>
-
-      </View>
-      <View className='ApplicationListBox'>
-        <View className='ApplicationListBox-CardBox'>
-
-          <View className='ApplicationListBox-CardBox-headerTop'>
-            狗狗姓名
-            <View className='ApplicationListBox-CardBox-headerTop-right'>
-              <View>我的二狗子</View>
-
-              <Image src='https://gss0.baidu.com/7Po3dSag_xI4khGko9WTAnF6hhy/zhidao/pic/item/48540923dd54564e953f5e6cbede9c82d1584f08.jpg' />
-            </View>
-          </View>
-          {/* 状态
-
-待付款 
-审核中 > 驳回 点击去修改  /退款
-驳回原因
-
-待发卡
-已完成 
-
-        狗名字
-        时间
-        方式
-        状态
-        单号+快递公司
-*/}
-
-          <View className='ApplicationListBox-CardBox-content'>
-            <View>申请时间</View>
-            <View>2022-05-06 12:36</View>
-          </View>
-          <View className='ApplicationListBox-CardBox-content'>
-            <View>审领方式</View>
-            <View>邮寄</View>
-          </View>
-          <View className='ApplicationListBox-CardBox-content'>
-            <View>状态</View>
-            <View>已完成</View>
-          </View>
-          <View className='ApplicationListBox-CardBox-content'>
-            <View>邮政快递</View>
-            <View>3200222000</View>
-          </View>
-        </View>
-
-      </View>
-      <View className='ApplicationListBox'>
-        <View className='ApplicationListBox-CardBox'>
-
-          <View className='ApplicationListBox-CardBox-headerTop'>
-            狗狗姓名
-            <View className='ApplicationListBox-CardBox-headerTop-right'>
-              <View>我的二狗子</View>
-
-              <Image src='https://gss0.baidu.com/7Po3dSag_xI4khGko9WTAnF6hhy/zhidao/pic/item/48540923dd54564e953f5e6cbede9c82d1584f08.jpg' />
-            </View>
-          </View>
-          {/* 状态
-
-待付款 
-审核中 > 驳回 点击去修改  /退款
-驳回原因
-
-待发卡
-已完成 
-
-        狗名字
-        时间
-        方式
-        状态
-        单号+快递公司
-*/}
-
-          <View className='ApplicationListBox-CardBox-content'>
-            <View>申请时间</View>
-            <View>2022-05-06 12:36</View>
-          </View>
-          <View className='ApplicationListBox-CardBox-content'>
-            <View>审领方式</View>
-            <View>邮寄</View>
-          </View>
-          <View className='ApplicationListBox-CardBox-content'>
-            <View>状态</View>
-            <View>已完成</View>
-          </View>
-          <View className='ApplicationListBox-CardBox-content'>
-            <View>邮政快递</View>
-            <View>3200222000</View>
-          </View>
-          <View>
-
-            <View className='ApplicationListBox-CardBox-refuse'>
-              <View>驳回原因</View>
-              <View>因地区政策原因，疫苗报告失效，请重新填写申请信息。</View>
-            </View>
-            <View style={{ margin: '0.5em 0 0.2em 0' }}>
-              <Button style={{ width: '135px', height: '35px', fontSize: '14px', backgroundColor: '#fbd804', borderRadius: '40px', color: '#000', border: '0px' }} class='weui-btn' type='primary' loading={false} onClick={goSetDogLicense}>重新填写</Button>
-            </View>
-          </View>
-
-        </View>
+      <AppliCard onClick={goSetDogLicense} />
 
+      <View style={{ textAlign: 'center', margin: '6vw 0 3vw 0', color: '#858585', fontSize: '12px' }}>
+        申请驳回，费用将原路退回支付账户！
       </View>
 
     </ScrollView>

src/pages/ApplicationList/style.less

@@ -1,72 +0,0 @@
-// #858B9C
-.ApplicationListBox {
-  background-color: white;
-  padding: 30px 30px;
-  margin-top: 3vw;
-  // font-family: "Trebuchet MS", "Lucida Sans Unicode", "Lucida Grande",
-  //   "Lucida Sans", Arial, sans-serif;
-
-  &-CardBox {
-    width: 90%;
-    background-color: #f9fafb;
-    border-radius: 20px;
-
-    padding: 20px 20px;
-    margin: 0 auto;
-    &-headerTop {
-      display: flex;
-      align-items: center;
-      border-bottom: 1px solid rgba(219, 219, 219, 0.603);
-      padding-bottom: 30px;
-      justify-content: space-between;
-      // font-weight: 600;
-      font-size: 30px;
-
-      &-right {
-        display: flex;
-        flex-flow: row-reverse;
-        align-items: center;
-        color: #41485d;
-        > Image {
-          width: 45px;
-          height: 45px;
-          border-radius: 50%;
-          margin: 0 10px;
-        }
-      }
-    }
-
-    &-content {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      margin: 20px auto;
-      // font-weight: 600;
-      font-size: 30px;
-      > View:nth-child(1) {
-        color: #858b9c;
-      }
-      > View:nth-child(2) {
-        color: #41485d;
-      }
-    }
-    &-refuse {
-      border-top: 1px solid rgba(219, 219, 219, 0.603);
-      display: flex;
-      font-size: 30px;
-      text-align: left;
-      margin-top: 30px;
-      padding-top: 15px;
-
-      > View:nth-child(1) {
-        width: 180px;
-        color: #858b9c;
-      }
-      > View:nth-child(2) {
-        color: #41485d;
-        font-size: 27px;
-        text-align: right;
-      }
-    }
-  }
-}

src/pages/setDogInfo/index.jsx

@@ -18,7 +18,7 @@ const rules = {
 }
 
 export default (props) => {
-  const {dogs, setDogs} = useModel('userData')
+  const { dogs, setDogs } = useModel('userData')
   const [dogType, setDogType] = useState([])
   const [formData, setFormData] = useState()
 
@@ -87,16 +87,18 @@ export default (props) => {
   ]
 
   const handleBirthday = (e) => {
-    const birthday = e.detail.value
-    setFormData({ ...formData, birthday })
+    const birday = e.detail.value
+    // console.log(' birthday: birthday', birthday);
+    setFormData({ ...formData, birthday: birday })
+    console.log("🚀 ~ file: index.jsx ~ line 93 ~ handleBirthday ~ formData", formData)
   }
-  
+
   return (
     <ScrollView scrollY style={{ height: '100vh' }}>
       <View class='page' >
         <Form rules={rules} onSubmit={formSubmit}>
           <FormItem title='狗狗名称' required>
-            <Input name='name' value={formData?.name} placeholder='请输入狗狗名称' />
+            <Input name='name' value={formData?.name} placeholder='请输入狗狗名称' onInput={(e) => { setFormData({ ...formData, name: e.detail.value }) }} />
           </FormItem>
           <FormItem title='狗狗性别' required>
             <s-picker name='sex' rangeKey='text' rangeValue='value' range={dogSex} value={formData?.sex} />
@@ -105,12 +107,12 @@ export default (props) => {
             <s-picker name='petType' rangeKey='text' rangeValue='value' range={dogType} value={formData?.petType} />
           </FormItem>
           <FormItem title='生日' required>
-            <Picker name='birthday' mode='date' onChange={handleBirthday}>
-              { formData?.birthday ? (
+            <Picker name='birthday' mode='date' onChange={handleBirthday} value={formData?.birthday}>
+              {formData?.birthday ? (
                 <View className='picker'>
-                  {formData?.birthday }
+                  {formData?.birthday}
                 </View>
-                ) : <View style={{ color: '#858585' }}>请选择...</View>
+              ) : <View style={{ color: '#858585' }}>请选择...</View>
               }
             </Picker>
           </FormItem>

src/pages/setDogLicense/index.jsx

@@ -14,7 +14,7 @@ export default (props) => {
   const { dogs, person } = useModel('userData')
   const [formData, setFormData] = useState()
 
-  const [dogDate, setDogDate] = useState({ immunizationDate: '请选择日期', petBirthday: '请选择生日', petSex: [], petType: [] })
+  const [dogDate, setDogDate] = useState({ immunizationDate: null, petBirthday: '请选择生日', petSex: [], petType: [] })
   const [mainDog, setMainDog] = useState([])
 
   const router = useRouter()
@@ -82,7 +82,7 @@ export default (props) => {
         icon: 'none',
         duration: 1000
       })
-      Taro.navigateTo({
+      Taro.reLaunch({
         url: `/pages/payPage/index?id=${res.applyId}`
       })
     })
@@ -120,13 +120,17 @@ export default (props) => {
                 <Input name='petColor' placeholder='请输入毛色' value={formData?.color} />
               </FormItem>
               <FormItem title='狗狗照片' required>
-                <uploader name='dogImg1' onFile={handleFile} />
+                <uploader name='dogImg1' onFile={handleFile} value={formData?.image} />
               </FormItem>
               <FormItem title='最近免疫日期' required>
                 <Picker name='immunizationDate' mode='date' onChange={(e) => { onDateChange('immunizationDate', e.detail.value) }}>
-                  <View className='picker' style={!formData ? { "color": '#858585' } : {}}>
-                    {dogDate.immunizationDate}
-                  </View>
+                  {dogDate?.immunizationDate ? (
+                    <View className='picker' >
+                      {dogDate.immunizationDate}
+                    </View>
+                  ) : <View style={{ color: '#858585' }}>请选择...</View>
+                  }
+
                 </Picker>
               </FormItem>
               <FormItem title='免疫证号' required>