feat: 调整项目结构

features/feature/Index.ets

@@ -4,5 +4,3 @@ export { SecondView } from './src/main/ets/view/SecondView';
 
 export { ThirdView } from './src/main/ets/view/ThirdView';
 
-export { add } from './src/main/ets/utils/Calc';
-

features/feature/src/main/ets/pages/BookItemDetailPage.ets → features/feature/src/main/ets/pages/BookList/BookItemDetailPage.ets

@@ -1,9 +1,8 @@
 import { RouterPage, yTRouter } from 'basic';
-import { tagItemComp } from '../components/BuilderIndex';
-import { SchoolBag } from '../components/SchoolBag';
-import { CustomTextStyle } from '../style/CustomTextStyle';
-import { BookItemDetailViewModel } from './viewModel/BookItemDetailViewModel';
-import { PhotoPickerComponent } from '@ohos.file.PhotoPickerComponent';
+import { tagItemComp } from '../../components/BuilderIndex';
+import { SchoolBag } from '../../components/SchoolBag';
+import { CustomTextStyle } from '../../style/CustomTextStyle';
+import { BookItemDetailViewModel } from '../viewModel/BookItemDetailViewModel';
 
 @ComponentV2
 @RouterPage

features/feature/src/main/ets/pages/BookListDetailPage.ets → features/feature/src/main/ets/pages/BookList/BookListDetailPage.ets

@@ -1,7 +1,7 @@
 import { RouterPage, YTHeader } from 'basic';
-import { bookItemComp } from '../components/BuilderIndex';
-import { CustomTextStyle } from '../style/CustomTextStyle';
-import { BookListDetailViewModel } from './viewModel/BookListDetailViewModel';
+import { bookItemComp } from '../../components/BuilderIndex';
+import { CustomTextStyle } from '../../style/CustomTextStyle';
+import { BookListDetailViewModel } from '../viewModel/BookListDetailViewModel';
 
 @ComponentV2
 @RouterPage

features/feature/src/main/ets/pages/BookListPage.ets → features/feature/src/main/ets/pages/BookList/BookListPage.ets

@@ -1,8 +1,8 @@
 import { RouterPage, YTHeader } from 'basic';
-import { DeerSearch } from '../components/DeerSearch';
-import { CustomTextStyle } from '../style/CustomTextStyle';
-import { BookListViewModel } from './viewModel/BookListViewModel';
-import { bookListItemComp } from '../components/BuilderIndex';
+import { DeerSearch } from '../../components/DeerSearch';
+import { CustomTextStyle } from '../../style/CustomTextStyle';
+import { BookListViewModel } from '../viewModel/BookListViewModel';
+import { bookListItemComp } from '../../components/BuilderIndex';
 
 // 精选书单
 @ComponentV2

features/feature/src/main/ets/pages/BookSearchPage.ets → features/feature/src/main/ets/pages/BookList/BookSearchPage.ets

@@ -1,8 +1,8 @@
 import { YTAvoid, YTHeader } from 'basic'
-import { DeerSearch } from '../components/DeerSearch'
-import { CustomTextStyle } from '../style/CustomTextStyle'
+import { DeerSearch } from '../../components/DeerSearch'
+import { CustomTextStyle } from '../../style/CustomTextStyle'
 import { LengthMetrics, PersistenceV2 } from '@kit.ArkUI'
-import { HistoryStorage } from '../model/Storage'
+import { HistoryStorage } from '../../model/Storage'
 
 // 书籍搜索页面
 @ComponentV2

features/feature/src/main/ets/pages/QAPage.ets → features/feature/src/main/ets/pages/BookList/QAPage.ets

@@ -1,5 +1,5 @@
 import { BasicType, RouterPage, YTHeader } from 'basic'
-import { CustomTextStyle } from '../style/CustomTextStyle'
+import { CustomTextStyle } from '../../style/CustomTextStyle'
 
 // 借阅问答页面
 @ComponentV2

features/feature/src/main/ets/pages/DiaLogPage.ets

@@ -1,20 +0,0 @@
-import { DiaLogComp, DiaLogSheetComp } from 'basic';
-import { DiaLogParam } from '../model/DiaLogParam';
-
-@ComponentV2
-struct DiaLogPage {
-  @Param param: DiaLogParam = {}
-
-  build() {
-    if(this.param?.isCenter ?? true) {
-      DiaLogComp({param: this.param.param})
-    } else {
-      DiaLogSheetComp({params: this.param.params})
-    }
-  }
-}
-
-@Builder
-function DiaLogBuilder(_: string, param: DiaLogParam) {
-    DiaLogPage({param: param})
-}

features/feature/src/main/ets/pages/BorrowAnsPage.ets → features/feature/src/main/ets/pages/Order/BorrowAnsPage.ets

@@ -1,6 +1,6 @@
 import { RouterPage, YTHeader, YTRequest, yTRouter } from 'basic'
-import { buttonComp } from '../components/BuilderIndex'
-import { CustomTextStyle } from '../style/CustomTextStyle'
+import { buttonComp } from '../../components/BuilderIndex'
+import { CustomTextStyle } from '../../style/CustomTextStyle'
 
 @ComponentV2
 @RouterPage

