diff --git a/fuintAdmin/src/views/cashier/components/hangUpDialog.vue b/fuintAdmin/src/views/cashier/components/hangUpDialog.vue
index a2655b773..9c9cc3141 100644
--- a/fuintAdmin/src/views/cashier/components/hangUpDialog.vue
+++ b/fuintAdmin/src/views/cashier/components/hangUpDialog.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-dialog class="common-dialog" title="挂单列表" :visible="showDialog" @close="close" width="1000px" destroy-on-close>
+    <el-dialog center class="common-dialog" title="挂单列表" :visible="showDialog" @close="close" width="1000px" destroy-on-close>
         <el-alert title="提示：请选择一个空白位置挂单" type="warning" :closable="false"></el-alert>
         <div class="order-list">
           <div class="order-item" v-for="orderInfo in orderList">
diff --git a/fuintAdmin/src/views/cashier/components/noGoodsCashier.vue b/fuintAdmin/src/views/cashier/components/noGoodsCashier.vue
index 951941784..9a3fd848d 100644
--- a/fuintAdmin/src/views/cashier/components/noGoodsCashier.vue
+++ b/fuintAdmin/src/views/cashier/components/noGoodsCashier.vue
@@ -1,6 +1,6 @@
 <template>
   <!-- 积分变更对话框 -->
-  <el-dialog title="无商品收款" :visible.sync="showDialog" class="common-dialog" width="700px" @close="close" destroy-on-close>
+  <el-dialog center title="无商品收款" :visible.sync="showDialog" class="common-dialog" width="700px" @close="close" destroy-on-close>
     <el-form ref="form" :model="form" :rules="rules" label-width="120px">
       <el-row>
         <el-col :span="24">
diff --git a/fuintAdmin/src/views/cashier/components/orderPrintDialog.vue b/fuintAdmin/src/views/cashier/components/orderPrintDialog.vue
index b71110352..c24e5dd5b 100644
--- a/fuintAdmin/src/views/cashier/components/orderPrintDialog.vue
+++ b/fuintAdmin/src/views/cashier/components/orderPrintDialog.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog class="common-dialog" title="订单打印预览" :visible="showDialog" width="380px" @close="cancel" append-to-body destroy-on-close>
+  <el-dialog center class="common-dialog" title="订单打印预览" :visible="showDialog" width="380px" @close="cancel" append-to-body destroy-on-close>
     <div v-if="orderInfo.id" class="print-area" id="printArea">
       <div class="base-info">
         <div class="name">{{ storeInfo.name }}</div>
diff --git a/fuintAdmin/src/views/cashier/components/payResultDialog.vue b/fuintAdmin/src/views/cashier/components/payResultDialog.vue
index 4afc98048..7021d2ac9 100644
--- a/fuintAdmin/src/views/cashier/components/payResultDialog.vue
+++ b/fuintAdmin/src/views/cashier/components/payResultDialog.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-dialog class="common-dialog" title="支付结果" :visible="showDialog" @close="submit" width="580px" destroy-on-close>
+    <el-dialog center class="common-dialog" title="支付结果" :visible="showDialog" @close="submit" width="580px" destroy-on-close>
           <el-row>
             <el-col :span="24">
               <div class="main">
diff --git a/fuintAdmin/src/views/cashier/components/scanPayCodeDialog.vue b/fuintAdmin/src/views/cashier/components/scanPayCodeDialog.vue
index e0ac8f487..65ccda758 100644
--- a/fuintAdmin/src/views/cashier/components/scanPayCodeDialog.vue
+++ b/fuintAdmin/src/views/cashier/components/scanPayCodeDialog.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-dialog class="common-dialog" title="扫码收款中..." :visible="showDialog" @close="submit" width="580px" destroy-on-close>
+    <el-dialog center class="common-dialog" title="扫码收款中..." :visible="showDialog" @close="submit" width="580px" destroy-on-close>
           <el-row>
             <el-col :span="24">
               <div class="main">
diff --git a/fuintAdmin/src/views/cashier/components/settlementDialog.vue b/fuintAdmin/src/views/cashier/components/settlementDialog.vue
index 68eeaaa80..52135a2f6 100644
--- a/fuintAdmin/src/views/cashier/components/settlementDialog.vue
+++ b/fuintAdmin/src/views/cashier/components/settlementDialog.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-dialog class="common-dialog" title="支付结算" :visible="showDialog" width="1100px" @close="cancel" destroy-on-close>
+    <el-dialog center class="common-dialog" title="支付结算" :visible="showDialog" width="1100px" @close="cancel" destroy-on-close>
         <el-dialog class="common-dialog" width="800px" title="选择卡券" :visible.sync="showCouponDialog" append-to-body destroy-on-close>
           <div class="coupon-list">
             <div class="none" v-if="!memberInfo || !myCouponList || myCouponList.length < 1">暂无可用卡券</div>
diff --git a/fuintAdmin/src/views/cashier/components/switchMemberDialog.vue b/fuintAdmin/src/views/cashier/components/switchMemberDialog.vue
index 237be8fcb..474e9d87e 100644
--- a/fuintAdmin/src/views/cashier/components/switchMemberDialog.vue
+++ b/fuintAdmin/src/views/cashier/components/switchMemberDialog.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-dialog class="common-dialog" title="关联会员" :visible="showDialog" @close="close" width="750px" destroy-on-close>
+    <el-dialog center class="common-dialog" title="关联会员" :visible="showDialog" @close="close" width="750px" destroy-on-close>
         <el-form ref="form" v-if="!memberInfo.id" class="form" :model="form" label-width="100px">
             <el-form-item label="会员关键字" class="form-item" prop="keyword">
               <el-input class="input-item" v-model="form.keyword" v-focus placeholder="请输入会员手机号码、会员名称或扫码会员二维码" clearable maxlength="200" />
diff --git a/fuintAdmin/src/views/cashier/index.vue b/fuintAdmin/src/views/cashier/index.vue
index 7b8c48b02..60398c8db 100644
--- a/fuintAdmin/src/views/cashier/index.vue
+++ b/fuintAdmin/src/views/cashier/index.vue
@@ -131,7 +131,7 @@
      </el-drawer>
 
      <!-- 规格详情 start-->
-     <el-dialog title="选择商品规格" :visible.sync="openGoodsDialog" class="common-dialog" append-to-body>
+     <el-dialog center title="选择商品规格" :visible.sync="openGoodsDialog" class="common-dialog" append-to-body>
        <div class="goods-info">
          <div class="name">{{ goodsInfo.name }}</div>
          <div class="price">￥{{ goodsInfo.price }}</div>
diff --git a/fuintAdmin/src/views/content/article/index.vue b/fuintAdmin/src/views/content/article/index.vue
index 56f89fa9a..b8110e1e7 100644
--- a/fuintAdmin/src/views/content/article/index.vue
+++ b/fuintAdmin/src/views/content/article/index.vue
@@ -92,7 +92,7 @@
     />
 
     <!-- 添加或修改文章对话框 -->
-    <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
+    <el-dialog center :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
           <el-row>
             <el-col :span="24">
diff --git a/fuintAdmin/src/views/coupon/confirm/index.vue b/fuintAdmin/src/views/coupon/confirm/index.vue
index e31b3e66c..818f41319 100644
--- a/fuintAdmin/src/views/coupon/confirm/index.vue
+++ b/fuintAdmin/src/views/coupon/confirm/index.vue
@@ -17,7 +17,7 @@
     </div>
 
     <!--核销对话框 start-->
-    <el-dialog :close-on-click-modal="false" title="核销卡券" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
+    <el-dialog center :close-on-click-modal="false" title="核销卡券" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
       <el-form ref="confirmForm" :model="confirmForm" :rules="confirmRules" label-width="120px">
         <el-row>
           <el-col :span="24">
diff --git a/fuintAdmin/src/views/coupon/coupon/index.vue b/fuintAdmin/src/views/coupon/coupon/index.vue
index 146665f58..b057071f2 100644
--- a/fuintAdmin/src/views/coupon/coupon/index.vue
+++ b/fuintAdmin/src/views/coupon/coupon/index.vue
@@ -139,7 +139,7 @@
     />
 
     <!-- 添加或修改卡券对话框 start-->
-    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" class="common-dialog" width="800px" append-to-body>
+    <el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="open" class="common-dialog" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="140px">
         <el-row>
           <el-col :span="24">
@@ -439,7 +439,7 @@
     <!-- 添加或修改卡券对话框 end-->
 
     <!--发券对话框 start-->
-    <el-dialog :close-on-click-modal="false" title="发放卡券" :visible.sync="openSendCouponDialog" class="common-dialog" width="700px" append-to-body>
+    <el-dialog center :close-on-click-modal="false" title="发放卡券" :visible.sync="openSendCouponDialog" class="common-dialog" width="700px" append-to-body>
       <el-form ref="sendForm" :model="sendForm" :rules="sendFormRules" label-width="120px">
         <el-row>
           <el-col :span="24">
diff --git a/fuintAdmin/src/views/coupon/give/index.vue b/fuintAdmin/src/views/coupon/give/index.vue
index 6d96745ce..747a3bb40 100644
--- a/fuintAdmin/src/views/coupon/give/index.vue
+++ b/fuintAdmin/src/views/coupon/give/index.vue
@@ -111,7 +111,7 @@
       @pagination="getList"
     />
 
-    <el-dialog :close-on-click-modal="false" title="转赠明细" :visible.sync="open" class="common-dialog" width="800px" append-to-body>
+    <el-dialog center :close-on-click-modal="false" title="转赠明细" :visible.sync="open" class="common-dialog" width="800px" append-to-body>
       <el-table ref="tables" v-loading="loading" :data="itemList">
         <el-table-column label="ID" align="center" prop="id" width="60"/>
         <el-table-column label="手机号" align="center" width="120" prop="mobile"/>
diff --git a/fuintAdmin/src/views/coupon/group/index.vue b/fuintAdmin/src/views/coupon/group/index.vue
index 4d7cac477..862904e7e 100644
--- a/fuintAdmin/src/views/coupon/group/index.vue
+++ b/fuintAdmin/src/views/coupon/group/index.vue
@@ -100,7 +100,7 @@
     />
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
+    <el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="24">
diff --git a/fuintAdmin/src/views/duty/index.vue b/fuintAdmin/src/views/duty/index.vue
index 2b0b5bb88..5acaeaf81 100644
--- a/fuintAdmin/src/views/duty/index.vue
+++ b/fuintAdmin/src/views/duty/index.vue
@@ -93,7 +93,7 @@
     </div>
 
     <!-- 添加或修改角色配置对话框 -->
-    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="openDuty" width="700px" append-to-body>
+    <el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="openDuty" width="700px" append-to-body>
       <el-form ref="form1" :model="form1" :rules="rules1" label-width="100px">
         <el-form-item label="角色名称" prop="roleName">
           <el-input v-model="form1.roleName" @input="$forceUpdate()" style="width: 300px" placeholder="请输入角色名称"/>
