diff --git a/fuintAdmin/src/api/integral/gift.js b/fuintAdmin/src/api/integral/gift.js
index 8f892fecc..8bc6a2924 100644
--- a/fuintAdmin/src/api/integral/gift.js
+++ b/fuintAdmin/src/api/integral/gift.js
@@ -2,54 +2,49 @@ import request from "@/utils/request";
 
 // 查询油罐列表
 export function getGiftApi(data) {
-    return request({
-      url: 'business/integral/integralGift/queryByPage',
-      method: 'get',
-      params: data
-    })
-  }
-  // 新增有关信息
-  export function insertGiftApi(data) {
-    return request({
-      url: 'business/integral/integralGift',
-      method: 'post',
-      data: data
-    })
-  }
-  // 修改有关信息
-  export function updateGiftApi(data) {
-    return request({
-      url: 'business/integral/integralGift',
-      method: 'put',
-      data: data
-    })
-  }
-  
+  return request({
+    url: 'business/integral/integralGift/queryByPage',
+    method: 'get',
+    params: data
+  })
+}
+
+// 新增有关信息
+export function insertGiftApi(data) {
+  return request({
+    url: 'business/integral/integralGift',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改有关信息
+export function updateGiftApi(data) {
+  return request({
+    url: 'business/integral/integralGift',
+    method: 'put',
+    data: data
+  })
+}
+
+
+// 修改库存
+export function updateGiftInventoryApi(data) {
+  return request({
+    url: 'business/integral/integralGift/updateInventory',
+    method: 'get',
+    params: data
+  })
+}
+
+
+//获取全部 剩余数量 >0 的优惠券
+export function getCardCoupon(data) {
+  return request({
+    url: 'cardCoupon/queryByNum',
+    method: 'get',
+    params: data
+  })
+}
+
 
-  // 修改库存
-  export function updateGiftInventoryApi(data) {
-    return request({
-      url: 'business/integral/integralGift/updateInventory',
-      method: 'get',
-      params: data
-    })
-  }
-    
-  
-  //兑换券
-  export function getCardFavorableApi(data) {
-    return request({
-      url: 'business/marketingActivity/cardFavorable?pageNo=1&pageSize=10',
-      method: 'get',
-      params: data
-    })
-  }
-    
-  //优惠券
-  export function getCardExchangeApi(data) {
-    return request({
-      url: 'business/marketingActivity/cardExchange?pageNo=1&pageSize=10',
-      method: 'get',
-      params: data
-    })
-  }
\ No newline at end of file
diff --git a/fuintAdmin/src/views/integral/gift/add.vue b/fuintAdmin/src/views/integral/gift/add.vue
index 238db70b1..62ff272f0 100644
--- a/fuintAdmin/src/views/integral/gift/add.vue
+++ b/fuintAdmin/src/views/integral/gift/add.vue
@@ -1,14 +1,14 @@
 <script>
 import {getToken} from "@/utils/auth";
-import {getCardExchangeApi, getCardFavorableApi, insertGiftApi, updateGiftApi} from "@/api/integral/gift";
+import {getCardCoupon, insertGiftApi, updateGiftApi} from "@/api/integral/gift";
 import {listLJGoods} from "@/api/convenienceStore/ljgoods";
 import {selectTree} from "@/api/convenienceStore/goods";
 import {getGiftCategoryApi} from "@/api/integral/category";
 
 export default {
   name: "in-add",
-  dicts: ['zhzt','lplx','redemptionMethod','expressShippingCosts','shippingMethod'],
-props:['giftDataF','type'],
+  dicts: ['zhzt', 'lplx', 'redemptionMethod', 'expressShippingCosts', 'shippingMethod'],
+  props: ['giftDataF'],
   data() {
     var valiNumberPass = (rule, value, callback) => {//包含小数的数字
       let reg = /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g;
@@ -21,41 +21,50 @@ props:['giftDataF','type'],
       }
     };
     return {
-      title:'添加礼品',
-      openCommodity:false,
+      giftTypeOption: [
+        {
+          value: '1',
+          label: '电子券'
+        },
+        {
+          value: '2',
+          label: '实物商品'
+        }
+      ],
+      title: '添加礼品',
+      openCommodity: false,
       getGiftTypeShow: '',
-      stock: '',
+      stock: null,
       // 兑换卷
-      cardFavorableList:[],
+      cardFavorableList: [],
       // 优惠券
-      cardExchangeApiList:[],
-      dataForm:{
+      cardExchangeApiList: [],
+      dataForm: {
         id: null,
         giftName: '', // 礼品名称
-        categoryId:'', // 分类id
-        goodsId:'', // 商品Id
-        goodsName:'', // 商品Id
-        voucherId:'', // 兑换券id
-        coverImage:'', // 封面图
+        categoryId: '', // 分类id
+        goodsId: '', // 商品Id
+        goodsName: '', // 商品Id
+        coverImage: '', // 封面图
         giftImages: [], // 礼品图片
-        giftType:"优惠券", // 礼品类型
-        couponId:'',// 优惠券
+        giftType: '电子券', // 礼品类型
+        couponId: '',// 优惠券
         giftQuantity: 1, // 礼品数量
-        totalInventory:'', // 库存
-        exchangeMethod:'积分', // 兑换方式
-        exchangePoints:'', // 兑换积分
-        exchangeTimes:'', // 兑换次数
-        moneyRatio:'', // 价钱比例
-        expressShippingFee:'', // 快递运费
-        shippingFeeAmount:'', // 运费金额
-        exchangeamount:'', // 兑换金额
+        totalInventory: '', // 库存
+        exchangeMethod: '积分', // 兑换方式
+        exchangePoints: '', // 兑换积分
+        exchangeTimes: '', // 兑换次数
+        moneyRatio: '', // 价钱比例
+        expressShippingFee: '', // 快递运费
+        shippingFeeAmount: '', // 运费金额
+        exchangeamount: '', // 兑换金额
         // deliveryMethod:['门店自提'], // 配送方式
-        deliveryMethod:[], // 配送方式
-        detailedDescription:'', // 图文详情
+        deliveryMethod: [], // 配送方式
+        detailedDescription: '', // 图文详情
         categoryName: 1,
         sort: null,
         status: '启用',
-        market:null
+        market: 0
       },
       showList: {
         // 优惠类型展示
@@ -63,12 +72,12 @@ props:['giftDataF','type'],
         voucher: false,
         goods: false,
         // 兑换方式展示
-        jf:true,
-        je:false,
-        jfje:false,
-        jfjq:false,
+        jf: true,
+        je: false,
+        jfje: false,
+        jfjq: false,
         // 配送方式
-        delivery:false,
+        delivery: false,
         express: false,
         shippingFee: false
       },
@@ -79,13 +88,15 @@ props:['giftDataF','type'],
       giftImages: [],
       // 上传地址
       uploadAction: process.env.VUE_APP_BASE_API + 'backendApi/file/upload',
-      uploadHeader: { 'Access-Token' : getToken() },
+      uploadHeader: {'Access-Token': getToken()},
       // 隐藏上传
       hideUpload: false,
       // 上传文件列表
       uploadFiles: [
-        {name:"nihao",
-          url:'http://localhost:8008/static/uploadImages/20231103/ffbbe7d3ee1441fdaf706802fa0f176a.png'}
+        {
+          name: "nihao",
+          url: 'http://localhost:8008/static/uploadImages/20231103/ffbbe7d3ee1441fdaf706802fa0f176a.png'
+        }
       ],
       // 图片根目录
       imagePath: process.env.VUE_APP_BASE_API,
@@ -95,65 +106,62 @@ props:['giftDataF','type'],
       rulesInventory: {},
       rules: {
         deliveryMethod: [
-          { type: 'array', required: true, message: '请至少选择一个配送方式', trigger: 'change' }
+          {type: 'array', required: true, message: '请至少选择一个配送方式', trigger: 'change'}
         ],
         giftName: [
-          { required: true, message: "礼品名称不能为空", trigger: "blur" },
+          {required: true, message: "礼品名称不能为空", trigger: "blur"},
         ],
         coverImage: [
-          { required: true, message: "封面不能为空", trigger: "blur" },
+          {required: true, message: "封面不能为空", trigger: "blur"},
         ],
         giftType: [
-          { required: true, message: "礼品类型不能为空", trigger: "change" },
+          {required: true, message: "礼品类型不能为空", trigger: "change"},
         ],
         couponId: [
-          { required: true, message: "请选择优惠券", trigger: "blur" },
-        ],
-        voucherId: [
-          { required: true, message: "请选择兑换券", trigger: "blur" },
+          {required: true, message: "请选择优惠券", trigger: "blur"},
         ],
         goodsId: [
-          { required: true, message: "请选择关联商品", trigger: "change" },
+          {required: true, message: "请选择关联商品", trigger: "change"},
         ],
         giftQuantity: [
-          { required: true, message: "礼品数量不能为空", trigger: "blur" },
+          {required: true, message: "礼品数量不能为空", trigger: "blur"},
         ],
         totalInventory: [
-          { required: true, message: "礼品库存不能为空", trigger: "blur" },
+          {required: true, message: "礼品库存不能为空", trigger: "blur"},
         ],
         exchangeMethod: [
-          { required: true, message: "兑换方式不能为空", trigger: "blur" },
+          {required: true, message: "兑换方式不能为空", trigger: "blur"},
         ],
         exchangePoints: [
-          { required: true, validator:valiNumberPass, trigger: "blur" },
+          {required: true, validator: valiNumberPass, trigger: "blur"},
         ],
         exchangeAmount: [
-          { required: true, validator:valiNumberPass, trigger: "blur" },
+          {required: true, validator: valiNumberPass, trigger: "blur"},
         ],
         moneyRatio: [
-          { required: true, validator:valiNumberPass, trigger: "blur" },
+          {required: true, validator: valiNumberPass, trigger: "blur"},
         ],
         expressShippingFee: [
-          { required: true, message: "快递运费不能为空", trigger: "change" },
+          {required: true, message: "快递运费不能为空", trigger: "change"},
         ],
         shippingFeeAmount: [
-          { required: true, validator:valiNumberPass, trigger: "blur" },
+          {required: true, validator: valiNumberPass, trigger: "blur"},
         ],
         market: [
-          { required: true, validator:valiNumberPass, trigger: "blur" },
+          {required: true, validator: valiNumberPass, trigger: "blur"},
         ],
         exchangeTimes: [
-          { required: true, message: "兑换次数不能为空", trigger: "change" },
+          {required: true, message: "兑换次数不能为空", trigger: "change"},
         ],
         sort: [
-          { required: true, message: "礼品排序不能为空", trigger: "blur" },
+          {required: true, message: "礼品排序不能为空", trigger: "blur"},
         ],
         status: [
-          { required: true, message: "请选择礼品状态", trigger: "change" },
+          {required: true, message: "请选择礼品状态", trigger: "change"},
         ],
 
       },
-      commodityForm:{
+      commodityForm: {
         cvsGoodId: "",
         cvsGood: "",
         supplierId: "",
@@ -162,72 +170,71 @@ props:['giftDataF','type'],
         remark: "",
         page: 1,
         pageSize: 1000,
-        isRecovery:0,
-        status:"qy"
+        isRecovery: 0,
+        status: "qy"
       },
 
 
-      cvsGoodList:[],
+      cvsGoodList: [],
       // 供应商列表
-      supplierList:[],
+      supplierList: [],
 
     }
   },
+  computed: {
+    selectedCoupon() {
+      return this.cardFavorableList.find(option => option.id === this.dataForm.couponId);
+    }
+  },
   created() {
-    console.log(33333333333333,this.giftDataF)
-    this.cardFavorableApi()
-    if (this.giftDataF) {
-      this.init(this.giftDataF)
-
+    console.log("参数", this.$route.params.giftDataF)
+    if (this.$route.params.giftDataF) {
+      // 修改   需要查询出  关联的  优惠券 或 商品  以及库存 处理
+      this.dataForm = this.$route.params.giftDataF
+      this.init(this.dataForm)
     } else {
-      this.initadd()
+      // 新增  需要查询 全部的 优惠券
+      this.cardFavorableApi()
 
 
     }
+
   },
-  methods: {    // 取消按钮
-
+  methods: {
+    handleCouponChange(newVal) {
+      console.log('新选择的优惠券对象:', this.selectedCoupon);
+      // 设置 礼品库存  最大约束
+      this.stock = this.selectedCoupon.tfTotal - this.selectedCoupon.tfGetNum;
+      // 设置 礼品库存 初始化 值
+      this.dataForm.totalInventory = 1
+    },
+    // 取消按钮
     async init(data) {
-
-
-      await this.cardFavorableApi();
-      await this.cardExchangeApi();
+      //查询优惠券
+      await this.cardFavorableApi(data);
       await this.selectGiftCategory1();
-
+      //查询商品
+      this.getCommodityList(data);
       this.giftImages = []
       data.giftImages = JSON.parse(data.giftImages);
-      data.giftImages.forEach(res=> {
+      data.giftImages.forEach(res => {
         let newImage = {
           url: this.imagePath + res,
           fileName: res
         }
         this.giftImages.push(newImage);
       }),
-
-        // data.deliveryMethod = JSON.parse(data.deliveryMethod);
-
-        console.log("data",data)
-      this.dataForm = data;
       this.changeGiftType(this.dataForm.giftType)
       this.changeExchange(this.dataForm.exchangeMethod)
       this.changeExpressEDIT()
 
     },
 
-    initadd() {
-
-      this.changeGiftType("优惠券")
-      this.selectGiftCategory1();
-      this.cardFavorableApi();
-      this.cardExchangeApi();
-      this.$forceUpdate();
-    },
-
     cancel() {
       this.$router.back();
 
     },
-    submitForm: function() {
+    submitForm: function () {
       let this_ = this
       // if (this.dataForm.deliveryMethod.length === 0) {
       //     this.$message.warning('请至少选择一个配送方式');
@@ -247,7 +254,7 @@ props:['giftDataF','type'],
             // 判断是否是新增还是修改
             insertGiftApi(this_.dataForm).then(res => {
               // this_.getList(),
-                // this_.open = false
+              // this_.open = false
               this.$router.back();
 
             })
@@ -260,36 +267,26 @@ props:['giftDataF','type'],
 
             })
           }
-        }})
-    },
-    cardExchangeApi () {
-      getCardExchangeApi().then(res=>{
-        this.cardExchangeApiList =res.data.records
+        }
       })
     },
     // 分类查询
     selectGiftCategory1() {
-      let queryParams = {pageSize : 1000}
+      let queryParams = {pageSize: 1000}
       getGiftCategoryApi(queryParams).then(response => {
         this.giftCategoryList = response.data.records;
       })
     },
     // 选择礼品类型
     changeGiftType(newVal) {
+      console.log('新值', newVal)
       let this_ = this
-      if (newVal == '优惠券') {
+      if (newVal == '电子券') {
         this_.showList.coupon = true
-        this_.showList.voucher = false
         this_.showList.goods = false
         this_.showList.delivery = false
-      } else if (newVal == '兑换券') {
+      } else if (newVal == '实物商品') {
         this_.showList.coupon = false
-        this_.showList.voucher = true
-        this_.showList.goods = false
-        this_.showList.delivery = true
-      } else if(newVal == '实物商品') {
-        this_.showList.coupon = false
-        this_.showList.voucher = false
         this_.showList.goods = true
         this_.showList.delivery = true
       }
@@ -311,7 +308,7 @@ props:['giftDataF','type'],
       this.dataForm.giftImages.push(file.data.fileName);
 
 
-      console.log("this.giftImage",this.giftImages)
+      console.log("this.giftImage", this.giftImages)
       console.log(" this.dataForm.giftImages", this.dataForm.giftImages)
     },
 
@@ -333,8 +330,9 @@ props:['giftDataF','type'],
           this.dataForm.giftImages.splice(index, 1);
         }
       })
-      console.log("this.giftImage",this.giftImages)
-      console.log(" this.dataForm.giftImages", this.dataForm.giftImages)    },
+      console.log("this.giftImage", this.giftImages)
+      console.log(" this.dataForm.giftImages", this.dataForm.giftImages)
+    },
     handlePictureCardPreview(file) {
       console.log(file);
       this.dialogImageUrl = file.url;
@@ -342,20 +340,19 @@ props:['giftDataF','type'],
     },
 
 
-
     handleChildValue(value) {
       this.dataForm.detailedDescription = value
     },
 
     // 快递（处理选择）
