add copy

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

@@ -4,68 +4,116 @@ import Taro from '@tarojs/taro';
 import './style.less'
 
 export default (props) => {
-  const { onClick, } = props;
+  const { onClick, item, copy } = props;
+
+  const cardStatus = (ite) => {
+    if (item.status === 0) {
+      return {
+        title: '未付款',
+        styleColor: ''
+
+      }
+    } else if (item.status == 1) {
+      return {
+        title: '审核中',
+        styleColor: ''
+      }
+    } else if (item.status == 2 && item.verifyStatus == 2) {
+      return {
+        title: '驳回',
+        styleColor: 'red'
+
+      }
+
+    } else if (item.status == 2 && item.verifyStatus == 1) {
+      return {
+        title: '待发卡',
+        styleColor: ''
+
+      }
+    } else if (item.status == 3) {
+      return {
+        title: '已完成',
+        styleColor: '#04bd02'
+
+      }
+    }
+
+  }
+
+  // 状态  如果 status 0 未付款 
+  //       如果1审核中   
+  //        驳回  status: 2 ||  verifyStatus: 2 驳回
+
+  //        待发卡  status: 2 ||  verifyStatus: 1 待发卡 
+
+  //        status 3
 
 
   return (
     <View className='ApplicationListBox'>
       <View className='ApplicationListBox-CardBox'>
-
         <View className='ApplicationListBox-CardBox-headerTop'>
           狗狗姓名
           <View className='ApplicationListBox-CardBox-headerTop-right'>
-            <View>我的二狗子</View>
+            <View>{item.petName}</View>
 
-            <Image src='https://gss0.baidu.com/7Po3dSag_xI4khGko9WTAnF6hhy/zhidao/pic/item/48540923dd54564e953f5e6cbede9c82d1584f08.jpg' />
+            <Image src={item.img1} />
           </View>
         </View>
-        {/* 状态
-
-待付款 
-审核中 > 驳回 点击去修改  /退款
-驳回原因
-
-待发卡
-已完成 
-
-        狗名字
-        时间
-        方式
-        状态
-        单号+快递公司
-*/}
-
         <View className='ApplicationListBox-CardBox-content'>
           <View>申请时间</View>
-          <View>2022-05-06 12:36</View>
+          <View>{item.createDate}</View>
         </View>
         <View className='ApplicationListBox-CardBox-content'>
           <View>审领方式</View>
-          <View>邮寄</View>
+          <View>{item.applyMethod == 1 ? '自取' : '邮寄'}</View>
         </View>
         <View className='ApplicationListBox-CardBox-content'>
           <View>状态</View>
-          <View>已完成</View>
+          <View style={{ color: cardStatus(item)?.styleColor }}>{cardStatus(item)?.title}</View>
         </View>
-        <View className='ApplicationListBox-CardBox-content'>
-          <View>邮政快递</View>
-          <View>3200222000</View>
-        </View>
-        <View>
+        {
+          cardStatus(item)?.title == '已完成' ?
+            <View className='ApplicationListBox-CardBox-content' onClick={() => { copy(item.trackingNo) }}>
+              <View>{item.trackingType}</View>
+              <View>{item.trackingNo}</View>
+            </View>
+            : <></>
+        }
+        {
+          cardStatus(item)?.title == '驳回' ?
+            <View>
+              <View className='ApplicationListBox-CardBox-refuse'>
+                <View>驳回原因</View>
+                <View>{item.rejectReason}</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(item.petId) }}
+                >重新填写</Button>
+              </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>
+        {
+          cardStatus(item)?.title == '未付款' ?
+            <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('pay', item.applyId) }}
+                >支付</Button>
+              </View>
+            </View>
+            : <></>
+        }
 
       </View>
 

src/pages/ApplicationList/index.config.js

