diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
index 10b25884c..e1f642909 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
@@ -13,11 +13,12 @@
                   <span style="margin: 0px 5px">{{ chooseVipUser.gradeName }}</span>
                   <el-popover
                     placement="bottom"
-                    trigger="hover">
+                    trigger="hover"
+                  >
                     <div> 储值卡：￥{{ chooseVipUser.cardBalance || 0 }}</div>
                     <div v-if="chooseVipUser.userFuels">
                       <div v-for="(item,index) in chooseVipUser.userFuels" :key="index">
-                        囤油卡：{{item.oilNumberName}} {{item.fuelAmount}}升
+                        囤油卡：{{ item.oilNumberName }} {{ item.fuelAmount }}升
                       </div>
                     </div>
                     <div v-if="chooseVipUser.fleetMember">
@@ -48,7 +49,7 @@
               placeholder="请输入会员手机号"
             >
               <template slot-scope="{ item }">
-                <div class="name" @click="chooseUser(item)">{{ item.name + "        " + item.mobile }}</div>
+                <div class="name" @click="chooseUser(item)">{{ item.name + '        ' + item.mobile }}</div>
               </template>
             </el-autocomplete>
             <i class="el-icon-search" style="font-size: 18px;margin-right: 10px"></i>
@@ -73,7 +74,7 @@
           <div style="color: #F4F5F9">|</div>
           <div class="three_box">合计:￥{{ orderAmount }}</div>
         </div>
-        <div class="d-top"  v-loading="loadingPreferential">
+        <div class="d-top" v-loading="loadingPreferential">
           <div class="d-b">
 
             <el-checkbox v-model="showAct">活动优惠 <i class="el-icon-arrow-down"></i></el-checkbox>
@@ -131,15 +132,15 @@
       <div class="box-bottom">
         <div>
           <div class="price_">￥{{ realAmount }}</div>
-<!--          <div class="price_prefer" style="font-size: 14px">油品优惠:￥-{{ parseFloat(disOil).toFixed(2)}}</div>-->
-<!--          <div class="price_prefer" style="font-size: 14px">商品优惠:￥-{{ parseFloat(disGoods).toFixed(2) }}</div>-->
-          <div class="price_prefer">优惠合计:￥-{{  parseFloat(disTotal).toFixed(2) }}</div>
+          <!--          <div class="price_prefer" style="font-size: 14px">油品优惠:￥-{{ parseFloat(disOil).toFixed(2)}}</div>-->
+          <!--          <div class="price_prefer" style="font-size: 14px">商品优惠:￥-{{ parseFloat(disGoods).toFixed(2) }}</div>-->
+          <div class="price_prefer">优惠合计:￥-{{ parseFloat(disTotal).toFixed(2) }}</div>
         </div>
-        <div class="anniu" @click="settlement()" :class="{ disabled: !isClickable }">立即结算</div>
+        <div class="anniu" @click="settlement()" :class="{ disabled: !isClickable}">立即结算</div>
       </div>
     </div>
 
-<!--    油品-->
+    <!--    油品-->
     <div class="cont-box">
       <div class="box-top">
         <div class="cont-tab">
@@ -150,7 +151,7 @@
         </div>
         <div class="tab-kuang" style="flex-wrap: wrap;">
           <div class="zo_box" v-for="(item,index) in dataList">
-            <div :class=item.classStyle  @click="setRefuelingAmount(item)">
+            <div :class=item.classStyle @click="setRefuelingAmount(item)">
               <div>{{ item.oilType }}&nbsp;{{ item.oilName }}</div>
               <div class="card-title">{{ item.gunName }}</div>
               <div class="c-b-d">
@@ -181,7 +182,7 @@
       </div>
     </div>
 
-<!--    非油商品-->
+    <!--    非油商品-->
     <div class="right-box">
       <div class="box-top">
         <div class="r-top">非油商品</div>
@@ -218,10 +219,11 @@
           </div>
           <div class="stock_name">{{ item.stock }}</div>
           <div class="u-price_name">{{ item.retailPrice }}</div>
-          <div class="u-price_name">{{ item.memberPrice}}</div>
+          <div class="u-price_name">{{ item.memberPrice }}</div>
           <div class="num_name">
             <el-input-number v-model="goodsList[index].num" @change="handleCilone(goodsList[index])" :max=item.stock
-                             size="mini" :min="1">
+                             size="mini" :min="1"
+            >
             </el-input-number>
           </div>
           <div class="orerate_name">
@@ -249,9 +251,9 @@
     </div>
     <!--    弹窗-->
     <el-dialog :close-on-click-modal="false"
-      title="送券"
-      :visible.sync="freeTicket"
-      width="800px"
+               title="送券"
+               :visible.sync="freeTicket"
+               width="800px"
     >
       <div class="ds-tc" style="margin-top: -20px">
         <div class="left_tc">
@@ -261,7 +263,8 @@
           </div>
           <div class="wrap-tc">
             <div class="tc_wa" :class="{'tc-active' : item.id == sendCoupon.id }" @click="setFreeIndex(item)"
-                 v-for="(item,index) in sendCouponList">
+                 v-for="(item,index) in sendCouponList"
+            >
               {{ item.name }}
             </div>
           </div>
@@ -292,10 +295,10 @@
 
     </el-dialog>
     <el-dialog :close-on-click-modal="false"
-      title="新增会员"
-      :visible.sync="newMember"
-      width="439px"
-      center
+               title="新增会员"
+               :visible.sync="newMember"
+               width="439px"
+               center
     >
       <div class="tc-box">
         <div>请顾客扫码领取会员卡</div>
@@ -308,10 +311,10 @@
       </span>
     </el-dialog>
     <el-dialog :close-on-click-modal="false"
-      title="扫码支付"
-      :visible.sync="ScanCodePayment"
-      width="439px"
-      center
+               title="扫码支付"
+               :visible.sync="ScanCodePayment"
+               width="439px"
+               center
     >
       <div class="tc-box">
         <div class="title_">收款： <span style="color: #F44522">¥0.00</span></div>
@@ -348,10 +351,10 @@
       </span>
     </el-dialog>
     <el-dialog :close-on-click-modal="false"
-      title="支付结果"
-      :visible.sync="paymentResults"
-      width="439px"
-      center
+               title="支付结果"
+               :visible.sync="paymentResults"
+               width="439px"
+               center
     >
       <div class="tc-box">
 
@@ -375,10 +378,10 @@
       </span>
     </el-dialog>
     <el-dialog :close-on-click-modal="false"
-      title="取单"
-      :visible.sync="pickUpTheOrder"
-      width="910px"
-      center
+               title="取单"
+               :visible.sync="pickUpTheOrder"
+               width="910px"
+               center
     >
       <!--    商品挂单 子组件 -->
       <pickUp :pendingOrdersList="pendingOrdersList" @fatherPendingOrdersList="fatherPendingOrdersList"
@@ -392,22 +395,23 @@
       </span>
     </el-dialog>
     <el-dialog :close-on-click-modal="false"
-      title="挂账"
-      :visible.sync="accountPending"
-      width="542px"
-      center
+               title="挂账"
+               :visible.sync="accountPending"
+               width="542px"
+               center
     >
-      <accountPending v-if="oilGunClearing.amount>0" :amount="oilGunClearing.amount" @changeAmount="changeAmount"></accountPending>
+      <accountPending v-if="oilGunClearing.amount>0" :amount="oilGunClearing.amount" @changeAmount="changeAmount"
+      ></accountPending>
       <span slot="footer" class="dialog-footer">
     <el-button @click="accountPending = false">取 消</el-button>
     <el-button type="primary" @click="addHangbill">确 定</el-button>
       </span>
     </el-dialog>
     <el-dialog :close-on-click-modal="false"
-      title="会员充值"
-      :visible.sync="memberRecharge"
-      width="910px"
-      center
+               title="会员充值"
+               :visible.sync="memberRecharge"
+               width="910px"
+               center
     >
       <memberRecharge :userId="chooseVipUser.id" ref="rechargeRef"></memberRecharge>
       <span slot="footer" class="dialog-footer">
@@ -416,10 +420,10 @@
       </span>
     </el-dialog>
     <el-dialog :close-on-click-modal="false"
-      title="加油金额"
-      :visible.sync="refuelingAmount"
-      width="542px"
-      center
+               title="加油金额"
+               :visible.sync="refuelingAmount"
+               width="542px"
+               center
     >
       <div class="tc-box">
         <refuelingAmount :goodsItem="oilGun" ref="refuelingAmount" @fatherMethod="fatherMethod"></refuelingAmount>
@@ -433,30 +437,43 @@
     <!--    确认充值-->
     <el-dialog :close-on-click-modal="false" title="确认支付订单" :visible.sync="openConfirm" width="500px"
                append-to-body