diff --git a/fuintAdmin/src/views/feedBack/index.vue b/fuintAdmin/src/views/feedBack/index.vue
index b7198f16a..1c58eb776 100644
--- a/fuintAdmin/src/views/feedBack/index.vue
+++ b/fuintAdmin/src/views/feedBack/index.vue
@@ -91,7 +91,7 @@
 
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="40%" append-to-body>
+    <el-dialog center :title="title" :visible.sync="open" width="40%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
 
         <el-form-item label="反馈内容" prop="content">
diff --git a/fuintAdmin/src/views/fleet/index.vue b/fuintAdmin/src/views/fleet/index.vue
index 1e06ce633..6749a6f43 100644
--- a/fuintAdmin/src/views/fleet/index.vue
+++ b/fuintAdmin/src/views/fleet/index.vue
@@ -2,7 +2,7 @@
   <div class="app-r">
     <div class="app-top">
       <div :body-style="{ padding: '0px' }">
-        <div class="box">
+        <div class="sb_box">
           <div class="nbox" :class="pointerClass" @click="updateRedio('车队信息')">
             <div class="fount-box" :style="{ color: radio1 === '车队信息' ? '#FF770F' : '#999999' }">车队信息</div>
             <div class="heng-box" v-if="radio1 == '车队信息'"></div>
@@ -100,4 +100,14 @@ export default {
   height: 2px;
   margin-top: 10px;
 }
+.sb_box{
+  width: 100%;
+  display: flex;
+  box-sizing: border-box;
+  padding-left: 15px;
+  align-items: center;
+  background: #fff;
+  padding-top: 10px;
+
+}
 </style>
diff --git a/fuintAdmin/src/views/fleet/tab/fleetInfo.vue b/fuintAdmin/src/views/fleet/tab/fleetInfo.vue
index f3e5506f3..186163f09 100644
--- a/fuintAdmin/src/views/fleet/tab/fleetInfo.vue
+++ b/fuintAdmin/src/views/fleet/tab/fleetInfo.vue
@@ -128,7 +128,7 @@
       />
     </div>
     <!-- 添加或修改对话框 -->
-    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="32%" append-to-body>
+    <el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="open" width="32%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="95px">
         <el-form-item label="车队名称" prop="fleetName">
           <el-input v-model="form.fleetName" placeholder="请输入车队名称" maxlength="30" />
@@ -186,7 +186,7 @@
       </div>
     </el-dialog>
     <!-- 添加或修改对话框 -->
-    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open1" width="32%" append-to-body>
+    <el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="open1" width="32%" append-to-body>
       <el-form ref="form1" :model="form1" :rules="rules" label-width="80px">
         <el-form-item label="车队名称" prop="fleetName">
           <el-input v-model="form1.fleetName" placeholder="请输入车队名称" maxlength="50"/>
diff --git a/fuintAdmin/src/views/fleet/tab/fleetMember.vue b/fuintAdmin/src/views/fleet/tab/fleetMember.vue
index d1de3ce81..cfc59791f 100644
--- a/fuintAdmin/src/views/fleet/tab/fleetMember.vue
+++ b/fuintAdmin/src/views/fleet/tab/fleetMember.vue
@@ -149,7 +149,7 @@
     </div>
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="30%" append-to-body>
+    <el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="open" width="30%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="车队名称" prop="fleetId">
           <el-select v-model="form.fleetId" placeholder="请选择车队名称" style="width: 100%;">
@@ -202,7 +202,7 @@
       </div>
     </el-dialog>
     <!-- 添加或修改对话框 -->
-    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open1" width="30%" append-to-body>
+    <el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="open1" width="30%" append-to-body>
       <el-form ref="form1" :model="form1" :rules="rules" label-width="80px">
 
         <el-form-item label="副卡额度" prop="secondaryCardLimit">
@@ -248,7 +248,7 @@
     </el-dialog>
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open2" width="30%" append-to-body>
+    <el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="open2" width="30%" append-to-body>
       <el-form ref="form2" :model="form2" :rules="rules" label-width="80px">
 
         <el-form-item label="副卡额度" prop="secondaryCardLimit">
@@ -280,7 +280,7 @@
     </el-dialog>
 
     <!-- 批量添加用户认证信息 -->
-    <el-dialog :title="title" :visible.sync="open3" width="30%"
+    <el-dialog center :title="title" :visible.sync="open3" width="30%"
                :close-on-click-modal="false" append-to-body>
       <el-form ref="form2" :model="form3" :rules="rules">
         <el-row>
@@ -341,7 +341,7 @@
 
 
     <!--    批量导入结果-->
-    <el-dialog :close-on-click-modal="false" width="400px" style="margin-top: 150px" :title="title" :visible.sync="openResult" append-to-body>
+    <el-dialog center :close-on-click-modal="false" width="400px" style="margin-top: 150px" :title="title" :visible.sync="openResult" append-to-body>
       <div class="huiyuan">
         认证总数：<span class="num">{{result.total}}</span> 人
       </div>
diff --git a/fuintAdmin/src/views/goods/cate/index.vue b/fuintAdmin/src/views/goods/cate/index.vue
index 26f26c19e..7ef848e79 100644
--- a/fuintAdmin/src/views/goods/cate/index.vue
+++ b/fuintAdmin/src/views/goods/cate/index.vue
@@ -111,7 +111,7 @@
     />
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
+    <el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="24">
diff --git a/fuintAdmin/src/views/member/balanceRecharge.vue b/fuintAdmin/src/views/member/balanceRecharge.vue
index c712103a8..7da78f35f 100644
--- a/fuintAdmin/src/views/member/balanceRecharge.vue
+++ b/fuintAdmin/src/views/member/balanceRecharge.vue
@@ -1,6 +1,6 @@
 <template>
   <!-- 充值对话框 -->
-  <el-dialog :close-on-click-modal="false" class="common-dialog" title="余额充值/扣减" :visible.sync="showDialog" width="700px" @close="cancel" destroy-on-close>
+  <el-dialog  center :close-on-click-modal="false" class="common-dialog" title="余额充值/扣减" :visible.sync="showDialog" width="700px" @close="cancel" destroy-on-close>
     <el-form ref="form" :model="form" :rules="rules" label-width="120px">
       <el-row>
         <el-col :span="24">
diff --git a/fuintAdmin/src/views/member/creditIndex.vue b/fuintAdmin/src/views/member/creditIndex.vue
index ad57ba3c5..fc3dbbddc 100644
--- a/fuintAdmin/src/views/member/creditIndex.vue
+++ b/fuintAdmin/src/views/member/creditIndex.vue
@@ -113,7 +113,7 @@
     </div>
 
     <!--      新增挂账单位信息-->
-    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open1" width="700px" append-to-body>
+    <el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="open1" width="700px" append-to-body>
       <el-form ref="formName" :model="form1" :rules="rules1" label-width="120px">
         <el-row>
           <el-col :span="24">
diff --git a/fuintAdmin/src/views/member/fixingLevel.vue b/fuintAdmin/src/views/member/fixingLevel.vue
index 42de86942..ee8c5fc38 100644
--- a/fuintAdmin/src/views/member/fixingLevel.vue
+++ b/fuintAdmin/src/views/member/fixingLevel.vue
@@ -348,7 +348,7 @@
     </el-card>
 
     <!-- 批量添加用户认证信息 -->
-    <el-dialog :title="title" :visible.sync="openMembers"
+    <el-dialog center :title="title" :visible.sync="openMembers"
                :close-on-click-modal="false" append-to-body>
       <el-form ref="form2" :model="form2" :rules="rules2">
         <el-row>
@@ -423,7 +423,7 @@
     </el-dialog>
 
     <!--    批量导入结果-->
-    <el-dialog width="400px" style="margin-top: 150px" :title="title" :visible.sync="openResult" append-to-body>
+    <el-dialog center width="400px" style="margin-top: 150px" :title="title" :visible.sync="openResult" append-to-body>
       <div class="huiyuan">
         认证总数：<span class="num">{{result.total}}</span> 人
       </div>
@@ -440,7 +440,7 @@
     </el-dialog>
 
     <!-- 添加用户认证或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="openMember"
+    <el-dialog center :title="title" :visible.sync="openMember"
                :close-on-click-modal="false" append-to-body>
       <el-form ref="form1" :model="form1" :rules="rules1">
         <el-row>
@@ -578,7 +578,7 @@
     </el-dialog>
 
     <!-- 添加企业会员等级或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" class="roll-dialog"
+    <el-dialog center :title="title" :visible.sync="open" class="roll-dialog"
                :close-on-click-modal="false" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
diff --git a/fuintAdmin/src/views/member/index.vue b/fuintAdmin/src/views/member/index.vue
index de361cf7b..bf95e5e62 100644
--- a/fuintAdmin/src/views/member/index.vue
+++ b/fuintAdmin/src/views/member/index.vue
@@ -406,7 +406,7 @@
     <div style="width: 100%;height: 10px;"></div>
 
     <!--    添加会员信息，选择是否批量录入-->
-    <el-dialog :close-on-click-modal="false" :title="title" width="40%" :visible.sync="openUser" append-to-body>
+    <el-dialog center :close-on-click-modal="false" :title="title" width="40%" :visible.sync="openUser" append-to-body>
       <el-alert
         type="info"
         :closable="false">
@@ -425,7 +425,7 @@
     </el-dialog>
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :close-on-click-modal="false" :title="title" width="30%" :visible.sync="open" append-to-body>
+    <el-dialog center :close-on-click-modal="false" :title="title" width="30%" :visible.sync="open" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="90px">
         <el-row>
           <el-col :span="24">
@@ -580,7 +580,7 @@
     </el-dialog>
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :close-on-click-modal="false" :title="title" width="30%" :visible.sync="openMassSend" append-to-body>
+    <el-dialog center :close-on-click-modal="false" :title="title" width="30%" :visible.sync="openMassSend" append-to-body>
       <el-form ref="form1" :model="form1" :rules="rules1" label-width="100px">
         <el-row>
           <el-col :span="24">
@@ -637,7 +637,7 @@
     </el-dialog>
 
     <!--    批量录入会员信息-->
-    <el-dialog :title="title" :close-on-click-modal="false" width="500px" :visible.sync="openUpload" append-to-body>
+    <el-dialog center :title="title" :close-on-click-modal="false" width="500px" :visible.sync="openUpload" append-to-body>
       <el-form ref="form1" :model="form1" :rules="rules1" label-width="90px">
         <el-row>
           <el-col :span="24">
@@ -694,7 +694,7 @@
     </el-dialog>
 
     <!--    批量导入结果-->
