From 80787213bc9df717c571c2c02410889a96681db9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Mon, 17 Jan 2022 09:16:18 +0800
Subject: [PATCH 1/2] AiTopFixed

---
 src/apps/AppMarryAndDie/AppMarryAndDie.vue | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/apps/AppMarryAndDie/AppMarryAndDie.vue b/src/apps/AppMarryAndDie/AppMarryAndDie.vue
index 9bcd4147..1b5363f2 100644
--- a/src/apps/AppMarryAndDie/AppMarryAndDie.vue
+++ b/src/apps/AppMarryAndDie/AppMarryAndDie.vue
@@ -1,6 +1,8 @@
 <template>
   <div class="AppMarryAndDie">
-    <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" bg-color="#3975C6" inactive-color="#fff" active-color="#fff" @change="change"></u-tabs>
+    <AiTopFixed>
+      <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" bg-color="#3975C6" inactive-color="#fff" active-color="#fff" @change="change"></u-tabs>
+    </AiTopFixed>
 
     <div v-show="currentTabs == 0" class="msg">
       <div class="box">
@@ -328,6 +330,22 @@ uni-page-body {
 .AppMarryAndDie {
   height: 100%;
 
+  ::v-deep .AiTopFixed {
+    .placeholder {
+      .content {
+        min-height: 0 !important;
+        padding: 0 !important;
+      }
+    }
+    .fixed {
+      min-height: 0 !important;
+      .content {
+        min-height: 0 !important;
+        padding: 0 !important;
+      }
+    }
+  }
+
   .msg {
     background: #fff;
     .box {

From e4db9420ecb29e1ca68cd3e85fc2c1184c99f58b Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Mon, 17 Jan 2022 09:33:40 +0800
Subject: [PATCH 2/2] 26792

---
 src/apps/AppGridManagement/Organization.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/apps/AppGridManagement/Organization.vue b/src/apps/AppGridManagement/Organization.vue
index beedb406..dda2d2df 100644
--- a/src/apps/AppGridManagement/Organization.vue
+++ b/src/apps/AppGridManagement/Organization.vue
@@ -148,6 +148,7 @@ export default {
       margin-right: 32px;
     }
     .right{
+      width: 100%;
       .name{
         font-size: 32px;
         font-family: PingFangSC-Medium, PingFang SC;