update

src/features/trackSomething/components/Metric.tsx

@@ -19,6 +19,7 @@ import MetricModalAdd from "./MetricModalAdd";
 import MetricModalTime from "./MetricModalTime";
 import Modal from "@/components/layout/Modal";
 import { rpxToPx } from "@/utils/tools";
+import { AtActivityIndicator } from "taro-ui";
 
 let useNavigation;
 if (process.env.TARO_ENV == 'rn') {
@@ -213,6 +214,12 @@ export default function Component(props: any) {
     }
 
     function detail() {
+        if (!loaded){
+            return <View style={{ width: rpxToPx(750), height: rpxToPx(900), display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
+                <AtActivityIndicator size={40} color="#fff"/>
+                {/* <Tabbar index={0} /> */}
+            </View>
+        }
         return <View>
 
 

src/pages/clock/Index.tsx

@@ -153,7 +153,7 @@ export default function Page() {
         //resume timer
         pauseTimer = false
 
-        if (user.isLogin){
+        if (user.isLogin) {
             getInfo().then(res => {
                 dispatch(getInfoSuccess(res))
             }).catch(e => {
@@ -210,7 +210,7 @@ export default function Page() {
             client: {
                 client_type: process.env.TARO_ENV == 'weapp' ? 'MP' : 'APP',
                 client_version: process.env.TARO_ENV == 'weapp' ? Taro.getAccountInfoSync().miniProgram.version : '1.0',//'1.0'
-                wx_version:process.env.TARO_ENV == 'weapp' ?systemInfo.version:'_'
+                wx_version: process.env.TARO_ENV == 'weapp' ? systemInfo.version : '_'
             },
             meta: {
                 language: systemInfo.language,
@@ -454,10 +454,12 @@ export default function Page() {
 
     function render() {
         if (!loaded) {
-            return <View style={{ width: rpxToPx(750), height: rpxToPx(900), display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
-                <AtActivityIndicator size={40} color="#fff"/>
-                <Tabbar index={0} />
-            </View>
+            return <Layout type={TemplateType.customHeader} header={headerView()} title={t('page.clock.title')} titleShowStyle={NaviBarTitleShowType.scrollToShow}>
+                <View style={{ width: rpxToPx(750), height: rpxToPx(900), display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
+                    <AtActivityIndicator size={40} color="#fff" />
+                    <Tabbar index={0} />
+                </View>
+            </Layout>
         }
         return <Layout type={TemplateType.customHeader} header={headerView()} title={t('page.clock.title')} titleShowStyle={NaviBarTitleShowType.scrollToShow}>