-               @close="onDialogClose">
+               @close="onDialogClose"
+    >
       <div v-if="isPay"
-           v-loading="loading">
-
-        <div style="text-align: center;font-size: 15px;font-weight: bold">付款金额</div>
-        <div style="text-align: center;font-size: 30px;font-weight: bold;color: red;margin: 10px 0">
-          ￥{{ payForm.realyPayBills }}
+           v-loading="loading"
+      >
+        <div v-if="payType != 'fule_card'">
+          <div style="text-align: center;font-size: 15px;font-weight: bold">付款金额</div>
+          <div style="text-align: center;font-size: 30px;font-weight: bold;color: red;margin: 10px 0">
+            ￥{{ payForm.realyPayBills }}
+          </div>
         </div>
-        <!-- <div style="text-align: center;margin-bottom: 10px">赠送金额</div> -->
 
-        <div v-if="payForm.paymentType !== 'CASH' ">
+        <div v-else>
+          <div style="text-align: center;font-size: 15px;font-weight: bold">加油升数</div>
+          <div style="text-align: center;font-size: 30px;font-weight: bold;color: red;margin: 10px 0">
+             {{ oilLiter }}  L
+          </div>
+        </div>
+
+        <div
+          v-if="payForm.paymentType === 'ALIPAY'  || payForm.paymentType === 'WECHAT' || payForm.paymentType === 'UNIONPAY' || payForm.paymentType === 'APPLET_CODE'"
+        >
           <div>
             <el-input v-model="payForm.authCode"
                       ref="getFocus"
                       autofocus
                       @keydown.enter.native="collection1"
-                      placeholder="扫描或输入付款码、支持微信、支付宝、云闪付">
-              <i
-                slot="suffix">
+                      placeholder="扫描或输入付款码、支持微信、支付宝、云闪付"
+            >
+              <i slot="suffix">
                 <svg t="1697791915471" class="icon" viewBox="0 0 1024 1024" version="1.1"
-                     xmlns="http://www.w3.org/2000/svg" p-id="1479" width="32" height="32">
+                     xmlns="http://www.w3.org/2000/svg" p-id="1479" width="32" height="32"
+                >
                   <path
                     d="M149.333333 170.858667A21.546667 21.546667 0 0 1 170.858667 149.333333H384V106.666667H170.858667A64.213333 64.213333 0 0 0 106.666667 170.858667V384h42.666666V170.858667zM170.858667 874.666667A21.546667 21.546667 0 0 1 149.333333 853.141333V640H106.666667v213.141333A64.213333 64.213333 0 0 0 170.858667 917.333333H384v-42.666666H170.858667zM853.12 149.333333A21.546667 21.546667 0 0 1 874.666667 170.858667V384h42.666666V170.858667A64.213333 64.213333 0 0 0 853.141333 106.666667H640v42.666666h213.141333zM874.666667 853.141333A21.546667 21.546667 0 0 1 853.141333 874.666667H640v42.666666h213.141333A64.213333 64.213333 0 0 0 917.333333 853.141333V640h-42.666666v213.141333zM106.666667 490.666667h810.666666v42.666666H106.666667v-42.666666z"
-                    fill="#3D3D3D" p-id="1480"></path>
+                    fill="#3D3D3D" p-id="1480"
+                  ></path>
                 </svg>
               </i>
             </el-input>
@@ -466,10 +483,22 @@
               <el-image
                 style="width: 200px; height: 200px"
                 fit="cover"
-                src="https://oil.wudb.cn/static/img/scan-demo.fcb8b1ab.png"></el-image>
+                src="https://oil.wudb.cn/static/img/scan-demo.fcb8b1ab.png"
+              ></el-image>
             </div>
           </div>
         </div>
+        <div
+          v-else-if="payForm.paymentType==='card_value' || payForm.paymentType==='fule_card' || payForm.paymentType==='car_card_value'"
+        >
+
+          <div style="text-align: right;margin: 10px 0">
+            <span v-if="payType != 'fule_card'">卡余额</span>
+            <span v-else>卡油量</span>
+            <span v-if="payType != 'fule_card'" style="color: red;font-size: 18px"> ￥{{ cardBalance }}</span>
+            <span v-else style="color: red;font-size: 18px"> {{ cardBalance }}  L</span>
+          </div>
+        </div>
         <div v-else>
           <div>
             <el-input v-model.number="payForm.authCode"
@@ -478,7 +507,8 @@
                       ref="getFocus"
                       autofocus maxlength="10"
                       @keydown.enter.native="collection1"
-                      placeholder="请输入收款金额">
+                      placeholder="请输入收款金额"
+            >
             </el-input>
           </div>
           <div style="text-align: right;margin: 10px 0">
@@ -519,11 +549,14 @@
 
     </el-dialog>
 
-<!--    车队卡支付-->
+    <!--  储值卡  囤油卡  车队卡    -->
+
+    <!--    车队卡支付-->
     <el-dialog :close-on-click-modal="false"
-      title="车队卡支付"
-      :visible.sync="dialogVisible"
-      width="30%">
+               title="车队卡支付"
+               :visible.sync="dialogVisible"
+               width="30%"
+    >
       <carCard :fleetList="chooseVipUser.fleetInfoUniVos"></carCard>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
@@ -536,12 +569,12 @@
 
 <script>
 import QRCode from 'qrcode'
-import html2canvas from "html2canvas";
+import html2canvas from 'html2canvas'
 import pickUp from './newHomeComponents/pickUpTheOrder.vue'
 import accountPending from './newHomeComponents/accountPending.vue'
 import memberRecharge from './newHomeComponents/memberRecharge.vue'
 import refuelingAmount from './newHomeComponents/refuelingAmount.vue'
