Browse Source

优化代码,删除无用的homepage等页面文件,把主页面从App.tsx移动到index.tsx中

sw 1 week ago
parent
commit
ea0d30c3e1

+ 1 - 1
src/app.config.ts

@@ -1,5 +1,5 @@
 export default defineAppConfig({
-  pages: ['pages/demo/App'],
+  pages: ['pages/index/index'],
   window: {
     backgroundTextStyle: 'light',
     navigationBarBackgroundColor: '#fff',

+ 0 - 13
src/pages/demo/AboutPage.tsx

@@ -1,13 +0,0 @@
-// AboutPage.tsx
-import React from 'react';
-
-const AboutPage: React.FC = () => {
-  return (
-    <div>
-      <h1>About Us</h1>
-      <p>This is the about page content.</p>
-    </div>
-  );
-};
-
-export default AboutPage;

+ 0 - 36
src/pages/demo/App.tsx

@@ -1,36 +0,0 @@
-// App.tsx
-import React from 'react';
-import { BrowserRouter as Router, Routes, Route } from 'react-router-dom';
-import BasicLayout from '../../layouts/BasicLayout';
-import HomePage from './HomePage';
-import AboutPage from './AboutPage';
-import Login from '@/pages/security/Login';
-import AppInitializer from './AppInitializer';
-
-// 登录判断组件
-const AppContent: React.FC = () => {
-  const [initialized, setInitialized] = React.useState(false);
-
-  if (!initialized) {
-    return <AppInitializer onInitialized={() => setInitialized(true)} />;
-  }
-
-  return (
-    <Router>
-      <Login />
-      <BasicLayout>
-        <Routes>
-          <Route path="/" element={<HomePage />} />
-          <Route path="/about" element={<AboutPage />} />
-        </Routes>
-      </BasicLayout>
-    </Router>
-  );
-};
-
-const App: React.FC = () => {
-  console.log('App component rendered');
-  return <AppContent />;
-};
-
-export default App;

+ 0 - 13
src/pages/demo/HomePage.tsx

@@ -1,13 +0,0 @@
-// HomePage.tsx
-import React from 'react';
-
-const HomePage: React.FC = () => {
-  return (
-    <div style={{ backgroundColor: '#fff2f5', padding: '20px' }}>
-      <h1>Welcome to the Home Page</h1>
-      <p>This is the home page content.</p>
-    </div>
-  );
-};
-
-export default HomePage;

+ 0 - 0
src/pages/demo/AppInitializer.tsx → src/pages/index/AppInitializer.tsx


+ 21 - 9
src/pages/index/index.tsx

@@ -1,18 +1,30 @@
-import { View, Text } from '@tarojs/components';
 import { useLoad } from '@tarojs/taro';
 import './index.css';
-import { FormattedMessage } from 'react-intl';
+import Login from '../security/Login';
+import AppInitializer from './AppInitializer';
+import React from 'react';
+import BasicLayout from '@/layouts/BasicLayout';
+import { BrowserRouter as Router } from 'react-router-dom';
+
+const AppContent: React.FC = () => {
+  const [initialized, setInitialized] = React.useState(false);
+
+  if (!initialized) {
+    return <AppInitializer onInitialized={() => setInitialized(true)} />;
+  }
+
+  return (
+    <Router>
+      <Login />
+      <BasicLayout children={undefined}></BasicLayout>
+    </Router>
+  );
+};
 
 export default function Index() {
   useLoad(() => {
     console.log('Page loaded.');
   });
 
-  return (
-    <View>
-      <Text>
-        <FormattedMessage id="greeting" defaultMessage="Hello, world!" />
-      </Text>
-    </View>
-  );
+  return <AppContent />;
 }