10.31

2024-10-31 15:36:10 +08:00 · 2024-10-31 15:36:10 +08:00 · 94c0c18e6f
commit 94c0c18e6f
parent 1b09dab46f
102 changed files with 237 additions and 173 deletions
--- a/fuintAdmin/src/views/EventMarketing/Writeoffrecords/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/Writeoffrecords/index.vue
@ -201,8 +201,9 @@
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue
@ -305,8 +305,9 @@
 <!--        </el-form-item>-->
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue
@ -289,8 +289,9 @@
 <!--        </el-form-item>-->
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
@ -220,8 +220,9 @@
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
    <el-dialog
--- a/fuintAdmin/src/views/EventMarketing/cardExchangeRecord/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/cardExchangeRecord/index.vue
@ -192,8 +192,9 @@
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue
@ -312,8 +312,9 @@

      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
    <el-dialog
--- a/fuintAdmin/src/views/EventMarketing/cardFavorableRecord/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/cardFavorableRecord/index.vue
@ -228,8 +228,9 @@
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
@ -32,7 +32,7 @@
          <el-button type="primary" icon="el-icon-search" @click="getlist">查询</el-button>
          <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
          <el-button type="primary" icon="el-icon-search" @click="downloadTemplate()">下载模板</el-button>
-          <el-button type="primary" @click="centerDialogVisible =! centerDialogVisible">新增礼品卡活动</el-button>
+          <el-button type="primary" @click="addcenterDialogVisible()">新增礼品卡活动</el-button>

        </div>
      </div>
@ -296,7 +296,8 @@

    </el-dialog>
    <el-dialog
-      title="新增/修改礼品卡活动"
+      :title="titles"
+      center
      :visible.sync="centerDialogVisible"
      :close-on-click-modal="false"
      width="40%"
