.

src/app.js

@@ -1,29 +1,45 @@
-import { Component } from 'react'
-import Taro from '@tarojs/taro'
+import { Component } from "react";
+import Taro from "@tarojs/taro";
 // import preFetchData from '@/utils/preFetchData'
-import store, { StoreRoot } from './store'
-import './app.less'
+// import { useModel } from "@/store";
+import store, { StoreRoot } from "./store";
+import "./app.less";
 
 class App extends Component {
-
   // componentDidShow(options) {
   //   if (options.path === 'pages/index/index' && options.query?.tab === '1') {
   //   }
   // }
 
   onLaunch(options) {
-    console.group('APP Launch')
-    console.debug(options)
-    console.groupEnd()
-    
-
-    const { login } = store.getModel('person').getState()
-      Taro.login({
-        success: (res) => {
-          const { code } = res;
-          login({ code })
+    console.group("APP Launch");
+    console.debug(options);
+    console.groupEnd();
+    const { setTpls } = store.getModel("tpls").getState();
+
+    Taro.getBackgroundFetchData({
+      fetchType: "pre",
+      success(res) {
+        const { code, data } = JSON.parse(res.fetchedData) || {};
+        if (code === 1000) {
+          const { tpls } = data;
+          let Tpls=tpls.map(item=>item.appTplId)
+          Tpls=[...new Set(Tpls)]
+          setTpls(Tpls);          
         }
-      })
+      },
+      fail: (errMessage) => {
+        console.log("预拉取数据失败" + errMessage);
+      },
+    });
+
+    const { login } = store.getModel("person").getState();
+    Taro.login({
+      success: (res) => {
+        const { code } = res;
+        login({ code });
+      },
+    });
 
     // const { login } = store.getModel('person').getState()
 
@@ -49,12 +65,8 @@ class App extends Component {
 
   // this.props.children 是将要会渲染的页面
   render() {
-    return (
-      <StoreRoot>
-        {this.props.children}
-      </StoreRoot>
-    )
+    return <StoreRoot>{this.props.children}</StoreRoot>;
   }
 }
 
-export default App
+export default App;

src/components/NullCard/style.less

@@ -1,17 +1,11 @@
-.noDataCard{
-  margin: 30px;
-  box-shadow: 0px 0px 44px 0px rgba(0, 0, 0, 0.08);
-  border-radius: 40px;
-  position: relative;
-  overflow: hidden;
+.noDataCard{  
   padding: 78px;
   font-size: 34px;
-  font-weight: bold;
   color: #B4B4B4;
   text-align: center;
   .NullImg{
-    width: 220px;
-    height: 264px;
+    width: 45vw;
+    height: 54vw;
     margin-bottom: 44px;
   }
 }

src/pages/index/components/order/index.jsx

@@ -171,7 +171,7 @@ export default (props) => {
               })
           }
           {
-            isMore && <Footer />
+            jobList.length === 0 ||isMore && <Footer />
           }
         </View>
         <Popup

src/pages/index/index.jsx

@@ -24,9 +24,14 @@ export default withLayout((props) => {
   let { tab } = router.params
   const { location, setLocation, setAddress } = useModel('location')
   const { person } = useModel('person')
+  const { tpls } = useModel('tpls')
   const handleClick = (val) => {
+    Taro.requestSubscribeMessage({
+      tmplIds: tpls
+    });
+
     if (!person.phone && val != 0) {
-      Taro.navigateTo({url:`/pages/Login/index?tab=${val}`})
+      Taro.navigateTo({ url: `/pages/Login/index?tab=${val}` })
     } else {
       Taro.redirectTo({ url: `/pages/index/index?tab=${val}` });
     }
@@ -53,19 +58,19 @@ export default withLayout((props) => {
   return (
     <View className='page-index'>
       <View className='index-navbar'>
-        <CustomNav home title={(!tab||tab==0) ? '首页' : tab == 1 ? '订单列表' : '我的'} />
+        <CustomNav home title={(!tab || tab == 0) ? '首页' : tab == 1 ? '订单列表' : '我的'} />
       </View>
       <View className='index-container'>
-        {(!tab||tab==0) && <Order />}
+        {(!tab || tab == 0) && <Order />}
         {tab == 1 && <Job />}
         {tab == 2 && <User />}
       </View>
       <View className='index-tabbar'>
         <View
-          className={['tabberItem', (!tab||tab==0) ? "activeTabber" : '']}
+          className={['tabberItem', (!tab || tab == 0) ? "activeTabber" : '']}
           onClick={() => handleClick(0)}
         >
-          <Image className='tabberImg' src={(!tab||tab==0) ? indexActive : indexImg}></Image>
+          <Image className='tabberImg' src={(!tab || tab == 0) ? indexActive : indexImg}></Image>
           <View className='text'>首页</View>
         </View>
         <View

src/pages/machineryList/index.jsx

@@ -2,6 +2,7 @@ import { useEffect, useState } from "react"
 import Taro from "@tarojs/taro"
 import { View, ScrollView } from "@tarojs/components"
 import CustomNav from "@/components/CustomNav"
+import NullCard from "@/components/NullCard";
 import withLayout from '@/layouts'
 import { getMachineryList } from '@/services/machinery'
 import { useModel } from "@/store"
@@ -30,6 +31,7 @@ export default withLayout((props) => {
       <View className='index-container machineryListContent'>
         <ScrollView scrollY style={{ height: '100%' }}>
           {
+            machinery.length === 0 ? <NullCard value='您还没有农机！' /> :
             machinery?.map((item) => {
               return <MachineryCard value={item} key={item.machineryId} onClick={() => goDetail(item.machineryId)} goMap={() => goMap(item.machineryId)} />
             })

src/pages/wallet/index.jsx

@@ -3,6 +3,7 @@ import { View, ScrollView } from "@tarojs/components"
 import { useEffect, useState } from "react"
 import withLayout from '@/layouts'
 import CustomNav from "@/components/CustomNav"
+import NullCard from "@/components/NullCard";
 import WalletCard from "@/components/walletCard"
 import ListTitle from "@/components/ListTitle"
 import { getAccount, getLogList } from '@/services/account'
@@ -55,30 +56,31 @@ export default withLayout((props) => {
           <WalletCard onClick={goWithdrawal} value={balance} />
           <ListTitle value='零钱明细' />
           {
-            logList && logList.map(item => {
-              return <View key={item.accountId} className='walletCell'>
-                <View className='flexTop'>
-                  <View className='content'>
-                    {
-                      item.chargeType == 'order_pay' ?
-                        '订单收入' :
-                        item.chargeType == 'order_refund' ?
-                          '用户退款' :
-                          item.chargeType == 'withdraw' ?
-                            '提现' : ''
-                    }
-                  </View>
-                  <View className={['money', item.chargeType == 'order_pay' ? '' : 'revenue']}>
-                    {
-                      item.chargeType == 'order_pay' ?
-                        '+' + item.money / 100 :
-                        '-' + item.money / 100
-                    }
+            logList.length === 0 ? <NullCard value='暂无明细！' /> :
+              logList.map(item => {
+                return <View key={item.accountId} className='walletCell'>
+                  <View className='flexTop'>
+                    <View className='content'>
+                      {
+                        item.chargeType == 'order_pay' ?
+                          '订单收入' :
+                          item.chargeType == 'order_refund' ?
+                            '用户退款' :
+                            item.chargeType == 'withdraw' ?
+                              '提现' : ''
+                      }
+                    </View>
+                    <View className={['money', item.chargeType == 'order_pay' ? '' : 'revenue']}>
+                      {
+                        item.chargeType == 'order_pay' ?
+                          '+' + item.money / 100 :
+                          '-' + item.money / 100
+                      }
+                    </View>
                   </View>
+                  <View className='withDrawalDetail'>{item.createDate.substr(0, 16)}</View>
                 </View>
-                <View className='withDrawalDetail'>{item.createDate.substr(0, 16)}</View>
-              </View>
-            })
+              })
           }
         </ScrollView>
       </View>

src/store/index.js

@@ -2,12 +2,14 @@ import { createStore, createStoreRoot, createModelHook } from '@zjxpcyc/react-ti
 import phone from './models/phone'
 import person from './models/person'
 import location from './models/location'
+import tpls from './models/tpls'
 
 const store = createStore()
 const models = {
   phone,
   person,
-  location
+  location,
+  tpls
 }
 
 const useModel = createModelHook(store)

src/store/models/tpls.js

@@ -0,0 +1,10 @@
+import { useState } from "react";
+
+export default function usePhone() {
+  const [tpls, setTpls] = useState()
+
+  return {
+    tpls,
+    setTpls,
+  }
+}