fie

config/dev.js

@@ -3,7 +3,9 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    HOST: '"http://127.0.01:9002"'
+    // HOST: '"http://192.168.89.147:9002"'
+    HOST: '"https://pet-certificate-online.njyunzhi.com"',
+
 
   },
   mini: {},

src/pages/dogCardDetail/index.jsx

@@ -8,7 +8,6 @@ import { getDogCardInfo } from '@/services/dogAPI';
 import NoData from '../../components/NoData';
 
 import './style.less'
-
 const CardDetailPage = (props) => {
   const router = useRouter()
   const cardNo = router.params.cardno

src/pages/setDogLicense/index.jsx

@@ -72,6 +72,36 @@ export default (props) => {
     if (applyType == 'renewal' || applyType == 'reissue') {
       getDogInfoFunction(petId)
       getCardLicenseInfo(petId).then((res) => {
+        console.log("🚀 ~ file: index.jsx ~ line 75 ~ getCardLicenseInfo ~ res", res)
+        setIsOrgState(res.isOrg)
+
+        if (res.isOrg) {
+          setOrgState([{
+            value: false,
+            text: '个人',
+            checked: false,
+          },
+          {
+            value: true,
+            text: '企业',
+            checked: true,
+
+          }])
+        } else {
+          setOrgState([{
+            value: true,
+            text: '个人',
+            checked: true,
+          },
+          {
+            value: false,
+            text: '企业',
+            checked: false,
+
+          }])
+        }
+
+
         setRenewalAndReissue({ ...renewalAndReissue, ...res })
       })
     }
@@ -134,50 +164,57 @@ export default (props) => {
 
   // ...dogDate,
   const formSubmit = (value) => {
-
-    if (applyType == 'renewal' || applyType == 'reissue') {
-
-      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
+    if (applyType == 'reissue') {
+      console.log("🚀 ~ file: index.jsx ~ line 201 ~ getApplicationList ~ applyType", applyType, value.applyMethod)
+      if (value.applyMethod) {
+        getApplicationList({ pageSize: 500 }).then((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
                 })
-              }, 1000);
+                setTimeout(() => {
+                  Taro.navigateBack({
+                    delta: 1
+                  })
+                }, 1000);
 
-              return;
+                return;
+              } else {
+                console.log('没有支付',);
+                other(value);
+                return;
+              }
             } else {
-              console.log('没有支付',);
+              console.log('没有这个订单',);
               other(value);
               return;
             }
-          } else {
-            console.log('没有这个订单',);
-            other(value);
-            return;
           }
-        }
 
-      })
 
+        })
+
+      } else {
+        console.log("🚀 ~ file: index.jsx ~ line 201 ~ getApplicationList ~ applyType", applyType, value.applyMethod)
+
+        Taro.showToast({
+          title: '请选择申领方式',
+          icon: 'none',
+          duration: 1000
+        })
+      }
     } else {
+      if (applyType == 'renewal' || applyType == 'reissue') {
 
-      getApplicationList({ pageSize: 500 }).then((e) => {
-        console.log('开始',);
+        getApplicationList({ pageSize: 500 }).then((e) => {
+          const array = e.records
 
-        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) {
@@ -192,28 +229,78 @@ export default (props) => {
                     delta: 1
                   })
                 }, 1000);
+
                 return;
               } else {
                 console.log('没有支付',);
-                goPayPage(value)
-
+                other(value);
                 return;
               }
             } else {
-              console.log('没有这个订单-----------',);
+              console.log('没有这个订单',);
+              other(value);
+              return;
+            }
+          }
+
+
+        })
+
+      } else {
+        if (value.applyMethod) {
+
+          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)
 
-              return;
             }
 
-          }
+
+          })
         } else {
-          goPayPage(value)
+          Taro.showToast({
+            title: '请选择申领方式',
+            icon: 'none',
+            duration: 1000
+          })
 
         }
+      }
+
 
 
-      })
 
     }
   }
@@ -307,21 +394,31 @@ export default (props) => {
 
     })
   }
-
-  const orgState = [
-    {
-      value: false,
-      text: '个人',
-      checked: true,
-    },
-    {
-      value: true,
-      text: '企业',
-      checked: false,
-
-    },
-
-  ]
+  const [orgState, setOrgState] = useState([{
+    value: false,
+    text: '个人',
+    checked: false,
+  },
+  {
+    value: true,
+    text: '企业',
+    checked: false,
+
+  }])
+
+  // const orgState = [
+  //   {
+  //     value: false,
+  //     text: '个人',
+  //     checked: true,
+  //   },
+  //   {
+  //     value: true,
+  //     text: '企业',
+  //     checked: false,
+  //   },
+
+  // ]
 
 
 
@@ -360,22 +457,6 @@ export default (props) => {
 
   })
 
-  // let rules = {
-  //   petId: [{ required: true, message: '请填写狗狗名称' }],
-  //   petSex: [{ type: 'number', required: true, message: '请填写狗狗性别' }],
-  //   petBirthday: [{ required: true, message: '请选择狗狗生日' }],
-  //   petColor: [{ required: true, message: '请选择狗狗毛色' }],
-  //   petType: [{ required: true, message: '请选择犬种类别' }],
-  //   img1: [{ required: true, message: '请上传狗狗照片' }],
-  //   immunizationDate: [{ required: true, message: '请上输入最近免疫时间' }],
-  //   immunizationCode: [{ required: true, message: '请输入免疫证号' }],
-  //   immunizationImg: [{ required: true, message: '请上传免疫图片' }],
-
-  //   address: [{ required: true, message: '请输入详细地址' }],
-
-  // }
-
-
   return (
     <>
       <AuthProfile />
@@ -458,7 +539,7 @@ export default (props) => {
               {
                 !isOrgState ? <></> : <>
                   <FormItem title='企业名称' required >
-                    <Input name='orgName' placeholder='请输入企业名称' />
+                    <Input name='orgName' placeholder='请输入企业名称' value={renewalAndReissue?.orgName} />
                   </FormItem>
                   <FormItem title='营业执照' >
                     <uploader name='orgLicense' onFile={handleFile} />