@ -420,6 +421,7 @@ export default {
  dicts: ['card_gift_type'],
  data() {
    return {
+      titles:"",
      value1:'',
      //http://localhost:81/dev-api/cardGiftActive
      uploadUrl: process.env.VUE_APP_BASE_API + ' /cardGiftActive/importCardInfo',
@ -646,6 +648,7 @@ export default {
    updateId(row) {

      this.centerDialogVisible = !this.centerDialogVisible
+      this.titles ="修改礼品卡"
      this.ruleForm = row
      // 时间
      this.ruleForm.value1 = [row.effectiveTimeStart, row.effectiveTimeEnd]
@ -687,6 +690,10 @@ export default {
      }
      this.getlist();
    },
+    addcenterDialogVisible(){
+      this.centerDialogVisible =! this.centerDialogVisible
+      this.titles = "新增礼品卡活动"
+    },
    getlist() {

      this.queryParams.pageNo = this.pageNo
@ -799,6 +806,7 @@ export default {
  width: 100%;
  height: 70vh;
  overflow: auto;
+  scrollbar-width: none;
  //padding: 15px;
 }
 .d-b {
--- a/fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue
@ -298,9 +298,10 @@

      </el-form>
      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel">取 消</el-button>
        <el-button type="primary" @click="submitForm">确 定</el-button>
        <!--        最终提交-->
-        <el-button @click="cancel">取 消</el-button>
+
      </div>
    </el-dialog>
    <el-dialog title="详情统计" :visible.sync="opendetails" width="45%" append-to-body>
--- a/fuintAdmin/src/views/balance/setting.vue
+++ b/fuintAdmin/src/views/balance/setting.vue
@ -33,8 +33,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="footer">
-        <el-button type="primary" @click="submitForm">保 存</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">保 存</el-button>
+
      </div>
    </div>
  </div>
--- a/fuintAdmin/src/views/commission/relation/index.vue
+++ b/fuintAdmin/src/views/commission/relation/index.vue
@ -186,8 +186,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin/src/views/content/article/index.vue
+++ b/fuintAdmin/src/views/content/article/index.vue
@ -171,8 +171,9 @@
          </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin/src/views/content/banner/list.vue
+++ b/fuintAdmin/src/views/content/banner/list.vue
@ -191,8 +191,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin/src/views/convenienceStore/damage/index.vue
+++ b/fuintAdmin/src/views/convenienceStore/damage/index.vue
@ -1,6 +1,6 @@
 <template>
  <div class="app-container">
-    <el-card >
+    <div class="card_box" style="margin-bottom: 15px" >
      <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="业务单号" />
@ -40,9 +40,9 @@
          <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
        </el-form-item>
      </el-form>
-    </el-card>
+    </div>

-    <el-card style="margin-top: 20px" >
+    <div class="card_box" >
      <el-row :gutter="10" class="mb8">
        <el-col :span="1.5">
          <el-button
@ -103,7 +103,7 @@
        :limit.sync="queryParams.pageSize"
        @pagination="getList"
      />
-    </el-card>
+    </div>

  </div>
 </template>
@ -220,5 +220,10 @@ export default {
  height: 100%;
  background: #f6f8f9;
 }
-
+.card_box{
+  background: #fff;
+  border-radius: 8px;
+  box-sizing: border-box;
+  padding: 15px;
+}
 </style>
--- a/fuintAdmin/src/views/convenienceStore/goodsFile.vue
+++ b/fuintAdmin/src/views/convenienceStore/goodsFile.vue
@ -52,7 +52,7 @@
            <el-option label="下架" value="jy"/>
          </el-select>
        </el-form-item>
-        <el-form-item style="float: right">
+        <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
@ -253,25 +253,7 @@
            </el-form-item>
          </div>
        </div>
-        <!--        <el-row>-->
-        <!--          <el-col :span="8">-->
-        <!--            <el-form-item label="是否使用积分抵扣" prop="canUsePoint" label-width="110">-->
-        <!--              <el-radio-group v-model="form.canUsePoint">-->
-        <!--                <el-radio v-for="dict in dict.type.yes_or_no" :label="dict.value">{{ dict.label }}</el-radio>-->
-        <!--              </el-radio-group>-->
-        <!--            </el-form-item>-->
-        <!--          </el-col>-->
-        <!--          <el-col :span="8">-->
-        <!--            <el-form-item label="是否使用兑换券兑换" prop="canUsePoint" label-width="110">-->
-        <!--              <el-radio-group v-model="form.canUseExchange">-->
-        <!--                <el-radio label="0">是</el-radio>-->
-        <!--                <el-radio label="1">否</el-radio>-->
-        <!--              </el-radio-group>-->
-        <!--            </el-form-item>-->
-        <!--          </el-col>-->
-        <!--          <el-col :span="8">-->
-        <!--          </el-col>-->
-        <!--        </el-row>-->
+
      </el-form>
      <div class="dialog-footer" style="text-align: center">
        <el-button @click="cancel">取 消</el-button>
--- a/fuintAdmin/src/views/convenienceStore/index.vue
+++ b/fuintAdmin/src/views/convenienceStore/index.vue
@ -98,7 +98,7 @@ export default {
  margin-right: 50px;
  display: flex;
  align-items: center;
-
+  cursor: pointer;
 }

 .active {
--- a/fuintAdmin/src/views/convenienceStore/inventory/index.vue
+++ b/fuintAdmin/src/views/convenienceStore/inventory/index.vue
@ -31,7 +31,7 @@
          </el-date-picker>
        </el-form-item>

-        <el-form-item style="float: right">
+        <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
@ -43,7 +43,7 @@
        </el-form-item>
      </el-form>

-      <div style="height: 74vh;overflow: auto">
+      <div style="height: 74vh;overflow: auto; scrollbar-width: none">
        <el-table ref="tables" border
                  v-loading="loading"
                  :data="inventoryList"
--- a/fuintAdmin/src/views/convenienceStore/purchase/index.vue
+++ b/fuintAdmin/src/views/convenienceStore/purchase/index.vue
@ -72,7 +72,7 @@ export default {
  margin-right: 50px;
  display: flex;
  align-items: center;
-
+  cursor: pointer;
 }

 .active {
--- a/fuintAdmin/src/views/convenienceStore/purchase/purchase.vue
+++ b/fuintAdmin/src/views/convenienceStore/purchase/purchase.vue
@ -40,7 +40,7 @@
            placeholder="结束日期">
          </el-date-picker>
        </el-form-item>
-        <el-form-item style="float: right">
+        <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
--- a/fuintAdmin/src/views/convenienceStore/returns/index.vue
+++ b/fuintAdmin/src/views/convenienceStore/returns/index.vue
@ -41,7 +41,7 @@
          </el-date-picker>
        </el-form-item>

-        <el-form-item style="float: right">
+        <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
--- a/fuintAdmin/src/views/convenienceStore/saleStatistic.vue
+++ b/fuintAdmin/src/views/convenienceStore/saleStatistic.vue
@ -74,6 +74,7 @@ export default {
  margin-right: 50px;
  display: flex;
  align-items: center;
+  cursor: pointer;

 }

--- a/fuintAdmin/src/views/convenienceStore/stockStatistic.vue
+++ b/fuintAdmin/src/views/convenienceStore/stockStatistic.vue
@ -84,7 +84,7 @@
        <!--            <el-option label="下架" value="jy"/>-->
        <!--          </el-select>-->
        <!--        </el-form-item>-->
-        <el-form-item style="float: right;">
+        <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="dialogVisible = true"
@ -93,11 +93,7 @@
          </el-button>
        </el-form-item>
      </el-form>
-      <div style="display: flex;justify-content: space-between">
-
-      </div>
-
-      <div style="height: 71vh;overflow: auto">
+      <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">
--- a/fuintAdmin/src/views/convenienceStore/supplier.vue
+++ b/fuintAdmin/src/views/convenienceStore/supplier.vue
@ -104,7 +104,7 @@
    </div>

    <!-- 添加或修改对话框 -->
-    <el-dialog :close-on-click-modal="false" :title="title" width="600px" style="margin-top: 5%" :visible.sync="open"
+    <el-dialog center :close-on-click-modal="false" :title="title" width="600px" style="margin-top: 5%" :visible.sync="open"
               append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="95px">
        <el-row>
--- a/fuintAdmin/src/views/coupon/coupon/index.vue
+++ b/fuintAdmin/src/views/coupon/coupon/index.vue
@ -432,8 +432,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
    <!-- 添加或修改卡券对话框 end-->
--- a/fuintAdmin/src/views/coupon/group/index.vue
+++ b/fuintAdmin/src/views/coupon/group/index.vue
@ -128,8 +128,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin/src/views/feedBack/index.vue
+++ b/fuintAdmin/src/views/feedBack/index.vue
@ -112,8 +112,9 @@

      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>

--- a/fuintAdmin/src/views/fleet/tab/fleetInfo.vue
+++ b/fuintAdmin/src/views/fleet/tab/fleetInfo.vue
@ -181,8 +181,9 @@
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
    <!-- 添加或修改对话框 -->
--- a/fuintAdmin/src/views/fleet/tab/fleetMember.vue
+++ b/fuintAdmin/src/views/fleet/tab/fleetMember.vue
@ -197,8 +197,9 @@
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
    <!-- 添加或修改对话框 -->
--- a/fuintAdmin/src/views/goods/cate/index.vue
+++ b/fuintAdmin/src/views/goods/cate/index.vue
@ -187,8 +187,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin/src/views/goods/goods/goodsForm.vue
+++ b/fuintAdmin/src/views/goods/goods/goodsForm.vue
@ -223,8 +223,9 @@
        </el-tab-pane>
      </el-tabs>
      <div slot="footer" class="footer">
+        <el-button @click="cancel">取 消</el-button>
         <el-button type="primary" @click="submitForm">确 定</el-button>
-         <el-button @click="cancel">取 消</el-button>
+
      </div>
    </div>
  </div>
--- a/fuintAdmin/src/views/integral/gift/add.vue
+++ b/fuintAdmin/src/views/integral/gift/add.vue
@ -752,9 +752,10 @@ export default {
          </el-col>
        </el-row>
      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+      <div style="display: flex;justify-content: center">
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </div>

--- a/fuintAdmin/src/views/integral/gift/gift.vue
+++ b/fuintAdmin/src/views/integral/gift/gift.vue
@ -406,8 +406,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
    <!-- 打开商品界面 -->
--- a/fuintAdmin/src/views/integral/giftCategory/index.vue
+++ b/fuintAdmin/src/views/integral/giftCategory/index.vue
@ -109,8 +109,9 @@

      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>

--- a/fuintAdmin/src/views/integral/order/outcome.vue
+++ b/fuintAdmin/src/views/integral/order/outcome.vue
@ -83,8 +83,9 @@
      </el-row>
    </el-form>
    <div style="float: right; margin-bottom: 20px;">
+      <el-button @click="cancel">取 消</el-button>
        <el-button type="primary" @click="submit">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+
      </div>
    </el-card>
  </div>
--- a/fuintAdmin/src/views/integral/settings/index.vue
+++ b/fuintAdmin/src/views/integral/settings/index.vue
@ -498,7 +498,7 @@ valiNumberPass(rule, value, callback, fieldName)

 .cor {
  box-sizing: border-box;
-  padding: 15px;
+  padding: 10px;
  background: #f9f9f9;

 }
--- a/fuintAdmin/src/views/member/balanceRecharge.vue
+++ b/fuintAdmin/src/views/member/balanceRecharge.vue
@ -42,8 +42,9 @@
      </el-row>
    </el-form>
    <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="submitForm">确 定</el-button>
      <el-button @click="cancel">取 消</el-button>
+      <el-button type="primary" @click="submitForm">确 定</el-button>
+
    </div>
  </el-dialog>
 </template>
--- a/fuintAdmin/src/views/member/fixingLevel.vue
+++ b/fuintAdmin/src/views/member/fixingLevel.vue
@ -841,8 +841,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin/src/views/member/index.vue
+++ b/fuintAdmin/src/views/member/index.vue
@ -574,8 +574,9 @@
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>

@ -631,8 +632,9 @@
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm1">确 定</el-button>
        <el-button @click="openMassSend = false">取 消</el-button>
+        <el-button type="primary" @click="submitForm1">确 定</el-button>
+
      </div>
    </el-dialog>

--- a/fuintAdmin/src/views/member/manage.vue
+++ b/fuintAdmin/src/views/member/manage.vue
@ -503,8 +503,9 @@

      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>

--- a/fuintAdmin/src/views/member/pointRecharge.vue
+++ b/fuintAdmin/src/views/member/pointRecharge.vue
@ -42,8 +42,9 @@
      </el-row>
    </el-form>
    <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="submitForm">确 定</el-button>
      <el-button @click="cancel">取 消</el-button>
+      <el-button type="primary" @click="submitForm">确 定</el-button>
+
    </div>
  </el-dialog>
 </template>
--- a/fuintAdmin/src/views/member/userInfo.vue
+++ b/fuintAdmin/src/views/member/userInfo.vue
@ -272,8 +272,9 @@
                </el-col>
              </el-row>
              <div style="margin: 20px 0;text-align: center">
-                <el-button type="primary" @click="confirm(1)">确认充值</el-button>
                <el-button @click="cancel">取 消</el-button>
+                <el-button type="primary" @click="confirm(1)">确认充值</el-button>
+
              </div>
            </div>
          </el-tab-pane>
@ -362,8 +363,9 @@
              </el-col>
            </el-row>
            <div style="margin: 20px 0;text-align: center">
-              <el-button type="primary" @click="confirm(2)">确认充值</el-button>
              <el-button @click="cancel">取 消</el-button>
+              <el-button type="primary" @click="confirm(2)">确认充值</el-button>
+
            </div>
          </el-tab-pane>
          <el-tab-pane label="礼品卡兑换电子储值卡余额" name="giftCard">
@ -384,8 +386,9 @@
              </el-row>
            </el-form>
            <div style="margin: 20px 0;text-align: center">
-              <el-button type="primary" @click="confirm1()">确认充值</el-button>
              <el-button @click="cancel">取 消</el-button>
+              <el-button type="primary" @click="confirm1()">确认充值</el-button>
+
            </div>
          </el-tab-pane>
        </el-tabs>
--- a/fuintAdmin/src/views/member/userLabel.vue
+++ b/fuintAdmin/src/views/member/userLabel.vue
@ -119,8 +119,9 @@

      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin/src/views/merchant/index.vue
+++ b/fuintAdmin/src/views/merchant/index.vue
@ -217,8 +217,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin/src/views/oilConfig/oilPurchase/purchaseOrder.vue
+++ b/fuintAdmin/src/views/oilConfig/oilPurchase/purchaseOrder.vue
@ -226,8 +226,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>

--- a/fuintAdmin/src/views/oilConfig/oilSuppliers/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilSuppliers/list.vue
@ -109,8 +109,9 @@

      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>

--- a/fuintAdmin/src/views/oilConfig/oilTank/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilTank/list.vue
@ -184,8 +184,9 @@
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>

--- a/fuintAdmin/src/views/openGift/index.vue
+++ b/fuintAdmin/src/views/openGift/index.vue
@ -148,8 +148,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin/src/views/order/order_Added.vue
+++ b/fuintAdmin/src/views/order/order_Added.vue
@ -1,7 +1,7 @@
 <!--增值交易订单-->
 <template>
  <div class="app-container">    <!--    表单查询-->
-    <el-card class="box-card">
+    <div class="box-card">
      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
        <el-form-item label="" prop="orderNo">
          <el-input
@ -46,30 +46,6 @@
            <el-option label="部分归还" value="2"></el-option>
          </el-select>
        </el-form-item>
-        <!--        <el-form-item label="" prop="unitName">-->
-        <!--          <el-input-->
-        <!--            v-model="queryParams.unitName"-->
-        <!--            placeholder="单位名称"-->
-        <!--            clearable-->
-        <!--            @keyup.enter.native="handleQuery"-->
-        <!--          />-->
-        <!--        </el-form-item>-->
-        <!--        <el-form-item label="" prop="personCredit">-->
-        <!--          <el-input-->
-        <!--            v-model="queryParams.personCredit"-->
-        <!--            placeholder="挂账人"-->
-        <!--            clearable-->
-        <!--            @keyup.enter.native="handleQuery"-->
-        <!--          />-->
-        <!--        </el-form-item>-->
-        <!--        <el-form-item label="" prop="contactMobile">-->
-        <!--          <el-input-->
-        <!--            v-model="queryParams.contactMobile"-->
-        <!--            placeholder="请输入挂账人联系电话"-->
-        <!--            clearable-->
-        <!--            @keyup.enter.native="handleQuery"-->
-        <!--          />-->
-        <!--        </el-form-item>-->
        <el-form-item label="">
          <el-date-picker
            v-model="beginTime"
@ -85,7 +61,7 @@
            placeholder="结束日期">
          </el-date-picker>
        </el-form-item>
-        <el-form-item style="float: right">
+        <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="exportExcelCashier()">导出</el-button>
@ -149,7 +125,7 @@
      </div>


-    </el-card>
+    </div>

    <!--    归还记录信息-->
    <el-drawer
@ -159,7 +135,7 @@
      size="55%"
      :before-close="handleClose">
      <div style="display: grid; place-items: center;">
-        <el-card style="background-color: #f5f5f5;width: 90%">
+        <div style="background-color: #f5f5f5;width: 90%;box-sizing: border-box;padding: 15px;padding-top: 20px">
          <div slot="header" class="clearfix">
            <div style="position: relative;">
              <div style="position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%);">
@ -186,9 +162,10 @@
              <span>{{ record.contactMobile }}</span>
            </div>
          </div>
-        </el-card>
-        <el-card style="margin-top: 15px;width: 90%">
+        </div>
+        <div style="margin-top: 15px;width: 90%">
          <el-table ref="tables"
+                    border
                    v-loading="loading"
                    :data="returnRecordList">
            <el-table-column label="单据号" align="center" prop="orderNo" width="200"></el-table-column>
@ -231,7 +208,7 @@
              @current-change="getRecordList">
            </el-pagination>
          </div>
-        </el-card>
+        </div>
      </div>
    </el-drawer>
  </div>
@ -449,6 +426,9 @@ export default {
 .box-card {
  width: 100%;
  margin-bottom: 15px;
+  background: #fff;
+  box-sizing: border-box;
+  padding: 10px;
 }

 .box-gang {
@ -494,15 +474,11 @@ export default {
 }

 .size-bole {
-  //font-weight: bold;
-
-  //width: 53px;
  height: 31px;
  font-family: YouSheBiaoTiHei;
  font-weight: 400;
  font-size: 24px;
  color: #555555;
-  //line-height: 0px;
  text-align: left;
  font-style: normal;
  text-transform: none;
@ -519,7 +495,7 @@ export default {

 .table-box {
  width: 100%;
-  height: 70vh;
+  height: 75vh;
  overflow: auto;
 }

--- a/fuintAdmin/src/views/order/order_Vip.vue
+++ b/fuintAdmin/src/views/order/order_Vip.vue
@ -1,7 +1,7 @@
 <!--会员充值订单-->
 <template>
  <div class="app-container">    <!--    条件查询-->
-    <el-card class="box-card">
+    <div class="box-card">
      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">

        <el-form-item label="">
@ -128,7 +128,7 @@
      </div>


-    </el-card>
+    </div>

    <!--    订单退款-->
    <el-dialog :close-on-click-modal="false"
@ -422,6 +422,10 @@ export default {

 .box-card {
  width: 100%;
+  border-radius: 8px;
+  background: #fff;
+  box-sizing: border-box;
+  padding: 10px;
  margin-bottom: 15px;
 }

@ -486,7 +490,7 @@ export default {

 .table-box {
  width: 100%;
-  height: 72vh;
+  height: 82vh;
  overflow: auto;
 }

--- a/fuintAdmin/src/views/order/setting.vue
+++ b/fuintAdmin/src/views/order/setting.vue
@ -22,8 +22,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="footer">
-        <el-button type="primary" @click="submitForm">保 存</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">保 存</el-button>
+
      </div>
    </div>
  </div>
--- a/fuintAdmin/src/views/point/setting.vue
+++ b/fuintAdmin/src/views/point/setting.vue
@ -35,8 +35,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="footer">
-        <el-button type="primary" @click="submitForm">保 存</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">保 存</el-button>
+
      </div>
    </div>
  </div>
--- a/fuintAdmin/src/views/power/linkManage.vue
+++ b/fuintAdmin/src/views/power/linkManage.vue
@ -103,8 +103,9 @@

      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>

--- a/fuintAdmin/src/views/power/page/mode.vue
+++ b/fuintAdmin/src/views/power/page/mode.vue
@ -160,8 +160,9 @@
        <!--        </el-form-item>-->
      </el-form>
      <div style="display: flex; justify-content: center; align-items: center;margin-top: 30px">
-        <el-button type="primary" @click="handleSubmit">保存</el-button>
        <el-button @click="handleReset">取消</el-button>
+        <el-button type="primary" @click="handleSubmit">保存</el-button>
+
      </div>

    </el-dialog>
--- a/fuintAdmin/src/views/refund/index.vue
+++ b/fuintAdmin/src/views/refund/index.vue
@ -173,8 +173,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin/src/views/smsManager/index.vue
+++ b/fuintAdmin/src/views/smsManager/index.vue
@ -95,8 +95,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin/src/views/smsTemplate/index.vue
+++ b/fuintAdmin/src/views/smsTemplate/index.vue
@ -138,8 +138,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin/src/views/staff/device/tab/oilEngineList.vue
+++ b/fuintAdmin/src/views/staff/device/tab/oilEngineList.vue
@ -130,8 +130,9 @@

      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin/src/views/staff/device/tab/printList.vue
+++ b/fuintAdmin/src/views/staff/device/tab/printList.vue
@ -155,8 +155,9 @@

      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin/src/views/staff/list.vue
+++ b/fuintAdmin/src/views/staff/list.vue
@ -224,8 +224,9 @@

      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>

--- a/fuintAdmin/src/views/staff/tag/list.vue
+++ b/fuintAdmin/src/views/staff/tag/list.vue
@ -101,8 +101,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
    <!-- 添加或修改对话框 -->
@ -119,8 +120,9 @@
                </el-option>
              </el-select>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="enterBind">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="enterBind">确 定</el-button>
+
      </div>
    </el-dialog>

--- a/fuintAdmin/src/views/staffCommission/staffCommission.vue
+++ b/fuintAdmin/src/views/staffCommission/staffCommission.vue
@ -382,8 +382,9 @@

      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">保存</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">保存</el-button>
+
      </div>
    </el-dialog>

--- a/fuintAdmin/src/views/store/list.vue
+++ b/fuintAdmin/src/views/store/list.vue
@ -309,8 +309,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin/src/views/subMessage/index.vue
+++ b/fuintAdmin/src/views/subMessage/index.vue
@ -94,8 +94,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin/src/views/system/account/index.vue
+++ b/fuintAdmin/src/views/system/account/index.vue
@ -254,8 +254,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin/src/views/system/config/index.vue
+++ b/fuintAdmin/src/views/system/config/index.vue
@ -173,8 +173,9 @@
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin/src/views/system/dict/data.vue
+++ b/fuintAdmin/src/views/system/dict/data.vue
@ -159,8 +159,9 @@
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin/src/views/system/dict/index.vue
+++ b/fuintAdmin/src/views/system/dict/index.vue
@ -161,8 +161,9 @@
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin/src/views/system/menu/index.vue
+++ b/fuintAdmin/src/views/system/menu/index.vue
@ -166,8 +166,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin/src/views/system/notice/index.vue
+++ b/fuintAdmin/src/views/system/notice/index.vue
@ -162,8 +162,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin/src/views/system/role/index.vue
+++ b/fuintAdmin/src/views/system/role/index.vue
@ -149,8 +149,9 @@
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin/src/views/userGrade/index.vue
+++ b/fuintAdmin/src/views/userGrade/index.vue
@ -527,8 +527,9 @@

      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>

--- a/fuintAdmin_zt/src/views/balance/setting.vue
+++ b/fuintAdmin_zt/src/views/balance/setting.vue
@ -33,8 +33,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="footer">
-        <el-button type="primary" @click="submitForm">保 存</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">保 存</el-button>
+
      </div>
    </div>
  </div>
--- a/fuintAdmin_zt/src/views/content/article/index.vue
+++ b/fuintAdmin_zt/src/views/content/article/index.vue
@ -171,8 +171,9 @@
          </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin_zt/src/views/content/banner/list.vue
+++ b/fuintAdmin_zt/src/views/content/banner/list.vue
@ -191,8 +191,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin_zt/src/views/coupon/coupon/index.vue
+++ b/fuintAdmin_zt/src/views/coupon/coupon/index.vue
@ -432,8 +432,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
    <!-- 添加或修改卡券对话框 end-->
--- a/fuintAdmin_zt/src/views/coupon/group/index.vue
+++ b/fuintAdmin_zt/src/views/coupon/group/index.vue
@ -128,8 +128,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin_zt/src/views/goods/cate/index.vue
+++ b/fuintAdmin_zt/src/views/goods/cate/index.vue
@ -187,8 +187,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin_zt/src/views/goods/goods/goodsForm.vue
+++ b/fuintAdmin_zt/src/views/goods/goods/goodsForm.vue
@ -223,8 +223,9 @@
        </el-tab-pane>
      </el-tabs>
      <div slot="footer" class="footer">
+        <el-button @click="cancel">取 消</el-button>
         <el-button type="primary" @click="submitForm">确 定</el-button>
-         <el-button @click="cancel">取 消</el-button>
+
      </div>
    </div>
  </div>
--- a/fuintAdmin_zt/src/views/member/balanceRecharge.vue
+++ b/fuintAdmin_zt/src/views/member/balanceRecharge.vue
@ -42,8 +42,9 @@
      </el-row>
    </el-form>
    <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="submitForm">确 定</el-button>
      <el-button @click="cancel">取 消</el-button>
+      <el-button type="primary" @click="submitForm">确 定</el-button>
+
    </div>
  </el-dialog>
 </template>
--- a/fuintAdmin_zt/src/views/member/index.vue
+++ b/fuintAdmin_zt/src/views/member/index.vue
@ -317,8 +317,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>

--- a/fuintAdmin_zt/src/views/member/pointRecharge.vue
+++ b/fuintAdmin_zt/src/views/member/pointRecharge.vue
@ -42,8 +42,9 @@
      </el-row>
    </el-form>
    <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="submitForm">确 定</el-button>
      <el-button @click="cancel">取 消</el-button>
+      <el-button type="primary" @click="submitForm">确 定</el-button>
+
    </div>
  </el-dialog>
 </template>
--- a/fuintAdmin_zt/src/views/member/setting.vue
+++ b/fuintAdmin_zt/src/views/member/setting.vue
@ -34,8 +34,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </div>
  </div>
--- a/fuintAdmin_zt/src/views/order/index.vue
+++ b/fuintAdmin_zt/src/views/order/index.vue
@ -267,8 +267,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
    <!-- 修改对话框 end-->
--- a/fuintAdmin_zt/src/views/order/setting.vue
+++ b/fuintAdmin_zt/src/views/order/setting.vue
@ -22,8 +22,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="footer">
-        <el-button type="primary" @click="submitForm">保 存</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">保 存</el-button>
+
      </div>
    </div>
  </div>
--- a/fuintAdmin_zt/src/views/point/setting.vue
+++ b/fuintAdmin_zt/src/views/point/setting.vue
@ -35,8 +35,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="footer">
-        <el-button type="primary" @click="submitForm">保 存</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">保 存</el-button>
+
      </div>
    </div>
  </div>
--- a/fuintAdmin_zt/src/views/refund/index.vue
+++ b/fuintAdmin_zt/src/views/refund/index.vue
@ -173,8 +173,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin_zt/src/views/staff/list.vue
+++ b/fuintAdmin_zt/src/views/staff/list.vue
@ -194,8 +194,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin_zt/src/views/store/list.vue
+++ b/fuintAdmin_zt/src/views/store/list.vue
@ -309,8 +309,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin_zt/src/views/system/account/index.vue
+++ b/fuintAdmin_zt/src/views/system/account/index.vue
@ -254,8 +254,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin_zt/src/views/system/config/index.vue
+++ b/fuintAdmin_zt/src/views/system/config/index.vue
@ -173,8 +173,9 @@
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin_zt/src/views/system/dict/data.vue
+++ b/fuintAdmin_zt/src/views/system/dict/data.vue
@ -147,8 +147,9 @@
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin_zt/src/views/system/dict/index.vue
+++ b/fuintAdmin_zt/src/views/system/dict/index.vue
@ -146,8 +146,9 @@
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin_zt/src/views/system/menu/index.vue
+++ b/fuintAdmin_zt/src/views/system/menu/index.vue
@ -162,8 +162,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin_zt/src/views/system/notice/index.vue
+++ b/fuintAdmin_zt/src/views/system/notice/index.vue
@ -162,8 +162,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin_zt/src/views/system/role/index.vue
+++ b/fuintAdmin_zt/src/views/system/role/index.vue
@ -155,8 +155,9 @@
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin_zt/src/views/tag/oilTag/index.vue
+++ b/fuintAdmin_zt/src/views/tag/oilTag/index.vue
@ -143,8 +143,9 @@
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
    <el-dialog title="一键绑定" :visible.sync="openShow" width="800px" append-to-body>
--- a/fuintAdmin_zt/src/views/tag/tagCode/index.vue
+++ b/fuintAdmin_zt/src/views/tag/tagCode/index.vue
@ -91,8 +91,9 @@
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintAdmin_zt/src/views/tag/tagCodeRecord/index.vue
+++ b/fuintAdmin_zt/src/views/tag/tagCodeRecord/index.vue
@ -161,8 +161,9 @@
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>
  </div>
--- a/fuintCashier/src/renderer/views/cashier/components/balanceRecharge.vue
+++ b/fuintCashier/src/renderer/views/cashier/components/balanceRecharge.vue
@ -42,8 +42,9 @@
      </el-row>
    </el-form>
    <div slot="footer" class="dialog-footer">
-      <el-button type="primary" class="main-button" @click="submitForm">确 定</el-button>
      <el-button @click="cancel">取 消</el-button>
+      <el-button type="primary" class="main-button" @click="submitForm">确 定</el-button>
+
    </div>
  </el-dialog>
 </template>
--- a/fuintCashier/src/renderer/views/cashier/components/memberList.vue
+++ b/fuintCashier/src/renderer/views/cashier/components/memberList.vue
@ -288,8 +288,9 @@
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" class="main-button" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" class="main-button" @click="submitForm">确 定</el-button>
+
      </div>
    </el-dialog>

--- a/Show More
+++ b/Show More