From 888a6709e270c82dda5e1e6b4666e7e43a523626 Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Mon, 30 Sep 2024 14:10:07 +0800
Subject: [PATCH] 9.30

---
 .../src/assets/styles/element-ui.scss         |   1 +
 fuintCashierWeb/src/assets/styles/fuint.scss  |   2 +-
 .../views/cashier/NewComponents/newHome.vue   |  33 ++-
 .../newHomeComponents/memberRecharge.vue      |   3 +-
 .../cashier/orderComponents/order_Cashier.vue |  23 +-
 .../cashier/orderComponents/order_Goods.vue   |  25 +-
 .../cashier/orderComponents/order_Oil.vue     | 214 +++++++++---------
 .../cashier/orderComponents/order_Vip.vue     |  22 +-
 8 files changed, 159 insertions(+), 164 deletions(-)

diff --git a/fuintCashierWeb/src/assets/styles/element-ui.scss b/fuintCashierWeb/src/assets/styles/element-ui.scss
index 18620e9ef..a85a7af72 100644
--- a/fuintCashierWeb/src/assets/styles/element-ui.scss
+++ b/fuintCashierWeb/src/assets/styles/element-ui.scss
@@ -107,6 +107,7 @@
   }
   .el-dialog__body {
     padding: 30px;
+    padding-top: 0px;
   }
   .el-dialog__title,.el-dialog__close{
     color: #fff;
diff --git a/fuintCashierWeb/src/assets/styles/fuint.scss b/fuintCashierWeb/src/assets/styles/fuint.scss
index 9d559fd87..852f867a7 100644
--- a/fuintCashierWeb/src/assets/styles/fuint.scss
+++ b/fuintCashierWeb/src/assets/styles/fuint.scss
@@ -198,7 +198,7 @@
 
 
  .el-form--inline .el-form-item {
-   margin-right: 44px;
+
  }
 
 
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
index e6ce345b3..cd036a39a 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
@@ -114,20 +114,7 @@
           </div>
 
         </div>
-<!--        <div class="three-top">-->
-<!--          <div class="addbor">-->
-<!--            <div class="">扫码支付</div>-->
-<!--            <div class="or_num">0.00</div>-->
-<!--          </div>-->
-<!--          <div class="addbor">-->
-<!--            <div class="">找零</div>-->
-<!--            <div class="or_num">0.00</div>-->
-<!--          </div>-->
-<!--          <div class="addbor">-->
-<!--            <div class="">加油员</div>-->
-<!--            <div class="or_num">0.00</div>-->
-<!--          </div>-->
-<!--        </div>-->
+
         <div class="er-box"></div>
         <div class="wrap-box">
           <div class="f-box" v-for="(item,index) in payList" :class="{'f-acvite' : item.dictValue == payWay }"
@@ -255,11 +242,11 @@
       width="800px"
 
     >
-      <div class="ds-tc">
+      <div class="ds-tc" style="margin-top: -20px">
         <div class="left_tc">
           <div class="t-tc">
             <div style="font-size: 18px;font-weight: bold">所有卡券</div>
-            <div style="font-size: 16px;color: #ff9655">打印所有二维码</div>
+
           </div>
           <div class="wrap-tc">
             <div class="tc_wa" :class="{'tc-active' : freeIndex == index }" @click="setFreeIndex(index)"
@@ -280,11 +267,16 @@
           <div style="font-weight: 600;font-size: 16px;color: #333333;margin-bottom: 5px">使用规则</div>
           <div>优惠说明：价值10元代金券一张消费满100可用</div>
           <div style="margin-top: 20px;text-align: end">
-            <el-button type="primary" >确定赠送</el-button>
+
           </div>
 
         </div>
+
       </div>
+      <div style="display: flex;justify-content: center">
+        <el-button type="primary" >确定赠送</el-button>
+      </div>
+
 
 
     </el-dialog>
@@ -2169,9 +2161,9 @@ input {
   margin-top: 15px;
 }
 .tc_wa{
-  width: 32%;
+  width: 30%;
   margin-bottom: 4%;
-  margin-right: 1%;
+  margin-right: 3%;
   box-sizing: border-box;
   padding: 10px;
   background: url("./imgs/dx.png") no-repeat;
@@ -2194,4 +2186,7 @@ input {
 .el-radio-group .or_num{
   float: right;
 }
+.el-dialog__body{
+  padding-top: 0px !important;
+}
 </style>
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/newHomeComponents/memberRecharge.vue b/fuintCashierWeb/src/views/cashier/NewComponents/newHomeComponents/memberRecharge.vue
index e8a23c61c..55830b201 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/newHomeComponents/memberRecharge.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/newHomeComponents/memberRecharge.vue
@@ -110,9 +110,10 @@ export default {
   </div>
   <div v-if="tabIndex == 0">
     <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px" class="demo-ruleForm">
-      <el-form-item label="充值金额" prop="price" >
+      <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,index)" >
             {{item.activeName}}
             <img src="../imgs/r-j.png" class="p-img" v-if="kIndex == index" >
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
index 5a98452ff..32679c788 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
@@ -38,14 +38,14 @@
 
           <el-date-picker
             v-model="beginTime"
-            style="width: 140px"
+            style="width: 200px"
             type="date"
             placeholder="开始日期">
           </el-date-picker>
           至
           <el-date-picker
             v-model="endTime"
-            style="width: 140px"
+            style="width: 200px"
             type="date"
             placeholder="结束日期">
           </el-date-picker>
@@ -65,8 +65,7 @@
         <div class="box-gang">
           <div class="box2">
             <div style="font-size: 26px;color: #0DC291;font-weight: bold;margin-top: 5px">
-              {{ orderStatistics.theTotalAmountOfTheOrder ? orderStatistics.theTotalAmountOfTheOrder : 0 }}/
-              {{ orderStatistics.numberOfStrokes ? orderStatistics.numberOfStrokes : 0 }}
+              {{ orderStatistics.theTotalAmountOfTheOrder ? orderStatistics.theTotalAmountOfTheOrder : 0 }}/{{ orderStatistics.numberOfStrokes ? orderStatistics.numberOfStrokes : 0 }}
             </div>
             <div class="size-hui">
               <div style="width: 8px;height: 8px;border-radius: 4px;background: #0DC291"></div>
@@ -84,8 +83,7 @@
           </div>
           <div class="box2">
             <div style="font-size: 26px;color: #F44522;font-weight: bold;margin-top: 5px">
-              {{ orderStatistics.oilDiscounts ? orderStatistics.oilDiscounts : 0 }}/
-              {{ seekZeroAmount }}
+              {{ orderStatistics.oilDiscounts ? orderStatistics.oilDiscounts : 0 }}/{{ seekZeroAmount }}
             </div>
             <div class="size-hui">
               <div style="width: 8px;height: 8px;border-radius: 4px;background: #F44522"></div>
@@ -94,8 +92,7 @@
           </div>
           <div class="box2">
             <div style="font-size: 26px;color: #FA6400;font-weight: bold;margin-top: 5px">
-              {{ orderStatistics.numberOfStrokesByOil ? orderStatistics.numberOfStrokesByOil : 0 }}/
-              {{ orderStatistics.theTotalAmountOfOil ? orderStatistics.theTotalAmountOfOil : 0 }}
+              {{ orderStatistics.numberOfStrokesByOil ? orderStatistics.numberOfStrokesByOil : 0 }}/{{ orderStatistics.theTotalAmountOfOil ? orderStatistics.theTotalAmountOfOil : 0 }}
             </div>
             <div class="size-hui">
               <div style="width: 8px;height: 8px;border-radius: 4px;background: #FA6400"></div>
@@ -104,8 +101,7 @@
           </div>
           <div class="box2">
             <div style="font-size: 26px;color: #FE59E5;font-weight: bold;margin-top: 5px">
-              {{ orderStatistics.numberOfStrokesByGoods ? orderStatistics.numberOfStrokesByGoods : 0 }}/
-              {{ orderStatistics.theTotalAmountOfTheItem ? orderStatistics.theTotalAmountOfTheItem : 0 }}
+              {{ orderStatistics.numberOfStrokesByGoods ? orderStatistics.numberOfStrokesByGoods : 0 }}/{{ orderStatistics.theTotalAmountOfTheItem ? orderStatistics.theTotalAmountOfTheItem : 0 }}
             </div>
             <div class="size-hui">
               <div style="width: 8px;height: 8px;border-radius: 4px;background: #FE59E5"></div>
@@ -1516,6 +1512,7 @@ export default {
 }
 
 .el-form--inline .el-form-item {
+  margin-right: 20px;
 
 }
 
@@ -1529,7 +1526,6 @@ export default {
   text-align: left;
   font-style: normal;
   text-transform: none;
-
   .nei {
     width: 150px;
   }
@@ -1596,7 +1592,7 @@ export default {
   box-sizing: border-box;
   padding: 20px;
   margin: 0 auto;
-  min-height: 82vh;
+  min-height: 84vh;
 }
 .top_new{
   display: flex;
@@ -1604,9 +1600,10 @@ export default {
   height: 65px;
   background: #fff;
   width: 98%;
-  margin: 10px auto;
+  margin: 5px auto;
   border-radius: 8px;
   box-sizing: border-box;
   padding: 15px
+
 }
 </style>
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue
index cbd3c5c0e..5b9ca8cac 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue
@@ -2,7 +2,7 @@
 <template>
   <div>
     <div class="top_new">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+      <el-form :model="queryParams" ref="queryForm" size="small" style="width: 100%" :inline="true" v-show="showSearch">
         <el-form-item label="" prop="staffId">
           <el-select
             v-model="queryParams.staffId"
@@ -62,19 +62,22 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item >
-          <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="exportExcelGoodsOrder()">导出</el-button>
+
         </el-form-item>
       </el-form>
+      <div style="height: 32px;width: 20%">
+        <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="exportExcelGoodsOrder()">导出</el-button>
+      </div>
+
     </div>
     <div class="cot-box">
       <div>
         <div class="box-gang">
           <div class="box2">
             <div style="font-size: 26px;color: #0DC291;font-weight: bold;margin-top: 5px">
-              {{ orderStatistics.theTotalAmount || 0 }}/
-              {{ orderStatistics.numberOfProducts || 0 }}
+              {{ orderStatistics.theTotalAmount || 0 }}/{{ orderStatistics.numberOfProducts || 0 }}
             </div>
             <div class="size-hui">
               <div style="width: 8px;height: 8px;border-radius: 4px;background: #0DC291"></div>
@@ -101,8 +104,7 @@
           </div>
           <div class="box2">
             <div style="font-size: 26px;color: #FA6400;font-weight: bold;margin-top: 5px">
-              {{ orderStatistics.wechat || 0 }}/
-              {{ orderStatistics.alipay || 0 }}
+              {{ orderStatistics.wechat || 0 }}/{{ orderStatistics.alipay || 0 }}
             </div>
             <div class="size-hui">
               <div style="width: 8px;height: 8px;border-radius: 4px;background: #FA6400"></div>
@@ -111,8 +113,7 @@
           </div>
           <div class="box2">
             <div style="font-size: 26px;color: #2B63F4;font-weight: bold;margin-top: 5px">
-              {{ orderStatistics.wechat || 0 }}/
-              {{ orderStatistics.alipay || 0 }}
+              {{ orderStatistics.wechat || 0 }}/{{ orderStatistics.alipay || 0 }}
             </div>
             <div class="size-hui">
               <div style="width: 8px;height: 8px;border-radius: 4px;background: #2B63F4"></div>
@@ -924,14 +925,14 @@ export default {
   margin: 0 auto;
 }
 .el-form--inline .el-form-item {
-  margin-right: 30px;
+
 }
 .top_new{
   display: flex;
   justify-content: space-between;
 
   background: #fff;
-  width: 98%;
+  width: 100%;
   margin: 10px auto;
   border-radius: 8px;
   box-sizing: border-box;
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
index 085fcee77..0a64f5308 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
@@ -3,99 +3,106 @@
 <template>
   <div>
     <div class="top_new">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
-        <el-form-item label="" prop="staffId">
-          <el-select
-            v-model="queryParams.staffId"
-            clearable
-            placeholder="请选择操作人">
-            <el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
-              <span style="float: left">{{ item.realName }}</span>
-              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.mobile }}</span>
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="">
-          <el-input v-model="queryParams.orderNo" clearable placeholder="请输入订单号"></el-input>
-        </el-form-item>
-        <el-form-item label="" prop="terminal">
-          <el-select
-            v-model="queryParams.terminal"
-            clearable
-            placeholder="请选择订单类型"
-          >
-            <el-option v-for="item in terminalList"
-                       :key="item.id"
-                       :label="item.dictLabel"
-                       :value="item.dictValue">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="" prop="oilGunNum">
-          <el-select
-            v-model="queryParams.oilGunNum"
-            filterable
-            clearable
-            placeholder="请选择油品油号"
-          >
-            <el-option v-for="item in oilGunList"
-                       :key="item.id"
-                       :label="item.gunName"
-                       :value="item.id">
-              <span style="float: left">{{ item.oilName }}</span>
-              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.gunName }}</span>
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="" prop="oilGunNum">
-          <el-select
-            v-model="queryParams.oilGunNum"
-            filterable
-            clearable
-            placeholder="请选择油枪"
-          >
-            <el-option v-for="item in oilGunList"
-                       :key="item.id"
-                       :label="item.gunName"
-                       :value="item.id">
-              <span style="float: left">{{ item.oilName }}</span>
-              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.gunName }}</span>
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="" prop="payType">
-          <el-select
-            v-model="queryParams.payType"
-            clearable
-            placeholder="请选择支付方式"
-          >
-            <el-option v-for="item in payList"
-                       :key="item.id"
-                       :label="item.dictLabel"
-                       :value="item.dictValue">
-            </el-option>
-            <el-option label="电子囤油卡" value="oilCard"/>
-            <el-option label="电子电子储值卡" value="balance"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="">
-          <el-input v-model="queryParams.payUser" clearable placeholder="请输入付款用户"></el-input>
-        </el-form-item>
-        <el-form-item label="">
-          <el-date-picker
-            v-model="beginTime"
-            style="width: 140px"
-            type="date"
-            placeholder="开始日期">
-          </el-date-picker>
-          至
-          <el-date-picker
-            v-model="endTime"
-            style="width: 140px"
-            type="date"
-            placeholder="结束日期">
-          </el-date-picker>
-        </el-form-item>
+      <el-form :model="queryParams" width="100%" ref="queryForm" size="small" :inline="true" label-width="68px">
+        <div style=" width: 1645px; display: flex; justify-content: space-between">
+          <el-form-item label="" prop="staffId">
+            <el-select
+              v-model="queryParams.staffId"
+              clearable
+              placeholder="请选择操作人">
+              <el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
+                <span style="float: left">{{ item.realName }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.mobile }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="">
+            <el-input v-model="queryParams.orderNo" clearable placeholder="请输入订单号"></el-input>
+          </el-form-item>
+          <el-form-item label="" prop="terminal">
+            <el-select
+              v-model="queryParams.terminal"
+              clearable
+              placeholder="请选择订单类型"
+            >
+              <el-option v-for="item in terminalList"
+                         :key="item.id"
+                         :label="item.dictLabel"
+                         :value="item.dictValue">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="oilGunNum">
+            <el-select
+              v-model="queryParams.oilGunNum"
+              filterable
+              clearable
+              placeholder="请选择油品油号"
+            >
+              <el-option v-for="item in oilGunList"
+                         :key="item.id"
+                         :label="item.gunName"
+                         :value="item.id">
+                <span style="float: left">{{ item.oilName }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.gunName }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="oilGunNum">
+            <el-select
+              v-model="queryParams.oilGunNum"
+              filterable
+              clearable
+              placeholder="请选择油枪"
+            >
+              <el-option v-for="item in oilGunList"
+                         :key="item.id"
+                         :label="item.gunName"
+                         :value="item.id">
+                <span style="float: left">{{ item.oilName }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.gunName }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="payType">
+            <el-select
+              v-model="queryParams.payType"
+              clearable
+              placeholder="请选择支付方式"
+            >
+              <el-option v-for="item in payList"
+                         :key="item.id"
+                         :label="item.dictLabel"
+                         :value="item.dictValue">
+              </el-option>
+              <el-option label="电子囤油卡" value="oilCard"/>
+              <el-option label="电子电子储值卡" value="balance"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="">
+            <el-input v-model="queryParams.payUser" clearable placeholder="请输入付款用户"></el-input>
+          </el-form-item>
+        </div>
+
+          <el-form-item label="" >
+            <el-date-picker
+              v-model="beginTime"
+              style="width: 215px"
+              type="date"
+              placeholder="开始日期">
+            </el-date-picker>
+            <span >
+              至
+            </span>
+            <el-date-picker
+              v-model="endTime"
+              style="width: 215px"
+              type="date"
+              placeholder="结束日期">
+            </el-date-picker>
+          </el-form-item>
+
+
         <el-form-item style="float: right;">
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@@ -109,8 +116,7 @@
         <div class="box-gang">
           <div class="box2">
             <div style="font-size: 26px;color: #0DC291;font-weight: bold;margin-top: 5px">
