更改目录结构

src/components/Buttons.scss → src/components/basic/Buttons.scss

@@ -1,4 +1,4 @@
-@import '../utils/common.scss';
+@import '@/utils/common.scss';
 
 /* #ifdef weapp */ 
 .btn{

src/components/Buttons.tsx → src/components/basic/Buttons.tsx

@@ -1,6 +1,6 @@
 import { Button, View } from "@tarojs/components";
 import './Buttons.scss'
-import { ButtonType, ComponentStatus } from "../utils/types";
+import { ButtonType, ComponentStatus } from "../../utils/types";
 
 import {Button as RNButton} from 'react-native' ;
 

src/components/Texts.tsx → src/components/basic/Texts.tsx

@@ -1,5 +1,5 @@
 import { Text } from "@tarojs/components";
-import { TextType } from "../utils/types";
+import { TextType } from "../../utils/types";
 import './Texts.scss'
 
 

src/components/Inputs.scss → src/components/input/Inputs.scss

@@ -1,4 +1,4 @@
-@import '../utils/common.scss';
+@import '@/utils/common.scss';
 .input{
     height: 112px;
     background-color: #000;

src/components/SingleSelect.tsx → src/components/input/SingleSelect.tsx

@@ -1,7 +1,7 @@
 import { View, Text, Image } from "@tarojs/components";
 import { useEffect, useState } from "react";
 import './SingleSelect.scss'
-import check from '../assets/svg/check.svg'
+import check from '@/assets/svg/check.svg'
 
 export default function Component(props: { items: any[],itemSelect?:(index: number)=>void,selIndex?:number }) {
     const [selIndex, setSelIndex] = useState(props.selIndex?props.selIndex:-1)

src/components/Stepper.tsx → src/components/input/Stepper.tsx

@@ -1,6 +1,6 @@
 import { View, Image } from "@tarojs/components";
-import minus from '../assets/svg/minus.svg'
-import plus from '../assets/svg/plus.svg'
+import minus from '../../assets/svg/minus.svg'
+import plus from '../../assets/svg/plus.svg'
 import './Stepper.scss'
 import { useEffect, useState } from "react";
 import Taro from "@tarojs/taro";

src/components/view/Badge.tsx

@@ -0,0 +1,7 @@
+import { View } from "@tarojs/components";
+
+export default function Component() {
+    return <View>
+
+    </View>
+}

src/components/Timeline.scss → src/components/view/Timeline.scss

@@ -52,6 +52,7 @@
   .timeline-content {
     display: flex;
     flex-direction: column;
+    color: #fff;
   }
   
   .timeline-text {

src/features/auth/components/Auth.scss

@@ -1,4 +1,4 @@
-@import '../../../utils/common.scss';
+@import '@/utils/common.scss';
 .agree_view{
     display: flex;
     flex-direction: row;

src/features/auth/components/CreateAccount.tsx

@@ -1,13 +1,13 @@
-import Box from "@/components/Box";
-import Buttons from "@/components/Buttons";
-import Inputs from "@/components/Inputs";
-import Texts from "@/components/Texts";
+import Box from "@/components/layout/Box";
+import Buttons from "@/components/basic/Buttons";
+import Inputs from "@/components/input/Inputs";
+import Texts from "@/components/basic/Texts";
 import { ComponentStatus, TextType } from "@/utils/types";
 import { View,Image,Text } from "@tarojs/components";
 import Taro from "@tarojs/taro";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
-import check from '@assets/svg/check.svg'
+import check from '@/assets/svg/check.svg'
 import './Auth.scss'
 
 export default function Component(props:{login:()=>void}) {

src/features/auth/components/CreatePassword.tsx

@@ -1,13 +1,13 @@
-import Box from "@/components/Box";
-import Buttons from "@/components/Buttons";
-import Inputs from "@/components/Inputs";
-import Texts from "@/components/Texts";
+import Box from "@/components/layout/Box";
+import Buttons from "@/components/basic/Buttons";
+import Inputs from "@/components/input/Inputs";
+import Texts from "@/components/basic/Texts";
 import { ComponentStatus, TextType } from "@/utils/types";
 import { View, Image, Text } from "@tarojs/components";
 import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { useDispatch, useSelector } from "react-redux";
-import check from '@assets/svg/check.svg'
+import check from '@/assets/svg/check.svg'
 import './Auth.scss'
 import Taro from "@tarojs/taro";
 import { register } from "@/services/user";

src/features/auth/components/login.tsx

@@ -1,12 +1,12 @@
-import Inputs from "@/components/Inputs";
+import Inputs from "@/components/input/Inputs";
 import { View, Text, Image } from "@tarojs/components";
 import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
-import check from '@assets/svg/check.svg'
-import Texts from "@/components/Texts";
-import Box from "@/components/Box";
+import check from '@/assets/svg/check.svg'
+import Texts from "@/components/basic/Texts";
+import Box from "@/components/layout/Box";
 import { ComponentStatus, TextType } from "@/utils/types";
-import Buttons from "@/components/Buttons";
+import Buttons from "@/components/basic/Buttons";
 import './Auth.scss'
 import { login } from "@/services/user";
 import { useDispatch, useSelector } from "react-redux";

src/features/trackSomething/components/Activity.tsx

@@ -8,8 +8,8 @@ import Taro from "@tarojs/taro";
 import { activityCards, uploadSteps } from "@/services/trackSomething";
 import { TimeFormatter } from "@/utils/time_format";
 import MetricItem from "./MetricItem";
-import Layout from '@/context/locales/layout'
-import NoData from "@/components/NoData";
+import Layout from '@/components/layout/layout'
+import NoData from "@/components/view/NoData";
 import { ResultType, checkFail, checkRetry, checkStart, checkSuccess, resetStatus, setResult } from "@/store/action_results";
 import { uploadSessionKey } from "@/services/common";
 import RequestType, { thirdPartRequest } from "@/services/thirdPartRequest";

src/features/trackSomething/components/Metric.tsx

@@ -9,13 +9,13 @@ import { metricCards, uploadMetric, uploadSteps } from "@/services/trackSomethin
 import { TimeFormatter } from "@/utils/time_format";
 import MetricItem from "./MetricItem";
 import { get } from "http";
-import Modal from "@/components/Modal";
-import PickerViews from "@/components/PickerViews";
-import LimitPickers from "@/components/LimitPickers";
-import SlidngScale from "@/components/SlidngScale";
-import NoData from "@/components/NoData";
+import Modal from "@/components/layout/Modal";
+import PickerViews from "@/components/input/PickerViews";
+import LimitPickers from "@/components/input/LimitPickers";
+import SlidngScale from "@/components/input/SlidngScale";
+import NoData from "@/components/view/NoData";
 import { alphaToHex } from "@/utils/tools";
-import Layout from "@/context/locales/layout";
+import Layout from "@/components/layout/layout";
 import { NaviBarTitleShowType, TemplateType } from "@/utils/types";
 import { useTranslation } from "react-i18next";
 

src/features/trackSomething/components/Metric_backup.tsx

@@ -9,10 +9,10 @@ import { metricCards, uploadMetric, uploadSteps } from "@/services/trackSomethin
 import { TimeFormatter } from "@/utils/time_format";
 import MetricItem from "./MetricItem";
 import { get } from "http";
-import Modal from "@/components/Modal";
-import PickerViews from "@/components/PickerViews";
-import LimitPickers from "@/components/LimitPickers";
-import  SlidngScale from "@/components/SlidngScale";
+import Modal from "@/components/layout/Modal";
+import PickerViews from "@/components/input/PickerViews";
+import LimitPickers from "@/components/input/LimitPickers";
+import  SlidngScale from "@/components/input/SlidngScale";
 
 export default function Component(props: any) {
     const user = useSelector((state: any) => state.user);

src/features/trackTimeDuration/components/ChooseScenario.tsx

@@ -1,10 +1,10 @@
 import { View, Text } from "@tarojs/components";
-import Buttons from '@components/Buttons';
-import Texts from '@components/Texts';
-import Rings from '@components/Rings';
+import Buttons from '@/components/basic/Buttons';
+import Texts from '@/components/basic/Texts';
+import Rings from '@components/view/Rings';
 import Rings2, { BgRing, RingCommon, TargetRing } from './Rings';
-import Footer from '@components/Footer';
-import SingleSelect from '../../../components/SingleSelect';
+import Footer from '@/components/layout/Footer';
+import SingleSelect from '../../../components/input/SingleSelect';
 import { ComponentStatus, TextType } from "@utils/types";
 import { useTranslation } from 'react-i18next'
 

src/features/trackTimeDuration/components/Console.tsx

@@ -3,15 +3,15 @@ import { View, Text, PickerView } from "@tarojs/components";
 import trackTimeService, { machine } from "@/store/trackTimeMachine"
 import { useEffect, useRef, useState } from "react";
 import { TimeFormatter } from "@/utils/time_format";
-import TimePickers from '@/components/TimePickers'
+import TimePickers from '@/components/input/TimePickers'
 import { useSelector } from "react-redux";
 import Taro from "@tarojs/taro";
-import LimitPickers from '@/components/LimitPickers';
+import LimitPickers from '@/components/input/LimitPickers';
 import { endFast, endSleep, startFast, startSleep } from "../actions/TrackTimeActions";
 import { durationDatas, durationIndex, pickerDurations } from "../hooks/Console";
-import PickerViews from "@/components/PickerViews";
-import Modal from "@/components/Modal";
-import Stepper from "@/components/Stepper";
+import PickerViews from "@/components/input/PickerViews";
+import Modal from "@/components/layout/Modal";
+import Stepper from "@/components/input/Stepper";
 
 export default function Component() {
     const scenario = useSelector((state: any) => state.scenario);

src/features/trackTimeDuration/components/More.tsx

@@ -5,9 +5,9 @@ import { useTranslation } from "react-i18next";
 import { useDispatch, useSelector } from "react-redux";
 import trackTimeService, { machine } from "@/store/trackTimeMachine"
 import { recordCheck } from "@/services/trackTimeDuration";
-import LimitPickers from "@/components/LimitPickers";
+import LimitPickers from "@/components/input/LimitPickers";
 import { endFast } from "../actions/TrackTimeActions";
-import Modal from "@/components/Modal";
+import Modal from "@/components/layout/Modal";
 import { setStep } from "@/store/scenario";
 import { TimeFormatter } from "@/utils/time_format";
 

src/features/trackTimeDuration/components/Schedule.tsx

@@ -5,10 +5,10 @@ import Taro from "@tarojs/taro";
 import { TimeFormatter } from "@/utils/time_format";
 // import "taro-ui/dist/style/components/float-layout.scss";
 import { delRecord } from "@/services/trackTimeDuration";
-import Modal from "@/components/Modal";
+import Modal from "@/components/layout/Modal";
 import Rings, { BgRing, CurrentDot, RealRing, RingCommon } from './Rings';
 import { getBgRing, getCommon, getDot, getReal, getTarget } from "../hooks/RingData";
-import Timeline from "@/components/Timeline";
+import Timeline from "@/components/view/Timeline";
 
 
 export default function Component(props: { type?: string, data?: any, delSuccess?: Function }) {

src/features/trackTimeDuration/components/SetSchedule.tsx

@@ -1,19 +1,19 @@
-import Buttons from "@/components/Buttons";
+import Buttons from "@/components/basic/Buttons";
 import { setPlan } from "@/services/trackTimeDuration";
 import { setScenario, setStep } from "@/store/scenario";
 import { View, Text } from "@tarojs/components";
 import "./SetSchedule.scss";
 import Taro, { useReady } from "@tarojs/taro";
-import TimePickers from "@/components/TimePickers";
+import TimePickers from "@/components/input/TimePickers";
 // import { AtList, AtListItem } from 'taro-ui'
 import { useRef, useState } from "react";
 import { useDispatch, useSelector } from "react-redux";
-import Footer from "@/components/Footer";
-import PickerViews from "@/components/PickerViews";
+import Footer from "@/components/layout/Footer";
+import PickerViews from "@/components/input/PickerViews";
 // import "taro-ui/dist/style/components/float-layout.scss";
 import { durationDatas, durationIndex, durationTime, pickerDurations } from "../hooks/Console";
 import { TimeFormatter } from "@/utils/time_format";
-import Modal from "@/components/Modal";
+import Modal from "@/components/layout/Modal";
 import Dial from './Dial';
 
 export default function Component() {

src/features/trackTimeDuration/components/SetSchedule_backup.tsx

@@ -1,15 +1,15 @@
-import Buttons from "@/components/Buttons";
+import Buttons from "@/components/basic/Buttons";
 import { setPlan } from "@/services/trackTimeDuration";
 import { setScenario, setStep } from "@/store/scenario";
 import { View, Text } from "@tarojs/components";
 import "./SetSchedule.scss";
 import Taro, { useReady } from "@tarojs/taro";
-import TimePickers from "@/components/TimePickers";
+import TimePickers from "@/components/input/TimePickers";
 // import { AtList, AtListItem } from 'taro-ui'
 import { useState } from "react";
 import { useDispatch, useSelector } from "react-redux";
-import Footer from "@/components/Footer";
-import PickerViews from "@/components/PickerViews";
+import Footer from "@/components/layout/Footer";
+import PickerViews from "@/components/input/PickerViews";
 // import { AtFloatLayout } from "taro-ui";
 // import "taro-ui/dist/style/components/float-layout.scss";
 import { durationDatas, durationIndex, durationTime, pickerDurations } from "../hooks/Console";

src/features/trackTimeDuration/hooks/RingData.tsx

@@ -1,4 +1,4 @@
-import { CurrentDot, RealRing, RingCommon, TargetRing } from "../components/Rings"
+import { CurrentDot, RealRing, RingCommon, TargetRing } from "@/components/view/Rings"
 
 
 

src/pages/Space.tsx

@@ -1,6 +1,6 @@
 import { View } from "@tarojs/components";
-import Buttons from '@components/Buttons';
-import Texts from '@components/Texts';
+import Buttons from '@/components/basic/Buttons';
+import Texts from '@/components/basic/Texts';
 import { ComponentStatus, TextType } from "@utils/types";
 import { useTranslation } from 'react-i18next'
 

src/pages/account/ChooseAuth.tsx

@@ -1,6 +1,6 @@
 import { View } from "@tarojs/components";
-import Buttons from '@components/Buttons'
-import Texts from '@components/Texts'
+import Buttons from '@/components/basic/Buttons'
+import Texts from '@/components/basic/Texts'
 import './ChooseAuth.scss'
 import { ButtonType, ComponentStatus, TextType } from "../../utils/types";
 import Taro, { useReady } from "@tarojs/taro";

src/pages/account/Login.tsx

@@ -1,7 +1,7 @@
 import { View,Text } from "@tarojs/components";
-import Buttons from "@components/Buttons";
-import SingleSelect from "@components/SingleSelect";
-import Rings from '@components/Rings';
+import Buttons from "@/components/basic/Buttons";
+import SingleSelect from "@/components/input/SingleSelect";
+import Rings from '@components/view/Rings';
 import { ButtonType,ComponentStatus } from "../../utils/types";
 import Taro from "@tarojs/taro";
 

src/pages/account/Profile.tsx

@@ -1,4 +1,4 @@
-import Buttons from "@/components/Buttons";
+import Buttons from "@/components/basic/Buttons";
 import { delSession } from "@/services/common";
 import { clear, logout } from "@/services/user";
 import { View, Text,Image } from "@tarojs/components";

src/pages/account/ProfileSetting.tsx

@@ -1,9 +1,9 @@
-import Buttons from "@/components/Buttons";
+import Buttons from "@/components/basic/Buttons";
 import { clear, logout } from "@/services/user";
 import { View, Text, Image,Button } from "@tarojs/components";
 import { useDispatch, useSelector } from "react-redux";
 import './ProfileSetting.scss'
-import Box from "@/components/Box";
+import Box from "@/components/layout/Box";
 import Taro from "@tarojs/taro";
 
 export default function Page() {

src/pages/account/Setting.tsx

@@ -1,4 +1,4 @@
-import Buttons from "@/components/Buttons";
+import Buttons from "@/components/basic/Buttons";
 import { clear, logout } from "@/services/user";
 import { View,Text,Button } from "@tarojs/components";
 import Taro from "@tarojs/taro";

src/pages/clock/Clock.tsx

@@ -4,7 +4,7 @@ import '../index/index.scss'
 import './Clock.scss'
 import Taro, { useDidShow, useReady, useRouter } from '@tarojs/taro'
 // import ComponentA from './component'
-import Rings from '@components/Rings';
+import Rings from '@components/view/Rings';
 
 import { useDispatch, useSelector } from 'react-redux';
 import { getInfoSuccess, logoutSuccess } from '@/store/user';
@@ -22,7 +22,7 @@ import { setScenario } from '@/store/scenario';
 import { setSpecifiedStatus, setSpecifiedState, machine } from '@/store/trackTimeMachine';
 import trackTimeService from '@/store/trackTimeMachine';
 import { setWXFollow } from '@/store/permission';
-import Tooltip from '@/components/Tooltip'
+import Tooltip from '@/components/view/Tooltip'
 import RequestType, { thirdPartRequest } from '@/services/thirdPartRequest'
 import { setConfigs } from '@/store/common'
 // import TabBar from '../../components/Tabbar';

src/pages/common/RecordsHistory.tsx

@@ -7,8 +7,8 @@ import MetricHistory from "@/features/trackSomething/components/MetricHistory";
 import ActivityHistory from "@/features/trackSomething/components/ActivityHistory";
 import { activityRecords, clearMetricRecords, cleartActivityRecords, metricRecords } from "@/services/trackSomething";
 import Taro from "@tarojs/taro";
-import Layout from "@/context/locales/layout";
-import NoData from "@/components/NoData";
+import Layout from "@/components/layout/layout";
+import NoData from "@/components/view/NoData";
 import { NaviBarTitleShowType, TemplateType } from "@/utils/types";
 
 export default function Page() {

src/pages/demo.tsx

@@ -1,7 +1,7 @@
 import Taro from '@tarojs/taro';
 import { Canvas, View } from '@tarojs/components';
 import { useEffect, useRef } from 'react';
-import Timeline from '@/components/Timeline';
+import Timeline from '@/components/view/Timeline';
 
 export default function Demo() {
   const canvasRef = useRef<any>(null);

src/pages/index/index.tsx

@@ -3,8 +3,8 @@ import { View, Text, Button, Input } from '@tarojs/components'
 // import './index.scss'
 import Taro, { useReady } from '@tarojs/taro'
 // import ComponentA from './component'
-import Rings from '@components/Rings';
-import SingleSelect from '@components/SingleSelect';
+import Rings from '@components/view/Rings';
+import SingleSelect from '@/components/input/SingleSelect';
 import { useDispatch, useSelector } from 'react-redux';
 import { getInfoSuccess } from '@/store/user';
 import { wxPubFollow } from '@/services/permission';