diff --git a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
index 65c7a4b29..86dbd2136 100644
--- a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
@@ -181,6 +181,7 @@
         :visible.sync="dialog"
         width="50%"
         ref="drawer"
+        center
       >
         <div class="demo-drawer__content">
           <el-form :model="form" ref="ruleForm" :rules="rules" :inline="true" :label-position="labelPosition" label-width="100px" >
@@ -351,9 +352,7 @@
           </div>
           <div class="demo-drawer__footer">
             <el-button @click="cancelForm">取 消</el-button>
-            <el-button type="primary" @click="submitForm('ruleForm')"
-                      >
-              确定</el-button>
+            <el-button type="primary" @click="submitForm('ruleForm')">保 存</el-button>
           </div>
         </div>
       </el-dialog>
@@ -420,7 +419,7 @@
 
       </el-dialog>
       <!--      规则-->
-      <el-dialog title="编辑储值卡规则" :visible.sync="Crule">
+      <el-dialog title="编辑储值卡规则" :visible.sync="Crule" center>
         <el-form :model="ruleForm" ref="ruleForm1" :rules="rules" label-width="100px" class="demo-ruleForm" :label-position="labelPosition">
           <el-form-item label="名称" prop="name">
             <el-input disabled v-model="ruleForm.name"></el-input>
@@ -436,15 +435,14 @@
              <div class="d-s" @click="ruleForm.oilLimit = 1">
                <img src="../../../assets/images/wx.png" v-if="ruleForm.oilLimit != 1" style="width: 20px;height: 20px;">
                <img src="../../../assets/images/xz.png" v-if="ruleForm.oilLimit == 1" style="width: 20px;height: 20px;">
-               <div>不限</div>
+               <div style="width: 60px;">不限</div>
              </div>
               <div class="d-s" @click="ruleForm.oilLimit = 2" >
                 <img src="../../../assets/images/wx.png" v-if="ruleForm.oilLimit != 2" style="width: 20px;height: 20px;">
                 <img src="../../../assets/images/xz.png" v-if="ruleForm.oilLimit == 2" style="width: 20px;height: 20px;">
-                <div>自定义</div>
-                <el-select v-if="ruleForm.oilLimit == 2" v-model="ruleForm.oilNumber" placeholder="请选择油品油号（可多选）" multiple style="margin-left: 10px">
+                <div style="width: 60px;">自定义</div>
+                <el-select v-if="ruleForm.oilLimit == 2" v-model="ruleForm.oilNumber" placeholder="请选择油品油号（可多选）" multiple style="margin-left: 10px; width: 700px;">
                   <el-option :label="item.oilName" :value="item.oilId"  v-for="(item,index) in oilnumList" :key="index"></el-option>
-
                 </el-select>
               </div>
             </div>
@@ -471,12 +469,12 @@
 <!--            </div>-->
 <!--          </el-form-item>-->
 
-
-          <el-form-item>
-            <el-button type="primary" @click="submitForms('ruleForm1')">保存</el-button>
-            <el-button @click="resetForm('ruleForm')">取消</el-button>
-          </el-form-item>
         </el-form>
+
+        <div slot="footer" class="dialog-footer" style="text-align: center">
+          <el-button @click="cancel">取 消</el-button>
+          <el-button type="primary" @click="submitForms('ruleForm1')">保 存</el-button>
+        </div>
       </el-dialog>
 
     </div>
@@ -867,7 +865,7 @@ import {delLJGoods, listLJGoods} from "@/api/convenienceStore/ljgoods";
           })
         },
       handleUpdate(row) {
-        this.titles = "修改储值卡"
+        this.titles = "修改储值卡活动"
         let data = {
           pageNo:1,
           pageSize:30,
@@ -916,7 +914,7 @@ import {delLJGoods, listLJGoods} from "@/api/convenienceStore/ljgoods";
       },
       addblock(){
         this.isOnLine = false
-        this.titles = "新增储值卡"
+        this.titles = "新增储值卡活动"
         this.vipname = []
         let data = {
           pageNo:1,
@@ -1053,7 +1051,10 @@ import {delLJGoods, listLJGoods} from "@/api/convenienceStore/ljgoods";
         this.loading = false;
         this.dialog = false;
         clearTimeout(this.timer);
-      }
+      },
+      cancel(){
+        this.Crule = false;
+      },
     }
   }
 </script>
diff --git a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
index 3fbc0551b..373913d5a 100644
--- a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
@@ -241,8 +241,9 @@
       title="上传礼品卡数据"
       :visible.sync="uploadingShow"
       :close-on-click-modal="false"
-      width="40%"
+      width="30%"
       @close="handleClose2"
+      center
     >
       <el-form :model="ruleForm2"  ref="ruleForm2" label-width="100px" class="demo-ruleForm">
 
@@ -286,14 +287,16 @@
       </span>
             </div>
           </el-upload>
-          <el-button @click="uploadingShow = false">取消</el-button>
-          <el-button type="primary" @click="submitUpload">导入</el-button>
+
 
         </el-form-item>
 
 
       </el-form>
-
+      <div slot="footer" class="dialog-footer" center>
+        <el-button @click="uploadingShow = false">取消</el-button>
+        <el-button type="primary" @click="submitUpload">导入</el-button>
+      </div>
     </el-dialog>
     <el-dialog
       :title="titles"
@@ -347,7 +350,7 @@
       </el-form>
       <span slot="footer" class="dialog-footer">
             <el-button @click="centerDialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="addBlock('formName')">创建</el-button>
+            <el-button type="primary" @click="addBlock('formName')">保 存</el-button>
           </span>
     </el-dialog>
     <el-dialog