-import carCard from "./newHomeComponents/carCard.vue";
+import carCard from './newHomeComponents/carCard.vue'
 import {
   cashRegisterList,
   cashRegisterGoodsList,
@@ -550,28 +583,30 @@ import {
   getCanUseCoupon,
   sendCouponFun
 } from '@/api/newHome/newHome.js'
-import {QRCodeByStoreId} from "@/api/staff/qrcode";
-import {userListByPhone} from "@/api/cashier/user";
+import { QRCodeByStoreId } from '@/api/staff/qrcode'
+import { userListByPhone } from '@/api/cashier/user'
 
-import {VueClipboard} from 'vue-clipboard2';
-import {getDicts} from "@/api/dict/data";
+import { VueClipboard } from 'vue-clipboard2'
+import { getDicts } from '@/api/dict/data'
 import {
   getCheckTheStatusOfYourPaymentApi,
   rechargeCard
-} from "@/api/cashier/cardSet";
-import {getReturnCode, printOilOrderReport,printCardValueReport,printFuelDieselReport} from '../../../api/print'
-import {addLJGoods, scanAppletQrCode} from "@/api/cashier/oilorder";
-import {cashierOrderByOrderNo} from '@/api/cashier/cashierorder'
-import {addHangBill} from "../../../api/cashier/hangbill";
+} from '@/api/cashier/cardSet'
+import { getReturnCode, printOilOrderReport, printCardValueReport, printFuelDieselReport } from '../../../api/print'
+import { addLJGoods, scanAppletQrCode } from '@/api/cashier/oilorder'
+import { cashierOrderByOrderNo } from '@/api/cashier/cashierorder'
+import { addHangBill } from '../../../api/cashier/hangbill'
 
 export default {
   dicts: ['CardCoupon_type'],
   data() {
     return {
+      //用卡支付时候 卡的余额 根据监听器变动
+      cardBalance: 0,
       disOil: 0.00,
       disGoods: 0.00,
       loadingPreferential: false,
-      dialogVisible:false,
+      dialogVisible: false,
       isClickable: false, // 默认不可点击
       payForm: {
         realyPayBills: 0.00,
@@ -586,15 +621,15 @@ export default {
       //可用优惠券
       couponList: [],
       //选中的活动  actId_ruleId
-      chooseActId: "",
+      chooseActId: '',
       //选中的优惠券id
-      chooseCouponId: "",
+      chooseCouponId: '',
       //选中的活动对象
       chooseAct: {},
       //选中的优惠券对象
       chooseCoupon: {},
       //支付方式--默认支付宝
-      payType: "ALIPAY",
+      payType: 'ALIPAY',
       //订单总金额
       orderAmount: 0.00,
       //加油升数
@@ -661,7 +696,7 @@ export default {
       },
       rules: {
         name: [
-          {required: true, message: '请输入挂单名称', trigger: 'blur'}
+          { required: true, message: '请输入挂单名称', trigger: 'blur' }
         ]
       },
       refuelingAmount: false,
@@ -703,56 +738,56 @@ export default {
   },
   watch: {
     //监听 会员登录  刷新一下商品会员价 计算
-    chooseVipUser:{
+    chooseVipUser: {
       deep: true,
       handler(newVal) {
-         this.goodsList = this.goodsList.map(
-           item => {
-             return item;
-           }
-         )
+        this.goodsList = this.goodsList.map(
+          item => {
+            return item
+          }
+        )
       }
     },
     //监听商品列表 变化计算商品优惠
     goodsList: {
       handler(newVal) {
-      //如果会员不为空
-        if (this.chooseVipUser.hasOwnProperty("id")) {
-          this.disGoods = 0.00;
+        //如果会员不为空
+        if (this.chooseVipUser.hasOwnProperty('id')) {
+          this.disGoods = 0.00
           // 计算商品会员价
-          console.log("走了啊", this.goodsList);
+          console.log('走了啊', this.goodsList)
           this.goodsList.forEach(item => {
-            const memberPrice = Number(item.retailPrice - item.memberPrice);
-            const num = Number(item.num);
-            const product = (memberPrice * num).toFixed(2); // 固定为两位小数
-            this.disGoods = (parseFloat(this.disGoods) + parseFloat(product)).toFixed(2);
-          });
+            const memberPrice = Number(item.retailPrice - item.memberPrice)
+            const num = Number(item.num)
+            const product = (memberPrice * num).toFixed(2) // 固定为两位小数
+            this.disGoods = (parseFloat(this.disGoods) + parseFloat(product)).toFixed(2)
+          })
 
           // 优惠总金额赋值
-          this.disTotal = 0.00;
-          this.disTotal = (parseFloat(this.disGoods) + parseFloat(this.disOil)).toFixed(2);
+          this.disTotal = 0.00
+          this.disTotal = (parseFloat(this.disGoods) + parseFloat(this.disOil)).toFixed(2)
 
-        }else {
-          this.disGoods = 0.00;
+        } else {
+          this.disGoods = 0.00
           // 计算商品会员价
-          console.log("走了啊", this.goodsList);
+          console.log('走了啊', this.goodsList)
           this.goodsList.forEach(item => {
-            const memberPrice = Number(item.retailPrice - item.memberPrice);
-            const num = Number(item.num);
-            const product = (memberPrice * num).toFixed(2); // 固定为两位小数
-            this.disGoods = (parseFloat(this.disGoods) + parseFloat(product)).toFixed(2);
-          });
+            const memberPrice = Number(item.retailPrice - item.memberPrice)
+            const num = Number(item.num)
+            const product = (memberPrice * num).toFixed(2) // 固定为两位小数
+            this.disGoods = (parseFloat(this.disGoods) + parseFloat(product)).toFixed(2)
+          })
 
           // 优惠总金额赋值
-          this.disTotal = 0.00;
+          this.disTotal = 0.00
         }
       },
-      deep: true,
+      deep: true
     },
     //监听结算金额 是否获取
     realAmount: {
       handler(newVal) {
-        console.log("结算金额", newVal);
+        console.log('结算金额', newVal)
         //  判断是否有结算金额
         if (this.realAmount > 0) {
           this.isClickable = true
@@ -760,55 +795,55 @@ export default {
           this.isClickable = false
         }
 
-      },
+      }
     },
     //监听选择的活动
     chooseActId: {
       handler(newVal) {
-        console.log("选择的活动发生变化", newVal);
+        console.log('选择的活动发生变化', newVal)
         //计算优惠金额
         this.getDisTotal()
       },
       deep: true,
-      immediate: true,
+      immediate: true
     },
     //监听选择的优惠券
     chooseCouponId: {
       handler(newVal) {
-        console.log("选择的优惠券发生变化", newVal);
+        console.log('选择的优惠券发生变化', newVal)
         //计算优惠金额
         this.getDisTotal()
       },
       deep: true,
-      immediate: true,
+      immediate: true
     },
     //监听订单总金额
     orderAmount: {
       handler(newVal) {
-        console.log("订单总金额发生变化", newVal);
+        console.log('订单总金额发生变化', newVal)
         //计算实付金额
         this.realAmount = (this.orderAmount - this.disTotal).toFixed(2)
       },
       deep: true,
-      immediate: true,
+      immediate: true
     },
     //监听优惠总金额
     disTotal: {
       handler(newVal) {
-        console.log("优惠总金额发生变化", newVal);
+        console.log('优惠总金额发生变化', newVal)
         //计算实付金额
         this.realAmount = (this.orderAmount - this.disTotal).toFixed(2)
       },
       deep: true,
-      immediate: true,
+      immediate: true
     },
     //监听子弹窗成功 提交了  然后再隐藏子元素标签
     oilGunClearing: {
       immediate: true,
       deep: true,
       handler(newValue, oldValue) {
-        console.log('油枪发生变化', newValue);
-        if (newValue && newValue.hasOwnProperty("oilNameId")) {
+        console.log('油枪发生变化', newValue)
+        if (newValue && newValue.hasOwnProperty('oilNameId')) {
           this.orderAmount = (Number(newValue.amount) + Number(this.getGoodsNum)).toFixed(2)
           //  保留两位小数
           this.oilLiter = (this.oilGunClearing.amount / this.oilGunClearing.oilPrice).toFixed(2)
@@ -824,9 +859,9 @@ export default {
     },
     //监听商品总金额发生变化
     getGoodsNum(newVal, oldVal) {
-      console.log('商品总金额发生变化', newVal);
+      console.log('商品总金额发生变化', newVal)
       // 商品总金额发生变化，重查优惠券
-      if (this.oilGunClearing != '' && this.oilGunClearing.hasOwnProperty("oilNameId")) {
+      if (this.oilGunClearing != '' && this.oilGunClearing.hasOwnProperty('oilNameId')) {
         this.orderAmount = (Number(newVal) + Number(this.oilGunClearing.amount)).toFixed(2)
       } else {
         this.orderAmount = newVal
@@ -845,15 +880,15 @@ export default {
     //初始化 油枪  商品
     this.getOilList()
     this.getGoodsList()
-    this.getQRCodeInfoByStoreId(0);
+    this.getQRCodeInfoByStoreId(0)
     this.getPayList()
     this.getCouponType()
   },
 
   computed: {
     getChangeShould() {
-      let change = this.payForm.authCode - this.payForm.realyPayBills;
-      return change.toFixed(2);
+      let change = this.payForm.authCode - this.payForm.realyPayBills
+      return change.toFixed(2)
     },
     getGoodsItem() {
       if (this.oilGunClearing.amount && this.oilGunClearing.amount !== undefined) {
@@ -889,31 +924,31 @@ export default {
     //结算弹窗 监听关闭 清除表单
     onDialogClose() {
       this.payForm.authCode = null
+      this.cardBalance = 0
     },
 
     sendCouponClick() {
-      console.log("数量",this.sendCoupon.tfTotal - this.sendCoupon.tfGetNum)
-      if (this.sendCoupon.tfTotal - this.sendCoupon.tfGetNum <=0){
-        this.$message.error("优惠券已领完")
+      console.log('数量', this.sendCoupon.tfTotal - this.sendCoupon.tfGetNum)
+      if (this.sendCoupon.tfTotal - this.sendCoupon.tfGetNum <= 0) {
+        this.$message.error('优惠券已领完')
         return
       }
       //this.sendCoupon this.chooseVipUser.id
       this.sendCoupon.mtUserId = this.chooseVipUser.id
-      this.sendCoupon.fromType = "4"
+      this.sendCoupon.fromType = '4'
       this.sendCoupon.cardCouponId = this.sendCoupon.id
       //清除 一些  重复字段
       this.sendCoupon.status = null
       this.sendCoupon.createTime = null
-      this.sendCoupon.updateTime  = null
+      this.sendCoupon.updateTime = null
       this.sendCoupon.updateBy = null
       this.sendCoupon.createBy = null
       sendCouponFun(this.sendCoupon).then(
         res => {
-          if (res.code == 200){
-            this.$message.success("赠送成功")
+          if (res.code == 200) {
+            this.$message.success('赠送成功')
             this.freeTicket = false
-          }
-          else {
+          } else {
             this.$message.error(res.msg)
           }
 
@@ -922,12 +957,12 @@ export default {
     },
     handleCilone(obj) {
       // 强制组件重新渲染  elementui 组件都是通过监听数据来重新渲染  数据层级太深了 需要手动强刷
-      this.$forceUpdate();
+      this.$forceUpdate()
 
       this.goodsList = this.goodsList.map(
         item => {
           if (item.id == obj.id) {
-            return {...item, num: obj.num}
+            return { ...item, num: obj.num }
 
           } else {
             return item
@@ -943,48 +978,48 @@ export default {
     getDisTotal() {
       this.disTotal = 0.00
       this.disOil = 0.00
-      if ("" != this.chooseCouponId) {
-        this.disOil =  parseFloat(this.disOil)+ parseFloat(this.chooseCoupon.disAmount);
+      if ('' != this.chooseCouponId) {
+        this.disOil = parseFloat(this.disOil) + parseFloat(this.chooseCoupon.disAmount)
       }
-      if ("" != this.chooseActId) {
-        this.disOil =  parseFloat(this.disOil)+ parseFloat(this.chooseAct.disAmount);
+      if ('' != this.chooseActId) {
+        this.disOil = parseFloat(this.disOil) + parseFloat(this.chooseAct.disAmount)
       }
 
-      console.log("油品优惠金额", this.disOil);
-      console.log("商品优惠金额", this.disGoods);
+      console.log('油品优惠金额', this.disOil)
+      console.log('商品优惠金额', this.disGoods)
 
-      this.disTotal = parseFloat(this.disOil)+ parseFloat(this.disGoods);
+      this.disTotal = parseFloat(this.disOil) + parseFloat(this.disGoods)
     },
     /**
      * 监听活动选择切换
      * */
     handleChangeAct(value) {
       this.chooseAct = this.activityList.filter(item => item.id === value)[0]
-      console.log("选中的活动", this.chooseAct);
-      if ("" != this.chooseCouponId) {
+      console.log('选中的活动', this.chooseAct)
+      if ('' != this.chooseCouponId) {
         //判断已选择的优惠券是否可以与其他活动共用
-        if ("0" == this.chooseCoupon.useWithOther) {
+        if ('0' == this.chooseCoupon.useWithOther) {
           //优惠券不能与本活动共用
-          this.chooseCouponId = ""
+          this.chooseCouponId = ''
           this.chooseCoupon = {}
         }
       }
       this.getDisTotal()
-      console.log("选中的活动", this.chooseAct)
+      console.log('选中的活动', this.chooseAct)
     },
     /**
      * 监听优惠券选择切换
      * */
     handleChangeCoupon(value) {
       this.chooseCoupon = this.couponList.filter(item => item.id === value)[0]
-      console.log("选中的优惠券", this.chooseCoupon)
-      if ("0" == this.chooseCoupon.useWithOther) {
+      console.log('选中的优惠券', this.chooseCoupon)
+      if ('0' == this.chooseCoupon.useWithOther) {
         //本优惠券不能与其他活动一起用
         this.chooseAct = {}
-        this.chooseActId = ""
+        this.chooseActId = ''
       }
       this.getDisTotal()
-      console.log("选中的优惠券", this.chooseCoupon)
+      console.log('选中的优惠券', this.chooseCoupon)
     },
     // 关闭支付窗口
     handClose1() {
@@ -1027,8 +1062,8 @@ export default {
         return
       }
       let makeChange = 0
-      if (!this.payForm.authCode && this.payForm.paymentType !== "CASH") {
-        this.$message.error('请先扫码');
+      if (!this.payForm.authCode && this.payForm.paymentType !== 'CASH') {
+        this.$message.error('请先扫码')
         return
       }
       // 会员id  会员名字会员手机号码
@@ -1038,64 +1073,64 @@ export default {
       // 现金找零金额
       this.payForm.seekZero = makeChange
       this.payForm.payChannel = 'cashier'
-      let id;
+      let id
       await rechargeCard(this.payForm).then(response => {
         if (response.data != null) {
-          this.loading = true;
+          this.loading = true
           id = response.data.id
         }
-      });
+      })
       let this_ = this
-      console.log(this.payForm,1054)
+      console.log(this.payForm, 1054)
       //
-      let timer = setInterval(async () => {
-        let flag  = false
+      let timer = setInterval(async() => {
+        let flag = false
         await getCheckTheStatusOfYourPaymentApi(id).then(async response => {
           if (response.data != null) {
             const payStatus = response.data.payStatus
-            if (payStatus === "unpaid") {
-              this_.isQuery = true;
-            } else if (payStatus === "paid") {
+            if (payStatus === 'unpaid') {
+              this_.isQuery = true
+            } else if (payStatus === 'paid') {
               // 当支付成功时
-              this_.isPaySuccess = true;
-              this_.isQuery = false;
+              this_.isPaySuccess = true
+              this_.isQuery = false
               this_.rechargeBalCard = true
               // await this_.printLocally1()
               flag = true
               // await this_.cardValueReport()
               // await this_.getMemberAfter();
-              clearInterval(timer);
-            } else if (payStatus === "payFail") {
-              this_.isPaySuccess = false;
-              this_.isQuery = false;
-              clearInterval(timer);
+              clearInterval(timer)
+            } else if (payStatus === 'payFail') {
+              this_.isPaySuccess = false
+              this_.isQuery = false
+              clearInterval(timer)
             }
           }
           // await this_.getMemberAfter();
         })
         if (flag) await this_.cardValueReport()
-      }, 1000);
+      }, 1000)
 
-      let timer2 = setInterval(function () {
+      let timer2 = setInterval(function() {
         if (!this_.isQuery || !this_.openConfirm) {
-          this_.loading = false;
-          this_.isPay = false;
-          clearInterval(timer);
-          clearTimeout(timer3);
+          this_.loading = false
+          this_.isPay = false
+          clearInterval(timer)
+          clearTimeout(timer3)
 
         }
       }, 500)
 
-      var timer3 = setTimeout(function () {
-        clearInterval(timer2);
-        clearInterval(timer);
-        this_.loading = false;
-        this_.isPay = false;
-        this_.isPaySuccess = false;
-        this_.isAwait = true;
+      var timer3 = setTimeout(function() {
+        clearInterval(timer2)
+        clearInterval(timer)
+        this_.loading = false
+        this_.isPay = false
+        this_.isPaySuccess = false
+        this_.isAwait = true
       }, 15000)
 
-      this.$forceUpdate();
+      this.$forceUpdate()
 
     },
     cancelCollection() {
@@ -1103,22 +1138,22 @@ export default {
     },
     // 获取支付方式
     getPayList() {
-      getDicts("payment_type").then(response => {
-        this.payList = response.data;
+      getDicts('payment_type').then(response => {
+        this.payList = response.data
       })
     },
     // 确认充值
     async rechargeConfirm() {
       let selectCard = this.$refs.rechargeRef.selectCard
       if (!selectCard.paymentType) {
-        this.$message.error('请选择支付方式');
+        this.$message.error('请选择支付方式')
         return
       }
       if (!selectCard.rechargeBalance) {
-        this.$message.error('请选择输入充值本金');
+        this.$message.error('请选择输入充值本金')
         return
       }
-      console.log(selectCard,1122)
+      console.log(selectCard, 1122)
       this.payForm.rechargeBalance = selectCard.rechargeBalance
       this.payForm.lockupPrice = selectCard.lockupPrice
       this.payForm.realyPayBills = selectCard.rechargeBalance
@@ -1141,20 +1176,20 @@ export default {
       // // 发送扫码机请求（易联云网络下发）
       // await this.getSendPrintIndex(this.realyPayBills);
       this.memberRecharge = false
-      this.openConfirm = true;
+      this.openConfirm = true
       this.isPay = true
       //this.getCode(this.realyPayBills, this.flag)
     },
     // 打印商品支付后的订单
     oilOrderReport() {
-      console.log(this.goodsOrder,this.goodsList,1095)
+      console.log(this.goodsOrder, this.goodsList, 1095)
       //现在油品只有一个了
       let oilOrderR = []
-      if (this.oilGunClearing && this.oilGunClearing.amount>0){
+      if (this.oilGunClearing && this.oilGunClearing.amount > 0) {
         oilOrderR = [
           {
             oilName: this.oilGunClearing.oilType + this.oilGunClearing.oilName,
-            amount: this.oilGunClearing.amount + '',
+            amount: this.oilGunClearing.amount + ''
           }
         ]
       }
@@ -1181,15 +1216,15 @@ export default {
         'after_pay': '挂账',
         'fule_card': '囤油卡',
         'card_value': '储值卡',
-        'car_card_value': '车队卡',
-      };
-      let payTypeText = payTypeMap[this.payType] || '小程序码';
+        'car_card_value': '车队卡'
+      }
+      let payTypeText = payTypeMap[this.payType] || '小程序码'
 
       let f = {
         oilOrder: oilOrderR,
         goodsOrder: goodsOrderR,
         payType: payTypeText,
-        unitName: "", // 挂账单位
+        unitName: '', // 挂账单位
 
         // consumeAmount:this.consumeAmount,
         creditAmount: this.realAmount,//挂账金额
@@ -1202,7 +1237,7 @@ export default {
         // 实付款
         actualPay: this.realAmount,
         // 找零
-        seekZero: this.seekZero ? this.seekZero.toFixed(2) : 0,
+        seekZero: this.seekZero ? this.seekZero.toFixed(2) : 0
       }
       if (this.credit && this.credit.unitName) f.unitName = this.credit.unitName
       printOilOrderReport(f).then(res => {
@@ -1210,7 +1245,7 @@ export default {
       })
     },
     // 用户余额/礼品卡充值打印
-    cardValueReport(){
+    cardValueReport() {
       // 支付方式
       const payTypeMap = {
         'CASH': '现金',
@@ -1220,62 +1255,62 @@ export default {
         'after_pay': '挂账',
         'fule_card': '囤油卡',
         'card_value': '储值卡',
-        'car_card_value': '车队卡',
-      };
+        'car_card_value': '车队卡'
+      }
 
-      if (this.payForm.cardType==0 || this.payForm.cardType==2){
+      if (this.payForm.cardType == 0 || this.payForm.cardType == 2) {
         console.log(1226)
         let payTypeText = payTypeMap[this.payForm.paymentType]
-        let actualPay = this.payForm.paymentType == 'CASH' ? this.payForm.authCode:this.payForm.realyPayBills
+        let actualPay = this.payForm.paymentType == 'CASH' ? this.payForm.authCode : this.payForm.realyPayBills
 
         let a = {
           // 充值金额
-          realyPayBills:this.payForm.realyPayBills,
+          realyPayBills: this.payForm.realyPayBills,
           //赠送金额
-          giftBalance:this.payForm.giftBalance,
+          giftBalance: this.payForm.giftBalance,
           // 到账金额
-          getAmount:Number(this.payForm.giftBalance) + Number(this.payForm.realyPayBills),
-          payType:payTypeText,
+          getAmount: Number(this.payForm.giftBalance) + Number(this.payForm.realyPayBills),
+          payType: payTypeText,
 
           // 实付款
           actualPay: actualPay,
           // 找零
-          seekZero:this.payForm.seekZero.toFixed(2),
+          seekZero: this.payForm.seekZero.toFixed(2)
         }
         printCardValueReport(a).then(res => {
-          console.log(res,1245)
+          console.log(res, 1245)
         })
       }
 
-      if (this.payForm.cardType==1){
+      if (this.payForm.cardType == 1) {
         let payTypeText1 = payTypeMap[this.payForm.paymentType]
-        console.log(this.payForm,1256)
+        console.log(this.payForm, 1256)
         let b = {
           // 充值油品
-          oilType:this.payForm.oilName,
+          oilType: this.payForm.oilName,
           // 充值升数
-          incomeLitres:(this.payForm.rechargeBalance / this.payForm.lockupPrice).toFixed(2),
+          incomeLitres: (this.payForm.rechargeBalance / this.payForm.lockupPrice).toFixed(2),
           // 订单金额
-          realyPayBills:this.payForm.rechargeBalance,
+          realyPayBills: this.payForm.rechargeBalance,
           // 锁价金额
-          lockupPrice:this.payForm.lockupPrice,
+          lockupPrice: this.payForm.lockupPrice,
           // 支付方式
-          payType:payTypeText1,
+          payType: payTypeText1,
           // 实付款
 
           // 找零
-          seekZero:this.payForm.seekZero.toFixed(2),
+          seekZero: this.payForm.seekZero.toFixed(2)
         }
 
-        console.log(b,1271)
-        printFuelDieselReport(b).then(res=>{
-          console.log(res,1273)
+        console.log(b, 1271)
+        printFuelDieselReport(b).then(res => {
+          console.log(res, 1273)
         })
       }
     },
     //表单重置
     resetting1() {
-      console.log("表单重置")
+      console.log('表单重置')
       this.realAmount = 0.00
       //优惠合计金额
       this.disTotal = 0.00
@@ -1288,32 +1323,32 @@ export default {
 
       this.userInfo = false
       //支付方式 默认 支付宝
-      this.payType = "ALIPAY"
+      this.payType = 'ALIPAY'
 
-      this.loading = false;
+      this.loading = false
 
-      this.restVipUser();
+      this.restVipUser()
 
     },
     // 查询订单支付状态
     queryPayStatus() {
-      let _this = this;
-      let timer = setInterval(function () {
+      let _this = this
+      let timer = setInterval(function() {
         // "234520231228115544f073f4"
-        cashierOrderByOrderNo({orderNo: _this.orderNo}).then(response => {
+        cashierOrderByOrderNo({ orderNo: _this.orderNo }).then(response => {
           if (response.data) {
-            console.log(1318,response)
-            if (response.data.status == "paid") {
-              _this.isPay = false;
-              _this.isPaySuccess = true;
-              _this.isQuery = false;
+            console.log(1318, response)
+            if (response.data.status == 'paid') {
+              _this.isPay = false
+              _this.isPaySuccess = true
+              _this.isQuery = false
               _this.amount = 0
 
-              _this.loading = false;
+              _this.loading = false
               // _this.printLocally()
               _this.oilOrderReport()
 
-              _this.resetting1();
+              _this.resetting1()
 
               if (response.data.oilOrderAmount > 0) {
                 // for (let i =0;i<_this.oilPreferentialData.length;i++){
@@ -1326,18 +1361,18 @@ export default {
                 //   usePaymentActive(_this.oilPreferentialData[i].oilPreferential).then(res => {})
                 // }
               }
-              clearInterval(timer);
+              clearInterval(timer)
             }
-            if (response.data.status == "payFail") {
-              _this.isPaySuccess = false;
+            if (response.data.status == 'payFail') {
+              _this.isPaySuccess = false
               // _this.isPay = true;
-              _this.isQuery = false;
+              _this.isQuery = false
 
-              _this.loading = false;
-              clearInterval(timer);
+              _this.loading = false
+              clearInterval(timer)
             }
-            if (response.data.status == "unpaid") {
-              _this.isQuery = true;
+            if (response.data.status == 'unpaid') {
+              _this.isQuery = true
               _this.dialogVisiblejLoading = true
             }
           }
@@ -1351,160 +1386,215 @@ export default {
       //   },10000)
       // }
 
-      let timer2 = setInterval(function () {
+      let timer2 = setInterval(function() {
         if (!_this.isQuery || !_this.dialogVisiblej) {
-          _this.loading = false;
+          _this.loading = false
           // _this.isPay = true;
           // _this.countdown()
-          clearInterval(timer);
-          clearTimeout(timer3);
+          clearInterval(timer)
+          clearTimeout(timer3)
 
         }
       }, 1000)
 
-      var timer3 = setTimeout(function () {
-        clearInterval(timer2);
-        clearInterval(timer);
-        _this.loading = false;
-        _this.isPay = true;
-        this.isPaySuccess = false;
+      var timer3 = setTimeout(function() {
+        clearInterval(timer2)
+        clearInterval(timer)
+        _this.loading = false
+        _this.isPay = true
+        this.isPaySuccess = false
       }, 15000)
     },
     // 确定收款
     async collection() {
-      if (this.payForm.payType == "CASH") {
+      if (this.payForm.payType == 'CASH') {
         if (this.payForm.authCode < ((+this.oilActualPay) + (+this.goodsActualPay)) || this.seekZero < 0) {
-          this.$modal.msgError("请输入正确的金额");
-          return;
+          this.$modal.msgError('请输入正确的金额')
+          return
         }
         if (!this.payForm.authCode && ((+this.oilActualPay) + (+this.goodsActualPay)) > 0) {
-          this.$modal.msgError("请输入正确的金额");
-          return;
+          this.$modal.msgError('请输入正确的金额')
+          return
         }
       }
       if (!this.payForm.authCode && ((+this.oilActualPay) + (+this.goodsActualPay)) > 0) {
-        this.$modal.msgError("请先扫码");
-        return;
+        this.$modal.msgError('请先扫码')
+        return
       }
 
       //只有在现金时候才会有找零
-      if (this.payForm.payType == "CASH"){
+      if (this.payForm.payType == 'CASH') {
         //找零金额
         this.payForm.seekZero = this.getChangeShould
-      }
-      else {
+      } else {
         this.payForm.seekZero = 0
       }
 
-
-      this.loading = true;
-      let _this = this;
+      this.loading = true
+      let _this = this
       //小程序码付款
-      if (this.payForm.payType == "APPLET_CODE") {
+      if (this.payForm.payType == 'APPLET_CODE') {
         if (this.goodsList.length > 0) {
-          this.$modal.msgError("非油商品不可使用小程序码支付")
-          return;
+          this.$modal.msgError('非油商品不可使用小程序码支付')
+          return
         }
         await scanAppletQrCode(_this.payForm).then(resp => {
           if (resp.data.success == 'success') {
-            setTimeout(function () {
-              _this.loading = false;
-              _this.isPaySuccess = true;
-              _this.isPay = false;
+            setTimeout(function() {
+              _this.loading = false
+              _this.isPaySuccess = true
+              _this.isPay = false
               // _this.printLocally()
               _this.oilOrderReport()
-              _this.resetting1();
+              _this.resetting1()
             }, 3000)
           } else {
-            setTimeout(function () {
-              _this.loading = false;
-              _this.isPaySuccess = false;
-              _this.isPay = false;
-              _this.resetting1();
+            setTimeout(function() {
+              _this.loading = false
+              _this.isPaySuccess = false
+              _this.isPay = false
+              _this.resetting1()
               this.$modal.msgError(resp.data.error)
             }, 3000)
           }
         })
-        return;
+        return
       }
 
-      let isPaySuccess = false;
+      let isPaySuccess = false
       console.log(_this.payForm, 1089)
       // 调用 支付接口 并产生 订单 返回订单号
       await addLJGoods(_this.payForm).then(async response => {
-        _this.orderNo = response.data.orderNo;
+        _this.orderNo = response.data.orderNo
 
         //支付成功 后需要打印小票
-        console.log("支付成功", response)
+        console.log('支付成功', response)
 
         if (response.data.oilOrder != null) {
-          if (response.data.oilOrder.orderStatus == "paid") {
+          if (response.data.oilOrder.orderStatus == 'paid') {
 
-            _this.isPaySuccess = true;
+            _this.isPaySuccess = true
             isPaySuccess = true
-            _this.isPay = false;
-            _this.loading = false;
+            _this.isPay = false
+            _this.loading = false
             _this.oilOrderReport()
             _this.resetting1()
-            return;
+            return
           }
         }
         if (response.data.goodsOrder != null) {
-          if (response.data.goodsOrder.status == "paid") {
-            _this.isPaySuccess = true;
+          if (response.data.goodsOrder.status == 'paid') {
+            _this.isPaySuccess = true
             isPaySuccess = true
-            _this.isPay = false;
-            _this.loading = false;
+            _this.isPay = false
+            _this.loading = false
             _this.oilOrderReport()
             _this.resetting1()
-            return;
+            return
           }
         }
         if (response.data.error == 1) {
-          this.$modal.msgError("商品库存不足，请重新选择商品")
-          this.loading = false;
+          this.$modal.msgError('商品库存不足，请重新选择商品')
+          this.loading = false
           this.autofocus = false
-          this.dialogVisiblej = false;
-          return;
+          this.dialogVisiblej = false
+          return
         }
         if (response.data.error && response.data.error != 1) {
           this.$modal.msgError(response.data.error)
-          this.loading = false;
+          this.loading = false
           // this.dialogVisiblej = false;
-          return;
+          return
         }
       })
-      this.loading = true;
-      console.log(1480,isPaySuccess)
+      this.loading = true
+      console.log(1480, isPaySuccess)
       if (!isPaySuccess) {
-        await _this.queryPayStatus();
-        _this.resetting1();
+        await _this.queryPayStatus()
+        _this.resetting1()
       }
     },
     // 立即结算
     async settlement() {
+
+
+      this.cardBalance=0
+      // 囤油   这时候卡余额是 升
+      if (this.payType == 'fule_card') {
+        if (this.oilGunClearing.amount > 0) {
+          this.chooseVipUser.userFuels.find(
+            item => {
+              if (item.oilName == this.oilGunClearing.oilNameId) {
+                this.cardBalance = item.fuelAmount
+              }
+            }
+          )
+        }
+      }
+      // 车队
+      if (this.payType == 'car_card_value') {
+        if (this.oilGunClearing.amount > 0) {
+          this.cardBalance = this.chooseVipUser.fleetMember.remainingCreditLimit
+        }
+      }
+      // 储值
+      if (this.payType == 'card_value') {
+        if (this.oilGunClearing.amount > 0) {
+          this.cardBalance = this.chooseVipUser.cardBalance
+        }
+      }
+
+      // 储值卡  小程序码   囤油卡  车队卡    都不可带商品
+      if (this.payType == 'card_value' || this.payType == 'APPLET_CODE' || this.payType == 'fule_card' || this.payType == 'car_card_value') {
+        if (this.goodsList.length > 0) {
+          this.$modal.msgError('当前支付方式不可带商品')
+          return
+        }
+      }
+
+      //   储值卡    车队卡   余额都必须满足支付要求
+      if (this.payType == 'card_value'  || this.payType == 'car_card_value') {
+        console.log("付款金额",this.payForm.realyPayBills)
+        if (this.cardBalance <= 0 || this.cardBalance < this.oilGunClearing.amount) {
+          this.$modal.msgError('当前卡 余额 不足')
+          return
+        }
+      }
+      // 囤油卡 升数是否满足
+      if (this.payType == 'fule_card'){
+        if (this.cardBalance <= 0 || this.cardBalance < this.oilLiter) {
+          this.$modal.msgError('当前卡 升数 不足')
+          return
+        }
+      }
+
+      //如果是挂账 不可结算
+      if (this.payType == 'after_pay') {
+        this.$modal.msgError('挂账无需结算')
+        return
+      }
+
       // 油品单价
       //  油号id
       //  油枪id
       //  油罐id
       //  活动id
       //  活动类型
-      this.loading = false;
+      this.loading = false
       console.log(this.oilGunClearing)
-      if (this.oilGunClearing && this.oilGunClearing.amount>0) {
+      if (this.oilGunClearing && this.oilGunClearing.amount > 0) {
         this.payForm.oilOrder = JSON.stringify({
           oilPrice: this.oilGunClearing.oilPrice,
           oils: this.oilGunClearing.oilNameId,
           oilGunNum: this.oilGunClearing.id,
           tankId: this.oilGunClearing.tankId,
           activeId: this.chooseAct.hasOwnProperty('actId') ? this.chooseAct.activeId : null,
-          activeType: this.chooseAct.hasOwnProperty('type') ? this.chooseAct.activeType : null,
+          activeType: this.chooseAct.hasOwnProperty('type') ? this.chooseAct.activeType : null
         })
       } else {
         this.payForm.oilOrder = null
       }
 
-
       //商品 集合
       this.payForm.goodsOrder = JSON.stringify(this.goodsList)
       //支付方式
@@ -1514,7 +1604,7 @@ export default {
       //商品订单金额
       this.payForm.goodsAmount = this.getGoodsNum || 0
       //油品实付金额
-      this.payForm.oilActualPay = (this.oilGunClearing.amount || 0)-(this.disOil || 0)
+      this.payForm.oilActualPay = (this.oilGunClearing.amount || 0) - (this.disOil || 0)
       //商品实付金额
       this.payForm.goodsActualPay = (this.getGoodsNum || 0) - (this.disGoods || 0)
       //油枪id
@@ -1530,25 +1620,24 @@ export default {
       //付款用户
       this.payForm.payUser = this.chooseVipUser.mobile
       //油品优惠金额
-      this.payForm.oilDiscount = this.disOil;
+      this.payForm.oilDiscount = this.disOil
       //商品优惠金额
-      this.payForm.goodsDiscount = this.disGoods;
+      this.payForm.goodsDiscount = this.disGoods
 
       //会员消费金额 (储值卡需要减少的金额)
-      if (this.payForm.payType == "card_value"){
-        this.payForm.consumeAmount = this.realAmount;
-      }
-      else {
+      if (this.payForm.payType == 'card_value') {
+        this.payForm.consumeAmount = this.realAmount
+      } else {
         this.payForm.consumeAmount = 0
       }
 
       //会员id
       this.payForm.userId = this.chooseVipUser.id
       //终端  默认传PC
-      this.payForm.terminal = "PC"
+      this.payForm.terminal = 'PC'
       //商品 ids
       // 将集合内 所有id 拼接 , 隔开  this.goodsList
-      this.payForm.goodsIds = this.goodsList.map(item => item.id).join(",")
+      this.payForm.goodsIds = this.goodsList.map(item => item.id).join(',')
       //购买商品的总数量    计算属性
       this.payForm.goodsNum = this.getGoodsListNum
       //油品 + 商品 的实付总额
@@ -1556,18 +1645,17 @@ export default {
 
       this.payForm.paymentType = this.payType
 
-
       //支付弹窗 相关
       this.payForm.realyPayBills = this.realAmount
-      this.isPay = true;
-      this.openConfirm = true;
+      this.isPay = true
+      this.openConfirm = true
       this.flag = 3
 
     },
     // 网络下发之后获取条码
     getCode(amount, flag) {
-      console.log("payType", this.payForm.payType)        // 现金不参与
-      if (this.payForm.payType == "CASH" && flag == 1) {
+      console.log('payType', this.payForm.payType)        // 现金不参与
+      if (this.payForm.payType == 'CASH' && flag == 1) {
         return
       }
       // if (this.cardValueForm.paymentType == "CASH" && flag == 1)
@@ -1576,12 +1664,12 @@ export default {
         this.jishuqi = 0
         return
       }
-      this.continuePolling = true;
-      getReturnCode({payAmount: amount}).then(res => {
-        if (res.data === "300" && this.continuePolling) {
+      this.continuePolling = true
+      getReturnCode({ payAmount: amount }).then(res => {
+        if (res.data === '300' && this.continuePolling) {
           setTimeout(() => {
-            this.getCode(amount); // 重新发起请求
-          }, 1000); // 停顿一秒
+            this.getCode(amount) // 重新发起请求
+          }, 1000) // 停顿一秒
         } else {
           this.payForm.authCode = res.data
         }
@@ -1596,7 +1684,7 @@ export default {
     getActivity() {
       this.chooseActId = ''
       //组装请求参数
-      if (this.oilGunClearing != '' && this.oilGunClearing.hasOwnProperty("oilNameId") && this.chooseVipUser.hasOwnProperty("id")) {
+      if (this.oilGunClearing != '' && this.oilGunClearing.hasOwnProperty('oilNameId') && this.chooseVipUser.hasOwnProperty('id')) {
         //油枪已结算，且已选择会员
         let dataObj = {
           userId: this.chooseVipUser.id,
@@ -1608,7 +1696,7 @@ export default {
           oilLiter: this.oilLiter
         }
         getActivityList(dataObj).then(res => {
-          console.log("返回的可参加活动", res)
+          console.log('返回的可参加活动', res)
           this.activityList = res.data
         })
       } else {
@@ -1624,19 +1712,19 @@ export default {
      * @date 2024年9月19日
      */
     getCoupon() {
-      this.loadingPreferential = true;
+      this.loadingPreferential = true
       this.chooseCouponId = ''
       //组装请求参数   必须有会员id  以及  商品 和 油品的任意一种
-      if (this.chooseVipUser.hasOwnProperty("id") && this.oilGunClearing != '' && this.oilGunClearing.hasOwnProperty("oilNameId") ) {
+      if (this.chooseVipUser.hasOwnProperty('id') && this.oilGunClearing != '' && this.oilGunClearing.hasOwnProperty('oilNameId')) {
         //已选择会员且（选了商品或者加了油）
         let dataObj = {
           userId: this.chooseVipUser.id,
           payWay: this.payType
         }
-        if (this.oilGunClearing != '' && this.oilGunClearing.hasOwnProperty("oilNameId")) {
+        if (this.oilGunClearing != '' && this.oilGunClearing.hasOwnProperty('oilNameId')) {
           //加油油枪有值
           dataObj['oilId'] = this.oilGunClearing.oilNameId
-           dataObj['oilAmount'] = this.oilGunClearing.amount
+          dataObj['oilAmount'] = this.oilGunClearing.amount
           dataObj['oilLiter'] = this.oilLiter
         }
         if (this.goodsList.length > 0) {
@@ -1655,13 +1743,13 @@ export default {
           console.log(dataObj)
         }
         getCouponList(dataObj).then(res => {
-          console.log("返回的可用的优惠券", res)
+          console.log('返回的可用的优惠券', res)
           this.couponList = res.data
-          this.loadingPreferential = false;
+          this.loadingPreferential = false
         })
       } else {
         this.couponList = []
-        this.loadingPreferential = false;
+        this.loadingPreferential = false
       }
     },
     restVipUser() {
@@ -1686,36 +1774,36 @@ export default {
     },
     // 根据手机号查询会员信息
     getUser(queryString, cb) {
-      userListByPhone({mobile: queryString}).then(response => {
+      userListByPhone({ mobile: queryString }).then(response => {
         if (response.data) {
           cb(response.data)
           console.log(response.data, 608)
         } else {
-          this.$modal.msgError("会员信息不存在")
+          this.$modal.msgError('会员信息不存在')
         }
       })
     },
     // 获取二维码信息
     getQRCodeInfoByStoreId(type) {
-      QRCodeByStoreId({type: type}).then(response => {
-        this.collectionImg = response.data;
+      QRCodeByStoreId({ type: type }).then(response => {
+        this.collectionImg = response.data
       })
     },
     // 根据字符串获取二维码图片url地址
     getQRcode() {
       let opts = {
-        errorCorrectionLevel: "L",//容错级别
-        type: "image/png",//生成的二维码类型
+        errorCorrectionLevel: 'L',//容错级别
+        type: 'image/png',//生成的二维码类型
         quality: 0.3,//二维码质量
         margin: 0,//二维码留白边距
         width: 180,//宽
         height: 180,//高
-        text: "http://www.xxx.com",//二维码内容
+        text: 'http://www.xxx.com',//二维码内容
         color: {
-          dark: "#666666",//前景色
-          light: "#fff"//背景色
+          dark: '#666666',//前景色
+          light: '#fff'//背景色
         }
-      };
+      }
       if (this.qrcode.length > 0) {
         //this.QRlink 生成的二维码地址url
         QRCode.toDataURL(this.qrcode[0].collection, opts, (err, url) => {
@@ -1733,18 +1821,18 @@ export default {
     // 根据dom生成图片并下载到本地
     handleDownloadqrCode(id) {
       html2canvas(document.getElementById(id)).then((canvas) => {
-        let imgUrl = canvas.toDataURL("image/png"); //可将 canvas 转为 base64 格式
+        let imgUrl = canvas.toDataURL('image/png') //可将 canvas 转为 base64 格式
         let a = document.createElement('a')
-        a.href = imgUrl;
+        a.href = imgUrl
         if (id == 'collection') {
-          a.download = "门店二维码"; //文件名
+          a.download = '门店二维码' //文件名
         } else {
-          a.download = "收款二维码"; //文件名
+          a.download = '收款二维码' //文件名
         }
-        document.body.appendChild(a);
-        a.click(); // 触发点击
-        document.body.removeChild(a); // 然后移除
-      });
+        document.body.appendChild(a)
+        a.click() // 触发点击
+        document.body.removeChild(a) // 然后移除
+      })
     },
 
     //油枪初始化
@@ -1852,7 +1940,7 @@ export default {
             this.$message({
               message: '挂单成功',
               type: 'success'
-            });
+            })
           }
 
         } else {
@@ -1872,71 +1960,71 @@ export default {
     },
     setFreeIndex(data) {
       //根据字段处理显示
-      let dateText = "";
+      let dateText = ''
       if (data.availableOrUn == 0) {
-        dateText += "适用时间   "
+        dateText += '适用时间   '
       } else {
-        dateText += "不适用时间   "
+        dateText += '不适用时间   '
       }
       if (data.availableType == 1) {
         //每周
-        dateText += "每周   "
+        dateText += '每周   '
       } else {
-        dateText += "每月   "
+        dateText += '每月   '
       }
       if (data.availableOrUn == 0) {
-        dateText += data.availableDay + " 可用"
+        dateText += data.availableDay + ' 可用'
       } else {
-        dateText += data.availableDay + " 不可用"
+        dateText += data.availableDay + ' 不可用'
       }
 
       data.dateText = dateText
-      let amountRule = "";
+      let amountRule = ''
       if (data.type == 1) {
-        amountRule += "消费条件：  "
-        if (data.useType == "1") {
-          amountRule += "订单金额"
+        amountRule += '消费条件：  '
+        if (data.useType == '1') {
+          amountRule += '订单金额'
         } else {
-          amountRule += "实收金额"
+          amountRule += '实收金额'
         }
-        amountRule += "满足金额  " + data.reachAmount
-        amountRule += "优惠  " + data.reduceAmount
+        amountRule += '满足金额  ' + data.reachAmount
+        amountRule += '优惠  ' + data.reduceAmount
       } else if (data.type == 2) {
-        amountRule += "兑换内容：  " + data.exchangeContent
+        amountRule += '兑换内容：  ' + data.exchangeContent
 
       } else if (data.type == 3) {
-        amountRule = "";
-        amountRule += "优惠条件：  "
-        if (data.useType == "1") {
-          amountRule += "订单金额"
+        amountRule = ''
+        amountRule += '优惠条件：  '
+        if (data.useType == '1') {
+          amountRule += '订单金额'
         } else {
-          amountRule += "实收金额"
+          amountRule += '实收金额'
         }
-        amountRule += "金额起  " + data.zkStartAmount
-        amountRule += "金额止  " + data.zkEndAmount
-        amountRule += data.zkData * 10 + "折"
+        amountRule += '金额起  ' + data.zkStartAmount
+        amountRule += '金额止  ' + data.zkEndAmount
+        amountRule += data.zkData * 10 + '折'
       } else if (data.type == 4) {
-        amountRule = "";
-        amountRule += "消费条件：  "
-        if (data.useType == "1") {
-          amountRule += "订单金额"
+        amountRule = ''
+        amountRule += '消费条件：  '
+        if (data.useType == '1') {
+          amountRule += '订单金额'
         } else {
-          amountRule += "实收金额"
+          amountRule += '实收金额'
         }
-        amountRule += "金额满  " + data.reachAmount + "   每" + data.ljOilNum + "L,减" + data.ljOilAmount + "元"
+        amountRule += '金额满  ' + data.reachAmount + '   每' + data.ljOilNum + 'L,减' + data.ljOilAmount + '元'
       } else if (data.type == 5) {
-        amountRule += "消费条件：  "
-        if (data.useType == "1") {
-          amountRule += "订单金额"
+        amountRule += '消费条件：  '
+        if (data.useType == '1') {
+          amountRule += '订单金额'
         } else {
-          amountRule += "实收金额"
+          amountRule += '实收金额'
         }
-        amountRule += "满足金额  " + data.reachAmount
-        amountRule += "优惠  " + data.reduceAmount
+        amountRule += '满足金额  ' + data.reachAmount
+        amountRule += '优惠  ' + data.reduceAmount
       }
       data.ruleText = amountRule
       console.log(amountRule, dateText, this.couponTypeList)
-      let tempType = ""
+      let tempType = ''
       for (const item of this.couponTypeList) {
         if (item.dictValue == data.type) {
           tempType = item.dictLabel
@@ -1947,8 +2035,8 @@ export default {
     },
     // 获取支付方式
     getCouponType() {
-      getDicts("CardCoupon_type").then(response => {
-        this.couponTypeList = response.data;
+      getDicts('CardCoupon_type').then(response => {
+        this.couponTypeList = response.data
       })
     },
     addFreeTicket() {
@@ -1958,12 +2046,11 @@ export default {
       })
       this.freeTicket = true
 
-
     },
     addMemberRecharge() {
       this.memberRecharge = true
       this.$nextTick(res => {
-        this.$refs.rechargeRef.getCardValueList();
+        this.$refs.rechargeRef.getCardValueList()
       })
 
     },
@@ -1996,17 +2083,17 @@ export default {
     addHangbill() {
       addHangBill(this.credit).then(async response => {
         if (response.data == 1) {
-          await this.addOrder();
-          this.$modal.msgSuccess("挂账记录添加成功");
-          this.accountPending = false;
+          await this.addOrder()
+          this.$modal.msgSuccess('挂账记录添加成功')
+          this.accountPending = false
           // this.printLocally()
           this.oilOrderReport()
 
-          this.payType = "WECHAT"
-          this.restVipUser();
-          this.resetting1();
+          this.payType = 'WECHAT'
+          this.restVipUser()
+          this.resetting1()
         } else {
-          this.$modal.msgError("挂账单位可用额度不足，无法进行挂账");
+          this.$modal.msgError('挂账单位可用额度不足，无法进行挂账')
         }
       })
     },
@@ -2019,13 +2106,12 @@ export default {
           oilGunNum: this.oilGunClearing.id,
           tankId: this.oilGunClearing.tankId,
           activeId: this.chooseAct.hasOwnProperty('actId') ? this.chooseAct.activeId : null,
-          activeType: this.chooseAct.hasOwnProperty('type') ? this.chooseAct.activeType : null,
+          activeType: this.chooseAct.hasOwnProperty('type') ? this.chooseAct.activeType : null
         })
       } else {
         this.payForm.oilOrder = null
       }
 
-
       //商品 集合
       this.payForm.goodsOrder = JSON.stringify(this.goodsList)
       //支付方式
@@ -2035,9 +2121,9 @@ export default {
       //商品订单金额
       this.payForm.goodsAmount = this.getGoodsNum || 0
       //油品实付金额
-      this.payForm.oilActualPay = this.oilGunClearing.amount ? this.oilGunClearing.getAmount-this.disOil : 0
+      this.payForm.oilActualPay = this.oilGunClearing.amount ? this.oilGunClearing.getAmount - this.disOil : 0
       //商品实付金额
-      this.payForm.goodsActualPay = this.getGoodsNum ? this.getGoodsNum-this.disGoods : 0
+      this.payForm.goodsActualPay = this.getGoodsNum ? this.getGoodsNum - this.disGoods : 0
       //油枪id
       this.payForm.oilGunId = this.oilGunClearing.id
       //活动营销优惠金额
@@ -2051,26 +2137,24 @@ export default {
       //付款用户
       this.payForm.payUser = this.chooseVipUser.mobile
       //油品优惠金额
-      this.payForm.oilDiscount = this.disOil;
+      this.payForm.oilDiscount = this.disOil
       //商品优惠金额
-      this.payForm.goodsDiscount = this.disGoods;
+      this.payForm.goodsDiscount = this.disGoods
 
       //会员消费金额 (储值卡需要减少的金额)
-      this.payForm.consumeAmount = this.realAmount;
+      this.payForm.consumeAmount = this.realAmount
       //会员id
       this.payForm.userId = this.chooseVipUser.id
       //终端  默认传PC
-      this.payForm.terminal = "PC"
+      this.payForm.terminal = 'PC'
       //商品 ids
       // 将集合内 所有id 拼接 , 隔开  this.goodsList
-      this.payForm.goodsIds = this.goodsList.map(item => item.id).join(",")
+      this.payForm.goodsIds = this.goodsList.map(item => item.id).join(',')
       //购买商品的总数量    计算属性
       this.payForm.goodsNum = this.getGoodsListNum
       //油品 + 商品 的实付总额
       this.payForm.allAmount = this.realAmount
 
-
-
       this.payForm.paymentType = this.payType
 
       console.log('支付类型', this.payForm.paymentType)
@@ -2088,22 +2172,22 @@ export default {
     setindex(value) {
       if (value == 'after_pay') {
         if (this.getGoodsNum > 0) {
-          this.$message.error("商品订单不支持挂账")
+          this.$message.error('商品订单不支持挂账')
           return
         }
         if (this.oilGunClearing.amount <= 0) {
-          this.$message.error("请选择挂账订单")
-          return;
+          this.$message.error('请选择挂账订单')
+          return
         }
         this.accountPending = true
       }
       if (value == 'card_value' || value == 'fule_card' || value == 'car_card_value') {
         if (!this.userInfo) {
-          this.$message.error("请先选择会员")
+          this.$message.error('请先选择会员')
           return
         }
       }
-      console.log('支付方式', value);
+      console.log('支付方式', value)
       this.payType = value
       //支付方式发生变化，查询可用优惠券和优惠活动
       this.getActivity()
@@ -2157,7 +2241,7 @@ export default {
         this.$message({
           message: '取单成功',
           type: 'success'
-        });
+        })
 
       } else {
         this.$message.error('当前无存单  请存单后再取单')
@@ -2177,7 +2261,7 @@ export default {
         this.$message({
           message: '作废成功',
           type: 'success'
-        });
+        })
       } else {
         this.$message.error('当前无存单  请存单后再作废')
       }
@@ -2200,7 +2284,7 @@ export default {
     // 子组件提交调用父组件方法
     fatherMethod(list) {
       //将当前选中油枪 放入 油枪订单容器  (需要被数据监听)
-      this.oilGunClearing = {amount: list, ...this.oilGun}
+      this.oilGunClearing = { amount: list, ...this.oilGun }
 
     },
     //获取子组件数据
@@ -2211,14 +2295,14 @@ export default {
     },
     handleSelect(row) {
       let bo1 = true
-      console.log('当前选择的商品',row)
+      console.log('当前选择的商品', row)
       // 如果 item 存在 goodsList 则 属性+1  不存在直接添加到数组
       // 使用 map  生成新数组  防止vue监听不到数组内数据变化
       this.goodsList = this.goodsList.map(
         item => {
           if (item.id == row.id) {
             bo1 = false
-            return {...item, num: item.num + 1}
+            return { ...item, num: item.num + 1 }
 
           } else {
             return item
@@ -2570,10 +2654,12 @@ input {
   height: 68vh;
 
 }
-.zo_box{
+
+.zo_box {
   width: 33.3%;
   margin-bottom: 1%;
 }
+
 .card92 {
   width: 95%;
   height: 90px;