Leon 2 years ago
parent
commit
7883637dd6

+ 129 - 129
package.json

@@ -1,131 +1,131 @@
 {
-  "name": "hola",
-  "version": "1.0.0",
-  "private": true,
-  "description": "",
-  "templateInfo": {
-    "name": "react-native",
-    "typescript": true,
-    "css": "sass"
-  },
-  "scripts": {
-    "build:weapp": "taro build --type weapp",
-    "build:swan": "taro build --type swan",
-    "build:alipay": "taro build --type alipay",
-    "build:tt": "taro build --type tt",
-    "build:h5": "taro build --type h5",
-    "build:rn": "taro build --type rn",
-    "build:qq": "taro build --type qq",
-    "build:jd": "taro build --type jd",
-    "build:quickapp": "taro build --type quickapp",
-    "dev:weapp": "npm run build:weapp -- --watch",
-    "dev:swan": "npm run build:swan -- --watch",
-    "dev:alipay": "npm run build:alipay -- --watch",
-    "dev:tt": "npm run build:tt -- --watch",
-    "dev:h5": "npm run build:h5 -- --watch",
-    "dev:rn": "npm run build:rn -- --watch --qr",
-    "dev:qq": "npm run build:qq -- --watch",
-    "dev:jd": "npm run build:jd -- --watch",
-    "dev:quickapp": "npm run build:quickapp -- --watch",
-    "android": "react-native run-android",
-    "ios": "react-native run-ios",
-    "start": "react-native start",
-    "podInstall": "pod-install",
-    "upgradePeerdeps": "install-peerdeps @tarojs/taro-rn@3.6.16 -o -Y && install-peerdeps @tarojs/components-rn@3.6.16 -o -Y && install-peerdeps @tarojs/router-rn@3.6.16 -o -Y && pod-install"
-  },
-  "browserslist": [
-    "last 3 versions",
-    "Android >= 4.1",
-    "ios >= 8"
-  ],
-  "author": "",
-  "dependencies": {
-    "@babel/runtime": "^7.7.7",
-    "@bam.tech/react-native-image-resizer": "~3.0.4",
-    "@react-native-async-storage/async-storage": "~1.17.7",
-    "@react-native-camera-roll/camera-roll": "~5.0.4",
-    "@react-native-clipboard/clipboard": "~1.11.1",
-    "@react-native-community/geolocation": "~3.0.2",
-    "@react-native-community/netinfo": "~9.3.0",
-    "@react-native-community/slider": "~4.3.2",
-    "@react-native-masked-view/masked-view": "~0.2.7",
-    "@react-native-picker/picker": "~2.4.2",
-    "@react-navigation/bottom-tabs": "^6.5.10",
-    "@react-navigation/native": "^6.1.9",
-    "@react-navigation/stack": "^6.3.19",
-    "@reduxjs/toolkit": "^1.9.7",
-    "@tarojs/components": "3.6.16",
-    "@tarojs/helper": "3.6.16",
-    "@tarojs/plugin-framework-react": "3.6.16",
-    "@tarojs/plugin-platform-alipay": "3.6.16",
-    "@tarojs/plugin-platform-h5": "3.6.16",
-    "@tarojs/plugin-platform-jd": "3.6.16",
-    "@tarojs/plugin-platform-qq": "3.6.16",
-    "@tarojs/plugin-platform-swan": "3.6.16",
-    "@tarojs/plugin-platform-tt": "3.6.16",
-    "@tarojs/plugin-platform-weapp": "3.6.16",
-    "@tarojs/react": "3.6.16",
-    "@tarojs/rn-supporter": "3.6.16",
-    "@tarojs/runtime": "3.6.16",
-    "@tarojs/runtime-rn": "3.6.16",
-    "@tarojs/shared": "3.6.16",
-    "@tarojs/taro": "3.6.16",
-    "@tarojs/taro-rn": "3.6.16",
-    "@xstate/react": "^3.2.2",
-    "expo": "~47.0.3",
-    "expo-av": "~13.0.0",
-    "expo-barcode-scanner": "~12.0.0",
-    "expo-brightness": "~11.0.0",
-    "expo-camera": "~13.0.0",
-    "expo-file-system": "~15.1.1",
-    "expo-image-picker": "~14.0.0",
-    "expo-keep-awake": "~11.0.1",
-    "expo-location": "~15.0.1",
-    "expo-sensors": "~12.0.1",
-    "i18next": "^23.5.1",
-    "i18next-browser-languagedetector": "^7.1.0",
-    "react": "^18.1.0",
-    "react-dom": "^18.1.0",
-    "react-i18next": "^13.2.2",
-    "react-native": "^0.70.1",
-    "react-native-device-info": "~10.3.0",
-    "react-native-gesture-handler": "~2.9.0",
-    "react-native-pager-view": "~6.0.1",
-    "react-native-safe-area-context": "~4.4.1",
-    "react-native-screens": "^3.18.2",
-    "react-native-svg": "~13.7.0",
-    "react-native-syan-image-picker": "0.5.3",
-    "react-native-webview": "~11.23.0",
-    "react-redux": "^8.1.3",
-    "taro-ui": "^3.1.1",
-    "xstate": "^4.38.2"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.12.9",
-    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.5",
-    "@tarojs/cli": "3.6.16",
-    "@tarojs/rn-runner": "3.6.16",
-    "@tarojs/taro-loader": "3.6.16",
-    "@tarojs/webpack5-runner": "3.6.16",
-    "@types/node": "^18.15.11",
-    "@types/react": "^18.0.0",
-    "@types/react-native": "^0.69.8",
-    "@types/webpack-env": "^1.13.6",
-    "@typescript-eslint/eslint-plugin": "^5.20.0",
-    "@typescript-eslint/parser": "^5.20.0",
-    "babel-preset-taro": "3.6.16",
-    "eslint": "^8.12.0",
-    "eslint-config-taro": "3.6.16",
-    "eslint-plugin-import": "^2.12.0",
-    "eslint-plugin-react": "^7.8.2",
-    "eslint-plugin-react-hooks": "^4.2.0",
-    "install-peerdeps": "^3.0.3",
-    "pod-install": "^0.1.23",
-    "postcss": "^8.4.18",
-    "react-refresh": "^0.11.0",
-    "stylelint": "9.3.0",
-    "ts-node": "^10.9.1",
-    "typescript": "^4.1.0",
-    "webpack": "^5.78.0"
-  }
+	"name": "hola",
+	"version": "1.0.0",
+	"private": true,
+	"description": "",
+	"templateInfo": {
+		"name": "react-native",
+		"typescript": true,
+		"css": "sass"
+	},
+	"scripts": {
+		"build:weapp": "taro build --type weapp",
+		"build:swan": "taro build --type swan",
+		"build:alipay": "taro build --type alipay",
+		"build:tt": "taro build --type tt",
+		"build:h5": "taro build --type h5",
+		"build:rn": "taro build --type rn",
+		"build:qq": "taro build --type qq",
+		"build:jd": "taro build --type jd",
+		"build:quickapp": "taro build --type quickapp",
+		"dev:weapp": "npm run build:weapp -- --watch",
+		"dev:swan": "npm run build:swan -- --watch",
+		"dev:alipay": "npm run build:alipay -- --watch",
+		"dev:tt": "npm run build:tt -- --watch",
+		"dev:h5": "npm run build:h5 -- --watch",
+		"dev:rn": "npm run build:rn -- --watch --qr",
+		"dev:qq": "npm run build:qq -- --watch",
+		"dev:jd": "npm run build:jd -- --watch",
+		"dev:quickapp": "npm run build:quickapp -- --watch",
+		"android": "react-native run-android",
+		"ios": "react-native run-ios",
+		"start": "react-native start",
+		"podInstall": "pod-install",
+		"upgradePeerdeps": "install-peerdeps @tarojs/taro-rn@3.6.16 -o -Y && install-peerdeps @tarojs/components-rn@3.6.16 -o -Y && install-peerdeps @tarojs/router-rn@3.6.16 -o -Y && pod-install"
+	},
+	"browserslist": [
+		"last 3 versions",
+		"Android >= 4.1",
+		"ios >= 8"
+	],
+	"author": "",
+	"dependencies": {
+		"@babel/runtime": "^7.7.7",
+		"@bam.tech/react-native-image-resizer": "~3.0.4",
+		"@react-native-async-storage/async-storage": "~1.17.7",
+		"@react-native-camera-roll/camera-roll": "~5.0.4",
+		"@react-native-clipboard/clipboard": "~1.11.1",
+		"@react-native-community/geolocation": "~3.0.2",
+		"@react-native-community/netinfo": "~9.3.0",
+		"@react-native-community/slider": "~4.3.2",
+		"@react-native-masked-view/masked-view": "~0.2.7",
+		"@react-native-picker/picker": "~2.4.2",
+		"@react-navigation/bottom-tabs": "^6.5.10",
+		"@react-navigation/native": "^6.1.9",
+		"@react-navigation/stack": "^6.3.19",
+		"@reduxjs/toolkit": "^1.9.7",
+		"@tarojs/components": "3.6.19",
+		"@tarojs/helper": "3.6.19",
+		"@tarojs/plugin-framework-react": "3.6.19",
+		"@tarojs/plugin-platform-alipay": "3.6.19",
+		"@tarojs/plugin-platform-h5": "3.6.19",
+		"@tarojs/plugin-platform-jd": "3.6.19",
+		"@tarojs/plugin-platform-qq": "3.6.19",
+		"@tarojs/plugin-platform-swan": "3.6.19",
+		"@tarojs/plugin-platform-tt": "3.6.19",
+		"@tarojs/plugin-platform-weapp": "3.6.19",
+		"@tarojs/react": "3.6.19",
+		"@tarojs/rn-supporter": "3.6.19",
+		"@tarojs/runtime": "3.6.19",
+		"@tarojs/runtime-rn": "3.6.19",
+		"@tarojs/shared": "3.6.19",
+		"@tarojs/taro": "3.6.19",
+		"@tarojs/taro-rn": "3.6.19",
+		"@xstate/react": "^3.2.2",
+		"expo": "~47.0.3",
+		"expo-av": "~13.0.0",
+		"expo-barcode-scanner": "~12.0.0",
+		"expo-brightness": "~11.0.0",
+		"expo-camera": "~13.0.0",
+		"expo-file-system": "~15.1.1",
+		"expo-image-picker": "~14.0.0",
+		"expo-keep-awake": "~11.0.1",
+		"expo-location": "~15.0.1",
+		"expo-sensors": "~12.0.1",
+		"i18next": "^23.5.1",
+		"i18next-browser-languagedetector": "^7.1.0",
+		"react": "^18.1.0",
+		"react-dom": "^18.1.0",
+		"react-i18next": "^13.2.2",
+		"react-native": "^0.70.1",
+		"react-native-device-info": "~10.3.0",
+		"react-native-gesture-handler": "~2.9.0",
+		"react-native-pager-view": "~6.0.1",
+		"react-native-safe-area-context": "~4.4.1",
+		"react-native-screens": "^3.18.2",
+		"react-native-svg": "~13.7.0",
+		"react-native-syan-image-picker": "0.5.3",
+		"react-native-webview": "~11.23.0",
+		"react-redux": "^8.1.3",
+		"taro-ui": "^3.1.1",
+		"xstate": "^4.38.2"
+	},
+	"devDependencies": {
+		"@babel/core": "^7.12.9",
+		"@pmmmwh/react-refresh-webpack-plugin": "^0.5.5",
+		"@tarojs/cli": "3.6.19",
+		"@tarojs/rn-runner": "3.6.19",
+		"@tarojs/taro-loader": "3.6.19",
+		"@tarojs/webpack5-runner": "3.6.19",
+		"@types/node": "^18.15.11",
+		"@types/react": "^18.0.0",
+		"@types/react-native": "^0.69.8",
+		"@types/webpack-env": "^1.13.6",
+		"@typescript-eslint/eslint-plugin": "^5.20.0",
+		"@typescript-eslint/parser": "^5.20.0",
+		"babel-preset-taro": "3.6.19",
+		"eslint": "^8.12.0",
+		"eslint-config-taro": "3.6.19",
+		"eslint-plugin-import": "^2.12.0",
+		"eslint-plugin-react": "^7.8.2",
+		"eslint-plugin-react-hooks": "^4.2.0",
+		"install-peerdeps": "^3.0.3",
+		"pod-install": "^0.1.23",
+		"postcss": "^8.4.18",
+		"react-refresh": "^0.11.0",
+		"stylelint": "9.3.0",
+		"ts-node": "^10.9.1",
+		"typescript": "^4.1.0",
+		"webpack": "^5.78.0"
+	}
 }

