diff --git a/src/assets/scss/main.scss b/src/assets/scss/main.scss
index 34453e2..3778d5e 100644
--- a/src/assets/scss/main.scss
+++ b/src/assets/scss/main.scss
@@ -33,12 +33,12 @@ html{
 }
 @media screen and (max-width: 1600px) {
   html {
-    font-size: 12px; // 更小的字体以适配较小屏幕
+    font-size: 14px; // 更小的字体以适配较小屏幕
   }
 }
 @media screen and (max-width: 1440px) {
   html {
-    font-size: 10px; // 更小的字体以适配较小屏幕
+    font-size: 12px; // 更小的字体以适配较小屏幕
   }
 }
 #app {
@@ -134,6 +134,7 @@ $btn-color: #4D6DE4;
 $lighter-color: rgba(#4D6DE4, 0.5);
 .default-btn{
   cursor: pointer;
+  display: inline-block;
   width: 120px;
   height: 42px;
   line-height: 42px;
@@ -146,4 +147,19 @@ $lighter-color: rgba(#4D6DE4, 0.5);
     background: $lighter-color;
   }
 
+}
+.small-btn{
+  cursor: pointer;
+  display: inline-block;
+  width: 72px;
+  height: 24px;
+  line-height: 24px;
+  background: $btn-color;
+  border-radius: 3px;
+  color: #FFF;
+  font-size: 12px;
+  text-align: center;
+  &:hover{
+    background: $lighter-color;
+  }
 }
\ No newline at end of file
diff --git a/src/components/charge/OrderDetail.vue b/src/components/charge/OrderDetail.vue
index a860f03..60154a4 100644
--- a/src/components/charge/OrderDetail.vue
+++ b/src/components/charge/OrderDetail.vue
@@ -64,66 +64,60 @@
           </div>
         </div>
         <div class="right">
-          <div class="right_head">
-            <div class="title">支付信息</div>
-            <div class="info">
-              <div class="item">
-                <div class="label">开单时间</div>
-                <div class="value">{{ formatDate(orderInfo.createDatetime) }}</div>
-              </div>
-              <div class="item">
-                <div class="label">完成时间</div>
-                <div class="value">{{ formatDate(orderInfo.payTime) }}</div>
-              </div>
-              <div class="item">
-                <div class="label">收费员</div>
-                <div class="value">{{ orderInfo.salePersonName }}</div>
-              </div>
-              <div class="item">
-                <div class="label">药师</div>
-                <div class="value">{{ orderInfo.dockerName }}</div>
-              </div>
-              <div class="item">
-                <div class="label">销售人</div>
-                <div class="value">{{ orderInfo.salePersonName }}</div>
-              </div>
-              <div class="item">
-                <div class="label">原价</div>
-                <div class="value">￥{{ orderInfo.preTotalPrice }}</div>
-              </div>
-              <div class="item">
-                <div class="label">优惠</div>
-                <div class="value">￥{{ (orderInfo.preTotalPrice - orderInfo.totalPrice).toFixed(2) }}</div>
-              </div>
-              <div class="item">
-                <div class="label">应收</div>
-                <div class="value">￥{{ orderInfo.totalPrice }}</div>
-              </div>
-              <div class="item">
-                <div class="label">实收</div>
-                <div class="value">￥{{ orderInfo.totalPrice }}</div>
-              </div>
-              <div class="item">
-                <div class="label">支付方式</div>
-                <div class="value">{{ orderInfo.orderId }}</div>
-              </div>
-              <div class="item">
-                <div class="label">零售备注</div>
-                <div class="value">{{ orderInfo.orderId }}</div>
-              </div>
+          <div class="title">支付信息</div>
+          <div class="info">
+            <div class="item">
+              <div class="label">开单时间</div>
+              <div class="value">{{ formatDate(orderInfo.createDatetime) }}</div>
             </div>
-          </div>
-          <div class="right_body">
-            <div class="label">发票状态</div>
-            <div class="value">未开票</div>
-          </div>
-          <div class="right_foot">
-            <div class="label">
-              <div class="pay">收-{{ orderInfo.payType ? getPayTypeStr(orderInfo.payType) : "" }}</div>
-              <div class="name">{{ orderInfo.salePersonName }}</div>
-              <div>备注：-</div>
+            <div class="item">
+              <div class="label">完成时间</div>
+              <div class="value">{{ formatDate(orderInfo.payTime) }}</div>
+            </div>
+            <div class="item">
+              <div class="label">收费员</div>
+              <div class="value">{{ orderInfo.salePersonName }}</div>
+            </div>
+            <div class="item">
+              <div class="label">药师</div>
+              <div class="value">{{ orderInfo.dockerName }}</div>
+            </div>
+            <div class="item">
+              <div class="label">销售人</div>
+              <div class="value">{{ orderInfo.salePersonName }}</div>
+            </div>
+            <div class="item">
+              <div class="label">原价</div>
+              <div class="value">￥{{ orderInfo.preTotalPrice }}</div>
+            </div>
+            <div class="item">
+              <div class="label">优惠</div>
+              <div class="value">￥{{ (orderInfo.preTotalPrice - orderInfo.totalPrice).toFixed(2) }}</div>
+            </div>
+            <div class="item">
+              <div class="label">应收</div>
+              <div class="value">￥{{ orderInfo.totalPrice }}</div>
+            </div>
+            <div class="item">
+              <div class="label">实收</div>
+              <div class="value">￥{{ orderInfo.totalPrice }}</div>
+            </div>
+            <div class="item">
+              <div class="label">支付方式</div>
+              <div class="value">{{ orderInfo.orderId }}</div>
+            </div>
+            <div class="item">
+              <div class="label">发票状态</div>
+              <div class="value" :style="{color:orderInfo.status==1 ? '#4D6DE4':'#63BD39'}">{{orderInfo.status==1 ? "未开票":"已开票"}}</div>
+            </div>
+            <div class="item">
+              <div class="label" style="color: #333333">收-{{ orderInfo.payType ? getPayTypeStr(orderInfo.payType) : "" }}</div>
+              <div class="value" style="color: #FF0000">￥{{ orderInfo.totalPrice }}</div>
+            </div>
+            <div class="item">
+              <div class="label">备注</div>
+              <div class="value">-</div>
             </div>
-            <div class="value">￥{{ orderInfo.totalPrice }}</div>
           </div>
         </div>
       </div>
@@ -281,7 +275,6 @@ onUnmounted(() => {
   .left {
     flex: 1;
     height: 100%;
-    margin-right: 10px;
     min-height: 0;
     display: flex;
     flex-direction: column;
@@ -318,82 +311,39 @@ onUnmounted(() => {
   .right {
     width: 314px;
     height: 100%;
-    border: solid 1px #e6e6e6;
     display: flex;
     flex-direction: column;
-
-    .right_head {
-      padding: 10px;
-
-      .title {
-        font-size: 12px;
-        font-weight: 600;
-        height: 25px;
-      }
-
-      .info {
-        font-size: 12px;
-        font-weight: 400;
-        color: #999ca1;
-
-        .item {
-          display: flex;
-          justify-content: space-between;
-          margin-bottom: 10px;
-
-          .value {
-            color: #000;
-          }
-        }
-      }
+    padding: 24px;
+    .title {
+      font-weight: 800;
+      font-size: 18px;
+      color: #333333;
+      font-style: normal;
+      margin-bottom: 24px;
     }
 
-    .right_body {
-      padding: 0 10px;
-      font-size: 12px;
-      font-weight: 400;
-      height: 30px;
-      color: #999ca1;
-      border-top: 1px solid #e6e6e6;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-
-      .value {
-        color: base.$warning-color;
-      }
-    }
-
-    .right_foot {
+    .info {
       flex: 1;
-      padding: 0 10px;
-      font-size: 12px;
-      font-weight: 400;
-      color: #999ca1;
-      border-top: 1px solid #e6e6e6;
+      font-weight: 500;
+      font-size: 16px;
+      color: #999999;
+      font-style: normal;
       display: flex;
+      flex-direction: column;
       justify-content: space-between;
-      align-items: center;
+      min-height: 0;
 
-      .label {
+      .item {
         display: flex;
-        flex-direction: column;
-        justify-content: center;
-        height: 100%;
+        justify-content: space-between;
 
-        .pay {
+        .value {
           color: #000;
         }
-
-        .name {
-          margin: 5px 0;
-        }
       }
 
-      .value {
-        color: #000;
-      }
     }
+
   }
 }
 
diff --git a/src/components/common/Footer.vue b/src/components/common/Footer.vue
index 383e1f8..9ec9602 100644
--- a/src/components/common/Footer.vue
+++ b/src/components/common/Footer.vue
@@ -1,6 +1,6 @@
 <template>
   <footer>
-    @版权所有:沈阳嘉尔网络科技有限公司
+    @版权所有:沈阳嘉尔科技有限公司
   </footer>
 </template>
 
diff --git a/src/components/common/Mask.vue b/src/components/common/Mask.vue
index b4ae821..88d7034 100644
--- a/src/components/common/Mask.vue
+++ b/src/components/common/Mask.vue
@@ -35,6 +35,9 @@ watch(
       _height.value = newVal == null ? 800 : Number(newVal);
     }
 );
+let width_rem=(_width.value/16).toFixed(2);
+let height_rem=(_height.value/16).toFixed(2);
+
 
 </script>
 
@@ -42,7 +45,7 @@ watch(
   <teleport to="body">
     <transition name="el-fade-in">
       <div class="mask" v-if="_isShow">
-        <div class="mask-wrapper" :style="{ width: _width + 'px', height: _height + 'px' }" v-if="_isShow">
+        <div class="mask-wrapper" :style="{ width: width_rem + 'rem', height: height_rem + 'rem' }" v-if="_isShow">
           <div class="header">
             <div class="title">{{ title }}</div>
             <div class="close" @click="closeBtn" v-if="_close">
diff --git a/src/components/home/index/InventoryAlert.vue b/src/components/home/index/InventoryAlert.vue
index 84965c5..f37d3b7 100644
--- a/src/components/home/index/InventoryAlert.vue
+++ b/src/components/home/index/InventoryAlert.vue
@@ -32,7 +32,7 @@ const isZeroInventory = (item: any) => {
 <template>
   <Panel title="库存预警" class="kuCun">
     <template #tools>
-      <el-button type="primary" size="small" @click="openInventoryWarnDetail">查看详情</el-button>
+      <span  class="small-btn" @click="openInventoryWarnDetail">查看详情</span>
     </template>
     <div style="padding: 0 24px 24px">
       <div class="box">
diff --git a/src/components/home/index/ValidityWarning.vue b/src/components/home/index/ValidityWarning.vue
index 42c93ed..1bfeff2 100644
--- a/src/components/home/index/ValidityWarning.vue
+++ b/src/components/home/index/ValidityWarning.vue
@@ -31,7 +31,7 @@ const isExpire = (item: any) => {
 <template>
   <Panel title="效期预警" class="xiaoQi">
     <template #tools>
-      <el-button type="primary" size="small" @click="openExpireWarnDetail">查看详情</el-button>
+      <span class="small-btn" @click="openExpireWarnDetail">查看详情</span>
     </template>
     <div style="padding: 0 24px 24px">
       <div class="box">
diff --git a/src/components/outpatient/MedicalQueue.vue b/src/components/outpatient/MedicalQueue.vue
index abcfb10..82fa308 100644
--- a/src/components/outpatient/MedicalQueue.vue
+++ b/src/components/outpatient/MedicalQueue.vue
@@ -23,7 +23,7 @@
       </div>
       <div class="search">
         <img src="/static/images/outpatient/search.png" class="search-icon" alt="搜索图标">
-        <input class="search-input" v-model="search" placeholder="搜索门诊单" style="font-size: 16px">
+        <input class="search-input" v-model="search" placeholder="搜索门诊单">
       </div>
       <div class="list">
         <ul style="height: 100%">
diff --git a/src/components/social/inventoryUp/List_3501.vue b/src/components/social/inventoryUp/List_3501.vue
index 489634d..6526671 100644
--- a/src/components/social/inventoryUp/List_3501.vue
+++ b/src/components/social/inventoryUp/List_3501.vue
@@ -3,6 +3,7 @@ import {ref, computed, onMounted} from 'vue'
 import {ElInput, ElTable, ElTableColumn, ElPagination} from 'element-plus'
 import {post} from "@/utils/request.ts";
 import {Search} from "@element-plus/icons-vue";
+
 interface TableItem {
   name: string;
   status: string;
@@ -14,6 +15,7 @@ interface TableItem {
   uploadDatetime: string;
   fragmentNumber: number;
 }
+
 // 模拟数据
 const tableData = ref<TableItem[]>([])
 
@@ -59,46 +61,51 @@ let changePage = (value: number) => {
 let change_search = () => {
   init()
 }
-const formatDate = (isoStr:any) => {
-  if (!isoStr){
+const formatDate = (isoStr: any) => {
+  if (!isoStr) {
     return ''
   }
   const date = new Date(isoStr);
-  return `${date.getFullYear()}-${(date.getMonth()+1).toString().padStart(2,'0')}-${date.getDate().toString().padStart(2,'0')}`;
+  return `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}`;
 }
 </script>
 
 <template>
-  <div class="container-wrapper">
+  <div class="container">
     <div class="tip">
       <el-input
           v-model="code"
-          style="width: 240px;height: 32px"
+          style="width: 240px;height: 100%"
           placeholder="请输入库存初始化编码"
           :suffix-icon="Search"
           size="large" clearable
           @change="change_search"/>
-      <el-button type="primary" style="margin-left: 10px" @click="change_search">搜索</el-button>
+      <div class="default-btn" @click="change_search" style="margin-left: 24px">
+        <span class="iconfont icon-RectangleCopy"></span>
+        搜索
+      </div>
     </div>
     <div class="content">
       <el-table :data="tableData" style="width: 100%;height: 100%">
-        <el-table-column prop="name" label="商品名称" />
-        <el-table-column prop="code" label="库存初始化编码" />
+        <el-table-column prop="name" label="商品名称"/>
+        <el-table-column prop="code" label="库存初始化编码"/>
         <el-table-column prop="wholeNumber" label="初始化商品整量数量">
           <template #default="scope">
-            {{scope.row.wholeNumber}}{{scope.row.packagingUnit}}
+            {{ scope.row.wholeNumber }}{{ scope.row.packagingUnit }}
           </template>
 
         </el-table-column>
         <el-table-column prop="fragmentNumber" label="初始化商品分量数量">
           <template #default="scope">
-            {{scope.row.fragmentNumber}}{{scope.row.minPackagingUnit}}
+            {{ scope.row.fragmentNumber }}{{ scope.row.minPackagingUnit }}
           </template>
         </el-table-column>
         <el-table-column prop="createDate" label="初始化日期"/>
         <el-table-column prop="uploadStatus" label="状态">
           <template #default="{row}">
-            {{ row.uploadStatus == 0 ? '未上传' : row.uploadStatus == 1 ? '已上传' :row.uploadStatus == 2 ? '异常':"无需上报" }}
+            {{
+              row.uploadStatus == 0 ? '未上传' : row.uploadStatus == 1 ? '已上传' : row.uploadStatus == 2 ? '异常' : "无需上报"
+            }}
           </template>
         </el-table-column>
         <el-table-column prop="uploadMessage" label="上传状态信息" show-overflow-tooltip/>
@@ -125,15 +132,16 @@ const formatDate = (isoStr:any) => {
 
 <style scoped lang="scss">
 @use "@/assets/scss/base.scss";
-.container-wrapper {
+.container {
   display: flex;
   flex-direction: column;
   height: 100%;
   .tip {
-    height: 60px;
+    height: 42px;
   }
 
   .content {
+    margin-top: 24px;
     flex: 1;
     min-height: 0;
   }
@@ -142,7 +150,7 @@ const formatDate = (isoStr:any) => {
     height: 60px;
     display: flex;
     align-items: center;
-    background: base.$background-color-base;
+    justify-content: flex-end;
   }
 }
 </style>
\ No newline at end of file
diff --git a/src/components/social/inventoryUp/List_3502.vue b/src/components/social/inventoryUp/List_3502.vue
index 558bca2..ed4d9a3 100644
--- a/src/components/social/inventoryUp/List_3502.vue
+++ b/src/components/social/inventoryUp/List_3502.vue
@@ -30,7 +30,10 @@
           start-placeholder="开始时间"
           end-placeholder="结束时间"
       />
-      <el-button type="primary" style="margin-left: 10px" @click="change_search">搜索</el-button>
+      <div class="default-btn" @click="change_search" style="margin-left: 24px">
+        <span class="iconfont icon-RectangleCopy"></span>
+        搜索
+      </div>
     </div>
     <div class="content">
       <el-table :data="tableData" style="width: 100%;height: 100%">
@@ -219,31 +222,31 @@ const formatDate = (isoStr: any) => {
 
 <style scoped lang="scss">
 @use "@/assets/scss/base.scss";
-
 .container {
   display: flex;
   flex-direction: column;
   height: 100%;
-
   .top {
     height: 60px;
-
     .search {
       width: 300px;
     }
   }
-
   .content {
     flex: 1;
     min-height: 0;
   }
-
   .bottom {
     height: 60px;
     display: flex;
     align-items: center;
-    background: base.$background-color-base;
-
   }
 }
+
+:deep(.el-input__wrapper) {
+  height: 42px;
+}
+:deep(.el-select__wrapper){
+  height: 42px;
+}
 </style>
\ No newline at end of file
diff --git a/src/components/social/inventoryUp/List_3503.vue b/src/components/social/inventoryUp/List_3503.vue
index db835a1..fac4b06 100644
--- a/src/components/social/inventoryUp/List_3503.vue
+++ b/src/components/social/inventoryUp/List_3503.vue
@@ -23,8 +23,10 @@
             :value="key"
         />
       </el-select>
-
-      <el-button type="primary" style="margin-left: 10px" @click="change_search">搜索</el-button>
+      <div class="default-btn" @click="change_search" style="margin-left: 24px">
+        <span class="iconfont icon-RectangleCopy"></span>
+        搜索
+      </div>
     </div>
     <div class="content">
       <el-table :data="tableData" style="width: 100%;height: 100%">
@@ -169,4 +171,7 @@ const formatDate = (isoStr:any) => {
 
   }
 }
+:deep(.el-select__wrapper){
+  height: 42px;
+}
 </style>
\ No newline at end of file
diff --git a/src/components/social/inventoryUp/List_3505.vue b/src/components/social/inventoryUp/List_3505.vue
index 87e5a4d..5095936 100644
--- a/src/components/social/inventoryUp/List_3505.vue
+++ b/src/components/social/inventoryUp/List_3505.vue
@@ -1,7 +1,6 @@
-
 <script setup lang="ts">
 import {ref, computed, onMounted} from 'vue'
-import { ElInput, ElTable, ElTableColumn, ElPagination } from 'element-plus'
+import {ElInput, ElTable, ElTableColumn, ElPagination} from 'element-plus'
 import {post} from "@/utils/request.ts";
 import {Search} from "@element-plus/icons-vue";
 
@@ -10,19 +9,19 @@ const tableData = ref([])
 // 分页相关
 const currentPage = ref(1)
 const pageSize = ref(10)
-const total= ref(0)
+const total = ref(0)
 // 查询条件
 const code = ref('')
-onMounted(()=>{
+onMounted(() => {
   init()
 })
-let init = ()=>{
+let init = () => {
   const query = {
     page: 1,
     pageSize: 20,
     code: code.value
   }
-  post("social/upload/get3505List",{query: query}).then((res:any)=>{
+  post("social/upload/get3505List", {query: query}).then((res: any) => {
     tableData.value = res.list
   })
 }
@@ -33,21 +32,21 @@ let changePage = (value: number) => {
     pageSize: pageSize.value,
     code: code.value
   }
-  post("social/upload/get3505List",{query: query}).then((res:any)=>{
+  post("social/upload/get3505List", {query: query}).then((res: any) => {
     tableData.value = res.list
     total.value = res.total_count
   })
 }
-let change_search = ()=>{
+let change_search = () => {
   init()
 }
 // 转成YYYY-MM-DD格式
-const formatDate = (isoStr:any) => {
-  if (!isoStr){
+const formatDate = (isoStr: any) => {
+  if (!isoStr) {
     return "";
   }
   const date = new Date(isoStr);
-  return `${date.getFullYear()}-${(date.getMonth()+1).toString().padStart(2,'0')}-${date.getDate().toString().padStart(2,'0')}`;
+  return `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}`;
 }
 </script>
 
@@ -61,7 +60,10 @@ const formatDate = (isoStr:any) => {
           :suffix-icon="Search"
           clearable
           @change="change_search"/>
-      <el-button type="primary" style="margin-left: 10px" @click="change_search">搜索</el-button>
+      <div class="default-btn" @click="change_search" style="margin-left: 24px">
+        <span class="iconfont icon-RectangleCopy"></span>
+        搜索
+      </div>
     </div>
     <div class="content">
       <el-table :data="tableData" style="width: 100%;height: 100%">
@@ -69,23 +71,23 @@ const formatDate = (isoStr:any) => {
         <el-table-column prop="chargeOrderCode" label="订单号" show-overflow-tooltip/>
         <el-table-column prop="number" label="变化量">
           <template #default="{row}">
-            {{row.type ==1 ? row.number : "+"+row.number }}{{row.unit}}
+            {{ row.type == 1 ? row.number : "+" + row.number }}{{ row.unit }}
           </template>
         </el-table-column>
         <el-table-column prop="uploadMessage" label="变更类型" show-overflow-tooltip>
           <template #default="{row}">
-            {{row.type ==1 ? '销售' :row.type ==2 ? '退货': '异常' }}
+            {{ row.type == 1 ? '销售' : row.type == 2 ? '退货' : '异常' }}
           </template>
         </el-table-column>
         <el-table-column prop="feedetlSn" label="详情流水号" width="250"/>
         <el-table-column prop="createTime" label="初始化日期">
           <template #default="{row}">
-            {{formatDate(row.createTime)}}
+            {{ formatDate(row.createTime) }}
           </template>
         </el-table-column>
         <el-table-column prop="uploadStatus" label="状态">
           <template #default="{row}">
-            {{row.uploadStatus ==0 ? '未上传' :row.uploadStatus ==1 ? '已上传':row.uploadStatus ==2 ? '无需上报':"异常"}}
+            {{ row.uploadStatus == 0 ? '未上传' : row.uploadStatus == 1 ? '已上传' : row.uploadStatus == 2 ? '无需上报' : "异常" }}
           </template>
         </el-table-column>
 
@@ -108,17 +110,21 @@ const formatDate = (isoStr:any) => {
 
 <style scoped lang="scss">
 @use "@/assets/scss/base.scss";
+
 .container {
   display: flex;
   flex-direction: column;
   height: 100%;
+
   .top {
     height: 60px;
   }
+
   .content {
     flex: 1;
     min-height: 0;
   }
+
   .bottom {
     height: 60px;
     display: flex;
@@ -126,4 +132,8 @@ const formatDate = (isoStr:any) => {
     background: base.$background-color-base;
   }
 }
+
+:deep(.el-input__wrapper) {
+  height: 42px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/LayoutInventory.vue b/src/views/LayoutInventory.vue
index e6083ad..97ee100 100644
--- a/src/views/LayoutInventory.vue
+++ b/src/views/LayoutInventory.vue
@@ -20,12 +20,14 @@
 </template>
 
 <style scoped lang="scss">
-.body{
-  height: 100%;
+.body {
+  flex: 1;
   padding: 24px;
   display: flex;
   flex-direction: column;
+  min-height: 0;
 }
+
 .childMenu {
   width: 100%;
   height: 50px;
@@ -45,19 +47,21 @@
     position: relative;
     line-height: 50px;
     text-align: center;
-    &::before{
+
+    &::before {
       content: '';
       position: absolute;
       right: 0;
-      top:50%;
+      top: 50%;
       display: block;
       width: 2px;
       height: 16px;
       background: #D8D8D8;
       border-radius: 1px;
-      transform: translate(0 ,-50%);
+      transform: translate(0, -50%);
     }
-    &:last-child::before{
+
+    &:last-child::before {
       display: none;
     }
   }
@@ -75,7 +79,8 @@
     border-radius: 2px;
   }
 }
-a.router-link-active.router-link-exact-active.child-item{
+
+a.router-link-active.router-link-exact-active.child-item {
   color: #4D6DE4;
 }
 </style>
diff --git a/src/views/LayoutSetting.vue b/src/views/LayoutSetting.vue
index 54c4adc..64b348e 100644
--- a/src/views/LayoutSetting.vue
+++ b/src/views/LayoutSetting.vue
@@ -21,12 +21,14 @@
 </template>
 
 <style scoped lang="scss">
-.body{
-  height: 100%;
+.body {
+  flex: 1;
   padding: 24px;
   display: flex;
   flex-direction: column;
+  min-height: 0;
 }
+
 .childMenu {
   width: 100%;
   height: 50px;
@@ -46,19 +48,21 @@
     position: relative;
     line-height: 50px;
     text-align: center;
-    &::before{
+
+    &::before {
       content: '';
       position: absolute;
       right: 0;
-      top:50%;
+      top: 50%;
       display: block;
       width: 2px;
       height: 16px;
       background: #D8D8D8;
       border-radius: 1px;
-      transform: translate(0 ,-50%);
+      transform: translate(0, -50%);
     }
-    &:last-child::before{
+
+    &:last-child::before {
       display: none;
     }
   }
@@ -76,7 +80,8 @@
     border-radius: 2px;
   }
 }
-a.router-link-active.router-link-exact-active.child-item{
+
+a.router-link-active.router-link-exact-active.child-item {
   color: #4D6DE4;
 }
 </style>
diff --git a/src/views/LayoutSocial.vue b/src/views/LayoutSocial.vue
index 8cfbd81..c918c29 100644
--- a/src/views/LayoutSocial.vue
+++ b/src/views/LayoutSocial.vue
@@ -20,12 +20,14 @@
 </template>
 
 <style scoped lang="scss">
-.body{
-  height: 100%;
+.body {
+  flex: 1;
   padding: 24px;
   display: flex;
   flex-direction: column;
+  min-height: 0;
 }
+
 .childMenu {
   width: 100%;
   height: 50px;
@@ -45,19 +47,21 @@
     position: relative;
     line-height: 50px;
     text-align: center;
-    &::before{
+
+    &::before {
       content: '';
       position: absolute;
       right: 0;
-      top:50%;
+      top: 50%;
       display: block;
       width: 2px;
       height: 16px;
       background: #D8D8D8;
       border-radius: 1px;
-      transform: translate(0 ,-50%);
+      transform: translate(0, -50%);
     }
-    &:last-child::before{
+
+    &:last-child::before {
       display: none;
     }
   }
@@ -75,7 +79,8 @@
     border-radius: 2px;
   }
 }
-a.router-link-active.router-link-exact-active.child-item{
+
+a.router-link-active.router-link-exact-active.child-item {
   color: #4D6DE4;
 }
 </style>
@@ -86,6 +91,7 @@ import "@/assets/scss/layout.scss"
 import Header from "@/components/common/Header.vue";
 import Footer from "@/components/common/Footer.vue";
 import {ref} from "vue";
+
 const childMenuList = ref([
   {
     name: '医保目录',
diff --git a/src/views/inventory/apply.vue b/src/views/inventory/apply.vue
index 6520ac5..43770ca 100644
--- a/src/views/inventory/apply.vue
+++ b/src/views/inventory/apply.vue
@@ -28,7 +28,7 @@
         </div>
       </div>
       <div class="addBtn">
-        <span @click="clickApply">新增领用</span>
+        <span class="default-btn" @click="clickApply">新增领用</span>
       </div>
     </div>
     <div class="content">
@@ -244,26 +244,12 @@ const resetSearch=  () => {
   .addBtn {
     span {
       display: inline-block;
-      width: 120px;
-      height: 42px;
-      background: #FFFFFF;
-      border-radius: 6px;
-      border: 1px solid #4D6DE4;
-      margin-right: 24px;
-      font-weight: 500;
-      font-size: 16px;
-      color: #4D6DE4;
-      text-align: center;
-      line-height: 42px;
-      cursor: pointer;
-      &:hover {
-        background: #4D6DE4;
-        color: #fff;
-        border: none;
-      }
     }
   }
 }
+:deep(.el-input__wrapper){
+  height: 42px;
+}
 :deep(.el-range-editor.el-input__wrapper) {
   height: 42px;
 }
diff --git a/src/views/inventory/check.vue b/src/views/inventory/check.vue
index 0c0a10d..7136159 100644
--- a/src/views/inventory/check.vue
+++ b/src/views/inventory/check.vue
@@ -28,7 +28,7 @@
         </div>
       </div>
       <div class="addBtn">
-        <span @click="openAdd">开始盘点</span>
+        <span class="default-btn" @click="openAdd">开始盘点</span>
       </div>
     </div>
     <div class="content_list">
@@ -245,28 +245,13 @@ const resetSearch = () => {
   .addBtn {
     span {
       display: inline-block;
-      width: 120px;
-      height: 42px;
-      background: #FFFFFF;
-      border-radius: 6px;
-      border: 1px solid #4D6DE4;
       margin-right: 24px;
-      font-weight: 500;
-      font-size: 16px;
-      color: #4D6DE4;
-      text-align: center;
-      line-height: 42px;
-      cursor: pointer;
-
-      &:hover {
-        background: #4D6DE4;
-        color: #fff;
-        border: none;
-      }
     }
   }
 }
-
+:deep(.el-input__wrapper) {
+  height: 42px;
+}
 :deep(.el-range-editor.el-input__wrapper) {
   height: 42px;
 }
diff --git a/src/views/inventory/goods.vue b/src/views/inventory/goods.vue
index 6ae4fd6..08b4b27 100644
--- a/src/views/inventory/goods.vue
+++ b/src/views/inventory/goods.vue
@@ -8,8 +8,8 @@
               <el-input placeholder="名称/首字母/批准文号/条形码/标识码"
                         clearable
                         v-model="searchModel.keyword"
-                        style="width: 290px;height: 42px"
                         @input="searchGoods"
+                        style="width: 300px"
               >
                 <template #prefix>
                   <el-icon>
@@ -19,13 +19,13 @@
               </el-input>
             </el-form-item>
             <el-form-item>
-              <el-cascader :collapse-tags="true" :props="props" style="width: 180px;height: 42px" :options="allCateList" :show-all-levels="false"
+              <el-cascader :collapse-tags="true" :props="props" style="width: 100px" :options="allCateList" :show-all-levels="false"
                            v-model="searchModel.cateId" clearable/>
             </el-form-item>
             <el-form-item>
               <el-select
                   placeholder="利润分类"
-                  style="width: 180px;"
+                  style="width: 100px"
                   multiple
                   collapse-tags
                   collapse-tags-tooltip
@@ -41,7 +41,7 @@
             </el-form-item>
             <el-form-item style="margin-right: 0">
               <el-input placeholder="最低毛利率" v-model="searchModel.minInterestRate"
-                        style="width: 100px;height: 42px">
+                        style="width: 100px">
                 <template #suffix>
                   <el-icon class="el-input__icon">%</el-icon>
                 </template>
@@ -52,7 +52,7 @@
             </el-form-item>
             <el-form-item>
               <el-input placeholder="最高毛利率" v-model="searchModel.maxInterestRate"
-                        style="width: 100px;height: 42px">
+                        style="width: 100px">
                 <template #suffix>
                   <el-icon class="el-input__icon">%</el-icon>
                 </template>
@@ -76,10 +76,10 @@
         </div>
       </div>
       <div class="addBtn">
-        <span @click="open_edit(1301,0)">新增中西成药</span>
-        <span @click="open_edit(1302,0)">新增中药饮片</span>
-        <span @click="open_edit(1306,0)">新增医疗器材</span>
-        <span @click="open_edit(0,0)">新增其他商品</span>
+        <span class="default-btn" @click="open_edit(1301,0)">新增中西成药</span>
+        <span class="default-btn" @click="open_edit(1302,0)">新增中药饮片</span>
+        <span class="default-btn" @click="open_edit(1306,0)">新增医疗器材</span>
+        <span class="default-btn" @click="open_edit(0,0)">新增其他商品</span>
       </div>
     </div>
     <div class="content_goods">
@@ -471,23 +471,7 @@ const props = { multiple: true }
     .addBtn {
       span {
         display: inline-block;
-        width: 120px;
-        height: 42px;
-        background: #FFFFFF;
-        border-radius: 6px;
-        border: 1px solid #4D6DE4;
         margin-right: 24px;
-        font-weight: 500;
-        font-size: 16px;
-        color: #4D6DE4;
-        text-align: center;
-        line-height: 42px;
-        cursor: pointer;
-        &:hover {
-          background: #4D6DE4;
-          color: #fff;
-          border: none;
-        }
       }
     }
   }
@@ -517,7 +501,9 @@ const props = { multiple: true }
 .tags {
   margin-left: 5px;
 }
-
+:deep(.el-input__inner){
+  height: 42px;
+}
 :deep(.el-cascader .el-input) {
   height: 42px;
 }
diff --git a/src/views/inventory/inventory.vue b/src/views/inventory/inventory.vue
index 67e5b2b..6a80927 100644
--- a/src/views/inventory/inventory.vue
+++ b/src/views/inventory/inventory.vue
@@ -18,7 +18,7 @@
               <el-input
                   v-model="searchModel.code"
                   placeholder="单号"
-                  style="width: 200px;height: 42px"
+                  style="width: 200px"
                   :prefix-icon="Search"
               >
               </el-input>
@@ -27,7 +27,7 @@
               <el-input
                   v-model="searchModel.goodsName"
                   placeholder="商品名称"
-                  style="width: 200px;height: 42px"
+                  style="width: 200px"
               >
               </el-input>
             </el-form-item>
@@ -35,7 +35,7 @@
               <el-select
                   v-model="searchModel.supplierIds"
                   placeholder="供应商"
-                  style="width: 200px;height: 42px"
+                  style="width: 100px"
                   multiple
               >
                 <el-option
@@ -51,7 +51,7 @@
               <el-select
                   v-model="searchModel.managerUserIds"
                   placeholder="采购人"
-                  style="width: 200px;height: 42px"
+                  style="width: 100px"
                   multiple
               >
                 <el-option
@@ -390,7 +390,9 @@ const openUpload= ()=>{
     }
   }
 }
-
+:deep(.el-input__wrapper) {
+  height: 42px;
+}
 :deep(.el-range-editor.el-input__wrapper) {
   height: 42px;
 }
diff --git a/src/views/inventory/supplier.vue b/src/views/inventory/supplier.vue
index 388a949..40618fe 100644
--- a/src/views/inventory/supplier.vue
+++ b/src/views/inventory/supplier.vue
@@ -28,7 +28,7 @@
         </div>
       </div>
       <div class="addBtn">
-        <span @click="addSupplier(null)">添加供应商</span>
+        <span class="default-btn" @click="addSupplier(null)">添加供应商</span>
       </div>
     </div>
     <div class="content">
@@ -190,23 +190,6 @@ const resetSearch = () => {
   .addBtn {
     span {
       display: inline-block;
-      width: 120px;
-      height: 42px;
-      background: #FFFFFF;
-      border-radius: 6px;
-      border: 1px solid #4D6DE4;
-      margin-right: 24px;
-      font-weight: 500;
-      font-size: 16px;
-      color: #4D6DE4;
-      text-align: center;
-      line-height: 42px;
-      cursor: pointer;
-      &:hover {
-        background: #4D6DE4;
-        color: #fff;
-        border: none;
-      }
     }
   }
 }
diff --git a/src/views/settings/index.vue b/src/views/settings/index.vue
index 9b57294..f798627 100644
--- a/src/views/settings/index.vue
+++ b/src/views/settings/index.vue
@@ -47,6 +47,11 @@
                 <el-input v-model="ruleForm.social_certUrl"/>
               </el-form-item>
             </el-descriptions-item>
+            <el-descriptions-item label="数字签名">
+              <el-form-item prop="social_cainfo">
+                <el-input v-model="ruleForm.social_cainfo" style="margin:0 24px"/>
+              </el-form-item>
+            </el-descriptions-item>
             <el-descriptions-item
                 :rowspan="2"
                 label="logo上传">
@@ -55,16 +60,11 @@
                         style="margin-left: 24px"></UpLoad>
               </el-form-item>
             </el-descriptions-item>
-            <el-descriptions-item label="数字签名">
-              <el-form-item prop="social_cainfo">
-                <el-input v-model="ruleForm.social_cainfo" style="margin:0 24px"/>
-              </el-form-item>
-            </el-descriptions-item>
           </el-descriptions>
         </el-form>
       </div>
       <div style="display: flex;justify-content: flex-end;padding: 0 24px">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">保存</el-button>
+        <span class="default-btn" @click="submitForm(ruleFormRef)">保存</span>
       </div>
     </Panel>
   </div>
diff --git a/src/views/settings/item.vue b/src/views/settings/item.vue
index d1fb244..aa4f19b 100644
--- a/src/views/settings/item.vue
+++ b/src/views/settings/item.vue
@@ -17,10 +17,10 @@
         </el-form>
       </div>
       <div class="title-btn">
-        <el-button type="primary" @click="initData()">查询</el-button>
-        <el-button type="primary" @click="resetSearch">重置</el-button>
-        <el-button type="primary" :icon="Plus" @click="openDialog">新建项目</el-button>
-        <el-button type="primary" @click="openSetMenu">组套</el-button>
+        <span  class="default-btn" @click="initData()">查询</span>
+        <span  class="default-btn" @click="resetSearch" style="margin: 0 24px">重置</span>
+        <span  class="default-btn" @click="openDialog">新建项目</span>
+<!--        <el-button type="primary" @click="openSetMenu">组套</el-button>-->
       </div>
     </div>
     <div class="table">
@@ -198,5 +198,7 @@ const loading= ref(true)
   }
 }
 
-
+:deep(.el-input__wrapper){
+  height: 42px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/settings/log.vue b/src/views/settings/log.vue
index ce07cb4..beecbdb 100644
--- a/src/views/settings/log.vue
+++ b/src/views/settings/log.vue
@@ -24,8 +24,7 @@
     <div class="content">
       <el-table
           :data="tableData"
-          style="width: 100%"
-          max-height="700px"
+          style="width: 100%;height: 100%"
       >
         <el-table-column prop="managerName" label="用户名" width="100"></el-table-column>
         <el-table-column prop="managerUsername" label="用户名" width="100"></el-table-column>
@@ -119,6 +118,7 @@ const handleDateChange = (date: any[]) => {
   .content {
     flex: 1;
     background: #fff;
+    min-height: 0;
   }
 
   .pagination {
diff --git a/src/views/settings/member.vue b/src/views/settings/member.vue
index 566a71d..3e66407 100644
--- a/src/views/settings/member.vue
+++ b/src/views/settings/member.vue
@@ -25,9 +25,9 @@
         </el-form>
       </div>
       <div class="title-btn">
-        <el-button type="primary" @click="init()">查询</el-button>
-        <el-button type="primary" @click="resetSearch">重置</el-button>
-        <el-button type="primary" :icon="Plus" @click="openDialog(null)">新增</el-button>
+        <span class="default-btn" @click="init()">查询</span>
+        <span class="default-btn" @click="resetSearch" style="margin: 0 24px">重置</span>
+        <span class="default-btn" @click="openDialog(null)">新增</span>
       </div>
     </div>
 
@@ -188,5 +188,10 @@ const resetSearch = () => {
     justify-content: flex-end;
   }
 }
-
+:deep(.el-input__wrapper){
+  height: 42px;
+}
+:deep(.el-select__wrapper){
+  height: 42px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/social/accountRecords.vue b/src/views/social/accountRecords.vue
index 242a9d9..80535fd 100644
--- a/src/views/social/accountRecords.vue
+++ b/src/views/social/accountRecords.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="container-wrapper">
-    <div class="header">
+    <div class="search">
       <el-date-picker
           v-model="selectDate"
           type="daterange"
@@ -8,35 +8,34 @@
           range-separator="-"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
+          style="height: 100%"
       />
     </div>
-    <div class="table">
-      <el-table :data="list" style="width: 100%">
-        <el-table-column label="清算类别" prop="reconciliationType"></el-table-column>
-        <el-table-column label="险种类型" prop="insuranceType"></el-table-column>
-        <el-table-column label="经办机构" prop="handlingInstitution"></el-table-column>
-        <el-table-column label="医疗费用总额" prop="totalMedicalCost"></el-table-column>
-        <el-table-column label="基金支付总额" prop="totalFundPayment"></el-table-column>
-        <el-table-column label="个账支付总额" prop="totalPersonalAccountPayment"></el-table-column>
-        <el-table-column label="结算笔数" prop="settlementCount"></el-table-column>
-        <el-table-column label="对账结果" prop="reconciliationResult">
-          <template #default="scope">
-            <el-tag v-if="scope.row.reconciliationResult == null" type="info">未对账</el-tag>
-            <el-tag v-if="scope.row.reconciliationResult == 0" type="success">{{ reconciliationResult[0] }}</el-tag>
-            <el-tag v-if="scope.row.reconciliationResult != null&&scope.row.reconciliationResult != 0" type="danger">{{
-                reconciliationResult[scope.row.reconciliationResult as keyof typeof reconciliationResult] || '未知状态'
-              }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作">
-          <template #default="scope">
-            <el-button type="primary" @click="accountRecordDo(scope.row)" link>对账</el-button>
-            <el-button type="primary" @click="detailsDo(scope.row)" link>明细对账</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
+    <el-table :data="list" style="width: 100%;flex: 1;min-height: 0">
+      <el-table-column label="清算类别" prop="reconciliationType"></el-table-column>
+      <el-table-column label="险种类型" prop="insuranceType"></el-table-column>
+      <el-table-column label="经办机构" prop="handlingInstitution"></el-table-column>
+      <el-table-column label="医疗费用总额" prop="totalMedicalCost"></el-table-column>
+      <el-table-column label="基金支付总额" prop="totalFundPayment"></el-table-column>
+      <el-table-column label="个账支付总额" prop="totalPersonalAccountPayment"></el-table-column>
+      <el-table-column label="结算笔数" prop="settlementCount"></el-table-column>
+      <el-table-column label="对账结果" prop="reconciliationResult">
+        <template #default="scope">
+          <el-tag v-if="scope.row.reconciliationResult == null" type="info">未对账</el-tag>
+          <el-tag v-if="scope.row.reconciliationResult == 0" type="success">{{ reconciliationResult[0] }}</el-tag>
+          <el-tag v-if="scope.row.reconciliationResult != null&&scope.row.reconciliationResult != 0" type="danger">{{
+              reconciliationResult[scope.row.reconciliationResult as keyof typeof reconciliationResult] || '未知状态'
+            }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作">
+        <template #default="scope">
+          <el-button type="primary" @click="accountRecordDo(scope.row)" link>对账</el-button>
+          <el-button type="primary" @click="detailsDo(scope.row)" link>明细对账</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
   </div>
   <DetailList ref="detailListRef"></DetailList>
 </template>
@@ -114,5 +113,16 @@ onMounted(() => {
 
 </script>
 <style scoped lang="scss">
+.container-wrapper {
+  height: 100%;
+  padding: 24px;
+  border-radius: 8px;
+  display: flex;
+  flex-direction: column;
 
+  .search {
+    height: 42px;
+    margin-bottom: 24px;
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/social/costRecord.vue b/src/views/social/costRecord.vue
index f1dcaa7..9ab2647 100644
--- a/src/views/social/costRecord.vue
+++ b/src/views/social/costRecord.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="container-wrapper">
-    <div class="seach">
+    <div class="search">
       <el-date-picker
           v-model="date"
           type="daterange"
@@ -9,41 +9,39 @@
           start-placeholder="Start date"
           end-placeholder="End date"
           @change="dateChangeHandler"
+          style="height: 100%"
       />
     </div>
-    <div class="detail">
-      <el-table :data="tableData" border style="width: 100%">
-        <el-table-column prop="chargeTime" label="结算时间" width="180"></el-table-column>
-        <el-table-column prop="customer" label="患者" width="180"></el-table-column>
-        <el-table-column prop="projectCode" label="订单号" width="240"></el-table-column>
-        <el-table-column prop="source" label="结算类型" width="180">
-          <template #default="scope">
-            <el-tag v-if="scope.row.source == 0" type="success">门诊收费</el-tag>
-            <el-tag v-if="scope.row.source == 1" type="success">门诊退费</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column prop="payType" label="支付类型" width="180">
-          <template #default="scope">
-            {{ payTypeMapping[scope.row.payType as keyof typeof payTypeMapping] || '未知' }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="netReceipts" label="结算金额" width="180">
-          <template #default="scope">
-            ￥{{ scope.row.netReceipts }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="dockerName" label="医生" width="180"></el-table-column>
-        <el-table-column prop="salePersonName" label="收费员" width="180"></el-table-column>
-        <el-table-column prop="type" label="交易类型" width="180">
-          <template #default="scope">
-            <el-tag v-if="scope.row.type == 0" type="danger">退款</el-tag>
-            <el-tag v-else type="success">收费</el-tag>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
+    <el-table :data="tableData" :max-height="710" border style="width: 100%;flex: 1;min-height: 0">
+      <el-table-column prop="chargeTime" label="结算时间"></el-table-column>
+      <el-table-column prop="customer" label="患者" width="180"></el-table-column>
+      <el-table-column prop="projectCode" label="订单号"></el-table-column>
+      <el-table-column prop="source" label="结算类型" width="180">
+        <template #default="scope">
+          <el-tag v-if="scope.row.source == 0" type="success">门诊收费</el-tag>
+          <el-tag v-if="scope.row.source == 1" type="success">门诊退费</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="payType" label="支付类型" width="180">
+        <template #default="scope">
+          {{ payTypeMapping[scope.row.payType as keyof typeof payTypeMapping] || '未知' }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="netReceipts" label="结算金额" width="180">
+        <template #default="scope">
+          ￥{{ scope.row.netReceipts }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="dockerName" label="医生" width="180"></el-table-column>
+      <el-table-column prop="salePersonName" label="收费员" width="180"></el-table-column>
+      <el-table-column prop="type" label="交易类型" width="180">
+        <template #default="scope">
+          <el-tag v-if="scope.row.type == 0" type="danger">退款</el-tag>
+          <el-tag v-else type="success">收费</el-tag>
+        </template>
+      </el-table-column>
+    </el-table>
   </div>
-
 </template>
 <script setup lang="ts">
 import {onMounted, ref} from "vue";
@@ -80,5 +78,15 @@ onMounted(() => {
 })
 </script>
 <style scoped lang="scss">
-
+.container-wrapper {
+  height: 100%;
+  padding: 24px;
+  border-radius: 8px;
+  display: flex;
+  flex-direction: column;
+  .search {
+    height: 42px;
+    margin-bottom: 24px;
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/social/directory.vue b/src/views/social/directory.vue
index fcebca3..efddb54 100644
--- a/src/views/social/directory.vue
+++ b/src/views/social/directory.vue
@@ -99,11 +99,11 @@
               type="date"
               placeholder="选择一个起始日期"
               size="default"
-              style="flex: 1;height: 42px"
+              style="flex: 1;height: 100%"
           />
-          <div class="default-btn startBtn" @click="update1318()"
+          <div class="default-btn startBtn" @click="update1318(1)"
                :style="{background: showBtn ? '#EDEFF6' : '', color: showBtn ? '#333333' : ''}"
-               style="margin-left: 24px">
+               >
             开始更新
           </div>
         </div>
@@ -113,7 +113,7 @@
               {{ tip }}
             </div>
             <div class="demo-progress">
-              <el-progress v-if="tip" :text-inside="true" :stroke-width="30" :percentage="0"/>
+              <el-progress v-if="tip" :text-inside="true" :stroke-width="30" :percentage="percent"/>
             </div>
           </div>
         </div>
@@ -127,11 +127,10 @@
               type="date"
               placeholder="选择一个起始日期"
               size="default"
-              style="flex: 1;height: 42px"
+              style="flex: 1;height: 100%"
           />
-          <div class="default-btn startBtn" @click="update1319()"
-               :style="{background: showBtn ? '#EDEFF6' : '', color: showBtn ? '#333333' : ''}"
-               style="margin-left: 24px;height: 42px">
+          <div class="default-btn startBtn" @click="update1319(1)"
+               :style="{background: showBtn ? '#EDEFF6' : '', color: showBtn ? '#333333' : ''}">
             开始更新
           </div>
         </div>
@@ -203,14 +202,11 @@ let update1312 = (current_page: number) => {
       update1312(current_page);
     } else {
       tip.value = "所有更新已完成"
-      isUpdate1312.value = false
-      showBtn.value = false
+      close()
     }
 
   }).catch((err: any) => {
-    isUpdate1312.value = false;
-    current_page = 1;
-    showBtn.value = false
+    close()
   })
 }
 const openUpdateBox = (type: number) => {
@@ -292,7 +288,6 @@ const start_type = () => {
     download(res.currentVersionName, current_tab.value);
   }).catch((err: any) => {
     UpdateDirectoryLoading.value = false;
-    close()
     ElNotification({
       title: '提示',
       message: "当前是最新版本",
@@ -304,7 +299,6 @@ let download = (ver: any, type: any) => {
   post("social/directory/download", {ver: ver, type: type}).then((res: any) => {
     if (res == null || res == "") {
       UpdateDirectoryLoading.value = false;
-      close()
       ElNotification({
         title: '提示',
         message: "当前是最新版本",
@@ -315,7 +309,6 @@ let download = (ver: any, type: any) => {
     get_data_list()
     start_type()
   }).catch((err: any) => {
-    close()
     UpdateDirectoryLoading.value = false;
     ElNotification({
       title: '提示',
@@ -325,17 +318,57 @@ let download = (ver: any, type: any) => {
   })
 }
 const close = () => {
+  showBtn.value = false
   UpdateDirectoryLoading.value = false;
   isUpdate1312.value = false
   isUpdate1318.value = false
   isUpdate1319.value = false
   tip.value = ""
+  percent.value = 100
 }
-const update1318 = () => {
-  console.log(111)
+const update1318 = (current_page: number) => {
+  showBtn.value = true
+  if (current_page == 1) {
+    tip.value = "开始更新第1页"
+  }
+  post('social/directory_limit/get_page', {
+    updt_time: updt_time.value,
+    page: current_page
+  }).then((res: any) => {
+    let pages = res.pages;
+    let number = res.number;
+    if (current_page < pages && isUpdate1318.value) {
+      current_page++
+      percent.value = Math.floor((current_page / pages) * 100)
+      tip.value = "开始更新第:" + current_page + "/" + pages;
+      update1318(current_page);
+    } else {
+      tip.value = "所有更新已完成"
+      close()
+    }
+  })
 }
-const update1319 = () => {
-  console.log(111)
+const update1319 = (current_page: number) => {
+  showBtn.value = true
+  if (current_page == 1) {
+    tip.value = "开始更新第1页"
+  }
+  post('social/directory_self/get_page', {
+    updt_time: updt_time.value,
+    page: current_page
+  }).then((res: any) => {
+    let pages = res.pages;
+    let number = res.number;
+    if (current_page < pages && isUpdate1319.value) {
+      current_page++
+      percent.value = Math.floor((current_page / pages) * 100)
+      tip.value = "开始更新第:" + current_page + "/" + pages;
+      update1318(current_page);
+    } else {
+      tip.value = "所有更新已完成"
+      close()
+    }
+  })
 }
 </script>
 
diff --git a/src/views/social/inventoryUp.vue b/src/views/social/inventoryUp.vue
index 918929d..50895f1 100644
--- a/src/views/social/inventoryUp.vue
+++ b/src/views/social/inventoryUp.vue
@@ -19,7 +19,7 @@
         </el-tab-pane>
       </el-tabs>
       <div class="right">
-        <el-button type="primary" @click="startUpload">一键上传</el-button>
+        <span class="default-btn" @click="startUpload">一键上传</span>
       </div>
     </div>
     <div class="content" ref="content">
@@ -111,23 +111,22 @@ let upload_data = () => {
   flex-direction: column;
   height: 100%;
   min-height: 0;
+  padding: 24px;
+  border-radius: 8px;
 
   .top {
     width: 100%;
     height: 50px;
-
   }
-
   .content {
     flex: 1;
-    overflow: hidden;
     min-height: 0;
   }
 }
 
 .right {
   float: right;
-  transform: translateY(-52px);
+  transform: translateY(-63px);
 }
 
 .example-showcase .el-loading-mask {