Merge remote-tracking branch 'origin/master'

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

@@ -277,7 +277,7 @@ struct AddAdjustModelPage{
   build() {
     Column() {
       Flex({ direction: FlexDirection.Column }) {
-        TitleBar({ title: "物资新增" }).padding({bottom:10})
+        TitleBar({ title: "物资新增" })
         Tabs({ barPosition: BarPosition.Start, controller: this.controller }) {
           TabContent() {
             Column(){

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

@@ -262,7 +262,7 @@ struct AddConversionPage {
   build() {
     Column() {
       Flex({ direction: FlexDirection.Column }) {
-        TitleBar({ title: "物资换位" }).padding({bottom:10})
+        TitleBar({ title: "物资换位" })
         Tabs({ barPosition: BarPosition.Start, controller: this.controller }) {
           TabContent() {
             Column(){

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

@@ -281,7 +281,7 @@ export struct AddTemporaryInPage {
   build() {
     Column() {
       Flex({ direction: FlexDirection.Column }) {
-        TitleBar({ title: "物资新增" }).padding({ bottom: 10 })
+        TitleBar({ title: "物资新增" })
         Tabs({ barPosition: BarPosition.Start, controller: this.controller }) {
           TabContent() {
             Column() {

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

@@ -270,7 +270,7 @@ struct AddTemporaryOutPage{
   build(){
     Column() {
       Flex({ direction: FlexDirection.Column }) {
-        TitleBar({ title: "物资新增"}).padding({bottom:10})
+        TitleBar({ title: "物资新增"})
         Tabs({ barPosition: BarPosition.Start, controller: this.controller }) {
           TabContent() {
             Column(){

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

@@ -76,9 +76,6 @@ struct WzConversionPage{
         Column() {
           Demo({itemClick: this.itemClick}).width('90%')
         }.flexGrow(1).backgroundColor('#fff').alignSelf(ItemAlign.Center)
-        Column(){
-          BasicTable({dataSource:[]})
-        }.flexGrow(1)
       }
     }.linearGradient({
       direction: GradientDirection.Right, // 渐变方向

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

@@ -70,7 +70,6 @@ struct WzPositionPage{
         Column() {
           Demo({itemClick: this.itemClick}).width('90%')
         }.flexGrow(1).backgroundColor('#fff').alignSelf(ItemAlign.Center)
-
       }
     }.linearGradient({
       direction: GradientDirection.Right, // 渐变方向

entry/src/main/ets/pages/order_detail/PzAdjustModelPage.ets

@@ -294,7 +294,7 @@ struct PzAdjustModelPage{
   build(){
     Column() {
       Flex({ direction: FlexDirection.Column }) {
-        TitleBar({ title: "凭证详情"}).padding({bottom:10})
+        TitleBar({ title: "凭证详情"})
         Tabs({ barPosition: BarPosition.Start, controller: this.controller }) {
           TabContent() {
             Column(){

entry/src/main/ets/pages/order_detail/PzInOutDetailPage.ets

@@ -267,7 +267,7 @@ struct PzInOutDetailPage{
   build(){
     Column() {
       Flex({ direction: FlexDirection.Column }) {
-        TitleBar({ title: "凭证详情"}).padding({bottom:10})
+        TitleBar({ title: "凭证详情"})
         Tabs({ barPosition: BarPosition.Start, controller: this.controller }) {
           TabContent() {
             Column(){

entry/src/main/ets/pages/order_detail/PzInvDetailPage.ets

@@ -253,7 +253,7 @@ struct PzInvDetailPage{
   build(){
     Column() {
       Flex({ direction: FlexDirection.Column }) {
-        TitleBar({ title: "凭证详情"}).padding({bottom:10})
+        TitleBar({ title: "凭证详情"})
         Tabs({ barPosition: BarPosition.Start, controller: this.controller }) {
           TabContent() {
             Column(){

entry/src/main/ets/pages/order_detail/PzPourStoragePage.ets

@@ -332,7 +332,7 @@ struct PzPourStoragePage{
   build(){
     Column() {
       Flex({ direction: FlexDirection.Column }) {
-        TitleBar({ title: "凭证详情"}).padding({bottom:10})
+        TitleBar({ title: "凭证详情"})
         Tabs({ barPosition: BarPosition.Start, controller: this.controller }) {
           TabContent() {
             Column(){

entry/src/main/ets/view/title/TitleBar.ets

@@ -37,6 +37,6 @@ export struct TitleBar {
           }
         }.width('100%')
       }.width('100%').layoutWeight(1)
-    }.padding({top: `${StatusBarManager.get().getSystemBarOffset()}px`}).width('100%').height(65)
+    }.padding({top: `${StatusBarManager.get().getSystemBarOffset()}px`}).width('100%').height("10%")
   }
 }
\ No newline at end of file