-    <el-dialog width="400px" style="margin-top: 150px" :title="title" :visible.sync="openResult" append-to-body>
+    <el-dialog center width="400px" style="margin-top: 150px" :title="title" :visible.sync="openResult" append-to-body>
       <div class="huiyuan">
         会员总数：<span class="num">{{ result.total }}</span> 人
       </div>
diff --git a/fuintAdmin/src/views/member/manage.vue b/fuintAdmin/src/views/member/manage.vue
index 03dbb27b9..8224e69ba 100644
--- a/fuintAdmin/src/views/member/manage.vue
+++ b/fuintAdmin/src/views/member/manage.vue
@@ -369,7 +369,7 @@
 
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="55%" append-to-body>
+    <el-dialog center :title="title" :close-on-click-modal="false" :visible.sync="open" width="55%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
           <div class="flax_box">
             <el-form-item label="分组名称" prop="groupName">
@@ -509,7 +509,7 @@
     </el-dialog>
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open1" width="35%" append-to-body>
+    <el-dialog center :title="title" :close-on-click-modal="false" :visible.sync="open1" width="35%" append-to-body>
       <el-form ref="form1" :model="form1" :rules="rules" label-width="80px">
 
         <el-form-item label="活动名称" prop="name">
diff --git a/fuintAdmin/src/views/member/pointRecharge.vue b/fuintAdmin/src/views/member/pointRecharge.vue
index 78b16f753..cf7f94aa8 100644
--- a/fuintAdmin/src/views/member/pointRecharge.vue
+++ b/fuintAdmin/src/views/member/pointRecharge.vue
@@ -1,6 +1,6 @@
 <template>
   <!-- 积分变更对话框 -->
-  <el-dialog :close-on-click-modal="false" title="积分变更" :visible.sync="showDialog" class="common-dialog" width="700px" @close="cancel" destroy-on-close>
+  <el-dialog center :close-on-click-modal="false" title="积分变更" :visible.sync="showDialog" class="common-dialog" width="700px" @close="cancel" destroy-on-close>
     <el-form ref="form" :model="form" :rules="rules" label-width="120px">
       <el-row>
         <el-col :span="24">
diff --git a/fuintAdmin/src/views/member/userInfo.vue b/fuintAdmin/src/views/member/userInfo.vue
index 7182fd572..60146180e 100644
--- a/fuintAdmin/src/views/member/userInfo.vue
+++ b/fuintAdmin/src/views/member/userInfo.vue
@@ -155,7 +155,7 @@
     </el-card>
 
     <!--    会员充值-->
-    <el-dialog :close-on-click-modal="false" width="60%" :title="title" :visible.sync="openRecharge" append-to-body>
+    <el-dialog center :close-on-click-modal="false" width="60%" :title="title" :visible.sync="openRecharge" append-to-body>
       <template>
         <el-tabs v-model="activeRecharge" type="card" @tab-click="handleClick">
           <el-tab-pane label="电子储值卡" name="balance">
@@ -393,7 +393,7 @@
     </el-dialog>
 
     <!--    选择员工-->
-    <el-dialog :close-on-click-modal="false" width="50%" height="50%" title="选择员工" :visible.sync="openStaff"
+    <el-dialog center :close-on-click-modal="false" width="50%" height="50%" title="选择员工" :visible.sync="openStaff"
                append-to-body>
       <select-staff @send-data="handleDataFromChild">
 
@@ -401,7 +401,7 @@
     </el-dialog>
 
     <!--    确认充值-->
-    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="openConfirm" width="500px" append-to-body>
+    <el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="openConfirm" width="500px" append-to-body>
       <div v-if="isPay"
            v-loading="loading">
 
@@ -491,7 +491,7 @@
     </el-dialog>
 
     <!--    更换手机号对话框-->
-    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="openMobile" style="margin-top: 200px"
+    <el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="openMobile" style="margin-top: 200px"
                width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
diff --git a/fuintAdmin/src/views/member/userInfoOrder/cardValueChild.vue b/fuintAdmin/src/views/member/userInfoOrder/cardValueChild.vue
index 98c56a070..a5bd78065 100644
--- a/fuintAdmin/src/views/member/userInfoOrder/cardValueChild.vue
+++ b/fuintAdmin/src/views/member/userInfoOrder/cardValueChild.vue
@@ -127,7 +127,7 @@
       </el-tab-pane>
     </el-tabs>
 
-    <el-dialog :title="title" :visible.sync="openSubCard1" width="30%">
+    <el-dialog center :title="title" :visible.sync="openSubCard1" width="30%">
       <el-form ref="form1" :model="form1" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="24">
diff --git a/fuintAdmin/src/views/member/userLabel.vue b/fuintAdmin/src/views/member/userLabel.vue
index cf87b0f34..21b89844c 100644
--- a/fuintAdmin/src/views/member/userLabel.vue
+++ b/fuintAdmin/src/views/member/userLabel.vue
@@ -96,7 +96,7 @@
     </div>
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="30%" append-to-body>
+    <el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="open" width="30%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
 
         <el-form-item label="标签名称" prop="labelName">
diff --git a/fuintAdmin/src/views/oilConfig/oilGun/list.vue b/fuintAdmin/src/views/oilConfig/oilGun/list.vue
index daf214ca4..773ac16fa 100644
--- a/fuintAdmin/src/views/oilConfig/oilGun/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilGun/list.vue
@@ -47,9 +47,9 @@
           </el-button>
         </el-form-item>
       </el-form>
-
       <div>
-        <el-table ref="tables"
+        <div style="width: 100%;overflow: auto;height: 72vh">
+          <el-table ref="tables"
                   v-loading="loading"
                   :data="gunList"
                   border
@@ -87,6 +87,7 @@
             </template>
           </el-table-column>
         </el-table>
+        </div>
       </div>
       <pagination
         v-show="total>0"
@@ -97,14 +98,14 @@
       />
     </div>
     <el-dialog
+      center
       :title="title"
       :visible.sync="dialogVisible"
-      width="30%"
+      width="25%"
       :before-close="handleClose"
       :close-on-click-modal="false">
       <el-form :model="gunForm" :rules="rules" ref="gunForm" label-width="100px" class="demo-ruleForm">
         <el-form-item label="油枪名称" prop="gunName">
-
           <el-input style="width: 300px" placeholder="请输入内容" v-model="gunForm.gunName" class="input-with-select">
             <el-select style="width: 110px" v-model="gunForm.select" slot="append" placeholder="选择油枪"
                        @change="chooseName">
@@ -117,7 +118,6 @@
             </el-select>
           </el-input>
         </el-form-item>
-
         <el-form-item label="所属油罐" prop="tankId">
           <el-select style="width: 300px" v-model="gunForm.tankId" placeholder="请选择所属油罐">
             <el-option
@@ -147,8 +147,6 @@
             </el-option>
           </el-select>
         </el-form-item>
-
-
         <el-form-item label="状态" prop="status">
           <el-radio-group v-model="gunForm.status">
             <el-radio
@@ -173,7 +171,7 @@
         </el-form-item>
         <el-form-item label="设备枪号" prop="name">
           <el-input style="width: 300px" v-model="gunForm.oilMachineGunNumber"></el-input>
-          <div style="font-size: 12px;color: #999999">
+          <div style="font-size: 12px;width: 300px; color: #999999">
             请确保输入的集线器正确的枪号，否则出现设备显示屏与一件加油页面显示数据不一致。例如：0001，0002···
           </div>
         </el-form-item>
@@ -182,11 +180,6 @@
           <el-button type="primary" @click="submitForm()">确 定</el-button>
         </el-form-item>
       </el-form>
-
-      <!--           <span slot="footer" class="dialog-footer">-->
-      <!--/*           <el-button v-if="judgement"  type="danger" @click="delGun()" style="float: left;">删除</el-button>*/-->
-
-      <!--          </span>-->
     </el-dialog>
   </div>
 </template>
diff --git a/fuintAdmin/src/views/oilConfig/oilGun/list1.vue b/fuintAdmin/src/views/oilConfig/oilGun/list1.vue
index 9c7e872ae..abd060b36 100644
--- a/fuintAdmin/src/views/oilConfig/oilGun/list1.vue
+++ b/fuintAdmin/src/views/oilConfig/oilGun/list1.vue
@@ -42,6 +42,7 @@
         </div>
       </div>
       <el-dialog
+        center
         :title="title"
         :visible.sync="dialogVisible"
         width="30%"
diff --git a/fuintAdmin/src/views/oilConfig/oilInventory/list.vue b/fuintAdmin/src/views/oilConfig/oilInventory/list.vue
index 3ce020818..9584a8a24 100644
--- a/fuintAdmin/src/views/oilConfig/oilInventory/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilInventory/list.vue
@@ -53,7 +53,7 @@
         </el-form-item>
       </el-form>
 
-      <div style="height: 76vh;overflow: auto">
+      <div style="height: 76vh;overflow: auto;scrollbar-width: none">
         <el-table ref="tables"
                   v-loading="loading"
                   :data="inventoryList"
diff --git a/fuintAdmin/src/views/oilConfig/oilInventory/order.vue b/fuintAdmin/src/views/oilConfig/oilInventory/order.vue
index b67b60cd2..e30afe531 100644
--- a/fuintAdmin/src/views/oilConfig/oilInventory/order.vue
+++ b/fuintAdmin/src/views/oilConfig/oilInventory/order.vue
@@ -168,7 +168,7 @@
     </div>
 
 <!--    添加采购油品-->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
