Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_cp/dv_cp_wechat_app into dev

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;

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 {