features/feature/src/main/ets/pages/BorrowingProcessPage.ets → features/feature/src/main/ets/pages/Order/BorrowingProcessPage.ets

@@ -1,5 +1,5 @@
 import { BasicType, RouterPage, YTAvoid, YTHeader } from 'basic'
-import { CustomTextStyle } from '../style/CustomTextStyle'
+import { CustomTextStyle } from '../../style/CustomTextStyle'
 
 @ComponentV2
 @RouterPage

features/feature/src/main/ets/pages/OrderDetailPage.ets → features/feature/src/main/ets/pages/Order/OrderDetailPage.ets

@@ -1,7 +1,7 @@
 import { DiaLogSheetControl, RouterPage, YTAvoid, YTHeader, yTRouter } from 'basic'
-import { AddressComp } from '../components/AddressComp'
-import { buttonComp } from '../components/BuilderIndex'
-import { CustomTextStyle } from '../style/CustomTextStyle'
+import { AddressComp } from '../../components/AddressComp'
+import { buttonComp } from '../../components/BuilderIndex'
+import { CustomTextStyle } from '../../style/CustomTextStyle'
 
 @ComponentV2
 @RouterPage

features/feature/src/main/ets/pages/OrderManagementPage.ets → features/feature/src/main/ets/pages/Order/OrderManagementPage.ets

@@ -1,8 +1,8 @@
 import { RouterPage, YTHeader } from 'basic';
-import { buttonComp } from '../components/BuilderIndex';
-import { OrderStatus } from '../model/OrderStatus';
-import { CustomTextStyle } from '../style/CustomTextStyle';
-import { OrderManagementViewModel } from './viewModel/OrderManagementViewModel';
+import { buttonComp } from '../../components/BuilderIndex';
+import { OrderStatus } from '../../model/OrderStatus';
+import { CustomTextStyle } from '../../style/CustomTextStyle';
+import { OrderManagementViewModel } from '../viewModel/OrderManagementViewModel';
 
 @ComponentV2
 @RouterPage

features/feature/src/main/ets/utils/Calc.ets

@@ -1,3 +0,0 @@
-export function add(a: number, b: number) {
-  return a + b;
-}

features/feature/src/main/ets/utils/RouterUtrils.ets

@@ -10,7 +10,4 @@ export class RouterUtils{
     yTRouter.pushPathByName('OrderDetailPage', null)
   }
 
-  static openDiaLog(){
-    
-  }
 }

features/feature/src/main/resources/base/profile/router_map.json

@@ -2,52 +2,47 @@
   "routerMap": [
     {
       "name": "BookListPage",
-      "pageSourceFile": "src/main/ets/pages/BookListPage.ets",
+      "pageSourceFile": "src/main/ets/pages/BookList/BookListPage.ets",
       "buildFunction": "BookListBuilder"
     },
     {
       "name": "BookSearchPage",
-      "pageSourceFile": "src/main/ets/pages/BookSearchPage.ets",
+      "pageSourceFile": "src/main/ets/pages/BookList/BookSearchPage.ets",
       "buildFunction": "BookSearchBuilder"
     },
     {
       "name": "BookListDetailPage",
-      "pageSourceFile": "src/main/ets/pages/BookListDetailPage.ets",
+      "pageSourceFile": "src/main/ets/pages/BookList/BookListDetailPage.ets",
       "buildFunction": "BookListDetailBuilder"
     },
     {
       "name": "QAPage",
-      "pageSourceFile": "src/main/ets/pages/QAPage.ets",
+      "pageSourceFile": "src/main/ets/pages/BookList/QAPage.ets",
       "buildFunction": "QABuilder"
     },
     {
       "name": "BookItemDetailPage",
-      "pageSourceFile": "src/main/ets/pages/BookItemDetailPage.ets",
+      "pageSourceFile": "src/main/ets/pages/BookList/BookItemDetailPage.ets",
       "buildFunction": "BookItemDetailBuilder"
     },
-    {
-      "name": "DiaLogPage",
-      "pageSourceFile": "src/main/ets/pages/DiaLogPage.ets",
-      "buildFunction": "DiaLogBuilder"
-    },
     {
       "name": "BorrowingProcessPage",
-      "pageSourceFile": "src/main/ets/pages/BorrowingProcessPage.ets",
+      "pageSourceFile": "src/main/ets/pages/Order/BorrowingProcessPage.ets",
       "buildFunction": "BorrowingProcessBuilder"
     },
     {
       "name": "OrderManagementPage",
-      "pageSourceFile": "src/main/ets/pages/OrderManagementPage.ets",
+      "pageSourceFile": "src/main/ets/pages/Order/OrderManagementPage.ets",
       "buildFunction": "OrderManagementBuilder"
     },
     {
       "name": "OrderDetailPage",
-      "pageSourceFile": "src/main/ets/pages/OrderDetailPage.ets",
+      "pageSourceFile": "src/main/ets/pages/Order/OrderDetailPage.ets",
       "buildFunction": "OrderDetailBuilder"
     },
     {
       "name": "BorrowAnsPage",
-      "pageSourceFile": "src/main/ets/pages/BorrowAnsPage.ets",
+      "pageSourceFile": "src/main/ets/pages/Order/BorrowAnsPage.ets",
       "buildFunction": "BorrowAnsBuilder"
     }
   ]