add ord

src/pages/setDogLicense/index.jsx

@@ -9,6 +9,7 @@ import { addDogList, addlication, getDogInfo, getCardLicenseInfo } from '@/servi
 import { handleFile } from '@/utils/request';
 import { useModel } from '@/store';
 import './style.less'
+import { getApplicationList } from '../../services/dogAPI';
 
 export default (props) => {
   function getBool (val) {
@@ -18,9 +19,7 @@ export default (props) => {
 
   const { dogs, setDogs, person } = useModel('userData')
   const [formData, setFormData] = useState()
-  const [isOrgState, setIsOrgState] = useState(
-    false
-  )
+  const [isOrgState, setIsOrgState] = useState(false)
   const [dogDate, setDogDate] = useState({ immunizationDate: null, petBirthday: null, petSex: [], petType: [] })
   //狗证详情
   const [renewalAndReissue, setRenewalAndReissue] = useState()
@@ -44,14 +43,7 @@ export default (props) => {
     }
   }, [applyType])
   useDidShow(() => {
-    // addDogList().then((res) => {
-    //   setDogs(res.records)
-    //   if (res.records && res.records.length == 1) {
-    //     getDetail(res.records[0])
-    //   }
-    // })
     if (dogs) {
-      console.log("🚀 ~ file: index.jsx ~ line 41 ~ useDidShow ~ dogs", dogs)
       if (dogs.length == 1) {
         getDetail(dogs[0])
       }
@@ -69,7 +61,6 @@ export default (props) => {
   const getDogInfoFunction = (petId) => {
     getDogInfo(petId).then((e) => {
       setFormData(e)
-      console.log("🚀 ~ file: index.jsx ~ line 58 ~ getDogInfo ~ e", 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, })
@@ -143,87 +134,185 @@ export default (props) => {
 
   // ...dogDate,
   const formSubmit = (value) => {
+
     if (applyType == 'renewal' || applyType == 'reissue') {
-      addlication({ ...value, applyType, originCardNo: renewalAndReissue?.cardNo, petName: formData.name, isOrg: isOrgState }).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}`
-          })
+
+      getApplicationList({ pageSize: 500 }).then((e) => {
+        console.log('e', e);
+        const array = e.records
+        for (let i = 0; i < array.length; i++) {
+          if (array[i].petId == formData.petId) {
+            if (array[i].status == 1) {
+              console.log('支付过了',);
+              Taro.showToast({
+                title: '申请成功，等待审核',
+                icon: 'none',
+                duration: 1000
+              })
+              setTimeout(() => {
+                Taro.navigateBack({
+                  delta: 1
+                })
+              }, 1000);
+
+              return;
+            } else {
+              console.log('没有支付',);
+              other(value);
+              return;
+            }
+          } else {
+            console.log('没有这个订单',);
+            other(value);
+            return;
+          }
         }
 
       })
+
     } else {
-      getCardLicenseInfo(renewalAndReissue?.petId).then((res) => {
-        if (!res) {
-          addlication({ ...value, applyType, petName: formData.name, isOrg: isOrgState }).then((ress) => {
-            console.log('dogInfo xinwe', ress);
-            Taro.showToast({
-              title: '申请成功，等待审核',
-              icon: 'none',
-              duration: 1000
+
+      getApplicationList({ pageSize: 500 }).then((e) => {
+        console.log('开始',);
+
+        console.log('e', e);
+        const array = e.records
+        if (array.length > 0) {
+          for (let i = 0; i < array.length; i++) {
+            if (array[i].petId == formData.petId) {
+              if (array[i].status == 1) {
+                console.log('支付过了',);
+                Taro.showToast({
+                  title: '申请成功，等待审核',
+                  icon: 'none',
+                  duration: 1000
+                })
+                setTimeout(() => {
+                  Taro.navigateBack({
+                    delta: 1
+                  })
+                }, 1000);
+                return;
+              } else {
+                console.log('没有支付',);
+                goPayPage(value)
+
+                return;
+              }
+            } else {
+              console.log('没有这个订单-----------',);
+              goPayPage(value)
+
+              return;
+            }
+
+          }
+        } else {
+          goPayPage(value)
+
+        }
+
+
+      })
+
+    }
+  }
+  const goPayPage = (value) => {
+    getCardLicenseInfo(renewalAndReissue?.petId).then((res) => {
+      if (!res) {
+        addlication({ ...value, applyType, petName: formData.name, isOrg: isOrgState }).then((ress) => {
+          console.log('dogInfo xinwe', ress);
+          Taro.showToast({
+            title: '申请成功，等待审核',
+            icon: 'none',
+            duration: 1000
+          })
+          if (applyType == 'renewal') {
+            Taro.navigateBack({
+              delta: 1
             })
-            if (applyType == 'renewal') {
-              Taro.navigateBack({
-                delta: 1
+            return;
+          } else {
+            if (value.applyMethod == '1') {
+              console.log('不跳转',);
+              Taro.showToast({
+                title: '申请成功，等待审核',
+                icon: 'none',
+                duration: 1000
               })
-              return;
+              setTimeout(() => {
+                Taro.navigateBack({
+                  delta: 1
+                })
+              }, 1000);
             } else {
+              console.log('跳转',);
               Taro.reLaunch({
                 url: `/pages/payPage/index?id=${ress.applyId}`
               })
             }
+          }
+        })
+      } else {
+        Taro.showModal({
+          title: '提示',
+          content: '当前狗狗已有证件，请勿重复申请！',
+          showCancel: false,
+          success: function (v) {
+            if (v.confirm) {
+              // console.log('用户点击确定')
+              // Taro.navigateBack({
+              //   delta: 1
+              // })
+            }
+          }
+        })
+      }
+    })
+  }
 
+  const other = (value) => {
+    addlication({ ...value, applyType, originCardNo: renewalAndReissue?.cardNo, petName: formData.name, isOrg: isOrgState }).then((res) => {
+      console.log('dogInfo xinwe', res);
+      Taro.showToast({
+        title: '申请成功，等待审核',
+        icon: 'none',
+        duration: 1000
+      })
+      if (applyType == 'renewal') {
+        Taro.navigateBack({
+          delta: 1
+        })
+        return;
+      } else {
+        if (value.applyMethod == '1') {
+          console.log('不跳转',);
+          Taro.showToast({
+            title: '申请成功，等待审核',
+            icon: 'none',
+            duration: 1000
           })
+          setTimeout(() => {
+            Taro.navigateBack({
+              delta: 1
+            })
+          }, 1000);
         } else {
-          Taro.showModal({
-            title: '提示',
-            content: '当前狗狗已有证件，请勿重复申请！',
-            showCancel: false,
-            success: function (v) {
-              if (v.confirm) {
-                // console.log('用户点击确定')
-                // Taro.navigateBack({
-                //   delta: 1
-                // })
-              }
-            }
+          console.log('跳转',);
+          Taro.reLaunch({
+            url: `/pages/payPage/index?id=${res.applyId}`
           })
         }
-      })
-    }
+      }
+
+    })
   }
-  const [abcc, setAbc] = useState(
-    [
-      {
-        value: false,
-        text: '个人',
-        checked: false,
-      },
-      {
-        value: true,
-        text: '企业',
-        checked: false,
-
-      },
-
-    ]
-  )
+
   const orgState = [
     {
       value: false,
       text: '个人',
-      checked: false,
+      checked: true,
     },
     {
       value: true,
@@ -237,11 +326,7 @@ export default (props) => {
 
 
 
-  const handleRadio = (index) => {
-    setAbc([...abcc, abcc[index].checked = true])
-    setIsOrgState(getBool(abcc[index].checked))
-    console.log("🚀 ~ file: index.jsx ~ line 224 ~ handleRadio ~ orgState", abcc, abcc[index])
-  }
+
 
   const rules = {
     petId: [{ required: true, message: '请填写狗狗名称' }],
@@ -262,27 +347,29 @@ export default (props) => {
     <>
       <AuthProfile />
       <View class='page' >
+        <View style={{ backgroundColor: 'white' }}>
+          <FormItem title='是否企业' extClass='' required >
+            <View className='radio-list' >
+              <RadioGroup name='isOrg' onChange={(e) => setIsOrgState(getBool(e.detail.value))} >
+                {orgState.map((item, i) => {
+                  return (
+                    <Label className='radio-list__label' for={i} key={i}>
+                      <Radio color='#FCD905' checked={item.checked} className='radio-list__radio' value={item.value} >{item.text}</Radio>
+                    </Label>
+                  )
+                })}
+              </RadioGroup>
+            </View>
+          </FormItem>
+        </View>
         <Form onSubmit={formSubmit} rules={rules} >
           <mp-form  >
             <mp-cells >
-              <FormItem title='是否企业' >
+              {/* <FormItem title='是否企业' >
                 <s-picker name='isOrg' rangeKey='text' rangeValue='value' range={orgState} value={orgState?.text} onChange={(e) => { setIsOrgState(e.detail.value) }} />
-              </FormItem>
-              {/* setIsOrgState(getBool(e.detail.value)) */}
-              {/* 
-              <FormItem title='是否企业' extClass='' required >
-                <View className='radio-list'>
-                  <RadioGroup name='isOrg' >
-                    {orgState.map((item, i) => {
-                      return (
-                        <Label className='radio-list__label' for={i} key={i}>
-                          <Radio onClick={() => { handleRadio(i) }} color='#FCD905' checked={item.checked} className='radio-list__radio' value={item.value} >{item.text}</Radio>
-                        </Label>
-                      )
-                    })}
-                  </RadioGroup>
-                </View>
               </FormItem> */}
+              {/* setIsOrgState(getBool(e.detail.value)) */}
+
               <FormItem title='犬主姓名' required>
                 <View >{person?.nickName}</View>
               </FormItem>
@@ -352,7 +439,6 @@ export default (props) => {
               <FormItem title='处罚信息' >
                 <uploader name='penaltyInfo' onFile={handleFile} />
               </FormItem>
-
               <FormItem title='最近免疫日期' required>
                 <Picker name='immunizationDate' mode='date' onChange={(e) => { onDateChange('immunizationDate', e.detail.value) }}>
                   {dogDate?.immunizationDate ? (

src/pages/setDogLicense/style.less

@@ -20,3 +20,6 @@
   font-size: 35px;
   transform: scale(0.9);
 }
+.weui-cells {
+  margin-top: 0px;
+}