Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app

src/pages/product/outbound/index.vue

@@ -18,13 +18,7 @@
             "
           >
             <u-icon size="80" :name="item.iconClass"></u-icon>
-            <text class="name">
+            <text class="name"> {{ session.lang == 'en' ? index + 1 + ' ' + item.engResourceName : index + 1 + ' ' + item.resourceName }}</text>
-              {{
-                session.lang == 'en'
-                  ? index + 1 + ' ' + item.engResourceName
-                  : index + 1 + ' ' + item.resourceName
-              }}</text
-            >
           </u-button>
         </u-col>
         <!-- <u-col :span="12">
@@ -57,20 +51,37 @@ export default class RawAppointment extends BasePage {
   min-height: 100%;
 
   .header {
+    // position: fixed;
+    // top: 36rpx;
+    // left: 0;
+    // right: 0;
+    // z-index: 99;
+    // display: flex;
+    // background-color: #255cea;
+    // height: 88rpx;
+    // line-height: 88rpx;
+    // color: #fff;
+    // font-size: 34rpx;
+    // font-weight: 500;
+    // text-align: center;
+    // box-shadow: 0 1rpx 5rpx #6b90ef;
     position: fixed;
-    top: 36rpx;
+    top: 0;
+    padding-top: 18px;
     left: 0;
     right: 0;
     z-index: 99;
+    display: -webkit-box;
+    display: -webkit-flex;
     display: flex;
     background-color: #255cea;
-    height: 88rpx;
+    /* height: 46px; */
-    line-height: 88rpx;
+    line-height: 46px;
     color: #fff;
-    font-size: 34rpx;
+    font-size: 17px;
     font-weight: 500;
     text-align: center;
-    box-shadow: 0 1rpx 5rpx #6b90ef;
+    box-shadow: 0 1px 2px #6b90ef;
     .title {
       flex: 3;
     }