@@ -648,7 +651,7 @@ export default {
     updateId(row) {
 
       this.centerDialogVisible = !this.centerDialogVisible
-      this.titles ="修改礼品卡"
+      this.titles ="修改礼品卡活动"
       this.ruleForm = row
       // 时间
       this.ruleForm.value1 = [row.effectiveTimeStart, row.effectiveTimeEnd]
diff --git a/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue b/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
index 482b804ad..ae5e4bf42 100644
--- a/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
@@ -1426,6 +1426,7 @@ export default {
 
 .card-boxs {
   width: 100%;
+  height: 83.5vh;
   background: #fff;
   box-sizing: border-box;
   padding: 15px;
diff --git a/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue b/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
index 6dfff6d48..72d56095a 100644
--- a/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
@@ -187,7 +187,7 @@
         </div>
       </el-drawer>
       <!--      规则-->
-      <el-dialog :close-on-click-modal="false" title="编辑囤油卡规则" width="30%" :visible.sync="Crule">
+      <el-dialog :close-on-click-modal="false" title="编辑囤油卡规则" width="30%" :visible.sync="Crule" center>
         <el-form :model="oilForm" :rules="ruleInfo" ref="oilForm" label-width="70px" class="demo-ruleForm" >
           <el-form-item label="名称" prop="name">
             <el-input disabled v-model="oilForm.name"></el-input>
@@ -198,16 +198,16 @@
           <el-form-item label="规则说明" prop="desc">
             <el-input type="textarea" v-model="oilForm.gzDetail"></el-input>
           </el-form-item>
-
-          <el-form-item >
-            <el-button type="primary" @click="submitForms('oilForm')">保存</el-button>
-            <el-button @click="resetForm('oilForm')">取消</el-button>
-          </el-form-item>
         </el-form>
+        <div slot="footer" class="dialog-footer" style="text-align: center;">
+          <el-button @click="resetForm('oilForm')">取 消</el-button>
+          <el-button type="primary" @click="submitForms('oilForm')">保 存</el-button>
+        </div>
+
       </el-dialog>
 
       <el-dialog
-        title="囤油卡操作"
+        title="新增囤油卡活动"
         :visible.sync="centerDialogVisible"
         width="30%"
         :close-on-click-modal="false"
@@ -295,7 +295,7 @@
           </el-form-item>
 
         </el-form>
-        <span slot="footer" class="dialog-footer">
+        <span slot="footer" class="dialog-footer" center>
           <el-button @click="centerDialogVisible = false">取 消</el-button>
            <el-button type="primary" @click="postadd(ruleForm)">确 定</el-button>
         </span>
diff --git a/fuintAdmin/src/views/convenienceStore/goodsFile.vue b/fuintAdmin/src/views/convenienceStore/goodsFile.vue
index a344a5ce0..ce5f55eed 100644
--- a/fuintAdmin/src/views/convenienceStore/goodsFile.vue
+++ b/fuintAdmin/src/views/convenienceStore/goodsFile.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div class="card-change">
+    <div class="card-change" style="height: 86vh;">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
         <!--        <el-tabs v-model="activeName" @tab-click="handleClick">-->
         <!--          <el-tab-pane label="商品档案" name="goods"></el-tab-pane>-->
@@ -164,7 +164,7 @@
     </div>
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body center>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <div style="display: flex;justify-content: space-between">
           <div style="width: 50%">
diff --git a/fuintAdmin/src/views/convenienceStore/goodsSale.vue b/fuintAdmin/src/views/convenienceStore/goodsSale.vue
index d240be9fd..8a56be7bf 100644
--- a/fuintAdmin/src/views/convenienceStore/goodsSale.vue
+++ b/fuintAdmin/src/views/convenienceStore/goodsSale.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <!--    商品销售统计-->
     <!--    搜索框-->
-    <div class="card-change">
+    <div class="card-change" style="height: 86vh;">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
         <el-form-item label="" prop="name">
           <el-input
@@ -44,7 +44,7 @@
         </el-form-item>
       </el-form>
 
-      <div style="height: 69vh;overflow: auto">
+      <div style="height: 71vh;overflow: auto">
         <el-table ref="tables" v-loading="loading" :data="list" border
                   @selection-change="handleSelectionChange" :default-sort="defaultSort"
                   @sort-change="handleSortChange">
diff --git a/fuintAdmin/src/views/convenienceStore/inventory/details.vue b/fuintAdmin/src/views/convenienceStore/inventory/details.vue
index a0e0500de..4fe23fbc5 100644
--- a/fuintAdmin/src/views/convenienceStore/inventory/details.vue
+++ b/fuintAdmin/src/views/convenienceStore/inventory/details.vue
@@ -196,7 +196,7 @@
     </div>
 
 
-    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body :close-on-click-modal="false" center>
       <el-container>
         <el-header style="">
           <el-form ref="tankForm" :model="commodityForm" label-width="20px" :inline="true">
@@ -837,4 +837,13 @@ export default {
   align-items: start;
   padding-left: 20px;
 }
+
+.card-change-1-search{
+  margin: 0;
+}
+
+.card-change-1-1{
+  margin: 0;
+  height: 73.5vh;
+}
 </style>
diff --git a/fuintAdmin/src/views/convenienceStore/inventory/index.vue b/fuintAdmin/src/views/convenienceStore/inventory/index.vue
index 38c97a582..9be4bcdc5 100644
--- a/fuintAdmin/src/views/convenienceStore/inventory/index.vue
+++ b/fuintAdmin/src/views/convenienceStore/inventory/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div class="card-change">
+    <div class="card-change" style="height: 90vh;">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="60px">
         <el-form-item label="" prop="orderNumber">
           <el-input v-model="queryParams.orderNumber" placeholder="请输入盘点单号"/>
diff --git a/fuintAdmin/src/views/convenienceStore/pinlei.vue b/fuintAdmin/src/views/convenienceStore/pinlei.vue
index efb9f6117..c65d2e9e0 100644
--- a/fuintAdmin/src/views/convenienceStore/pinlei.vue
+++ b/fuintAdmin/src/views/convenienceStore/pinlei.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div class="card-change">
+    <div class="card-change" style="height: 86vh;">
       <!-- 查询类别 -->
       <el-form :inline="true" :model="queryParams">
         <el-form-item label="" prop="name">
@@ -117,7 +117,7 @@
 
     <!-- 添加类别对话框 -->
     <el-dialog :title="title" :visible.sync="open" class="roll-dialog"
-               :close-on-click-modal="false" append-to-body width="500px">
+               :close-on-click-modal="false" append-to-body width="500px" center>
       <el-form :model="form" :rules="rules" ref="form" label-width="80px">
         <!--            <el-form-item label="上级品类" >-->
         <!--                <el-select v-model="form.pid" placeholder="请选择上级品类">-->
@@ -159,7 +159,7 @@
     </el-dialog>
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="openGoods" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="openGoods" append-to-body center>
       <el-form ref="form1" :model="form1" :rules="rules1" label-width="100px">
         <div style="display: flex;justify-content: center">
           <div style="width: 50%">
@@ -742,7 +742,7 @@ export default {
       selectParentById(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改品类信息";
+        this.title = "修改品类";
       });
     },
     // 删除按钮操作
diff --git a/fuintAdmin/src/views/convenienceStore/purchase/details.vue b/fuintAdmin/src/views/convenienceStore/purchase/details.vue
index e1016eeb0..ba3c5f955 100644
--- a/fuintAdmin/src/views/convenienceStore/purchase/details.vue
+++ b/fuintAdmin/src/views/convenienceStore/purchase/details.vue
@@ -153,7 +153,7 @@
     </div>
 
 
-    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body :close-on-click-modal="false" center>
       <el-container>
         <el-header style="">
           <el-form ref="tankForm" :model="commodityForm" label-width="20px" :inline="true">
diff --git a/fuintAdmin/src/views/convenienceStore/purchase/purchase.vue b/fuintAdmin/src/views/convenienceStore/purchase/purchase.vue
index ec99d467c..3d15367e7 100644
--- a/fuintAdmin/src/views/convenienceStore/purchase/purchase.vue
+++ b/fuintAdmin/src/views/convenienceStore/purchase/purchase.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div class="card-change">
+    <div class="card-change" style="height: 86vh;">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
         <el-form-item label="" prop="orderNumber">
           <el-input v-model="queryParams.orderNumber" placeholder="请输入进货单号"/>
diff --git a/fuintAdmin/src/views/convenienceStore/returns/index.vue b/fuintAdmin/src/views/convenienceStore/returns/index.vue
index 51e134b6e..272a91279 100644
--- a/fuintAdmin/src/views/convenienceStore/returns/index.vue
+++ b/fuintAdmin/src/views/convenienceStore/returns/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div class="card-change">
+    <div class="card-change" style="height: 86vh;">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
         <el-form-item label="" prop="orderNumber">
           <el-input v-model="queryParams.orderNumber" placeholder="请输入退货单号"/>
diff --git a/fuintAdmin/src/views/convenienceStore/stockStatistic.vue b/fuintAdmin/src/views/convenienceStore/stockStatistic.vue
index 14a277bee..345fba9f2 100644
--- a/fuintAdmin/src/views/convenienceStore/stockStatistic.vue
+++ b/fuintAdmin/src/views/convenienceStore/stockStatistic.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <!--    搜索框-->
-    <div class="card-change">
+    <div class="card-change" style="height: 86vh;">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
         <el-form-item label="" prop="name">
           <el-input
@@ -93,7 +93,7 @@
           </el-button>
         </el-form-item>
       </el-form>
-      <div style="height: 69vh;overflow: auto;scrollbar-width: none">
+      <div style="height: 71vh;overflow: auto;scrollbar-width: none">
         <el-table ref="tables" v-loading="loading" :data="list" border
                   @selection-change="handleSelectionChange" :default-sort="defaultSort"
                   @sort-change="handleSortChange">
diff --git a/fuintAdmin/src/views/convenienceStore/supplier.vue b/fuintAdmin/src/views/convenienceStore/supplier.vue
index 9ae4cf01f..31afa5c4f 100644
--- a/fuintAdmin/src/views/convenienceStore/supplier.vue
+++ b/fuintAdmin/src/views/convenienceStore/supplier.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div class="card-change">
+    <div class="card-change" style="height: 86vh;">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
         <el-form-item label="" prop="name">
           <el-input
@@ -238,7 +238,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "新增供应商";
+      this.title = "新增供应商信息";
     },
     // 修改按钮操作
     handleUpdate(row) {
@@ -247,7 +247,7 @@ export default {
       getSupplier(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "编辑供应商";
+        this.title = "修改供应商信息";
       });
     },
     // 删除按钮操作
diff --git a/fuintAdmin/src/views/financialStatement/buy/tab/gun.vue b/fuintAdmin/src/views/financialStatement/buy/tab/gun.vue
index 6d10ee0be..26e7f539c 100644
--- a/fuintAdmin/src/views/financialStatement/buy/tab/gun.vue
+++ b/fuintAdmin/src/views/financialStatement/buy/tab/gun.vue
@@ -365,7 +365,7 @@ export default {
   box-sizing: border-box;
   padding: 15px;
   border-radius: 4px;
-  height: 78%;
+  height: 78vh;
 }
 .pagination-box{
   width: 100%;
diff --git a/fuintAdmin/src/views/fleet/tab/fleetInfo.vue b/fuintAdmin/src/views/fleet/tab/fleetInfo.vue
index bbd6986ef..5f33b73b4 100644
--- a/fuintAdmin/src/views/fleet/tab/fleetInfo.vue
+++ b/fuintAdmin/src/views/fleet/tab/fleetInfo.vue
@@ -182,7 +182,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取 消</el-button>
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm">保 存</el-button>
 
       </div>
     </el-dialog>
@@ -216,8 +216,8 @@
 
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm1">确 定</el-button>
         <el-button @click="cancel1">取 消</el-button>
+        <el-button type="primary" @click="submitForm1">保 存</el-button>
       </div>
     </el-dialog>
   </div>
@@ -403,7 +403,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "新增车队信息";
+      this.title = "新增车队";
     },
     // 搜索按钮操作
     handleQuery() {
@@ -429,7 +429,7 @@ export default {
         this.form.cardType = res.data.cardType.split(",")
         this.form.staffId = res.data.staffId.split(",")
         this.open = true;
-        this.title = "修改车队信息";
+        this.title = "修改车队";
       })
     },
     // 修改按钮操作
diff --git a/fuintAdmin/src/views/fleet/tab/fleetMember.vue b/fuintAdmin/src/views/fleet/tab/fleetMember.vue
index a179c6c9b..408727659 100644
--- a/fuintAdmin/src/views/fleet/tab/fleetMember.vue
+++ b/fuintAdmin/src/views/fleet/tab/fleetMember.vue
@@ -198,7 +198,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取 消</el-button>
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm">保 存</el-button>
 
       </div>
     </el-dialog>
@@ -243,8 +243,8 @@
 
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm1">确 定</el-button>
         <el-button @click="open1 = false">取 消</el-button>
+        <el-button type="primary" @click="submitForm1">保 存</el-button>
       </div>
     </el-dialog>
 
@@ -275,8 +275,8 @@
 
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm2">确 定</el-button>
         <el-button @click="open2 = false">取 消</el-button>
+        <el-button type="primary" @click="submitForm2">确 定</el-button>
       </div>
     </el-dialog>
 
@@ -335,8 +335,8 @@
       </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitFormMembers">导 入</el-button>
         <el-button @click="cancelMembers">取 消</el-button>
+        <el-button type="primary" @click="submitFormMembers">导 入</el-button>
       </div>
     </el-dialog>
 
@@ -763,7 +763,7 @@ export default {
       getFleetMember(row.id).then(res => {
         this.form = res.data
         this.open = true;
-        this.title = '修改车队成员'
+        this.title = '修改成员'
       })
     },
     // 额度管理
diff --git a/fuintAdmin/src/views/integral/gift/gift.vue b/fuintAdmin/src/views/integral/gift/gift.vue
index d3b652c76..7f19dbc3c 100644
--- a/fuintAdmin/src/views/integral/gift/gift.vue
+++ b/fuintAdmin/src/views/integral/gift/gift.vue
@@ -1255,7 +1255,7 @@ export default {
   height: 98px;
 }
 .card-change{
-  height: 85vh;
+  height: 86vh;
 }
 .table_box{
   height: 68vh;
diff --git a/fuintAdmin/src/views/integral/giftCategory/index.vue b/fuintAdmin/src/views/integral/giftCategory/index.vue
index 6a571b4f1..6410749fc 100644
--- a/fuintAdmin/src/views/integral/giftCategory/index.vue
+++ b/fuintAdmin/src/views/integral/giftCategory/index.vue
@@ -238,6 +238,6 @@ export default {
 
 <style scoped lang="scss">
 .card-change{
-  height: 84vh;
+  height: 86vh;
 }
 </style>
diff --git a/fuintAdmin/src/views/integral/order/index.vue b/fuintAdmin/src/views/integral/order/index.vue
index df09c9e2e..822217332 100644
--- a/fuintAdmin/src/views/integral/order/index.vue
+++ b/fuintAdmin/src/views/integral/order/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div class="card-change">
+    <div class="card-change" style="height: 91vh; margin-bottom: 0px;">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
         <el-form-item label="" prop="giftName">
           <el-input
@@ -79,7 +79,7 @@
           <el-button type="primary" @click="exportExcelVip">导出</el-button>
         </el-form-item>
       </el-form>
-      <div style="height: 73.5vh;overflow: auto">
+      <div style="height: 68vh;overflow: auto">
 
         <el-table ref="tables"
                   v-loading="loading"
diff --git a/fuintAdmin/src/views/integral/settings/index.vue b/fuintAdmin/src/views/integral/settings/index.vue
index a27dcc179..588d8959d 100644
--- a/fuintAdmin/src/views/integral/settings/index.vue
+++ b/fuintAdmin/src/views/integral/settings/index.vue
@@ -509,7 +509,7 @@ valiNumberPass(rule, value, callback, fieldName)
   background: #fff;
   box-sizing: border-box;
   padding: 10px;
-  height: 85vh;
+  height: 86vh;
 }
 
 .qizhi {
diff --git a/fuintAdmin/src/views/member/creditIndex.vue b/fuintAdmin/src/views/member/creditIndex.vue
index 8c20174aa..9dcc24ac4 100644
--- a/fuintAdmin/src/views/member/creditIndex.vue
+++ b/fuintAdmin/src/views/member/creditIndex.vue
@@ -196,7 +196,7 @@
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="open1 = false">取 消</el-button>
-        <el-button type="primary" @click="addCredit">确 定</el-button>
+        <el-button type="primary" @click="addCredit">保 存</el-button>
       </span>
     </el-dialog>
 
diff --git a/fuintAdmin/src/views/member/index.vue b/fuintAdmin/src/views/member/index.vue
index 4c2d98d10..f2d30656b 100644
--- a/fuintAdmin/src/views/member/index.vue
+++ b/fuintAdmin/src/views/member/index.vue
@@ -575,7 +575,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取 消</el-button>
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm">保 存</el-button>
       </div>
     </el-dialog>
 
@@ -658,7 +658,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="openMassSend = false">取 消</el-button>
-        <el-button type="primary" @click="submitForm1">确 定</el-button>
+        <el-button type="primary" @click="submitForm1">发 送</el-button>
 
       </div>
     </el-dialog>
diff --git a/fuintAdmin/src/views/member/manage.vue b/fuintAdmin/src/views/member/manage.vue
index c524978fd..64fe074d9 100644
--- a/fuintAdmin/src/views/member/manage.vue
+++ b/fuintAdmin/src/views/member/manage.vue
@@ -504,7 +504,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取 消</el-button>
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm">保 存</el-button>
 
       </div>
     </el-dialog>
@@ -1101,7 +1101,7 @@ export default {
         consumeCycle: this.tindex
       }
       this.open = true;
-      this.title = "新增会员标签";
+      this.title = "新增会员分组";
     },
     // 搜索按钮操作
     handleQuery2() {
@@ -1202,6 +1202,7 @@ export default {
 
 .cot-box {
   width: 99%;
+  height: 86vh;
   border-radius: 8px;
   background: #fff;
   box-sizing: border-box;
diff --git a/fuintAdmin/src/views/member/userLabel.vue b/fuintAdmin/src/views/member/userLabel.vue
index a049ef59f..9047c2f8e 100644
--- a/fuintAdmin/src/views/member/userLabel.vue
+++ b/fuintAdmin/src/views/member/userLabel.vue
@@ -286,6 +286,7 @@ export default {
 
 
 .wit_box{
+  height: 90vh;
   background: #fff;
   box-sizing: border-box;
   padding: 15px;
diff --git a/fuintAdmin/src/views/oilConfig/oilGun/list.vue b/fuintAdmin/src/views/oilConfig/oilGun/list.vue
index 718f815ba..1fda89336 100644
--- a/fuintAdmin/src/views/oilConfig/oilGun/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilGun/list.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div class="card-change">
+    <div class="card-change" style="height: 86vh;">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
         <el-form-item label="" prop="gunName">
           <el-input
diff --git a/fuintAdmin/src/views/oilConfig/oilInventory/list.vue b/fuintAdmin/src/views/oilConfig/oilInventory/list.vue
index 2e296660e..637aec348 100644
--- a/fuintAdmin/src/views/oilConfig/oilInventory/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilInventory/list.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div class="card-change">
+    <div class="card-change" style="height: 90vh;">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
         <el-form-item label="" prop="tankName">
           <el-input v-model="queryParams.inventoryNumber" placeholder="请输入盘点单号"/>
diff --git a/fuintAdmin/src/views/oilConfig/oilInventory/order.vue b/fuintAdmin/src/views/oilConfig/oilInventory/order.vue
index e30afe531..3641ecbcd 100644
--- a/fuintAdmin/src/views/oilConfig/oilInventory/order.vue
+++ b/fuintAdmin/src/views/oilConfig/oilInventory/order.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container" style="padding-top: 1px">
 
-    <div class="card-change-1-search" >
+    <div class="card-change-1-search" style="margin: 10px;">
       <div style="height: 90px; display: flex; justify-content: space-between;">
         <div style="height: 100%;  display: flex; justify-content: space-between;">
           <div style="height: 100%; width: 70%;  display: flex; justify-content: space-between;">
@@ -71,7 +71,7 @@
       </div>
     </div>
 
-    <div class="card-change-1-1" >
+    <div class="card-change-1-1" style="margin: 10px; height: 76vh; ">
       <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
 <!--          <span style="font-size: 20px;font-weight: bold">盘点详情</span>-->
@@ -171,9 +171,9 @@
     <el-dialog center :title="title" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
       <el-container>
         <el-header style="">
-          <el-form ref="tankForm" :model="tankForm" label-width="80px">
+          <el-form ref="tankForm" :model="tankForm">
             <el-row :gutter="24">
-              <el-col :span="10">
+              <el-col :span="8">
               <el-form-item label="">
                 <el-select v-model="tankForm.numberId" placeholder="请选择油品油号" style="width:100%" @change="chooseOilNumber()" clearable>
                   <el-option
@@ -185,13 +185,13 @@
                 </el-select>
               </el-form-item>
               </el-col>
-              <el-col :span="10">
+              <el-col :span="8">
                 <el-form-item label="">
                   <el-input v-model="tankForm.tankName" placeholder="请输入油罐名称"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="4">
-                  <el-button type="primary" @click="inquireTank()" icon="el-icon-search">搜索</el-button>
+              <el-col :span="8">
+                  <el-button type="primary" @click="inquireTank()" icon="el-icon-search" style="float:right; margin-right: 0px;">搜索</el-button>
               </el-col>
             </el-row>
           </el-form>
diff --git a/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue b/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue
index 37db80447..0b5e8f379 100644
--- a/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div class="card-change">
+    <div class="card-change" style="height: 90vh;">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
         <el-form-item label="" prop="purchaseNo">
           <el-input v-model="queryParams.purchaseNo" placeholder="请输入进货单号"/>
@@ -63,7 +63,7 @@
           </el-button>
         </el-form-item>
       </el-form>
-      <div style="height: 73vh;overflow: auto;scrollbar-width: none">
+      <div style="height: 74vh;overflow: auto;scrollbar-width: none">
         <el-table ref="tables"
                   v-loading="loading"
                   :data="purchaseList"
diff --git a/fuintAdmin/src/views/oilConfig/oilPurchase/purchaseOrder.vue b/fuintAdmin/src/views/oilConfig/oilPurchase/purchaseOrder.vue
index 8bf56d106..436d77d7c 100644
--- a/fuintAdmin/src/views/oilConfig/oilPurchase/purchaseOrder.vue
+++ b/fuintAdmin/src/views/oilConfig/oilPurchase/purchaseOrder.vue
@@ -227,7 +227,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取 消</el-button>
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm">保 存</el-button>
 
       </div>
     </el-dialog>
@@ -458,7 +458,7 @@ export default {
       // 初始化
       this.orderForm = {}
       this.open = true;
-      this.title = "新增采购油品"
+      this.title = "添加采购油品"
       this.getOilNameList()
       this.selectSuppliers()
     },
@@ -974,5 +974,14 @@ export default {
   padding-left: 20px;
 }
 
+.card-change-1-search{
+  margin: 10px;
+}
+
+.card-change-1-1{
+  margin: 10px;
+  height: 74vh;
+}
+
 
 </style>
diff --git a/fuintAdmin/src/views/oilConfig/oilStatistics/list.vue b/fuintAdmin/src/views/oilConfig/oilStatistics/list.vue
index ab8b24dcf..a06dc3747 100644
--- a/fuintAdmin/src/views/oilConfig/oilStatistics/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilStatistics/list.vue
@@ -336,6 +336,7 @@ box-sizing: border-box;
   margin-right: 44px;
 }
 .card_box{
+  height: 90vh;
   border-radius: 8px;
   background: #fff;
   box-sizing: border-box;
diff --git a/fuintAdmin/src/views/oilConfig/oilSuppliers/list.vue b/fuintAdmin/src/views/oilConfig/oilSuppliers/list.vue
index 03e40bf05..ab8392147 100644
--- a/fuintAdmin/src/views/oilConfig/oilSuppliers/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilSuppliers/list.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
 
-    <div class="card-change">
+    <div class="card-change" style="height: 90vh;">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
         <el-form-item label="" prop="supplierName">
           <el-input
@@ -110,7 +110,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取 消</el-button>
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm">保 存</el-button>
 
       </div>
     </el-dialog>
diff --git a/fuintAdmin/src/views/oilConfig/oilTank/list.vue b/fuintAdmin/src/views/oilConfig/oilTank/list.vue
index 819732290..b83ecabdf 100644
--- a/fuintAdmin/src/views/oilConfig/oilTank/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilTank/list.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <!--    搜索框-->
-    <div class="card-box">
+    <div class="card-box" style="height: 86vh; margin-bottom: 0px;">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
         <el-form-item label="" prop="tankName">
           <el-input
@@ -185,7 +185,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取 消</el-button>
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm">保 存</el-button>
 
       </div>
     </el-dialog>
diff --git a/fuintAdmin/src/views/order/order_Added.vue b/fuintAdmin/src/views/order/order_Added.vue
index 94d409800..5c748f803 100644
--- a/fuintAdmin/src/views/order/order_Added.vue
+++ b/fuintAdmin/src/views/order/order_Added.vue
@@ -425,9 +425,9 @@ export default {
 
 .box-card {
   width: 100%;
-  height: 89vh;
+  height: 91vh;
   border-radius: 8px;
-  margin-bottom: 15px;
+  // margin-bottom: 15px;
   background: #fff;
   box-sizing: border-box;
   padding: 10px;
@@ -497,7 +497,7 @@ export default {
 
 .table-box {
   width: 100%;
-  height: 73vh;
+  height: 75vh;
   overflow: auto;
 }
 
diff --git a/fuintAdmin/src/views/order/order_Goods.vue b/fuintAdmin/src/views/order/order_Goods.vue
index ab0fee6d1..b255822db 100644
--- a/fuintAdmin/src/views/order/order_Goods.vue
+++ b/fuintAdmin/src/views/order/order_Goods.vue
@@ -551,12 +551,12 @@ export default {
 
 .box-card {
   width: 100%;
-  height: 89vh;
+  height: 91vh;
   border-radius: 8px;
   background: #fff;
   box-sizing: border-box;
   padding: 10px;
-  margin-bottom: 15px;
+  // margin-bottom: 15px;
 }
 
 .box-gang {
diff --git a/fuintAdmin/src/views/order/order_Oil.vue b/fuintAdmin/src/views/order/order_Oil.vue
index ef94dbf2c..c3ceef4d4 100644
--- a/fuintAdmin/src/views/order/order_Oil.vue
+++ b/fuintAdmin/src/views/order/order_Oil.vue
@@ -715,12 +715,12 @@
   }
   .box-card {
     width: 100%;
-    height: 89vh;
+    height: 91vh;
     border-radius: 8px;
     background: #fff;
     box-sizing: border-box;
     padding: 10px;
-    margin-bottom: 15px;
+    // margin-bottom: 15px;
   }
   .box-gang{
     //width: 1920px;
diff --git a/fuintAdmin/src/views/order/order_Vip.vue b/fuintAdmin/src/views/order/order_Vip.vue
index bac0343e6..b73dcb508 100644
--- a/fuintAdmin/src/views/order/order_Vip.vue
+++ b/fuintAdmin/src/views/order/order_Vip.vue
@@ -422,12 +422,12 @@ export default {
 
 .box-card {
   width: 100%;
-  height: 89vh;
+  height: 91vh;
   border-radius: 8px;
   background: #fff;
   box-sizing: border-box;
   padding: 10px;
-  margin-bottom: 15px;
+  // margin-bottom: 15px;
 }
 
 .box-gang {
diff --git a/fuintAdmin/src/views/power/banner.vue b/fuintAdmin/src/views/power/banner.vue
index 526f39e7b..47a1dbf96 100644
--- a/fuintAdmin/src/views/power/banner.vue
+++ b/fuintAdmin/src/views/power/banner.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-conts">
-    <div class="card-change" >
+    <div class="card-change" style="height: 91vh;">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
         <el-form-item label="" prop="name">
           <el-input
@@ -28,7 +28,7 @@
           >新增banner图</el-button>
         </el-form-item>
       </el-form>
-      <div style="height: 76vh;overflow: auto">
+      <div style="height: 74vh;overflow: auto">
         <el-table :data="tableData" style="width: 100%;" border>
           <el-table-column type="index" align="center" label="序号"></el-table-column>
           <el-table-column prop="bannerName" align="center" label="banner名称"></el-table-column>
@@ -150,8 +150,8 @@
         </el-form>
       </el-form>
       <div style="display: flex;align-items: center;justify-content: center">
-        <el-button @click="open=false">取消</el-button>
-        <el-button type="primary" @click="submitForm('deviceForm')">提交</el-button>
+        <el-button @click="open=false">取 消</el-button>
+        <el-button type="primary" @click="submitForm('deviceForm')">保 存</el-button>
       </div>
     </el-dialog>
 
diff --git a/fuintAdmin/src/views/power/linkManage.vue b/fuintAdmin/src/views/power/linkManage.vue
index 1f6e59754..d17441beb 100644
--- a/fuintAdmin/src/views/power/linkManage.vue
+++ b/fuintAdmin/src/views/power/linkManage.vue
@@ -35,7 +35,7 @@
         </el-form-item>
       </el-form>
 
-      <div style="height: 75vh;overflow: auto">
+      <div style="height: 76vh;overflow: auto">
         <el-table :data="tableData" style="width: 100%" border>
           <el-table-column type="index" align="center" label="序号"></el-table-column>
           <el-table-column prop="pageName" align="center" label="页面/功能名称"></el-table-column>
@@ -104,7 +104,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取 消</el-button>
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm">保 存</el-button>
 
       </div>
     </el-dialog>
diff --git a/fuintAdmin/src/views/power/message.vue b/fuintAdmin/src/views/power/message.vue
index f0e1f1ab9..a2cd17c64 100644
--- a/fuintAdmin/src/views/power/message.vue
+++ b/fuintAdmin/src/views/power/message.vue
@@ -452,7 +452,7 @@
 
         <div style="text-align: center">
           <el-button @click="open = false">取 消</el-button>
-          <el-button type="primary" @click="submitForm('form')">提交</el-button>
+          <el-button type="primary" @click="submitForm('form')">保 存</el-button>
         </div>
       </el-form>
 
@@ -481,7 +481,7 @@
       </el-form>
       <div slot="footer" style="text-align: center">
         <el-button @click="open2 = false">取 消</el-button>
-        <el-button type="primary" @click="submitForm2">确 定</el-button>
+        <el-button type="primary" @click="submitForm2">保 存</el-button>
       </div>
     </el-dialog>
     <!--  充值  -->
@@ -509,7 +509,7 @@
         </el-form-item>
         <div style="text-align: center">
           <el-button @click="open3 = false">取 消</el-button>
-          <el-button type="primary" @click="submitForm3">确 定</el-button>
+          <el-button type="primary" @click="submitForm3">保 存</el-button>
         </div>
       </el-form>
     </el-dialog>
@@ -1084,7 +1084,7 @@ export default {
     handleAdd(e) {
       this.clean()
       this.open = true;
-      this.title = "新增短信"
+      this.title = "新增短信模板"
     },
     edit(e) {
       this.clean()
@@ -1146,7 +1146,7 @@ export default {
 .container_hui{
   background: #f6f8f9;
   box-sizing: border-box;
-  padding-bottom: 10px;
+  // padding-bottom: 10px;
 }
 
 .card-changes{
@@ -1155,7 +1155,7 @@ export default {
   box-sizing: border-box;
   padding: 15px;
   margin: 10px;
-  height: 84.5vh;
+  height: 86vh;
 }
 
 .common-dialog > > > .el-upload--picture-card {
diff --git a/fuintAdmin/src/views/power/operateLog.vue b/fuintAdmin/src/views/power/operateLog.vue
index cf8d13ecc..ae28e6add 100644
--- a/fuintAdmin/src/views/power/operateLog.vue
+++ b/fuintAdmin/src/views/power/operateLog.vue
@@ -80,7 +80,7 @@
         </el-form>
       </div>
 
-      <div style="height: 71vh;overflow: auto;width: 100%;scrollbar-width: none">
+      <div style="height: 76vh;overflow: auto;width: 100%;scrollbar-width: none">
         <el-table :data="tableData" style="width: 100%" border>
           <el-table-column type="index" label="序号"></el-table-column>
           <el-table-column prop="createAccount" label="登录账号"></el-table-column>
diff --git a/fuintAdmin/src/views/power/page/mode.vue b/fuintAdmin/src/views/power/page/mode.vue
index d3cca5399..21ef57854 100644
--- a/fuintAdmin/src/views/power/page/mode.vue
+++ b/fuintAdmin/src/views/power/page/mode.vue
@@ -40,7 +40,7 @@
           </el-button>
         </el-form-item>
       </el-form>
-      <div style="height: 68vh;overflow: auto">
+      <div style="height: 70vh;overflow: auto">
 
         <el-table :data="tableData" style="width: 100%" border>
           <el-table-column align="center" type="index" label="序号"></el-table-column>
@@ -332,12 +332,12 @@ export default {
       this.getDutyList()
       this.form.conditions = [{}]
 
-      this.title = "增加通知模板"
+      this.title = "新增通知模板"
     },
     edit(e) {
       this.clean()
       this.open = true;
-      this.title = "编辑通知模板"
+      this.title = "修改通知模板"
       this.getDutyList()
 
       this.form = e
@@ -479,7 +479,7 @@ export default {
 
 }
 .cards-change{
-    height: 81vh;
+  height: 83vh;
 }
 
 </style>
diff --git a/fuintAdmin/src/views/power/page/record.vue b/fuintAdmin/src/views/power/page/record.vue
index 7e7f51a3e..6bd488ed6 100644
--- a/fuintAdmin/src/views/power/page/record.vue
+++ b/fuintAdmin/src/views/power/page/record.vue
@@ -150,8 +150,8 @@
       </el-form>
 
       <div style="display: flex; justify-content: center; align-items: center;margin-top: 30px">
-        <el-button type="primary" @click="userEnter1">确定</el-button>
-        <el-button @click="userCe2">取消</el-button>
+        <el-button @click="userCe2">取 消</el-button>
+        <el-button type="primary" @click="userEnter1">保 存</el-button>
       </div>
     </el-dialog>
     <el-dialog center :title="title" :close-on-click-modal="false" :visible.sync="open1" width="50%" append-to-body>
@@ -399,7 +399,7 @@ export default {
       this.onlyGetUser()
       getSysNotifyInfo(e.id).then(res => {
         this.open = true;
-        this.title = "编辑通知"
+        this.title = "修改通知"
         this.form = res.data
         if (this.form.recipientUser) {
           this.form.recipientUser = JSON.parse(this.form.recipientUser)
@@ -557,7 +557,7 @@ export default {
 
 }
 .cards-change{
-  height: 81vh;
+  height: 83vh;
 }
 
 </style>
diff --git a/fuintAdmin/src/views/power/payment/index.vue b/fuintAdmin/src/views/power/payment/index.vue
index e17516256..3342d7177 100644
--- a/fuintAdmin/src/views/power/payment/index.vue
+++ b/fuintAdmin/src/views/power/payment/index.vue
@@ -197,7 +197,7 @@
         </el-table-column>
       </el-table>
     </div>
-    <el-dialog center :close-on-click-modal="false" :title="addMerchantTitile" :visible.sync="addMerchants" width="26%">
+    <el-dialog center :close-on-click-modal="false" :title="addMerchantTitile" :visible.sync="addMerchants" width="28%">
       <el-form :model="form" ref="formAdd" :rules="rules"  :inline="true">
         <el-form-item label="所属机构" style="margin-right: 0px" :label-width="formLabelWidth" prop="deptId">
           <el-select v-model="form.deptId+''" disabled placeholder="请选择所属机构" style="width: 350px">
@@ -235,7 +235,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="addMerchants = false">取 消</el-button>
-        <el-button type="primary" @click="submitMerchant">确 定</el-button>
+        <el-button type="primary" @click="submitMerchant">保 存</el-button>
       </div>
     </el-dialog>
     <el-dialog center :close-on-click-modal="false" :title="Ruletitle" :visible.sync="addRule">
@@ -330,7 +330,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer" v-if="Ruletitle != '查看商户信息'">
         <el-button @click="addRule = false">取 消</el-button>
-        <el-button type="primary" @click="submitAddRule">确 定</el-button>
+        <el-button type="primary" @click="submitAddRule">保 存</el-button>
       </div>
     </el-dialog>
     <el-dialog center :close-on-click-modal="false" title="启用" :visible.sync="Enable" width="650px">
@@ -704,7 +704,7 @@ export default {
           this.Ruletitle = '查看商户信息';
           this.isEditable = false;
         }else {
-          this.Ruletitle = '修改商户信息';
+          this.Ruletitle = '修改规则';
           this.isEditable = true;
         }
         this.addRule = true
diff --git a/fuintAdmin/src/views/setting/print/index.vue b/fuintAdmin/src/views/setting/print/index.vue
index a1a1f27e3..dac011603 100644
--- a/fuintAdmin/src/views/setting/print/index.vue
+++ b/fuintAdmin/src/views/setting/print/index.vue
@@ -347,12 +347,12 @@ export default {
     handleAdd(e) {
       this.clean()
       this.open = true;
-      this.title = "新增设备"
+      this.title = "新增设备信息"
     },
     edit(e) {
       this.clean()
       this.open = true;
-      this.title = "编辑设备"
+      this.title = "修改设备信息"
       console.log("eeeeeeee", e)
       if (e.staffIds) {
         let a = JSON.parse(e.staffIds)
diff --git a/fuintAdmin/src/views/staff/list.vue b/fuintAdmin/src/views/staff/list.vue
index 988a3873b..72f5e6803 100644
--- a/fuintAdmin/src/views/staff/list.vue
+++ b/fuintAdmin/src/views/staff/list.vue
@@ -225,7 +225,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取 消</el-button>
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm">保 存</el-button>
 
       </div>
     </el-dialog>
@@ -926,6 +926,7 @@ export default {
   margin-right: 44px;
 }
 .cont_box{
+  height: 90vh;
   border-radius: 8px;
   background: #fff;
   box-sizing: border-box;
diff --git a/fuintAdmin/src/views/staffCommission/staffCommission.vue b/fuintAdmin/src/views/staffCommission/staffCommission.vue
index dfe4b1a09..8cc138ba8 100644
--- a/fuintAdmin/src/views/staffCommission/staffCommission.vue
+++ b/fuintAdmin/src/views/staffCommission/staffCommission.vue
@@ -789,7 +789,7 @@ export default {
         // this.form.takeEffect = JSON.parse(this.form.takeEffect)
         this.form.royaltyRate = this.form.royaltyRate.slice(0, this.form.royaltyRate.length - 1)
         this.open = true;
-        this.title = "编辑提成方案";
+        this.title = "修改提成方案";
         if (response.data.staffRoleGroup) {
           this.staffRoleGroup = response.data.staffRoleGroup.split(",");
         }
@@ -939,7 +939,6 @@ export default {
   background: #fff;
   box-sizing: border-box;
   padding: 20px;
-
   margin: 0 auto;
 }
 
diff --git a/fuintAdmin/src/views/userGrade/index.vue b/fuintAdmin/src/views/userGrade/index.vue
index 978174ef4..73946db1c 100644
--- a/fuintAdmin/src/views/userGrade/index.vue
+++ b/fuintAdmin/src/views/userGrade/index.vue
@@ -528,7 +528,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取 消</el-button>
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm">保 存</el-button>
 
       </div>
     </el-dialog>
@@ -686,8 +686,8 @@
 
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm2">确 定</el-button>
         <el-button @click="cancel2">取 消</el-button>
+        <el-button type="primary" @click="submitForm2">保 存</el-button>
       </div>
     </el-dialog>
 
@@ -1360,7 +1360,7 @@ export default {
         this.tindex2 = res.data.suitDateType
         this.tindex3 = res.data.suitTimeSlotType
         this.tindex4 = res.data.noUseTimeType
-        this.title = "修改会员折扣"
+        this.title = "修改折扣"
       })
     },
     // 删除按钮操作
@@ -1871,7 +1871,7 @@ export default {
           }
         }
         this.open = true;
-        this.title = "编辑会员等级";
+        this.title = "修改会员等级";
       });
     },
     // 删除按钮操作
diff --git a/fuintAdmin_zt/src/views/Site/components/afterff.vue b/fuintAdmin_zt/src/views/Site/components/afterff.vue
index 36bbca62c..867b6a1e1 100644
--- a/fuintAdmin_zt/src/views/Site/components/afterff.vue
+++ b/fuintAdmin_zt/src/views/Site/components/afterff.vue
@@ -8,10 +8,13 @@ import {
   updateYearApi
 } from "@/api/system/Site/compant";
 
+import { getDeptName} from '@/api/indexBanner/index'
+
 export default {
   name: "afterff",
   data() {
     return {
+      deptName:'',
       dialogVisible:false,
       dialogVisible2:false,
       tableData: [],
@@ -34,8 +37,15 @@ export default {
   created() {
     this.getList();
     this.getData();
+    this.getDeptName();
   },
   methods: {
+    getDeptName(){
+      getDeptName().then(res=>{
+        console.log("获取到的deptName",res)
+        this.deptName = res.data.deptName
+      })
+    },
     getList() {
       getAfterListApi({deptId : this.deptId}).then(res => {
         this.tableData = res.data.records
@@ -160,11 +170,12 @@ export default {
         align="center"
         label="创建人">
       </el-table-column>
-      <!-- <el-table-column
-      width="200"
-        align="center"
-      label="操作"
-      > -->
+      <el-table-column
+        v-if = "this.deptName === '百业兴总部'"
+        width="200"
+          align="center"
+        label="操作"
+        >
 <!--        <template slot="header" slot-scope="scope">-->
 <!--          <el-button-->
 <!--            size="mini"-->
@@ -172,14 +183,14 @@ export default {
 <!--          >新增</el-button>-->
 <!--          操作-->
 <!--        </template>-->
-        <!-- <template slot-scope="scope">
+        <template slot-scope="scope">
           <el-button
             size="mini"
             @click="handleEdit(scope.row)">修改</el-button>
           <el-button
             size="mini"
             @click="handleEditshoukuan(scope.row)">收款</el-button>
-        </template> -->
+        </template>
 
       </el-table-column>
     </el-table>
diff --git a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/list.vue b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/list.vue
index f4fe0ffd6..77ffbfb33 100644
--- a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/list.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/list.vue
@@ -68,7 +68,7 @@ export default {
 .app-top{
   width: 100%;
 //margin-bottom: 20px;
-  height: 52px;
+  height: 41px;
   box-sizing: border-box;
 
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/mapper/PaymentParameterConfigMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/mapper/PaymentParameterConfigMapper.java
index 5587b2fbf..7572bf3fb 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/mapper/PaymentParameterConfigMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/mapper/PaymentParameterConfigMapper.java
@@ -19,5 +19,6 @@ public interface PaymentParameterConfigMapper extends BaseMapper<PaymentParamete
     IPage<PaymentParameterConfigVo> selectListPage(Page page,@Param("entity") PaymentParameterConfigVo paymentParameterConfigVo,@Param("ownDeptStr") String ownDeptStr);
 
     PaymentParameterConfigVo selectInfoById(@Param("id") Integer id);
+    List<PaymentParameterConfig> selectListByDeptId(Integer deptId);
 }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/mapper/xml/PaymentParameterConfigMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/mapper/xml/PaymentParameterConfigMapper.xml
index a6ec0877e..bdfeb35c1 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/mapper/xml/PaymentParameterConfigMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/mapper/xml/PaymentParameterConfigMapper.xml
@@ -34,5 +34,24 @@
              LEFT JOIN t_account ta ON ppc.create_by = ta.acct_id
         where ppc.id = #{id}
     </select>
+
+    <select id="selectListByDeptId" resultType="com.fuint.api.fuyou.entity.PaymentParameterConfig"
+            parameterType="java.lang.Integer">
+        SELECT ppc.id,
+               ppc.dept_id,
+               CONCAT(sd.dept_name, '-' , ppc.payment_channel) as payment_channel,
+               ppc.ins_cd,
+               ppc.public_key,
+               ppc.private_key,ppc.contact,
+               ppc.information,
+               ppc.status,
+               ppc.create_time,
+               ppc.update_time,
+               ppc.create_by,
+               ppc.update_by
+        FROM payment_parameter_config ppc
+                 join sys_dept sd on ppc.dept_id = sd.dept_id
+        WHERE ppc.dept_id = #{deptId}
+    </select>
 </mapper>
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java
index f928dc3dc..a7eac4a1d 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java
@@ -218,7 +218,7 @@ public class MerchantConfigServiceImpl extends ServiceImpl<MerchantConfigMapper,
         }
         merchantConfig.setStoreId(storeId);
         int row = 0;
-        if (merchantConfig.getMerchantName().equals("富友")){
+        if (merchantConfig.getMerchantName().split("-")[1].equals("富友")){
             merchantConfig.setInsCd(FuYouPublicMerchant.insCd);
             merchantConfig.setPublicKey(FuYouPublicMerchant.publicKey);
             merchantConfig.setPrivateKey(FuYouPublicMerchant.privateKey);
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/PaymentParameterConfigServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/PaymentParameterConfigServiceImpl.java
index f3ee35b15..02b1280cc 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/PaymentParameterConfigServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/PaymentParameterConfigServiceImpl.java
@@ -13,6 +13,7 @@ import com.fuint.api.fuyou.vo.PaymentParameterConfigVo;
 import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.util.TokenUtil;
 import com.fuint.system.dept.entity.SysDept;
+import com.fuint.system.dept.mapper.SysDeptMapper;
 import com.fuint.system.dept.service.ISysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
@@ -21,6 +22,7 @@ import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -36,6 +38,9 @@ public class PaymentParameterConfigServiceImpl extends ServiceImpl<PaymentParame
     @Lazy
     private ISysDeptService deptService;
 
+    @Autowired
+    private SysDeptMapper sysDeptMapper;
+
     /**
      * 通过ID查询单条数据
      *
@@ -117,11 +122,29 @@ public class PaymentParameterConfigServiceImpl extends ServiceImpl<PaymentParame
         return baseMapper.selectInfoById(id);
     }
 
+    // @Override
+    // public List<PaymentParameterConfig> selectListByDeptID(Integer deptId) {
+    //     QueryWrapper queryWrapper = new QueryWrapper<>();
+    //     queryWrapper.eq("dept_id",deptId);
+    //     return baseMapper.selectList(queryWrapper);
+    // }
+
     @Override
     public List<PaymentParameterConfig> selectListByDeptID(Integer deptId) {
-        QueryWrapper queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("dept_id",deptId);
-        return baseMapper.selectList(queryWrapper);
+        List<PaymentParameterConfig> resultList = new ArrayList<>();
+        selectListByDeptIDRecursive(deptId, resultList);
+        return resultList;
+    }
+
+    private void selectListByDeptIDRecursive(Integer deptId, List<PaymentParameterConfig> resultList) {
+        List<PaymentParameterConfig> selectList = baseMapper.selectListByDeptId(deptId);
+        if (CollectionUtil.isNotEmpty(selectList)) {
+            resultList.addAll(selectList);
+            SysDept sysDept = sysDeptMapper.selectById(deptId);
+            if (sysDept != null && sysDept.getParentId() != null) {
+                selectListByDeptIDRecursive(sysDept.getParentId().intValue(), resultList);
+            }
+        }
     }
 
     @Override