commit

entry/src/main/ets/pages/MainPage.ets

@@ -20,7 +20,6 @@ struct MainPage {
 
   aboutToAppear() {
     this.breakpointSystem.register();
-
   }
 
   aboutToDisappear() {

entry/src/main/ets/pages/metailmange/AddConversionPage.ets

@@ -247,13 +247,16 @@ struct AddConversionPage {
         TitleBar({ title: "物资换位" })
         Tabs({ barPosition: BarPosition.Start, controller: this.controller }) {
           TabContent() {
-            // Column().width('100%').height('100%').backgroundColor('#00CB87')
+            Column(){
               this.VoucherRow()
+            }.margin({top:15})
+
           }.tabBar(this.TabBuilder(0, '凭证信息'))
 
           TabContent() {
-            // Column().width('100%').height('100%').backgroundColor('#007DFF')
+            Column(){
               this.WzInfoRow()
+            }.margin({top:15})
           }.tabBar(this.TabBuilder(1, '物资信息'))
         }
         .height(500)

entry/src/main/ets/pages/package/Pack.ets

@@ -18,6 +18,7 @@ interface Type {
 @Component
 export struct Pack {
   @State type: string = ''
+  controller: SearchController = new SearchController()
 
 aboutToAppear(){
   let params = router.getParams() as Type;
@@ -29,22 +30,53 @@ aboutToAppear(){
     Column(){
       Flex({direction:FlexDirection.Column}){
         TitleBar({ title:"包裹信息查询" })
-        Row(){
-          Flex({justifyContent:FlexAlign.SpaceAround}) {
 
+        Row(){
+          Flex({justifyContent:FlexAlign.SpaceAround,alignItems:ItemAlign.Center}) {
             if(this.type == 'wait') {
-              TextInput({placeholder:"请输入包裹信息"}).width('50%')
+              Search({ placeholder: '请输入包裹信息', controller: this.controller })
+                .height(40)
+                .backgroundColor('#F5F5F5')
+                .placeholderColor(Color.Grey)
+                .placeholderFont({ size: 14, weight: 400 })
+                .textFont({ size: 14, weight: 400 })
+                .width('50%')
+                .onSubmit((value: string) => {
+                })
+                .onChange((value: string) => {
+                })
               Button("接收").CommonButtonStyle()
               Button("上架").CommonButtonStyle()
             }
 
             if(this.type == 'unclaimed') {
-              TextInput({placeholder:"请输入包裹信息"}).width('50%')
+              Search({ placeholder: '请输入包裹信息', controller: this.controller })
+                .height(40)
+                .backgroundColor('#F5F5F5')
+                .placeholderColor(Color.Grey)
+                .placeholderFont({ size: 14, weight: 400 })
+                .textFont({ size: 14, weight: 400 })
+                .width('50%')
+                .onSubmit((value: string) => {
+                })
+                .onChange((value: string) => {
+                })
               Button("导出").CommonButtonStyle()
               Button("打印面单").CommonButtonStyle()
             }
+
             if(this.type == 'received') {
-              TextInput({placeholder:"请输入包裹信息"}).width('70%')
+              Search({ placeholder: '请输入包裹信息', controller: this.controller })
+                .height(40)
+                .backgroundColor('#F5F5F5')
+                .placeholderColor(Color.Grey)
+                .placeholderFont({ size: 14, weight: 400 })
+                .textFont({ size: 14, weight: 400 })
+                .width('70%')
+                .onSubmit((value: string) => {
+                })
+                .onChange((value: string) => {
+                })
               Button("导出").CommonButtonStyle()
             }
           }

entry/src/main/ets/pages/package/Pick.ets

@@ -14,15 +14,26 @@ import { TitleBar } from '../../view/title/TitleBar'
 @Entry
 @Component
 export struct Pick {
+  controller: SearchController = new SearchController()
+
   build() {
     Column() {
-      Flex({ direction: FlexDirection.Column }) {
+      Flex({ direction: FlexDirection.Column, alignItems:ItemAlign.Center }) {
         TitleBar({ title: "取件" })
         Row() {
           Flex({justifyContent:FlexAlign.Center}){
-            TextInput({ placeholder: "请输入取件码或者手机后四位查询" }).width('80%').height(45).backgroundColor('#fff')
+            Search({ placeholder: '请输入包裹信息', controller: this.controller })
+              .height(40)
+              .backgroundColor('#F5F5F5')
+              .placeholderColor(Color.Grey)
+              .placeholderFont({ size: 14, weight: 400 })
+              .textFont({ size: 14, weight: 400 })
+              .width('80%')
+              .onSubmit((value: string) => {
+              })
+              .onChange((value: string) => {
+              })
           }
-
         }.margin({ top: 20 })
 
         Column() {

features/DirectConnect/src/main/ets/components/DirectConnect.ets

+
+@Extend(Button) function CommonButtonStyle() {
+  .borderWidth(2)
+  .borderColor('#0fa983')
+  .backgroundColor('#fff')
+  .fontColor('#0fa983')
+  .borderRadius(10)
+  .type(ButtonType.Normal)
+  .height(30)
+  .margin({ left: 10,right: 10 })
+  .stateEffect(true)
+}
+
+@Entry
 @Component
 export struct DirectConnect {
   @State message: string = 'DirectConnect'
-  build() {
+
+  @Builder renderTop() {
+    Column() {
+      Row() {
+        Divider()
+          .vertical(true)
+          .height(14)
+          .strokeWidth(3)
+          .color('#19ac88')
+          .opacity(0.6)
+          .margin({ left: 8, right: 8 })
+        Text("扫描信息")
+          .fontWeight(FontWeight.Medium)
+          .fontSize(14)
+      }
+
+      Row() {
+        Text("连接状态：").fontSize(20)
+        Text("未连接").fontColor("#22b08d").fontSize(21)
+      }.padding({ top: 8, bottom: 8 })
+
       Row() {
+        Text("扫描信息：").fontSize(18)
+        Text("请扫描二维码").fontSize(19)
+      }.padding({ top: 8, bottom: 8 })
+    }
+    .backgroundColor("#fff")
+    .height("20%")
+    .width("100%")
+    .margin({ top: 25 })
+    .borderRadius(15)
+  }
+
+  @Builder renderBottom() {
     Column() {
-        Text(this.message)
-          .fontSize(50)
-          .fontWeight(FontWeight.Bold)
+      Row() {
+        Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
+          Row() {
+            Divider()
+              .vertical(true)
+              .height(14)
+              .strokeWidth(3)
+              .color('#19ac88')
+              .opacity(0.6)
+              .margin({ left: 8, right: 8 })
+            Text("历史扫描信息").fontSize(10)
+              .fontWeight(FontWeight.Medium)
+              .fontSize(14)
+              .margin({ left: 7, right: 7 })
+          }
+
+          Row() {
+            Text("流水统计数量：0")
+            Button("清空").onClick((event: ClickEvent) => {
+            }).CommonButtonStyle()
           }
-      .width('100%')
         }
-    .height('100%')
+      }.margin({ top: 12 })
+    }
+    .height("70%")
+    .width("100%")
+    .backgroundColor("#fff")
+    .margin({ top: 25 })
+    .borderRadius(15)
+  }
+
+  build() {
+    Column() {
+      this.renderTop()
+      this.renderBottom()
+      // BasicTable()
+
+    }.padding({ left: 20, right: 20 }).width("100%").height("100%").linearGradient({
+      direction: GradientDirection.RightBottom,
+      repeating: true,
+      colors: [[0x36a3c0, 0.0], [0x97c6a6, 1.0], [0xc7d799, 2.0]]
+    })
   }
 }
\ No newline at end of file

features/PageManagement/src/main/ets/pages/PageManagement.ets

@@ -5,6 +5,7 @@ import router from '@ohos.router'
 export struct PageManagement {
   @State currentIndex: number = 0
   private controller: TabsController = new TabsController()
+  searchController: SearchController = new SearchController()
 
   @Builder TabBuilder(index: number, name: string) {
     Column() {
@@ -24,8 +25,17 @@ export struct PageManagement {
     Column() {
       Flex({ direction: FlexDirection.Column }) {
         Column() {
-          TextInput({ placeholder: '请输入订单号查询' })
-            .backgroundColor("#fff").width('80%').margin({top:16})
+          Search({ placeholder: '请输入订单号查询', controller: this.searchController })
+            .backgroundColor('#F5F5F5')
+            .placeholderColor(Color.Grey)
+            .placeholderFont({ size: 14, weight: 400 })
+            .textFont({ size: 14, weight: 400 })
+            .width('80%')
+            .margin({ top: 14 })
+            .onSubmit((value: string) => {
+            })
+            .onChange((value: string) => {
+            })
         }.backgroundColor("#0fa983").width('100%').height(70)
 
         Image($r("app.media.banner")).width('100%')