@@ -1,10 +1,11 @@
 export default {
-  navigationBarTitleText: '申请状态列表',
+  navigationBarTitleText: '申请列表',
   disableScroll: true,
   navigationBarBackgroundColor: "#FBD804",
   navigationBarTextStyle: "black",
   backgroundColor: "#FBD804",
   usingComponents: {
+    "mp-loading": "weui-miniprogram/loading/loading"
 
   }
 

src/pages/ApplicationList/index.jsx

@@ -1,34 +1,70 @@
 import { ScrollView, View, Image, Button } from '@tarojs/components'
-import Taro from '@tarojs/taro';
+import Taro, { useDidShow } from '@tarojs/taro';
 import { useState, useEffect } from 'react';
-import { getOrder } from '../../services/dogAPI';
+import { getApplicationList, getOrder } from '../../services/dogAPI';
 import AppliCard from './components/AppliCard';
 import './style.less'
 
 export default (props) => {
   const id = Taro.getCurrentInstance().router.params.id;
-  const [orderInfo, setOrderInfo] = useState()
+  const [applionList, setApplionList] = useState([])
+  const [applionLoading, setApplionLoading] = useState(false)
 
-  useEffect(() => {
-    if (id) {
-      getOrder(id).then((e) => {
-        console.log('e', e);
-        setOrderInfo(e)
-      })
-    }
+  useDidShow(() => {
+    setApplionLoading(true)
 
-  }, [id])
+    getApplicationList({ pageSize: 500 }).then((e) => {
+      console.log('e', e);
+      setApplionList(e.records)
+      setApplionLoading(false)
 
-  const goSetDogLicense = () => {
-    Taro.navigateTo({
-      url: '/pages/setDogLicense/index'
+    })
+  }, [])
+  const trackingCopy = (value) => {
+    Taro.setClipboardData({
+      data: value,
+      success: e => {
+        Taro.showToast({
+          title: '快递单号已复制',
+          icon: 'success',
+          duration: 2000,
+        })
+      }
     })
   }
+  const goSetDogLicense = (e, Id) => {
+    if (e == 'pay') {
+      Taro.navigateTo({
+        url: `/pages/payPage/index?id=${Id}`
+      })
+    } else {
+      Taro.navigateTo({
+        url: `/pages/setDogLicense/index?type=first&petId=${Id}`
+      })
+    }
+
+  }
 
 
   return (
     <ScrollView scrollY style={{ height: '100vh' }}>
-      <AppliCard onClick={goSetDogLicense} />
+      {
+        applionLoading ? <mp-loading extClass="page-loading-circle" type="circle" show={applionLoading} /> :
+
+          <>
+
+            {
+              applionList.map((item, index) => {
+                return (
+                  <AppliCard key={index} item={item} onClick={goSetDogLicense} copy={trackingCopy} />
+
+                )
+
+              })
+            }
+          </>
+      }
+
 
       <View style={{ textAlign: 'center', margin: '6vw 0 3vw 0', color: '#858585', fontSize: '12px' }}>
         申请驳回，费用将原路退回支付账户！

src/pages/ApplicationList/style.less

@@ -0,0 +1,6 @@
+.page-loading-circle {
+  .weui-loading {
+    width: 96rpx;
+    height: 96rpx;
+  }
+}

src/pages/dogCardDetail/index.jsx

@@ -2,17 +2,16 @@ import { View, Image, ScrollView } from '@tarojs/components'
 import Taro from '@tarojs/taro';
 import { useEffect, useState } from 'react';
 import RatioItem from '@/components/RatioItem';
-import { getApplicationInfo } from '../../services/dogAPI';
+import { getDogCardInfo } from '../../services/dogAPI';
 
 import './style.less'
 
 export default (props) => {
-  const status = 2;
   const petId = Taro.getCurrentInstance().router.params.id
   const [applicationInfoDate, setApplicationInfoDate] = useState()
   useEffect(() => {
     if (petId) {
-      getApplicationInfo(petId).then((e) => {
+      getDogCardInfo(petId).then((e) => {
         setApplicationInfoDate(e)
 
       })
@@ -48,14 +47,14 @@ export default (props) => {
               </View>
               <View className='cell'>
                 <View className='lable'>性别</View>：
-                <View className='content'>{applicationInfoDate?.petSex}</View>
+                <View className='content'>{applicationInfoDate?.petSex == 1 ? '雄' : '雌'}</View>
               </View>
             </View>
             <View className='cardRight'>
               <RatioItem ratio='109:151'>
                 <Image
                   style={{ width: '100%' }}
-                  mode='center'
+                  mode='widthFix'
                   src={applicationInfoDate?.petImg1}
                 ></Image>
               </RatioItem>
@@ -63,7 +62,7 @@ export default (props) => {
           </View >
           <View className='cell' style={{ marginTop: '0' }}>
             <View className='lable'>状态</View>：
-            <View className={['state', 'color' + status]}>{applicationInfoDate?.status == 1 ? '正常' : applicationInfoDate?.status == 2 ? '挂失' : '过期'}</View>
+            <View className={['state', 'color' + applicationInfoDate?.status]}>{applicationInfoDate?.status == 1 ? '正常' : applicationInfoDate?.status == 2 ? '挂失' : '过期'}</View>
             {/* 挂失 续期 */}
           </View>
           <View className='cell'>

src/pages/dogLicenseList/index.jsx

@@ -25,8 +25,9 @@ export default (props) => {
   }
 
   const widgetView = (value) => {
+    console.log("🚀 ~ file: index.jsx ~ line 28 ~ widgetView ~ value", value)
     return (
-      <View className='user-box-DogListCard' onClick={() => { goLicenseInfo(value.petId) }}>
+      <View className='user-box-DogListCard' onClick={() => { goLicenseInfo(value.cardId) }}>
         <View className='user-box-DogListCard-DogImage'>
           {/* <ViewIcon icon='morentouxiang' size={50} color='#FBD804' /> */}
           <Image src={value.petImg1} />

src/pages/index/index.jsx

@@ -4,9 +4,10 @@ import Taro from '@tarojs/taro'
 import Banner from '@/components/Banner'
 import Notice from '@/components/Notice'
 import PageLoading from '@/components/PageLoading'
+import withBasic from '@/layouts/withBasic'
+
 import { useModel } from '@/store'
 import { getApplicationList, getBannerList } from '@/services/dogAPI'
-import withBasic from '@/layouts/withBasic'
 import MenuItem from './components/MenuItem'
 
 import './style.less'

src/pages/payPage/index.config.js

@@ -5,6 +5,7 @@ export default {
   navigationBarTextStyle: "black",
   backgroundColor: "#FBD804",
   usingComponents: {
+    "mp-loading": "weui-miniprogram/loading/loading"
 
   }
 

src/pages/payPage/index.jsx

@@ -1,5 +1,5 @@
 import { ScrollView, View, Button } from '@tarojs/components'
-import Taro from '@tarojs/taro';
+import Taro, { reLaunch } from '@tarojs/taro';
 import { useState, useEffect } from 'react';
 import { getOrder } from '@/services/dogAPI';
 import './style.less'
@@ -7,12 +7,15 @@ import './style.less'
 export default (props) => {
   const id = Taro.getCurrentInstance().router.params.id;
   const [orderInfo, setOrderInfo] = useState()
-
+  const [payLoading, setPayLoading] = useState(false)
   useEffect(() => {
     if (id) {
+      setPayLoading(true)
       getOrder(id).then((e) => {
         console.log('e', e);
         setOrderInfo(e)
+        setPayLoading(false)
+
       })
     }
 
@@ -20,19 +23,19 @@ export default (props) => {
 
   const pay = (params) => {
     Taro.hideLoading()
-    console.log("🚀 ~ file: index.jsx ~ line 92 ~ requestPayment ~ params", params)
     Taro.requestPayment({
-      // ...params,
-      // package: params.packageValue,
+      ...orderInfo.prepay,
+      package: orderInfo.prepay.packageValue,
       success: () => {
         Taro.showToast({
           title: "支付成功",
           icon: "success",
           duration: 1000,
         }).then(() => {
+          console.log('支付成功',);
           setTimeout(() => {
             Taro.reLaunch({
-              // url: `/pages/index/index?tab=2`
+              url: '/pages/ApplicationList/index'
             })
           }, 400)
         })
@@ -43,33 +46,41 @@ export default (props) => {
           icon: "none",
           duration: 2000,
         });
-        Taro.reLaunch({
-          // url: `/pages/MineUserAll/AllOrder/index?tabJump=1`
-        })
+        console.log('支付失败', e);
+
       },
     })
   }
 
   return (
     <ScrollView scrollY style={{ height: '100vh' }}>
-      <View className='payPageBox'>
-        <View className='payPageBox-payItemBox'>
-          <View className='payPageBox-payItemBox-left'></View>
-          <View className='payPageBox-payItemBox-content'>订单号： <View>32121321321</View></View>
-        </View>
-        <View className='payPageBox-payItemBox'>
-          <View className='payPageBox-payItemBox-leftText'>工本费： <View>20</View>元</View>
-        </View>
-        <View className='payPageBox-payItemBox'>
-          <View className='payPageBox-payItemBox-leftText'>快递费： <View>3221321</View>元</View>
-        </View>
-        <View className='payPageBox-payItemBox'>
-          <View className='payPageBox-payItemBox-leftText'>总金额： <View style={{ color: 'red' }}>20</View>元</View>
-        </View>
-      </View>
-      <View slot='button' style={{ margin: '4em 0 2em 0' }}>
-        <Button style={{ backgroundColor: '#fbd804', borderRadius: '40px', color: '#000', border: '0px' }} class='weui-btn' type='primary' loading={false} onClick={pay}>支付</Button>
-      </View>
+      {
+        payLoading ? <mp-loading extClass="page-loading-circle" type="circle" show={payLoading} /> :
+          <>
+            <View className='payPageBox'>
+              <View className='payPageBox-payItemBox'>
+                <View className='payPageBox-payItemBox-left'></View>
+                <View className='payPageBox-payItemBox-content'>订单号： <View>{orderInfo?.order?.orderNo}</View></View>
+              </View>
+              <View className='payPageBox-payItemBox'>
+                <View className='payPageBox-payItemBox-leftText'>下单时间： <View>{orderInfo?.order?.createDate}</View></View>
+              </View>
+              <View className='payPageBox-payItemBox'>
+                <View className='payPageBox-payItemBox-leftText'>工本费： <View>{orderInfo?.order?.productionCost / 100}</View>元</View>
+              </View>
+              <View className='payPageBox-payItemBox'>
+                <View className='payPageBox-payItemBox-leftText'>快递费： <View>{orderInfo?.order?.expressFee / 100}</View>元</View>
+              </View>
+              <View className='payPageBox-payItemBox'>
+                <View className='payPageBox-payItemBox-leftText'>总金额： <View style={{ color: 'red' }}>{orderInfo?.order?.charges / 100}</View>元</View>
+              </View>
+            </View>
+            <View slot='button' style={{ margin: '4em 0 2em 0' }}>
+              <Button style={{ backgroundColor: '#fbd804', borderRadius: '40px', color: '#000', border: '0px' }} class='weui-btn' type='primary' loading={false} onClick={pay}>支付</Button>
+            </View>
+          </>
+      }
+
     </ScrollView>
   )
 }

src/pages/payPage/style.less

@@ -1,3 +1,10 @@
+.page-loading-circle {
+  .weui-loading {
+    width: 96rpx;
+    height: 96rpx;
+  }
+}
+
 .payPageBox {
   width: 86%;
   background-color: #fff;

src/pages/setDogLicense/index.jsx

@@ -14,6 +14,7 @@ import { getCardLicenseInfo } from '../../services/dogAPI';
 export default (props) => {
   const { dogs, person } = useModel('userData')
   const [formData, setFormData] = useState()
+  const routerPetId = Taro.getCurrentInstance().router.params.petId;
 
   const [dogDate, setDogDate] = useState({ immunizationDate: null, petBirthday: null, petSex: [], petType: [] })
   const [mainDog, setMainDog] = useState([])
@@ -49,6 +50,7 @@ export default (props) => {
     })
   }, [])
 
+
   const getDogInfoFunction = (petId) => {
 
     getDogInfo(petId).then((e) => {
@@ -56,7 +58,7 @@ export default (props) => {
       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 })
+      setDogDate({ ...dogDate, petBirthday: e?.birthday, petSex: sex, petType: petType, })
       console.log('test', e);
 
     })
@@ -64,11 +66,12 @@ export default (props) => {
   const getMainDogChange = (value) => {
     console.log("🚀 ~ file: index.jsx ~ line 34 ~ getMainDogChange ~ value", value)
     const { petId } = value.detail.data
-    if (applyType == 'renewal' || (applyType == 'reissue')) {
+    if (applyType == 'renewal' || applyType == 'reissue') {
       setDogStatus(false)
       getDogInfoFunction(petId)
       getCardLicenseInfo(petId).then((res) => {
         console.log('狗子证件有效期', res);
+        setRenewalAndReissue(res)
       })
     }
     if (applyType == 'first') {
@@ -78,12 +81,21 @@ export default (props) => {
           getDogInfoFunction(petId)
         } else {
           setDogStatus(true)
-          Taro.showToast({
-            title: '当前狗狗已有证件！',
-            icon: 'error',
-            duration: 2000,
+          Taro.showModal({
+            title: '提示',
+            content: '当前狗狗已有证件，请勿重复申请！',
+            showCancel: false,
+            success: function (v) {
+              if (v.confirm) {
+                console.log('用户点击确定')
+                Taro.navigateBack({
+                  delta: 1
+                })
+              }
+            }
           })
 
+
         }
       })
     }
@@ -114,35 +126,58 @@ export default (props) => {
   const modeList = [
     {
       value: 1,
-      text: '邮寄',
+      text: '自取',
     },
     {
       value: 2,
-      text: '自取',
+      text: '邮寄',
     },
   ]
 
   // ...dogDate,
   const formSubmit = value => {
-    addlication({ ...value, applyType }).then((res) => {
-      console.log('dogInfo xinwe', res);
-      Taro.showToast({
-        title: '申请成功，等待审核',
-        icon: 'none',
-        duration: 1000
-      })
-      if (applyType == 'renewal') {
-        Taro.navigateBack({
-          delta: 1
+    if (applyType == 'renewal' || applyType == 'reissue') {
+      addlication({ ...value, applyType, petId: formData.petId, originCardNo: renewalAndReissue?.cardNo }).then((res) => {
+        console.log('dogInfo xinwe', res);
+        Taro.showToast({
+          title: '申请成功，等待审核',
+          icon: 'none',
+          duration: 1000
         })
-        return;
-      } else {
-        Taro.reLaunch({
-          url: `/pages/payPage/index?id=${res.applyId}`
+        if (applyType == 'renewal') {
+          Taro.navigateBack({
+            delta: 1
+          })
+          return;
+        } else {
+          Taro.reLaunch({
+            url: `/pages/payPage/index?id=${res.applyId}`
+          })
+        }
+
+      })
+    } else {
+      addlication({ ...value, applyType, petId: formData.petId }).then((res) => {
+        console.log('dogInfo xinwe', res);
+        Taro.showToast({
+          title: '申请成功，等待审核',
+          icon: 'none',
+          duration: 1000
         })
-      }
+        if (applyType == 'renewal') {
+          Taro.navigateBack({
+            delta: 1
+          })
+          return;
+        } else {
+          Taro.reLaunch({
+            url: `/pages/payPage/index?id=${res.applyId}`
+          })
+        }
+
+      })
+    }
 
-    })
   }
 
   const rules = {
@@ -151,7 +186,7 @@ export default (props) => {
     petBirthday: [{ required: true, message: '请选择狗狗生日' }],
     petColor: [{ required: true, message: '请选择狗狗毛色' }],
     petType: [{ required: true, message: '请选择犬种类别' }],
-    dogImg1: [{ required: true, message: '请上传狗狗照片' }],
+    img1: [{ required: true, message: '请上传狗狗照片' }],
     immunizationDate: [{ required: true, message: '请上输入最近免疫时间' }],
     immunizationCode: [{ required: true, message: '请输入免疫证号' }],
     immunizationImg: [{ required: true, message: '请上传免疫图片' }],
@@ -169,12 +204,27 @@ export default (props) => {
               <FormItem title='犬主姓名' required>
                 <View >{person?.nickName}</View>
               </FormItem>
-              <FormItem title='证件号' required>
-                <View >{person?.nickName}</View>
-              </FormItem>
-              <FormItem title='有效期' required>
-                <View >{person?.nickName}</View>
-              </FormItem>
+              {
+                applyType == 'first' ? <></>
+                  :
+                  <>
+                    <FormItem title='证件号' required>
+                      <View >{renewalAndReissue?.cardNo}</View>
+                    </FormItem>
+                    <FormItem title='有效期' required>
+                      {
+                        formData?.sex ?
+                          <View >
+
+                            {renewalAndReissue?.startDate}~{renewalAndReissue?.expireDate}</View>
+                          :
+                          <View></View>
+                      }
+
+                    </FormItem>
+                  </>
+              }
+
               <FormItem title='狗狗名称' required>
                 <s-picker name='petName' rangeKey='name' rangeValue='value' range={mainDog} value={formData?.name} onChange={getMainDogChange} />
               </FormItem>
@@ -201,7 +251,7 @@ export default (props) => {
                 <Input name='petColor' placeholder='请输入毛色' value={formData?.color} />
               </FormItem>
               <FormItem title='狗狗照片' required>
-                <uploader name='dogImg1' onFile={handleFile} value={formData?.image} />
+                <uploader name='img1' onFile={handleFile} value={formData?.image} />
               </FormItem>
               <FormItem title='最近免疫日期' required>
                 <Picker name='immunizationDate' mode='date' onChange={(e) => { onDateChange('immunizationDate', e.detail.value) }}>

src/services/dogAPI.js

@@ -108,7 +108,6 @@ export const getDogType = (id, data) => request(`/setting/dog_type`, { data, met
 
 
 
-
 /**
 * 消息列表
 * @param {*} data