Merge branch 'master' of http://git.ycjcjy.com/pet_identity/miniapp

config/prod.js

@@ -3,6 +3,7 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
+    HOST: '"https://pet-certificate-online.njyunzhi.com"',
   },
   mini: {},
   h5: {

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

@@ -69,6 +69,10 @@ export default (props) => {
           <View>审领方式</View>
           <View>{item.applyMethod == 1 ? '自取' : '邮寄'}</View>
         </View>
+        <View className='ApplicationListBox-CardBox-content'>
+          <View>申请类型</View>
+          <View>{item.applyType == 'first' ? '办证申请' : item.applyType == 'renewal' ? '证件续期' : item.applyType == 'reissue' ? '证件补办' : '异常'}</View>
+        </View>
         <View className='ApplicationListBox-CardBox-content'>
           <View>状态</View>
           <View style={{ color: cardStatus(item)?.styleColor }}>{cardStatus(item)?.title}</View>
@@ -84,6 +88,10 @@ export default (props) => {
         {
           cardStatus(item)?.title == '驳回' ?
             <View>
+              <View className='ApplicationListBox-CardBox-content'>
+                <View>退款方式</View>
+                <View>原路退回支付账户</View>
+              </View>
               <View className='ApplicationListBox-CardBox-refuse'>
                 <View>驳回原因</View>
                 <View>{item.rejectReason}</View>

src/pages/ApplicationList/index.jsx

@@ -48,26 +48,32 @@ export default (props) => {
   return (
     <>
       {
-        applionLoading ? <mp-loading extClass="page-loading-circle" type="circle" show={applionLoading} /> :
+        !applionLoading ?
+
 
-          <>
 
+          <>
             {
-              applionList.map((item, index) => {
-                return (
-                  <AppliCard key={index} item={item} onClick={goSetDogLicense} copy={trackingCopy} />
 
-                )
+              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' }}>
+            暂无申请信息
+          </View>
       }
 
 
-      <View style={{ textAlign: 'center', margin: '6vw 0 3vw 0', color: '#858585', fontSize: '12px' }}>
-        申请驳回，费用将原路退回支付账户！
-      </View>
+
 
     </>
   )

src/pages/NoticeInfo/index.jsx

@@ -10,6 +10,9 @@ export default (props) => {
   const { id } = value.params
   const [content, setContent] = useState()
   useEffect(() => {
+    Taro.showShareMenu({
+      withShareTicket: true
+    })
     if (id) {
       getNoticeInfo(id).then((res) => {
         setContent(res)

src/pages/index/index.jsx

@@ -28,6 +28,9 @@ const IndexPage = (props) => {
   const [bannerList, setBannerList] = useState([])
 
   useEffect(() => {
+    Taro.showShareMenu({
+      withShareTicket: true
+    })
     getNoticeList({ pageSize: 5 }).then((res) => {
       setNoticeList(res.records)
     })

src/pages/setDogInfo/index.jsx

@@ -62,7 +62,8 @@ export default (props) => {
 
       addDogInfo(value).then((e) => {
         console.log("🚀 修改前s", dogs)
-        setDogs((dogs || [e]))
+        // setDogs((dogs || [e]))
+        setDogs((dogs || []).concat(e))
 
         console.log("🚀 ~ 保存成功数据", value, e)
 

src/pages/setDogLicense/index.jsx

@@ -15,8 +15,8 @@ import { getCardLicenseInfo } from '../../services/dogAPI';
 export default (props) => {
   const { dogs, person } = useModel('userData')
   const [formData, setFormData] = useState()
-  const value = useRouter();
-  const { petId } = value.params
+  const values = useRouter();
+  // const { petId } = value.params
 
   const [dogDate, setDogDate] = useState({ immunizationDate: null, petBirthday: null, petSex: [], petType: [] })
   const [mainDog, setMainDog] = useState([])
@@ -67,13 +67,16 @@ export default (props) => {
   }
   const getMainDogChange = (value) => {
     console.log("🚀 ~ file: index.jsx ~ line 34 ~ getMainDogChange ~ value", value)
-    const { petId } = value.detail.data
+    const valuess = value.detail.data
+    const { petId } = valuess
+    setRenewalAndReissue({ ...renewalAndReissue, ...valuess })
+
     if (applyType == 'renewal' || applyType == 'reissue') {
       setDogStatus(false)
       getDogInfoFunction(petId)
       getCardLicenseInfo(petId).then((res) => {
         console.log('狗子证件有效期', res);
-        setRenewalAndReissue(res)
+        setRenewalAndReissue({ ...renewalAndReissue, ...res })
       })
     }
     if (applyType == 'first') {
@@ -89,10 +92,10 @@ export default (props) => {
             showCancel: false,
             success: function (v) {
               if (v.confirm) {
-                console.log('用户点击确定')
-                Taro.navigateBack({
-                  delta: 1
-                })
+                // console.log('用户点击确定')
+                // Taro.navigateBack({
+                //   delta: 1
+                // })
               }
             }
           })
@@ -137,7 +140,7 @@ export default (props) => {
   ]
 
   // ...dogDate,
-  const formSubmit = value => {
+  const formSubmit = (value) => {
     if (applyType == 'renewal' || applyType == 'reissue') {
       addlication({ ...value, applyType, petId: formData.petId, originCardNo: renewalAndReissue?.cardNo }).then((res) => {
         console.log('dogInfo xinwe', res);
@@ -159,25 +162,48 @@ export default (props) => {
 
       })
     } 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
+      console.log("🚀 ~ file: index.jsx ~ line 166 ~ getCardLicenseInfo ~ renewalAndReissue", renewalAndReissue)
+
+      getCardLicenseInfo(renewalAndReissue?.petId).then((res) => {
+        if (!res) {
+          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}`
+              })
+            }
+
           })
-          return;
         } else {
-          Taro.reLaunch({
-            url: `/pages/payPage/index?id=${res.applyId}`
+          Taro.showModal({
+            title: '提示',
+            content: '当前狗狗已有证件，请勿重复申请！',
+            showCancel: false,
+            success: function (v) {
+              if (v.confirm) {
+                // console.log('用户点击确定')
+                // Taro.navigateBack({
+                //   delta: 1
+                // })
+              }
+            }
           })
-        }
 
+
+        }
       })
+
     }
 
   }
@@ -296,7 +322,8 @@ export default (props) => {
 
             </mp-cells>
           </mp-form>
-          <Button disabled={dogStatus} title='确定' />
+          {/* <Button disabled={dogStatus} title='确定' /> */}
+          <Button title='确定' />
         </Form>
       </View>
     </>