-              {{ orderStatistics.theTotalAmountOfOil || 0 }}/
-              {{ orderStatistics.numberOfOilPens || 0 }}
+              {{ orderStatistics.theTotalAmountOfOil || 0 }}/{{ orderStatistics.numberOfOilPens || 0 }}
             </div>
             <div class="size-hui">
               <div style="width: 8px;height: 8px;border-radius: 4px;background: #0DC291"></div>
@@ -137,8 +143,7 @@
           </div>
           <div class="box2">
             <div style="font-size: 26px;color: #FA6400;font-weight: bold;margin-top: 5px">
-              {{ orderStatistics.wechat || 0 }}/
-              {{ orderStatistics.alipay || 0 }}
+              {{ orderStatistics.wechat || 0 }}/{{ orderStatistics.alipay || 0 }}
             </div>
             <div class="size-hui">
               <div style="width: 8px;height: 8px;border-radius: 4px;background: #FA6400"></div>
@@ -147,8 +152,7 @@
           </div>
           <div class="box2">
             <div style="font-size: 26px;color: #2B63F4;font-weight: bold;margin-top: 5px">
-              {{ orderStatistics.wechat || 0 }}/
-              {{ orderStatistics.alipay || 0 }}
+              {{ orderStatistics.wechat || 0 }}/{{ orderStatistics.alipay || 0 }}
             </div>
             <div class="size-hui">
               <div style="width: 8px;height: 8px;border-radius: 4px;background: #2B63F4"></div>
