feats

src/components/PageLoading/index.jsx

@@ -0,0 +1,15 @@
+
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components'
+
+import './style.less'
+
+export default function (props) {
+  const { tips } = props
+
+  return (
+    <View className="page-loading">
+      <mp-loading extClass="page-loading-circle" type="circle" tips={tips} show />
+    </View>
+  )
+}

src/components/PageLoading/style.less

@@ -0,0 +1,14 @@
+
+.page-loading {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 80vh;
+
+  .page-loading-circle {
+    .weui-loading {
+      width: 96rpx;
+      height: 96rpx;
+    }
+  }
+}

src/layouts/withBasic.jsx

@@ -4,8 +4,8 @@ import { useModel } from '@/store'
 export default function withBasic (Comp, Loading) {
   return (props) => {
     const { person } = useModel('userData')
-    const loading = person && person.personId
+    const loading = !person || !person.personId
 
-    return loading ? <Loading /> : <Comp>
+    return loading ? <Loading /> : <Comp />
   }
 }

src/pages/index/components/MenuItem/index.jsx

@@ -1,4 +1,5 @@
 import React, { useMemo } from 'react'
+import Taro from '@tarojs/taro'
 import { View, Image } from '@tarojs/components'
 import RatioItem from '@/components/RatioItem'
 import certificate from '@/assets/certificate.png'
@@ -17,7 +18,7 @@ const images = {
 }
 
 export default (props) => {
-  const { title, subtitle, icon, ratio = '470:310', iconSize = 100 } = props;
+  const { to, title, subtitle, icon, ratio = '470:310', iconSize = 100 } = props;
 
   const iconImage = useMemo(() => images[icon], [icon])
   const iconStyle = useMemo(() => ({
@@ -25,9 +26,15 @@ export default (props) => {
     height: `${iconSize}rpx`,
   }), [iconSize])
 
+  const handleClick = () => {
+    if (to) {
+      Taro.navigateTo({ url: to })
+    }
+  }
+
   return (
     <RatioItem ratio={ratio}>
-      <View className='index-menu-item'>
+      <View className='index-menu-item' onClick={handleClick}>
         <View className='index-menu-item-title'>{title}</View>
         <View className='index-menu-item-subtitle'>{subtitle}</View>
         <View className='index-menu-item-desc'>

src/pages/index/index.config.js

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

src/pages/index/index.jsx

@@ -3,8 +3,10 @@ import { View, ScrollView, Text } from '@tarojs/components'
 import Taro from '@tarojs/taro'
 import Banner from '@/components/Banner'
 import Notice from '@/components/Notice'
+import PageLoading from '@/components/PageLoading'
 import { useModel } from '@/store'
 import { getApplicationList } from '@/services/dogAPI'
+import withBasic from '@/layouts/withBasic'
 import MenuItem from './components/MenuItem'
 
 import './style.less'
@@ -17,8 +19,7 @@ const ml16 = {
   marginLeft: '16px'
 }
 
-export default (props) => {
-
+const IndexPage = (props) => {
   const { pets, cards } = useModel('userData')
   const [totalApplyNum, setTotalApplyNum] = useState(0)
 
@@ -34,16 +35,6 @@ export default (props) => {
     { text: '我是第3165656565' },
     { text: '我是第四条通知啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊' }
   ]
-  const goDogLicense = (e) => {
-    Taro.navigateTo({
-      url: '/pages/setDogLicense/index'
-    })
-  }
-  const goMain = (e) => {
-    Taro.navigateTo({
-      url: '/pages/main/index'
-    })
-  }
   
   const goNoticeList=()=>{
     Taro.navigateTo({url:'/pages/noticeList/index'})
@@ -51,14 +42,7 @@ export default (props) => {
   const goDetail=()=>{
     Taro.navigateTo({url:'/pages/noticeInfo/index'})
   }
-  const goDogLicenseList = (e) => {
-    // Taro.navigateTo({
-    //   url: '/pages/dogLicenseList/index'
-    // })
-    Taro.navigateTo({
-      url: '/pages/dogCardDetail/index'
-    })
-  }
+
   return (
     <ScrollView scrollY style={{
       height: '100vh'
@@ -70,26 +54,56 @@ export default (props) => {
         </View>
         <View className='border-card-group'>
           <View class='weui-flex'>
-            <View class='weui-flex__item' onClick={goDogLicense}>
-              <MenuItem title='办证申请' subtitle='Registration application' icon='dog'>
+            <View class='weui-flex__item'>
+              <MenuItem
+                icon='dog'
+                title='办证申请'
+                subtitle='Registration application'
+                to='/pages/setDogLicense/index?type=first'
+              >
                 <View>您有<Text>{ totalApplyNum }</Text>条办证申请记录</View>
               </MenuItem>
             </View>
-            <View class='weui-flex__item' style={ml16} onClick={goDogLicenseList}>
-              <MenuItem title='证件查看' subtitle='Certificate check' icon='certificate'>
+            <View class='weui-flex__item' style={ml16}>
+              <MenuItem
+                title='证件查看'
+                subtitle='Certificate check'
+                icon='certificate'
+                to='/pages/dogLicenseList/index'
+              >
                 <View>您有<Text>{ cards ? cards.length : 0 }</Text>条办证申请记录</View>
               </MenuItem>
             </View>
           </View>
           <View class='weui-flex' style={pt16}>
-            <View class='weui-flex__item' onClick={goMain}>
-              <MenuItem title='个人中心' subtitle='Personal center' ratio='470:452' icon='personal' />
+            <View class='weui-flex__item'>
+              <MenuItem
+                title='个人中心'
+                subtitle='Personal center'
+                ratio='470:452'
+                icon='personal'
+                to='/pages/main/index'
+              />
             </View>
-            <View class='weui-flex__item' style={ml16} onClick={goDogLicense}>
-              <MenuItem title='证件续期' subtitle='Certificate renewal' ratio='470:206' icon='renewal' iconSize={72} />
+            <View class='weui-flex__item' style={ml16}>
+              <MenuItem
+                title='证件续期'
+                subtitle='Certificate renewal'
+                ratio='470:206'
+                icon='renewal'
+                iconSize={72}
+                to='/pages/setDogLicense/index?type=renewal'
+              />
 
-              <View style={pt16} onClick={goDogLicense}>
-                <MenuItem title='证件补办' subtitle='Replacement certificate' ratio='470:206' icon='replacement' iconSize={72} />
+              <View style={pt16}>
+                <MenuItem
+                  title='证件补办'
+                  subtitle='Replacement certificate'
+                  ratio='470:206'
+                  icon='replacement'
+                  iconSize={72}
+                  to='/pages/setDogLicense/index?type=reissue'
+                />
               </View>
             </View>
           </View>
@@ -103,6 +117,4 @@ export default (props) => {
   )
 }
 
-
-
-
+export default withBasic(IndexPage, PageLoading)