Merge remote-tracking branch 'origin/master'

entry/src/main/ets/index.ets

+@Entry
+@Component
+export struct PageManagement {
+
+  @State fontColor: string = '#182431'
+  @State selectedFontColor: string = '#007DFF'
+  @State currentIndex: number = 0
+  private controller: TabsController = new TabsController()
+
+  @Builder TabBuilder(index: number, name: string) {
+    Column() {
+      Text(name)
+        .fontColor(this.currentIndex === index ? this.selectedFontColor : this.fontColor)
+        .fontSize(16)
+        .fontWeight(this.currentIndex === index ? 500 : 400)
+        .lineHeight(22)
+        .margin({ top: 17, bottom: 7 })
+      Divider()
+        .strokeWidth(2)
+        .color('#0fa983')
+        .opacity(this.currentIndex === index ? 1 : 0)
+    }.width('100%')
+  }
+
+  build() {
+    Column() {
+      Column(){
+        TextInput({ placeholder: '请输入订单号查询' })
+          .backgroundColor("#fff").width('80%')
+      }.backgroundColor("#0fa983").width('100%').height(70)
+      Image($rawfile("parcelManagement/banner-.png")).width('100%')
+
+     Row(){
+       Flex({justifyContent:FlexAlign.SpaceEvenly}){
+         Row(){
+           Column(){
+             Image($rawfile("parcelManagement/qj.png")).width(30).margin({top:15})
+             Text("取件").margin({top:15}).fontWeight(600).fontSize(18)
+             Text("仓库取件").margin({bottom:15,top:15}).fontSize(13)
+           }
+         }.width("45%").backgroundColor('#f8fdfc').justifyContent(FlexAlign.Center)
+
+         Row(){
+           Column(){
+             Image($rawfile("parcelManagement/cx.png")).width(42).margin({top:15})
+             Text("取件").margin({top:15}).fontWeight(600).fontSize(18)
+             Text("仓库取件").margin({bottom:15,top:15}).fontSize(13)
+           }
+         }.width("45%").backgroundColor('#f8fdfc').justifyContent(FlexAlign.Center)
+       }
+     }.margin({top: 20})
+
+      Tabs({ barPosition: BarPosition.Start, controller: this.controller }) {
+        TabContent() {
+          Column().width('100%').height('100%').backgroundColor('#00CB87')
+        }.tabBar(this.TabBuilder(0, '最新上架'))
+
+        TabContent() {
+          Column().width('100%').height('100%').backgroundColor('#007DFF')
+        }.tabBar(this.TabBuilder(1, '取件记录'))
+      }
+      .height(250)
+      .onChange((index: number) => {
+        this.currentIndex = index
+      })
+
+      Row() {
+        Row() {
+          Column(){
+            Row(){
+              Text("0")
+              Text("条")
+            }
+            Text("订单数量")
+          }
+        }.width('50%').justifyContent(FlexAlign.Center)
+        Row() {
+          Column(){
+              Text("待上架0条")
+              Text("未领取0条")
+              Text("已领取0条")
+          }
+        }.width('50%').justifyContent(FlexAlign.Center)
+      }
+    }
+    .width('100%')
+  }
+}
\ No newline at end of file

entry/src/main/ets/viewmodel/MainPageData.ets

@@ -25,7 +25,7 @@ const buttonInfo: ButtonInfoModel[] = [
     index: 0,
     img: $rawfile("tabbar/saomiao.png"),
     selectImg: $rawfile("tabbar/saomiao3.png"),
-    title: $r('app.string.wz_management')
+    title: $r('app.string.direct')
   },
   {
     index: 1,

features/PageManagement/src/main/ets/components/PageManagement.ets

+@Entry
 @Component
 export struct PageManagement {
-  @State message: string = 'PageManagement'
+
+  @State fontColor: string = '#182431'
+  @State selectedFontColor: string = '#007DFF'
+  @State currentIndex: number = 0
+  private controller: TabsController = new TabsController()
+
+  @Builder TabBuilder(index: number, name: string) {
+    Column() {
+      Text(name)
+        .fontColor(this.currentIndex === index ? this.selectedFontColor : this.fontColor)
+        .fontSize(16)
+        .fontWeight(this.currentIndex === index ? 500 : 400)
+        .lineHeight(22)
+        .margin({ top: 17, bottom: 7 })
+      Divider()
+        .strokeWidth(2)
+        .color('#0fa983')
+        .opacity(this.currentIndex === index ? 1 : 0)
+    }.width('100%')
+  }
 
   build() {
-    Row() {
     Column() {
-        Text(this.message)
-          .fontSize(50)
-          .fontWeight(FontWeight.Bold)
+      Column(){
+        TextInput({ placeholder: '请输入订单号查询' })
+          .backgroundColor("#fff").width('80%')
+      }.backgroundColor("#0fa983").width('100%').height(70)
+      Image($rawfile("parcelManagement/banner-.png")).width('100%')
+
+      Row(){
+        Flex({justifyContent:FlexAlign.SpaceEvenly}){
+          Row(){
+            Column(){
+              Image($rawfile("parcelManagement/qj.png")).width(30).margin({top:15})
+              Text("取件").margin({top:15}).fontWeight(600).fontSize(18)
+              Text("仓库取件").margin({bottom:15,top:15}).fontSize(13)
             }
-      .width('100%')
+          }.width("45%").backgroundColor('#f8fdfc').justifyContent(FlexAlign.Center)
+
+          Row(){
+            Column(){
+              Image($rawfile("parcelManagement/cx.png")).width(42).margin({top:15})
+              Text("取件").margin({top:15}).fontWeight(600).fontSize(18)
+              Text("仓库取件").margin({bottom:15,top:15}).fontSize(13)
+            }
+          }.width("45%").backgroundColor('#f8fdfc').justifyContent(FlexAlign.Center)
+        }
+      }.margin({top: 20})
+
+      Tabs({ barPosition: BarPosition.Start, controller: this.controller }) {
+        TabContent() {
+          Column().width('100%').height('100%').backgroundColor('#00CB87')
+        }.tabBar(this.TabBuilder(0, '最新上架'))
+
+        TabContent() {
+          Column().width('100%').height('100%').backgroundColor('#007DFF')
+        }.tabBar(this.TabBuilder(1, '取件记录'))
+      }
+      .height(250)
+      .onChange((index: number) => {
+        this.currentIndex = index
+      })
+
+      Row() {
+        Row() {
+          Column(){
+            Row(){
+              Text("0")
+              Text("条")
+            }
+            Text("订单数量")
           }
-    .height('100%')
+        }.width('50%').justifyContent(FlexAlign.Center)
+        Row() {
+          Column(){
+            Text("待上架0条")
+            Text("未领取0条")
+            Text("已领取0条")
+          }
+        }.width('50%').justifyContent(FlexAlign.Center)
+      }
+    }
+    .width('100%')
   }
 }
\ No newline at end of file