BIN
src/assets/images/tooltip_add_to_mine.png


+ 3 - 2
src/components/layout/Modal.tsx

@@ -1,4 +1,4 @@
-import { View, Text, CoverView } from '@tarojs/components'
+import { View, Text, ScrollView } from '@tarojs/components'
 import './Modal.scss'
 import React from 'react';
 import { ModalType } from '@/utils/types';
@@ -11,7 +11,8 @@ export default function Modal(props: {
     title?: string, dismiss: Function,
     confirm: Function,
     themeColor?: string,
-    modalType?: ModalType
+    modalType?: ModalType,
+    cancelCatchMove?: boolean
 }) {
 
     //阻止中间内容点击事件穿透

+ 1 - 1
src/components/view/Timeline.scss

@@ -2,7 +2,7 @@
   display: flex;
   flex-direction: column;
   color: #fff;
-  max-height: 70vh;
+  // max-height: 70vh;
   overflow-y: scroll;
   letter-spacing: 0.05em;
   z-index: 100000000;

+ 2 - 2
src/components/view/Timeline.tsx

@@ -5,8 +5,8 @@ import { IconRadio, IconRadioCheck, IconRadioCross } from '../basic/Icons'
 
 
 export default function Component(props: { items: any[], title?: string, type?: TimelineType, showLastLine?: boolean }) {
-    return <View className="timeline" catchMove>
-        <View>
+    return <View className="timeline">
+        <View style={{position:'relative'}}>
             {
                 props.title && <Text className='timeline_title'>{props.title}</Text>
             }

+ 14 - 12
src/components/view/Tooltip.scss

@@ -1,16 +1,16 @@
 .tip_bg {
     z-index: 1000;
-    display: flex;
-    flex-direction: row;
-    height: 76px;
-    border-radius: 38px;
-    background-color: #787878;
-    padding-left: 28px;
-    padding-right: 28px;
-    align-items: center;
+    // display: flex;
+    // flex-direction: row;
+    // height: 76px;
+    // border-radius: 38px;
+    // background-color: #787878;
+    // padding-left: 28px;
+    // padding-right: 28px;
+    // align-items: center;
     position: fixed;
     right: 20px;
-    top: 20px;
+    top: 0px;
 
 }
 
@@ -42,7 +42,9 @@
 }
 
 .tip_close {
-    padding: 5px;
-    width: 37px;
-    height: 37px;
+    width: 364px;
+    height: 100px;
+    // padding: 5px;
+    // width: 37px;
+    // height: 37px;
 }

+ 4 - 3
src/components/view/Tooltip.tsx

@@ -2,11 +2,12 @@ import { View, Text, Image } from "@tarojs/components";
 import './Tooltip.scss'
 export default function Component(props: { title: string, closeTip: Function }) {
     return (
-        <View className="tip_bg">
-            <View className="arrow"/>
+        <View className="tip_bg" >
+            <Image className="tip_close" src={require('@/assets/images/tooltip_add_to_mine.png')} onClick={() => {props.closeTip()}} />
+            {/* <View className="arrow"/>
             <Image className="tip_more" src={require('@assets/images/more.png')} />
             <Text className="tip_text">{props.title}</Text>
-            <Image className="tip_close" src={require('@/assets/images/close.png')} onClick={() => {props.closeTip()}} />
+            <Image className="tip_close" src={require('@/assets/images/close.png')} onClick={() => {props.closeTip()}} /> */}
         </View>
     )
 }

+ 35 - 15
src/features/trackSomething/components/ActivityHistory.tsx

@@ -1,4 +1,4 @@
-import { View, Text, Image } from "@tarojs/components";
+import { View, Text, Image, ScrollView } from "@tarojs/components";
 import './MetricHistory.scss'
 import RecordItem from "@/features/common/RecordItem";
 import { deleteActivityRecord } from "@/services/trackSomething";
@@ -12,11 +12,14 @@ import './ActivityHistory.scss'
 import CenterContentTitleModal from "@/features/common/CenterContentTitleModal";
 import { useRouter } from "@tarojs/taro";
 import { useTranslation } from "react-i18next";
+import Taro from "@tarojs/taro";
 
 export default function Component(props: { records: any[] }) {
     const user = useSelector((state: any) => state.user);
     const [list, setList] = useState(props.records)
-    const {t} = useTranslation()
+    const [showModal, setShowModal] = useState(false)
+    const [modalItem, setModalItem] = useState(null)
+    const { t } = useTranslation()
     const router = useRouter();
     useEffect(() => {
         setList(props.records)
@@ -66,41 +69,49 @@ export default function Component(props: { records: any[] }) {
         console.log(item)
         var timelineItems: any = [];
         for (var i = item.records.length - 1; i > 0; i--) {
-            var type = item.records[i].type == 'total' ? t('feature.track_something.activity.total') : 
-            item.records[i].type == 'sync' ? t('feature.track_something.activity.sync') : t('feature.track_something.activity.check')
+            var type = item.records[i].type == 'total' ? t('feature.track_something.activity.total') :
+                item.records[i].type == 'sync' ? t('feature.track_something.activity.sync') : t('feature.track_something.activity.check')
             timelineItems.push(
                 {
                     status: 'done',
                     title: type + item.records[i].items[0].value + '步',
                     content: TimeFormatter.timelineFormatTime(item.records[i].timestamp),
                     date: TimeFormatter.dateDescription(item.records[i].timestamp),
-                    color: item.records[i].type == 'sync' ?'#fff':router.params.themeColor
+                    color: item.records[i].type == 'sync' ? '#fff' : router.params.themeColor
                 }
             )
         }
         return <View style={{ display: 'flex', flexDirection: 'column' }}>
             <Text className="box_title">{t('feature.track_something.activity.pop_title')}</Text>
             <Text className="box_subtitle">{TimeFormatter.getMonthAndDayByDate(item.date)}</Text>
-            <View style={{display:'flex',alignItems:'center',position:'relative',width:'100%',flexDirection:'column'}}>
-                <Timeline items={timelineItems} type={TimelineType.timeFirst} showLastLine={TimeFormatter.getMonthAndDayByDate(item.date)=='今天'}/>
-            </View>
+            <ScrollView style={{ maxHeight: 400 }} scrollY>
+                <View style={{ display: 'flex', alignItems: 'center', position: 'relative', width: '100%', flexDirection: 'column' }}>
+
+                    <Timeline items={timelineItems} type={TimelineType.timeFirst} showLastLine={TimeFormatter.getMonthAndDayByDate(item.date) == '今天'} />
+
+                </View>
+            </ScrollView>
 
         </View>
 
     }
 
     function showDetail(item) {
-        var node = (<Modal children={schedules(item)}
-            modalType={ModalType.center}
-            dismiss={() => {
-                global.showModal(false, null)
-            }}
-            confirm={() => { }} />);
-        global.showModal(true, node);
+        setModalItem(item)
+        setShowModal(true)
+        // var node = (<Modal children={schedules(item)}
+        //     modalType={ModalType.center}
+        //     cancelCatchMove={true}
+        //     dismiss={() => {
+        //         global.showModal(false, null)
+        //     }}
+        //     confirm={() => { }} />);
+        // global.showModal(true, node);
     }
     var lastYearStr = '2023年'
 
     return <View style={{ display: 'flex', flexDirection: 'column' }}>
+
         {
             user.test_user && <Text style={{ color: '#fff', position: 'absolute', right: 50, top: 0 }} onClick={() => global.clearHistory()}>删除全部</Text>
         }
@@ -127,5 +138,14 @@ export default function Component(props: { records: any[] }) {
                 </View>
             })
         }
+        {
+            showModal && <Modal children={schedules(modalItem)}
+                modalType={ModalType.center}
+                cancelCatchMove={true}
+                dismiss={() => {
+                    setShowModal(false)
+                }}
+                confirm={() => { }} />
+        }
     </View>
 }

+ 43 - 37
src/features/trackTimeDuration/components/Clock.tsx

@@ -14,12 +14,19 @@ export default function Component(props: { showCoverView: boolean }) {
     const user = useSelector((state: any) => state.user);
     const [showCover, setShowCover] = useState(props.showCoverView)
 
+    const [smallCtx, setSmallCtx] = useState(null)
+    const [bigCtx, setBigCtx] = useState(null)
+
     useEffect(() => {
         if (!user.isLogin) {
             setCheckData(null)
         }
     }, [user.isLogin])
 
+    // useEffect(()=>{
+    //     setCheckData(time)
+    // },[time.status,time.scenario])
+
     useEffect(() => {
         if (machine.context.checkData) {
             setCheckData(machine.context.checkData as any);
@@ -47,7 +54,7 @@ export default function Component(props: { showCoverView: boolean }) {
         var bgRing = getBgRing()
         if (!checkData) {
             var currentDot1 = getDot(null, true)
-            return <Rings common={common} bgRing={bgRing} currentDot={currentDot1} canvasId='clock0' />
+            return <Rings common={common} bgRing={bgRing} currentDot={currentDot1} canvasId={new Date().getTime()} />
         }
         var current_record = (checkData as any).current_record
         var currentDot1 = getDot((checkData as any).current_record, true)
@@ -59,22 +66,30 @@ export default function Component(props: { showCoverView: boolean }) {
 
         // console.log(targetBigRing1.color)
 
+        var realRing1;
         if (current_record.status == 'ONGOING') {
-            var realRing1 = getReal((checkData as any).current_record, true, false)
+            realRing1 = getReal((checkData as any).current_record, true, false)
 
-            return <Rings common={common} bgRing={bgRing} currentDot={currentDot1} realRing={realRing1} targetRing={targetBigRing1} canvasId='clock1' />
-        }
-        if (current_record.status == 'WAIT_FOR_START') {
-            return <Rings common={common} bgRing={bgRing} currentDot={currentDot1} canvasId='clock2' />
+            // return <Rings common={common} bgRing={bgRing} currentDot={currentDot1} realRing={realRing1} targetRing={targetBigRing1} canvasId='clock1' />
         }
+        // if (current_record.status == 'WAIT_FOR_START') {
+        //     return <Rings common={common} bgRing={bgRing} currentDot={currentDot1} canvasId='clock2' />
+        // }
+
+        realRing1 = getReal((checkData as any).current_record, true, false)
+        // return <Rings common={common} bgRing={bgRing} realRing={realRing1} currentDot={currentDot1} targetRing={targetBigRing1} canvasId='clock3' />
 
-        var realRing1 = getReal((checkData as any).current_record, true, false)
-        return <Rings common={common} bgRing={bgRing} realRing={realRing1} currentDot={currentDot1} targetRing={targetBigRing1} canvasId='clock3' />
+
+        return <Rings common={common} bgRing={bgRing} currentDot={currentDot1}
+            targetRing={current_record.status == 'WAIT_FOR_START' ? null : targetBigRing1} 
+            realRing={current_record.status == 'WAIT_FOR_START' ? null : realRing1}
+            canvasId='clockBig' />
     }
 
 
     //内环
     function smallRing() {
+        if (!checkData) return null
         var current_record = (checkData as any).current_record
         if (current_record.scenario == 'FAST_SLEEP') {
             var common = getCommon(null, false)
@@ -85,21 +100,26 @@ export default function Component(props: { showCoverView: boolean }) {
             var currentDot = getDot((checkData as any).current_record, false)
             var targetRing = getTarget((checkData as any).current_record, false)
             targetRing.color = global.sleepColor ? global.sleepColor + '66' : ColorType.sleep + '66'//'rgba(0, 255, 255, 0.4)'
-            if (current_record.status == 'ONGOING2') {
-                return <Rings common={common} bgRing={bgRing} realRing={realRing} currentDot={currentDot} targetRing={targetRing} canvasId='clock7' />
-            }
+            // if (current_record.status == 'ONGOING2') {
+            //     return <Rings common={common} bgRing={bgRing} realRing={realRing} currentDot={currentDot} targetRing={targetRing} canvasId='clock7' />
+            // }
 
             //ongoing3时,睡眠点整理亮度降低
             if (current_record.status == 'ONGOING3') {
                 currentDot.color = global.sleepColor ? global.sleepColor + '66' : ColorType.sleep + '66'
             }
-            return <Rings common={common} bgRing={bgRing} currentDot={currentDot} canvasId='clock8' />
+            // return <Rings common={common} bgRing={bgRing} currentDot={currentDot} canvasId='clock8' />
+
+            return <Rings common={common} bgRing={bgRing} currentDot={currentDot}
+                realRing={current_record.status == 'ONGOING2' ? realRing : null}
+                targetRing={current_record.status == 'ONGOING2' ? targetRing : null}
+                canvasId='clockSmall' ctx={smallCtx} setCtx={setSmallCtx} />
         }
         return null;
     }
 
-    function tapCover(){
-        if (user.isLogin){
+    function tapCover() {
+        if (user.isLogin) {
 
         }
         else {
@@ -107,23 +127,6 @@ export default function Component(props: { showCoverView: boolean }) {
         }
     }
 
-    if (!checkData)
-        return <View style={{ display: 'flex', flexDirection: 'column', alignItems: 'center', width: '100%',  position: 'relative', pointerEvents: 'none' }}>
-            {
-                bigRing()
-            }
-            <View style={{ display: 'flex', position: 'absolute', left: 0, right: 0, top: 0, bottom: 0, alignItems: 'center', justifyContent: 'center' }}>
-                {
-                    <Text className="clock_text" style={{ fontSize: 24, color: ColorType.fast }}>{TimeFormatter.getCurrentHourAndMinute()}</Text>
-                }
-            </View>
-            {
-                showCover && <CoverView onClick={tapCover} style={{
-                    display: 'flex', position: 'absolute',
-                    left: 0, right: 0, top: 0, bottom: 0, backgroundColor: 'transparent'
-                }} />
-            }
-        </View>
     return (
         <View style={{ display: 'flex', flexDirection: 'column', alignItems: 'center', width: '100%', pointerEvents: 'none' }}>
             <View style={{ position: 'relative', zIndex: 1 }}>
@@ -137,27 +140,30 @@ export default function Component(props: { showCoverView: boolean }) {
                 </View>
                 <View style={{ display: 'flex', position: 'absolute', left: 0, right: 0, top: 0, bottom: 0, alignItems: 'center', justifyContent: 'center' }}>
                     {
-                        (checkData as any).current_record.status == 'WAIT_FOR_START' && time.scenario == 'FAST_SLEEP' &&
+                        !checkData && <Text className="clock_text" style={{ fontSize: 24, color: ColorType.fast }}>{TimeFormatter.getCurrentHourAndMinute()}</Text>
+                    }
+                    {
+                        checkData && (checkData as any).current_record.status == 'WAIT_FOR_START' && time.scenario == 'FAST_SLEEP' &&
                         <Text className="clock_text fast_sleep_text" style={{ fontSize: 24 }}>{TimeFormatter.getCurrentHourAndMinute()}</Text>
                     }
                     {
-                        (checkData as any).current_record.status == 'WAIT_FOR_START' && time.scenario != 'FAST_SLEEP' &&
+                        checkData && (checkData as any).current_record.status == 'WAIT_FOR_START' && time.scenario != 'FAST_SLEEP' &&
                         <Text className="clock_text" style={{ color: time.scenario == 'FAST' ? ColorType.fast : ColorType.sleep, fontSize: 24 }}>{TimeFormatter.getCurrentHourAndMinute()}</Text>
                     }
                     {
-                        (checkData as any).current_record.status == 'ONGOING' && <Text className="clock_text" style={{ color: (checkData as any).current_record.scenario == 'FAST' ? global.fastColor ? global.fastColor : ColorType.fast : global.sleepColor ? global.sleepColor : ColorType.sleep, fontSize: 32 }}>
+                        checkData && (checkData as any).current_record.status == 'ONGOING' && <Text className="clock_text" style={{ color: (checkData as any).current_record.scenario == 'FAST' ? global.fastColor ? global.fastColor : ColorType.fast : global.sleepColor ? global.sleepColor : ColorType.sleep, fontSize: 32 }}>
                             {TimeFormatter.formateTimeNow((checkData as any).current_record.fast ?
                                 (checkData as any).current_record.fast.real_start_time :
                                 (checkData as any).current_record.sleep.real_start_time)}
                         </Text>
                     }
                     {
-                        (checkData as any).current_record.status == 'ONGOING1' && <Text className="clock_text" style={{ color: global.fastColor ? global.fastColor : ColorType.fast, fontSize: 32 }}>
+                        checkData && (checkData as any).current_record.status == 'ONGOING1' && <Text className="clock_text" style={{ color: global.fastColor ? global.fastColor : ColorType.fast, fontSize: 32 }}>
                             {TimeFormatter.formateTimeNow((checkData as any).current_record.fast.real_start_time)}
                         </Text>
                     }
                     {
-                        (checkData as any).current_record.status == 'ONGOING2' && <View style={{ flexDirection: 'column', display: 'flex' }}>
+                        checkData && (checkData as any).current_record.status == 'ONGOING2' && <View style={{ flexDirection: 'column', display: 'flex' }}>
                             <Text className="clock_text" style={{ color: global.fastColor ? global.fastColor : global.fastColor ? global.fastColor : ColorType.fast, fontSize: 32 }}>
                                 {TimeFormatter.formateTimeNow((checkData as any).current_record.fast.real_start_time)}
                             </Text>
@@ -167,7 +173,7 @@ export default function Component(props: { showCoverView: boolean }) {
                         </View>
                     }
                     {
-                        (checkData as any).current_record.status == 'ONGOING3' && <Text>
+                        checkData && (checkData as any).current_record.status == 'ONGOING3' && <Text>
                             <Text className="clock_text" style={{ color: global.fastColor ? global.fastColor : ColorType.fast, fontSize: 32 }}>
                                 {TimeFormatter.formateTimeNow((checkData as any).current_record.fast.real_start_time)}
                             </Text>

+ 18 - 6
src/features/trackTimeDuration/components/Rings.weapp.tsx

@@ -2,6 +2,7 @@ import { Canvas } from "@tarojs/components";
 import Taro from "@tarojs/taro";
 import { useDidShow, useReady } from "@tarojs/taro";
 import { useEffect, useRef, useState } from "react";
+import { useSelector } from "react-redux";
 
 export type RingCommon = {
     useCase: string;
@@ -38,9 +39,8 @@ export default function Rings(props: {
     realRing?: RealRing; targetRing?: TargetRing; 
     breathAnimation?:boolean;
     bgRing: BgRing; canvasId?: string;
+    ctx?:any;setCtx?:any;
 }) {
-    const [context,setContext] = useState(null)
-    const [canvas,setCanvas] = useState(null)
     const r = props.common.radius
     const strokeWidth = props.common.lineWidth;
     // const color = props.color || 'orange'
@@ -49,7 +49,11 @@ export default function Rings(props: {
     const dpr = Taro.getSystemInfoSync().pixelRatio; // 获取设备的像素比
     const radius = r; // 圆形进度条的半径
     const lineWidth = strokeWidth; // 圆形进度条的线宽
+    const time = useSelector((state: any) => state.time);
 
+    useEffect (()=>{
+        drawCircle()
+    },[time.status,time.scenario])
     
 
     useEffect(()=>{
@@ -107,10 +111,15 @@ export default function Rings(props: {
             _canvas.height = res[0].height * dpr;
             const ctx = _canvas.getContext('2d');
 
-            setCanvas(_canvas)
-            setContext(ctx)
+            if (props.setCtx){
+                props.setCtx(ctx)
+            }
+            // setCanvas(_canvas)
+            // setContext(ctx)
             // const ctx = Taro.createCanvasContext(canvasId);
             drawContent(ctx)
+
+
         });
     }
 
@@ -179,8 +188,11 @@ export default function Rings(props: {
     }
 
     useEffect(() => {
-        drawCircle()
-    }, [props.targetRing, props.currentDot,props.realRing]);
+
+            drawCircle()
+        
+    }, [props.targetRing, props.currentDot,props.realRing,props.canvasId]);
+    // console.log('b',canvasId)
     return <Canvas canvasId={canvasId}  id={canvasId} className={canvasId} type="2d" style={{ width: (radius * 2 + lineWidth)+6, height: (radius * 2 + lineWidth)+6, zIndex: 0 }} ref={canvasRef} />
 
 }

+ 12 - 1
src/pages/clock/Clock.weapp.tsx

@@ -77,6 +77,7 @@ export default function IndexPage() {
   const [showSingleFastEnd, setShowSingleFastEnd] = useState(false)
   const [consoleStatus, setConsoleStatus] = useState(consoleData.status)
   const [showLogin, setShowLogin] = useState(false)
+  const [showTip,setShowTip] = useState(false)
 
   let navigation;
   if (useNavigation) {
@@ -428,13 +429,23 @@ export default function IndexPage() {
     </View>
   }
 
+  usePageScroll((e) => {
+        if (e.scrollTop > 70) {
+          setShowTip(true)
+        }
+        else {
+          setShowTip(false)
+        }
+    
+})
+
 
   function detail() {
     return (
       <Layout type={TemplateType.customHeader} header={headerView()} title={t('page.clock.title')} titleShowStyle={NaviBarTitleShowType.scrollToShow}>
         <View style={{ flex: 1, flexDirection: 'column', display: 'flex', backgroundColor: '#000', color: '#fff' }}>
           {
-            needShowAddTip && <Tooltip title="添加到我的小程序" closeTip={() => { setNeedShowAddTip(false) }} />
+            needShowAddTip && showTip && <Tooltip title="添加到我的小程序" closeTip={() => { setNeedShowAddTip(false) }} />
           }
           {/* <View style={{ width: '100%', height: 400, backgroundColor: 'gray' }}></View> */}
 

+ 2 - 1
src/pages/common/RecordsHistory.config.ts

@@ -1,5 +1,6 @@
 export default definePageConfig({
     "disableScroll": false,
     "navigationBarTitleText":"",
-    "enablePullDownRefresh":true
+    "enablePullDownRefresh":true,
+    // "enablePageMeta":true
 })

+ 4 - 1
src/pages/common/RecordsHistory.tsx

@@ -1,5 +1,5 @@
 import { clearTimeRecords, getClockRecords } from "@/services/trackTimeDuration";
-import { View, Text, ScrollView } from "@tarojs/components";
+import { View, Text, ScrollView, PageMeta, NavigationBar } from "@tarojs/components";
 import { usePullDownRefresh, useReachBottom, useReady, useRouter } from "@tarojs/taro";
 import { useEffect, useState } from "react";
 import Schedule from '@/features/trackTimeDuration/components/Schedule'
@@ -247,6 +247,9 @@ export default function Page() {
     }
 
     return <View style={{ position: 'relative' }}>
+        {/* <PageMeta pageStyle='overflow:hidden'>
+            <NavigationBar frontColor='#ffffff' backgroundColor="#000000"/>
+        </PageMeta> */}
         <Layout children={showErrorPage ? <NoData refresh={() => { refresh() }} /> : detail()}
             // title={router.params.title}
             isFastSleepTheme={router.params.type=='time'}

+ 298 - 290
yarn.lock

@@ -2519,24 +2519,24 @@
   dependencies:
     defer-to-connect "^1.0.1"
 
-"@tarojs/api@3.6.16":
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/@tarojs/api/-/api-3.6.16.tgz#4be1851e762c0c1e0baa6fdfd8fd07e02fe0c460"
-  integrity sha512-2vH0iQTnwGOb4UDGs2lKw6zbLXd4BmjvtjEuxLEsXBq/Bk/HY29zPuC0GcCgPPz1U15zoRA1F+mo2giCAr2dmg==
+"@tarojs/api@3.6.19":
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/@tarojs/api/-/api-3.6.19.tgz#a8e301c828c5622ed687503bd93ab80d1d114f30"
+  integrity sha512-VHVmIdKxiiukmYb5gXHEUr85GWiBdKjavdAZzhDS4SVKeq75Sk6DTbZgKUw7Yy5ExSGuE2y3hyB9zpP/PrQEBg==
   dependencies:
     "@babel/runtime" "^7.14.5"
-    "@tarojs/runtime" "3.6.16"
-    "@tarojs/shared" "3.6.16"
+    "@tarojs/runtime" "3.6.19"
+    "@tarojs/shared" "3.6.19"
 
-"@tarojs/cli@3.6.16":
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/@tarojs/cli/-/cli-3.6.16.tgz#4fb4441e7b66b0e0b4c81bf90f7593d5ea429d23"
-  integrity sha512-LtgKJudA9E33aOU1UvVqKLNIp1vV60Ec4Ny0xDcnIjk8yNMRvhPikVA9tq+Zls/7yFQw8d6crh6fCbUgM4J9Kw==
+"@tarojs/cli@3.6.19":
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/@tarojs/cli/-/cli-3.6.19.tgz#d1c6a6f175a3f2fcc4deb8d9b9130fbffe99c649"
+  integrity sha512-sZjv5VN08aj9bkM42VU36Efu/8x3C9vtwNUP9DbeZOTuYS0mEPXIhoGPraOXQcrV1iGD+rZuUmAea3Hv6w9FfA==
   dependencies:
-    "@tarojs/helper" "3.6.16"
+    "@tarojs/helper" "3.6.19"
     "@tarojs/plugin-doctor" "^0.0.11"
-    "@tarojs/service" "3.6.16"
-    "@tarojs/shared" "3.6.16"
+    "@tarojs/service" "3.6.19"
+    "@tarojs/shared" "3.6.19"
     adm-zip "^0.4.13"
     cli-highlight "^2.1.11"
     download-git-repo "^2.0.0"
@@ -2557,43 +2557,43 @@
     validate-npm-package-name "^5.0.0"
     xml2js "^0.5.0"
 
-"@tarojs/components-advanced@3.6.16":
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/@tarojs/components-advanced/-/components-advanced-3.6.16.tgz#bebba2e0e1b6b1e4e595812e39a782af3daabd27"
-  integrity sha512-zoejuu39P4LZBae9Q7LiwpRAAU7CPhqCF0hQoY1QvD/ZUEHLLNlw+ITV/OyjamHaui8jDwC7UMfVPzObaxbh1w==
+"@tarojs/components-advanced@3.6.19":
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/@tarojs/components-advanced/-/components-advanced-3.6.19.tgz#13b4459f3310561d751da5cc30ebf034584c00a0"
+  integrity sha512-R/LRsosn8Tga+k+mwI+DEdka3qx9Sirnx6mWRBCTw/6GPAo2Jk2wAW6IHwVgAPSiid+krZ6hs463FQHLnKC4SQ==
   dependencies:
-    "@tarojs/components" "3.6.16"
-    "@tarojs/runtime" "3.6.16"
-    "@tarojs/shared" "3.6.16"
-    "@tarojs/taro" "3.6.16"
+    "@tarojs/components" "3.6.19"
+    "@tarojs/runtime" "3.6.19"
+    "@tarojs/shared" "3.6.19"
+    "@tarojs/taro" "3.6.19"
     classnames "^2.2.5"
     csstype "^3.1.1"
     memoize-one "^6.0.0"
     postcss "^8.4.18"
 
-"@tarojs/components-react@3.6.16":
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/@tarojs/components-react/-/components-react-3.6.16.tgz#de300c1cd0cf3150a9955e667c29a0f30e9b2da6"
-  integrity sha512-DT3uP/bf/kyGfor45x3u2Wp4M05NqbSVAUcu5vFLi07Yw0dwmTZDf04+gIujdSah2HR+Q5VG7CaBUbLzSs/o1Q==
+"@tarojs/components-react@3.6.19":
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/@tarojs/components-react/-/components-react-3.6.19.tgz#ed57f690bae9867171d262f2d050aeec7557092a"
+  integrity sha512-nNgEOc9kq7I2fqbBJhsnhR6JqwTVVihT8It8rILLwM0XuBUdcJGUF5NVeZIDsKGd8LR/K62yC+7B8ar4dyJIBg==
   dependencies:
     "@babel/runtime" "^7.14.5"
-    "@tarojs/components" "3.6.16"
-    "@tarojs/taro" "3.6.16"
+    "@tarojs/components" "3.6.19"
+    "@tarojs/taro" "3.6.19"
     classnames "^2.2.5"
     intersection-observer "^0.7.0"
     resolve-pathname "^3.0.0"
     swiper "6.8.0"
     weui "^1.1.2"
 
-"@tarojs/components-rn@3.6.16":
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/@tarojs/components-rn/-/components-rn-3.6.16.tgz#4664797d79a8c9866a8ed99e694908d54f79a010"
-  integrity sha512-ymQcuYMXCp1nPlQRaQVZguFTuZdeyw0O/ZfSOqXyIdhfqbeMuYrx/9gZL59UT5rFvFyC9WjUUrwHy/BV9IVIAA==
+"@tarojs/components-rn@3.6.19":
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/@tarojs/components-rn/-/components-rn-3.6.19.tgz#33aec7ab3ed5e48366318ac25c0bfe9043fa2d71"
+  integrity sha512-/SLnmvtEwwrceHCIUUuGua5rHTV6nQ4DFy0k+oH6/i/xujnob7BqnTV+xeesvpSmnI7bPS+MC9SveGcEUjk2uw==
   dependencies:
     "@ant-design/react-native" "^5.0.0"
     "@react-native-community/slider" "~4.3.2"
     "@react-native-picker/picker" "~2.4.2"
-    "@tarojs/router-rn" "3.6.16"
+    "@tarojs/router-rn" "3.6.19"
     expo-av "~13.0.0"
     expo-barcode-scanner "~12.0.0"
     expo-camera "~13.0.0"
@@ -2602,15 +2602,15 @@
     react-native-pager-view "~6.0.1"
     react-native-webview "~11.23.0"
 
-"@tarojs/components@3.6.16":
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/@tarojs/components/-/components-3.6.16.tgz#4d75b82a5e1e7864d8f2181d92b7e13e595b7d2e"
-  integrity sha512-ATCTZkB7OftIQOymwo8XpNfibCXJ4KQ/V+76yy91TvFZCcgT7Tj/PyV64NDj47Axk37h0GovQO9hCblO084/0g==
+"@tarojs/components@3.6.19":
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/@tarojs/components/-/components-3.6.19.tgz#982526f028fb1e3a5b3af83d6df4a0c691790588"
+  integrity sha512-OF//IKxw6APoML78ZuM5vdGoep42DezGYl5cgk63vIoIfxAA1oXfMvfjivgD84InTCTFNo9loZAZ6Pze+BSoIw==
   dependencies:
     "@stencil/core" "^2.22.2"
-    "@tarojs/components-advanced" "3.6.16"
-    "@tarojs/router" "3.6.16"
-    "@tarojs/taro" "3.6.16"
+    "@tarojs/components-advanced" "3.6.19"
+    "@tarojs/router" "3.6.19"
+    "@tarojs/taro" "3.6.19"
     classnames "^2.2.5"
     hls.js "^1.1.5"
     intersection-observer "^0.7.0"
@@ -2618,10 +2618,10 @@
     swiper "6.8.0"
     weui "^1.1.2"
 
-"@tarojs/helper@3.6.16":
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/@tarojs/helper/-/helper-3.6.16.tgz#5726588b8de5faf8faff499e78c93f355883de70"
-  integrity sha512-1A0zQk7WbVj2Cp36DnTw4GKE8vmhY6EoqP/jJt0/SJZSLfea81brrjLXjDwXBE/5qpNE4MGE7iohB/by2bb9YA==
+"@tarojs/helper@3.6.19":
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/@tarojs/helper/-/helper-3.6.19.tgz#c4d178265d8e8c32963ec3bb097ef6c858b89a22"
+  integrity sha512-FfkXYc+577OSxhzFWUwftD11/R2rQeqCu2KtkydF1FEdB7QEACbpnwtmvXzXBVnBOAwitb+sS8olh/FkVnK6Dg==
   dependencies:
     "@babel/core" "^7.14.5"
     "@babel/parser" "^7.14.5"
@@ -2726,154 +2726,154 @@
     "@tarojs/plugin-doctor-win32-ia32-msvc" "0.0.11"
     "@tarojs/plugin-doctor-win32-x64-msvc" "0.0.11"
 
-"@tarojs/plugin-framework-react@3.6.16":
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/@tarojs/plugin-framework-react/-/plugin-framework-react-3.6.16.tgz#b5da5d8a73aba24e31900452a40045bf2e76d744"
-  integrity sha512-zlCa3qmfCCvh1ICLNJH81dnNA9zCzyqWXrd5dLDtfT9eBZEYhn8BltsSW7FZsp0KxYFpO6NwYu2BOq8Y3S5Dow==
+"@tarojs/plugin-framework-react@3.6.19":
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/@tarojs/plugin-framework-react/-/plugin-framework-react-3.6.19.tgz#20e1351247877a0fd598d98ee576636cffb4fd90"
+  integrity sha512-Z0330PnlwP/GJcjXAaSDCvs6BhornrlZBM5IYBf7Amj0nZNSfJNMR6UeWnzb6+lN4U+EMNnehUI5MnV7LELtDA==
   dependencies:
-    "@tarojs/helper" "3.6.16"
-    "@tarojs/runtime" "3.6.16"
-    "@tarojs/service" "3.6.16"
-    "@tarojs/shared" "3.6.16"
+    "@tarojs/helper" "3.6.19"
+    "@tarojs/runtime" "3.6.19"
+    "@tarojs/service" "3.6.19"
+    "@tarojs/shared" "3.6.19"
     acorn "^8.0.4"
     acorn-walk "^8.0.0"
     lodash "^4.17.21"
 
-"@tarojs/plugin-platform-alipay@3.6.16":
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/@tarojs/plugin-platform-alipay/-/plugin-platform-alipay-3.6.16.tgz#f013f64c46060c65a09fa4c277befbf83e9e1ad2"
-  integrity sha512-PXHsk4oJoTObmZpZfTzh6m+3w3x7nIWE7xbkA0WBIClRkcL6vguOQCSzG+XX8Kxou3YctXGkAmdeT4T7Oc37/Q==
-  dependencies:
-    "@tarojs/components" "3.6.16"
-    "@tarojs/service" "3.6.16"
-    "@tarojs/shared" "3.6.16"
-
-"@tarojs/plugin-platform-h5@3.6.16":
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/@tarojs/plugin-platform-h5/-/plugin-platform-h5-3.6.16.tgz#663afe2a725c6001b6773750a14295b7b7358bd7"
-  integrity sha512-/xtSKbgGL6zMXJ2QHH/RurvFbyarSHg9D1EvVFChDH5wEs3cXVa/pakJSDmr6yhamVsdO8/j2/h3c4iUx60VhQ==
-  dependencies:
-    "@tarojs/components" "3.6.16"
-    "@tarojs/components-react" "3.6.16"
-    "@tarojs/router" "3.6.16"
-    "@tarojs/service" "3.6.16"
-    "@tarojs/shared" "3.6.16"
-    "@tarojs/taro-h5" "3.6.16"
-    babel-plugin-transform-taroapi "3.6.16"
+"@tarojs/plugin-platform-alipay@3.6.19":
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/@tarojs/plugin-platform-alipay/-/plugin-platform-alipay-3.6.19.tgz#f3e889efc5157c9dd0d0e51b5593242727971e97"
+  integrity sha512-rU3ymXzCTxaurieW/VpfDIvzlWa4R5ppFbcwSzvr1DPiGhaft8rgSHHU/FN1uyq9bVVWS1ZKcFnkhe4R4cU9PQ==
+  dependencies:
+    "@tarojs/components" "3.6.19"
+    "@tarojs/service" "3.6.19"
+    "@tarojs/shared" "3.6.19"
+
+"@tarojs/plugin-platform-h5@3.6.19":
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/@tarojs/plugin-platform-h5/-/plugin-platform-h5-3.6.19.tgz#dcbcdbebe53a28c1207b1554df20c965105c9f21"
+  integrity sha512-cFVefnceqlGm3l3ID6b+ZU4wMKp85HLSM/7RunZR2IPNfARL7o5HZxbeglih0rHmXzngb9Sw/+CqCJQaLTgk4w==
+  dependencies:
+    "@tarojs/components" "3.6.19"
+    "@tarojs/components-react" "3.6.19"
+    "@tarojs/router" "3.6.19"
+    "@tarojs/service" "3.6.19"
+    "@tarojs/shared" "3.6.19"
+    "@tarojs/taro-h5" "3.6.19"
+    babel-plugin-transform-taroapi "3.6.19"
     change-case "^4.1.2"
     lodash-es "4.17.21"
     resolve "^1.22.0"
 
-"@tarojs/plugin-platform-jd@3.6.16":
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/@tarojs/plugin-platform-jd/-/plugin-platform-jd-3.6.16.tgz#4940479903905cc5cfcec56b2c0c805bf8eb91bb"
-  integrity sha512-snizhiAhAkOZw35k8p8X1qFqtN+Xj2w9U1MbykpKZv9gt49qWU49Wnkn+F8peizl8Z79I4ptqF/T/uWpesT8qw==
-  dependencies:
-    "@tarojs/service" "3.6.16"
-    "@tarojs/shared" "3.6.16"
-
-"@tarojs/plugin-platform-qq@3.6.16":
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/@tarojs/plugin-platform-qq/-/plugin-platform-qq-3.6.16.tgz#d710a67d4206b82874bd8371278de67e3c1836ac"
-  integrity sha512-1nz0BaV7IfNho6Ipwc6DcjQTZ/uHhn8X8RptWhX2hq9vu0DMoGH6rP7Icqo0iyVTxsuiijUrgRd2PJigrmjzZA==
-  dependencies:
-    "@tarojs/plugin-platform-weapp" "3.6.16"
-    "@tarojs/service" "3.6.16"
-    "@tarojs/shared" "3.6.16"
-
-"@tarojs/plugin-platform-swan@3.6.16":
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/@tarojs/plugin-platform-swan/-/plugin-platform-swan-3.6.16.tgz#e0259c317236bca9aeccadb65174fdb2f8bf9bc9"
-  integrity sha512-oeSssPv5Se9Vo6CVzd1Vdab/f0Ezq9uH1Y/f2kTIXvWfdycz68ZwgmpCqSwNl39TfQc28tpjl8liS0wyWhrB+g==
-  dependencies:
-    "@tarojs/components" "3.6.16"
-    "@tarojs/service" "3.6.16"
-    "@tarojs/shared" "3.6.16"
-
-"@tarojs/plugin-platform-tt@3.6.16":
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/@tarojs/plugin-platform-tt/-/plugin-platform-tt-3.6.16.tgz#c278f2001810d9b6a9e157b3dc363b7c2c87611e"
-  integrity sha512-m981kyw3kSNs1j5h/KjxMO3M2wbYq/IitcqdDrj27Zz52PqQ5ReG9V6M/szavMI9OZL33yNIOGElh4zlQ2zwjQ==
-  dependencies:
-    "@tarojs/components" "3.6.16"
-    "@tarojs/service" "3.6.16"
-    "@tarojs/shared" "3.6.16"
-
-"@tarojs/plugin-platform-weapp@3.6.16":
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/@tarojs/plugin-platform-weapp/-/plugin-platform-weapp-3.6.16.tgz#f3333e3d5034e38d03677b7b569d760e3c58f9f7"
-  integrity sha512-rbLld+cOYsfihg3EiqgPPE76UCNU38RiPVVrU0Rfp3nH7cpEWSweFn35T3b34XPSJBlV+yhRbplHLnjPmgD3Zw==
-  dependencies:
-    "@tarojs/components" "3.6.16"
-    "@tarojs/service" "3.6.16"
-    "@tarojs/shared" "3.6.16"
-
-"@tarojs/react@3.6.16":
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/@tarojs/react/-/react-3.6.16.tgz#ec1efade0209e3ea196712f2eef55a34a930a98c"
-  integrity sha512-BGwnR/stoOyB1lzXjAjyTpD/4m2IxCYxj5mbex6MsKHnyBLmwNUXBr0KT27p9RZjLbBMf+/0pcSpyWn6xQGrXQ==
-  dependencies:
-    "@tarojs/runtime" "3.6.16"
-    "@tarojs/shared" "3.6.16"
+"@tarojs/plugin-platform-jd@3.6.19":
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/@tarojs/plugin-platform-jd/-/plugin-platform-jd-3.6.19.tgz#e4ec06b932ce457707566dbe6655001bbf88fb1e"
+  integrity sha512-JtDLdZWo4hr1mVGNzXdnU4ffajgRrgr29K2dzkZqHekbtIyto23xHGPlKgGA0Cwox5QTN2krglmO7rV2KByGwA==
+  dependencies:
+    "@tarojs/service" "3.6.19"
+    "@tarojs/shared" "3.6.19"
+
+"@tarojs/plugin-platform-qq@3.6.19":
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/@tarojs/plugin-platform-qq/-/plugin-platform-qq-3.6.19.tgz#e4570a877f1ea0c93674f041a17389a0e98cd690"
+  integrity sha512-Aqw5Ei02CHQS4A1lvLKs03tZXUxUrhoN2VMo2sMBjvFiM4rkkQvc5UVSfGJ2f4u/4metR72AjmuyIzjdMM9KFQ==
+  dependencies:
+    "@tarojs/plugin-platform-weapp" "3.6.19"
+    "@tarojs/service" "3.6.19"
+    "@tarojs/shared" "3.6.19"
+
+"@tarojs/plugin-platform-swan@3.6.19":
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/@tarojs/plugin-platform-swan/-/plugin-platform-swan-3.6.19.tgz#34cf37a591ff775f7ace36b0187d597f32a813e3"
+  integrity sha512-pSkER8srwUJzN+TbHDZXpvrWUzDeek79RWapsFGUJtoLmshEeamRQZXxa9hFBBwbYmOC0mkJegc2cIu3k1y+zQ==
+  dependencies:
+    "@tarojs/components" "3.6.19"
+    "@tarojs/service" "3.6.19"
+    "@tarojs/shared" "3.6.19"
+
+"@tarojs/plugin-platform-tt@3.6.19":
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/@tarojs/plugin-platform-tt/-/plugin-platform-tt-3.6.19.tgz#a036b84746c1e1e150bc1a5d65a482e03e90b8e8"
+  integrity sha512-TwFBfhv1f4bmXD/vizgsrzNirLitWv+Br5rX61+qz/Yo+9CHUZ2sgQm9Anffh3Lp0xM1uyOuKhcmeCuPoeWmEg==
+  dependencies:
+    "@tarojs/components" "3.6.19"
+    "@tarojs/service" "3.6.19"
+    "@tarojs/shared" "3.6.19"
+
+"@tarojs/plugin-platform-weapp@3.6.19":
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/@tarojs/plugin-platform-weapp/-/plugin-platform-weapp-3.6.19.tgz#9db1ddc3b5d68583ac97af3c0f1ec826d7552f56"
+  integrity sha512-QcxzHRJNb0p9j57R2EEveXxH3KqoGEUQS94FhRlP1TyVE12Wfp0dU/tHKr1VobvgYXDySpm8VsvTsjwX4Hfteg==
+  dependencies:
+    "@tarojs/components" "3.6.19"
+    "@tarojs/service" "3.6.19"
+    "@tarojs/shared" "3.6.19"
+
+"@tarojs/react@3.6.19":
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/@tarojs/react/-/react-3.6.19.tgz#ec82864709d55d1b30f09c534c5c8f5ce297209b"
+  integrity sha512-uYuoijXnXdlh6RorGx01/dFjagM0lwK02UIM7TjnPl9py/geLSJuIMT5ZVFaUiQlR5o3Ov7A0hrkqZmTChrCYA==
+  dependencies:
+    "@tarojs/runtime" "3.6.19"
+    "@tarojs/shared" "3.6.19"
     react-reconciler "0.27.0"
 
-"@tarojs/rn-runner@3.6.16":
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/@tarojs/rn-runner/-/rn-runner-3.6.16.tgz#e1cb8d574b45ca5ff081807fce25d3fa93a14e77"
-  integrity sha512-LEwkFtWrNSrmsVv8d+6y0BV+1LUKN7H2+Bo2ioX8jyx7sWeur1yfcfVoOf/5VRjOWkcm/PcOiV55Gq+6owujnA==
+"@tarojs/rn-runner@3.6.19":
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/@tarojs/rn-runner/-/rn-runner-3.6.19.tgz#6ba6ef582140b53549bda46826a5668863bca559"
+  integrity sha512-f2wN6YQOvCd1A4qWyEfxFwVMedeYzRJKL0p96XD2WdRS86/cteQJWc055Jagw3Cekm/daRP8saxNN2UyQGQz9Q==
   dependencies:
     "@rollup/plugin-babel" "^5.3.1"
     "@rollup/plugin-commonjs" "^20.0.0"
     "@rollup/plugin-json" "^4.1.0"
     "@rollup/plugin-node-resolve" "^13.3.0"
     "@rollup/plugin-replace" "^4.0.0"
-    "@tarojs/helper" "3.6.16"
-    "@tarojs/rn-style-transformer" "3.6.16"
-    "@tarojs/rn-supporter" "3.6.16"
-    "@tarojs/rn-transformer" "3.6.16"
+    "@tarojs/helper" "3.6.19"
+    "@tarojs/rn-style-transformer" "3.6.19"
+    "@tarojs/rn-supporter" "3.6.19"
+    "@tarojs/rn-transformer" "3.6.19"
     acorn-jsx "^5.3.2"
     fs-extra "^8.0.1"
     lodash "^4.17.21"
     rollup-plugin-image-file "^1.0.2"
 
-"@tarojs/rn-style-transformer@3.6.16":
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/@tarojs/rn-style-transformer/-/rn-style-transformer-3.6.16.tgz#c20bc157ffcedb9c486f7038b11be45b00f21412"
-  integrity sha512-+SR+E5azVgkyUMi0VlO1VO2w69cDaeZ6abb72Pko7ycb4ly1iUJRlr2A7oIWx3f1PwbU62Zky4ghvvFaKRtuVg==
+"@tarojs/rn-style-transformer@3.6.19":
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/@tarojs/rn-style-transformer/-/rn-style-transformer-3.6.19.tgz#f7ff90965f77d832eb20c1df30ed7102812b3e0a"
+  integrity sha512-YHLBvawaqUEwW0tBtPAU1jbSff+jpcicsoKo9WVhRRQdGFBgIgp4NkJ8cVwqZMcmXJBi+qcw4caWgw8HSwcFwg==
   dependencies:
     "@babel/core" "^7.14.5"
-    "@tarojs/helper" "3.6.16"
+    "@tarojs/helper" "3.6.19"
     fbjs "^2.0.0"
     less "^3.12.2"
     metro-react-native-babel-transformer "^0.72.1"
     postcss-import "^14.0.0"
-    postcss-pxtransform "3.6.16"
+    postcss-pxtransform "3.6.19"
     postcss-reporter "^7.0.5"
     prop-types "^15.7.2"
     resolve "^1.22.0"
     sass "1.37.5"
     stylelint "^14.9.1"
-    stylelint-config-taro-rn "3.6.16"
-    stylelint-taro-rn "3.6.16"
+    stylelint-config-taro-rn "3.6.19"
+    stylelint-taro-rn "3.6.19"
     stylus "^0.55.0"
-    taro-css-to-react-native "3.6.16"
+    taro-css-to-react-native "3.6.19"
 
-"@tarojs/rn-supporter@3.6.16":
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/@tarojs/rn-supporter/-/rn-supporter-3.6.16.tgz#6cb8cf162f16b240f73e79fdc16c0fd51f42d4af"
-  integrity sha512-8Nfr6CbuHaL8HkXrqaEdID/WbUToA47bNcincBGYNRj3ohv5fQeJS78KNPcUH0oCXeH3sRTVSDKr20kddUKxwg==
+"@tarojs/rn-supporter@3.6.19":
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/@tarojs/rn-supporter/-/rn-supporter-3.6.19.tgz#3489494422e4d86dc3878984f832d4cc53cb571d"
+  integrity sha512-35joU9O4+t86U5IidS+anN5D+a+jeuQ/vfi5GmIpsJ/aONrAPi8VnMXLki+VKlVg1SNcO/mDomta5vPrdLIw9w==
   dependencies:
     "@react-native-community/cli-config" "^9.1.0"
     "@react-native-community/cli-tools" "^9.1.0"
     "@rnx-kit/metro-resolver-symlinks" "^0.1.23"
-    "@tarojs/helper" "3.6.16"
-    "@tarojs/rn-style-transformer" "3.6.16"
-    "@tarojs/rn-transformer" "3.6.16"
-    "@tarojs/service" "3.6.16"
-    "@tarojs/taro" "3.6.16"
+    "@tarojs/helper" "3.6.19"
+    "@tarojs/rn-style-transformer" "3.6.19"
+    "@tarojs/rn-transformer" "3.6.19"
+    "@tarojs/service" "3.6.19"
+    "@tarojs/taro" "3.6.19"
     babel-plugin-global-define "1.0.3"
     babel-plugin-jsx-attributes-array-to-object "0.3.0"
-    babel-plugin-transform-react-jsx-to-rn-stylesheet "3.6.16"
+    babel-plugin-transform-react-jsx-to-rn-stylesheet "3.6.19"
     lodash "^4.17.21"
     metro "^0.72.1"
     metro-cache "^0.72.1"
@@ -2885,20 +2885,20 @@
     react-native-svg-transformer "^0.14.3"
     yargs "^15.3.1"
 
-"@tarojs/rn-transformer@3.6.16":
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/@tarojs/rn-transformer/-/rn-transformer-3.6.16.tgz#d47063d7024795abe4aefa63fe6bc2b141658e1d"
-  integrity sha512-q3GNemnRrqUiQUhRrC6C34HGxnVmz1EaWEO7jSZPBktKYqSRTXtNKu5qXTl5aj94fuijdyitEWoqtiEUFjk6EQ==
+"@tarojs/rn-transformer@3.6.19":
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/@tarojs/rn-transformer/-/rn-transformer-3.6.19.tgz#4ffe0a2cb5caf0d98babacd274cb9aabde46d50a"
+  integrity sha512-+vsDYB3IV6zffEfGZbkJ+XEx3ikL5qZJmyFX9/SynAL6JYsgCHN7n5jSNVv4aaXNtIlbMUQQGL/56CpFXSzCRQ==
   dependencies:
     lodash "^4.17.21"
     mime-types "^2.1.27"
     mkdirp "^1.0.4"
     normalize-path "^3.0.0"
 
-"@tarojs/router-rn@3.6.16":
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/@tarojs/router-rn/-/router-rn-3.6.16.tgz#f9cac05be20c2f0d35ec7b669ef24c1c605567f3"
-  integrity sha512-+emReRMXWBL90c3Le6VxUrxoewIqoqzbk+eimXM1dzkk9udVkhAlOmVXFh1QbUcqvBrrg+FIuudY5mYvPk61Nw==
+"@tarojs/router-rn@3.6.19":
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/@tarojs/router-rn/-/router-rn-3.6.19.tgz#17674a56261238c33b75ac33de74fd3da8f37a59"
+  integrity sha512-ug5PtmdDpXLjxYBwWdF03cxt5oZXFo793mkZcM0IgX4UIbNRrFhZXKy2ln10SdSB5n3gX3+8nFTPc0bo0exF2w==
   dependencies:
     "@react-native-masked-view/masked-view" "~0.2.7"
     "@react-navigation/bottom-tabs" "^6.2.0"
@@ -2910,54 +2910,54 @@
     query-string "^7.1.1"
     react-native-gesture-handler "~2.9.0"
     react-native-safe-area-context "~4.4.1"
-    react-native-screens "^3.18.2"
+    react-native-screens "~3.20.0"
 
-"@tarojs/router@3.6.16":
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/@tarojs/router/-/router-3.6.16.tgz#41cb14f263ab86f5ed9d69f525c774a64f80bd6b"
-  integrity sha512-8yhAPqjbmmphyN3QkYmbNrjWG5OYq0iKsUvUZm0NV+hZIxhha/odS2uxQoOm8zn8xxaj9mlL8ID3Tc90ukMP1w==
+"@tarojs/router@3.6.19":
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/@tarojs/router/-/router-3.6.19.tgz#1e6f10e326ec6c34fca870d4c651a98288e89eca"
+  integrity sha512-R1hVo+W6ypsmT5068NCYN/rTugUKd2Jb70qJc69lazMNW783ZtoSE1JCWADkFS5px+DYEFA2IHDFfwwlzLgE9g==
   dependencies:
-    "@tarojs/runtime" "3.6.16"
-    "@tarojs/taro" "3.6.16"
+    "@tarojs/runtime" "3.6.19"
+    "@tarojs/taro" "3.6.19"
     dingtalk-jsapi "~2.15.2"
     history "^5.1.0"
     mobile-detect "^1.4.2"
     query-string "^7.1.1"
     universal-router "^8.3.0"
 
-"@tarojs/runner-utils@3.6.16":
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/@tarojs/runner-utils/-/runner-utils-3.6.16.tgz#51744c39e294b35b19cb8babee2889afc7aa8e09"
-  integrity sha512-C4i/8LkpvCgQNyDVLqAPR8j5caXxRmCmslOzzek5r6Y5CC5MBDUVM/QlgmcQH67u0mKHdiVq9OT+13xmhpdwbQ==
+"@tarojs/runner-utils@3.6.19":
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/@tarojs/runner-utils/-/runner-utils-3.6.19.tgz#477d877a1f0474748f6b196e83ca06222224c59f"
+  integrity sha512-gD8o1nbQrnyNFKmbDWAzdutOnOm96Ku0/T9FNbmQtWRkW+api6LME5q9aFAm2Iwig1Duhp1AccG8zqyLBspEaQ==
   dependencies:
-    "@tarojs/helper" "3.6.16"
+    "@tarojs/helper" "3.6.19"
     scss-bundle "^3.0.2"
 
-"@tarojs/runtime-rn@3.6.16":
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/@tarojs/runtime-rn/-/runtime-rn-3.6.16.tgz#bd789133ab63072f56ad4e97882f97703f3e7e85"
-  integrity sha512-CH+TVgzxgMrLiCd82g/b8QccOxiuhi2SIGSSUTFgrQaXJMwPHbDJJq+Js66ZFLGtIn+loFNtyiQ9MlwVxnLeBQ==
+"@tarojs/runtime-rn@3.6.19":
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/@tarojs/runtime-rn/-/runtime-rn-3.6.19.tgz#efa4bf76b456d0587fee2eb2c63d9e01044b4072"
+  integrity sha512-tAIX/POPjH+mhT2JouD5L4hdwV78i1oRf7aD0b5Kl6CIhAmsPPG45CRxT2v8VTwJzGZ7rWUJtTed9rLXBxIZrQ==
   dependencies:
-    "@tarojs/components-rn" "3.6.16"
-    "@tarojs/router-rn" "3.6.16"
+    "@tarojs/components-rn" "3.6.19"
+    "@tarojs/router-rn" "3.6.19"
     react-native-root-siblings "^4.1.1"
 
-"@tarojs/runtime@3.6.16":
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/@tarojs/runtime/-/runtime-3.6.16.tgz#e2975516d9eefa543684d3ae2b59ba01841c3b76"
-  integrity sha512-iLH6LTDdf/sGrNf2JeOqJmGgvGCc16EzlTAPkk76MXIiQc+/dSrYtjNwO/6DXGbyUEH8vxz+Azh9IBS3pEvkWQ==
+"@tarojs/runtime@3.6.19":
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/@tarojs/runtime/-/runtime-3.6.19.tgz#86457e4a08bfe92c889ef9f0fd6984e81d63ca92"
+  integrity sha512-fpvzV2MQhK9IAXPv1nDJJX8aN3JfyrCOyAPEQyjk8UtciMjmFOuKQIN5CE+BwAuGFA3tWPuus2WrDjzx0hML0w==
   dependencies:
-    "@tarojs/shared" "3.6.16"
+    "@tarojs/shared" "3.6.19"
     lodash-es "4.17.21"
 
-"@tarojs/service@3.6.16":
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/@tarojs/service/-/service-3.6.16.tgz#91458a23a065ce72982f67026c2d5aaa80f04a28"
-  integrity sha512-izBhearJoDztzREQBaK8xS7D8zKvPvt4GmeJfKdhVxV4mAhQHYU61RkbqP0R7VQnZrZia5/80eBYYenkpkUzVw==
+"@tarojs/service@3.6.19":
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/@tarojs/service/-/service-3.6.19.tgz#3fae4f8454c9e83aedb88f415eff72a649dedfb7"
+  integrity sha512-M44w9ESnAjFhjfVNMRJ5cuntTa7JrhxpYbIi3zd/K05utc/yt25DkiCqNjeIu5bOh+F2D0OLeGCgSS8VqtkzlA==
   dependencies:
-    "@tarojs/helper" "3.6.16"
-    "@tarojs/shared" "3.6.16"
-    "@tarojs/taro" "3.6.16"
+    "@tarojs/helper" "3.6.19"
+    "@tarojs/shared" "3.6.19"
+    "@tarojs/taro" "3.6.19"
     joi "^17.6.0"
     lodash "^4.17.21"
     ora "^5.0.0"
@@ -2965,21 +2965,21 @@
     tapable "^1.1.3"
     webpack-merge "^4.2.2"
 
-"@tarojs/shared@3.6.16":
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/@tarojs/shared/-/shared-3.6.16.tgz#86a8b7ef69ffb62345a5ab214b12fe2cd5cd59f0"
-  integrity sha512-Jlp8qIvbSxR/4CJ8UD0EyZp7eXvkwllOeHNuhkiZNs30mPLFhu77XNGIEkLemITYuRaNAVPFCw9h5rI9EUlYjQ==
-
-"@tarojs/taro-h5@3.6.16":
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/@tarojs/taro-h5/-/taro-h5-3.6.16.tgz#8cba1d7113861c316adb32006038bbcad16c0230"
-  integrity sha512-HyN2MyH6ywZlcvEcG7FBzEhVWiCic4I6V03eleLmllaVi6LVgt9bFKmpX9oPB3nVYVVbZtJ+Itfv8cu09O0upQ==
-  dependencies:
-    "@tarojs/api" "3.6.16"
-    "@tarojs/components" "3.6.16"
-    "@tarojs/router" "3.6.16"
-    "@tarojs/runtime" "3.6.16"
-    "@tarojs/shared" "3.6.16"
+"@tarojs/shared@3.6.19":
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/@tarojs/shared/-/shared-3.6.19.tgz#4082702be7eca76d300297cf2eaf76c8bbcff57d"
+  integrity sha512-cLpo9i3TUHSvpjKiusTUOd0/tw9v6UxYKxo6JrFYb6zcn0RJlJRO+Wk9g1iGp+hOSw9rJ2p+zJ16tZ29D/igXQ==
+
+"@tarojs/taro-h5@3.6.19":
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/@tarojs/taro-h5/-/taro-h5-3.6.19.tgz#627d63012036053ec29957b8a9ec25888d7272c5"
+  integrity sha512-lJqkcSFkIEUQh2UuvVKS5dMqf5O0i2jASduCWEoAa5jBcPmiy3a5tLkHdfru+GhU+0ZBFqjyKmZu9sHbtRjKRg==
+  dependencies:
+    "@tarojs/api" "3.6.19"
+    "@tarojs/components" "3.6.19"
+    "@tarojs/router" "3.6.19"
+    "@tarojs/runtime" "3.6.19"
+    "@tarojs/shared" "3.6.19"
     abortcontroller-polyfill "^1.7.5"
     base64-js "^1.3.0"
     ics "^3.1.0"
@@ -2989,19 +2989,19 @@
     query-string "^7.1.1"
     whatwg-fetch "^3.4.0"
 
-"@tarojs/taro-loader@3.6.16":
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/@tarojs/taro-loader/-/taro-loader-3.6.16.tgz#f4e701d1f39fc243e3c6f57c7476688e3b9755d9"
-  integrity sha512-PCRQhliOUdGcKIELgyT+p2wYNcLycw/Kv5wCMihclIin+LuC41BMSUyryXi4dq11a6e1EDmcLzlE0fYN+etg6Q==
+"@tarojs/taro-loader@3.6.19":
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/@tarojs/taro-loader/-/taro-loader-3.6.19.tgz#037f38b92acaa494adad5db01795f1cb1557f7d2"
+  integrity sha512-VTxsHV80MevJWbRZd6dwO2N5JWSb4CAt2r+mwqe6Z2G9HObvd2ICIU5dIxNJ/ut6hhBrrcbGi7Hp3hC1g3Ftmg==
   dependencies:
-    "@tarojs/helper" "3.6.16"
-    "@tarojs/taro" "3.6.16"
+    "@tarojs/helper" "3.6.19"
+    "@tarojs/taro" "3.6.19"
     loader-utils "^1.2.3"
 
-"@tarojs/taro-rn@3.6.16":
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/@tarojs/taro-rn/-/taro-rn-3.6.16.tgz#bcaf1d844b5e9cbe0c598ca270e4c372870fb0ab"
-  integrity sha512-GNz824AUesAnk0giwfl7mfXDmbChmjXgNIu9e0mUzSSRGAPkZLNkvLWqF/R1P/LelfhuKWVXJszO5nV0PxrtVw==
+"@tarojs/taro-rn@3.6.19":
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/@tarojs/taro-rn/-/taro-rn-3.6.19.tgz#25e49eeddff5a7ced2e3c92b4e4c67204db754aa"
+  integrity sha512-0Tf1puTlJzGFhCuHM4dcHJ1ShwLSdju1s2EWUvKusaIqhYh9pfndobD6hcm7G5S99X+5QvWlOA9AvcYZOD5ZKQ==
   dependencies:
     "@bam.tech/react-native-image-resizer" "~3.0.4"
     "@react-native-async-storage/async-storage" "~1.17.7"
@@ -3009,7 +3009,7 @@
     "@react-native-clipboard/clipboard" "~1.11.1"
     "@react-native-community/geolocation" "~3.0.2"
     "@react-native-community/netinfo" "~9.3.0"
-    "@tarojs/runtime-rn" "3.6.16"
+    "@tarojs/runtime-rn" "3.6.19"
     babel-preset-expo "~9.2.1"
     base64-js "^1.3.0"
     deprecated-react-native-prop-types "^2.3.0"
@@ -3032,47 +3032,47 @@
     react-native-stylekit "^1.0.0"
     react-native-syan-image-picker "0.5.3"
 
-"@tarojs/taro@3.6.16":
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/@tarojs/taro/-/taro-3.6.16.tgz#2c48a6df61a80f0393dbfc30e97d67e48f3652cd"
-  integrity sha512-tHRUgi19aPhN0STxTAHk8poEXg/2gvheMDvPnOHCHSAW6/30kp+ejDTIzT/RD+Rht3WfREMLEauavPx6Q42m8A==
+"@tarojs/taro@3.6.19":
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/@tarojs/taro/-/taro-3.6.19.tgz#9c2df428bbef35cf909b66ac9514d00243d87777"
+  integrity sha512-rGk1fU2ZIi+hI9D9+kzpaoYv3qT4Bc1LKhMompxcPCsLVafMiOYj2mMDrQou+S/oeOCVLsM4KDiKkg/14LO4DQ==
   dependencies:
-    "@tarojs/api" "3.6.16"
-    "@tarojs/runtime" "3.6.16"
+    "@tarojs/api" "3.6.19"
+    "@tarojs/runtime" "3.6.19"
 
-"@tarojs/webpack5-prebundle@3.6.16":
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/@tarojs/webpack5-prebundle/-/webpack5-prebundle-3.6.16.tgz#4bbbb6b9f900c56906f97456e4cd0b79759b0079"
-  integrity sha512-pqTd3cpb2Dj/z48t8vQbyCfLDmpXloyPGhnl43DpWFiQSjwt/HXrAEHieOf5xYmld5/btcbwNzl02EHs073UHg==
+"@tarojs/webpack5-prebundle@3.6.19":
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/@tarojs/webpack5-prebundle/-/webpack5-prebundle-3.6.19.tgz#4a03845dbc9bb3166e3d279ff8be2976388dc436"
+  integrity sha512-L3r8TGVJD5QvTBKlfoXl6+PaCZTxRBDkcDkkmVhN78DkRAb+MLYqjnXNUGHc0zXfcKho8dZQFXtOpAbfq3ENtg==
   dependencies:
-    "@tarojs/helper" "3.6.16"
-    "@tarojs/shared" "3.6.16"
-    "@tarojs/taro" "3.6.16"
+    "@tarojs/helper" "3.6.19"
+    "@tarojs/shared" "3.6.19"
+    "@tarojs/taro" "3.6.19"
     enhanced-resolve "^5.9.3"
     es-module-lexer "^0.10.4"
     lodash "^4.17.21"
     webpack-chain "6.5.1"
     webpack-virtual-modules "^0.5.0"
 
-"@tarojs/webpack5-runner@3.6.16":
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/@tarojs/webpack5-runner/-/webpack5-runner-3.6.16.tgz#8202c2d5f2646c1f729ddeea5fcf4cc179776b21"
-  integrity sha512-BLY9fRSzgWJu63AsE+iDOAC6AB0vdDOMmKGxgXo7zowTdVyWCUE3dm01ps6bdmIHtE063fw43kdDeZnBFtt4hA==
+"@tarojs/webpack5-runner@3.6.19":
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/@tarojs/webpack5-runner/-/webpack5-runner-3.6.19.tgz#e87d7b56f8d35e01b2c018697781452a0321ee72"
+  integrity sha512-xaj6i1MRDMMTi8bAeshQV24eNQH+bLt9sJbVNjpEUrUXFaLdzk0vFo+Ju1lYQqmQuZkbCNmxeD8Rzg0tJzMtZw==
   dependencies:
     "@parcel/css" "^1.4.0"
-    "@tarojs/helper" "3.6.16"
-    "@tarojs/plugin-platform-alipay" "3.6.16"
-    "@tarojs/plugin-platform-jd" "3.6.16"
-    "@tarojs/plugin-platform-qq" "3.6.16"
-    "@tarojs/plugin-platform-swan" "3.6.16"
-    "@tarojs/plugin-platform-tt" "3.6.16"
-    "@tarojs/plugin-platform-weapp" "3.6.16"
-    "@tarojs/runner-utils" "3.6.16"
-    "@tarojs/runtime" "3.6.16"
-    "@tarojs/shared" "3.6.16"
-    "@tarojs/taro" "3.6.16"
-    "@tarojs/taro-loader" "3.6.16"
-    "@tarojs/webpack5-prebundle" "3.6.16"
+    "@tarojs/helper" "3.6.19"
+    "@tarojs/plugin-platform-alipay" "3.6.19"
+    "@tarojs/plugin-platform-jd" "3.6.19"
+    "@tarojs/plugin-platform-qq" "3.6.19"
+    "@tarojs/plugin-platform-swan" "3.6.19"
+    "@tarojs/plugin-platform-tt" "3.6.19"
+    "@tarojs/plugin-platform-weapp" "3.6.19"
+    "@tarojs/runner-utils" "3.6.19"
+    "@tarojs/runtime" "3.6.19"
+    "@tarojs/shared" "3.6.19"
+    "@tarojs/taro" "3.6.19"
+    "@tarojs/taro-loader" "3.6.19"
+    "@tarojs/webpack5-prebundle" "3.6.19"
     acorn-walk "^8.0.0"
     autoprefixer "^9.7.4"
     babel-loader "8.2.1"
@@ -3097,11 +3097,11 @@
     miniprogram-simulate "^1.1.5"
     mkdirp "^1.0.4"
     ora "^5.0.0"
-    postcss-html-transform "3.6.16"
+    postcss-html-transform "3.6.19"
     postcss-import "^14.0.0"
     postcss-loader "^7.0.1"
-    postcss-plugin-constparse "3.6.16"
-    postcss-pxtransform "3.6.16"
+    postcss-plugin-constparse "3.6.19"
+    postcss-pxtransform "3.6.19"
     postcss-url "^10.1.3"
     regenerator-runtime "0.11"
     resolve "^1.22.0"
@@ -4537,18 +4537,18 @@ babel-plugin-transform-imports-api@1.0.0:
   dependencies:
     is-invalid-path "^1.0.2"
 
-babel-plugin-transform-react-jsx-to-rn-stylesheet@3.6.16:
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/babel-plugin-transform-react-jsx-to-rn-stylesheet/-/babel-plugin-transform-react-jsx-to-rn-stylesheet-3.6.16.tgz#7e2a2d7e84f4a00d49a4c1ced41e888bb65cf994"
-  integrity sha512-A6grSw2RaqanOPCIwoCEQXN6lqNGUQoklZVhb5GIEuCjTyUI19oEPG3WiGSyYVO14m1MG5scYbs2XCx5/MrywA==
+babel-plugin-transform-react-jsx-to-rn-stylesheet@3.6.19:
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/babel-plugin-transform-react-jsx-to-rn-stylesheet/-/babel-plugin-transform-react-jsx-to-rn-stylesheet-3.6.19.tgz#db35813888c5fb923aa83c8acaef934c59942062"
+  integrity sha512-C8s3R68LO8RMnoXvTXARYh2MRbq+uvRSwAOBialuOW3KC1levNNNgynrIky2LMef3SxZbesjCUmxiOEs1nI6pg==
   dependencies:
     camelize "^1.0.0"
-    taro-css-to-react-native "3.6.16"
+    taro-css-to-react-native "3.6.19"
 
-babel-plugin-transform-taroapi@3.6.16:
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/babel-plugin-transform-taroapi/-/babel-plugin-transform-taroapi-3.6.16.tgz#c45615716879c7225d3662a1fb272b6ef0679f9c"
-  integrity sha512-GHVEtkCLGzUE7f4OaTH2MOOVpGpju7B4rLkPIHEw+oNH+N2fiMgHykK8nK1itA6xiKdRz5EtXEd5jVeVEqGMgw==
+babel-plugin-transform-taroapi@3.6.19:
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/babel-plugin-transform-taroapi/-/babel-plugin-transform-taroapi-3.6.19.tgz#3cd7185e66972edfe3a528a42fdeb4c8331f2e51"
+  integrity sha512-GIITUla2RXDtwttAujJCJ+Z7tuTHiCZIfyX9HadZAaD9UVeSoNNYJBkPoJ72I5lzCGFUCx3srjgY3joZ2A2xMw==
   dependencies:
     lodash "^4.17.21"
 
@@ -4598,10 +4598,10 @@ babel-preset-fbjs@^3.4.0:
     "@babel/plugin-transform-template-literals" "^7.0.0"
     babel-plugin-syntax-trailing-function-commas "^7.0.0-beta.0"
 
-babel-preset-taro@3.6.16:
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/babel-preset-taro/-/babel-preset-taro-3.6.16.tgz#a75ff205347caa65bb29a65ff68386a3ba03f1c3"
-  integrity sha512-mY4sYljpqThwWSvFFG+VKwtj/QygOjOfgKj1IXtr7K0VMP5oSpX2EzODZopMoypOinHY9QzbeQobtC9BPnMXgg==
+babel-preset-taro@3.6.19:
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/babel-preset-taro/-/babel-preset-taro-3.6.19.tgz#426ec28e9a93514abba36c0927059cedc0ffb2e6"
+  integrity sha512-XaGUn1DBlSmHTwQ6KXgFWhxqjdmgPDOrkE4XqwFeYFyP32I+BRJ+F4m0Q3RsnV3IEXgoIGFs34u4lAG1nW25+w==
   dependencies:
     "@babel/plugin-proposal-class-properties" "^7.14.5"
     "@babel/plugin-proposal-decorators" "^7.14.5"
@@ -4612,8 +4612,8 @@ babel-preset-taro@3.6.16:
     "@babel/preset-typescript" "^7.14.5"
     "@babel/runtime" "^7.14.5"
     "@babel/runtime-corejs3" "^7.14.5"
-    "@tarojs/helper" "3.6.16"
-    "@tarojs/shared" "3.6.16"
+    "@tarojs/helper" "3.6.19"
+    "@tarojs/shared" "3.6.19"
     babel-plugin-dynamic-import-node "2.3.3"
     babel-plugin-minify-dead-code-elimination "^0.5.2"
     babel-plugin-transform-imports-api "1.0.0"
@@ -7122,10 +7122,10 @@ escodegen@^2.0.0:
   optionalDependencies:
     source-map "~0.6.1"
 
-eslint-config-taro@3.6.16:
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/eslint-config-taro/-/eslint-config-taro-3.6.16.tgz#e37094fab863ae067f04420a0e7494b1c536a241"
-  integrity sha512-a8HPE/JAqjB+/nKRo5kVx6gSSSs7aDBXdLP6XTlwjV/mN6NxYIn565PJuiyPPT5F2Xfs7NrvJUcjsZufbwchJA==
+eslint-config-taro@3.6.19:
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/eslint-config-taro/-/eslint-config-taro-3.6.19.tgz#121e345cc5362595f3a7e1a53ad2e0ffb05cd01b"
+  integrity sha512-3qNkafHUEWnCtUqQtTJ6lXAjjpwHn0stuoW6h4/y5Qm9F4ttt+126/QfMeFTsRWgfSBugUP9jt82t3HRkwtJuQ==
   dependencies:
     "@babel/eslint-parser" "^7.17.0"
     "@typescript-eslint/parser" "^5.20.0"
@@ -12791,10 +12791,10 @@ postcss-discard-overridden@^5.1.0:
   resolved "https://registry.npmmirror.com/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz#7e8c5b53325747e9d90131bb88635282fb4a276e"
   integrity sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==
 
-postcss-html-transform@3.6.16:
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/postcss-html-transform/-/postcss-html-transform-3.6.16.tgz#89908d97dd2e0bea0ff93ef22b06af322a073c15"
-  integrity sha512-kWTwsxQzoW1L71GCrS+aZOAhgArwA+jX4Awe9VCJpp7mwqEB38ovq9cNpm4H6DKIG8oBiN6RUHNAETWZ+GfJSA==
+postcss-html-transform@3.6.19:
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/postcss-html-transform/-/postcss-html-transform-3.6.19.tgz#68de51aa87c3067ad439c3776cbd12b296403e5c"
+  integrity sha512-h2xphaRO6H6dofYAd3E4Bx+q92JYgvYXFb/+fSkAxjLJ2z5YCbKXpWhxz9sRyWmbXnj6GXuhUnZ+a+nMoe/MXA==
 
 postcss-html@^0.28.0:
   version "0.28.0"
@@ -12990,15 +12990,15 @@ postcss-ordered-values@^5.1.3:
     cssnano-utils "^3.1.0"
     postcss-value-parser "^4.2.0"
 
-postcss-plugin-constparse@3.6.16:
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/postcss-plugin-constparse/-/postcss-plugin-constparse-3.6.16.tgz#f173157f75891fb3dec57fcf27e1a9d0843a370b"
-  integrity sha512-B8kg2PWzPrSwFgvb1gs+wMTeb1iYesFZSLo78PAQiXdxC+UbGxm66wOfhqvv5bt3YMAnh5Ti6R9Dn1WAFLwJNw==
+postcss-plugin-constparse@3.6.19:
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/postcss-plugin-constparse/-/postcss-plugin-constparse-3.6.19.tgz#d0e0d39d2239c2779a3ebfe60bd23504f03288fb"
+  integrity sha512-szNz2zM6Bag/t/b60iVFPeD7QNDtGSP5t7GtpuWVqaUCgBZe5nkyvWe65UM+67uCgtVz+SZC3r8zUltiuJfO9g==
 
-postcss-pxtransform@3.6.16:
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/postcss-pxtransform/-/postcss-pxtransform-3.6.16.tgz#b6483835c9e1349706f25687694648dfd199126c"
-  integrity sha512-eLacRgq00OpYHl5fJu9I2Ri5RYEsNa0K/PQbDefT09UcEow2f1m1z2uQhier8y0yZSIRsPbXkWMlpQ8VGaOVUw==
+postcss-pxtransform@3.6.19:
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/postcss-pxtransform/-/postcss-pxtransform-3.6.19.tgz#2e73afbe902c7d4cf3decb57434afdb70618b7ac"
+  integrity sha512-DjNywHsz/wg8ASly7Po70C3t6ZtilxCIoDEXb1WFsOvdoUMlitJR+aQilDdHfrlQUtG/o24jdl5FPHo1Hhot3Q==
 
 postcss-reduce-initial@^5.1.2:
   version "5.1.2"
@@ -13643,6 +13643,14 @@ react-native-screens@^3.18.2:
     react-freeze "^1.0.0"
     warn-once "^0.1.0"
 
+react-native-screens@~3.20.0:
+  version "3.20.0"
+  resolved "https://registry.npmmirror.com/react-native-screens/-/react-native-screens-3.20.0.tgz#4d154177395e5541387d9a05bc2e12e54d2fb5b1"
+  integrity sha512-joWUKWAVHxymP3mL9gYApFHAsbd9L6ZcmpoZa6Sl3W/82bvvNVMqcfP7MeNqVCg73qZ8yL4fW+J/syusHleUgg==
+  dependencies:
+    react-freeze "^1.0.0"
+    warn-once "^0.1.0"
+
 react-native-stylekit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmmirror.com/react-native-stylekit/-/react-native-stylekit-1.0.0.tgz#96fc013345b8d3cd60dfdaced0d47af7a9d5316b"
@@ -15336,15 +15344,15 @@ stylehacks@^5.1.1:
     browserslist "^4.21.4"
     postcss-selector-parser "^6.0.4"
 
-stylelint-config-taro-rn@3.6.16:
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/stylelint-config-taro-rn/-/stylelint-config-taro-rn-3.6.16.tgz#b523a4e06f184e39eb25a6a92def1be2be4be30d"
-  integrity sha512-jDVVmiYAod0T89+CD+N+ua3Q15l9FhI/RibL2fDGFRdYoiuFr68Yz34K/hT6ojn1M0zwpnl7b0MIKVhjh6As2g==
+stylelint-config-taro-rn@3.6.19:
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/stylelint-config-taro-rn/-/stylelint-config-taro-rn-3.6.19.tgz#ef4f8542cdd42a87c4c263d9a41d47bf83eaf6ec"
+  integrity sha512-FAZou8Rnj+jKaoA5RcQ4ZsV+l9llZ1Cw9m29Ln/UGmpC0e38dF+ZUD6YVnlYNFrMedMxEeVDbDVAl+LKALGpFw==
 
-stylelint-taro-rn@3.6.16:
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/stylelint-taro-rn/-/stylelint-taro-rn-3.6.16.tgz#78ec8b12fa8d2d6de14f25b06d087d906a30f9da"
-  integrity sha512-oiajuMl/RrNhSIbKZ0GKYUUdGxErg13iEiJKnCOX3QwsAIHme5X+tAFJb1xkfez3+uRX17nV7NLX5r/EaZBlQw==
+stylelint-taro-rn@3.6.19:
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/stylelint-taro-rn/-/stylelint-taro-rn-3.6.19.tgz#88eb06746dba28fa3e9b738dc7bb9fc7dffab15b"
+  integrity sha512-SwiW+F5QM0hhyMfMsxJSE8pag/gOhu6BR9GNsc+vIeDzCDeuXxaNG/nhCktuTXWdhTadcBdB4jpuJNXTB7qVuQ==
   dependencies:
     react-native-known-styling-properties "^1.0.4"
 
@@ -15658,10 +15666,10 @@ tar@^6.0.2, tar@^6.0.5:
     mkdirp "^1.0.3"
     yallist "^4.0.0"
 
-taro-css-to-react-native@3.6.16:
-  version "3.6.16"
-  resolved "https://registry.npmmirror.com/taro-css-to-react-native/-/taro-css-to-react-native-3.6.16.tgz#a92d2a4c4d0d8f942d48ee8c609fe5349717f07f"
-  integrity sha512-kju/uXobf/a8WyWVYHuMMV0geuoHEgqvjSa1nZVInoESBb+7gn4rbaDhfbZaUUHI+anwrygozQjrwlo7vE3atA==
+taro-css-to-react-native@3.6.19:
+  version "3.6.19"
+  resolved "https://registry.npmmirror.com/taro-css-to-react-native/-/taro-css-to-react-native-3.6.19.tgz#7ce3f668c322333b2df870975efb97d2520818c2"
+  integrity sha512-poMyvDhgu6WW65Q7CkhgnGHaU1eLy6h7GwLElQN2AHRbb8/blqEmIsYjhYgfsKxYGAupwUvOilKVFx5QW9Ve3w==
   dependencies:
     camelize "^1.0.0"
     css "^3.0.0"