+    <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">
diff --git a/fuintAdmin/src/views/oilConfig/oilPrice/comp/addprice.vue b/fuintAdmin/src/views/oilConfig/oilPrice/comp/addprice.vue
index 41b23d1b1..14f20573d 100644
--- a/fuintAdmin/src/views/oilConfig/oilPrice/comp/addprice.vue
+++ b/fuintAdmin/src/views/oilConfig/oilPrice/comp/addprice.vue
@@ -207,7 +207,7 @@ export default {
 
 <template>
   <div>
-    <div class="card-change-1-search" style="margin-bottom: 20px">
+    <div class="card-change-box" style="margin-bottom: 20px">
       <div style="display: flex; justify-content: space-between;margin-bottom: 10px">
         <div style="display: flex;">
           <div style="background-color: #FF9655;height: 22px;width: 4px;margin-right: 10px"></div>
@@ -335,7 +335,7 @@ export default {
       </div>
 
     </div>
-    <el-dialog title="新增/修改预设油价" :visible.sync="dialogFormPricesAdd" width="30%" :close-on-click-modal="false">
+    <el-dialog center title="新增/修改预设油价" :visible.sync="dialogFormPricesAdd" width="30%" :close-on-click-modal="false">
       <el-form ref="priForm" :model="oilPresetPrices" label-width="140px" :rules="oilPresetPricesRules">
         <el-form-item label="预设油品油号" prop="numberId">
           <el-select v-model="oilPresetPrices.numberId" placeholder="请选择油品名称" style="width: 100%"
@@ -394,5 +394,11 @@ export default {
 </template>
 
 <style scoped lang="scss">
-
+.card-change-box{
+  background: #fff;
+  box-sizing: border-box;
+  padding: 10px;
+  margin: 10px;
+  border-radius: 8px;
+}
 </style>
diff --git a/fuintAdmin/src/views/oilConfig/oilPrice/comp/oilcon.vue b/fuintAdmin/src/views/oilConfig/oilPrice/comp/oilcon.vue
index 4f9110cdf..192a23410 100644
--- a/fuintAdmin/src/views/oilConfig/oilPrice/comp/oilcon.vue
+++ b/fuintAdmin/src/views/oilConfig/oilPrice/comp/oilcon.vue
@@ -279,7 +279,7 @@ export default {
 
 <template>
 <div>
-  <div class="card-change-1-search"  style="margin-bottom: 20px">
+  <div class="card-change-box"  >
     <div style="display: flex; justify-content: space-between;margin-bottom: 10px">
       <div style="display: flex;">
         <div style="background-color: #FF9655;height: 22px;width: 4px;margin-right: 10px"></div>
@@ -329,7 +329,7 @@ export default {
 
 
     </div>
-    <el-dialog :title="title" width="26%" :visible.sync="dialogFormNumberEdit" :close-on-click-modal="false">
+    <el-dialog center :title="title" width="26%" :visible.sync="dialogFormNumberEdit" :close-on-click-modal="false">
       <el-form ref="form" :model="oilNumber" :rules="rules" label-width="130px" >
         <el-form-item label="油品类型" prop="oilType">
           <el-radio-group  v-model="oilNumber.oilType" @change="oilTypeClick(oilNumber.oilType),oilTypeClick2()">
@@ -410,5 +410,11 @@ export default {
 </template>
 
 <style scoped lang="scss">
-
+.card-change-box{
+  background: #fff;
+  box-sizing: border-box;
+  padding: 10px;
+  margin: 10px;
+  border-radius: 8px;
+}
 </style>
diff --git a/fuintAdmin/src/views/oilConfig/oilPrice/index.vue b/fuintAdmin/src/views/oilConfig/oilPrice/index.vue
index b91221be6..38c689030 100644
--- a/fuintAdmin/src/views/oilConfig/oilPrice/index.vue
+++ b/fuintAdmin/src/views/oilConfig/oilPrice/index.vue
@@ -1,8 +1,5 @@
 <template>
-  <div class="containers
-
-">
-
+  <div class="containers">
     <oilcon></oilcon>
     <addprice></addprice>
    </div>
diff --git a/fuintAdmin/src/views/oilConfig/oilPrice/index1.vue b/fuintAdmin/src/views/oilConfig/oilPrice/index1.vue
index 9a9b0d0d7..ab918f7b5 100644
--- a/fuintAdmin/src/views/oilConfig/oilPrice/index1.vue
+++ b/fuintAdmin/src/views/oilConfig/oilPrice/index1.vue
@@ -134,7 +134,7 @@
 
     </el-card>
 
-    <el-dialog title="添加" :visible.sync="dialogFormVisible" :close-on-click-modal="false">
+    <el-dialog center title="添加" :visible.sync="dialogFormVisible" :close-on-click-modal="false">
       <el-form ref="oilNumberF" :model="oilNumber" :rules="rules">
         <el-form-item label="油品类型" prop="oilType" label-width="130px">
           <el-radio-group v-model="oilNumber.oilType" @change="oilTypeClick(oilNumber),oilTypeClick2()">
@@ -224,7 +224,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog title="修改" :visible.sync="dialogFormNumberEdit" :close-on-click-modal="false">
+    <el-dialog center title="修改" :visible.sync="dialogFormNumberEdit" :close-on-click-modal="false">
       <el-form ref="form" :model="oilNumber" :rules="rules">
         <el-form-item label="油品类型" prop="oilType">
           <el-radio-group v-model="oilNumber.oilType" @change="oilTypeClick(oilNumber.oilType),oilTypeClick2()">
@@ -325,7 +325,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog title="添加预设" :visible.sync="dialogFormPricesAdd" width="500px" :close-on-click-modal="false">
+    <el-dialog center title="添加预设" :visible.sync="dialogFormPricesAdd" width="500px" :close-on-click-modal="false">
       <el-form ref="priForm" :model="oilPresetPrices" label-width="100px" :rules="oilPresetPricesRules">
         <el-form-item label="预设油号" prop="numberId"  label-width="120px">
           <el-select v-model="oilPresetPrices.numberId" placeholder="请选择油号" @change="oilTypeClickByPrice()">
diff --git a/fuintAdmin/src/views/oilConfig/oilPrice/oilconfig-index.vue b/fuintAdmin/src/views/oilConfig/oilPrice/oilconfig-index.vue
index 2403b07e4..53616fae4 100644
--- a/fuintAdmin/src/views/oilConfig/oilPrice/oilconfig-index.vue
+++ b/fuintAdmin/src/views/oilConfig/oilPrice/oilconfig-index.vue
@@ -1,11 +1,7 @@
 <script >
-
-
-
 import OilPrice from "@/views/oilConfig/oilPrice/index.vue";
 import Oilqiang from "@/views/oilConfig/oilGun/list.vue";
 import OilTank from "@/views/oilConfig/oilTank/list.vue";
-
 export default {
   components: {OilTank, Oilqiang, OilPrice},
   data(){
diff --git a/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue b/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue
index 8e0838806..ea167b92f 100644
--- a/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue
@@ -52,20 +52,18 @@
             placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item style="display:flex;justify-content: end">
+        <el-form-item style="float: right;margin-right: 0px" >
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
           <el-button
             type="primary"
             @click="purchaseAdd"
             v-hasPermi="['oilConfig:oilPurchase:list:add']"
-
           >新增采购
           </el-button>
         </el-form-item>
       </el-form>
-
-      <div style="height: 70vh;overflow: auto">
+      <div style="height: 75vh;overflow: auto;scrollbar-width: none">
         <el-table ref="tables"
                   v-loading="loading"
                   :data="purchaseList"
@@ -284,7 +282,7 @@ export default {
 }
 
 .el-form--inline .el-form-item {
-  margin-right: 44px;
+  margin-right: 10px;
 }
 
 </style>
diff --git a/fuintAdmin/src/views/oilConfig/oilPurchase/purchaseOrder.vue b/fuintAdmin/src/views/oilConfig/oilPurchase/purchaseOrder.vue
index 373dd2ddb..806864ac3 100644
--- a/fuintAdmin/src/views/oilConfig/oilPurchase/purchaseOrder.vue
+++ b/fuintAdmin/src/views/oilConfig/oilPurchase/purchaseOrder.vue
@@ -141,7 +141,7 @@
     </div>
 
     <!--    添加采购油品-->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog center :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="orderForm" :rules="rules" label-width="120px">
         <el-row :gutter="24">
           <el-col :span="22">
diff --git a/fuintAdmin/src/views/oilConfig/oilSuppliers/list.vue b/fuintAdmin/src/views/oilConfig/oilSuppliers/list.vue
index 274716420..62b1fa655 100644
--- a/fuintAdmin/src/views/oilConfig/oilSuppliers/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilSuppliers/list.vue
@@ -82,7 +82,7 @@
     </div>
 
     <!--     新增/修改-->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog center :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="suppliersForm" :rules="rules" label-width="100px">
 
         <el-form-item label="供应商名称" prop="supplierName">
diff --git a/fuintAdmin/src/views/oilConfig/oilTank/list.vue b/fuintAdmin/src/views/oilConfig/oilTank/list.vue
index 35a534cdc..7d7bbbda7 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-change">
+    <div class="card-box">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
         <el-form-item label="" prop="tankName">
           <el-input
@@ -53,7 +53,7 @@
       <!--    </div>-->
 
       <!--     列表-->
-      <div style="height: 70vh;overflow: auto">
+      <div style="height: 72vh;overflow: auto">
         <el-table ref="tables"
                   v-loading="loading"
                   :data="tankList"
@@ -120,7 +120,7 @@
     </div>
 
     <!--     新增/修改-->
-    <el-dialog :title="title" :visible.sync="open" width="30%" append-to-body :close-on-click-modal="false">
+    <el-dialog center :title="title" :visible.sync="open" width="30%" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="tankForm" :rules="rules" label-width="80px">
         <el-form-item label="油罐名称" prop="tankName">
           <el-input v-model="tankForm.tankName" placeholder="请输入油罐名称" />
@@ -161,11 +161,6 @@
               <template slot="append">{{ tankForm.unit }}</template>
             </el-input>
           </el-form-item>
-          <!--        <el-form-item label="存油总价" prop="totalPrice" >-->
-          <!--          <el-input v-model="tankForm.totalPrice" placeholder="请输入存油总价" style="width:300px" maxlength="30" :disabled="true"  @input="changePrice()" @change="changeNumber" >-->
-          <!--            <template slot="append">元</template>-->
-          <!--          </el-input>-->
-          <!--        </el-form-item>-->
           <el-form-item label="折合单价" prop="discountedPrice">
             <el-input v-model="tankForm.discountedPrice" placeholder="请输入折合单价" maxlength="30"
                       :disabled="true">
@@ -173,7 +168,6 @@
             </el-input>
           </el-form-item>
         </template>
-
         <el-form-item label="油罐状态" prop="status">
           <el-radio-group v-model="tankForm.status">
             <el-radio
@@ -185,17 +179,6 @@
             />
           </el-radio-group>
         </el-form-item>
-        <!--        <el-form-item label="库存统计" prop="inventoryStatistics">-->
-        <!--          <el-radio-group v-model="tankForm.inventoryStatistics">-->
-        <!--            <el-radio-->
-        <!--              v-for="dict in dict.type.zhzt"-->
-        <!--              :key="dict.value"-->
-        <!--              :label="dict.label"-->
-        <!--              :value="dict.value"-->
-        <!--              @change="handleIsopenSelect"-->
-        <!--            />-->
-        <!--          </el-radio-group>-->
-        <!--        </el-form-item>-->
         <el-form-item label="备注信息">
           <el-input type="textarea" v-model="tankForm.remarks"></el-input>
         </el-form-item>
@@ -556,10 +539,14 @@ export default {
 <style>
 .app-container {
   width: 100%;
-  height: 100vh;
   background: #f6f8f9;
 }
-
+.card-box{
+  border-radius: 8px;
+  box-sizing: border-box;
+  padding: 15px;
+  background: #fff;
+}
 .el-form--inline .el-form-item {
   margin-right: 44px;
 }
diff --git a/fuintAdmin/src/views/order/index.vue b/fuintAdmin/src/views/order/index.vue
index 3cde47cff..be1dfcb48 100644
--- a/fuintAdmin/src/views/order/index.vue
+++ b/fuintAdmin/src/views/order/index.vue
@@ -108,7 +108,7 @@
     </el-card>
 
     <!-- 商品购买详情 -->
-    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="700px" append-to-body>
+    <el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="open" width="700px" append-to-body>
       <el-table ref="tables" v-loading="loading" :data="goodsList" :default-sort="defaultSort">
         <el-table-column label="商品名称" align="center" prop="name"/>
         <el-table-column label="商品数量" align="center" prop="num"/>
diff --git a/fuintAdmin/src/views/order/order_Cashier.vue b/fuintAdmin/src/views/order/order_Cashier.vue
index 8418d6336..af7554f80 100644
--- a/fuintAdmin/src/views/order/order_Cashier.vue
+++ b/fuintAdmin/src/views/order/order_Cashier.vue
@@ -225,7 +225,7 @@
     </el-card>
 
     <!--    订单详情-->
-    <el-dialog :close-on-click-modal="false"
+    <el-dialog center :close-on-click-modal="false"
       title="订单详情"
       :visible.sync="dialogVisible">
       <div>
@@ -357,6 +357,7 @@
     </el-dialog>
     <!--    订单退款-->
     <el-dialog
+      center
       :close-on-click-modal="false"
       title="订单退款"
       width="25%"
diff --git a/fuintAdmin/src/views/order/order_Goods.vue b/fuintAdmin/src/views/order/order_Goods.vue
index d567e9558..c37a46a10 100644
--- a/fuintAdmin/src/views/order/order_Goods.vue
+++ b/fuintAdmin/src/views/order/order_Goods.vue
@@ -180,7 +180,7 @@
       <!--    订单退款-->
       <el-dialog
         :close-on-click-modal="false"
-
+        center
         title="订单退款"
         width="25%"
         :visible.sync="dialogRefund">
@@ -210,7 +210,7 @@
       </el-dialog>
 
       <!-- 商品购买详情 -->
-      <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="open" width="700px" append-to-body>
         <el-table ref="tables" v-loading="loading" :data="goodsList" :default-sort="defaultSort">
           <el-table-column label="商品名称" align="center" prop="name"/>
           <el-table-column label="商品数量" align="center" prop="num"/>
diff --git a/fuintAdmin/src/views/order/order_Oil.vue b/fuintAdmin/src/views/order/order_Oil.vue
index 8a2659fec..52160ebed 100644
--- a/fuintAdmin/src/views/order/order_Oil.vue
+++ b/fuintAdmin/src/views/order/order_Oil.vue
@@ -206,6 +206,7 @@
 
     <!--    订单退款-->
     <el-dialog
+      center
       :close-on-click-modal="false"
       title="订单退款"
       width="25%"
diff --git a/fuintAdmin/src/views/order/order_Ordinary.vue b/fuintAdmin/src/views/order/order_Ordinary.vue
index 0161a5562..8d8b7a333 100644
--- a/fuintAdmin/src/views/order/order_Ordinary.vue
+++ b/fuintAdmin/src/views/order/order_Ordinary.vue
@@ -186,6 +186,7 @@
 
     <!--    订单退款-->
     <el-dialog :close-on-click-modal="false"
+               center
       title="订单退款"
       width="25%"
       :visible.sync="dialogRefund">
diff --git a/fuintAdmin/src/views/order/order_Vip.vue b/fuintAdmin/src/views/order/order_Vip.vue
index 347860a54..a46d8835f 100644
--- a/fuintAdmin/src/views/order/order_Vip.vue
+++ b/fuintAdmin/src/views/order/order_Vip.vue
@@ -132,6 +132,7 @@
 
     <!--    订单退款-->
     <el-dialog :close-on-click-modal="false"
+               center
       title="订单退款"
       width="25%"
       :visible.sync="dialogRefund">
diff --git a/fuintAdmin/src/views/power/banner.vue b/fuintAdmin/src/views/power/banner.vue
index 289c7632d..526f39e7b 100644
--- a/fuintAdmin/src/views/power/banner.vue
+++ b/fuintAdmin/src/views/power/banner.vue
@@ -90,6 +90,7 @@
     </div>
 
     <el-dialog
+      center
       @close="close()"
       :title="title"
       :close-on-click-modal="false"
diff --git a/fuintAdmin/src/views/power/linkManage.vue b/fuintAdmin/src/views/power/linkManage.vue
index 692eba3bd..b80aa0dec 100644
--- a/fuintAdmin/src/views/power/linkManage.vue
+++ b/fuintAdmin/src/views/power/linkManage.vue
@@ -75,7 +75,7 @@
     </div>
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="30%" append-to-body>
+    <el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="open" width="30%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
 
         <el-form-item label="页面/功能名称" prop="pageName">
diff --git a/fuintAdmin/src/views/power/message.vue b/fuintAdmin/src/views/power/message.vue
index ff3fec8f8..a8e0a5944 100644
--- a/fuintAdmin/src/views/power/message.vue
+++ b/fuintAdmin/src/views/power/message.vue
@@ -213,7 +213,7 @@
         @pagination="messageRecordListss"
       />
       <!-- 弹出框 -->
-      <el-dialog :close-on-click-modal="false"
+      <el-dialog center :close-on-click-modal="false"
         title="短信接收人"
         :visible.sync="dialogVisible"
         width="50%">
@@ -333,7 +333,7 @@
         @pagination="getMessageCostList"
       />
 
-      <el-dialog :close-on-click-modal="false"
+      <el-dialog center :close-on-click-modal="false"
         title="短信充值记录"
         :visible.sync="rechargedialogVisible"
         width="50%">
@@ -361,7 +361,7 @@
 
     </div>
     <!-- 短信模板添加/修改 -->
-    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="35%" append-to-body>
+    <el-dialog center :title="title" :close-on-click-modal="false" :visible.sync="open" width="35%" append-to-body>
       <el-form ref="form" :rules="rules" :model="form" label-width="95px">
 
         <el-form-item label="短信模板ID" prop="messageId">
@@ -458,7 +458,7 @@
 
     </el-dialog>
     <!-- 新增费用设置 -->
-    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open2" width="30%" append-to-body>
+    <el-dialog center :title="title" :close-on-click-modal="false" :visible.sync="open2" width="30%" append-to-body>
       <el-form ref="form2" :rules="rules" :model="form2" label-width="80px">
 
         <el-form-item label="机构名称" prop="deptId">
@@ -485,7 +485,7 @@
       </div>
     </el-dialog>
     <!--  充值  -->
-    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open3" width="30%" append-to-body>
+    <el-dialog center :title="title" :close-on-click-modal="false" :visible.sync="open3" width="30%" append-to-body>
       <el-form ref="form3" :rules="rules" :model="form3" label-width="80px">
 
         <el-form-item label="机构名称" prop="deptId">
diff --git a/fuintAdmin/src/views/power/operateLog.vue b/fuintAdmin/src/views/power/operateLog.vue
index a5b2c032f..cf8d13ecc 100644
--- a/fuintAdmin/src/views/power/operateLog.vue
+++ b/fuintAdmin/src/views/power/operateLog.vue
@@ -115,7 +115,7 @@
 
     </div>
 
-    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="50%" append-to-body>
+    <el-dialog center :title="title" :close-on-click-modal="false" :visible.sync="open" width="50%" append-to-body>
       <el-form ref="form" :rules="rules" :model="form" label-width="80px">
 
         <el-form-item label="商品名称" prop="name">
diff --git a/fuintAdmin/src/views/power/page/mode.vue b/fuintAdmin/src/views/power/page/mode.vue
index 8e77d7970..46939000a 100644
--- a/fuintAdmin/src/views/power/page/mode.vue
+++ b/fuintAdmin/src/views/power/page/mode.vue
@@ -87,7 +87,7 @@
 
     </div>
 
-    <el-dialog :title="title" :close-on-click-modal="false"  :visible.sync="open" width="42%" append-to-body>
+    <el-dialog center :title="title" :close-on-click-modal="false"  :visible.sync="open" width="42%" append-to-body>
       <el-form :model="form" label-width="80px" >
         <!-- 通知名称 -->
         <el-form-item label="通知名称" :required="true">
diff --git a/fuintAdmin/src/views/power/page/record.vue b/fuintAdmin/src/views/power/page/record.vue
index 490bcb7a4..7de66ab4d 100644
--- a/fuintAdmin/src/views/power/page/record.vue
+++ b/fuintAdmin/src/views/power/page/record.vue
@@ -105,7 +105,7 @@
 
     </div>
 
-    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="35%" append-to-body>
+    <el-dialog center :title="title" :close-on-click-modal="false" :visible.sync="open" width="35%" append-to-body>
       <el-form ref="form" :model="form" label-width="80px">
         <!-- 通知名称 -->
         <el-form-item label="通知名称" :required="true">
@@ -154,7 +154,7 @@
         <el-button @click="userCe2">取消</el-button>
       </div>
     </el-dialog>
-    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open1" width="50%" append-to-body>
+    <el-dialog center :title="title" :close-on-click-modal="false" :visible.sync="open1" width="50%" append-to-body>
       <el-table v-loading="" :data="userList" @selection-change="handleSelectionChange" border>
         <el-table-column type="selection" width="50" align="center"/>
 
diff --git a/fuintAdmin/src/views/power/payment/index.vue b/fuintAdmin/src/views/power/payment/index.vue
index c7c29934e..e2ac137c8 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 :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="26%">
       <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">
@@ -238,7 +238,7 @@
         <el-button type="primary" @click="submitMerchant">确 定</el-button>
       </div>
     </el-dialog>
-    <el-dialog :close-on-click-modal="false" :title="Ruletitle" :visible.sync="addRule">
+    <el-dialog center :close-on-click-modal="false" :title="Ruletitle" :visible.sync="addRule">
       <el-form :model="formRule" ref="formRule" :rules="rules">
         <div style="display: flex;align-items: center">
           <el-form-item label="规则名称" :label-width="formLabelWidth" prop="ruleName">
@@ -333,7 +333,7 @@
         <el-button type="primary" @click="submitAddRule">确 定</el-button>
       </div>
     </el-dialog>
-    <el-dialog :close-on-click-modal="false" title="启用" :visible.sync="Enable" width="650px">
+    <el-dialog center :close-on-click-modal="false" title="启用" :visible.sync="Enable" width="650px">
       <el-form :model="formRule">
         <el-form-item label="开始时间" required>
           <div style="display: flex;align-items: center;">
@@ -352,7 +352,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="dialogVisible" width="30%">
+    <el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="dialogVisible" width="30%">
       <el-form :model="form1" ref="form1" :rules="rules" label-width="100px">
         <el-form-item label="支付通道" :label-width="formLabelWidth" prop="merchantName" width="300px">
           <el-select
@@ -382,7 +382,7 @@
       </span>
     </el-dialog>
 
-    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="show" width="25%" style="margin-top: 200px">
+    <el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="show" width="25%" style="margin-top: 200px">
       <span>请输入备注信息</span>
       <el-input placeholder="请输入备注信息" style="margin-top: 20px"
                 v-model="merchantConfig.remark"
@@ -395,7 +395,7 @@
       </span>
     </el-dialog>
     <!--    编辑通道规则-->
-    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="dialogFormVisible"
+    <el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="dialogFormVisible"
                width="30%">
       <el-form :model="form" ref="form">
         <el-form-item label="支付通道" :label-width="formLabelWidth" width="300px">
diff --git a/fuintAdmin/src/views/refund/index.vue b/fuintAdmin/src/views/refund/index.vue
index 0d7fec478..8d63aefd6 100644
--- a/fuintAdmin/src/views/refund/index.vue
+++ b/fuintAdmin/src/views/refund/index.vue
@@ -125,7 +125,7 @@
     />
 
     <!-- 审核对话框 start-->
-    <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
+    <el-dialog center :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="24">
diff --git a/fuintAdmin/src/views/setting/print/index.vue b/fuintAdmin/src/views/setting/print/index.vue
index e5240723b..ed6b854ed 100644
--- a/fuintAdmin/src/views/setting/print/index.vue
+++ b/fuintAdmin/src/views/setting/print/index.vue
@@ -107,7 +107,7 @@
       />
 
     </div>
-    <el-dialog :title="title" :close-on-click-modal="false" :before-close="handleCancel" :visible.sync="open" width="30%"
+    <el-dialog center :title="title" :close-on-click-modal="false" :before-close="handleCancel" :visible.sync="open" width="30%"
                append-to-body >
 
         <el-form :model="deviceInfo" :rules="rules" ref="deviceForm" label-width="95px">
@@ -171,12 +171,12 @@
           <el-form-item label="备注" prop="remark">
             <el-input type="textarea" v-model="deviceInfo.remark" ></el-input>
           </el-form-item>
-          <el-form-item>
-            <el-button type="" @click="handleCancel">取消</el-button>
-            <el-button type="primary" @click="submitForm('deviceForm')">提交</el-button>
-          </el-form-item>
-        </el-form>
 
+        </el-form>
+      <div slot="footer" class="dialog-footer" >
+        <el-button type="" @click="handleCancel">取消</el-button>
+        <el-button type="primary" @click="submitForm('deviceForm')">提交</el-button>
+      </div>
     </el-dialog>
 
   </div>
diff --git a/fuintAdmin/src/views/staff/device/tab/oilEngineList.vue b/fuintAdmin/src/views/staff/device/tab/oilEngineList.vue
index 9603b42da..3c3143929 100644
--- a/fuintAdmin/src/views/staff/device/tab/oilEngineList.vue
+++ b/fuintAdmin/src/views/staff/device/tab/oilEngineList.vue
@@ -85,7 +85,7 @@
     </el-card>
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="30%" append-to-body>
+    <el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="open" width="30%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
 
         <el-form-item label="设备名称" prop="realName">
diff --git a/fuintAdmin/src/views/staff/device/tab/printList.vue b/fuintAdmin/src/views/staff/device/tab/printList.vue
index f9b15a8bd..e690ef8a5 100644
--- a/fuintAdmin/src/views/staff/device/tab/printList.vue
+++ b/fuintAdmin/src/views/staff/device/tab/printList.vue
@@ -110,7 +110,7 @@
     </el-card>
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="30%" append-to-body>
+    <el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="open" width="30%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
 
         <el-form-item label="设备名称" prop="realName">
diff --git a/fuintAdmin/src/views/staff/list.vue b/fuintAdmin/src/views/staff/list.vue
index f3e7baa7e..9ddf91c0f 100644
--- a/fuintAdmin/src/views/staff/list.vue
+++ b/fuintAdmin/src/views/staff/list.vue
@@ -147,7 +147,7 @@
     </div>
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="30%" append-to-body>
+    <el-dialog center :title="title" :close-on-click-modal="false" :visible.sync="open" width="30%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
 
         <el-form-item label="所属机构" prop="storeId">
@@ -230,6 +230,7 @@
     </el-dialog>
 
     <el-dialog :close-on-click-modal="false"
+               center
       :title="title"
       :visible.sync="dialogVisible"
       style="margin-top: 100px"
@@ -243,7 +244,7 @@
       </span>
     </el-dialog>
 
-    <el-dialog :close-on-click-modal="false" title="码牌列表" :visible.sync="openShow" width="800px" append-to-body>
+    <el-dialog center :close-on-click-modal="false" title="码牌列表" :visible.sync="openShow" width="800px" append-to-body>
 
       <div class="wrap-box">
         <div class="gang-box">
diff --git a/fuintAdmin/src/views/staff/tag/list.vue b/fuintAdmin/src/views/staff/tag/list.vue
index f284932eb..1907f175f 100644
--- a/fuintAdmin/src/views/staff/tag/list.vue
+++ b/fuintAdmin/src/views/staff/tag/list.vue
@@ -92,7 +92,7 @@
     </el-card>
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="50%" append-to-body>
+    <el-dialog center :title="title" :close-on-click-modal="false" :visible.sync="open" width="50%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
             <el-form-item label="新增二维码SN号" prop="tagCodeSn">
@@ -106,7 +106,7 @@
       </div>
     </el-dialog>
     <!-- 添加或修改对话框 -->
-    <el-dialog title="新增二维码SN号" :close-on-click-modal="false" :visible.sync="open2" width="50%" append-to-body>
+    <el-dialog center title="新增二维码SN号" :close-on-click-modal="false" :visible.sync="open2" width="50%" append-to-body>
 
               <el-select v-model="staffId">
                 <el-option
diff --git a/fuintAdmin/src/views/staffCommission/staffCommission.vue b/fuintAdmin/src/views/staffCommission/staffCommission.vue
index 5ff479a6e..8e491f160 100644
--- a/fuintAdmin/src/views/staffCommission/staffCommission.vue
+++ b/fuintAdmin/src/views/staffCommission/staffCommission.vue
@@ -264,7 +264,7 @@
     </div>
 
     <!-- 添加或修改提成方案对话框 -->
-    <el-dialog :close-on-click-modal="false" :title="title" width="30%" :visible.sync="open" append-to-body>
+    <el-dialog center :close-on-click-modal="false" :title="title" width="30%" :visible.sync="open" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="90px">
         <el-row>
           <el-col :span="24">
diff --git a/fuintAdmin/src/views/stock/index.vue b/fuintAdmin/src/views/stock/index.vue
index b7b78f600..33a3a12d0 100644
--- a/fuintAdmin/src/views/stock/index.vue
+++ b/fuintAdmin/src/views/stock/index.vue
@@ -113,7 +113,7 @@
       @pagination="getList"
     />
     <!--编辑商品库存-->
-    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" class="common-dialog" width="80%" append-to-body>
+    <el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="open" class="common-dialog" width="80%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="24">
diff --git a/fuintAdmin/src/views/stock/selectGoodsDialog.vue b/fuintAdmin/src/views/stock/selectGoodsDialog.vue
index e18b1c912..8f82744de 100644
--- a/fuintAdmin/src/views/stock/selectGoodsDialog.vue
+++ b/fuintAdmin/src/views/stock/selectGoodsDialog.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :close-on-click-modal="false" class="common-dialog" title="选择商品" :visible="showDialog" @close="close" width="70%" destroy-on-close>
+  <el-dialog center :close-on-click-modal="false" class="common-dialog" title="选择商品" :visible="showDialog" @close="close" width="70%" destroy-on-close>
     <el-form :model="params" ref="queryForm" class="main-search" size="small" :inline="true" label-width="100px">
       <el-form-item label="商品关键字" prop="keyword">
         <el-input
diff --git a/fuintAdmin/src/views/store/list.vue b/fuintAdmin/src/views/store/list.vue
index a79dec6e0..171a96b06 100644
--- a/fuintAdmin/src/views/store/list.vue
+++ b/fuintAdmin/src/views/store/list.vue
@@ -102,7 +102,7 @@
     />
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" class="common-dialog" width="800px" append-to-body>
+    <el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="open" class="common-dialog" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="24">
diff --git a/fuintAdmin/src/views/system/account/index.vue b/fuintAdmin/src/views/system/account/index.vue
index e515eec5a..b181d9437 100644
--- a/fuintAdmin/src/views/system/account/index.vue
+++ b/fuintAdmin/src/views/system/account/index.vue
@@ -149,7 +149,7 @@
     </el-row>
 
     <!-- 添加或修改管理员配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="600px" append-to-body>
+    <el-dialog center :title="title" :visible.sync="open" class="common-dialog" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="24">
diff --git a/fuintAdmin/src/views/system/account/profile/userAvatar.vue b/fuintAdmin/src/views/system/account/profile/userAvatar.vue
index bbcbb80f5..da337e705 100644
--- a/fuintAdmin/src/views/system/account/profile/userAvatar.vue
+++ b/fuintAdmin/src/views/system/account/profile/userAvatar.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="user-info-head" @click="editCropper()"><img v-bind:src="options.img" title="点击上传头像" class="img-circle img-lg" /></div>
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened"  @close="closeDialog">
+    <el-dialog center :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened"  @close="closeDialog">
       <el-row>
         <el-col :xs="24" :md="12" :style="{height: '350px'}">
           <vue-cropper
diff --git a/fuintAdmin/src/views/system/config/index.vue b/fuintAdmin/src/views/system/config/index.vue
index 1502a726f..82dd423de 100644
--- a/fuintAdmin/src/views/system/config/index.vue
+++ b/fuintAdmin/src/views/system/config/index.vue
@@ -148,7 +148,7 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog center :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="参数名称" prop="configName">
           <el-input v-model="form.configName" placeholder="请输入参数名称" />
diff --git a/fuintAdmin/src/views/system/dict/data.vue b/fuintAdmin/src/views/system/dict/data.vue
index de83f9dd1..3a96823b8 100644
--- a/fuintAdmin/src/views/system/dict/data.vue
+++ b/fuintAdmin/src/views/system/dict/data.vue
@@ -113,7 +113,7 @@
     </el-card>
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog center :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="字典类型">
           <el-input v-model="form.dictType" :disabled="true" />
diff --git a/fuintAdmin/src/views/system/dict/index.vue b/fuintAdmin/src/views/system/dict/index.vue
index c5d11b776..2ece1164a 100644
--- a/fuintAdmin/src/views/system/dict/index.vue
+++ b/fuintAdmin/src/views/system/dict/index.vue
@@ -134,7 +134,7 @@
 
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" top="50vh" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog center :title="title" top="50vh" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="字典名称" prop="dictName">
           <el-input v-model="form.dictName" placeholder="请输入字典名称" />
diff --git a/fuintAdmin/src/views/system/logs/index.vue b/fuintAdmin/src/views/system/logs/index.vue
index f1f46d5b4..99e8feb54 100644
--- a/fuintAdmin/src/views/system/logs/index.vue
+++ b/fuintAdmin/src/views/system/logs/index.vue
@@ -82,7 +82,7 @@
     />
 
     <!-- 操作日志详细 -->
-    <el-dialog title="操作日志详细" :visible.sync="open" width="700px" append-to-body>
+    <el-dialog center title="操作日志详细" :visible.sync="open" width="700px" append-to-body>
       <el-form ref="form" :model="form" label-width="100px" size="mini">
         <el-row>
           <el-col :span="12">
diff --git a/fuintAdmin/src/views/system/menu/index.vue b/fuintAdmin/src/views/system/menu/index.vue
index e14660a68..1bf403e9c 100644
--- a/fuintAdmin/src/views/system/menu/index.vue
+++ b/fuintAdmin/src/views/system/menu/index.vue
@@ -77,7 +77,7 @@
     </el-table>
 
     <!-- 添加或修改菜单对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
+    <el-dialog center :title="title" :visible.sync="open" width="680px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="24">
diff --git a/fuintAdmin/src/views/system/notice/index.vue b/fuintAdmin/src/views/system/notice/index.vue
index b5ac56717..0bff19ea1 100644
--- a/fuintAdmin/src/views/system/notice/index.vue
+++ b/fuintAdmin/src/views/system/notice/index.vue
@@ -123,7 +123,7 @@
     />
 
     <!-- 添加或修改公告对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
+    <el-dialog center :title="title" :visible.sync="open" width="780px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
diff --git a/fuintAdmin/src/views/system/role/index.vue b/fuintAdmin/src/views/system/role/index.vue
index a552c7d16..27befe4b2 100644
--- a/fuintAdmin/src/views/system/role/index.vue
+++ b/fuintAdmin/src/views/system/role/index.vue
@@ -107,7 +107,7 @@
     />
 
     <!-- 添加或修改角色配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="700px" class="common-dialog" append-to-body>
+    <el-dialog center :title="title" :visible.sync="open" width="700px" class="common-dialog" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="角色名称" prop="roleName">
           <el-input v-model="form.roleName" style="width: 300px" placeholder="请输入角色名称" />
diff --git a/fuintAdmin/src/views/system/role/selectUser.vue b/fuintAdmin/src/views/system/role/selectUser.vue
index d85e3faa6..c345c3eaa 100644
--- a/fuintAdmin/src/views/system/role/selectUser.vue
+++ b/fuintAdmin/src/views/system/role/selectUser.vue
@@ -1,6 +1,6 @@
 <template>
   <!-- 授权用户 -->
-  <el-dialog title="选择用户" :visible.sync="visible" width="800px" top="5vh" append-to-body>
+  <el-dialog center title="选择用户" :visible.sync="visible" width="800px" top="5vh" append-to-body>
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
       <el-form-item label="用户名称" prop="userName">
         <el-input
diff --git a/fuintAdmin/src/views/tool/build/CodeTypeDialog.vue b/fuintAdmin/src/views/tool/build/CodeTypeDialog.vue
index b5c2e2e49..3a7b959ff 100644
--- a/fuintAdmin/src/views/tool/build/CodeTypeDialog.vue
+++ b/fuintAdmin/src/views/tool/build/CodeTypeDialog.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
     <el-dialog
+      center
       v-bind="$attrs"
       width="500px"
       :close-on-click-modal="false"
diff --git a/fuintAdmin/src/views/tool/build/IconsDialog.vue b/fuintAdmin/src/views/tool/build/IconsDialog.vue
index 958be50c5..e05f32656 100644
--- a/fuintAdmin/src/views/tool/build/IconsDialog.vue
+++ b/fuintAdmin/src/views/tool/build/IconsDialog.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="icon-dialog">
     <el-dialog
+      center
       v-bind="$attrs"
       width="980px"
       :modal-append-to-body="false"
diff --git a/fuintAdmin/src/views/tool/build/TreeNodeDialog.vue b/fuintAdmin/src/views/tool/build/TreeNodeDialog.vue
index fa7f0b285..b7eeb8f9b 100644
--- a/fuintAdmin/src/views/tool/build/TreeNodeDialog.vue
+++ b/fuintAdmin/src/views/tool/build/TreeNodeDialog.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
     <el-dialog
+      center
       v-bind="$attrs"
       :close-on-click-modal="false"
       :modal-append-to-body="false"
diff --git a/fuintAdmin/src/views/tool/gen/importTable.vue b/fuintAdmin/src/views/tool/gen/importTable.vue
index fe2bbb7ff..5cffb9e76 100644
--- a/fuintAdmin/src/views/tool/gen/importTable.vue
+++ b/fuintAdmin/src/views/tool/gen/importTable.vue
@@ -1,9 +1,10 @@
 <template>
   <!-- 导入表 -->
-  <el-dialog :close-on-click-modal="false" title="导入表" :visible.sync="visible" width="800px" top="5vh" append-to-body>
+  <el-dialog  center :close-on-click-modal="false" title="导入表" :visible.sync="visible" width="800px" top="5vh" append-to-body>
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
       <el-form-item label="表名称" prop="tableName">
         <el-input
+
           v-model="queryParams.tableName"
           placeholder="请输入表名称"
           clearable
diff --git a/fuintAdmin/src/views/tool/gen/index.vue b/fuintAdmin/src/views/tool/gen/index.vue
index 7c5031106..28047a167 100644
--- a/fuintAdmin/src/views/tool/gen/index.vue
+++ b/fuintAdmin/src/views/tool/gen/index.vue
@@ -158,9 +158,10 @@
       @pagination="getList"
     />
     <!-- 预览界面 -->
-    <el-dialog :close-on-click-modal="false" :title="preview.title" :visible.sync="preview.open" width="80%" top="5vh" append-to-body class="scrollbar">
+    <el-dialog center :close-on-click-modal="false" :title="preview.title" :visible.sync="preview.open" width="80%" top="5vh" append-to-body class="scrollbar">
       <el-tabs v-model="preview.activeName">
         <el-tab-pane
+
           v-for="(value, key) in preview.data"
           :label="key.substring(key.lastIndexOf('/')+1,key.indexOf('.vm'))"
           :name="key.substring(key.lastIndexOf('/')+1,key.indexOf('.vm'))"
diff --git a/fuintAdmin/src/views/userGrade/index.vue b/fuintAdmin/src/views/userGrade/index.vue
index ec5f56c58..1a2d274f0 100644
--- a/fuintAdmin/src/views/userGrade/index.vue
+++ b/fuintAdmin/src/views/userGrade/index.vue
@@ -140,12 +140,6 @@
     </div>
 
     <div class="cot-box" v-if="tabindex == 1">
-<!--      <el-row :gutter="10" class="mb8">-->
-<!--        <el-col :span="21">-->
-<!--          <span style="font-size: 18px">会员等级</span>-->
-<!--          <span style="font-size: 14px">（最多支持20个等级）</span>-->
-<!--        </el-col>-->
-<!--      </el-row>-->
       <div>
         <el-form :model="queryParams1" ref="queryForm" size="small" :inline="true" label-width="120px">
 
@@ -354,7 +348,7 @@
     </div>
     <div style="width: 100%;height: 15px "></div>
     <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="46%" append-to-body>
+    <el-dialog center :title="title" :visible.sync="open" :close-on-click-modal="false" width="46%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="24">
@@ -540,7 +534,7 @@
 
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open2" append-to-body width="42%">
+    <el-dialog center :title="title" :visible.sync="open2" append-to-body width="42%">
       <el-form ref="form2" :model="form2" :rules="rules" label-width="120px">
 
         <el-form-item label="会员等级" prop="gradeId">
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueController.java
index 0552aa39c..53b7fde9d 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueController.java
@@ -116,6 +116,20 @@ public class CardValueController extends BaseController {
     public ResponseObject selectById(@PathVariable Serializable id) {
         return getSuccessResult(this.cardValueService.getOneById(id));
     }
+
+    /**
+     *
+     * 查询储值卡活动 以及优惠券子表
+     */
+    @GetMapping("/cardValueAndRecordList")
+     public ResponseObject cardValueAndRecordList(CardValue cardValue) {
+        //获取当前登录用户
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        cardValue.setStoreId(nowAccountInfo.getStoreId());
+         return getSuccessResult(this.cardValueService.cardValueAndRecordList(cardValue));
+     }
+
+
     /**
      * 获取使用时的详细信息
      *
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/CardValueMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/CardValueMapper.java
index 338ecd379..f20f4d163 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/CardValueMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/CardValueMapper.java
@@ -2,6 +2,11 @@ package com.fuint.business.marketingActivity.cardValue.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fuint.business.marketingActivity.cardValue.entity.CardValue;
+import com.fuint.business.marketingActivity.cardValue.vo.CardValueVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 储值卡表(CardValue)表数据库访问层
@@ -9,7 +14,11 @@ import com.fuint.business.marketingActivity.cardValue.entity.CardValue;
  * @author makejava
  * @since 2023-10-31 09:41:57
  */
+@Mapper
 public interface CardValueMapper extends BaseMapper<CardValue> {
 
+
+    List<CardValueVO> cardValueList(@Param("obj") CardValue cardValue);
+
 }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueMapper.xml
new file mode 100644
index 000000000..3aa711785
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueMapper.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fuint.business.marketingActivity.cardValue.mapper.CardValueMapper">
+
+
+    <!-- 嵌套结果映射 -->
+    <resultMap id="CardValueResultMap" type="com.fuint.business.marketingActivity.cardValue.vo.CardValueVO">
+        <id property="id" column="cv_id"/>
+        <result property="chainStoreId" column="cv_chain_store_id"/>
+        <result property="storeId" column="cv_store_id"/>
+        <result property="status" column="cv_status"/>
+        <result property="isonline" column="cv_isonline"/>
+        <result property="bidBalance" column="cv_bid_balance"/>
+        <result property="rechargeBalance" column="cv_recharge_balance"/>
+        <result property="giftBalance" column="cv_gift_balance"/>
+        <result property="points" column="cv_points"/>
+        <result property="growthValue" column="cv_growth_value"/>
+        <result property="refuelMoney" column="cv_refuel_money"/>
+        <result property="fringeBenefit" column="cv_fringe_benefit"/>
+        <result property="participationNo" column="cv_participation_no"/>
+        <result property="employeeCommission" column="cv_employee_commission"/>
+        <result property="royaltyType" column="cv_royalty_type"/>
+        <result property="amountCommission" column="cv_amount_commission"/>
+        <result property="percentageCommissions" column="cv_percentage_commissions"/>
+        <result property="activeTime" column="cv_active_time"/>
+        <result property="activityProgress" column="cv_activity_progress"/>
+        <result property="startTime" column="cv_start_time"/>
+        <result property="endTime" column="cv_end_time"/>
+        <result property="activeStatus" column="cv_active_status"/>
+        <result property="paymentValue" column="cv_payment_value"/>
+        <result property="groupOriented" column="cv_group_oriented"/>
+<!--        <result property="membershipLevel" column="cv_membership_level"/>-->
+        <result property="sort" column="cv_sort"/>
+        <result property="createBy" column="cv_create_by"/>
+        <result property="createTime" column="cv_create_time"/>
+        <result property="updateBy" column="cv_update_by"/>
+        <result property="updateTime" column="cv_update_time"/>
+        <result property="activeName" column="cv_active_name"/>
+        <collection property="cardValueChildList" ofType="com.fuint.business.marketingActivity.cardValue.entity.CardValueChild">
+            <id property="id" column="cc_id"/>
+            <result property="cardValueId" column="cc_card_value_id"/>
+            <result property="vouchersId" column="cc_vouchers_id"/>
+            <result property="activeGift" column="cc_active_gift"/>
+            <result property="giftCardName" column="cc_gift_card_name"/>
+            <result property="giftCardType" column="cc_gift_card_type"/>
+            <result property="giftCardDetail" column="cc_gift_card_detail"/>
+            <result property="giftCardTime" column="cc_gift_card_time"/>
+            <result property="giftCardTotal" column="cc_gift_card_total"/>
+            <result property="validityZero" column="cc_validity_zero"/>
+            <result property="validityOne" column="cc_validity_one"/>
+            <result property="validityTwo" column="cc_validity_two"/>
+            <result property="createBy" column="cc_create_by"/>
+            <result property="instruction" column="cc_instruction"/>
+            <result property="createTime" column="cc_create_time"/>
+            <result property="updateBy" column="cc_update_by"/>
+            <result property="updateTime" column="cc_update_time"/>
+            <result property="timeType" column="cc_time_type"/>
+        </collection>
+    </resultMap>
+
+
+    <select id="cardValueList" resultMap="CardValueResultMap">
+        SELECT
+            cv.id AS cv_id,
+            cv.chain_store_id AS cv_chain_store_id,
+            cv.store_id AS cv_store_id,
+            cv.status AS cv_status,
+            cv.isonline AS cv_isonline,
+            cv.bid_balance AS cv_bid_balance,
+            cv.recharge_balance AS cv_recharge_balance,
+            cv.gift_balance AS cv_gift_balance,
+            cv.points AS cv_points,
+            cv.growth_value AS cv_growth_value,
+            cv.refuel_money AS cv_refuel_money,
+            cv.fringe_benefit AS cv_fringe_benefit,
+            cv.participation_no AS cv_participation_no,
+            cv.employee_commission AS cv_employee_commission,
+            cv.royalty_type AS cv_royalty_type,
+            cv.amount_commission AS cv_amount_commission,
+            cv.percentage_commissions AS cv_percentage_commissions,
+            cv.active_time AS cv_active_time,
+            cv.activity_progress AS cv_activity_progress,
+            cv.start_time AS cv_start_time,
+            cv.end_time AS cv_end_time,
+            cv.active_status AS cv_active_status,
+            cv.payment_value AS cv_payment_value,
+            cv.group_oriented AS cv_group_oriented,
+            cv.membership_level AS cv_membership_level,
+            cv.sort AS cv_sort,
+            cv.create_by AS cv_create_by,
+            cv.create_time AS cv_create_time,
+            cv.update_by AS cv_update_by,
+            cv.update_time AS cv_update_time,
+            cv.active_name AS cv_active_name,
+            cc.id AS cc_id,
+            cc.card_value_id AS cc_card_value_id,
+            cc.vouchers_id AS cc_vouchers_id,
+            cc.active_gift AS cc_active_gift,
+            cc.gift_card_name AS cc_gift_card_name,
+            cc.gift_card_type AS cc_gift_card_type,
+            cc.gift_card_detail AS cc_gift_card_detail,
+            cc.gift_card_time AS cc_gift_card_time,
+            cc.gift_card_total AS cc_gift_card_total,
+            cc.validity_zero AS cc_validity_zero,
+            cc.validity_one AS cc_validity_one,
+            cc.validity_two AS cc_validity_two,
+            cc.create_by AS cc_create_by,
+            cc.instruction AS cc_instruction,
+            cc.create_time AS cc_create_time,
+            cc.update_by AS cc_update_by,
+            cc.update_time AS cc_update_time,
+            cc.time_type AS cc_time_type
+        FROM
+            card_value cv
+            LEFT JOIN
+            card_value_child cc ON cv.id = cc.card_value_id
+        where
+            (cv.active_time = '1' and  cv.store_id = #{obj.storeId} and cv.active_status = '1')
+           or
+            (cv.active_time = '2' and  cv.store_id = #{obj.storeId} and cv.active_status = '1' and CURRENT_TIMESTAMP BETWEEN cv.start_time AND cv.end_time )
+    </select>
+
+</mapper>
+
+
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueService.java
index 137247d15..9b7df7403 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueService.java
@@ -46,6 +46,9 @@ public interface CardValueService extends IService<CardValue> {
     CardValueVO getOneById(Serializable id);
     List<CardCoupon> getCoupons(Integer userId,Integer cardValueId);
 
+
+    List<CardValueVO> cardValueAndRecordList(CardValue cardValue);
+
     /**
      * 新增数据
      * @param cardValueDTO
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueServiceImpl.java
index 864f3ed68..cea32c380 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueServiceImpl.java
@@ -331,6 +331,13 @@ public class CardValueServiceImpl extends ServiceImpl<CardValueMapper, CardValue
 
     }
 
+    @Override
+    public List<CardValueVO> cardValueAndRecordList(CardValue cardValue) {
+
+        List<CardValueVO> cardValues = super.baseMapper.cardValueList(cardValue);
+        return cardValues;
+    }
+
     /**
      * 新增数据
      * @param cardValueDTO
diff --git a/fuintCashierWeb/src/api/newHome/newHome.js b/fuintCashierWeb/src/api/newHome/newHome.js
index 542b6ceb4..a36fd9ecf 100644
--- a/fuintCashierWeb/src/api/newHome/newHome.js
+++ b/fuintCashierWeb/src/api/newHome/newHome.js
@@ -29,10 +29,10 @@ export function cashRegisterGoodsList() {
     method: 'get',
   })
 }
-
+//  查询储值卡活动 以及优惠券子表
 export function cardValueList() {
   return request({
-    url: '/business/marketingActivity/cardValue/cardValueList',
+    url: '/business/marketingActivity/cardValue/cardValueAndRecordList',
     method: 'get',
   })
 }
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/newHomeComponents/memberRecharge.vue b/fuintCashierWeb/src/views/cashier/NewComponents/newHomeComponents/memberRecharge.vue
index fd0a139fd..f570e27a1 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/newHomeComponents/memberRecharge.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/newHomeComponents/memberRecharge.vue
@@ -119,14 +119,16 @@ export default {
         oilNumberId:null
       },
       this.selectCard.cardType = index
-       this.getCardValueList()
+      //切换 电子储值卡 囤油卡  礼品卡 初始化
+      this.getCardValueList()
 
     },
     chooseActive(data){
       data.cardType =  this.selectCard.cardType
       this.selectCard = data
-      this.selectCard.cardCouponList = []
+      this.selectCard.cardCouponList =  data.cardCouponList
     },
+    //切换初始化
     getCardValueList(){
       let that = this
       cardValueList().then(res=>{
@@ -154,7 +156,7 @@ export default {
 <template>
 <div>
   <div class="top-dd">
-    <div class="tab-dv" v-for="(item,index) in  tabList" :key="index" :class="{ 'active':selectCard.cardType==item.num}" @click="selectTab(item.num)" >
+    <div class="tab-dv" v-for="(item,index) in tabList" :key="index" :class="{ 'active':selectCard.cardType==item.num}" @click="selectTab(item.num)" >
       {{item.name}}
     </div>
   </div>
@@ -163,37 +165,12 @@ export default {
       <el-form-item label="充值金额" prop="price" style="margin-bottom: 10px" >
       </el-form-item>
       <div class="d-s">
-
           <div class="k_kang" v-for="(item,index) in cardList" :key="index" @click="chooseActive(item)" >
             {{item.activeName}}
             <img src="../imgs/r-j.png" class="p-img" v-if="selectCard.id == item.id" >
           </div>
       </div>
-      <el-form-item label="充值本金" prop="region" >
-        <el-input v-model="selectCard.rechargeBalance" style="width: 330px">
-          <template slot="append">元</template>
-        </el-input>
-      </el-form-item>
-      <div style="display: flex">
-      <el-form-item label="赠送金额" prop="text">
-        <el-input v-model="selectCard.giftBalance" style="width: 150px">
-          <template slot="append">元</template>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="赠送积分" prop="text">
-        <el-input v-model="selectCard.points" style="width: 150px">
-          <template slot="append">积分</template>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="赠送成长值" prop="text">
-        <el-input v-model="selectCard.growthValue" style="width: 150px">
-          <template slot="append">成长值</template>
-        </el-input>
-      </el-form-item>
-
-      </div>
-      <!--        选择优惠券-->
-      <div class="xh-box"    v-if="selectCard.cardCouponList.length>0">
+      <div class="xh-box" >
         <div style="margin: 10px 0px;width: 800px;margin-left: 25px">
           <el-table
             :data="selectCard.cardCouponList"
@@ -235,9 +212,32 @@ export default {
               width="240">
             </el-table-column>
           </el-table>
-
         </div>
       </div>
+      <el-form-item label="充值本金" prop="region" >
+        <el-input v-model="selectCard.rechargeBalance" style="width: 330px">
+          <template slot="append">元</template>
+        </el-input>
+      </el-form-item>
+      <div style="display: flex">
+      <el-form-item label="赠送金额" prop="text">
+        <el-input v-model="selectCard.giftBalance" style="width: 150px">
+          <template slot="append">元</template>
+        </el-input>
+      </el-form-item>
+      <el-form-item label="赠送积分" prop="text">
+        <el-input v-model="selectCard.points" style="width: 150px">
+          <template slot="append">积分</template>
+        </el-input>
+      </el-form-item>
+      <el-form-item label="赠送成长值" prop="text">
+        <el-input v-model="selectCard.growthValue" style="width: 150px">
+          <template slot="append">成长值</template>
+        </el-input>
+      </el-form-item>
+
+      </div>
+
       <el-form-item label="提成员工" prop="region" >
         <el-select filterable v-model="selectCard.chooseStaff" placeholder="请选择提成员工" style="width: 330px">
           <el-option v-for="data in staffList" :label="data.realName" :value="data.id"></el-option>