-    changeExpress(data,flag){
+    changeExpress(data, flag) {
       let this_ = this
       // express: false,
       // shippingFee: false
-      if(flag === 1) {
+      if (flag === 1) {
         if (!this.dataForm.deliveryMethod) {
           this.dataForm.deliveryMethod = [];
-          this.showList.express= false
+          this.showList.express = false
         }
         if (!Array.isArray(this.dataForm.deliveryMethod)) {
           this.dataForm.deliveryMethod = JSON.parse(this.dataForm.deliveryMethod);
@@ -370,8 +367,8 @@ props:['giftDataF','type'],
           // jsonArray.push(data)
           // this.dataForm.deliveryMethod = jsonArray
 
-          if(data == '物流配送') {
-            this.showList.express= true
+          if (data == '物流配送') {
+            this.showList.express = true
           }
         } else {
           this.dataForm.deliveryMethod.splice(index, 1)
@@ -379,43 +376,43 @@ props:['giftDataF','type'],
           // jsonArray.splice(index, 1);
           // this.dataForm.deliveryMethod = JSON.stringify(jsonArray)
 
-          if(data == '物流配送') {
-            this.showList.express= false
+          if (data == '物流配送') {
+            this.showList.express = false
           }
         }
       } else {
         if (data == '包邮') {
-          this.showList.shippingFee= false
+          this.showList.shippingFee = false
         } else if (data == '统一运费') {
-          this.showList.shippingFee= true
+          this.showList.shippingFee = true
         }
       }
     },
     // 快递 修改时处理
-    changeExpressEDIT(){
+    changeExpressEDIT() {
       if (!this.dataForm.deliveryMethod) {
         this.dataForm.deliveryMethod = [];
-        this.showList.express= false
+        this.showList.express = false
       }
-      if(!this.dataForm.expressShippingFee) {
-        this.dataForm.expressShippingFee= ''
-        this.showList.shippingFee= false
+      if (!this.dataForm.expressShippingFee) {
+        this.dataForm.expressShippingFee = ''
+        this.showList.shippingFee = false
       }
       let this_ = this
       if (!Array.isArray(this_.dataForm.deliveryMethod)) {
         this_.dataForm.deliveryMethod = JSON.parse(this_.dataForm.deliveryMethod);
       }
       if (this_.dataForm.deliveryMethod && this_.dataForm.deliveryMethod.includes("物流配送")) {
-        this.showList.express= true
+        this.showList.express = true
 
       }
       if (this_.dataForm.expressShippingFee == "统一运费") {
-        this.showList.shippingFee= true
+        this.showList.shippingFee = true
       }
 
     },
     // 兑换方式
-    changeExchange(newVal){
+    changeExchange(newVal) {
       let this_ = this
       if (newVal == '积分') {
         this_.showList.jf = true
@@ -435,10 +432,16 @@ props:['giftDataF','type'],
         this_.showList.jfjq = true
       }
     },
-    cardFavorableApi () {
-      getCardFavorableApi().then(res=>{
-        this.cardFavorableList = res.data.records
+    cardFavorableApi(val) {
+      getCardCoupon().then(res => {
+        this.cardFavorableList = res.data
+        if (val.couponId) {
+          let obj = this.cardFavorableList.find(option => option.id == val.couponId)
+          this.stock = obj.tfTotal - obj.tfGetNum
+          console.log('当前库存', this.stock)
+        }
       })
+
     },
     getCommodity() {
       this.getQueryList()
@@ -446,17 +449,22 @@ props:['giftDataF','type'],
 
     },
     // 商品列表
-
-    getCommodityList() {
+    getCommodityList(data) {
       let this_ = this
-      listLJGoods(this_.commodityForm).then(res=>{
+      listLJGoods(this_.commodityForm).then(res => {
         this_.commodityList = res.data.records;
-        // this_.sumMethod(res.data.records);
-        // this.total = response.data.total;
+        if (data.goodsId){
+          let row = this.commodityList.find(option => option.id == data.goodsId)
+          this.dataForm.totalInventory = row.stock
+          this.stock = row.stock
+          this.dataForm.market = row.retailPrice
+          this.dataForm.goodsName = row.name
+          this.dataForm.goodsId = row.id
+        }
       })
     },
     // 查询搜索列表信息
-    getQueryList(){
+    getQueryList() {
       selectTree().then(response => {
         this.cvsGoodList = response.data.records
       });
@@ -473,7 +481,7 @@ props:['giftDataF','type'],
       this.$refs.tables.clearSelection(); // 清除当前选中的行
       this.$refs.tables.toggleRowSelection(row); // 选中当前点击的行
       // 处理选中的行数据
-      console.log("row",row)
+      console.log("row", row)
       // stock
       this.dataForm.totalInventory = row.stock
       this.stock = row.stock
@@ -487,184 +495,180 @@ props:['giftDataF','type'],
 </script>
 
 <template>
-<div class="container1">
+  <div class="container1">
 
-  <div class="card-change" style="margin-top: 10px;">
+    <div class="card-change" style="margin-top: 10px;">
 
-    <div style="display: flex; justify-content: space-between">
+      <div style="display: flex; justify-content: space-between">
 
-      <div style="width: 62%;height: 500px;">
-      <el-form ref="form" :model="dataForm" :rules="rules" label-width="80px">
+        <div style="width: 62%;height: 500px;">
+          <el-form ref="form" :model="dataForm" :rules="rules" label-width="80px">
 
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="礼品名称" prop="giftName">
-              <el-input v-model="dataForm.giftName" placeholder="请输入礼品名称" maxlength="30"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="分类" prop="categoryId">
-              <el-select clearable v-model="dataForm.categoryId" placeholder="请选择礼品分类" style="width:100%">
-                <el-option label="-不分类-" value=""></el-option>
-                <el-option
-                  v-for="option in giftCategoryList"
-                  :key="option.id"
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="礼品名称" prop="giftName">
+                  <el-input v-model="dataForm.giftName" placeholder="请输入礼品名称" maxlength="30"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="分类" prop="categoryId">
+                  <el-select clearable v-model="dataForm.categoryId" placeholder="请选择礼品分类" style="width:100%">
+                    <el-option label="-不分类-" value=""></el-option>
+                    <el-option
+                      v-for="option in giftCategoryList"
+                      :key="option.id"
 
-                  :label="option.categoryName"
-                  :value="option.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
+                      :label="option.categoryName"
+                      :value="option.id"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
 
 
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="礼品类型" prop="giftType">
-              <el-radio-group v-model="dataForm.giftType" @change="changeGiftType($event)">
-                <el-radio
-                  v-for="dict in dict.type.lplx"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                  @change="handleIsopenSelect,changeGiftType"
-                />
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item v-if="showList.coupon" label="优惠券" prop="couponId">
-              <el-select v-model="dataForm.couponId" placeholder="请选择" style="width:100%">
-                <el-option
-                  v-for="option in cardFavorableList"
-                  :key="option.id"
-                  :label="(option.type==0?'油品券-':option.type==1?'商品券-':'优惠券-')+ option.name"
-                  :value="option.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-
-            <el-form-item v-if="showList.voucher" label="兑换券" prop="voucherId">
-              <el-select v-model="dataForm.voucherId" placeholder="请选择" style="width:100%">
-                <el-option
-                  v-for="option in cardExchangeApiList"
-                  :key="option.id"
-                  :label="(option.type==0?'兑换券-':option.type==1?'洗车券-':'洗车卡-')+ option.name"
-                  :value="option.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-
-            <el-form-item v-if="showList.goods" label="关联商品" prop="goodsId">
-              <el-input v-model="dataForm.goodsName" placeholder="" maxlength="30" style="width:100%" @focus="getCommodity"/>
-              <!-- </el-select> -->
-            </el-form-item>
-          </el-col>
-        </el-row>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="礼品类型" prop="giftType">
+                  <el-radio-group v-model="dataForm.giftType" @change="changeGiftType($event)">
+                    <el-radio
+                      v-for="dict in giftTypeOption"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item v-if="showList.coupon" label="优惠券" prop="couponId">
+                  <el-select v-model="dataForm.couponId" placeholder="请选择" style="width:100%"
+                             @change="handleCouponChange">
+                    <el-option
+                      v-for="option in cardFavorableList"
+                      :key="option.id"
+                      :label="option.name"
+                      :value="option.id"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
 
 
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="商品库存" prop="">
-              <el-input  v-model="stock" controls-position="right" :min="1" :max="10" label=""  style="width:100%" :disabled="true"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="礼品库存" prop="totalInventory">
-              <el-input :disabled="title === '修改礼品'" v-model.number="dataForm.totalInventory" placeholder="礼品库存" maxlength="30" style="width:100%"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-<!--        <el-row :gutter="24">-->
-<!--          <el-col :span="12">-->
-<!--            <el-form-item label="商品库存" prop="">-->
-<!--              <el-input  v-model="stock" controls-position="right" :min="1" :max="10" label=""  style="width:100%" :disabled="true"></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="12">-->
-<!--            <el-form-item label="礼品库存" prop="totalInventory">-->
-<!--              <el-input :disabled="title === '修改礼品'" v-model.number="dataForm.totalInventory" placeholder="礼品库存" maxlength="30" style="width:100%"/>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--        </el-row>-->
-
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="市场价格" prop="market">
-              <el-input v-model="dataForm.market" placeholder="请输入市场价格" maxlength="30" style="width:100%">
-                <template slot="append">元</template></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="兑换方式" prop="exchangeMethod">
-              <el-radio-group v-model="dataForm.exchangeMethod" @change="changeExchange($event)">
-                <el-radio
-                  v-for="dict in dict.type.redemptionMethod"
-                  :key="dict.value"
-                  :label="dict.label"
-                  @change="handleIsopenSelect"
-                  :value="dict.value"/>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
+                <el-form-item v-if="showList.goods" label="关联商品" prop="goodsId">
+                  <el-input v-model="dataForm.goodsName" placeholder="" maxlength="30" style="width:100%"
+                            @focus="getCommodity"/>
+                  <!-- </el-select> -->
+                </el-form-item>
+              </el-col>
+            </el-row>
 
 
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="礼品排序" prop="sort" >
-              <el-input-number v-model="dataForm.sort" :min="1" :max="10" label="" style="width:100%"></el-input-number>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showList.jf" :span="12">
-            <el-form-item v-show="showList.jf" label="兑换积分" prop="exchangePoints">
-              <el-input v-model="dataForm.exchangePoints" placeholder=""  style="width:100%">
-                <template slot="append">积分</template>
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showList.je" :span="8">
-            <el-form-item label="兑换金额" prop="exchangeAmount">
-              <el-input v-model="dataForm.exchangeAmount" placeholder="" maxlength="30" style="width:100%">
-                <template slot="append">元</template>
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showList.jfjq" :span="7">
-            <el-form-item label="加钱比例" prop="moneyRatio" >
-              <el-input v-model="dataForm.moneyRatio" placeholder="" maxlength="30" style="width:100%">
-                <template slot="prepend">1积分=</template>
-                <template slot="append">元</template>
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="当前库存" prop="">
+                  <el-input v-model="stock" controls-position="right" :min="1" :max="10" label="" style="width:100%"
+                            :disabled="true"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="礼品库存" prop="totalInventory">
+                  <el-input-number v-model.number="dataForm.totalInventory" :disabled="title === '修改礼品'"
+                                   controls-position="right" :min="0" :max="stock"></el-input-number>
+                  <!--              <el-input :disabled="title === '修改礼品'" v-model.number="dataForm.totalInventory" placeholder="礼品库存" :min="1" :max="stock" maxlength="30" style="width:100%"/>-->
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <!--        <el-row :gutter="24">-->
+            <!--          <el-col :span="12">-->
+            <!--            <el-form-item label="商品库存" prop="">-->
+            <!--              <el-input  v-model="stock" controls-position="right" :min="1" :max="10" label=""  style="width:100%" :disabled="true"></el-input>-->
+            <!--            </el-form-item>-->
+            <!--          </el-col>-->
+            <!--          <el-col :span="12">-->
+            <!--            <el-form-item label="礼品库存" prop="totalInventory">-->
+            <!--              <el-input :disabled="title === '修改礼品'" v-model.number="dataForm.totalInventory" placeholder="礼品库存" maxlength="30" style="width:100%"/>-->
+            <!--            </el-form-item>-->
+            <!--          </el-col>-->
+            <!--        </el-row>-->
+
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="成本价" prop="market">
+                  <el-input v-model="dataForm.market" disabled maxlength="30" style="width:100%">
+                    <template slot="append">元</template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="兑换方式" prop="exchangeMethod">
+                  <el-radio-group v-model="dataForm.exchangeMethod" @change="changeExchange($event)">
+                    <el-radio
+                      v-for="dict in dict.type.redemptionMethod"
+                      :key="dict.value"
+                      :label="dict.label"
+                      @change="handleIsopenSelect"
+                      :value="dict.value"/>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+            </el-row>
 
 
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="兑换次数" prop="exchangeTimes">
-              <el-input v-model.number="dataForm.exchangeTimes" placeholder="" maxlength="30" style="width:100%">
-                <template slot="append">次</template>
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-
-          </el-col>
-        </el-row>
-
-      </el-form>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="礼品排序" prop="sort">
+                  <el-input-number v-model="dataForm.sort" :min="1" :max="10" label=""
+                                   style="width:100%"></el-input-number>
+                </el-form-item>
+              </el-col>
+              <el-col v-if="showList.jf" :span="12">
+                <el-form-item v-show="showList.jf" label="兑换积分" prop="exchangePoints">
+                  <el-input v-model="dataForm.exchangePoints" placeholder="" style="width:100%">
+                    <template slot="append">积分</template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col v-if="showList.je" :span="8">
+                <el-form-item label="兑换金额" prop="exchangeAmount">
+                  <el-input v-model="dataForm.exchangeAmount" placeholder="" maxlength="30" style="width:100%">
+                    <template slot="append">元</template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col v-if="showList.jfjq" :span="7">
+                <el-form-item label="加钱比例" prop="moneyRatio">
+                  <el-input v-model="dataForm.moneyRatio" placeholder="" maxlength="30" style="width:100%">
+                    <template slot="prepend">1积分=</template>
+                    <template slot="append">元</template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
 
 
-      </div>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="兑换次数" prop="exchangeTimes">
+                  <el-input v-model.number="dataForm.exchangeTimes" placeholder="" maxlength="30" style="width:100%">
+                    <template slot="append">次</template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
 
-      <div style="width: 35%;height: 550px;">
-        <el-form ref="form" :model="dataForm" :rules="rules" label-width="80px">
+              </el-col>
+            </el-row>
 
-        <el-form-item label="封面图" prop="coverImage">
+          </el-form>
+
+
+        </div>
+
+        <div style="width: 35%;height: 550px;">
+          <el-form :model="dataForm" :rules="rules" label-width="80px">
+
+            <el-form-item label="封面图" prop="coverImage">
               <el-upload
                 :action="uploadAction"
                 list-type="picture-card"
@@ -683,149 +687,153 @@ props:['giftDataF','type'],
               </el-upload>
             </el-form-item>
 
-        <el-form-item label="礼品图片" >
-          <el-upload
-            :action="uploadAction"
-            list-type="picture-card"
-            :file-list="giftImages"
-            :headers="uploadHeader"
-            :auto-upload="true"
-            :on-preview="handlePictureCardPreview"
-            :on-success="handleUploadSuccessGift"
-            style="height: 100px;"
-            :on-remove="handleRemove">
-            <i class="el-icon-plus"></i>
-          </el-upload>
-          <el-dialog :visible.sync="dialogVisible">
-            <img width="100%" :src="dialogImageUrl" alt="">s
-          </el-dialog>
+            <el-form-item label="礼品图片">
+              <el-upload
+                :action="uploadAction"
+                list-type="picture-card"
+                :file-list="giftImages"
+                :headers="uploadHeader"
+                :auto-upload="true"
+                :on-preview="handlePictureCardPreview"
+                :on-success="handleUploadSuccessGift"
+                style="height: 100px;"
+                :on-remove="handleRemove">
+                <i class="el-icon-plus"></i>
+              </el-upload>
+              <el-dialog :visible.sync="dialogVisible">
+                <img width="100%" :src="dialogImageUrl" alt="">s
+              </el-dialog>
 
-        </el-form-item>
-        <el-form-item label="配送方式" style="margin-top: 50px" prop="deliveryMethod">
-          <el-checkbox v-for="item in dict.type.shippingMethod" :key="item.value" :label="item.label" :checked="dataForm.deliveryMethod != null?dataForm.deliveryMethod.includes(item.label):null" @change="changeExpress(item.label,1)">{{ item.label }}</el-checkbox>
-        </el-form-item>
-<!--          <el-form-item label="快递运费" prop="expressShippingFee">-->
-<!--            <el-radio-group v-model="dataForm.expressShippingFee" @change="changeExpress($event,2)">-->
-<!--              <el-radio-->
-<!--                v-for="dict in dict.type.expressShippingCosts"-->
-<!--                :key="dict.value"-->
-<!--                :label="dict.label"-->
-<!--                @change="handleIsopenSelect"-->
-<!--                :value="dict.value"/>-->
-<!--            </el-radio-group>-->
-<!--          </el-form-item>-->
-<!--          <el-form-item label="运费金额" prop="shippingFeeAmount">-->
-<!--            <el-input v-model="dataForm.shippingFeeAmount" placeholder="" maxlength="30" style="width: 202px;" >-->
-<!--              <template slot="append">元</template>-->
-<!--            </el-input>-->
-<!--          </el-form-item>-->
-          <el-form-item label="礼品状态" prop="status">
-            <el-radio-group v-model="dataForm.status">
-              <el-radio
-                v-for="dict in dict.type.zhzt"
-                :key="dict.value"
-                :label="dict.label"
-                @change="handleIsopenSelect"
-                :value="dict.value"/>
-            </el-radio-group>
-          </el-form-item>
-        </el-form>
+            </el-form-item>
+            <el-form-item label="配送方式" style="margin-top: 50px" prop="deliveryMethod">
+              <el-checkbox v-for="item in dict.type.shippingMethod" :key="item.value" :label="item.label"
+                           :checked="dataForm.deliveryMethod != null?dataForm.deliveryMethod.includes(item.label):null"
+                           @change="changeExpress(item.label,1)">{{ item.label }}
+              </el-checkbox>
+            </el-form-item>
+            <!--          <el-form-item label="快递运费" prop="expressShippingFee">-->
+            <!--            <el-radio-group v-model="dataForm.expressShippingFee" @change="changeExpress($event,2)">-->
+            <!--              <el-radio-->
+            <!--                v-for="dict in dict.type.expressShippingCosts"-->
+            <!--                :key="dict.value"-->
+            <!--                :label="dict.label"-->
+            <!--                @change="handleIsopenSelect"-->
+            <!--                :value="dict.value"/>-->
+            <!--            </el-radio-group>-->
+            <!--          </el-form-item>-->
+            <!--          <el-form-item label="运费金额" prop="shippingFeeAmount">-->
+            <!--            <el-input v-model="dataForm.shippingFeeAmount" placeholder="" maxlength="30" style="width: 202px;" >-->
+            <!--              <template slot="append">元</template>-->
+            <!--            </el-input>-->
+            <!--          </el-form-item>-->
+            <el-form-item label="礼品状态" prop="status">
+              <el-radio-group v-model="dataForm.status">
+                <el-radio
+                  v-for="dict in dict.type.zhzt"
+                  :key="dict.value"
+                  :label="dict.label"
+                  @change="handleIsopenSelect"
+                  :value="dict.value"/>
+              </el-radio-group>
+            </el-form-item>
+          </el-form>
+        </div>
+      </div>
+
+
+      <el-form :model="dataForm" :rules="rules" label-width="80px">
+
+        <el-row :gutter="24">
+          <el-col :span="23">
+            <el-form-item label="图文详情" prop="detailedDescription">
+              <editor @input="handleChildValue" :value.default="dataForm.detailedDescription"
+                      :height.default="150"></editor>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
       </div>
     </div>
 
 
-    <el-form ref="form" :model="dataForm" :rules="rules" label-width="80px">
+    <el-dialog title="选择商品" :visible.sync="openCommodity" width="1000px" append-to-body :close-on-click-modal="false">
+      <el-container>
+        <el-header style="">
+          <el-form ref="tankForm" :model="commodityForm" label-width="80px">
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="商品分类">
+                  <el-select
+                    v-model="commodityForm.cvsGoodId"
+                    placeholder="全部"
+                    clearable
+                  >
+                    <el-option v-for="item in cvsGoodList" :key="item.id" :label="item.name" :value="item.id"/>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="供应商" prop="supplierId">
+                  <el-select
+                    v-model="commodityForm.supplierId"
+                    placeholder="全部"
+                    clearable
+                  >
+                    <el-option v-for="item in supplierList" :key="item.id" :label="item.name" :value="item.id"/>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="详细信息">
+                  <el-input v-model="commodityForm.remark" placeholder="商品名称，拼音码，条形码等信息"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="4">
+                <el-button type="primary" @click="inquire()">查询</el-button>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-header>
+        <el-main>
+          <el-table
+            ref="tables"
+            :data="commodityList"
+            @row-click="handleRowClick"
+            border
+          >
+            <el-table-column type="index" label="序号"></el-table-column>
+
+            <!-- <el-table-column type="selection" width="55"></el-table-column> -->
+
+            <el-table-column label="商品名称" align="center" prop="name"/>
+            <el-table-column label="商品编码" align="center" prop="goodsNo"/>
+            <el-table-column label="分类名称" prop="cvsGoodId" align="center">
+              <template slot-scope="scope">
+                <span>{{ getName(cvsGoodList, scope.row.cvsGoodId) }}</span>
+              </template>
+            </el-table-column>
+
+            <el-table-column label="供应商" prop="supplierId" align="center">
+              <template slot-scope="scope">
+                <span>{{ getName(supplierList, scope.row.supplierId) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="单位" align="center" prop="unit"/>
+            <el-table-column label="当前库存" align="center" prop="stock"/>
+          </el-table>
+
+        </el-main>
+      </el-container>
+      <!-- <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="addCommodity">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div> -->
+    </el-dialog>
 
-      <el-row :gutter="24">
-        <el-col :span="23">
-          <el-form-item label="图文详情" prop="detailedDescription">
-            <editor @input="handleChildValue" :value.default="dataForm.detailedDescription" :height.default="150"></editor>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="submitForm">确 定</el-button>
-      <el-button @click="cancel">取 消</el-button>
-    </div>
   </div>
-
-
-  <el-dialog title="选择商品" :visible.sync="openCommodity" width="1000px" append-to-body :close-on-click-modal="false">
-    <el-container>
-      <el-header style="">
-        <el-form ref="tankForm" :model="commodityForm" label-width="80px">
-          <el-row :gutter="24">
-            <el-col :span="6">
-              <el-form-item label="商品分类">
-                <el-select
-                  v-model="commodityForm.cvsGoodId"
-                  placeholder="全部"
-                  clearable
-                >
-                  <el-option v-for="item in cvsGoodList" :key="item.id" :label="item.name" :value="item.id"/>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="供应商" prop="supplierId">
-                <el-select
-                  v-model="commodityForm.supplierId"
-                  placeholder="全部"
-                  clearable
-                >
-                  <el-option v-for="item in supplierList" :key="item.id" :label="item.name" :value="item.id"/>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="详细信息">
-                <el-input v-model="commodityForm.remark" placeholder="商品名称，拼音码，条形码等信息" ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-button type="primary" @click="inquire()">查询</el-button>
-            </el-col>
-          </el-row>
-        </el-form>
-      </el-header>
-      <el-main>
-        <el-table
-          ref="tables"
-          :data="commodityList"
-          @row-click="handleRowClick"
-          border
-        >
-          <el-table-column type="index" label="序号"></el-table-column>
-
-          <!-- <el-table-column type="selection" width="55"></el-table-column> -->
-
-          <el-table-column label="商品名称" align="center" prop="name"/>
-          <el-table-column label="商品编码" align="center" prop="goodsNo"/>
-          <el-table-column label="分类名称" prop="cvsGoodId" align="center">
-            <template slot-scope="scope">
-              <span>{{ getName(cvsGoodList, scope.row.cvsGoodId) }}</span>
-            </template>
-          </el-table-column>
-
-          <el-table-column label="供应商" prop="supplierId" align="center">
-            <template slot-scope="scope">
-              <span>{{ getName(supplierList, scope.row.supplierId) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="单位" align="center" prop="unit"/>
-          <el-table-column label="当前库存" align="center" prop="stock"/>
-        </el-table>
-
-      </el-main>
-    </el-container>
-    <!-- <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="addCommodity">确 定</el-button>
-      <el-button @click="cancel">取 消</el-button>
-    </div> -->
-  </el-dialog>
-
-</div>
 </template>
 
 <style scoped lang="scss">
@@ -834,28 +842,30 @@ props:['giftDataF','type'],
   box-sizing: border-box;
   padding: 20px;
 }
-.app-container{
+
+.app-container {
   width: 100%;
   height: 100%;
   background: #f6f8f9;
 }
 
-.d-dialog >>> .el-upload--picture-card {
+.d-dialog > > > .el-upload--picture-card {
   width: 100px;
   height: 100px;
   line-height: 100px;
 }
 
-.d-dialog >>> .avatar-uploader .el-upload {
-  width: 100px;
-  height: 100px;
-}
-.d-dialog >>> .el-upload-list--picture-card .el-upload-list__item {
+.d-dialog > > > .avatar-uploader .el-upload {
   width: 100px;
   height: 100px;
 }
 
-.list-img{
+.d-dialog > > > .el-upload-list--picture-card .el-upload-list__item {
+  width: 100px;
+  height: 100px;
+}
+
+.list-img {
   width: 98px;
   height: 98px;
 }
diff --git a/fuintAdmin/src/views/integral/gift/gift.vue b/fuintAdmin/src/views/integral/gift/gift.vue
index 4b341cd9f..0b758ea97 100644
--- a/fuintAdmin/src/views/integral/gift/gift.vue
+++ b/fuintAdmin/src/views/integral/gift/gift.vue
@@ -142,10 +142,11 @@
           </template>
         </el-table-column>
       </el-table>
+<!--     分页  -->
       <pagination
         v-show="total>0"
         :total="total"
-        :page.sync="queryParams.page"
+        :page.sync="queryParams.pageNo"
         :limit.sync="queryParams.pageSize"
         @pagination="getList"
       />
@@ -652,8 +653,8 @@ export default {
       queryParams: {
         giftName: '',
         status: '',
-        page:null,
-        pageSize:null
+        pageNo:1,
+        pageSize:10
       },
       dateRange:{},
       // 遮罩层
@@ -905,7 +906,7 @@ export default {
     },
     // 搜索按钮操作
     handleQuery() {
-      this.queryParams.page = 1;
+      this.queryParams.pageNo = 1;
       this.getList();
     },
     // 修改按钮
@@ -919,48 +920,6 @@ export default {
         }
 
       });
-
-      //
-      // await this.cardFavorableApi();
-      // await this.cardExchangeApi();
-      // await this.selectGiftCategory();
-      //
-      // this.giftImages = []
-      // data.giftImages = JSON.parse(data.giftImages);
-      // data.giftImages.forEach(res=> {
-      //   let newImage = {
-      //     url: this.imagePath + res,
-      //     fileName: res
-      //   }
-      //   this.giftImages.push(newImage);
-      // }),
-      //
-      //   // data.deliveryMethod = JSON.parse(data.deliveryMethod);
-      //
-      //   console.log("data",data)
-      // this.dataForm = data;
-      // this.changeGiftType(this.dataForm.giftType)
-      // this.changeExchange(this.dataForm.exchangeMethod)
-      // this.changeExpressEDIT()
-      //
-      //
-      // console.log(" this.dataForm", this.dataForm)
-      // this.title = '修改礼品'
-      //
-      // this.open = true;
-      // this.getList();
-    },
-
-    cardFavorableApi () {
-      getCardFavorableApi().then(res=>{
-        this.cardFavorableList = res.data.records
-      })
-    },
-
-    cardExchangeApi () {
-      getCardExchangeApi().then(res=>{
-        this.cardExchangeApiList =res.data.records
-      })
     },
 
     resetQuery() {
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralGiftServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralGiftServiceImpl.java
index 2d4ed607a..783b1a7e9 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralGiftServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralGiftServiceImpl.java
@@ -68,7 +68,8 @@ public class IntegralGiftServiceImpl implements IntegralGiftService {
     public IPage<IntegralGiftVO> queryByPage(@Param("page") Page page, @Param("integralGiftCategory") IntegralGift integralGift) {
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
         integralGift.setStoreId(nowAccountInfo.getStoreId());
-        return integralGiftDao.queryAllByLimit(page, integralGift);
+        IPage<IntegralGiftVO> integralGiftVOIPage = integralGiftDao.queryAllByLimit(page, integralGift);
+        return integralGiftVOIPage;
     }
 
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/controller/CardCouponUserController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/controller/CardCouponUserController.java
index c50768f31..4bb6c46c5 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/controller/CardCouponUserController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/controller/CardCouponUserController.java
@@ -65,6 +65,7 @@ public class CardCouponUserController extends BaseController {
      */
     @PostMapping
     public ResponseObject insert(@RequestBody CardCouponUser cardCouponUser) {
+
         return getSuccessResult(this.cardCouponUserService.save(cardCouponUser));
     }
 
@@ -97,5 +98,18 @@ public class CardCouponUserController extends BaseController {
         Page page =new Page(pageNo,pageSize);
         return getSuccessResult(cardCouponUserService.queryPage(page, cardCouponUserVo));
     }
+
+    /**
+     * 根据 手机号 或 核销码   和 当前店铺id  以及 优惠券类型   兑换券 和 商品兑换券 来查询用户领取 并且 未核销的
+     * @param str  手机号 / 核销码
+     */
+    @GetMapping ("selectUserCardVerification")
+    public ResponseObject selectUserCardVerification(String str,@RequestParam (name = "couponType", required = false, defaultValue = "1,2") Integer[] couponType) {
+
+        List<CardCouponUser> list = cardCouponUserService.selectUserCardVerification(str, couponType);
+
+        return getSuccessResult(list);
+    }
+
 }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/CardCouponUserService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/CardCouponUserService.java
index 285cea020..edd644c24 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/CardCouponUserService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/CardCouponUserService.java
@@ -59,5 +59,9 @@ public interface CardCouponUserService extends IService<CardCouponUser> {
      * @return java.util.List<com.fuint.business.marketingActivity.cardCoupon.entity.CardCouponUser>
     **/
     List<CardCouponUser> selectListByUsed(Integer userId,List<Integer> couponIdList);
+
+
+    List<CardCouponUser> selectUserCardVerification(String str, Integer[] couponType);
+
 }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponUserServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponUserServiceImpl.java
index 22f06d295..4814cd5cd 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponUserServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponUserServiceImpl.java
@@ -171,5 +171,10 @@ public class CardCouponUserServiceImpl extends ServiceImpl<CardCouponUserMapper,
                 .eq(CardCouponUser::getStatus,"1");
         return this.list(queryWrapper);
     }
+
+    @Override
+    public List<CardCouponUser> selectUserCardVerification(String str, Integer[] couponType) {
+        return null;
+    }
 }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/service/impl/CardExchangeRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/service/impl/CardExchangeRecordServiceImpl.java
index 7c604a43b..a61a47bb8 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/service/impl/CardExchangeRecordServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/service/impl/CardExchangeRecordServiceImpl.java
@@ -44,7 +44,7 @@ public class CardExchangeRecordServiceImpl extends ServiceImpl<CardExchangeRecor
      */
     @Override
     public IPage select(Page page, CardExchangeRecord cardExchangeRecord) {
-        //获取当前店铺的id和连锁店id
+        // 根据 手机号 或 核销码   和 当前店铺id  以及 优惠券类型   兑换券 和 商品兑换券 来查询用户领取 并且 未核销的
         if (ObjectUtils.isNotEmpty(TokenUtil.getNowAccountInfo().getStoreId())) {
             cardExchangeRecord.setStoreId(TokenUtil.getNowAccountInfo().getStoreId());
             cardExchangeRecord.setChainStorId(storeService.getById(TokenUtil.getNowAccountInfo().getStoreId()).getChainStoreId());
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGiftActive/entity/CardGiftActive.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGiftActive/entity/CardGiftActive.java
index 7b8bd981f..4088b5b27 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGiftActive/entity/CardGiftActive.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGiftActive/entity/CardGiftActive.java
@@ -29,10 +29,10 @@ public class CardGiftActive extends Model<CardGiftActive> {
     //礼品卡金额
     private Double cardAmount;
     //有效期开始时间
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date effectiveTimeStart;
     //有效期结束时间
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date effectiveTimeEnd;
     //卡类型比如纸卡  使用数据字典 card_gift_type
     private String cardType;
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CreditUnitServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CreditUnitServiceImpl.java
index 501c3ec75..52aa1bffa 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CreditUnitServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CreditUnitServiceImpl.java
@@ -122,9 +122,9 @@ public class CreditUnitServiceImpl extends ServiceImpl<CreditUnitMapper, CreditU
         LJStore store = storeService.selectStoreByStoreId(nowAccountInfo.getStoreId());
         creditUnit.setStoreId(store.getId());
         creditUnit.setChainStoreId(store.getChainStoreId());
-        if (creditUnit.getStaffId()==null){
-            creditUnit.setStaffId(nowAccountInfo.getId());
-        }
+//        if (creditUnit.getStaffId()==null){
+//            creditUnit.setStaffId(nowAccountInfo.getId());
+//        }
 //        查询挂账单位是否存在
         QueryWrapper queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("unit_name",creditUnit.getUnitName());
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue b/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue
index a7f4f5235..e17a5b6b4 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue
@@ -3,21 +3,27 @@
   <div class="app-containerss">
 
     <div class="tab-box">
-      <div class="tab_" :class="{active:index== tabindex }" @click="getindex(index)" v-for="(item,index) in  tabs"  :key="index">
-        {{item}}
+      <div class="tab_" :class="{active:index== tabindex }" @click="getindex(index)" v-for="(item,index) in  tabs"
+           :key="index"
+      >
+        {{ item }}
       </div>
     </div>
     <div v-if="tabindex == 0">
-      <div class="card-box" style="width: 98%;margin: 10px auto;background: #fff;box-sizing: border-box;padding-top: 15px" >
+      <div class="card-box"
+           style="width: 98%;margin: 10px auto;background: #fff;box-sizing: border-box;padding-top: 15px"
+      >
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
           <el-form-item label="" prop="status">
             <el-select v-model="queryParams.status" style="width: 230px" placeholder="交班方式" clearable>
-              <el-option  label="统一交班" value="统一交班">统一交班</el-option>
-              <el-option  label="个人交班" value="个人交班">个人交班</el-option>
+              <el-option label="统一交班" value="统一交班">统一交班</el-option>
+              <el-option label="个人交班" value="个人交班">个人交班</el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="" prop="staffId">
-            <el-select v-model="queryParams.staffId" style="width: 230px" placeholder="交班员工" clearable      :disabled="queryParams.status== '统一交班'"   >
+            <el-select v-model="queryParams.staffId" style="width: 230px" placeholder="交班员工" clearable
+                       :disabled="queryParams.status== '统一交班'"
+            >
               <el-option
                 v-for="option in staffList"
                 :key="option.id"
@@ -27,12 +33,18 @@
             </el-select>
           </el-form-item>
           <el-form-item class="flex-container" style="float: right">
-            <el-button type="primary" icon="el-icon-search"  @click="handleQuery"  :disabled="queryParams.staffId == null" >搜索</el-button>
-            <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
+            <el-button type="primary" icon="el-icon-search" @click="handleQuery"
+                       :disabled="queryParams.staffId == null"
+            >搜索
+            </el-button>
+            <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
       </div>
-      <div style="width: 25%; margin: 0 auto; margin-top: 10px; margin-bottom: 10px; background: #FFFFFF;box-sizing: border-box;padding: 15px; height: 78vh;"   class="b-c-ad">
+      <div
+        style="width: 25%; margin: 0 auto; margin-top: 10px; margin-bottom: 10px; background: #FFFFFF;box-sizing: border-box;padding: 15px; height: 78vh;"
+        class="b-c-ad"
+      >
         <div class="title_" style="display: flex;justify-content: space-between">
           <div style="width: 10%;"></div>
           <div>门店交接单</div>
@@ -40,35 +52,35 @@
         </div>
         <div class="d-s-b">
           <div>油站名称</div>
-          <div>{{baseInfo.storeName}}</div>
+          <div>{{ baseInfo.storeName }}</div>
         </div>
         <div class="d-s-b">
           <div>油站站长</div>
-          <div>{{baseInfo.realName}}</div>
+          <div>{{ baseInfo.realName }}</div>
         </div>
         <div class="d-s-b">
           <div>交班方式</div>
-          <div>{{baseInfo.handoverType}}</div>
+          <div>{{ baseInfo.handoverType }}</div>
         </div>
         <div class="d-s-b">
           <div>开始时间</div>
-          <div>{{baseInfo.startTime}}</div>
+          <div>{{ baseInfo.startTime }}</div>
         </div>
         <div class="d-s-b">
           <div>结束时间</div>
-          <div>{{baseInfo.endTime}}</div>
+          <div>{{ baseInfo.endTime }}</div>
         </div>
         <div class="d-s-b">
           <div>订单金额</div>
-          <div>{{orderSummary.oilOrder}}</div>
+          <div>{{ orderSummary.oilOrder }}</div>
         </div>
         <div class="d-s-b">
           <div>优惠金额</div>
-          <div>{{orderSummary.allDis}}</div>
+          <div>{{ orderSummary.allDis }}</div>
         </div>
         <div class="d-s-b">
           <div>退款金额</div>
-          <div>{{orderSummary.oilRefund}}</div>
+          <div>{{ orderSummary.oilRefund }}</div>
         </div>
         <div class="d-s-b">
           <div>挂账金额</div>
@@ -76,277 +88,283 @@
         </div>
         <div class="d-s-b">
           <div>会员消费</div>
-          <div>{{orderSummary.allBalanceP}}</div>
+          <div>{{ orderSummary.allBalanceP }}</div>
         </div>
         <div class="d-s-b">
           <div>实收金额</div>
-          <div>{{orderSummary.allMoney}}</div>
+          <div>{{ orderSummary.allMoney }}</div>
         </div>
         <div class="d-s-b">
           <div>充值金额</div>
-          <div>{{orderSummary.cardPaid}}</div>
+          <div>{{ orderSummary.cardPaid }}</div>
         </div>
         <div class="d-s-b">
           <div>充值赠送</div>
-          <div>{{orderSummary.cardGiftPaid}}</div>
+          <div>{{ orderSummary.cardGiftPaid }}</div>
         </div>
         <div class="d-s-b">
           <div>会员总余额</div>
-          <div>{{orderSummary.points}}</div>
+          <div>{{ orderSummary.points }}</div>
         </div>
         <div class="d-s-b">
           <div>会员总积分</div>
-          <div>{{orderSummary.sumnum}}</div>
+          <div>{{ orderSummary.sumnum }}</div>
         </div>
         <div class="xxing"></div>
         <div style="overflow: auto; height: 32vh;scrollbar-width: none; ">
-        <div class="for-box">
-          <div class="for-title">
-            <div class="x-"></div>
-            <div>营业收入统计</div>
-            <div class="x-"></div>
-          </div>
-          <div class="d-s-b" style="font-weight: 600">
-            <div class="l-size">类型</div>
-            <div class="f-size">订单金额</div>
-            <div class="r-size">实收金额</div>
-          </div>
-          <div class="d-s-b">
-            <div class="l-size">营业总额</div>
-            <div class="s-size">{{orderSummary.allyingye1}}</div>
-            <div class="r-size">￥{{orderSummary.allyingye}}</div>
-          </div>
-          <div class="d-s-b">
-            <div class="l-size">充值总额</div>
-            <div class="s-size">{{orderSummary.allchuzhika1}}</div>
-            <div class="r-size">￥{{orderSummary.allchuzhika}}</div>
-          </div>
-          <div class="d-s-b">
-            <div class="l-size">合计</div>
-            <div class="s-size">{{orderSummary.allyingye1 + orderSummary.allchuzhika1}}</div>
-            <div class="r-size">￥{{orderSummary.allyingye + orderSummary.allchuzhika}}</div>
-          </div>
-        </div>
-
-
-        <div class="for-box">
-          <div class="for-title">
-            <div class="x-"></div>
-            <div>支付方式统计</div>
-            <div class="x-"></div>
-          </div>
-          <div class="d-s-b" style="font-weight: 600">
-            <div class="l-size">支付方式</div>
-            <div class="f-size">笔数</div>
-            <div class="r-size">实收金额</div>
-          </div>
-          <div class="d-s-b" v-for="item in paymentAggregation" v-if="item.flag == 'all'">
-            <div class="l-size">{{calculateThePaymentMethod(item.payType)}}</div>
-            <div class="s-size">{{item.numberOfDeals}}</div>
-            <div class="r-size">￥{{item.paidAmount}}</div>
-          </div>
-        </div>
-
-        <div class="for-box">
-          <div class="for-title">
-            <div class="x-"></div>
-            <div>油品实收统计</div>
-            <div class="x-"></div>
-          </div>
-          <div class="d-s-b" style="font-weight: 600">
-            <div class="l-size">油号</div>
-            <div class="f-size">笔数</div>
-            <div class="r-size">实收金额</div>
-          </div>
-          <div class="d-s-b" v-for="item in oilNumberStatistics">
-            <div class="l-size">{{item.oilName}}</div>
-            <div class="s-size">{{item.numberOfDeals}}</div>
-            <div class="r-size">￥{{item.paidAmount}}</div>
-          </div>
-        </div>
-
-        <div class="for-box">
-          <div class="for-title">
-            <div class="x-"></div>
-            <div>优惠统计</div>
-            <div class="x-"></div>
-          </div>
-          <div class="d-s-b" style="font-weight: 600">
-            <div class="l-size">油号</div>
-            <div class="f-size">笔数</div>
-            <div class="r-size">实收金额</div>
-          </div>
-          <div class="d-s-b" v-for="item in oilNumberStatistics">
-            <div class="l-size">{{item.oilName}}</div>
-            <div class="s-size">{{item.numberOfDeals}}</div>
-            <div class="r-size">￥{{item.paidAmount}}</div>
-          </div>
-        </div>
-
-        <div class="for-box">
-          <div class="for-title">
-            <div class="x-"></div>
-            <div>退款统计</div>
-            <div class="x-"></div>
-          </div>
-          <div class="d-s-b" style="font-weight: 600">
-            <div class="l-size">类型</div>
-            <div class="f-size">笔数</div>
-            <div class="r-size">实收金额</div>
-          </div>
-          <div class="d-s-b" v-for="item in oilNumberStatistics">
-            <div class="l-size">{{item.oilName}}</div>
-            <div class="s-size">{{item.numberOfDeals}}</div>
-            <div class="r-size">￥{{item.paidAmount}}</div>
-          </div>
-        </div>
-
-
-        <div class="for-box">
-          <div class="for-title">
-            <div class="x-"></div>
-            <div>挂账统计</div>
-            <div class="x-"></div>
-          </div>
-          <div class="d-s-b" style="font-weight: 600">
-            <div class="l-size">挂账单位</div>
-            <div class="f-size">笔数</div>
-            <div class="r-size">实收金额</div>
-          </div>
-          <div class="d-s-b" v-for="item in paymentAggregation" v-if="item.flag == 'all' && item.payType == 'balance'">
-            <div class="l-size">{{item.name}}</div>
-            <div class="s-size">{{item.numberOfDeals?item.numberOfDeals:'--'}}</div>
-            <div class="r-size">￥{{item.paidAmount?item.paidAmount:'--'}}</div>
-          </div>
-        </div>
-
-        <div class="for-box">
-          <div class="for-title">
-            <div class="x-"></div>
-            <div>会员充值统计</div>
-            <div class="x-"></div>
-          </div>
-          <div class="d-s-b" style="font-weight: 600">
-            <div class="l-size">支付方式</div>
-            <div class="f-size">笔数</div>
-            <div class="r-size">实收金额</div>
-          </div>
-          <div class="d-s-b" v-for="item in paymentAggregation" v-if="item.flag == 'allbalance'">
-            <div class="l-size">{{calculateThePaymentMethod(item.payType)}}</div>
-            <div class="s-size">{{item.numberOfDeals?item.numberOfDeals:'--'}}</div>
-            <div class="r-size">￥{{item.paidAmount?item.paidAmount:'--'}}</div>
-          </div>
-        </div>
-
-        <div class="for-box">
-          <div class="for-title">
-            <div class="x-"></div>
-            <div>会员消费统计</div>
-            <div class="x-"></div>
-          </div>
-          <div class="d-s-b" style="font-weight: 600">
-            <div class="l-size">支付方式</div>
-            <div class="f-size">笔数</div>
-            <div class="r-size">实收金额</div>
-          </div>
-          <div class="d-s-b" v-for="item in paymentAggregation" v-if="item.flag == 'all' && item.payType == 'balance'">
-            <div class="l-size">合计</div>
-            <div class="s-size">{{item.numberOfDeals?item.numberOfDeals:'--'}}</div>
-            <div class="r-size">￥{{item.paidAmount?item.paidAmount:'--'}}</div>
-          </div>
-        </div>
-
-        <div class="for-box">
-          <div class="for-title">
-            <div class="x-"></div>
-            <div>便利店统计</div>
-            <div class="x-"></div>
-          </div>
-          <div class="d-s-b" style="font-weight: 600">
-            <div class="l-size">支付方式</div>
-            <div class="f-size">笔数</div>
-            <div class="r-size">实收金额</div>
-          </div>
-          <div class="d-s-b" v-for="item in paymentAggregation" v-if="item.flag == 'goods'">
-            <div class="l-size">{{calculateThePaymentMethod(item.payType)}}</div>
-            <div class="s-size">{{item.numberOfDeals?item.numberOfDeals:'--'}}</div>
-            <div class="r-size">￥{{item.paidAmount?item.paidAmount:'--'}}</div>
-          </div>
-        </div>
-
-
-        <div class="for-box">
-          <div class="for-title">
-            <div class="x-"></div>
-            <div>积分商城统计</div>
-            <div class="x-"></div>
-          </div>
-          <div class="d-s-b" style="font-weight: 600">
-            <div class="l-size">支付方式</div>
-            <div class="f-size">笔数</div>
-            <div class="r-size">实收金额</div>
-          </div>
-          <div class="d-s-b" v-for="item in paymentAggregation" v-if="item.flag == 'point'">
-            <div class="l-size">{{calculateThePaymentMethod(item.payType)}}</div>
-            <div class="s-size">{{item.numberOfDeals?item.numberOfDeals:'--'}}</div>
-            <div class="r-size">￥{{item.paidAmount?item.paidAmount:'--'}}</div>
-          </div>
-        </div>
-
-
-        <div class="for-box">
-          <div class="for-title">
-            <div class="x-"></div>
-            <div>新增会员统计</div>
-            <div class="x-"></div>
-          </div>
-          <div class="d-s-b" style="font-weight: 600">
-            <div class="l-size">新增会员数</div>
-            <!--          <div class="f-size">笔数</div>-->
-            <div class="r-size">{{orderSummary.sumnum}}</div>
+          <div class="for-box">
+            <div class="for-title">
+              <div class="x-"></div>
+              <div>营业收入统计</div>
+              <div class="x-"></div>
+            </div>
+            <div class="d-s-b" style="font-weight: 600">
+              <div class="l-size">类型</div>
+              <div class="f-size">订单金额</div>
+              <div class="r-size">实收金额</div>
+            </div>
+            <div class="d-s-b">
+              <div class="l-size">营业总额</div>
+              <div class="s-size">{{ orderSummary.allyingye1 }}</div>
+              <div class="r-size">￥{{ orderSummary.allyingye }}</div>
+            </div>
+            <div class="d-s-b">
+              <div class="l-size">充值总额</div>
+              <div class="s-size">{{ orderSummary.allchuzhika1 }}</div>
+              <div class="r-size">￥{{ orderSummary.allchuzhika }}</div>
+            </div>
+            <div class="d-s-b">
+              <div class="l-size">合计</div>
+              <div class="s-size">{{ orderSummary.allyingye1 + orderSummary.allchuzhika1 }}</div>
+              <div class="r-size">￥{{ orderSummary.allyingye + orderSummary.allchuzhika }}</div>
+            </div>
           </div>
 
-        </div>
+
+          <div class="for-box">
+            <div class="for-title">
+              <div class="x-"></div>
+              <div>支付方式统计</div>
+              <div class="x-"></div>
+            </div>
+            <div class="d-s-b" style="font-weight: 600">
+              <div class="l-size">支付方式</div>
+              <div class="f-size">笔数</div>
+              <div class="r-size">实收金额</div>
+            </div>
+            <div class="d-s-b" v-for="item in paymentAggregation" v-if="item.flag == 'all'">
+              <div class="l-size">{{ calculateThePaymentMethod(item.payType) }}</div>
+              <div class="s-size">{{ item.numberOfDeals }}</div>
+              <div class="r-size">￥{{ item.paidAmount }}</div>
+            </div>
+          </div>
+
+          <div class="for-box">
+            <div class="for-title">
+              <div class="x-"></div>
+              <div>油品实收统计</div>
+              <div class="x-"></div>
+            </div>
+            <div class="d-s-b" style="font-weight: 600">
+              <div class="l-size">油号</div>
+              <div class="f-size">笔数</div>
+              <div class="r-size">实收金额</div>
+            </div>
+            <div class="d-s-b" v-for="item in oilNumberStatistics">
+              <div class="l-size">{{ item.oilName }}</div>
+              <div class="s-size">{{ item.numberOfDeals }}</div>
+              <div class="r-size">￥{{ item.paidAmount }}</div>
+            </div>
+          </div>
+
+          <div class="for-box">
+            <div class="for-title">
+              <div class="x-"></div>
+              <div>优惠统计</div>
+              <div class="x-"></div>
+            </div>
+            <div class="d-s-b" style="font-weight: 600">
+              <div class="l-size">油号</div>
+              <div class="f-size">笔数</div>
+              <div class="r-size">实收金额</div>
+            </div>
+            <div class="d-s-b" v-for="item in oilNumberStatistics">
+              <div class="l-size">{{ item.oilName }}</div>
+              <div class="s-size">{{ item.numberOfDeals }}</div>
+              <div class="r-size">￥{{ item.paidAmount }}</div>
+            </div>
+          </div>
+
+          <div class="for-box">
+            <div class="for-title">
+              <div class="x-"></div>
+              <div>退款统计</div>
+              <div class="x-"></div>
+            </div>
+            <div class="d-s-b" style="font-weight: 600">
+              <div class="l-size">类型</div>
+              <div class="f-size">笔数</div>
+              <div class="r-size">实收金额</div>
+            </div>
+            <div class="d-s-b" v-for="item in oilNumberStatistics">
+              <div class="l-size">{{ item.oilName }}</div>
+              <div class="s-size">{{ item.numberOfDeals }}</div>
+              <div class="r-size">￥{{ item.paidAmount }}</div>
+            </div>
+          </div>
 
 
-        <div class="for-box">
-          <div class="for-title">
-            <div class="x-"></div>
-            <div>挂账归还统计(再处理)</div>
-            <div class="x-"></div>
+          <div class="for-box">
+            <div class="for-title">
+              <div class="x-"></div>
+              <div>挂账统计</div>
+              <div class="x-"></div>
+            </div>
+            <div class="d-s-b" style="font-weight: 600">
+              <div class="l-size">挂账单位</div>
+              <div class="f-size">笔数</div>
+              <div class="r-size">实收金额</div>
+            </div>
+            <div class="d-s-b" v-for="item in paymentAggregation"
+                 v-if="item.flag == 'all' && item.payType == 'balance'"
+            >
+              <div class="l-size">{{ item.name }}</div>
+              <div class="s-size">{{ item.numberOfDeals ? item.numberOfDeals : '--' }}</div>
+              <div class="r-size">￥{{ item.paidAmount ? item.paidAmount : '--' }}</div>
+            </div>
           </div>
-          <div class="d-s-b" style="font-weight: 600">
-            <div class="l-size">支付方式</div>
-            <div class="f-size">笔数</div>
-            <div class="r-size">实收金额</div>
-          </div>
-          <div class="d-s-b" v-for="item in returnedToTheAccount">
-            <div class="l-size">{{item.name?item.name:'--'}}</div>
-            <div class="s-size">{{item.numberOfDeals?item.numberOfDeals:'--'}}</div>
-            <div class="r-size">￥{{item.paidAmount?item.paidAmount:'--'}}</div>
-          </div>
-        </div>
 
-        <div class="for-box">
-          <div class="for-title">
-            <div class="x-"></div>
-            <div>员工实收统计</div>
-            <div class="x-"></div>
+          <div class="for-box">
+            <div class="for-title">
+              <div class="x-"></div>
+              <div>会员充值统计</div>
+              <div class="x-"></div>
+            </div>
+            <div class="d-s-b" style="font-weight: 600">
+              <div class="l-size">支付方式</div>
+              <div class="f-size">笔数</div>
+              <div class="r-size">实收金额</div>
+            </div>
+            <div class="d-s-b" v-for="item in paymentAggregation" v-if="item.flag == 'allbalance'">
+              <div class="l-size">{{ calculateThePaymentMethod(item.payType) }}</div>
+              <div class="s-size">{{ item.numberOfDeals ? item.numberOfDeals : '--' }}</div>
+              <div class="r-size">￥{{ item.paidAmount ? item.paidAmount : '--' }}</div>
+            </div>
           </div>
-          <div class="d-s-b" style="font-weight: 600">
-            <div class="l-size">员工</div>
-            <div class="f-size">笔数</div>
-            <div class="r-size">实收金额</div>
+
+          <div class="for-box">
+            <div class="for-title">
+              <div class="x-"></div>
+              <div>会员消费统计</div>
+              <div class="x-"></div>
+            </div>
+            <div class="d-s-b" style="font-weight: 600">
+              <div class="l-size">支付方式</div>
+              <div class="f-size">笔数</div>
+              <div class="r-size">实收金额</div>
+            </div>
+            <div class="d-s-b" v-for="item in paymentAggregation"
+                 v-if="item.flag == 'all' && item.payType == 'balance'"
+            >
+              <div class="l-size">合计</div>
+              <div class="s-size">{{ item.numberOfDeals ? item.numberOfDeals : '--' }}</div>
+              <div class="r-size">￥{{ item.paidAmount ? item.paidAmount : '--' }}</div>
+            </div>
           </div>
-          <div class="d-s-b" v-for="item in employeeStatistics">
-            <div class="l-size">{{item.name?item.name:'--'}}</div>
-            <div class="s-size">{{item.numberOfDeals?item.numberOfDeals:'--'}}</div>
-            <div class="r-size">￥{{item.paidAmount?item.paidAmount:'--'}}</div>
+
+          <div class="for-box">
+            <div class="for-title">
+              <div class="x-"></div>
+              <div>便利店统计</div>
+              <div class="x-"></div>
+            </div>
+            <div class="d-s-b" style="font-weight: 600">
+              <div class="l-size">支付方式</div>
+              <div class="f-size">笔数</div>
+              <div class="r-size">实收金额</div>
+            </div>
+            <div class="d-s-b" v-for="item in paymentAggregation" v-if="item.flag == 'goods'">
+              <div class="l-size">{{ calculateThePaymentMethod(item.payType) }}</div>
+              <div class="s-size">{{ item.numberOfDeals ? item.numberOfDeals : '--' }}</div>
+              <div class="r-size">￥{{ item.paidAmount ? item.paidAmount : '--' }}</div>
+            </div>
+          </div>
+
+
+          <div class="for-box">
+            <div class="for-title">
+              <div class="x-"></div>
+              <div>积分商城统计</div>
+              <div class="x-"></div>
+            </div>
+            <div class="d-s-b" style="font-weight: 600">
+              <div class="l-size">支付方式</div>
+              <div class="f-size">笔数</div>
+              <div class="r-size">实收金额</div>
+            </div>
+            <div class="d-s-b" v-for="item in paymentAggregation" v-if="item.flag == 'point'">
+              <div class="l-size">{{ calculateThePaymentMethod(item.payType) }}</div>
+              <div class="s-size">{{ item.numberOfDeals ? item.numberOfDeals : '--' }}</div>
+              <div class="r-size">￥{{ item.paidAmount ? item.paidAmount : '--' }}</div>
+            </div>
+          </div>
+
+
+          <div class="for-box">
+            <div class="for-title">
+              <div class="x-"></div>
+              <div>新增会员统计</div>
+              <div class="x-"></div>
+            </div>
+            <div class="d-s-b" style="font-weight: 600">
+              <div class="l-size">新增会员数</div>
+              <!--          <div class="f-size">笔数</div>-->
+              <div class="r-size">{{ orderSummary.sumnum }}</div>
+            </div>
+
+          </div>
+
+
+          <div class="for-box">
+            <div class="for-title">
+              <div class="x-"></div>
+              <div>挂账归还统计(再处理)</div>
+              <div class="x-"></div>
+            </div>
+            <div class="d-s-b" style="font-weight: 600">
+              <div class="l-size">支付方式</div>
+              <div class="f-size">笔数</div>
+              <div class="r-size">实收金额</div>
+            </div>
+            <div class="d-s-b" v-for="item in returnedToTheAccount">
+              <div class="l-size">{{ item.name ? item.name : '--' }}</div>
+              <div class="s-size">{{ item.numberOfDeals ? item.numberOfDeals : '--' }}</div>
+              <div class="r-size">￥{{ item.paidAmount ? item.paidAmount : '--' }}</div>
+            </div>
+          </div>
+
+          <div class="for-box">
+            <div class="for-title">
+              <div class="x-"></div>
+              <div>员工实收统计</div>
+              <div class="x-"></div>
+            </div>
+            <div class="d-s-b" style="font-weight: 600">
+              <div class="l-size">员工</div>
+              <div class="f-size">笔数</div>
+              <div class="r-size">实收金额</div>
+            </div>
+            <div class="d-s-b" v-for="item in employeeStatistics">
+              <div class="l-size">{{ item.name ? item.name : '--' }}</div>
+              <div class="s-size">{{ item.numberOfDeals ? item.numberOfDeals : '--' }}</div>
+              <div class="r-size">￥{{ item.paidAmount ? item.paidAmount : '--' }}</div>
+            </div>
           </div>
-        </div>
         </div>
       </div>
-      <div style="width: 98%; margin: 10px auto;display: flex;align-items: center;justify-content: center; background: #fff;box-sizing: border-box;padding: 15px " >
+      <div
+        style="width: 98%; margin: 10px auto;display: flex;align-items: center;justify-content: center; background: #fff;box-sizing: border-box;padding: 15px "
+      >
         <el-button type="primary" @click="shift()">交班</el-button>
       </div>
     </div>
@@ -355,7 +373,7 @@
     </div>
     <el-dialog title="订单详情" :visible.sync="openDetail" width="600px" append-to-body :close-on-click-modal="false">
       <!--      <detail :dataForm = "recordData"></detail>-->
-      <HandoverOnly :recordData = "recordData"></HandoverOnly>
+      <HandoverOnly :recordData="recordData"></HandoverOnly>
     </el-dialog>
   </div>
 </template>
@@ -368,42 +386,42 @@ import {
   getStatisticsApi,
   getDicts,
   listStaff
-} from "@/api/handover/handover";
+} from '@/api/handover/handover'
 
-import HandoverOnly from "@/views/cashier/NewComponents/HandoverOnly.vue";
-import HandoverRecord from "@/views/cashier/NewComponents/HandoverRecord.vue";
+import HandoverOnly from '@/views/cashier/NewComponents/HandoverOnly.vue'
+import HandoverRecord from '@/views/cashier/NewComponents/HandoverRecord.vue'
 
 export default {
-  name: "pointsCashier",
-  components: {HandoverRecord, HandoverOnly},
+  name: 'pointsCashier',
+  components: { HandoverRecord, HandoverOnly },
 
   // dicts: ['zhzt'],
 
   data() {
     return {
 
-      tabs:[
-        "交接班",
-        "交班记录"
+      tabs: [
+        '交接班',
+        '交班记录'
       ],
-      value:'',
-      tabindex:0,
-      openDetail:false,
-      dataForm:{},
-      dataList:[],
-      recordData:'',
-      zhztList:'',
-      shiftHandoverList:'',
-      handoverList : {},
-      handoverData:{},
-      baseInfo:{},
-      billingDetails:[],
-      employeeStatistics:[],
-      greaseGunStatistics:[],
-      oilNumberStatistics:[],
-      orderSummary:{},
-      paymentAggregation:[],
-      returnedToTheAccount:[],
+      value: '',
+      tabindex: 0,
+      openDetail: false,
+      dataForm: {},
+      dataList: [],
+      recordData: '',
+      zhztList: '',
+      shiftHandoverList: '',
+      handoverList: {},
+      handoverData: {},
+      baseInfo: {},
+      billingDetails: [],
+      employeeStatistics: [],
+      greaseGunStatistics: [],
+      oilNumberStatistics: [],
+      orderSummary: {},
+      paymentAggregation: [],
+      returnedToTheAccount: [],
       // base
       queryParams: {
 
@@ -411,37 +429,51 @@ export default {
         status: '统一交班',
         type: '',
 
-        page:null,
-        pageSize:null
+        page: null,
+        pageSize: null
       },
       loading: false,
-      dateRange: [new Date(),new Date()],
-      beginTime:new Date(),
-      endTime:new Date(),
-      defaultSort: {prop: 'createTime', order: 'descending'},
+      dateRange: [new Date(), new Date()],
+      beginTime: new Date(),
+      endTime: new Date(),
+      defaultSort: { prop: 'createTime', order: 'descending' },
 
       total: 0,
-      staffList:[],
+      staffList: [],
       statisticsForm: {
-        num:0,
-        exchangeQuantity:0,
-        integral:0,
-        amount:0
+        num: 0,
+        exchangeQuantity: 0,
+        integral: 0,
+        amount: 0
       }
     }
   },
   created() {
-    this.getList();
-    this.getHandover();
-    this.getStatistics();
-    this.getStatus();
-    this.getStaffList();
+    this.getList()
+    this.getHandover()
+    this.getStatistics()
+    this.getStatus()
+    this.getStaffList()
+  },
+  watch: {
+    'queryParams.status': {
+      handler(newVal, oldVal) {
+        if (newVal == '统一交班') {
+          this.queryParams.staffId = null
+          this.getList()
+          this.getHandover()
+        }
+      },
+      immediate: false, // 是否在侦听器创建时立即触发回调
+      deep: false // 是否深度监听
+    }
+
   },
   methods: {
     getHandover() {
-      getHandoverApi2(this.queryParams).then(res=>{
+      getHandoverApi2(this.queryParams).then(res => {
         // this.handoverList = res.data;
-        this.handoverData = res.data;
+        this.handoverData = res.data
         this.baseInfo = this.handoverData.baseInfo,
           this.billingDetails = this.handoverData.billingDetails,
           this.employeeStatistics = this.handoverData.employeeStatistics,
@@ -450,43 +482,49 @@ export default {
           this.orderSummary = this.handoverData.orderSummary,
           this.paymentAggregation = this.handoverData.paymentAggregation,
           this.returnedToTheAccount = this.handoverData.returnedToTheAccount,
-          console.log("this.handoverList",this.handoverList)
+          console.log('this.handoverList', this.handoverList)
       })
-    },
+    }
+    ,
 
-    getindex(index){
+    getindex(index) {
       this.tabindex = index
-    },
-    getList(){
+    }
+    ,
+    getList() {
       this.dateRange = []
       if (this.beginTime && this.endTime) {
         this.dateRange.push(this.beginTime.toLocaleDateString())
         this.dateRange.push(this.endTime.toLocaleDateString())
       }
-      getHandoverListApi(this.addDateRange(this.queryParams, this.dateRange)).then(res=>{
+      getHandoverListApi(this.addDateRange(this.queryParams, this.dateRange)).then(res => {
         this.dataList = res.data.records
         this.total = res.data.total
 
       })
-    },
+    }
+    ,
     getStatistics() {
-      getStatisticsApi().then(res=>{
+      getStatisticsApi().then(res => {
         this.statisticsForm = res.data
       })
-      console.log("123123123",this.statisticsForm)
-    },
+      console.log('123123123', this.statisticsForm)
+    }
+    ,
 
     // 获取支付方式
     getZhzt() {
-      getDicts("zhzt").then(response => {
-        this.zhztList = response.data;
+      getDicts('zhzt').then(response => {
+        this.zhztList = response.data
       })
-    },
+    }
+    ,
     getStatus() {
-      getDicts("handover").then(response => {
-        this.shiftHandoverList = response.data;
+      getDicts('handover').then(response => {
+        this.shiftHandoverList = response.data
       })
-    },
+    }
+    ,
 // 交班
     async shift() {
       let msg = '交班, 是否继续?'
@@ -518,87 +556,100 @@ export default {
             //   location.href = '/';
             // })
           }
-          this.getHandover();
+          this.getHandover()
         })
       })
-    },
-    handleUpdate(){},
-    handleQuery(){
-      this.getList();
-      this.getHandover();
-    },
+    }
+    ,
+    handleUpdate() {
+    }
+    ,
+    handleQuery() {
+      this.getList()
+      this.getHandover()
+    }
+    ,
     getStaffList() {
-      listStaff(this.addDateRange({  page: 1,
-        pageSize: 10000})).then(response => {
-          this.staffList = response.data.records;
+      listStaff(this.addDateRange({
+        page: 1,
+        pageSize: 10000
+      })).then(response => {
+          this.staffList = response.data.records
 
         }
-      );
-    },
-    resetQuery(){
+      )
+    }
+    ,
+    resetQuery() {
       this.queryParams = {
         giftName: '',
         status: '统一交班',
         mobile: '',
         orderNumber: '',
-        page:1,
-        pageSize:10
+        page: 1,
+        pageSize: 10
       },
         this.dateRange = []
-      this.beginTime = "";
-      this.endTime = ""
-      this.getList();
-    },
+      this.beginTime = ''
+      this.endTime = ''
+      this.getList()
+    }
+    ,
     printLocally(data) {
-      printLocallyApi(data).then(res=>{
+      printLocallyApi(data).then(res => {
 
       })
-    },
-    handleDetail(data){
+    }
+    ,
+    handleDetail(data) {
       this.openDetail = true
-      this.recordData = data.recordData;
+      this.recordData = data.recordData
       // JSON.parse(this.recordData )
-      console.log("data.recordData;",this.recordData)
+      console.log('data.recordData;', this.recordData)
 
-    },
+    }
+    ,
     goToAbout() {
       this.$router.push({
-        path:'/Handover',
-        query:{
-          id:9
+        path: '/Handover',
+        query: {
+          id: 9
         }
-      });
-    },
+      })
+    }
+    ,
     billingDetails1() {
-      let count = [];
+      let count = []
       if (this.billingDetails) {
         return this.billingDetails
       }
-      return count;
-    },
+      return count
+    }
+    ,
     calculateThePaymentMethod(payType) {
       switch (payType) {
         case 'ALIPAY':
           return '支付宝'
-          break;
+          break
         case 'WECHAT':
           return '微信'
-          break;
+          break
         case 'UNIONPAY':
           return '银联二维码'
-          break;
+          break
         case 'CASH':
           return '现金'
-          break;
+          break
         case 'balance':
           return '余额'
-          break;
+          break
         case 'oilCard':
           return '油卡'
-          break;
+          break
       }
       return '未知'
-    },
+    }
+
   }
 }
 </script>
@@ -613,19 +664,22 @@ export default {
   display: flex;
   flex-direction: column;
 }
-.tab-box{
+
+.tab-box {
   width: 100%;
   background: #fff;
   display: flex;
   box-sizing: border-box;
-  padding:  5px;
+  padding: 5px;
   padding-bottom: 0px;
   border-top: 1px solid #eceff1;
 }
-.box_{
+
+.box_ {
   height: 100%;
   border-bottom: 2px solid #fe9554;
 }
+
 .box {
   padding: 10px;
   height: 80px;
@@ -639,25 +693,29 @@ export default {
   align-items: left;
   text-align: left;
 }
-.box-card{
+
+.box-card {
   width: 640px;
   margin: 0 auto;
   margin-bottom: 15px;
 
 }
+
 .font-chinese {
   font-size: 15px;
-  font-family:Microsoft YaHei;
+  font-family: Microsoft YaHei;
   font-weight: bold;
-  line-height:1.5
+  line-height: 1.5
 }
+
 .font-number {
   font-size: 20px;
-  font-family: PingFang SC,sans-serif;
+  font-family: PingFang SC, sans-serif;
   font-weight: bold;
-  line-height:1.3
+  line-height: 1.3
 }
-.table-box{
+
+.table-box {
   width: 100%;
 }
 
@@ -668,11 +726,12 @@ export default {
   flex-wrap: nowrap; /* 确保不换行 */
   width: 100%; /* 让父容器占满可用宽度 */
 }
+
 .el-form--inline .el-form-item {
 
 }
 
-.tab_{
+.tab_ {
   width: 75px;
   height: 40px;
   //border-bottom: 2px solid #FF770F;
@@ -685,17 +744,20 @@ export default {
   margin-left: 50px;
   cursor: pointer;
 }
-.active{
+
+.active {
   border-bottom: 2px solid #FF770F !important;
   color: #FF770F !important;
 }
-.title_{
+
+.title_ {
   text-align: center;
   font-weight: 600;
   font-size: 16px;
   color: #333333;
 }
-.d-s-b{
+
+.d-s-b {
   width: 100%;
   display: flex;
   align-items: center;
@@ -705,15 +767,18 @@ export default {
   color: #333333;
   margin: 5px auto;
 }
-.xxing{
+
+.xxing {
   width: 100%;
-  border-bottom:  1px solid #EEEEEE;
+  border-bottom: 1px solid #EEEEEE;
 }
-.for-box{
+
+.for-box {
   width: 100%;
   margin: 20px auto;
 }
-.for-title{
+
+.for-title {
   display: flex;
   align-items: center;
   justify-content: center;
@@ -722,34 +787,41 @@ export default {
   color: #333333;
 
 }
-.x-{
+
+.x- {
   width: 100px;
   border-bottom: 1px solid #EEEEEE;
   margin: 0 15px;
 }
-.f-size{
+
+.f-size {
   width: 33%;
   text-align: center;
 
   font-size: 14px;
   color: #333333;
 }
-.s-size{
+
+.s-size {
   width: 33%;
   text-align: center;
 }
-.l-size{
+
+.l-size {
   width: 33%;
   text-align: left;
 }
-.r-size{
+
+.r-size {
   width: 33%;
   text-align: right;
 }
-.bottom-{
+
+.bottom- {
   width: 98%;
 }
-.table-boxs{
+
+.table-boxs {
   border-radius: 8px;
   width: 98%;
   background: #fff;
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue b/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
index 38a020a19..849f0a639 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
@@ -1,503 +1,543 @@
 <!--积分 商城-->
 <template>
-    <div class="app-center">
-      <div class="center-left">
-        <div class="center-vh">
-          <div class="center-left-top">
-<!--            <div class="vip-bottom" v-if="isMember == false" @click="dialogVisiblevip = true">-->
-<!--              <div>会员搜索</div>-->
-<!--            </div>-->
-<!--            <div v-else style="width: 96%;margin: 0 auto;display: flex;justify-content: space-between">-->
-<!--              <div-->
-<!--                style="display: flex;color: white;justify-content: space-around;width: 55%;-->
-<!--                 height: 90%;border-radius: 10px;-->
-<!--                 padding-top: 10px;-->
-<!--                 background-color: rgb(67,119,204)">-->
-<!--                <div>-->
-<!--                  <template>-->
-<!--                    <img v-if="member.avatar" class="list-avatar" :src="baseUrl + member.avatar">-->
-<!--                    <img v-else class="list-avatar" src="@/assets/images/avatar.png">-->
-<!--                  </template>-->
-<!--                </div>-->
-<!--                <div style="text-align: center">-->
-<!--                  <span style="margin-bottom: 10px">{{ member.name }}</span><br/>-->
-<!--                  <span>{{ member.mobile }}</span>-->
-<!--                </div>-->
-<!--                <div style="background-color: rgba(46,82,142,0.65);width: 50px;height: 45px;padding-top: 5px;-->
-<!--                    border-radius: 5px;text-align: center">-->
-<!--                  <el-tooltip placement="top">-->
-<!--                    <div slot="content">-->
-<!--                      <p>会员储值账户余额：{{ member.cardBalance }}</p>-->
-<!--                      <p>积分余额：{{ member.points }}</p>-->
-<!--                    </div>-->
-<!--                    <i class="el-icon-bank-card" style="font-size: 35px"></i>-->
-<!--                  </el-tooltip>-->
-<!--                </div>-->
-<!--                <div style="background-color: rgba(46,82,142,0.65);width: 50px;height: 45px;padding-top: 5px;-->
-<!--                    border-radius: 5px;text-align: center">-->
-<!--                  <el-tooltip placement="top">-->
-<!--                    <div slot="content">-->
-<!--                      会员等级：{{ gradeName }}-->
-<!--                    </div>-->
-<!--                    <i class="el-icon-medal" style="font-size: 35px"></i>-->
-<!--                  </el-tooltip>-->
-<!--                </div>-->
-<!--              </div>-->
-<!--              <div class="vip-bottom" style="height: 40px;margin-top: 10px" @click="resetMember">-->
-<!--                <div>重置会员</div>-->
-<!--              </div>-->
-<!--            </div>-->
+  <div class="app-center">
+    <div class="center-left">
+      <div class="center-vh">
+        <div class="center-left-top">
+          <!--            <div class="vip-bottom" v-if="isMember == false" @click="dialogVisiblevip = true">-->
+          <!--              <div>会员搜索</div>-->
+          <!--            </div>-->
+          <!--            <div v-else style="width: 96%;margin: 0 auto;display: flex;justify-content: space-between">-->
+          <!--              <div-->
+          <!--                style="display: flex;color: white;justify-content: space-around;width: 55%;-->
+          <!--                 height: 90%;border-radius: 10px;-->
+          <!--                 padding-top: 10px;-->
+          <!--                 background-color: rgb(67,119,204)">-->
+          <!--                <div>-->
+          <!--                  <template>-->
+          <!--                    <img v-if="member.avatar" class="list-avatar" :src="baseUrl + member.avatar">-->
+          <!--                    <img v-else class="list-avatar" src="@/assets/images/avatar.png">-->
+          <!--                  </template>-->
+          <!--                </div>-->
+          <!--                <div style="text-align: center">-->
+          <!--                  <span style="margin-bottom: 10px">{{ member.name }}</span><br/>-->
+          <!--                  <span>{{ member.mobile }}</span>-->
+          <!--                </div>-->
+          <!--                <div style="background-color: rgba(46,82,142,0.65);width: 50px;height: 45px;padding-top: 5px;-->
+          <!--                    border-radius: 5px;text-align: center">-->
+          <!--                  <el-tooltip placement="top">-->
+          <!--                    <div slot="content">-->
+          <!--                      <p>会员储值账户余额：{{ member.cardBalance }}</p>-->
+          <!--                      <p>积分余额：{{ member.points }}</p>-->
+          <!--                    </div>-->
+          <!--                    <i class="el-icon-bank-card" style="font-size: 35px"></i>-->
+          <!--                  </el-tooltip>-->
+          <!--                </div>-->
+          <!--                <div style="background-color: rgba(46,82,142,0.65);width: 50px;height: 45px;padding-top: 5px;-->
+          <!--                    border-radius: 5px;text-align: center">-->
+          <!--                  <el-tooltip placement="top">-->
+          <!--                    <div slot="content">-->
+          <!--                      会员等级：{{ gradeName }}-->
+          <!--                    </div>-->
+          <!--                    <i class="el-icon-medal" style="font-size: 35px"></i>-->
+          <!--                  </el-tooltip>-->
+          <!--                </div>-->
+          <!--              </div>-->
+          <!--              <div class="vip-bottom" style="height: 40px;margin-top: 10px" @click="resetMember">-->
+          <!--                <div>重置会员</div>-->
+          <!--              </div>-->
+          <!--            </div>-->
 
-<!---->
-            <div class="o-top" v-if="userInfo">
-              <div style="width: 50%">
-                <div class="d-s">
-                  <img src="./imgs/new_user.png" style="width: 32px;height: 32px;margin-right: 10px">
-                  <div >
-                    <div style="font-weight: bold;margin-bottom: 2px">{{chooseVipUser.name||'匿名'}}</div>
-                    <div class="d-s">
-                      <span>{{chooseVipUser.mobile}}</span>
-                      <sapn style="margin: 0px 5px">普通会员</sapn>
-                      <el-popover
-                        placement="bottom"
-                        trigger="hover">
-                        <div> 储值卡：￥1000.00 </div>
-                        <div> 储值卡：￥1000.00 </div>
-                        <div> 储值卡：￥1000.00 </div>
-                        <div> 储值卡：￥1000.00 </div>
-                        <div> 储值卡：￥1000.00 </div>
-                        <img slot="reference" src="./imgs/kbao.png" style="width: 24px;height: 24px;margin-right: 10px">
+          <!---->
+          <div class="o-top" v-if="userInfo">
+            <div style="width: 50%">
+              <div class="d-s">
+                <img src="./imgs/new_user.png" style="width: 32px;height: 32px;margin-right: 10px">
+                <div>
+                  <div style="font-weight: bold;margin-bottom: 2px">{{ chooseVipUser.name || '匿名' }}</div>
+                  <div class="d-s">
+                    <span>{{ chooseVipUser.mobile }}</span>
+                    <sapn style="margin: 0px 5px">普通会员</sapn>
+                    <el-popover
+                      placement="bottom"
+                      trigger="hover"
+                    >
+                      <div> 储值卡：￥1000.00</div>
+                      <div> 储值卡：￥1000.00</div>
+                      <div> 储值卡：￥1000.00</div>
+                      <div> 储值卡：￥1000.00</div>
+                      <div> 储值卡：￥1000.00</div>
+                      <img slot="reference" src="./imgs/kbao.png" style="width: 24px;height: 24px;margin-right: 10px">
 
-                      </el-popover>
-                    </div>
+                    </el-popover>
                   </div>
                 </div>
-                <!--            <div class="d-s" >-->
-                <!--              <div style="font-size: 12px;margin-right: 5px">储值卡：￥{{chooseVipUser.cardBalance}} </div>-->
-                <!--              <div style="font-size: 12px">囤油卡：￥1000.000</div>-->
-                <!--            </div>-->
-              </div>
-
-              <div class="d-s" style="width: 50%">
-                <div class="an_bor" @click="addMemberRecharge()">会员充值</div>
-                <div class="an_bor" @click="restVipUser">重置会员</div>
-                <div class="an_bor" @click="addFreeTicket()" >赠送优惠券</div>
               </div>
+              <!--            <div class="d-s" >-->
+              <!--              <div style="font-size: 12px;margin-right: 5px">储值卡：￥{{chooseVipUser.cardBalance}} </div>-->
+              <!--              <div style="font-size: 12px">囤油卡：￥1000.000</div>-->
+              <!--            </div>-->
             </div>
-            <div class="o-top" v-if="!userInfo">
-              <div class="left_input">
-                <el-autocomplete
-                  v-model="userMobile"
-                  style="width: 95%; "
-                  :fetch-suggestions="getUsers"
-                  placeholder="请输入会员手机号"
-                >
-                  <template slot-scope="{ item }">
-                    <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>
-              </div>
-              <div class="d-s">
-                <div class="an_bor" @click="addVip()">新增会员</div>
-              </div>
 
-              <!--     渲染会员列表     -->
-              <div class="taber-box" v-for="(item,index) in vipUserList" :key="index">
-                <div class="goods_name">
-                  <!--            <img src="../../../assets/images/goods.png" style="width: 30px;height: 30px">-->
-                  {{ item.name }}
-                </div>
-
-              </div>
+            <div class="d-s" style="width: 50%">
+              <div class="an_bor"   @click="restVipUser">重置会员</div>
             </div>
           </div>
+          <div class="o-top" v-if="!userInfo">
+            <div class="left_input">
+              <el-autocomplete
+                v-model="userMobile"
+                style="width: 95%; "
+                :fetch-suggestions="getUsers"
+                placeholder="请输入会员手机号"
+              >
+                <template slot-scope="{ item }">
+                  <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>
+            </div>
+<!--            <div class="d-s">-->
+<!--              <div class="an_bor" @click="addVip()">新增会员</div>-->
+<!--            </div>-->
 
-          <div class="center-left-hj">
-            <div>使用积分</div>
-            <div>-{{allPoints}}</div>
-          </div>
-
-            <div class="center-left-hj" v-show="isMember">
-              <div>
-                积分余额
-                <span>（账户余额：{{ member.points }}积分）</span>
-                <span v-if="!isTheBalanceIsSufficient" style="color: red">积分余额不足</span>
+            <!--     渲染会员列表     -->
+            <div class="taber-box" v-for="(item,index) in vipUserList" :key="index">
+              <div class="goods_name">
+                <!--            <img src="../../../assets/images/goods.png" style="width: 30px;height: 30px">-->
+                {{ item.name }}
               </div>
-              <div>-{{ allPoints }}</div>
-            </div>
-          <div class="center-left-th">
-            <div class="th-box">
-              <div>扫码支付</div>
-              <div class="bule">{{allPoints}}</div>
-            </div>
-            <div class="th-box">
-              <div @click="dialogVisible = true">操作员</div>
-              <div style="cursor: pointer;color: crimson" @click="dialogVisible = true" >{{ staff.realName }}</div>
+
             </div>
           </div>
         </div>
-<!--      支付方式   -->
-        <div class="bottom-posi">
-          <div class="center-left-wrap">
-            <div class="wrap-box"
-                 @click="payMethod(item)"
-                 v-for="item in payList"
-                 v-if="item.dictValue!=='APPLET_CODE'"
-                 :key="item.dictValue"
-                 :value="item.dictValue"
-                 :class="{ 'wrap-box2': item.dictValue === paymentType }"
-            >
-              <span >{{ item.dictLabel }}</span>
-            </div>
-          </div>
-          <div class="center-left-bottom">
-            <div>
-              <div class="bottom-price">￥{{allAmout}}</div>
-              <div class="price-red">积分合计：{{allPoints}}</div>
-            </div>
-            <div v-if="!isMember" style="background-color: #ffa6a6;" class="center-left-lv" >请先登录会员</div>
-            <div v-if="isMember && !isTheBalanceIsSufficient" style="background-color: #a9fcce;" class="center-left-lv" >余额不足</div>
-            <div v-if="isMember && isTheBalanceIsSufficient" class="center-left-lv" @click="settlement">立即结算</div>
-          </div>
+
+        <div class="center-left-hj">
+          <div>使用积分</div>
+          <div>-{{ allPoints }}</div>
         </div>
 
+        <div class="center-left-hj" v-show="isMember">
+          <div>
+            积分余额
+            <span>（账户余额：{{ member.points }}积分）</span>
+            <span v-if="!isTheBalanceIsSufficient" style="color: red">积分余额不足</span>
+          </div>
+          <div>-{{ allPoints }}</div>
+        </div>
+        <div class="center-left-th">
+          <div class="th-box">
+            <div>扫码支付</div>
+            <div class="bule">{{ allPoints }}</div>
+          </div>
+<!--          <div class="th-box">-->
+<!--            <div @click="dialogVisible = true">操作员</div>-->
+<!--            <div style="cursor: pointer;color: crimson" @click="dialogVisible = true">{{ staff.realName }}</div>-->
+<!--          </div>-->
+        </div>
       </div>
-<!--      右侧-->
-      <div class="center-right">
-        <div class="center-right-top" style="margin-left: 25px;">
-          <el-tabs v-model="queryParams.categoryId" style="width: 100%" @tab-click="handleClick">
-            <el-tab-pane label="全部" name='first'></el-tab-pane>
-            <el-tab-pane v-for="(item,index) in giftCategoryList" :label="item.categoryName" :name='item.id.toString()'></el-tab-pane>
-          </el-tabs>
-        </div>
-        <div style="width: 200px;margin-left: 30px; ">
-          <el-input v-model="queryParams.giftName" @input="getGift()" placeholder="请输入内容"></el-input>
-        </div>
-        <div class="wrap-right">
-          <div class="ts-box">
-              <div class="wrap-right-box" v-for="(item,index) in giftList" :key="item.id" @click="addGift(item)">
-                <div class="new_card" >
-                  <el-badge :hidden="!item.markPurchases>0" :value="item.markPurchases" class="item">
-                    <div class="box-six">
-                      <img :src="imagePath+item.coverImage" >
-                    </div>
-                    <div class="box-four">
-                      <div class="title-red" >
-                        <span v-if="item.exchangeMethod == '积分' || item.exchangeMethod == '积分+金额' || item.exchangeMethod == '积分+加钱购'">{{item.exchangePoints}}积分</span>
-                        <span v-if="item.exchangeMethod == '积分+金额'">+</span>
-                        <span v-if="item.exchangeMethod == '金额' || item.exchangeMethod == '积分+金额'">￥{{item.exchangeAmount}}</span>
-<!--                        <span v-if="item.exchangeMethod == '积分+加钱购'">+{{item.moneyRatio}}加钱比例</span>-->
-                      </div>
-                      <div class="title-hui">
-                        <span>库存:{{item.remainingInventory === -1?"不限":item.remainingInventory}}</span>
-                      </div>
-                      <div class="title-goods">
-                        <el-tag type="danger" size="mini"  effect="dark">{{item.exchangeMethod}}</el-tag>
-<!--                        <span style="margin-left: 5px">{{item.giftName}}</span>-->
-                        <el-tooltip class="item" effect="dark" :content="item.giftName" placement="top-start">
-
-                        <span style="margin-left: 5px; display: inline-block; max-width: 100px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">{{ item.giftName }}</span>
-                        </el-tooltip>
-                      </div>
-                    </div>
-                  </el-badge>
-                </div>
-              </div>
+      <!--      支付方式   -->
+      <div class="bottom-posi">
+        <div class="center-left-wrap">
+          <div class="wrap-box"
+               @click="payMethod(item)"
+               v-for="item in payList"
+               v-if="item.dictValue == 'ALIPAY' || item.dictValue == 'WECHAT' ||  item.dictValue == 'UNIONPAY' ||  item.dictValue == 'CASH'  "
+               :key="item.dictValue"
+               :value="item.dictValue"
+               :class="{ 'wrap-box2': item.dictValue === paymentType }"
+          >
+            <span>{{ item.dictLabel }}</span>
           </div>
         </div>
-        <div class="wrap-right-bottom">
-          <div class="chongzhi" @click="reset()"> <i class="el-icon-refresh"></i> 重置</div>
-          <div style="display: flex;align-items: center">
-            <div class="ddjil" @click="orderHistoryMethod">订单记录</div>
-            <div class="gwuc" @click="shoppingCartMethod()">
-              <el-badge :hidden="markPurchasesAll<1" :value="markPurchasesAll" class="item">
-                <i class="el-icon-shopping-cart-2"></i> <span style="margin-left: 5px">购物车</span>
+        <div class="center-left-bottom">
+          <div>
+            <div class="bottom-price">￥{{ allAmout }}</div>
+            <div class="price-red">积分合计：{{ allPoints }}</div>
+          </div>
+          <div v-if="!isMember" style="background-color: #ffa6a6;" class="center-left-lv">请先登录会员</div>
+          <div v-if="isMember && !isTheBalanceIsSufficient" style="background-color: #a9fcce;" class="center-left-lv">
+            余额不足
+          </div>
+          <div v-if="isMember && isTheBalanceIsSufficient" class="center-left-lv" @click="settlement">立即结算</div>
+        </div>
+      </div>
+
+    </div>
+    <!--      右侧-->
+    <div class="center-right">
+      <div class="center-right-top" style="margin-left: 25px;">
+        <el-tabs v-model="queryParams.categoryId" style="width: 100%" @tab-click="handleClick">
+          <el-tab-pane label="全部" name="first"></el-tab-pane>
+          <el-tab-pane v-for="(item,index) in giftCategoryList" :label="item.categoryName" :name="item.id.toString()"
+          ></el-tab-pane>
+        </el-tabs>
+      </div>
+      <div style="width: 200px;margin-left: 30px; ">
+        <el-input v-model="queryParams.giftName" @input="getGift()" placeholder="请输入内容"></el-input>
+      </div>
+      <div class="wrap-right">
+        <div class="ts-box">
+          <div class="wrap-right-box" v-for="(item,index) in giftList" :key="item.id" @click="addGift(item)">
+            <div class="new_card">
+              <el-badge :hidden="!item.markPurchases>0" :value="item.markPurchases" class="item">
+                <div class="box-six">
+                  <img :src="imagePath+item.coverImage">
+                </div>
+                <div class="box-four">
+                  <div class="title-red">
+                    <span
+                      v-if="item.exchangeMethod == '积分' || item.exchangeMethod == '积分+金额' || item.exchangeMethod == '积分+加钱购'"
+                    >{{ item.exchangePoints }}积分</span>
+                    <span v-if="item.exchangeMethod == '积分+金额'">+</span>
+                    <span v-if="item.exchangeMethod == '金额' || item.exchangeMethod == '积分+金额'"
+                    >￥{{ item.exchangeAmount }}</span>
+                    <!--                        <span v-if="item.exchangeMethod == '积分+加钱购'">+{{item.moneyRatio}}加钱比例</span>-->
+                  </div>
+                  <div class="title-hui">
+                    <span>库存:{{ item.remainingInventory === -1 ? '不限' : item.remainingInventory }}</span>
+                  </div>
+                  <div class="title-goods">
+                    <el-tag type="danger" size="mini" effect="dark">{{ item.exchangeMethod }}</el-tag>
+                    <!--                        <span style="margin-left: 5px">{{item.giftName}}</span>-->
+                    <el-tooltip class="item" effect="dark" :content="item.giftName" placement="top-start">
+
+                      <span
+                        style="margin-left: 5px; display: inline-block; max-width: 100px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;"
+                      >{{ item.giftName }}</span>
+                    </el-tooltip>
+                  </div>
+                </div>
               </el-badge>
             </div>
           </div>
         </div>
-
       </div>
-<!--    会员登录-->
-      <el-dialog
-        title="会员信息"
-        :visible.sync="dialogVisiblevip"
-        width="30%"
-        :close-on-click-modal="false">
-        <div >
-          <el-input placeholder="会员手机号、用户昵称" v-model="userNo"
-                    clearable
-                    @keyup.enter.native="getUser"
-                    class="input-with-select" style="text-align: center;">
-            <el-select v-model="select1" slot="prepend" placeholder="请选择" style="width: 120px">
-              <el-option label="会员手机号" value="会员手机号"></el-option>
-              <el-option label="用户昵称" value="用户昵称"></el-option>
-            </el-select>
-            <el-button slot="append" @click="getUser">查询</el-button>
-          </el-input>
-        </div>
-        <el-row>
-          <el-descriptions title="会员信息" :column="2">
-            <el-descriptions-item label="手机号">{{member.mobile ? member.mobile : "--"}}</el-descriptions-item>
-            <el-descriptions-item label="会员昵称">{{member.name ? member.name : "--"}}</el-descriptions-item>
-            <el-descriptions-item label="积分">{{member.points ? member.points : "--"}}</el-descriptions-item>
-            <!--          <el-descriptions-item label="加油金余额">0</el-descriptions-item>-->
-            <el-descriptions-item label="车牌号">{{member.carNo ? member.carNo : "--"}}</el-descriptions-item>
-            <el-descriptions-item label="会员备注">{{member.remark ? member.remark : "--"}}</el-descriptions-item>
-          </el-descriptions>
-          <el-descriptions title="会员等级">
-            <el-descriptions-item label="等级名称">{{member.gradeId ? getGradeName(gradeList,member.gradeId) : "--"}}</el-descriptions-item>
-          </el-descriptions>
-          <el-descriptions title="储值余额">
-            <template slot="extra">
-<!--              <span style="color: red;margin-right: 20px">余额充值</span>-->
-              <span style="font-weight: bold">￥{{member.cardBalance ? member.cardBalance : "--"}}</span>
-            </template>
-            <el-descriptions-item v-if="member.cardBalance!=0" label="账户余额">{{member.cardBalance ? member.cardBalance : "--"}}元</el-descriptions-item>
-          </el-descriptions>
-        </el-row>
-        <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisiblevip = false">取 消</el-button>
-        <el-button type="primary" @click="chooseUser(member.mobile,member.id)">确 定</el-button>
-      </span>
-      </el-dialog>
-<!--    模糊查询会员列表信息-->
-      <el-dialog
-        title="请选择会员"
-        :visible.sync="dialogVisibleMember"
-        :close-on-click-modal="false">
-        <div class="wrap-wrap" style="height:700px;overflow-y: scroll;">
-          <el-table ref="tables" :data="memberList">
-            <el-table-column label="ID" align="center" prop="id" width="80" />
-            <el-table-column label="头像" align="center" width="70">
-              <template slot-scope="scope">
-                <img v-if="scope.row.avatar" class="list-avatar" :src="baseUrl + scope.row.avatar">
-                <img v-else class="list-avatar" src="@/assets/images/avatar.png">
-              </template>
-            </el-table-column>
-            <el-table-column label="姓名" align="center" prop="name" />
-            <el-table-column label="手机号" align="center" prop="mobile"/>
-            <el-table-column label="注册时间" align="center" prop="createTime">
-              <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.createTime) }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-              <template slot-scope="scope">
-                <el-button
-                  type="primary" round
-                  @click="handleChoose(scope.row)"
-                >选择</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-      </el-dialog>
-<!--    加油员姓名-->
-      <el-dialog
-        title="选择加油员"
-        :visible.sync="dialogVisible"
-        width="30%"
-        :close-on-click-modal="false">
-        <div class="wrap-wrap">
-          <div class="of-box" v-for="(item,index) in staffList" :key="index"
-               @click="chooseStaff(item),dialogVisible = false"
-               :style="{'background-color': item.color}">
-            <div class="of-title">{{ item.realName }}</div>
-            <div style="text-align: center;font-size: 17px">{{ item.mobile }}</div>
+      <div class="wrap-right-bottom">
+        <div class="chongzhi" @click="reset()"><i class="el-icon-refresh"></i> 重置</div>
+        <div style="display: flex;align-items: center">
+          <div class="ddjil" @click="orderHistoryMethod">订单记录</div>
+          <div class="gwuc" @click="shoppingCartMethod()">
+            <el-badge :hidden="markPurchasesAll<1" :value="markPurchasesAll" class="item">
+              <i class="el-icon-shopping-cart-2"></i> <span style="margin-left: 5px">购物车</span>
+            </el-badge>
           </div>
         </div>
-<!--        <span slot="footer" class="dialog-footer">-->
-<!--        <el-button @click="dialogVisible = false">关 闭</el-button>-->
-<!--          &lt;!&ndash;        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>&ndash;&gt;-->
-<!--      </span>-->
-      </el-dialog>
-<!--      购物车-->
-      <el-dialog title="购物车" :visible.sync="openShoppingCart" width="50%">
-        <el-alert
-          style="margin-bottom: 5px"
-          title="“加钱够”商品仅支持在单商品结算时支持积分不足情况下使用加钱购进行付款,多个商品结算不支持“加钱够”计算"
-          type="warning"
-          :closable="false">
-        </el-alert>
-        <el-table
-          :data="shoppingCart"
-          stripe
-          align="center"
-          style="width: 100%">
-          <el-table-column  align="center" prop="date" label="商品信息">
-            <el-table-column align="center" prop="date" label="商品图">
-              <template slot-scope="scope">
-                <el-image
-                  style="width: 60px; height: 60px"
-                  :src="imagePath+scope.row.coverImage"
-                  fit="cover"></el-image>
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="giftName" label="商品名称" ></el-table-column>
-            <el-table-column align="center" prop="remainingInventory" label="库存">
-              <template slot-scope="scope">
-                {{scope.row.remainingInventory === -1?"不限":scope.row.remainingInventory}}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="date" label="价格">
-              <template slot-scope="scope">
-                <span v-if="scope.row.exchangeMethod == '积分' || scope.row.exchangeMethod == '积分+金额' || scope.row.exchangeMethod == '积分+加钱购'">{{scope.row.exchangePoints}}积分</span>
-                <span v-if="scope.row.exchangeMethod == '积分+金额'">+</span>
-                <span v-if="scope.row.exchangeMethod == '金额' || scope.row.exchangeMethod == '积分+金额'">￥{{scope.row.exchangeAmount}}</span>
-                <span v-if="scope.row.exchangeMethod == '积分+加钱购'">+{{scope.row.moneyRatio}}加钱比例</span>
-              </template>
-            </el-table-column>
-          </el-table-column>
-          <el-table-column align="center" prop="name" label="购买数量" width="200px">
-            <template slot-scope="scope">
+      </div>
 
-              <el-input-number :disabled="scope.row.markPurchases>=scope.row.remainingInventory" v-model="scope.row.markPurchases" @change="changePurchases(scope.row),changeCompute" :min="1" :max="10000" label="" style="width: 130px" size="small"></el-input-number>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" prop="totalPoints_sum" label="合计">
-          </el-table-column>
-          <el-table-column
-            align="center"
-            fixed="right"
-            label="操作"
-            width="100">
+    </div>
+    <!--    会员登录-->
+<!--    <el-dialog-->
+<!--      title="会员信息"-->
+<!--      :visible.sync="dialogVisiblevip"-->
+<!--      width="30%"-->
+<!--      :close-on-click-modal="false"-->
+<!--    >-->
+<!--      <div>-->
+<!--        <el-input placeholder="会员手机号、用户昵称" v-model="userNo"-->
+<!--                  clearable-->
+<!--                  @keyup.enter.native="getUser"-->
+<!--                  class="input-with-select" style="text-align: center;"-->
+<!--        >-->
+<!--          <el-select v-model="select1" slot="prepend" placeholder="请选择" style="width: 120px">-->
+<!--            <el-option label="会员手机号" value="会员手机号"></el-option>-->
+<!--            <el-option label="用户昵称" value="用户昵称"></el-option>-->
+<!--          </el-select>-->
+<!--          <el-button slot="append" @click="getUser">查询</el-button>-->
+<!--        </el-input>-->
+<!--      </div>-->
+<!--      <el-row>-->
+<!--        <el-descriptions title="会员信息" :column="2">-->
+<!--          <el-descriptions-item label="手机号">{{ member.mobile ? member.mobile : '&#45;&#45;' }}</el-descriptions-item>-->
+<!--          <el-descriptions-item label="会员昵称">{{ member.name ? member.name : '&#45;&#45;' }}</el-descriptions-item>-->
+<!--          <el-descriptions-item label="积分">{{ member.points ? member.points : '&#45;&#45;' }}</el-descriptions-item>-->
+<!--          &lt;!&ndash;          <el-descriptions-item label="加油金余额">0</el-descriptions-item>&ndash;&gt;-->
+<!--          <el-descriptions-item label="车牌号">{{ member.carNo ? member.carNo : '&#45;&#45;' }}</el-descriptions-item>-->
+<!--          <el-descriptions-item label="会员备注">{{ member.remark ? member.remark : '&#45;&#45;' }}</el-descriptions-item>-->
+<!--        </el-descriptions>-->
+<!--        <el-descriptions title="会员等级">-->
+<!--          <el-descriptions-item label="等级名称">{{ member.gradeId ? getGradeName(gradeList, member.gradeId) : '&#45;&#45;' }}-->
+<!--          </el-descriptions-item>-->
+<!--        </el-descriptions>-->
+<!--        <el-descriptions title="储值余额">-->
+<!--          <template slot="extra">-->
+<!--            &lt;!&ndash;              <span style="color: red;margin-right: 20px">余额充值</span>&ndash;&gt;-->
+<!--            <span style="font-weight: bold">￥{{ member.cardBalance ? member.cardBalance : '&#45;&#45;' }}</span>-->
+<!--          </template>-->
+<!--          <el-descriptions-item v-if="member.cardBalance!=0" label="账户余额">-->
+<!--            {{ member.cardBalance ? member.cardBalance : '&#45;&#45;' }}元-->
+<!--          </el-descriptions-item>-->
+<!--        </el-descriptions>-->
+<!--      </el-row>-->
+<!--      <span slot="footer" class="dialog-footer">-->
+<!--        <el-button @click="dialogVisiblevip = false">取 消</el-button>-->
+<!--        <el-button type="primary" @click="chooseUser(member.mobile,member.id)">确 定</el-button>-->
+<!--      </span>-->
+<!--    </el-dialog>-->
+    <!--    模糊查询会员列表信息-->
+<!--    <el-dialog-->
+<!--      title="请选择会员"-->
+<!--      :visible.sync="dialogVisibleMember"-->
+<!--      :close-on-click-modal="false"-->
+<!--    >-->
+<!--      <div class="wrap-wrap" style="height:700px;overflow-y: scroll;">-->
+<!--        <el-table ref="tables" :data="memberList">-->
+<!--          <el-table-column label="ID" align="center" prop="id" width="80"/>-->
+<!--          <el-table-column label="头像" align="center" width="70">-->
+<!--            <template slot-scope="scope">-->
+<!--              <img v-if="scope.row.avatar" class="list-avatar" :src="baseUrl + scope.row.avatar">-->
+<!--              <img v-else class="list-avatar" src="@/assets/images/avatar.png">-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--          <el-table-column label="姓名" align="center" prop="name"/>-->
+<!--          <el-table-column label="手机号" align="center" prop="mobile"/>-->
+<!--          <el-table-column label="注册时间" align="center" prop="createTime">-->
+<!--            <template slot-scope="scope">-->
+<!--              <span>{{ parseTime(scope.row.createTime) }}</span>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-button-->
+<!--                type="primary" round-->
+<!--                @click="handleChoose(scope.row)"-->
+<!--              >选择-->
+<!--              </el-button>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--        </el-table>-->
+<!--      </div>-->
+<!--    </el-dialog>-->
+    <!--    加油员姓名-->
+<!--    <el-dialog-->
+<!--      title="选择加油员"-->
+<!--      :visible.sync="dialogVisible"-->
+<!--      width="30%"-->
+<!--      :close-on-click-modal="false"-->
+<!--    >-->
+<!--      <div class="wrap-wrap">-->
+<!--        <div class="of-box" v-for="(item,index) in staffList" :key="index"-->
+<!--             @click="chooseStaff(item),dialogVisible = false"-->
+<!--             :style="{'background-color': item.color}"-->
+<!--        >-->
+<!--          <div class="of-title">{{ item.realName }}</div>-->
+<!--          <div style="text-align: center;font-size: 17px">{{ item.mobile }}</div>-->
+<!--        </div>-->
+<!--      </div>-->
+<!--      &lt;!&ndash;        <span slot="footer" class="dialog-footer">&ndash;&gt;-->
+<!--      &lt;!&ndash;        <el-button @click="dialogVisible = false">关 闭</el-button>&ndash;&gt;-->
+<!--      &lt;!&ndash;          &lt;!&ndash;        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>&ndash;&gt;&ndash;&gt;-->
+<!--      &lt;!&ndash;      </span>&ndash;&gt;-->
+<!--    </el-dialog>-->
+    <!--      购物车-->
+    <el-dialog title="购物车" :visible.sync="openShoppingCart" width="50%">
+      <el-alert
+        style="margin-bottom: 5px"
+        title="“加钱够”商品仅支持在单商品结算时支持积分不足情况下使用加钱购进行付款,多个商品结算不支持“加钱够”计算"
+        type="warning"
+        :closable="false"
+      >
+      </el-alert>
+      <el-table
+        :data="shoppingCart"
+        stripe
+        align="center"
+        style="width: 100%"
+      >
+        <el-table-column align="center" prop="date" label="商品信息">
+          <el-table-column align="center" prop="date" label="商品图">
             <template slot-scope="scope">
-              <el-button type="text" size="small" @click="delShooping(scope.row)">删除</el-button>
+              <el-image
+                style="width: 60px; height: 60px"
+                :src="imagePath+scope.row.coverImage"
+                fit="cover"
+              ></el-image>
             </template>
           </el-table-column>
-        </el-table>
-      </el-dialog>
-<!--    立即结算-->
-      <el-dialog
-        :title="payType"
-        :visible.sync="dialogVisiblej"
-        width="30%"
-        :close-on-click-modal="false">
-        <div v-if="isPay == true"
-             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">
-            ￥{{allAmout}}
-          </div>
-          <div style="text-align: center;margin-bottom: 10px">
-            减去积分：{{ allPoints }}
-          </div>
-          <template v-if="paymentType !== 'CASH' ">
+          <el-table-column align="center" prop="giftName" label="商品名称"></el-table-column>
+          <el-table-column align="center" prop="remainingInventory" label="库存">
+            <template slot-scope="scope">
+              {{ scope.row.remainingInventory === -1 ? '不限' : scope.row.remainingInventory }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="date" label="价格">
+            <template slot-scope="scope">
+              <span
+                v-if="scope.row.exchangeMethod == '积分' || scope.row.exchangeMethod == '积分+金额' || scope.row.exchangeMethod == '积分+加钱购'"
+              >{{ scope.row.exchangePoints }}积分</span>
+              <span v-if="scope.row.exchangeMethod == '积分+金额'">+</span>
+              <span v-if="scope.row.exchangeMethod == '金额' || scope.row.exchangeMethod == '积分+金额'"
+              >￥{{ scope.row.exchangeAmount }}</span>
+              <span v-if="scope.row.exchangeMethod == '积分+加钱购'">+{{ scope.row.moneyRatio }}加钱比例</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="购买数量" width="200px">
+          <template slot-scope="scope">
+
+            <el-input-number :disabled="scope.row.markPurchases>=scope.row.remainingInventory"
+                             v-model="scope.row.markPurchases" @change="changePurchases(scope.row),changeCompute"
+                             :min="1" :max="10000" label="" style="width: 130px" size="small"
+            ></el-input-number>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="totalPoints_sum" label="合计">
+        </el-table-column>
+        <el-table-column
+          align="center"
+          fixed="right"
+          label="操作"
+          width="100"
+        >
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="delShooping(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+    <!--    立即结算-->
+    <el-dialog
+      :title="payType"
+      :visible.sync="dialogVisiblej"
+      width="30%"
+      :close-on-click-modal="false"
+    >
+      <div v-if="isPay == true"
+           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">
+          ￥{{ allAmout }}
+        </div>
+        <div style="text-align: center;margin-bottom: 10px">
+          减去积分：{{ allPoints }}
+        </div>
+        <template v-if="paymentType !== 'CASH' ">
           <template v-if="allAmout != 0 ">
 
-          <div>
-            <el-input
-              v-model="authCode"
-                      v-focus ref="getFocus"
-                      autofocus="autofocus"
-                      @keydown.enter.native="collection"
-                      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"><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></svg>
-              </i>
-            </el-input>
-          </div>
-          <div class="demo-image">
-            <div class="block" style="text-align: center">
-              <el-image
-                style="width: 200px; height: 200px"
-                fit="cover"
-                src="https://oil.wudb.cn/static/img/scan-demo.fcb8b1ab.png"></el-image>
-            </div>
-          </div>
-          </template>
-          </template>
-
-          <template  v-else-if="allAmout>0">
             <div>
-              <el-input v-model="authCode"
-                        v-focus ref="getFocus"
-                        autofocus
-                        @input="changeSeekZero"
-                        @keydown.enter.native="collection"
-                        placeholder="请输入收款金额">
+              <el-input
+                v-model="authCode"
+                v-focus ref="getFocus"
+                autofocus="autofocus"
+                @keydown.enter.native="collection"
+                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"
+                  >
+                    <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>
+                  </svg>
+                </i>
               </el-input>
             </div>
-            <div style="text-align: right;margin: 10px 0">
-              <span>应找零</span>
-              <span style="color: red;font-size: 18px"> ￥{{ seekZero }}</span>
+            <div class="demo-image">
+              <div class="block" style="text-align: center">
+                <el-image
+                  style="width: 200px; height: 200px"
+                  fit="cover"
+                  src="https://oil.wudb.cn/static/img/scan-demo.fcb8b1ab.png"
+                ></el-image>
+              </div>
             </div>
           </template>
+        </template>
 
-          <el-divider></el-divider>
-          <span slot="footer" class="dialog-footer" style="display: flex;justify-content: space-around">
+        <template v-else-if="allAmout>0">
+          <div>
+            <el-input v-model="authCode"
+                      v-focus ref="getFocus"
+                      autofocus
+                      @input="changeSeekZero"
+                      @keydown.enter.native="collection"
+                      placeholder="请输入收款金额"
+            >
+            </el-input>
+          </div>
+          <div style="text-align: right;margin: 10px 0">
+            <span>应找零</span>
+            <span style="color: red;font-size: 18px"> ￥{{ seekZero }}</span>
+          </div>
+        </template>
+
+        <el-divider></el-divider>
+        <span slot="footer" class="dialog-footer" style="display: flex;justify-content: space-around">
           <el-button @click="dialogVisiblej = false, visflg = true" class="but">取 消</el-button>
           <el-button type="primary" class="but" @click="collection">确 定 收 款</el-button>
         </span>
+      </div>
+      <div v-else>
+        <div v-if="isPaySuccess">
+          <el-result icon="success" title="收款成功">
+            <template slot="extra">
+              <el-button type="primary" @click="handClose">关 闭</el-button>
+            </template>
+          </el-result>
+        </div>
+        <div v-else-if="isAwait">
+          <el-result icon="warning" title="支付等待超时，请前往订单列表查看是否支付成功！">
+            <template slot="extra">
+              <el-button type="primary" @click="handClose">关 闭</el-button>
+            </template>
+          </el-result>
         </div>
         <div v-else>
-          <div v-if="isPaySuccess">
-            <el-result icon="success" title="收款成功">
-              <template slot="extra">
-                <el-button type="primary" @click="handClose">关 闭</el-button>
-              </template>
-            </el-result>
-          </div>
-          <div v-else-if="isAwait">
-            <el-result icon="warning" title="支付等待超时，请前往订单列表查看是否支付成功！">
-              <template slot="extra">
-                <el-button type="primary" @click="handClose">关 闭</el-button>
-              </template>
-            </el-result>
-          </div>
-          <div v-else>
-            <el-result icon="error" title="支付失败，请重新支付">
-              <template slot="extra">
-                <el-button type="primary" @click="handClose">关 闭</el-button>
-              </template>
-            </el-result>
-          </div>
-        </div>
-      </el-dialog>
-<!--      订单记录-->
-      <el-drawer title="订单记录" :visible.sync="openOrderHistory" direction="rtl" size="1300px">
-        <PointsCashier></PointsCashier>
-      </el-drawer>
-
-
-      <div id="reportSuccess" ref="report" class="box-center" v-show="false">
-        <div class="box-title">积分商城订单</div>
-        <div class="box-ge">
-          <div v-for="item in shoppingCart" :key="item.id">
-            <div class="input-box">
-              <div>商品名称</div>
-              <div>{{ item.giftName }}</div>
-            </div>
-            <div class="input-box">
-              <div>商品数量</div>
-              <div>{{ item.markPurchases }}</div>
-            </div>
-            <div class="input-box">
-              <div>价格</div>
-              <span v-if="item.exchangeMethod == '积分' || item.exchangeMethod == '积分+金额' || item.exchangeMethod == '积分+加钱购'">{{item.exchangePoints}}积分</span>
-              <span v-if="item.exchangeMethod == '积分+金额'">+</span>
-              <span v-if="item.exchangeMethod == '金额' || item.exchangeMethod == '积分+金额'">￥{{item.exchangeAmount}}</span>
-              <span v-if="item.exchangeMethod == '积分+加钱购'">+{{item.moneyRatio}}加钱比例</span>            </div>
-          </div>
-          <hr/>
-
-          <div class="input-box">
-            <div>积分合计：</div>
-            <div>{{allPoints}}</div>
-          </div>
-        <div class="input-box" v-if="allAmout">
-          <div>总价合计：</div>
-          <div>￥{{allAmout}}</div>
-        </div>
+          <el-result icon="error" title="支付失败，请重新支付">
+            <template slot="extra">
+              <el-button type="primary" @click="handClose">关 闭</el-button>
+            </template>
+          </el-result>
         </div>
       </div>
+    </el-dialog>
+    <!--      订单记录-->
+    <el-drawer title="订单记录" :visible.sync="openOrderHistory" direction="rtl" size="1300px">
+      <PointsCashier></PointsCashier>
+    </el-drawer>
 
 
+    <div id="reportSuccess" ref="report" class="box-center" v-show="false">
+      <div class="box-title">积分商城订单</div>
+      <div class="box-ge">
+        <div v-for="item in shoppingCart" :key="item.id">
+          <div class="input-box">
+            <div>商品名称</div>
+            <div>{{ item.giftName }}</div>
+          </div>
+          <div class="input-box">
+            <div>商品数量</div>
+            <div>{{ item.markPurchases }}</div>
+          </div>
+          <div class="input-box">
+            <div>价格</div>
+            <span
+              v-if="item.exchangeMethod == '积分' || item.exchangeMethod == '积分+金额' || item.exchangeMethod == '积分+加钱购'"
+            >{{ item.exchangePoints }}积分</span>
+            <span v-if="item.exchangeMethod == '积分+金额'">+</span>
+            <span v-if="item.exchangeMethod == '金额' || item.exchangeMethod == '积分+金额'">￥{{ item.exchangeAmount }}</span>
+            <span v-if="item.exchangeMethod == '积分+加钱购'">+{{ item.moneyRatio }}加钱比例</span></div>
+        </div>
+        <hr/>
 
+        <div class="input-box">
+          <div>积分合计：</div>
+          <div>{{ allPoints }}</div>
+        </div>
+        <div class="input-box" v-if="allAmout">
+          <div>总价合计：</div>
+          <div>￥{{ allAmout }}</div>
+        </div>
+      </div>
     </div>
+
+
+  </div>
 </template>
 
 <script>
@@ -506,776 +546,769 @@ import {
   getGiftApi,
   getGiftCategoryApi,
   getIntegralOrdersProcessingApi
-} from "@/api/cashier/integral";
-  import BigNumber from 'bignumber.js';
-  import PointsCashier from "@/views/cashier/NewComponents/integralOrder/pointsCashier";
-  import {getDicts} from "@/api/dict/data";
-import {getUserInfoMobile, getUserVoMobile, getUserVoName, userListByPhone} from "@/api/cashier/user";
-import {getUserGrade, listUserGrade} from "@/api/cashier/usergrade";
-  import {queryStaffs, staffInfo} from "@/api/cashier/staff";
-import {connectFlag, getLodop} from "@/api/LodopFuncs";
-import {listCardFavorableRecord} from "@/api/cashier/cardfavorablerecord";
-import {getReturnCode, printIntegralReport, sendPrintIndex} from "@/api/print";
-
-  export default {
-      name: "Integral",
-      components: {PointsCashier},
-      dict: [],
-      data(){
-          return{
-            userMobile:null,
-            seekZero :0,
-            userInfo: false,
-            baseUrl:process.env.VUE_APP_BASE_API,
-            shoppingCart:[],
-            giftList:'',
-            giftCategoryList:'',
-            queryParams: {
-              categoryId:'',
-              giftName:'',
-              deliveryMethod:'门店自提',
-              page: 1,
-              pageSize: 10000,
-            },
-            markPurchasesAll: 0,
-            // 图片根目录
-            imagePath: process.env.VUE_APP_SERVER_URL,
-            activeName:"first",
-            input:'',
-
-            allPoints:0,
-            allAmout:0,
-            allMoneyRatio:0,
-
-            dialogVisible: false, //员工选择
-            dialogVisiblevip:false, // 会员查询
-            dialogVisibleMember: false,// 模糊查询会员
-            dialogVisiblej: false,// 支付方式
-            visflg: false,// 支付方式
-            openShoppingCart: false,
-            openOrderHistory: false,
-            // 会员相关
-            isMember: false, //是否为会员
-            balance:0, // 账户余额
-            member:{}, // 会员信息
-            memberList:[], // 会员列表信息
-            select1:'会员手机号',
-            // 会员信息
-            userNo:"",
-            gradeName:"",
-            gradeList:"",
-            // 员工相关
-            staffList:[],
-            staff:"",
-            //支付方式
-            payList:[],
-            authCode:'',
-            isPay:true,
-            isPaySuccess:false,
-            isAwait: false,
-
-            loading:false,
-            paymentType : 'ALIPAY', // 默认支付宝
-            payType:'支付宝支付'
-            // isTheBalanceIsSufficient:false,  //余额是否充足
-          }
+} from '@/api/cashier/integral'
+import BigNumber from 'bignumber.js'
+import PointsCashier from '@/views/cashier/NewComponents/integralOrder/pointsCashier'
+import { getDicts } from '@/api/dict/data'
+import { getUserInfoMobile, getUserVoMobile, getUserVoName, userListByPhone } from '@/api/cashier/user'
+import { getUserGrade, listUserGrade } from '@/api/cashier/usergrade'
+import { queryStaffs, staffInfo } from '@/api/cashier/staff'
+import { connectFlag, getLodop } from '@/api/LodopFuncs'
+import { listCardFavorableRecord } from '@/api/cashier/cardfavorablerecord'
+import { getReturnCode, printIntegralReport, sendPrintIndex } from '@/api/print'
 
+export default {
+  name: 'Integral',
+  components: { PointsCashier },
+  dict: [],
+  data() {
+    return {
+      //会员搜索列表
+      vipUserList:[],
+      userMobile: null,
+      seekZero: 0,
+      userInfo: false,
+      baseUrl: process.env.VUE_APP_BASE_API,
+      shoppingCart: [],
+      giftList: '',
+      giftCategoryList: '',
+      queryParams: {
+        categoryId: '',
+        giftName: '',
+        deliveryMethod: '门店自提',
+        page: 1,
+        pageSize: 10000
       },
-      created() {
-        this.getGiftCategory();
-        this.getGift();
-        this.getPayList()
-        this.getStaffList();
-        this.getStaff();
-        this.getCouponList();
+      markPurchasesAll: 0,
+      // 图片根目录
+      imagePath: process.env.VUE_APP_SERVER_URL,
+      activeName: 'first',
+      input: '',
 
-      },
-    directives: {
-      // 注册一个局部的自定义指令 v-focus
-      focus: {
-        // 指令的定义
-        inserted: function (el) {
-          // 聚焦元素
-          el.querySelector('input').focus()
-        },
-      },
+      allPoints: 0,
+      allAmout: 0,
+      allMoneyRatio: 0,
+
+      dialogVisible: false, //员工选择
+      dialogVisiblevip: false, // 会员查询
+      dialogVisibleMember: false,// 模糊查询会员
+      dialogVisiblej: false,// 支付方式
+      visflg: false,// 支付方式
+      openShoppingCart: false,
+      openOrderHistory: false,
+      // 会员相关
+      isMember: false, //是否为会员
+      balance: 0, // 账户余额
+      member: {}, // 会员信息
+      memberList: [], // 会员列表信息
+      select1: '会员手机号',
+      // 会员信息
+      userNo: '',
+      gradeName: '',
+      gradeList: '',
+      // 员工相关
+      staffList: [],
+      staff: '',
+      //支付方式
+      payList: [],
+      authCode: '',
+      isPay: true,
+      isPaySuccess: false,
+      isAwait: false,
+
+      loading: false,
+      paymentType: 'ALIPAY', // 默认支付宝
+      payType: '支付宝支付'
+      // isTheBalanceIsSufficient:false,  //余额是否充足
+    }
+
+  },
+  created() {
+    this.getGiftCategory()
+    this.getGift()
+    this.getPayList()
+    this.getStaffList()
+    this.getStaff()
+    this.getCouponList()
+
+  },
+  directives: {
+    // 注册一个局部的自定义指令 v-focus
+    focus: {
+      // 指令的定义
+      inserted: function(el) {
+        // 聚焦元素
+        el.querySelector('input').focus()
+      }
+    }
+  },
+  methods: {
+    restVipUser() {
+      this.userInfo = false
+      this.chooseVipUser = {}
+      this.userMobile = ''
+    // 结算状态
+      this.isMember = false
     },
-      methods:{
-        changeSeekZero(){
-            this.seekZero = (this.authCode - this.allAmout).toFixed(2)
+    changeSeekZero() {
+      this.seekZero = (this.authCode - this.allAmout).toFixed(2)
 
-        },
-        // 获取所有积分商品
-        async getGift() {
-          if (this.queryParams.categoryId ==='first') {
-            this.queryParams.categoryId = null
-          }
-          await getGiftApi(this.queryParams).then(res=>{
-            this.giftList = res.data.records;
-          })
-          console.log("imagePath",this.imagePath)
-        },
-        // 获取商品分类
-        getGiftCategory() {
-          getGiftCategoryApi().then(res=>{
-            this.giftCategoryList = res.data.records;
-          })
-        },
-        // 获取支付方式
-        getPayList() {
-          getDicts("payment_type").then(response => {
-            this.payList = response.data;
-          })
-        },
-        payMethod(payType){
-          this.paymentType = payType.dictValue
-          this.payType = payType.dictLabel +"支付"
-        },
-        // 点击商品增加库存
-        async addGift(data) {
-          // if (data.giftType  === "实物商品") {
-          //   //判断商品库存(原库存)是否足够
-          //
-          //   let stock = 1;
-          //   if (data.markPurchases) {
-          //     stock = data.markPurchases+1
-          //   }
-          //   await getDetermineTheInventoryOfTheProductApi({id:data.goodsId,
-          //     stock:stock}).then(res=> {
-          //     if (!res.data) {
-          //       // data.markPurchases = data.markPurchases-1
-          //       this.$message.error('该商品库存不足');
-          //       return
-          //     }
-          //   })
-          // }
+    },
+    // 获取所有积分商品
+    async getGift() {
+      if (this.queryParams.categoryId === 'first') {
+        this.queryParams.categoryId = null
+      }
+      await getGiftApi(this.queryParams).then(res => {
+        this.giftList = res.data.records
+      })
+      console.log('imagePath', this.imagePath)
+    },
+    // 获取商品分类
+    getGiftCategory() {
+      getGiftCategoryApi().then(res => {
+        this.giftCategoryList = res.data.records
+      })
+    },
+    // 获取支付方式
+    getPayList() {
+      getDicts('payment_type').then(response => {
+        this.payList = response.data
+      })
+    },
+    payMethod(payType) {
+      console.log("支付方式",this.payList)
+      this.paymentType = payType.dictValue
+      this.payType = payType.dictLabel + '支付'
+    },
+    // 点击商品增加库存
+    async addGift(data) {
+      // if (data.giftType  === "实物商品") {
+      //   //判断商品库存(原库存)是否足够
+      //
+      //   let stock = 1;
+      //   if (data.markPurchases) {
+      //     stock = data.markPurchases+1
+      //   }
+      //   await getDetermineTheInventoryOfTheProductApi({id:data.goodsId,
+      //     stock:stock}).then(res=> {
+      //     if (!res.data) {
+      //       // data.markPurchases = data.markPurchases-1
+      //       this.$message.error('该商品库存不足');
+      //       return
+      //     }
+      //   })
+      // }
 
-
-          if (this.shoppingCart.length != 0) {
-            // 只能订购加钱购
-            let flag = false
-            this.shoppingCart.forEach(res => {
-              if (res.exchangeMethod == "积分+加钱购") {
-                flag = true
-              }
-            })
-            if (data.exchangeMethod == "积分+加钱购" || flag) {
-              flag = false
-              this.shoppingCart.forEach(res => {
-                if (res.id != data.id ) {
-                  flag = true
-                  return
-                }
-              })
-            }
-            if (flag){
-              this.$message.error('“加钱购”商品仅支持在单商品结算时支持积分不足情况下使用加钱购进行付款,多个商品结算不支持“加钱够”计算');
-              return
-            }
+      if (this.shoppingCart.length != 0) {
+        // 只能订购加钱购
+        let flag = false
+        this.shoppingCart.forEach(res => {
+          if (res.exchangeMethod == '积分+加钱购') {
+            flag = true
           }
-            if (data.markPurchases) {
-            if (data.markPurchases>=data.remainingInventory){
-              this.$message.error('库存不足');
-              return
-            }
-            data.markPurchases = data.markPurchases+1
-          }else {
-            if (data.remainingInventory == 0) {
-              this.$message.error('库存不足');
-              return
-            }
-            this.$set(data, "markPurchases", 1);
-          }
-          this.markPurchasesAll++
-          console.log("addGift",data)
-          // 计算总额
-          this.dataChange(data);
-          if (this.shoppingCart.length === 0) {
-            this.shoppingCart.push(data);
-          } else {
-            let flag = false;
-            this.shoppingCart.forEach(shopp=>{
-              if (data.id === shopp.id) {
-                flag = true;
-              }
-            })
-            if (!flag) {
-              this.shoppingCart.push(data);
-            }
-          }
-          this.allData();
-          // 计算余额是否足够
-        },
-        handleClick(tab, event){
-          this.getGift()
-        },
-        // 选择会员
-        chooseUser(mobile,id){
-          console.log("this.member",this.member)
-          if (this.member.id) {
-            this.dialogVisiblevip = false
-            this.isMember = true;
-            // this.map.payUser = mobile;
-            // this.map.userId = id;
-            this.balance = this.member.cardBalance;
-            if (this.balance>=(this.oilAmount - this.oilDiscount)){
-              this.consumeAmount = this.oilAmount - this.oilDiscount;
-              this.oilActualPay = 0;
-            }else {
-              this.consumeAmount = this.balance;
-              this.oilActualPay = this.oilAmount - this.oilDiscount - this.balance;
-            }
-          }else {
-            this.$message.error('请先选择会员');
-          }
-
-        },
-        // 选择会员信息
-        handleChoose(data){
-          this.member = data;
-          this.dialogVisibleMember = false;
-          this.allData();
-        },
-        // 根据手机号查询会员信息
-        getUser(){
-          if(this.select1=="会员手机号"){
-            getUserInfoMobile({mobile:this.userNo}).then( response => {
-              if (response.data!=null){
-                this.member = response.data
-              }else {
-                this.$modal.msgError("会员信息不存在")
-              }
-            })
-          }else {
-            getUserVoName({name:this.userNo}).then( response => {
-              this.memberList = response.data.userVo
-            })
-            this.dialogVisibleMember = true;
-          }
-        },
-        getUsers(queryString, cb){
-          userListByPhone({mobile:queryString}).then( response => {
-            if (response.data){
-              cb(response.data)
-              console.log(response.data,608)
-            }else {
-              this.$modal.msgError("会员信息不存在")
-            }
-          })
-        },
-        // 获取会员等级信息
-        // getGrade(id){
-        //   getUserGrade(id).then( response => {
-        //     this.gradeName = response.data.name;
-        //   })
-        //   return this.gradeName;
-        // },
-        // 重置会员
-        resetMember(){
-          this.member = {};
-          this.isMember = false;
-          this.userNo = "";
-        },
-        // 获取当前账户信息
-        getStaff(){
-          staffInfo().then( response => {
-            // this.staff = response.data;
-            console.log("response",response.data)
-            this.staff = response.data;
-            // this.map.staffId = this.staff.id;
-          })
-        },
-        // 选择员工信息
-        chooseStaff(data){
-          this.staff = data;
-          // this.map.staffId = this.staff.id;
-        },
-        // 获取员工列表
-        getStaffList(){
-          queryStaffs().then( response => {
-            this.staffList = response.data
-          })
-        },
-        // 重置
-        async reset() {
-          this.shoppingCart=[]
-          this.markPurchasesAll = 0
-          this.allPoints=0
-          this.allAmout=0
-          this.allMoneyRatio=0
-          this.giftList = ''
-          this.getGiftCategory();
-
-          await this.getGift();
-          // this.paymentType = ''
-          this.resetMember()
-        },
-        // 打开购物车
-        shoppingCartMethod() {
-          if (this.shoppingCart == [] || this.shoppingCart.length < 1) {
-            this.$message({
-              message: '请先选择商品！',
-              type: 'warning'
-            });
-          } else {
-            this.openShoppingCart = true
-            this.dataChange(this.shoppingCart[0])
-          }
-        },
-        // 购物车页面计算
-        changePurchases(data) {
-          //计算总积分
-          this.dataChange(data);
-          this.allData()
-        },
-        changeCompute(newValue,oldValue){
-          this.markPurchasesAll = this.markPurchasesAll + (newValue - oldValue)
-        },
-        // 删除商品
-        delShooping(data) {
-
-          if (this.markPurchasesAll >= data.markPurchases) {
-            this.markPurchasesAll = this.markPurchasesAll - data.markPurchases
-          }
-          data.markPurchases = 0;
-          this.shoppingCart = this.shoppingCart.filter(item => item.id !== data.id);
-          this.allData()
-        },
-        allData() {
-          this.allPoints = 0
-          this.allAmout = 0
-          let allPoints = new BigNumber(this.allPoints)
-          let allAmout = new BigNumber(this.allAmout)
-          let allMoneyRatio = new BigNumber(this.allMoneyRatio)
-
-          console.log("this.shoppingCart",this.shoppingCart)
-
+        })
+        if (data.exchangeMethod == '积分+加钱购' || flag) {
+          flag = false
           this.shoppingCart.forEach(res => {
-            if (res.exchangePoints_sum) {
-              let exchangePoints_sum = new BigNumber(res.exchangePoints_sum);
-              allPoints = allPoints.plus(exchangePoints_sum);
-            }
-            // todo   计算
-            if (res.exchangeAmount_sum) {
-              let exchangeAmount_sum = new BigNumber(res.exchangeAmount_sum);
-              allAmout = allAmout.plus(exchangeAmount_sum);
-            }
-          });
-
-          // 计算加钱购
-          if (this.shoppingCart && this.shoppingCart.length === 1 && this.shoppingCart[0].exchangeMethod === '积分+加钱购' && this.shoppingCart[0].moneyRatio) {
-            let data = this.shoppingCart[0];
-            // 计算加钱购商品一共多少积分
-            let markPurchases = new BigNumber(data.markPurchases);
-            let exchangePoints = markPurchases.multipliedBy(new BigNumber(data.exchangePoints));
-            // 拿到总的积分
-            this.member.points = this.member.points?this.member.points:0
-            let points = this.member.points - exchangePoints.toNumber(); // 使用 toNumber() 获取 BigNumber 的数值
-            if (this.member.points<0) {
-              points = 0
-            }
-            // 以及分等一多少
-            if (points < 0) {
-
-              // 计算需要的金额
-              points = Math.abs(points);
-
-
-              allAmout = points * data.moneyRatio; // 直接使用 JavaScript 中的乘法
-              this.allAmout = allAmout.toFixed(2);
-              this.allPoints = this.member.points;
-            } else {
-              console.log("计算加钱购",exchangePoints)
-              console.log("计算加钱购",this.member.points)
-
-              this.allAmout = 0
-              this.allPoints = exchangePoints.toNumber();
-            }
-            return
-          }
-
-
-          // 更新组件的值
-          this.allPoints = Number(allPoints).toFixed(2);
-          this.allAmout = Number(allAmout).toFixed(2);
-        },
-        dataChange(data) {
-          // 判断支付方式 (计算积分)
-          if (data.exchangeMethod =='积分'){
-            let exchange = new BigNumber(data.exchangePoints);
-            let mark = new BigNumber(data.markPurchases);
-            let exchangePoints_sum = exchange.multipliedBy(mark);
-            if (data.exchangePoints_sum) {
-              data.exchangePoints_sum = Number(exchangePoints_sum);
-            }else {
-              this.$set(data, "exchangePoints_sum", exchangePoints_sum);
-            }
-            if (data.totalPoints_sum) {
-              data.totalPoints_sum = exchangePoints_sum.toString()+"积分";
-            }else {
-              this.$set(data, "totalPoints_sum", exchangePoints_sum+"积分");
-            }
-          }else if (data.exchangeMethod =='金额') {
-            let amount = new BigNumber(data.exchangeAmount);
-            let mark = new BigNumber(data.markPurchases);
-            let exchangeAmount_sum = amount.multipliedBy(mark);
-
-            if (data.exchangeAmount_sum) {
-              data.exchangeAmount_sum = Number(exchangeAmount_sum);
-            }else {
-              this.$set(data, "exchangeAmount_sum", exchangeAmount_sum);
-            }
-            if (data.totalPoints_sum) {
-              data.totalPoints_sum = "￥"+exchangeAmount_sum.toString();
-            }else {
-              this.$set(data, "totalPoints_sum", "￥"+exchangeAmount_sum);
-            }
-          }else if (data.exchangeMethod =='积分+金额') {
-            let exchange = new BigNumber(data.exchangePoints);
-            let mark = new BigNumber(data.markPurchases);
-            let exchangePoints_sum = exchange.multipliedBy(mark);
-
-            if (data.exchangePoints_sum) {
-              data.exchangePoints_sum = Number(exchangePoints_sum);
-            }else {
-              this.$set(data, "exchangePoints_sum", exchangePoints_sum);
-            }
-
-            let amount = new BigNumber(data.exchangeAmount);
-            let exchangeAmount_sum = amount.multipliedBy(mark);
-
-            if (data.exchangeAmount_sum) {
-              data.exchangeAmount_sum = Number(exchangeAmount_sum);
-            }else {
-              this.$set(data, "exchangeAmount_sum", exchangeAmount_sum);
-            }
-            if (data.totalPoints_sum) {
-              data.totalPoints_sum = exchangePoints_sum.toString()+"积分"+"+"+"￥"+exchangeAmount_sum.toString();
-            }else {
-              this.$set(data, "totalPoints_sum", exchangePoints_sum+"积分"+"+"+"￥"+exchangeAmount_sum);
-            }
-
-          }else if (data.exchangeMethod =='积分+加钱购') {
-
-
-            let exchangePoints_sum = 0
-            let exchangeAmount_sum = 0
-
-            // let data1 = this.shoppingCart[0];
-            // 计算加钱购商品一共多少积分
-            let markPurchases = new BigNumber(data.markPurchases);
-            let exchangePoints = markPurchases.multipliedBy(new BigNumber(data.exchangePoints));
-            // 拿到总的积分
-            this.member.points = this.member.points?this.member.points:0
-            let points = this.member.points - exchangePoints.toNumber(); // 使用 toNumber() 获取 BigNumber 的数值
-            console.log("points",points)
-            // 以及分等一多少
-            if (points < 0) {
-
-              // 计算需要的金额
-              points = Math.abs(points);
-
-
-              exchangeAmount_sum = points * data.moneyRatio; // 直接使用 JavaScript 中的乘法
-              exchangeAmount_sum = exchangeAmount_sum.toFixed(2);
-
-              exchangePoints_sum = this.member.points;
-            } else {
-              exchangeAmount_sum = 0
-              exchangePoints_sum = exchangePoints.toNumber();
-            }
-            this.$set(data, "exchangePoints_sum", exchangePoints_sum)
-            this.$set(data, "exchangeAmount_sum", exchangeAmount_sum)
-
-
-            if (data.totalPoints_sum) {
-              data.totalPoints_sum = exchangePoints_sum+"积分"+"+"+exchangeAmount_sum+"";
-            }else {
-              this.$set(data, "totalPoints_sum", exchangePoints_sum+"积分"+"+"+exchangeAmount_sum+"");
-
-            }
-            console.log("数据",data)
-            return
-
-            //
-            // let exchange = new BigNumber(data.exchangePoints);
-            // let mark = new BigNumber(data.markPurchases);
-            // let exchangePoints_sum = exchange.multipliedBy(mark);
-            // this.$set(data, "exchangePoints_sum", exchangePoints_sum);
-            //
-            // if (data.exchangePoints_sum) {
-            //   data.exchangePoints_sum = Number(exchangePoints_sum);
-            // }else {
-            //   this.$set(data, "exchangePoints_sum", exchangePoints_sum);
-            // }
-            //
-            // let ratio = new BigNumber(data.moneyRatio);
-            // let moneyRatio_sum = ratio.multipliedBy(mark);
-            // this.$set(data, "totalPoints_sum", exchangePoints_sum+"积分"+"+"+moneyRatio_sum+"");
-            //
-            // if (data.moneyRatio_sum) {
-            //   data.moneyRatio_sum = moneyRatio_sum;
-            // }else {
-            //   this.$set(data, "moneyRatio_sum", moneyRatio_sum);
-            // }
-            // if (data.totalPoints_sum) {
-            //   data.totalPoints_sum = exchangePoints_sum+"积分"+"+"+moneyRatio_sum+"";
-            // }else {
-            //   this.$set(data, "totalPoints_sum", exchangePoints_sum+"积分"+"+"+moneyRatio_sum+"");
-            //
-            // }
-            // console.log("data积分",data)
-          }
-        },
-        // 打开订单记录
-        orderHistoryMethod() {
-          this.openOrderHistory = true
-        },
-        // 立即结算
-        async settlement(){
-          if (this.shoppingCart.length <1){
-            this.$message.error('请先选择商品');
-            return
-          } else if(!this.paymentType) {
-            this.$message.error('请先选择支付方式');
-            return
-          }
-          this.isPay = true;
-          this.dialogVisiblej = true
-          if (this.paymentType !== 'CASH') {
-            if (this.allAmout != 0) {
-              // 发送扫码机请求（易联云网络下发）
-              await this.getSendPrintIndex(this.allAmout);
-              this.getCode(this.allAmout)
-
-            }
-
-          }
-        },
-        // 网络下发之后获取条码
-        getCode(amount) {
-          this.jishuqi++;
-          if (this.jishuqi == 30) {
-            this.jishuqi = 0
-            return
-          }
-          getReturnCode ({payAmount:amount}).then(res=>{
-            if (res.data === "300") {
-              setTimeout(() => {
-                this.getCode(amount); // 重新发起请求
-              }, 1000); // 停顿一秒
-            }else {
-              this.authCode = res.data
+            if (res.id != data.id) {
+              flag = true
+              return
             }
           })
-        },
-        getSendPrintIndex(amount) {
-          sendPrintIndex({payAmount:amount}).then(ress=>{
-            if (ress.data != "success") {
-              this.$modal.msgError("扫码机发起付款失败！")
-              return;
-            }
-          })
-        },
-        integralReport() {
-          let shoppingCart = []
-          this.shoppingCart.forEach(res=>{
-            let price = ''
-            if (res.exchangeMethod == '积分' || res.exchangeMethod == '积分+金额' || res.exchangeMethod == '积分+加钱购') {
-              price = res.exchangePoints+"积分"
-            }
-            if (res.exchangeMethod == '积分+金额'){
-              price = price+"+"
-            }
-            if (res.exchangeMethod == '金额' || res.exchangeMethod == '积分+金额'){
-              price = price+"￥"+res.exchangeAmount
-            }
-            if (res.exchangeMethod == '积分+加钱购'){
-              price = price +"+"+res.moneyRatio+"加钱比例"
-            }
-            let a = {
-              giftName:res.giftName,
-              markPurchases:res.markPurchases,
-              price:price
-            }
-            shoppingCart.push(a)
-          })
-          let f = {
-            shoppingCart:shoppingCart,
-            allPoints:this.allPoints,
-            allAmout:this.allAmout
+        }
+        if (flag) {
+          this.$message.error('“加钱购”商品仅支持在单商品结算时支持积分不足情况下使用加钱购进行付款,多个商品结算不支持“加钱够”计算')
+          return
+        }
+      }
+      if (data.markPurchases) {
+        if (data.markPurchases >= data.remainingInventory) {
+          this.$message.error('库存不足')
+          return
+        }
+        data.markPurchases = data.markPurchases + 1
+      } else {
+        if (data.remainingInventory == 0) {
+          this.$message.error('库存不足')
+          return
+        }
+        this.$set(data, 'markPurchases', 1)
+      }
+      this.markPurchasesAll++
+      console.log('addGift', data)
+      // 计算总额
+      this.dataChange(data)
+      if (this.shoppingCart.length === 0) {
+        this.shoppingCart.push(data)
+      } else {
+        let flag = false
+        this.shoppingCart.forEach(shopp => {
+          if (data.id === shopp.id) {
+            flag = true
           }
-          printIntegralReport(f).then(res=>{
+        })
+        if (!flag) {
+          this.shoppingCart.push(data)
+        }
+      }
+      this.allData()
+      // 计算余额是否足够
+    },
+    handleClick(tab, event) {
+      this.getGift()
+    },
+    // 选择会员
+    chooseUser(data) {
+      if (data) {
+        //选择会员
+        this.userInfo = true
+        this.chooseVipUser = data
+        this.member=data
+        this.isMember=true
 
-          })
+      }
 
-        },
-
-
-        // 确定收款
-        async collection() {
-          let isPayFlag = false
-
-          let this_ = this
-
-          let actualPayment = 0
-          let makeChange = 0
-          if (this_.paymentType === "CASH") {
-            actualPayment = this.authCode
-            makeChange = this.seekZero
+    },
+    // 选择会员信息
+    handleChoose(data) {
+      this.member = data
+      this.dialogVisibleMember = false
+      this.allData()
+    },
+    // 根据手机号查询会员信息
+    getUser() {
+      if (this.select1 == '会员手机号') {
+        getUserInfoMobile({ mobile: this.userNo }).then(response => {
+          if (response.data != null) {
+            this.member = response.data
+          } else {
+            this.$modal.msgError('会员信息不存在')
           }
+        })
+      } else {
+        getUserVoName({ name: this.userNo }).then(response => {
+          this.memberList = response.data.userVo
+        })
+        this.dialogVisibleMember = true
+      }
+    },
+    getUsers(queryString, cb) {
+      userListByPhone({ mobile: queryString }).then(response => {
+        if (response.data) {
+          cb(response.data)
+          console.log(response.data, 608)
+        } else {
+          this.$modal.msgError('会员信息不存在')
+        }
+      })
+    },
+    // 获取会员等级信息
+    // getGrade(id){
+    //   getUserGrade(id).then( response => {
+    //     this.gradeName = response.data.name;
+    //   })
+    //   return this.gradeName;
+    // },
+    // 重置会员
+    resetMember() {
+      this.member = {}
+      this.isMember = false
+      this.userNo = ''
+    },
+    // 获取当前账户信息
+    getStaff() {
+      staffInfo().then(response => {
+        // this.staff = response.data;
+        console.log('response', response.data)
+        this.staff = response.data
+        // this.map.staffId = this.staff.id;
+      })
+    },
+    // 选择员工信息
+    chooseStaff(data) {
+      this.staff = data
+      // this.map.staffId = this.staff.id;
+    },
+    // 获取员工列表
+    getStaffList() {
+      queryStaffs().then(response => {
+        this.staffList = response.data
+      })
+    },
+    // 重置
+    async reset() {
+      this.shoppingCart = []
+      this.markPurchasesAll = 0
+      this.allPoints = 0
+      this.allAmout = 0
+      this.allMoneyRatio = 0
+      this.giftList = ''
+      this.getGiftCategory()
 
-          // this_.authCode
-          let integralOrdersList = []
-          if (this_.shoppingCart.length >0) {
-            //数组组装
-            console.log("this_.shoppingCart",this_.shoppingCart)
-            this_.shoppingCart.forEach(res =>{
-              let integralOrders = {
-                userId : this_.member.id,
-                giftId : res.id,
-                amount : res.exchangeAmount_sum,
-                integral : res.exchangePoints_sum,
-                exchangeQuantity : res.markPurchases,
-                orderType : 1,
-                staffId: this_.staff.id,
-                paymentType : this_.paymentType,
-                actualPayment : actualPayment,
-                makeChange : makeChange
+      await this.getGift()
+      // this.paymentType = ''
+      this.resetMember()
+    },
+    // 打开购物车
+    shoppingCartMethod() {
+      if (this.shoppingCart == [] || this.shoppingCart.length < 1) {
+        this.$message({
+          message: '请先选择商品！',
+          type: 'warning'
+        })
+      } else {
+        this.openShoppingCart = true
+        this.dataChange(this.shoppingCart[0])
+      }
+    },
+    // 购物车页面计算
+    changePurchases(data) {
+      //计算总积分
+      this.dataChange(data)
+      this.allData()
+    },
+    changeCompute(newValue, oldValue) {
+      this.markPurchasesAll = this.markPurchasesAll + (newValue - oldValue)
+    },
+    // 删除商品
+    delShooping(data) {
+
+      if (this.markPurchasesAll >= data.markPurchases) {
+        this.markPurchasesAll = this.markPurchasesAll - data.markPurchases
+      }
+      data.markPurchases = 0
+      this.shoppingCart = this.shoppingCart.filter(item => item.id !== data.id)
+      this.allData()
+    },
+    allData() {
+      this.allPoints = 0
+      this.allAmout = 0
+      let allPoints = new BigNumber(this.allPoints)
+      let allAmout = new BigNumber(this.allAmout)
+      let allMoneyRatio = new BigNumber(this.allMoneyRatio)
+
+      console.log('this.shoppingCart', this.shoppingCart)
+
+      this.shoppingCart.forEach(res => {
+        if (res.exchangePoints_sum) {
+          let exchangePoints_sum = new BigNumber(res.exchangePoints_sum)
+          allPoints = allPoints.plus(exchangePoints_sum)
+        }
+        // todo   计算
+        if (res.exchangeAmount_sum) {
+          let exchangeAmount_sum = new BigNumber(res.exchangeAmount_sum)
+          allAmout = allAmout.plus(exchangeAmount_sum)
+        }
+      })
+
+      // 计算加钱购
+      if (this.shoppingCart && this.shoppingCart.length === 1 && this.shoppingCart[0].exchangeMethod === '积分+加钱购' && this.shoppingCart[0].moneyRatio) {
+        let data = this.shoppingCart[0]
+        // 计算加钱购商品一共多少积分
+        let markPurchases = new BigNumber(data.markPurchases)
+        let exchangePoints = markPurchases.multipliedBy(new BigNumber(data.exchangePoints))
+        // 拿到总的积分
+        this.member.points = this.member.points ? this.member.points : 0
+        let points = this.member.points - exchangePoints.toNumber() // 使用 toNumber() 获取 BigNumber 的数值
+        if (this.member.points < 0) {
+          points = 0
+        }
+        // 以及分等一多少
+        if (points < 0) {
+
+          // 计算需要的金额
+          points = Math.abs(points)
+
+          allAmout = points * data.moneyRatio // 直接使用 JavaScript 中的乘法
+          this.allAmout = allAmout.toFixed(2)
+          this.allPoints = this.member.points
+        } else {
+          console.log('计算加钱购', exchangePoints)
+          console.log('计算加钱购', this.member.points)
+
+          this.allAmout = 0
+          this.allPoints = exchangePoints.toNumber()
+        }
+        return
+      }
+
+      // 更新组件的值
+      this.allPoints = Number(allPoints).toFixed(2)
+      this.allAmout = Number(allAmout).toFixed(2)
+    },
+    dataChange(data) {
+      // 判断支付方式 (计算积分)
+      if (data.exchangeMethod == '积分') {
+        let exchange = new BigNumber(data.exchangePoints)
+        let mark = new BigNumber(data.markPurchases)
+        let exchangePoints_sum = exchange.multipliedBy(mark)
+        if (data.exchangePoints_sum) {
+          data.exchangePoints_sum = Number(exchangePoints_sum)
+        } else {
+          this.$set(data, 'exchangePoints_sum', exchangePoints_sum)
+        }
+        if (data.totalPoints_sum) {
+          data.totalPoints_sum = exchangePoints_sum.toString() + '积分'
+        } else {
+          this.$set(data, 'totalPoints_sum', exchangePoints_sum + '积分')
+        }
+      } else if (data.exchangeMethod == '金额') {
+        let amount = new BigNumber(data.exchangeAmount)
+        let mark = new BigNumber(data.markPurchases)
+        let exchangeAmount_sum = amount.multipliedBy(mark)
+
+        if (data.exchangeAmount_sum) {
+          data.exchangeAmount_sum = Number(exchangeAmount_sum)
+        } else {
+          this.$set(data, 'exchangeAmount_sum', exchangeAmount_sum)
+        }
+        if (data.totalPoints_sum) {
+          data.totalPoints_sum = '￥' + exchangeAmount_sum.toString()
+        } else {
+          this.$set(data, 'totalPoints_sum', '￥' + exchangeAmount_sum)
+        }
+      } else if (data.exchangeMethod == '积分+金额') {
+        let exchange = new BigNumber(data.exchangePoints)
+        let mark = new BigNumber(data.markPurchases)
+        let exchangePoints_sum = exchange.multipliedBy(mark)
+
+        if (data.exchangePoints_sum) {
+          data.exchangePoints_sum = Number(exchangePoints_sum)
+        } else {
+          this.$set(data, 'exchangePoints_sum', exchangePoints_sum)
+        }
+
+        let amount = new BigNumber(data.exchangeAmount)
+        let exchangeAmount_sum = amount.multipliedBy(mark)
+
+        if (data.exchangeAmount_sum) {
+          data.exchangeAmount_sum = Number(exchangeAmount_sum)
+        } else {
+          this.$set(data, 'exchangeAmount_sum', exchangeAmount_sum)
+        }
+        if (data.totalPoints_sum) {
+          data.totalPoints_sum = exchangePoints_sum.toString() + '积分' + '+' + '￥' + exchangeAmount_sum.toString()
+        } else {
+          this.$set(data, 'totalPoints_sum', exchangePoints_sum + '积分' + '+' + '￥' + exchangeAmount_sum)
+        }
+
+      } else if (data.exchangeMethod == '积分+加钱购') {
+
+        let exchangePoints_sum = 0
+        let exchangeAmount_sum = 0
+
+        // let data1 = this.shoppingCart[0];
+        // 计算加钱购商品一共多少积分
+        let markPurchases = new BigNumber(data.markPurchases)
+        let exchangePoints = markPurchases.multipliedBy(new BigNumber(data.exchangePoints))
+        // 拿到总的积分
+        this.member.points = this.member.points ? this.member.points : 0
+        let points = this.member.points - exchangePoints.toNumber() // 使用 toNumber() 获取 BigNumber 的数值
+        console.log('points', points)
+        // 以及分等一多少
+        if (points < 0) {
+
+          // 计算需要的金额
+          points = Math.abs(points)
+
+          exchangeAmount_sum = points * data.moneyRatio // 直接使用 JavaScript 中的乘法
+          exchangeAmount_sum = exchangeAmount_sum.toFixed(2)
+
+          exchangePoints_sum = this.member.points
+        } else {
+          exchangeAmount_sum = 0
+          exchangePoints_sum = exchangePoints.toNumber()
+        }
+        this.$set(data, 'exchangePoints_sum', exchangePoints_sum)
+        this.$set(data, 'exchangeAmount_sum', exchangeAmount_sum)
+
+        if (data.totalPoints_sum) {
+          data.totalPoints_sum = exchangePoints_sum + '积分' + '+' + exchangeAmount_sum + ''
+        } else {
+          this.$set(data, 'totalPoints_sum', exchangePoints_sum + '积分' + '+' + exchangeAmount_sum + '')
+
+        }
+        console.log('数据', data)
+        return
+
+        //
+        // let exchange = new BigNumber(data.exchangePoints);
+        // let mark = new BigNumber(data.markPurchases);
+        // let exchangePoints_sum = exchange.multipliedBy(mark);
+        // this.$set(data, "exchangePoints_sum", exchangePoints_sum);
+        //
+        // if (data.exchangePoints_sum) {
+        //   data.exchangePoints_sum = Number(exchangePoints_sum);
+        // }else {
+        //   this.$set(data, "exchangePoints_sum", exchangePoints_sum);
+        // }
+        //
+        // let ratio = new BigNumber(data.moneyRatio);
+        // let moneyRatio_sum = ratio.multipliedBy(mark);
+        // this.$set(data, "totalPoints_sum", exchangePoints_sum+"积分"+"+"+moneyRatio_sum+"");
+        //
+        // if (data.moneyRatio_sum) {
+        //   data.moneyRatio_sum = moneyRatio_sum;
+        // }else {
+        //   this.$set(data, "moneyRatio_sum", moneyRatio_sum);
+        // }
+        // if (data.totalPoints_sum) {
+        //   data.totalPoints_sum = exchangePoints_sum+"积分"+"+"+moneyRatio_sum+"";
+        // }else {
+        //   this.$set(data, "totalPoints_sum", exchangePoints_sum+"积分"+"+"+moneyRatio_sum+"");
+        //
+        // }
+        // console.log("data积分",data)
+      }
+    },
+    // 打开订单记录
+    orderHistoryMethod() {
+      this.openOrderHistory = true
+    },
+    // 立即结算
+    async settlement() {
+      if (this.shoppingCart.length < 1) {
+        this.$message.error('请先选择商品')
+        return
+      } else if (!this.paymentType) {
+        this.$message.error('请先选择支付方式')
+        return
+      }
+      this.isPay = true
+      this.dialogVisiblej = true
+      if (this.paymentType !== 'CASH') {
+        if (this.allAmout != 0) {
+          // 发送扫码机请求（易联云网络下发）
+          await this.getSendPrintIndex(this.allAmout)
+          this.getCode(this.allAmout)
+
+        }
+
+      }
+    },
+    // 网络下发之后获取条码
+    getCode(amount) {
+      this.jishuqi++
+      if (this.jishuqi == 30) {
+        this.jishuqi = 0
+        return
+      }
+      getReturnCode({ payAmount: amount }).then(res => {
+        if (res.data === '300') {
+          setTimeout(() => {
+            this.getCode(amount) // 重新发起请求
+          }, 1000) // 停顿一秒
+        } else {
+          this.authCode = res.data
+        }
+      })
+    },
+    getSendPrintIndex(amount) {
+      sendPrintIndex({ payAmount: amount }).then(ress => {
+        if (ress.data != 'success') {
+          this.$modal.msgError('扫码机发起付款失败！')
+          return
+        }
+      })
+    },
+    integralReport() {
+      let shoppingCart = []
+      this.shoppingCart.forEach(res => {
+        let price = ''
+        if (res.exchangeMethod == '积分' || res.exchangeMethod == '积分+金额' || res.exchangeMethod == '积分+加钱购') {
+          price = res.exchangePoints + '积分'
+        }
+        if (res.exchangeMethod == '积分+金额') {
+          price = price + '+'
+        }
+        if (res.exchangeMethod == '金额' || res.exchangeMethod == '积分+金额') {
+          price = price + '￥' + res.exchangeAmount
+        }
+        if (res.exchangeMethod == '积分+加钱购') {
+          price = price + '+' + res.moneyRatio + '加钱比例'
+        }
+        let a = {
+          giftName: res.giftName,
+          markPurchases: res.markPurchases,
+          price: price
+        }
+        shoppingCart.push(a)
+      })
+      let f = {
+        shoppingCart: shoppingCart,
+        allPoints: this.allPoints,
+        allAmout: this.allAmout
+      }
+      printIntegralReport(f).then(res => {
+
+      })
+
+    },
+
+    // 确定收款
+    async collection() {
+      let isPayFlag = false
+
+      let this_ = this
+
+      let actualPayment = 0
+      let makeChange = 0
+      if (this_.paymentType === 'CASH') {
+        actualPayment = this.authCode
+        makeChange = this.seekZero
+      }
+
+      // this_.authCode
+      let integralOrdersList = []
+      if (this_.shoppingCart.length > 0) {
+        //数组组装
+        console.log('this_.shoppingCart', this_.shoppingCart)
+        this_.shoppingCart.forEach(res => {
+          let integralOrders = {
+            userId: this_.member.id,
+            giftId: res.id,
+            amount: res.exchangeAmount_sum,
+            integral: res.exchangePoints_sum,
+            exchangeQuantity: res.markPurchases,
+            orderType: 1,
+            staffId: this_.staff.id,
+            paymentType: this_.paymentType,
+            actualPayment: actualPayment,
+            makeChange: makeChange
+          }
+          integralOrdersList.push(integralOrders)
+        })
+        let flag = false
+        let orderNumber = ''
+        await getIntegralOrdersProcessingApi({
+          integralOrdersList: integralOrdersList,
+          authCode: this_.authCode,
+          paymentType: this_.paymentType,
+          allAmout: this_.allAmout,
+          allPoints: this_.allPoints
+        }).then(response => {
+          if (response.data != null) {
+            this_.loading = true
+            orderNumber = response.data.orderNumber
+            if (response.data.status == 'un') {
+              this.$message.error('积分已不足')
+              this_.loading = false
+              flag = true
+            }
+          }
+        })
+        if (flag) return
+        let timer = setInterval(async() => {
+          await getCheckTheStatusOfYourPaymentByIntegralApi({ orderNumber: orderNumber }).then(response => {
+            if (response.data != null) {
+              if (response.data.status == 'unpaid') {
+                this_.isQuery = true
               }
-              integralOrdersList.push(integralOrders)
-            })
-            let flag = false
-            let orderNumber = '';
-            await getIntegralOrdersProcessingApi({
-              integralOrdersList:integralOrdersList,
-              authCode:this_.authCode,
-              paymentType:this_.paymentType,
-              allAmout:this_.allAmout,
-              allPoints:this_.allPoints,
-            }).then(response=> {
-              if (response.data!=null){
-                this_.loading = true;
-                orderNumber = response.data.orderNumber
-                if (response.data.status == "un") {
-                  this.$message.error('积分已不足');
-                  this_.loading = false;
-                  flag = true
-                }
+              if (response.data.status == 'paid') {
+                this_.isPaySuccess = true
+                isPayFlag = true
+                this_.isQuery = false
+                clearInterval(timer)
+                // this_.printLocally()
               }
-            });
-            if (flag) return
-            let timer = setInterval(async () => {
-              await getCheckTheStatusOfYourPaymentByIntegralApi({orderNumber:orderNumber}).then(response => {
-                if (response.data!=null){
-                  if (response.data.status == "unpaid"){
-                    this_.isQuery = true;
-                  }
-                  if (response.data.status == "paid"){
-                    this_.isPaySuccess = true;
-                    isPayFlag = true
-                    this_.isQuery = false;
-                    clearInterval(timer);
-                    // this_.printLocally()
-                  }
-                  if (response.data.status == "payFail"){
-                    this_.isPaySuccess = false;
-                    this_.isQuery = false;
-                  }
-                }
-              })
-            }, 500);
-
-            let timer2 = setInterval(function () {
-              if (this_.isQuery == false) {
-                this_.loading = false;
-                this_.isPay = false;
-                console.log("isPayFlag",isPayFlag)
-                if (isPayFlag) {
-                  // this_.printLocally()
-                  this_.integralReport()
-                  isPayFlag = false
-                }
-                clearInterval(timer);
-                clearInterval(timer2);
-                clearTimeout(timer3);
+              if (response.data.status == 'payFail') {
+                this_.isPaySuccess = false
+                this_.isQuery = false
               }
-            },500)
-
-            let timer3 = setTimeout(function (){
-              clearInterval(timer2);
-              clearInterval(timer);
-              this_.loading = false;
-              this_.isPay = false;
-              this_.isAwait = true;
-
-              this.isPaySuccess = false;
-
-            },15000)
-
-            // console.log("isPayFlag",isPayFlag)
-
-          }
-
-
-          // this.paymentType = ''
-        },
-        // 获取优惠券列表信息
-        getCouponList(){
-          listCardFavorableRecord().then(response => {
-            this.couponList = response.data.records
-          })
-          let map = {
-            page:1,
-            pageSize:20,
-          }
-          listUserGrade(map).then(response => {
-            this.gradeList = response.data.records
-          })
-        },
-        // 获取会员等级id
-        getGradeName(list,id){
-          let name = "";
-          list.forEach(item => {
-            if (item.id == id){
-              name = item.name
             }
           })
-          this.gradeName = name;
-          return name;
-        },
-        // 清楚数据
-        handClose(){
-          // if(this.isPaySuccess){
-          //   this.oilAmount = 0;
-          //   this.oilActualPay = 0;
-          //   this.oilDiscount = 0;
-          //   this.goodsAmount = 0;
-          //   this.goodsActualPay = 0;
-          //   this.goodsDiscount = 0;
-          //   this.consumeAmount = 0;
-          //   this.oilTotal = 0;
-          //   this.goodsTotal = 0;
-          // }
-          this.isPay=true,
-          this.isPaySuccess=false,
-          this.isQuery=true,
-          this.openConfirm = false
-          this.openRecharge = false
+        }, 500)
 
-          // this.reset()
-          this.dialogVisiblej = false
-          this.visflg = false
-          this.authCode = '';
-        },
-        async printLocally(data) {
-          if (!connectFlag){
-            return
+        let timer2 = setInterval(function() {
+          if (this_.isQuery == false) {
+            this_.loading = false
+            this_.isPay = false
+            console.log('isPayFlag', isPayFlag)
+            if (isPayFlag) {
+              // this_.printLocally()
+              this_.integralReport()
+              isPayFlag = false
+            }
+            clearInterval(timer)
+            clearInterval(timer2)
+            clearTimeout(timer3)
           }
-          //初始化打印函数
-          let LODOP = getLodop(); // 初始化打印
-          LODOP.PRINT_INIT();
-          var bodyStyle = `<style>
+        }, 500)
+
+        let timer3 = setTimeout(function() {
+          clearInterval(timer2)
+          clearInterval(timer)
+          this_.loading = false
+          this_.isPay = false
+          this_.isAwait = true
+
+          this.isPaySuccess = false
+
+        }, 15000)
+
+        // console.log("isPayFlag",isPayFlag)
+
+      }
+
+      // this.paymentType = ''
+    },
+    // 获取优惠券列表信息
+    getCouponList() {
+      listCardFavorableRecord().then(response => {
+        this.couponList = response.data.records
+      })
+      let map = {
+        page: 1,
+        pageSize: 20
+      }
+      listUserGrade(map).then(response => {
+        this.gradeList = response.data.records
+      })
+    },
+    // 获取会员等级id
+    getGradeName(list, id) {
+      let name = ''
+      list.forEach(item => {
+        if (item.id == id) {
+          name = item.name
+        }
+      })
+      this.gradeName = name
+      return name
+    },
+    // 清楚数据
+    handClose() {
+      // if(this.isPaySuccess){
+      //   this.oilAmount = 0;
+      //   this.oilActualPay = 0;
+      //   this.oilDiscount = 0;
+      //   this.goodsAmount = 0;
+      //   this.goodsActualPay = 0;
+      //   this.goodsDiscount = 0;
+      //   this.consumeAmount = 0;
+      //   this.oilTotal = 0;
+      //   this.goodsTotal = 0;
+      // }
+      this.isPay = true,
+        this.isPaySuccess = false,
+        this.isQuery = true,
+        this.openConfirm = false
+      this.openRecharge = false
+
+      // this.reset()
+      this.dialogVisiblej = false
+      this.visflg = false
+      this.authCode = ''
+    },
+    async printLocally(data) {
+      if (!connectFlag) {
+        return
+      }
+      //初始化打印函数
+      let LODOP = getLodop() // 初始化打印
+      LODOP.PRINT_INIT()
+      var bodyStyle = `<style>
             .input-box{
                 width: 100%;
                 display: flex;
@@ -1338,552 +1371,605 @@ import {getReturnCode, printIntegralReport, sendPrintIndex} from "@/api/print";
               }
             </style>
             `
-          // var fromHtml = bodyStyle+this.$refs.report.innerHTML
-          var fromHtml = ''
+      // var fromHtml = bodyStyle+this.$refs.report.innerHTML
+      var fromHtml = ''
 
-          fromHtml = bodyStyle+this.$refs.report.innerHTML
+      fromHtml = bodyStyle + this.$refs.report.innerHTML
 
+      // LODOP.PRINT_INITA(0, 0, 665, 600, '模板设计')
+      LODOP.ADD_PRINT_HTM(0, 0, '100%', '100%', fromHtml)
+      // LODOP.SET_PRINT_PAGESIZE(100,100,100,100)
 
-          // LODOP.PRINT_INITA(0, 0, 665, 600, '模板设计')
-          LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", fromHtml);
-          // LODOP.SET_PRINT_PAGESIZE(100,100,100,100)
+      LODOP.SET_PRINT_MODE('FULL_WIDTH_FOR_OVERFLOW', true)
 
-          LODOP.SET_PRINT_MODE("FULL_WIDTH_FOR_OVERFLOW",true);
+      // LODOP.ADD_PRINT_BARCODE(10,40,100,100,'QRCode','123456789');
+      // let preview = LODOP.PREVIEW();
+      // console.log("preview",preview);
+      LODOP.PRINT()
 
-          // LODOP.ADD_PRINT_BARCODE(10,40,100,100,'QRCode','123456789');
-          // let preview = LODOP.PREVIEW();
-          // console.log("preview",preview);
-          LODOP.PRINT();
+    }
+  },
+  watch: {
+    dialogVisiblej(newValue) {
+      if (!newValue && !this.visflg) {
+        console.log('newValue', newValue)
 
+        this.queryParams = {
+          categoryId: '',
+          giftName: '',
+          deliveryMethod: '门店自提',
+          page: 1,
+          pageSize: 10000
         },
-      },
-    watch: {
-      dialogVisiblej(newValue) {
-        if (!newValue && !this.visflg) {
-          console.log("newValue",newValue)
+          this.seekZero = 0
+        this.handClose()
+        this.reset()
 
-          this.queryParams= {
-            categoryId:'',
-            giftName:'',
-            deliveryMethod:'门店自提',
-            page: 1,
-            pageSize: 10000,
-          },
-            this.seekZero = 0
-          this.handClose()
-          this.reset()
-
-        } else {
-          this.visflg = false
-        }
-      }
-    },
-    computed: {
-      isTheBalanceIsSufficient(){
-        if (this.member && this.member.points !== undefined) {
-          const allPoints = new BigNumber(this.allPoints);
-          const points = new BigNumber(this.member.points);
-          return points.minus(allPoints).toNumber() >= 0;
-        }
-        return false;
+      } else {
+        this.visflg = false
       }
     }
+  },
+  computed: {
+    isTheBalanceIsSufficient() {
+      if (this.member && this.member.points !== undefined) {
+        const allPoints = new BigNumber(this.allPoints)
+        const points = new BigNumber(this.member.points)
+        return points.minus(allPoints).toNumber() >= 0
+      }
+      return false
     }
+  }
+}
 </script>
 
 <style scoped lang="scss">
-  .app-center{
-    width: 100%;
-    display: flex;
-    box-sizing: border-box;
-    padding: 10px;
-    padding-top: 20px;
-    height: 100vh;
-    justify-content: space-between;
-  }
-  .center-left{
-    width: 33%;
-    border-radius: 8px;
-    overflow: hidden;
-    height: 98vh;
-    position: relative;
-    margin-left: 15px;
-  }
-  .bottom-posi{
-    width: 100%;
-    position: absolute;
-    bottom: 0px;
-  }
-  .center-app{
-    width: 33%;
-    border-radius: 8px;
-    overflow: hidden;
-    /*background: white;*/
+.app-center {
+  width: 100%;
+  display: flex;
+  box-sizing: border-box;
+  padding: 10px;
+  padding-top: 20px;
+  height: 100vh;
+  justify-content: space-between;
+}
 
-  }
-  .center-right{
-    width: 64%;
-    border-radius: 8px;
-    overflow: hidden;
-    margin: 0px 10px;
-    height: 98vh;
-    background: #fff;
-    /*background: white;*/
-  }
-  .center-top{
-    width: 100%;
-    height: 86vh;
-    background: white;
-    margin-bottom: 10px;
-    box-sizing: border-box;
-    padding: 10px;
-    position: relative;
+.center-left {
+  width: 33%;
+  border-radius: 8px;
+  overflow: hidden;
+  height: 98vh;
+  position: relative;
+  margin-left: 15px;
+}
 
-  }
-  .center-top-title{
-    box-sizing: border-box;
-    padding: 10px 0px;
-    padding-bottom: 15px;
-    border-bottom: 1px solid #ececec;
+.bottom-posi {
+  width: 100%;
+  position: absolute;
+  bottom: 0px;
+}
+
+.center-app {
+  width: 33%;
+  border-radius: 8px;
+  overflow: hidden;
+  /*background: white;*/
+
+}
+
+.center-right {
+  width: 64%;
+  border-radius: 8px;
+  overflow: hidden;
+  margin: 0px 10px;
+  height: 98vh;
+  background: #fff;
+  /*background: white;*/
+}
+
+.center-top {
+  width: 100%;
+  height: 86vh;
+  background: white;
+  margin-bottom: 10px;
+  box-sizing: border-box;
+  padding: 10px;
+  position: relative;
+
+}
+
+.center-top-title {
+  box-sizing: border-box;
+  padding: 10px 0px;
+  padding-bottom: 15px;
+  border-bottom: 1px solid #ececec;
+  font-size: 18px;
+  margin-bottom: 10px;
+}
+
+.center-top-tab {
+  box-sizing: border-box;
+  padding: 15px 0px;
+
+}
+
+.center-top-input {
+  width: 100%;
+  height: 60px;
+  background: #f8f8f8;
+  border-radius: 50px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  input {
+    width: 90%;
     font-size: 18px;
-    margin-bottom: 10px;
-  }
-  .center-top-tab{
-    box-sizing: border-box;
-    padding: 15px 0px;
-
-  }
-  .center-top-input{
-    width: 100%;
-    height: 60px;
-    background: #f8f8f8;
-    border-radius: 50px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    input{
-      width: 90%;
-      font-size: 18px;
-      border: none;
-      outline: none;
-      background-color:transparent;
-    }
-
-  }
-  .center-top-data{
-    width: 100%;
-    border-radius: 8px;
-    overflow: hidden;
-    margin-top: 10px;
-
-
-    /*background-color: #f8f8f8;*/
-  }
-  .center-top-of{
-    width: 100%;
-    /*background-color: #99a9bf;*/
-    height: 70vh;
-    overflow: auto;
-
-
-  }
-  .wrap-wrap{
-    display: flex;
-    flex-wrap: wrap;
-  }
-  .of-box{
-    width: 31%;
-    margin-right: 10px;
-    margin-bottom: 10px;
-    border-radius: 8px;
-    box-sizing: border-box;
-    background-color: #b4d5ff;
-    height: 110px;
-    padding: 10px;
-    color: #3e4f60;
-  }
-  .of-title{
-    font-weight: bold;
-    font-size: 22px;
-    text-align: center;
-    margin: 13px;
-  }
-  .data-top{
-    width: 100%;
-    background-color: #ededed;
-    box-sizing: border-box;
-    padding: 15px 10px;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-  }
-  .data-top-box{
-    width: 100%;
-    /*background-color: #ededed;*/
-    box-sizing: border-box;
-    padding: 15px 10px;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
+    border: none;
+    outline: none;
+    background-color: transparent;
   }
 
-  .data-top-three{
-    width: 55%;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
+}
 
-  }
-  .data-top-title{
-    width: 45%;
-    overflow: hidden;
-  }
-  .content-top-bottom{
-    position: absolute;
-    bottom:-16px;
-    width: 98%;
-    border-top: 1px solid #ececec;
-    height: 40px;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    transform: translate(-50%,-50%);
-    left: 50%;
-    color: #2c3e50;
-    font-size: 18px;
-    box-sizing: border-box;
-    padding: 15px ;
-    background-color: white;
+.center-top-data {
+  width: 100%;
+  border-radius: 8px;
+  overflow: hidden;
+  margin-top: 10px;
 
 
-  }
-  .center-left-top{
-    width: 100%;
-    background: #FF9655;
-    height: 70px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-  .center-vh{
-    /*height: 68vh;*/
-  }
-  .center-left-hj{
-    background: white;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    box-sizing: border-box;
-    padding: 15px;
-    margin-bottom: 2px;
-  }
-  .center-left-th{
-    background: white;
-    box-sizing: border-box;
-    padding: 15px;
-    margin: 10px auto;
-  }
-  .center-left-wrap{
-    display: flex;
-    justify-content: space-between;
-    flex-wrap: wrap;
-    /*margin-top: 280px;*/
-  }
-  .wrap-box{
-    width: 31%;
-    background: #ffffff;
-    border-radius: 8px;
-    height: 44px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    margin-bottom: 10px;
+  /*background-color: #f8f8f8;*/
+}
+
+.center-top-of {
+  width: 100%;
+  /*background-color: #99a9bf;*/
+  height: 70vh;
+  overflow: auto;
+
+
+}
+
+.wrap-wrap {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.of-box {
+  width: 31%;
+  margin-right: 10px;
+  margin-bottom: 10px;
+  border-radius: 8px;
+  box-sizing: border-box;
+  background-color: #b4d5ff;
+  height: 110px;
+  padding: 10px;
+  color: #3e4f60;
+}
+
+.of-title {
+  font-weight: bold;
+  font-size: 22px;
+  text-align: center;
+  margin: 13px;
+}
+
+.data-top {
+  width: 100%;
+  background-color: #ededed;
+  box-sizing: border-box;
+  padding: 15px 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.data-top-box {
+  width: 100%;
+  /*background-color: #ededed;*/
+  box-sizing: border-box;
+  padding: 15px 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.data-top-three {
+  width: 55%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+
+}
+
+.data-top-title {
+  width: 45%;
+  overflow: hidden;
+}
+
+.content-top-bottom {
+  position: absolute;
+  bottom: -16px;
+  width: 98%;
+  border-top: 1px solid #ececec;
+  height: 40px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  transform: translate(-50%, -50%);
+  left: 50%;
+  color: #2c3e50;
+  font-size: 18px;
+  box-sizing: border-box;
+  padding: 15px;
+  background-color: white;
+
+
+}
+
+.center-left-top {
+  width: 100%;
+  background: #FF9655;
+  height: 70px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.center-vh {
+  /*height: 68vh;*/
+}
+
+.center-left-hj {
+  background: white;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  box-sizing: border-box;
+  padding: 15px;
+  margin-bottom: 2px;
+}
+
+.center-left-th {
+  background: white;
+  box-sizing: border-box;
+  padding: 15px;
+  margin: 10px auto;
+}
+
+.center-left-wrap {
+  display: flex;
+  justify-content: space-between;
+  flex-wrap: wrap;
+  /*margin-top: 280px;*/
+}
+
+.wrap-box {
+  width: 31%;
+  background: #ffffff;
+  border-radius: 8px;
+  height: 44px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 10px;
   border: 1px solid #00afff;
-  }
+}
 
-  .wrap-box2{
-    background: #30a1ff !important;
-    color: white;
-  }
+.wrap-box2 {
+  background: #30a1ff !important;
+  color: white;
+}
 
-  .center-left-bottom{
+.center-left-bottom {
+  width: 100%;
+  background-color: white;
+  border-radius: 8px;
+  box-sizing: border-box;
+  padding: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.bottom-qk {
+  border: 1px solid #99a9bf;
+  box-sizing: border-box;
+  padding: 14px 20px;
+  border-radius: 50px;
+  color: #99a9bf;
+  margin: 15px 0px;
+}
+
+.bottom-qd {
+  border: 1px solid #13ce66;
+  background: #13ce66;
+  box-sizing: border-box;
+  padding: 14px 20px;
+  border-radius: 50px;
+  color: #ffffff;
+
+  margin: 15px 10px;
+}
+
+.bottom-gd {
+  border: 1px solid #FF9655;
+  background: #FF9655;
+  box-sizing: border-box;
+  padding: 14px 20px;
+  border-radius: 50px;
+  color: #ffffff;
+
+  margin: 15px 10px;
+}
+
+.bottom-price {
+  font-size: 26px;
+  font-weight: bold;
+}
+
+.price-red {
+  color: red;
+}
+
+.center-left-lv {
+  width: 40%;
+  height: 60px;
+  color: white;
+  background: linear-gradient(312deg, #FF945B 0%, #FEB37C 100%);
+  border-radius: 6px 6px 6px 6px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 22px;
+  cursor: pointer;
+}
+
+.th-box {
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-bottom: 1px solid #f6f8f9;
+  box-sizing: border-box;
+  padding: 10px 0px;
+}
+
+.hj-box {
+  width: 33%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.bule {
+  font-weight: 700;
+  color: #FF9655 !important;
+}
+
+.vip-bottom {
+  border: 1px solid #ffffff;
+  box-sizing: border-box;
+  padding: 5px 15px;
+  border-radius: 50px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: white;
+  cursor: pointer;
+}
+
+.center-right-top {
+  width: 100%;
+  background: white;
+  height: 75px;
+  box-sizing: border-box;
+  padding: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.wrap-right {
+  width: 100%;
+
+  background: white;
+  overflow: auto;
+}
+
+.ts-box {
+  box-sizing: border-box;
+  padding: 0px 15px;
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.wrap-right-box {
+  width: 20%;
+  height: 270px;
+  /*margin-right: 10px;*/
+  /*margin-bottom: 10px;*/
+
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+}
+
+.box-six {
+
+  width: 164px;
+  height: 150px;
+
+  img {
     width: 100%;
-    background-color: white;
-    border-radius: 8px;
-    box-sizing: border-box;
-    padding: 10px;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-  }
-  .bottom-qk{
-    border: 1px solid #99a9bf;
-    box-sizing: border-box;
-    padding: 14px 20px;
-    border-radius: 50px;
-    color: #99a9bf;
-    margin: 15px 0px ;
-  }
-  .bottom-qd{
-    border: 1px solid #13ce66;
-    background: #13ce66;
-    box-sizing: border-box;
-    padding: 14px 20px;
-    border-radius: 50px;
-    color: #ffffff;
-
-    margin: 15px 10px ;
-  }
-  .bottom-gd{
-    border: 1px solid #FF9655;
-    background: #FF9655;
-    box-sizing: border-box;
-    padding: 14px 20px;
-    border-radius: 50px;
-    color: #ffffff;
-
-    margin: 15px 10px ;
+    height: 100%;
   }
 
-  .bottom-price{
-    font-size: 26px;
-    font-weight: bold;
-  }
-  .price-red{
-    color: red;
-  }
-  .center-left-lv{
-    width: 40%;
-    height: 60px;
-    color: white;
-    background: linear-gradient( 312deg, #FF945B 0%, #FEB37C 100%);
-    border-radius: 6px 6px 6px 6px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 22px;
-    cursor: pointer;
-  }
-  .th-box{
-    width: 100%;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    border-bottom: 1px solid #f6f8f9;
-    box-sizing: border-box;
-    padding: 10px 0px;
-  }
-  .hj-box{
-    width: 33%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-  .bule{
-    font-weight: 700;
-    color: #FF9655 !important;
-  }
-  .vip-bottom{
-    border: 1px solid #ffffff;
-    box-sizing: border-box;
-    padding: 5px 15px;
-    border-radius: 50px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    color: white;
-    cursor: pointer;
-  }
-  .center-right-top{
-    width: 100%;
-    background: white;
-    height: 75px;
-    box-sizing: border-box;
-    padding: 10px;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-  }
-  .wrap-right{
-    width: 100%;
+}
 
-    background: white;
-    overflow: auto;
-  }
-  .ts-box{
-    box-sizing: border-box;
-    padding: 0px 15px;
-    display: flex;
-    flex-wrap: wrap;
-  }
+.title-red {
+  font-size: 18px;
+  font-weight: bold;
+  color: rgb(238, 59, 62);
+}
 
-  .wrap-right-box{
-    width: 20%;
-    height: 270px;
-    /*margin-right: 10px;*/
-    /*margin-bottom: 10px;*/
+.title-hui {
+  font-size: 14px;
+  /*font-weight: bold;*/
+  color: #999999;
+  margin: 5px 0px;
+}
 
-    display: flex;
-    align-items: center;
-    justify-content: center;
+.title-goods {
+  font-size: 16px;
+  display: flex;
+  align-items: center;
+}
 
-  }
-  .box-six{
-
-    width: 164px;
-    height: 150px;
-    img{
-      width: 100%;
-      height: 100%;
-    }
-
-  }
-  .title-red{
-    font-size: 18px;
-    font-weight: bold;
-    color: rgb(238, 59, 62);
-  }
-  .title-hui{
-    font-size: 14px;
-    /*font-weight: bold;*/
-    color: #999999;
-    margin: 5px 0px;
-  }
-  .title-goods{
-    font-size: 16px;
-    display: flex;
-    align-items: center;
-  }
-  .wrap-right-bottom{
-    position: absolute;
-    bottom: 0px;
-    justify-content: space-between;
-    width: 57%;
-    background: white;
-    display: flex;
-    align-items: center;
-    border-radius: 8px;
-    margin-top: 10px;
-    box-sizing: border-box;
-    padding: 15px;
+.wrap-right-bottom {
+  position: absolute;
+  bottom: 0px;
+  justify-content: space-between;
+  width: 57%;
+  background: white;
+  display: flex;
+  align-items: center;
+  border-radius: 8px;
+  margin-top: 10px;
+  box-sizing: border-box;
+  padding: 15px;
 
 
-  }
-  .chongzhi{
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    border-radius: 50px;
-    box-sizing: border-box;
-    padding: 10px 15px;
-    border: 1px solid #999999;
-    font-size: 20px;
-    cursor: pointer;
+}
 
-  }
-.ddjil{
+.chongzhi {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 50px;
+  box-sizing: border-box;
+  padding: 10px 15px;
+  border: 1px solid #999999;
+  font-size: 20px;
+  cursor: pointer;
+
+}
+
+.ddjil {
   display: flex;
   align-items: center;
   justify-content: center;
   box-sizing: border-box;
   padding: 10px 15px;
   font-size: 20px;
-  background: linear-gradient( 312deg, #9CDCA0 0%, #5BC557 100%);
+  background: linear-gradient(312deg, #9CDCA0 0%, #5BC557 100%);
   border-radius: 6px 6px 6px 6px;
   color: white;
   margin: 8px 10px;
   cursor: pointer;
 }
-  .gwuc{
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    border-radius: 50px;
-    box-sizing: border-box;
-    padding: 10px 25px;
-    font-size: 20px;
-    background: linear-gradient( 312deg, #70CAFD 0%, #0BADFE 100%, #02AAFE 100%);
-    border-radius: 6px 6px 6px 6px;
-    color: white;
-    margin: 8px 10px;
-    cursor: pointer;
-  }
-  .new_card{
-    border: 1px solid #eceff1;
-    box-sizing: border-box;
-    padding: 10px;
-    border-radius: 8px;
-  }
+
+.gwuc {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 50px;
+  box-sizing: border-box;
+  padding: 10px 25px;
+  font-size: 20px;
+  background: linear-gradient(312deg, #70CAFD 0%, #0BADFE 100%, #02AAFE 100%);
+  border-radius: 6px 6px 6px 6px;
+  color: white;
+  margin: 8px 10px;
+  cursor: pointer;
+}
+
+.new_card {
+  border: 1px solid #eceff1;
+  box-sizing: border-box;
+  padding: 10px;
+  border-radius: 8px;
+}
+
 //
-  .center-left{
-    width: 33%;
-    border-radius: 8px;
-    overflow: hidden;
-    height: 98vh;
-    position: relative;
-  }
-  .o-top {
-    width: 100%;
-    height: 80px;
-    background: #FF9655;
-    box-sizing: border-box;
-    padding: 15px;
-    display: flex;
-    align-items: center;
-    font-size: 14px;
+.center-left {
+  width: 33%;
+  border-radius: 8px;
+  overflow: hidden;
+  height: 98vh;
+  position: relative;
+}
+
+.o-top {
+  width: 100%;
+  height: 80px;
+  background: #FF9655;
+  box-sizing: border-box;
+  padding: 15px;
+  display: flex;
+  align-items: center;
+  font-size: 14px;
+  color: #fff;
+  justify-content: space-between;
+
+}
+
+.d-s {
+  display: flex;
+  align-items: center;
+}
+
+.left_input {
+  width: 80%;
+  overflow: hidden;
+  box-sizing: border-box;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  box-sizing: border-box;
+  border-radius: 8px;
+  color: white;
+  border: 1px solid #fff;
+
+  ::v-deep.el-input__inner {
+    background: transparent !important;
+    border: transparent 1px solid;
     color: #fff;
-    justify-content: space-between;
 
+    .el-input__placeholder {
+      color: #fff !important;
+    }
   }
 
-  .d-s {
-    display: flex;
-    align-items: center;
+  ::v-deep input:-moz-placeholder,
+  ::v-deep textarea:-moz-placeholder {
+    color: #fff;
   }
-  .left_input {
-    width: 80%;
-    overflow: hidden;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    box-sizing: border-box;
-    border-radius: 8px;
-    color: white;
-    border: 1px solid #fff;
-    ::v-deep.el-input__inner {
-      background: transparent !important;
-      border: transparent 1px solid;
-      color: #fff;
-      .el-input__placeholder{
-        color: #fff !important;
-      }
-    }
 
-    ::v-deep input:-moz-placeholder,
-    ::v-deep textarea:-moz-placeholder {
-      color: #fff;
-    }
-    ::v-deep input:-ms-input-placeholder,
-    ::v-deep textarea:-ms-input-placeholder {
-      color: #fff;
-    }
-    ::v-deep input::-webkit-input-placeholder,
-    ::v-deep textarea::-webkit-input-placeholder {
-      color: #fff ;
-    }
+  ::v-deep input:-ms-input-placeholder,
+  ::v-deep textarea:-ms-input-placeholder {
+    color: #fff;
   }
-  .an_bor {
-    box-sizing: border-box;
-    padding: 5px;
-    border: 1px solid #fff;
-    border-radius: 50px;
-    display: flex;
-    align-items: center;
-    font-size: 14px;
-    color: #FFFFFF;
-    justify-content: center;
-    margin: 0px 5px;
-    cursor: pointer;
+
+  ::v-deep input::-webkit-input-placeholder,
+  ::v-deep textarea::-webkit-input-placeholder {
+    color: #fff;
   }
+}
+
+.an_bor {
+  box-sizing: border-box;
+  padding: 5px;
+  border: 1px solid #fff;
+  border-radius: 50px;
+  display: flex;
+  align-items: center;
+  font-size: 14px;
+  color: #FFFFFF;
+  justify-content: center;
+  margin: 0px 5px;
+  cursor: pointer;
+}
 </style>
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue b/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
index 5bd773706..f98cf6105 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
@@ -1040,6 +1040,7 @@ import {getLodop} from "@/api/LodopFuncs";
         this.open1 = true
       },
       handleUpdate(data){
+        console.log("修改数据", data)
         creditUnitInfo(data.id).then(res => {
           this.form1 = res.data
           this.title = "修改挂账单位"
@@ -1068,7 +1069,7 @@ import {getLodop} from "@/api/LodopFuncs";
           this.total3 = res.data.total;
 
         })
-          this.getUnitStatistic(val)
+          this.getUnitStatistic(undefined)
       },
       getUnitStatistic(val){
         if (val!=undefined){