@@ -157,8 +161,7 @@
           </div>
           <div class="box2">
             <div style="font-size: 26px;color: #FE59E5;font-weight: bold;margin-top: 5px">
-              {{ orderStatistics.wechat || 0 }}/
-              {{ orderStatistics.alipay || 0 }}
+              {{ orderStatistics.wechat || 0 }}/{{ orderStatistics.alipay || 0 }}
             </div>
             <div class="size-hui">
               <div style="width: 8px;height: 8px;border-radius: 4px;background: #FE59E5"></div>
@@ -913,6 +916,7 @@ export default {
   width: 100%;
   display: flex;
   align-items: center;
+  justify-content: space-between;
   flex-wrap: wrap; /* 允许内容换行 */
 
 }
@@ -933,7 +937,7 @@ export default {
 }
 
 .el-form--inline .el-form-item {
-  margin-right: 44px;
+
 }
 
 .size-hui {
@@ -1021,7 +1025,6 @@ export default {
 
 .box2 {
   padding: 5px;
-  margin-right: 20px;
   margin-bottom: 20px;
   padding-left: 20px;
   width: 211px;
@@ -1044,13 +1047,12 @@ export default {
   height: 120px;
   background: #fff;
   width: 98%;
-  margin: 10px auto;
+  margin: 5px auto;
   border-radius: 8px;
   box-sizing: border-box;
   padding: 15px;
-  margin-bottom: 10px;
 }
 .new_bottom{
-  min-height: 80vh;
+  min-height: 65vh;
 }
 </style>
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue
index 32905c251..250cb9900 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue
@@ -60,19 +60,21 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item >
-          <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="exportExcelVip()">导出</el-button>
+
         </el-form-item>
       </el-form>
+      <div style="height: 32px;width: 16%">
+        <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="exportExcelVip()">导出</el-button>
+      </div>
     </div>
     <div class="cot-box">
       <div>
         <div class="box-gang">
           <div class="box2">
             <div style="font-size: 26px;color: #0DC291;font-weight: bold;margin-top: 5px">
-              {{ orderStatistics.totalAmountReceived || 0 }}/
-              {{ orderStatistics.numberOfTopUps || 0 }}
+              {{ orderStatistics.totalAmountReceived || 0 }}/{{ orderStatistics.numberOfTopUps || 0 }}
             </div>
             <div class="size-hui">
               <div style="width: 8px;height: 8px;border-radius: 4px;background: #0DC291"></div>
@@ -99,8 +101,7 @@
           </div>
           <div class="box2">
             <div style="font-size: 26px;color: #FA6400;font-weight: bold;margin-top: 5px">
-              {{ orderStatistics.wechat || 0 }}/
-              {{ orderStatistics.alipay || 0 }}
+              {{ orderStatistics.wechat || 0 }}/{{ orderStatistics.alipay || 0 }}
             </div>
             <div class="size-hui">
               <div style="width: 8px;height: 8px;border-radius: 4px;background: #FA6400"></div>
@@ -109,8 +110,7 @@
           </div>
           <div class="box2">
             <div style="font-size: 26px;color: #2B63F4;font-weight: bold;margin-top: 5px">
-              {{ orderStatistics.wechat || 0 }}/
-              {{ orderStatistics.alipay || 0 }}
+              {{ orderStatistics.wechat || 0 }}/{{ orderStatistics.alipay || 0 }}
             </div>
             <div class="size-hui">
               <div style="width: 8px;height: 8px;border-radius: 4px;background: #2B63F4"></div>
@@ -669,9 +669,7 @@ export default {
   color: grey;
   margin: 10px 0;
 }
-.el-form--inline .el-form-item {
-  margin-right: 4px !important;
-}
+
 
 .box1 {
   padding: 5px;