diff --git a/fuintAdmin/package.json b/fuintAdmin/package.json
index fd692ebdc..1cdcf947e 100644
--- a/fuintAdmin/package.json
+++ b/fuintAdmin/package.json
@@ -55,6 +55,7 @@
     "jsencrypt": "3.0.0-rc.1",
     "nprogress": "0.2.0",
     "qrcode": "^1.5.3",
+    "qrcodejs2": "0.0.2",
     "quill": "1.3.7",
     "save": "^2.9.0",
     "screenfull": "5.0.2",
diff --git a/fuintAdmin/src/api/EventMarketing/Writeoffrecords.js b/fuintAdmin/src/api/EventMarketing/Writeoffrecords.js
new file mode 100644
index 000000000..85b350419
--- /dev/null
+++ b/fuintAdmin/src/api/EventMarketing/Writeoffrecords.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 核销记录列表
+export function listRecord(query) {
+  return request({
+    url: 'business/marketingActivity/cardExchangeRecord/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询兑换券领取记录详细
+export function getRecord(id) {
+  return request({
+    url: '/system/record/' + id,
+    method: 'get'
+  })
+}
+
+// 新增兑换券领取记录
+export function addRecord(data) {
+  return request({
+    url: 'business/marketingActivity/cardExchangeRecord',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改兑换券领取记录
+export function updateRecord(data) {
+  return request({
+    url: 'business/marketingActivity/cardExchangeRecord',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除兑换券领取记录
+export function delRecord(id) {
+  return request({
+    url: '/system/record/' + id,
+    method: 'delete'
+  })
+}
diff --git a/fuintAdmin/src/api/EventMarketing/cardExchange.js b/fuintAdmin/src/api/EventMarketing/cardExchange.js
index 919268b5d..702e82032 100644
--- a/fuintAdmin/src/api/EventMarketing/cardExchange.js
+++ b/fuintAdmin/src/api/EventMarketing/cardExchange.js
@@ -29,7 +29,7 @@ export function addExchange(data) {
 // 修改兑换券
 export function updateExchange(data) {
   return request({
-    url: '/system/exchange',
+    url: 'business/marketingActivity/cardExchange',
     method: 'put',
     data: data
   })
diff --git a/fuintAdmin/src/api/EventMarketing/cardExchangeRecord.js b/fuintAdmin/src/api/EventMarketing/cardExchangeRecord.js
index a8c78f376..c42209ca9 100644
--- a/fuintAdmin/src/api/EventMarketing/cardExchangeRecord.js
+++ b/fuintAdmin/src/api/EventMarketing/cardExchangeRecord.js
@@ -1,9 +1,9 @@
 import request from '@/utils/request'
 
-// 查询兑换券领取记录列表
+// 领取记录列表
 export function listRecord(query) {
   return request({
-    url: '/system/record/list',
+    url: 'business/marketingActivity/cardExchangeRecord',
     method: 'get',
     params: query
   })
@@ -20,7 +20,7 @@ export function getRecord(id) {
 // 新增兑换券领取记录
 export function addRecord(data) {
   return request({
-    url: '/system/record',
+    url: 'business/marketingActivity/cardExchangeRecord',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addRecord(data) {
 // 修改兑换券领取记录
 export function updateRecord(data) {
   return request({
-    url: '/system/record',
+    url: 'business/marketingActivity/cardExchangeRecord',
     method: 'put',
     data: data
   })
diff --git a/fuintAdmin/src/views/EventMarketing/Writeoffrecords/index.vue b/fuintAdmin/src/views/EventMarketing/Writeoffrecords/index.vue
new file mode 100644
index 000000000..6be83fd82
--- /dev/null
+++ b/fuintAdmin/src/views/EventMarketing/Writeoffrecords/index.vue
@@ -0,0 +1,375 @@
+<template>
+  <!--  核销记录-->
+  <div class="">
+    <el-card style="margin-bottom: 20px">
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form-item label="" prop="name">
+          <el-input
+            v-model="queryParams.mobile"
+            placeholder="请输入会员手机号"
+            clearable
+
+          />
+        </el-form-item>
+        <el-form-item label="" prop="name">
+          <el-input
+            v-model="queryParams.staffMobile"
+            placeholder="请输入员工手机号"
+            clearable
+
+          />
+        </el-form-item>
+
+        <el-form-item label="" prop="name">
+          <el-input
+            v-model="queryParams.exchangeName"
+            placeholder="券名称"
+            clearable
+          />
+        </el-form-item>
+
+        <el-form-item label="" prop="isonline">
+          <el-select v-model="queryParams.status" placeholder="是否使用">
+            <el-option label="已使用" value="0"></el-option>
+            <el-option label="未使用" value="1"></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+
+        </el-form-item>
+      </el-form>
+    </el-card>
+
+    <el-card style="margin-bottom: 20px">
+      <!--    <el-row :gutter="10" class="mb8">-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="primary"-->
+      <!--          plain-->
+      <!--          icon="el-icon-plus"-->
+      <!--          size="mini"-->
+      <!--          @click="handleAdd"-->
+
+      <!--        >新增</el-button>-->
+      <!--      </el-col>-->
+      <!--    </el-row>-->
+
+      <el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange">
+        <!--      <el-table-column type="selection" width="55" align="center" />-->
+        <!--      <el-table-column label="主键id" align="center" prop="id" />-->
+        <!--      <el-table-column label="员工id" align="center" prop="mtStaffId" />-->
+        <!--      <el-table-column label="兑换券id" align="center" prop="cardExchangeId" />-->
+
+        <el-table-column label="id" align="center" prop="mtUserId" />
+        <el-table-column label="手机号码" align="center" prop="mobile" />
+        <el-table-column label="名字" align="center" prop="name" />
+        <el-table-column label="头像" align="center" prop="photo" />
+         <el-table-column label="核销人手机号" align="center" prop="staffMobile" />
+         <el-table-column label="核销人姓名" align="center" prop="realName" />
+        <el-table-column label="开始时间" align="center" prop="startTime" width="180">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="券名称" align="center" prop="exchangeName" />
+        <!--      <el-table-column label="券码" align="center" prop="ticketCode" />-->
+        <el-table-column label="券来源" align="center" prop="exchangeFrom" />
+
+        <el-table-column label="到期时间" align="center" prop="outTime" width="180">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.outTime, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="使用状态" align="center" prop="status" >
+          <template slot-scope="scope">
+            <span v-if="scope.row.status == 0">未使用</span>
+            <span v-if="scope.row.status == 1">已使用</span>
+          </template>
+        </el-table-column>
+        <!--      <el-table-column label="核销时间" align="center" prop="cancelTime" width="180">-->
+        <!--        <template slot-scope="scope">-->
+        <!--          <span>{{ parseTime(scope.row.cancelTime, '{y}-{m}-{d}') }}</span>-->
+        <!--        </template>-->
+        <!--      </el-table-column>-->
+
+        <!--      <el-table-column label="结束时间" align="center " prop="endTime" width="180">-->
+        <!--        <template slot-scope="scope">-->
+        <!--          <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>-->
+        <!--        </template>-->
+        <!--      </el-table-column>-->
+        <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+        <!--        <template slot-scope="scope">-->
+        <!--          <el-button-->
+        <!--            size="mini"-->
+        <!--            type="text"-->
+        <!--            icon="el-icon-edit"-->
+        <!--            @click="handleUpdate(scope.row)"-->
+        <!--            v-hasPermi="['system:record:edit']"-->
+        <!--          >修改</el-button>-->
+        <!--          <el-button-->
+        <!--            size="mini"-->
+        <!--            type="text"-->
+        <!--            icon="el-icon-delete"-->
+        <!--            @click="handleDelete(scope.row)"-->
+        <!--            v-hasPermi="['system:record:remove']"-->
+        <!--          >删除</el-button>-->
+        <!--        </template>-->
+        <!--      </el-table-column>-->
+      </el-table>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </el-card>
+    <!-- 添加或修改兑换券领取记录对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="兑换券id" prop="cardExchangeId">
+          <el-input v-model="form.cardExchangeId" placeholder="请输入兑换券id" />
+        </el-form-item>
+        <el-form-item label="员工id" prop="mtStaffId">
+          <el-input v-model="form.mtStaffId" placeholder="请输入员工id" />
+        </el-form-item>
+        <el-form-item label="员工姓名" prop="realName">
+          <el-input v-model="form.realName" placeholder="请输入员工姓名" />
+        </el-form-item>
+        <el-form-item label="员工手机号码" prop="staffMobile">
+          <el-input v-model="form.staffMobile" placeholder="请输入员工手机号码" />
+        </el-form-item>
+        <el-form-item label="会员id" prop="mtUserId">
+          <el-input v-model="form.mtUserId" placeholder="请输入会员id" />
+        </el-form-item>
+        <el-form-item label="会员名字" prop="name">
+          <el-input v-model="form.name" placeholder="请输入会员名字" />
+        </el-form-item>
+        <el-form-item label="会员手机号码" prop="mobile">
+          <el-input v-model="form.mobile" placeholder="请输入会员手机号码" />
+        </el-form-item>
+        <el-form-item label="会员头像" prop="photo">
+          <el-input v-model="form.photo" placeholder="请输入会员头像" />
+        </el-form-item>
+        <el-form-item label="券名称" prop="exchangeName">
+          <el-input v-model="form.exchangeName" placeholder="请输入券名称" />
+        </el-form-item>
+        <el-form-item label="券码" prop="ticketCode">
+          <el-input v-model="form.ticketCode" placeholder="请输入券码" />
+        </el-form-item>
+        <el-form-item label="券来源" prop="exchangeFrom">
+          <el-input v-model="form.exchangeFrom" placeholder="请输入券来源" />
+        </el-form-item>
+        <el-form-item label="到期时间" prop="outTime">
+          <el-date-picker clearable
+                          v-model="form.outTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择到期时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="核销时间" prop="cancelTime">
+          <el-date-picker clearable
+                          v-model="form.cancelTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择核销时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="开始时间" prop="startTime">
+          <el-date-picker clearable
+                          v-model="form.startTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择开始时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间" prop="endTime">
+          <el-date-picker clearable
+                          v-model="form.endTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择结束时间">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+
+  import { listRecord, getRecord, delRecord, addRecord, updateRecord } from "@/api/EventMarketing/Writeoffrecords";
+  export default {
+    name: "Record",
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 兑换券领取记录表格数据
+        recordList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          cardExchangeId: null,
+          mtStaffId: null,
+          realName: null,
+          staffMobile: null,
+          mtUserId: null,
+          name: null,
+          mobile: null,
+          photo: null,
+          exchangeName: null,
+          ticketCode: null,
+          exchangeFrom: null,
+          status: null,
+          outTime: null,
+          cancelTime: null,
+          startTime: null,
+          endTime: null,
+        },
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {
+        }
+      };
+    },
+    created() {
+      this.getList();
+    },
+    methods: {
+      /** 查询兑换券领取记录列表 */
+      getList() {
+        this.loading = true;
+        listRecord(this.queryParams).then(response => {
+          this.recordList = response.data.records;
+          this.total = response.data.total;
+          this.loading = false;
+        });
+      },
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.reset();
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          id: null,
+          cardExchangeId: null,
+          mtStaffId: null,
+          realName: null,
+          staffMobile: null,
+          mtUserId: null,
+          name: null,
+          mobile: null,
+          photo: null,
+          exchangeName: null,
+          ticketCode: null,
+          exchangeFrom: null,
+          status: null,
+          outTime: null,
+          cancelTime: null,
+          startTime: null,
+          endTime: null,
+          createBy: null,
+          createTime: null,
+          updateBy: null,
+          updateTime: null
+        };
+        this.resetForm("form");
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.resetForm("queryForm");
+        this.handleQuery();
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.id)
+        this.single = selection.length!==1
+        this.multiple = !selection.length
+      },
+      /** 新增按钮操作 */
+      handleAdd() {
+        this.reset();
+        this.open = true;
+        this.title = "添加兑换券领取记录";
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        this.reset();
+        const id = row.id || this.ids
+        getRecord(id).then(response => {
+          this.form = response.data;
+          this.open = true;
+          this.title = "修改兑换券领取记录";
+        });
+      },
+      /** 提交按钮 */
+      submitForm() {
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            if (this.form.id != null) {
+              updateRecord(this.form).then(response => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              });
+            } else {
+              addRecord(this.form).then(response => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            }
+          }
+        });
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const ids = row.id || this.ids;
+        this.$modal.confirm('是否确认删除兑换券领取记录编号为"' + ids + '"的数据项？').then(function() {
+          return delRecord(ids);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        this.download('system/record/export', {
+          ...this.queryParams
+        }, `record_${new Date().getTime()}.xlsx`)
+      }
+    }
+  };
+</script>
diff --git a/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue b/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
index da6a27248..48f1d993a 100644
--- a/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
@@ -1,222 +1,190 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="所属连锁店id" prop="chainStorId">
-        <el-input
-          v-model="queryParams.chainStorId"
-          placeholder="请输入所属连锁店id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="所属店铺id" prop="storeId">
-        <el-input
-          v-model="queryParams.storeId"
-          placeholder="请输入所属店铺id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否在线 0：在线 1： 下线" prop="isonline">
-        <el-input
-          v-model="queryParams.isonline"
-          placeholder="请输入是否在线 0：在线 1： 下线"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="兑换券名称" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入兑换券名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="兑换礼品名" prop="giftName">
-        <el-input
-          v-model="queryParams.giftName"
-          placeholder="请输入兑换礼品名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="卡券有效期" prop="validity">
-        <el-input
-          v-model="queryParams.validity"
-          placeholder="请输入卡券有效期"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="使用说明" prop="useInstructions">
-        <el-input
-          v-model="queryParams.useInstructions"
-          placeholder="请输入使用说明"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="二维码链接" prop="qrCodeLink">
-        <el-input
-          v-model="queryParams.qrCodeLink"
-          placeholder="请输入二维码链接"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="参与次数" prop="count">
-        <el-input
-          v-model="queryParams.count"
-          placeholder="请输入参与次数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="到期时间" prop="outTime">
-        <el-date-picker clearable
-                        v-model="queryParams.outTime"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择到期时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
+  <div class="">
+    <el-card style="margin-bottom: 20px">
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form-item label="" prop="name">
+          <el-input
+            v-model="queryParams.name"
+            placeholder="兑换券名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:exchange:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:exchange:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:exchange:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:exchange:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+        <el-form-item label="" prop="isonline">
+          <el-select v-model="queryParams.isonline" placeholder="是否在线">
+            <el-option label="在线" value="0"></el-option>
+            <el-option label="下线" value="1"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="" prop="status">
+          <el-select v-model="queryParams.status" placeholder="兑换券状态">
+            <el-option label="启用" value="0"></el-option>
+            <el-option label="禁用" value="1"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="" prop="type">
+          <el-select v-model="queryParams.type" placeholder="兑换券类型">
+            <el-option label="兑换券" value="0"></el-option>
+            <el-option label="洗车券" value="1"></el-option>
+            <el-option label="洗车卡" value="2"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
 
-    <el-table v-loading="loading" :data="exchangeList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键id" align="center" prop="id" />
-      <el-table-column label="所属连锁店id" align="center" prop="chainStorId" />
-      <el-table-column label="所属店铺id" align="center" prop="storeId" />
-      <el-table-column label="是否在线 0：在线 1： 下线" align="center" prop="isonline" />
-      <el-table-column label="兑换券状态 0：启用 1： 禁用" align="center" prop="status" />
-      <el-table-column label="兑换券名称" align="center" prop="name" />
-      <el-table-column label="兑换券类型 0：兑换券 1：洗车券 2：洗车卡" align="center" prop="type" />
-      <el-table-column label="兑换礼品名" align="center" prop="giftName" />
-      <el-table-column label="卡券有效期" align="center" prop="validity" />
-      <el-table-column label="使用说明" align="center" prop="useInstructions" />
-      <el-table-column label="二维码链接" align="center" prop="qrCodeLink" />
-      <el-table-column label="参与次数" align="center" prop="count" />
-      <el-table-column label="到期时间" align="center" prop="outTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.outTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        </el-form-item>
+      </el-form>
+    </el-card>
+
+    <el-card style="margin-bottom: 20px">
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
           <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
             size="mini"
-            type="text"
+            @click="handleAdd"
+
+          >新增
+          </el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="success"
+            plain
             icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:exchange:edit']"
-          >修改</el-button>
-          <el-button
             size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:exchange:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+            :disabled="single"
+            @click="handleUpdate"
+            v-hasPermi="['system:exchange:edit']"
+          >修改
+          </el-button>
+        </el-col>
+      </el-row>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+      <el-table v-loading="loading" :data="exchangeList" @selection-change="handleSelectionChange">
 
+        <!--      <el-table-column label="主键id" align="center" prop="id" />-->
+        <!--      <el-table-column label="所属连锁店id" align="center" prop="chainStorId" />-->
+        <!--      <el-table-column label="所属店铺id" align="center" prop="storeId" />-->
+        <el-table-column label="是否在线" align="center" prop="isonline">
+          <template slot-scope="scope">
+            <span v-if="scope.row.isonline == 0">在线</span>
+            <span v-if="scope.row.isonline == 1">下线</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="兑换券状态" align="center" prop="status">
+          <template slot-scope="scope">
+            <span v-if="scope.row.status == 0">  <el-tag>启用</el-tag> </span>
+            <span v-if="scope.row.status == 1">  <el-tag type="danger">禁用</el-tag> </span>
+
+          </template>
+        </el-table-column>
+        <el-table-column label="兑换券名称" align="center" prop="name"/>
+        <el-table-column label="兑换券类型 " align="center" prop="type">
+          <template slot-scope="scope">
+            <span v-if="scope.row.type == 0"> <el-tag>兑换券</el-tag> </span>
+            <span v-if="scope.row.type == 1"> <el-tag type="success">洗车券</el-tag> </span>
+            <span v-if="scope.row.type == 2"> <el-tag type="warning">洗车卡</el-tag> </span>
+          </template>
+        </el-table-column>
+        <el-table-column label="兑换礼品名" align="center" prop="giftName"/>
+        <el-table-column label="卡券有效期" align="center" prop="validity">
+          <template slot-scope="scope">
+            <span>{{scope.row.validity}}天</span>
+
+          </template>
+        </el-table-column>
+        <el-table-column label="使用说明" align="center" prop="useInstructions"/>
+        <el-table-column label="二维码链接" align="center" prop="qrCodeLink">
+          <template slot-scope="scope">
+            <i class="el-icon-picture" style="size: 20px;cursor: pointer" @click="qrcodelook(scope.row.qrCodeLink)"></i>
+            <!--        <span>{{ scope.row.qrCodeLink }}</span>-->
+          </template>
+        </el-table-column>
+        <el-table-column label="参与次数" align="center" prop="count"/>
+        <el-table-column label="到期时间" align="center" prop="outTime" width="180">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.outTime, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+            >修改
+            </el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              v-if="scope.row.isonline == 0"
+              @click="handleXia(scope.row)"
+            >下线
+            </el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              v-if="scope.row.isonline == 1"
+              @click="handleShang(scope.row)"
+            >上线
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </el-card>
     <!-- 添加或修改兑换券对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="所属连锁店id" prop="chainStorId">
-          <el-input v-model="form.chainStorId" placeholder="请输入所属连锁店id" />
-        </el-form-item>
-        <el-form-item label="所属店铺id" prop="storeId">
-          <el-input v-model="form.storeId" placeholder="请输入所属店铺id" />
-        </el-form-item>
-        <el-form-item label="是否在线 0：在线 1： 下线" prop="isonline">
-          <el-input v-model="form.isonline" placeholder="请输入是否在线 0：在线 1： 下线" />
-        </el-form-item>
+    <el-dialog :title="title" :visible.sync="open" width="40%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <!--        <el-form-item label="所属连锁店id" prop="chainStorId">-->
+        <!--          <el-input v-model="form.chainStorId" placeholder="请输入所属连锁店id" />-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="所属店铺id" prop="storeId">-->
+        <!--          <el-input v-model="form.storeId" placeholder="请输入所属店铺id" />-->
+        <!--        </el-form-item>-->
         <el-form-item label="兑换券名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入兑换券名称" />
+          <el-input v-model="form.name" placeholder="请输入兑换券名称"/>
+        </el-form-item>
+        <el-form-item label="兑换券类型" prop="type">
+          <el-radio-group v-model="form.type">
+            <el-radio label="0">兑换券</el-radio>
+            <el-radio label="1">洗车券</el-radio>
+            <el-radio label="2">洗车卡</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="兑换礼品名" prop="giftName">
-          <el-input v-model="form.giftName" placeholder="请输入兑换礼品名" />
+          <el-input type="textarea" v-model="form.giftName" placeholder="请输入兑换礼品名"></el-input>
         </el-form-item>
         <el-form-item label="卡券有效期" prop="validity">
-          <el-input v-model="form.validity" placeholder="请输入卡券有效期" />
+          <el-input placeholder="请输入卡券有效期" v-model="form.validity">
+            <template slot="append">天</template>
+          </el-input>
         </el-form-item>
         <el-form-item label="使用说明" prop="useInstructions">
-          <el-input v-model="form.useInstructions" placeholder="请输入使用说明" />
-        </el-form-item>
-        <el-form-item label="二维码链接" prop="qrCodeLink">
-          <el-input v-model="form.qrCodeLink" placeholder="请输入二维码链接" />
+          <el-input type="textarea" v-model="form.useInstructions" placeholder="请输入使用说明"></el-input>
         </el-form-item>
         <el-form-item label="参与次数" prop="count">
-          <el-input v-model="form.count" placeholder="请输入参与次数" />
+          <el-input-number v-model="form.count" controls-position="right" :min="1" :max="999"></el-input-number>
         </el-form-item>
-        <el-form-item label="到期时间" prop="outTime">
-          <el-date-picker clearable
-                          v-model="form.outTime"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="请选择到期时间">
-          </el-date-picker>
+        <el-form-item label="状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio label="0">启用</el-radio>
+            <el-radio label="1">禁用</el-radio>
+          </el-radio-group>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -224,167 +192,251 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog
+      title="二维码"
+      v-loading="loadingdialog"
+      :visible.sync="centerDialogVisible"
+      width="30%"
+      center>
+      <div style="display: flex;align-items: center">
+        <div class="qr-code" id="qrCode" ref="qrCodeUrl"></div>
+      </div>
+
+      <span slot="footer" class="dialog-footer">
+         <el-button @click="centerDialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-// import { listExchange, getExchange, delExchange, addExchange, updateExchange } from "@/api/system/exchange";
+  import QRCode from 'qrcodejs2'
+  import {
+    listExchange,
+    getExchange,
+    delExchange,
+    addExchange,
+    updateExchange
+  } from '@/api/EventMarketing/cardExchange'
+
+  export default {
+    name: 'Exchange',
+    data() {
+      return {
+        centerDialogVisible: false,
+        loadingdialog:true,
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 兑换券表格数据
+        exchangeList: [],
+        // 弹出层标题
+        title: '',
+        // 是否显示弹出层
+        open: false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          chainStorId: null,
+          storeId: null,
+          isonline: null,
+          status: null,
+          name: null,
+          type: null,
+          giftName: null,
+          validity: null,
+          useInstructions: null,
+          qrCodeLink: null,
+          count: null,
+          outTime: null
+        },
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {
+          name: [
+            { required: true, message: '请输入兑换券名称', trigger: 'change' }
+          ],
+          type: [
+            { required: true, message: '请输入兑换券类型', trigger: 'change' }
+          ],
+          giftName: [
+            { required: true, message: '请输入兑换礼品名', trigger: 'change' }
+          ],
+          validity: [
+            { required: true, message: '请输入卡券有效期', trigger: 'change' }
+          ],
+          useInstructions: [
+            { required: true, message: '请输入使用说明', trigger: 'change' }
+          ],
+          count: [
+            { required: true, message: '请输入参与次数', trigger: 'change' }
+          ],
+          status: [
+            { required: true, message: '请选择状态', trigger: 'change' }
+          ]
 
-export default {
-  name: "Exchange",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 兑换券表格数据
-      exchangeList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        chainStorId: null,
-        storeId: null,
-        isonline: null,
-        status: null,
-        name: null,
-        type: null,
-        giftName: null,
-        validity: null,
-        useInstructions: null,
-        qrCodeLink: null,
-        count: null,
-        outTime: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询兑换券列表 */
-    getList() {
-      this.loading = true;
-      listExchange(this.queryParams).then(response => {
-        this.exchangeList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        chainStorId: null,
-        storeId: null,
-        isonline: null,
-        status: null,
-        name: null,
-        type: null,
-        giftName: null,
-        validity: null,
-        useInstructions: null,
-        qrCodeLink: null,
-        count: null,
-        outTime: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加兑换券";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getExchange(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改兑换券";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateExchange(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addExchange(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
         }
-      });
+      }
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除兑换券编号为"' + ids + '"的数据项？').then(function() {
-        return delExchange(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+    created() {
+      this.getList()
+
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('system/exchange/export', {
-        ...this.queryParams
-      }, `exchange_${new Date().getTime()}.xlsx`)
+    methods: {
+      qrcodelook(url) {
+        this.loadingdialog = true
+        this.centerDialogVisible = true
+        setTimeout(() => {
+          this.creatQrCode(url)
+          this.loadingdialog = false
+        }, 1000);
+
+      },
+      creatQrCode(url) {
+
+        document.getElementById("qrCode").innerHTML = ""
+
+        new QRCode(this.$refs.qrCodeUrl, {
+          text: url, // 二维码的内容
+          width: 300,
+          height: 300,
+          colorDark: '#000',
+          colorLight: '#fff',
+          correctLevel: QRCode.CorrectLevel.H
+        })
+
+
+      },
+
+      /** 查询兑换券列表 */
+      getList() {
+        this.loading = true
+        listExchange(this.queryParams).then(response => {
+          this.exchangeList = response.data.records
+          this.total = response.data.total
+          this.loading = false
+        })
+      },
+      // 取消按钮
+      cancel() {
+        this.open = false
+        this.reset()
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          id: null,
+          chainStorId: null,
+          storeId: null,
+          isonline: null,
+          status: null,
+          name: null,
+          type: null,
+          giftName: null,
+          validity: null,
+          useInstructions: null,
+          qrCodeLink: null,
+          count: null,
+          outTime: null,
+          createBy: null,
+          createTime: null,
+          updateBy: null,
+          updateTime: null
+        }
+        this.resetForm('form')
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1
+        this.getList()
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.resetForm('queryForm')
+        this.handleQuery()
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.id)
+        this.single = selection.length !== 1
+        this.multiple = !selection.length
+      },
+      /** 新增按钮操作 */
+      handleAdd() {
+        this.reset()
+        this.open = true
+        this.title = '添加兑换券'
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        this.reset()
+        this.form = row
+        this.open = true
+        this.title = '修改兑换券'
+      },
+      /** 提交按钮 */
+      submitForm() {
+        this.$refs['form'].validate(valid => {
+          if (valid) {
+            if (this.form.id != null) {
+              updateExchange(this.form).then(response => {
+                this.$modal.msgSuccess('修改成功')
+                this.open = false
+                this.getList()
+              })
+            } else {
+              addExchange(this.form).then(response => {
+                this.$modal.msgSuccess('新增成功')
+                this.open = false
+                this.getList()
+              })
+            }
+          }
+        })
+      },
+      /** 下线操作 */
+      handleXia(row) {
+        let data = row
+        data.isonline = 1
+        updateExchange(data).then(res => {
+          if (res.code == 200) {
+            this.$message.success('下线成功')
+          }
+        })
+      },
+      /** 上线操作 */
+      handleShang(row) {
+        let data = row
+        data.isonline = 0
+        updateExchange(data).then(res => {
+          if (res.code == 200) {
+            this.$message.success('上线成功')
+          }
+        })
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        this.download('system/exchange/export', {
+          ...this.queryParams
+        }, `exchange_${new Date().getTime()}.xlsx`)
+      }
     }
   }
-};
 </script>
+<style scoped lang="scss">
+  .qr-code{
+    margin: 0px auto;
+  }
+</style>
diff --git a/fuintAdmin/src/views/EventMarketing/cardExchangeRecord/index.vue b/fuintAdmin/src/views/EventMarketing/cardExchangeRecord/index.vue
index 33d4e6846..88952fcdd 100644
--- a/fuintAdmin/src/views/EventMarketing/cardExchangeRecord/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/cardExchangeRecord/index.vue
@@ -1,231 +1,113 @@
 <template>
-  <div class="app-container">
+<!--  领取记录-->
+  <div class="">
+    <el-card style="margin-bottom: 20px">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="兑换券id" prop="cardExchangeId">
-        <el-input
-          v-model="queryParams.cardExchangeId"
-          placeholder="请输入兑换券id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="员工id" prop="mtStaffId">
-        <el-input
-          v-model="queryParams.mtStaffId"
-          placeholder="请输入员工id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="员工姓名" prop="realName">
-        <el-input
-          v-model="queryParams.realName"
-          placeholder="请输入员工姓名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="员工手机号码" prop="staffMobile">
-        <el-input
-          v-model="queryParams.staffMobile"
-          placeholder="请输入员工手机号码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="会员id" prop="mtUserId">
-        <el-input
-          v-model="queryParams.mtUserId"
-          placeholder="请输入会员id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="会员名字" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入会员名字"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="会员手机号码" prop="mobile">
+      <el-form-item label="" prop="name">
         <el-input
           v-model="queryParams.mobile"
-          placeholder="请输入会员手机号码"
+          placeholder="请输入会员手机号"
           clearable
-          @keyup.enter.native="handleQuery"
+
         />
       </el-form-item>
-      <el-form-item label="会员头像" prop="photo">
-        <el-input
-          v-model="queryParams.photo"
-          placeholder="请输入会员头像"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="券名称" prop="exchangeName">
+      <el-form-item label="" prop="name">
         <el-input
           v-model="queryParams.exchangeName"
-          placeholder="请输入券名称"
+          placeholder="券名称"
           clearable
-          @keyup.enter.native="handleQuery"
+
         />
       </el-form-item>
-      <el-form-item label="券码" prop="ticketCode">
-        <el-input
-          v-model="queryParams.ticketCode"
-          placeholder="请输入券码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="券来源" prop="exchangeFrom">
-        <el-input
-          v-model="queryParams.exchangeFrom"
-          placeholder="请输入券来源"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="到期时间" prop="outTime">
-        <el-date-picker clearable
-                        v-model="queryParams.outTime"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择到期时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="核销时间" prop="cancelTime">
-        <el-date-picker clearable
-                        v-model="queryParams.cancelTime"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择核销时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="开始时间" prop="startTime">
-        <el-date-picker clearable
-                        v-model="queryParams.startTime"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择开始时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="结束时间" prop="endTime">
-        <el-date-picker clearable
-                        v-model="queryParams.endTime"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择结束时间">
-        </el-date-picker>
+
+      <el-form-item label="" prop="isonline">
+        <el-select v-model="queryParams.status" placeholder="是否使用">
+          <el-option label="已使用" value="0"></el-option>
+          <el-option label="未使用" value="1"></el-option>
+        </el-select>
       </el-form-item>
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+
       </el-form-item>
     </el-form>
+    </el-card>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:record:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:record:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:record:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:record:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    <el-card style="margin-bottom: 20px">
+<!--    <el-row :gutter="10" class="mb8">-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
+<!--    </el-row>-->
 
     <el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键id" align="center" prop="id" />
-      <el-table-column label="兑换券id" align="center" prop="cardExchangeId" />
-      <el-table-column label="员工id" align="center" prop="mtStaffId" />
-      <el-table-column label="员工姓名" align="center" prop="realName" />
-      <el-table-column label="员工手机号码" align="center" prop="staffMobile" />
-      <el-table-column label="会员id" align="center" prop="mtUserId" />
-      <el-table-column label="会员名字" align="center" prop="name" />
-      <el-table-column label="会员手机号码" align="center" prop="mobile" />
-      <el-table-column label="会员头像" align="center" prop="photo" />
-      <el-table-column label="券名称" align="center" prop="exchangeName" />
-      <el-table-column label="券码" align="center" prop="ticketCode" />
-      <el-table-column label="券来源" align="center" prop="exchangeFrom" />
-      <el-table-column label="使用状态 ：0 ：未使用 1：已使用 " align="center" prop="status" />
-      <el-table-column label="到期时间" align="center" prop="outTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.outTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="核销时间" align="center" prop="cancelTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.cancelTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
+<!--      <el-table-column type="selection" width="55" align="center" />-->
+<!--      <el-table-column label="主键id" align="center" prop="id" />-->
+<!--      <el-table-column label="员工id" align="center" prop="mtStaffId" />-->
+<!--      <el-table-column label="兑换券id" align="center" prop="cardExchangeId" />-->
+<!--      <el-table-column label="员工手机号码" align="center" prop="staffMobile" />-->
+<!--      <el-table-column label="员工姓名" align="center" prop="realName" />-->
+      <el-table-column label="id" align="center" prop="mtUserId" />
+      <el-table-column label="手机号码" align="center" prop="mobile" />
+      <el-table-column label="名字" align="center" prop="name" />
+      <el-table-column label="头像" align="center" prop="photo" />
       <el-table-column label="开始时间" align="center" prop="startTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="结束时间" align="center" prop="endTime" width="180">
+      <el-table-column label="券名称" align="center" prop="exchangeName" />
+<!--      <el-table-column label="券码" align="center" prop="ticketCode" />-->
+      <el-table-column label="券来源" align="center" prop="exchangeFrom" />
+
+      <el-table-column label="到期时间" align="center" prop="outTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.outTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:record:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:record:remove']"
-          >删除</el-button>
-        </template>
+      <el-table-column label="使用状态" align="center" prop="status" >
+      <template slot-scope="scope">
+        <span v-if="scope.row.status == 0">未使用</span>
+        <span v-if="scope.row.status == 1">已使用</span>
+      </template>
       </el-table-column>
+<!--      <el-table-column label="核销时间" align="center" prop="cancelTime" width="180">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ parseTime(scope.row.cancelTime, '{y}-{m}-{d}') }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+
+<!--      <el-table-column label="结束时间" align="center " prop="endTime" width="180">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="handleUpdate(scope.row)"-->
+<!--            v-hasPermi="['system:record:edit']"-->
+<!--          >修改</el-button>-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['system:record:remove']"-->
+<!--          >删除</el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
 
     <pagination
@@ -235,7 +117,7 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
+    </el-card>
     <!-- 添加或修改兑换券领取记录对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
@@ -315,7 +197,7 @@
 
 <script>
 
-import { listRecord, getRecord, delRecord, addRecord, updateRecord } from "@/api/EventMarketing/cardExchange";
+import { listRecord, getRecord, delRecord, addRecord, updateRecord } from "@/api/EventMarketing/cardExchangeRecord";
 export default {
   name: "Record",
   data() {
@@ -339,7 +221,7 @@ export default {
       // 是否显示弹出层
       open: false,
       // 查询参数
-      queryParams: {
+      queryParams : {
         pageNum: 1,
         pageSize: 10,
         cardExchangeId: null,
@@ -374,8 +256,8 @@ export default {
     getList() {
       this.loading = true;
       listRecord(this.queryParams).then(response => {
-        this.recordList = response.rows;
-        this.total = response.total;
+        this.recordList = response.data.records;
+        this.total = response.data.total;
         this.loading = false;
       });
     },
diff --git a/fuintAdmin/src/views/EventMarketing/exchange/index.vue b/fuintAdmin/src/views/EventMarketing/exchange/index.vue
index 67e788018..867fb1c61 100644
--- a/fuintAdmin/src/views/EventMarketing/exchange/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/exchange/index.vue
@@ -1,268 +1,89 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="兑换券名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-
-      <el-form-item label="" prop="isonline">
-        <el-select v-model="queryParams.isonline" placeholder="是否在线">
-          <el-option label="在线" value="0"></el-option>
-          <el-option label="下线" value="1"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="" prop="status">
-        <el-select v-model="queryParams.status" placeholder="兑换券状态">
-          <el-option label="启用" value="0"></el-option>
-          <el-option label="禁用" value="1"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="" prop="type">
-        <el-select v-model="queryParams.type" placeholder="兑换券类型">
-          <el-option label="兑换券" value="0"></el-option>
-          <el-option label="洗车券" value="1"></el-option>
-          <el-option label="洗车卡" value="2"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:exchange:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:exchange:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:exchange:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="exchangeList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键id" align="center" prop="id" />
-      <el-table-column label="所属连锁店id" align="center" prop="chainStorId" />
-      <el-table-column label="所属店铺id" align="center" prop="storeId" />
-      <el-table-column label="是否在线 0：在线 1： 下线" align="center" prop="isonline" />
-      <el-table-column label="兑换券状态 0：启用 1： 禁用" align="center" prop="status" />
-      <el-table-column label="兑换券名称" align="center" prop="name" />
-      <el-table-column label="兑换券类型 0：兑换券 1：洗车券 2：洗车卡" align="center" prop="type" />
-      <el-table-column label="兑换礼品名" align="center" prop="giftName" />
-      <el-table-column label="卡券有效期" align="center" prop="validity" />
-      <el-table-column label="使用说明" align="center" prop="useInstructions" />
-      <el-table-column label="二维码链接" align="center" prop="qrCodeLink" />
-      <el-table-column label="参与次数" align="center" prop="count" />
-      <el-table-column label="到期时间" align="center" prop="outTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.outTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
+    <el-card style="margin-bottom: 20px">
+      <el-radio-group v-model="value">
+        <el-radio-button label="1">兑换券</el-radio-button>
+        <el-radio-button label="2">领取记录</el-radio-button>
+        <el-radio-button label="3">核销记录</el-radio-button>
+        <el-radio-button label="4">在线核销</el-radio-button>
+      </el-radio-group>
+    </el-card>
+    <cardExchange v-if="value == 1"></cardExchange>
+    <cardExchangeRecord  v-if="value == 2"></cardExchangeRecord>
+    <Writeoffrecords v-if="value == 3"></Writeoffrecords>
+    <online v-if="value == 4"></online>
     <!-- 添加或修改兑换券对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="40%" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-<!--        <el-form-item label="所属连锁店id" prop="chainStorId">-->
-<!--          <el-input v-model="form.chainStorId" placeholder="请输入所属连锁店id" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="所属店铺id" prop="storeId">-->
-<!--          <el-input v-model="form.storeId" placeholder="请输入所属店铺id" />-->
-<!--        </el-form-item>-->
-        <el-form-item label="兑换券名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入兑换券名称" />
-        </el-form-item>
-        <el-form-item label="兑换券类型" prop="type">
-          <el-radio-group v-model="form.type">
-            <el-radio label="0">兑换券</el-radio>
-            <el-radio label="1">洗车券</el-radio>
-            <el-radio label="2">洗车卡</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="兑换礼品名" prop="giftName">
-          <el-input type="textarea" v-model="form.giftName" placeholder="请输入兑换礼品名"></el-input>
-        </el-form-item>
-        <el-form-item label="卡券有效期" prop="validity">
-          <el-input placeholder="请输入卡券有效期" v-model="form.validity">
-            <template slot="append">天</template>
-          </el-input>
-        </el-form-item>
-        <el-form-item label="使用说明" prop="useInstructions">
-          <el-input type="textarea" v-model="form.useInstructions" placeholder="请输入使用说明"></el-input>
-        </el-form-item>
-        <el-form-item label="参与次数" prop="count">
-          <el-input-number v-model="form.count" controls-position="right"  :min="1" :max="999"></el-input-number>
-        </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-radio-group v-model="form.status">
-            <el-radio label="0">启用</el-radio>
-            <el-radio label="1">禁用</el-radio>
-          </el-radio-group>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
+
+
   </div>
 </template>
 
 <script>
-
-  import { listExchange, getExchange, delExchange, addExchange, updateExchange } from "@/api/EventMarketing/cardExchange";
+  import QRCode from 'qrcodejs2'
+  import {
+    listExchange,
+    getExchange,
+    delExchange,
+    addExchange,
+    updateExchange
+  } from '@/api/EventMarketing/cardExchange'
+  import cardExchange from '../cardExchange/index'
+  import cardExchangeRecord from '../cardExchangeRecord/index'
+  import Writeoffrecords from '../Writeoffrecords/index'
+  import  online from  '../online/index'
   export default {
-    name: "Exchange",
+    name: 'Exchange',
     data() {
-      return {
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 兑换券表格数据
-        exchangeList: [],
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        open: false,
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          chainStorId: null,
-          storeId: null,
-          isonline: null,
-          status: null,
-          name: null,
-          type: null,
-          giftName: null,
-          validity: null,
-          useInstructions: null,
-          qrCodeLink: null,
-          count: null,
-          outTime: null,
-        },
-        // 表单参数
-        form: {},
-        // 表单校验
-        rules: {
-          name: [
-            { required: true, message: '请输入兑换券名称', trigger: 'change' }
-          ],
-          type: [
-            { required: true, message: '请输入兑换券类型', trigger: 'change' }
-          ],
-          giftName: [
-            { required: true, message: '请输入兑换礼品名', trigger: 'change' }
-          ],
-          validity: [
-            { required: true, message: '请输入卡券有效期', trigger: 'change' }
-          ],
-          useInstructions: [
-            { required: true, message: '请输入使用说明', trigger: 'change' }
-          ],
-          count: [
-            { required: true, message: '请输入参与次数', trigger: 'change' }
-          ],
-          status: [
-            { required: true, message: '请选择状态', trigger: 'change' }
-          ],
-
-        }
-      };
+     return{
+       value:1
+     }
     },
     created() {
-      this.getList();
+
+
+    },
+    components:{
+      cardExchange,cardExchangeRecord,Writeoffrecords,online
     },
     methods: {
+      qrcodelook(url) {
+        this.loadingdialog = true
+        this.centerDialogVisible = true
+        setTimeout(() => {
+          this.creatQrCode(url)
+          this.loadingdialog = false
+        }, 1000);
+
+      },
+      creatQrCode(url) {
+
+          document.getElementById("qrCode").innerHTML = ""
+
+          new QRCode(this.$refs.qrCodeUrl, {
+            text: url, // 二维码的内容
+            width: 300,
+            height: 300,
+            colorDark: '#000',
+            colorLight: '#fff',
+            correctLevel: QRCode.CorrectLevel.H
+          })
+
+
+      },
+
       /** 查询兑换券列表 */
       getList() {
-        this.loading = true;
+        this.loading = true
         listExchange(this.queryParams).then(response => {
-          this.exchangeList = response.data.records;
-          this.total = response.data.total;
-          this.loading = false;
-        });
+          this.exchangeList = response.data.records
+          this.total = response.data.total
+          this.loading = false
+        })
       },
       // 取消按钮
       cancel() {
-        this.open = false;
-        this.reset();
+        this.open = false
+        this.reset()
       },
       // 表单重置
       reset() {
@@ -284,67 +105,77 @@
           createTime: null,
           updateBy: null,
           updateTime: null
-        };
-        this.resetForm("form");
+        }
+        this.resetForm('form')
       },
       /** 搜索按钮操作 */
       handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
+        this.queryParams.pageNum = 1
+        this.getList()
       },
       /** 重置按钮操作 */
       resetQuery() {
-        this.resetForm("queryForm");
-        this.handleQuery();
+        this.resetForm('queryForm')
+        this.handleQuery()
       },
       // 多选框选中数据
       handleSelectionChange(selection) {
         this.ids = selection.map(item => item.id)
-        this.single = selection.length!==1
+        this.single = selection.length !== 1
         this.multiple = !selection.length
       },
       /** 新增按钮操作 */
       handleAdd() {
-        this.reset();
-        this.open = true;
-        this.title = "添加兑换券";
+        this.reset()
+        this.open = true
+        this.title = '添加兑换券'
       },
       /** 修改按钮操作 */
       handleUpdate(row) {
-        this.reset();
-        this.form = row;
-        this.open = true;
-        this.title = "修改兑换券";
+        this.reset()
+        this.form = row
+        this.open = true
+        this.title = '修改兑换券'
       },
       /** 提交按钮 */
       submitForm() {
-        this.$refs["form"].validate(valid => {
+        this.$refs['form'].validate(valid => {
           if (valid) {
             if (this.form.id != null) {
               updateExchange(this.form).then(response => {
-                this.$modal.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              });
+                this.$modal.msgSuccess('修改成功')
+                this.open = false
+                this.getList()
+              })
             } else {
               addExchange(this.form).then(response => {
-                this.$modal.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              });
+                this.$modal.msgSuccess('新增成功')
+                this.open = false
+                this.getList()
+              })
             }
           }
-        });
+        })
       },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-        const ids = row.id || this.ids;
-        this.$modal.confirm('是否确认删除兑换券编号为"' + ids + '"的数据项？').then(function() {
-          return delExchange(ids);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
+      /** 下线操作 */
+      handleXia(row) {
+        let data = row
+        data.isonline = 1
+        updateExchange(data).then(res => {
+          if (res.code == 200) {
+            this.$message.success('下线成功')
+          }
+        })
+      },
+      /** 上线操作 */
+      handleShang(row) {
+        let data = row
+        data.isonline = 0
+        updateExchange(data).then(res => {
+          if (res.code == 200) {
+            this.$message.success('上线成功')
+          }
+        })
       },
       /** 导出按钮操作 */
       handleExport() {
@@ -353,5 +184,10 @@
         }, `exchange_${new Date().getTime()}.xlsx`)
       }
     }
-  };
+  }
 </script>
+<style scoped lang="scss">
+  .qr-code{
+    margin: 0px auto;
+  }
+</style>
diff --git a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
index 64dfe2e25..91d9e1146 100644
--- a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
@@ -3,8 +3,6 @@
 <!--      礼品卡-->
       <el-card  style="margin-bottom: 20px">
         <div class="top-hang">
-
-
         <el-input v-model="queryParams.number"  style="width: 20%;margin-right: 10px" placeholder="礼品卡号  "></el-input>
         <el-input v-model="queryParams.remark" style="width: 20%;margin-right: 10px" placeholder="备注信息"></el-input>
         <el-select v-model="queryParams.activateStatus" style="margin-right: 10px" placeholder="请选择">
diff --git a/fuintAdmin/src/views/EventMarketing/online/index.vue b/fuintAdmin/src/views/EventMarketing/online/index.vue
new file mode 100644
index 000000000..e8b767af2
--- /dev/null
+++ b/fuintAdmin/src/views/EventMarketing/online/index.vue
@@ -0,0 +1,74 @@
+<template>
+    <div class="center">
+      <el-card style="margin-bottom: 20px">
+        <div style="display: flex;align-items: center">
+          <div style="width: 5%;margin-right: 10px">卡券核销:</div>
+          <div style="width: 80%;">
+            <el-input v-model="queryParams.mobile" placeholder="请输入会员手机号码"></el-input>
+          </div>
+          <div style="width: 10%;margin-left: 20px">
+            <el-button type="primary" icon="el-icon-search" @click="getList">搜索</el-button>
+          </div>
+
+        </div>
+        <el-empty :image-size="200"></el-empty>
+
+
+      </el-card>
+    </div>
+</template>
+
+<script>
+  import { listRecord, getRecord, delRecord, addRecord, updateRecord } from "@/api/EventMarketing/cardExchangeRecord";
+  export default {
+    name: 'index',
+    data(){
+      return{
+        queryParams : {
+          pageNum: 1,
+          pageSize: 999,
+          cardExchangeId: null,
+          mtStaffId: null,
+          realName: null,
+          staffMobile: null,
+          mtUserId: null,
+          name: null,
+          mobile: null,
+          photo: null,
+          exchangeName: null,
+          ticketCode: null,
+          exchangeFrom: null,
+          status: null,
+          outTime: null,
+          cancelTime: null,
+          startTime: null,
+          endTime: null,
+        },
+        recordList:[],
+        total:0,
+      }
+    },
+    methods:{
+      getList() {
+        if(!this.queryParams.mobile ){
+          this.$message.error("输入框不能为空")
+          return
+        }
+        this.loading = true;
+        listRecord(this.queryParams).then(response => {
+          this.recordList = response.data.records;
+          this.total = response.data.total;
+          this.loading = false;
+        });
+      },
+    }
+
+  }
+</script>
+
+<style scoped>
+  .center{
+    width: 100%;
+
+  }
+</style>