set DogCardInfo

src/pages/dogCardDetail/index.jsx

@@ -5,6 +5,7 @@ import RatioItem from '@/components/RatioItem';
 import withBasic from '@/layouts/withBasic'
 import PageLoading from '@/components/PageLoading'
 import { getDogCardInfo } from '@/services/dogAPI';
+import NoData from '../../components/NoData';
 
 import './style.less'
 
@@ -14,9 +15,11 @@ const CardDetailPage = (props) => {
   const [applicationInfoDate, setApplicationInfoDate] = useState()
   useEffect(() => {
     if (cardNo) {
-      getDogCardInfo(cardNo).then((e) => {
+      getDogCardInfo(cardNo, true).then((e) => {
         setApplicationInfoDate(e)
 
+      }).catch(() => {
+
       })
     } else {
       Taro.showToast({
@@ -35,91 +38,97 @@ const CardDetailPage = (props) => {
   }
 
   return (
+
     <>
-      <View className='dogCardDetail'>
-        <View className='card'>
-          <View className='title'>电&nbsp;&nbsp;&nbsp;子&nbsp;&nbsp;&nbsp;版&nbsp;&nbsp;&nbsp;犬&nbsp;&nbsp;&nbsp;证</View>
-          <View className='body'>
-            <View className='cardLeft'>
+      {
+        !applicationInfoDate ? <NoData title='暂无此狗狗证件详情哦~' />
+          :
+          <View className='dogCardDetail'>
+            <View className='card'>
+              <View className='title'>电&nbsp;&nbsp;&nbsp;子&nbsp;&nbsp;&nbsp;版&nbsp;&nbsp;&nbsp;犬&nbsp;&nbsp;&nbsp;证</View>
+              <View className='body'>
+                <View className='cardLeft'>
+                  {
+                    !applicationInfoDate?.isOrg ? <></> :
+                      <View className='cell'>
+                        <View className='lable'>是否企业</View>：
+                        <View className='content'>{applicationInfoDate?.orgName}</View>
+                      </View>
+                  }
+
+                  <View className='cell'>
+                    <View className='lable'>犬主</View>：
+                    <View className='content'>{applicationInfoDate?.personName}</View>
+                  </View>
+                  <View className='cell'>
+                    <View className='lable'>电话</View>：
+                    <View className='content'>{applicationInfoDate?.phone}</View>
+                  </View>
+                  <View className='cell'>
+                    <View className='lable'>犬名</View>：
+                    <View className='content'>{applicationInfoDate?.petName}</View>
+                  </View>
+                  <View className='cell'>
+                    <View className='lable'>性别</View>：
+                    <View className='content'>{applicationInfoDate?.petSex == 1 ? '雄' : '雌'}</View>
+                  </View>
+                </View>
+                <View className='cardRight'>
+                  <RatioItem ratio='109:151'>
+                    <Image
+                      style={{ width: '100%', height: '100%' }}
+                      src={applicationInfoDate?.petImg1}
+                    ></Image>
+                  </RatioItem>
+                </View >
+              </View >
+              <View className='cell' style={{ marginTop: '0' }}>
+                <View className='lable'>状态</View>：
+                <View className={['state', 'color' + applicationInfoDate?.status]}>{applicationInfoDate?.status == 1 ? '正常' : applicationInfoDate?.status == 2 ? '挂失' : '过期'}</View>
+              </View>
+              <View className='cell'>
+                <View className='lable'>犬种</View>：
+                <View className='content'>{applicationInfoDate?.petType}</View>
+              </View>
               {
-                !applicationInfoDate?.isOrg ? <></> :
+                applicationInfoDate?.criminalInfo == null ? <></> :
+
                   <View className='cell'>
-                    <View className='lable'>是否企业</View>：
-                    <View className='content'>{applicationInfoDate?.orgName}</View>
+                    <View className='lable'>伤人信息</View>：
+                    {/* <View className='content'>{applicationInfoDate?.criminalInfo}</View> */}
+                    <Image onClick={() => { lookImage(applicationInfoDate?.criminalInfo) }} src={applicationInfoDate?.criminalInfo} style={{ width: '90px', height: '90px' }} />
+
                   </View>
               }
+              {
+                applicationInfoDate?.penaltyInfo == null ? <></> :
 
+                  <View className='cell'>
+                    <View className='lable'>伤人信息</View>：
+                    {/* <View className='content'>{applicationInfoDate?.criminalInfo}</View> */}
+                    <Image onClick={() => { lookImage(applicationInfoDate?.penaltyInfo) }} src={applicationInfoDate?.penaltyInfo} style={{ width: '90px', height: '90px' }} />
+                  </View>
+              }
               <View className='cell'>
-                <View className='lable'>犬主</View>：
-                <View className='content'>{applicationInfoDate?.personName}</View>
+                <View className='lable'>毛色</View>：
+                <View className='content'>{applicationInfoDate?.petColor}</View>
               </View>
               <View className='cell'>
-                <View className='lable'>电话</View>：
-                <View className='content'>{applicationInfoDate?.phone}</View>
+                <View className='lable'>证件号</View>：
+                <View className='content'>{applicationInfoDate?.cardNo}</View>
               </View>
               <View className='cell'>
-                <View className='lable'>犬名</View>：
-                <View className='content'>{applicationInfoDate?.petName}</View>
+                <View className='lable'>有效期</View>：
+                <View className='content'>{applicationInfoDate?.startDate}~{applicationInfoDate?.expireDate}</View>
               </View>
               <View className='cell'>
-                <View className='lable'>性别</View>：
-                <View className='content'>{applicationInfoDate?.petSex == 1 ? '雄' : '雌'}</View>
+                <View className='lable'>住址</View>：
+                <View className='content'>{applicationInfoDate?.address}</View>
               </View>
-            </View>
-            <View className='cardRight'>
-              <RatioItem ratio='109:151'>
-                <Image
-                  style={{ width: '100%', height: '100%' }}
-                  src={applicationInfoDate?.petImg1}
-                ></Image>
-              </RatioItem>
             </View >
           </View >
-          <View className='cell' style={{ marginTop: '0' }}>
-            <View className='lable'>状态</View>：
-            <View className={['state', 'color' + applicationInfoDate?.status]}>{applicationInfoDate?.status == 1 ? '正常' : applicationInfoDate?.status == 2 ? '挂失' : '过期'}</View>
-          </View>
-          <View className='cell'>
-            <View className='lable'>犬种</View>：
-            <View className='content'>{applicationInfoDate?.petType}</View>
-          </View>
-          {
-            applicationInfoDate?.criminalInfo == null ? <></> :
+      }
 
-              <View className='cell'>
-                <View className='lable'>伤人信息</View>：
-                {/* <View className='content'>{applicationInfoDate?.criminalInfo}</View> */}
-                <Image onClick={() => { lookImage(applicationInfoDate?.criminalInfo) }} src={applicationInfoDate?.criminalInfo} style={{ width: '90px', height: '90px' }} />
-
-              </View>
-          }
-          {
-            applicationInfoDate?.penaltyInfo == null ? <></> :
-
-              <View className='cell'>
-                <View className='lable'>伤人信息</View>：
-                {/* <View className='content'>{applicationInfoDate?.criminalInfo}</View> */}
-                <Image onClick={() => { lookImage(applicationInfoDate?.penaltyInfo) }} src={applicationInfoDate?.penaltyInfo} style={{ width: '90px', height: '90px' }} />
-              </View>
-          }
-          <View className='cell'>
-            <View className='lable'>毛色</View>：
-            <View className='content'>{applicationInfoDate?.petColor}</View>
-          </View>
-          <View className='cell'>
-            <View className='lable'>证件号</View>：
-            <View className='content'>{applicationInfoDate?.cardNo}</View>
-          </View>
-          <View className='cell'>
-            <View className='lable'>有效期</View>：
-            <View className='content'>{applicationInfoDate?.startDate}~{applicationInfoDate?.expireDate}</View>
-          </View>
-          <View className='cell'>
-            <View className='lable'>住址</View>：
-            <View className='content'>{applicationInfoDate?.address}</View>
-          </View>
-        </View >
-      </View >
     </>
   )
 }

src/pages/setDogLicense/index.jsx

@@ -341,7 +341,6 @@ export default (props) => {
         )
         // console.log('rules', rules, deleteObj);
       }
-
     }
 
   }, [isOrgState])

src/services/dogAPI.js

@@ -87,7 +87,7 @@ export const getDogCardList = (id, data) => request(`/card`, { data, method: 'GE
 * @param {*} data
 * @returns
 */
-export const getDogCardInfo = (id, data) => request(`/card/${id}`, { data, method: 'GET' })
+export const getDogCardInfo = (id, skipError) => request(`/card/${id}`, { skipError })
 
 
 /**

src/utils/request.js

@@ -40,6 +40,7 @@ export default (url, options) => {
           resolve(data)
 
         } else {
+
           if (!skipError) {
             Taro.showToast({
               title: message || '网络异常',