diff --git a/src/views/marketing/activity/activityList/index.vue b/src/views/marketing/activity/activityList/index.vue
index ed85daa..e9b8d64 100644
--- a/src/views/marketing/activity/activityList/index.vue
+++ b/src/views/marketing/activity/activityList/index.vue
@@ -13,15 +13,15 @@
       </el-form-item>
     </el-form>
     <el-table
-        :data="dataList"
-        v-loading="dataListLoading"
+      :data="dataList"
+      v-loading="dataListLoading"
 
-        style="width: 100%;">
+      style="width: 100%;">
       <el-table-column
-          prop="cid"
-          header-align="center"
-          align="center"
-          label="活动类型">
+        prop="cid"
+        header-align="center"
+        align="center"
+        label="活动类型">
         <template slot-scope="scope">
           <div class="demo-image__preview">
             <span v-if="scope.row.cid == 746">活动预约</span>
@@ -33,101 +33,101 @@
 
       </el-table-column>
       <el-table-column
-          width="150"
-          prop="title"
-          header-align="center"
-          align="center"
-          label="标题">
+        width="150"
+        prop="title"
+        header-align="center"
+        align="center"
+        label="标题">
       </el-table-column>
 
       <el-table-column
-          prop="imageInput"
-          header-align="center"
-          align="center"
-          label="图片">
+        prop="imageInput"
+        header-align="center"
+        align="center"
+        label="图片">
         <template slot-scope="scope">
           <div class="demo-image__preview">
             <el-image
-                style="width: 36px; height: 36px"
-                :src="scope.row.imageInput"
-                :preview-src-list="[scope.row.imageInput]"
+              style="width: 36px; height: 36px"
+              :src="scope.row.imageInput"
+              :preview-src-list="[scope.row.imageInput]"
             />
           </div>
         </template>
       </el-table-column>
       <el-table-column
-          prop="activityAddr"
-          header-align="center"
-          align="center"
-          label="地址">
+        prop="activityAddr"
+        header-align="center"
+        align="center"
+        label="地址">
       </el-table-column>
       <el-table-column
-          prop="activityNum"
-          header-align="center"
-          align="center"
-          label="活动人数">
+        prop="activityNum"
+        header-align="center"
+        align="center"
+        label="活动人数">
       </el-table-column>
       <el-table-column
-          prop="activityPrice"
-          header-align="center"
-          align="center"
-          label="费用">
+        prop="activityPrice"
+        header-align="center"
+        align="center"
+        label="费用">
       </el-table-column>
-<!--      <el-table-column-->
-<!--          prop="content"-->
-<!--          header-align="center"-->
-<!--          align="center"-->
-<!--          label="活动内容">-->
-<!--      </el-table-column>-->
+      <!--      <el-table-column-->
+      <!--          prop="content"-->
+      <!--          header-align="center"-->
+      <!--          align="center"-->
+      <!--          label="活动内容">-->
+      <!--      </el-table-column>-->
       <el-table-column
-          width="300"
-          prop="beginTime"
-          header-align="center"
-          align="center"
-          label="开始时间 - 结束时间">
+        width="300"
+        prop="beginTime"
+        header-align="center"
+        align="center"
+        label="开始时间 - 结束时间">
         <template slot-scope="scope">
           {{ scope.row.beginTime }} - {{ scope.row.endTime }}
         </template>
       </el-table-column>
       <el-table-column
-          header-align="center"
-          align="center"
-          label="是否热门">
+        header-align="center"
+        align="center"
+        label="是否热门">
         <template slot-scope="scope">
           <el-switch
-              @change='changeStatus($event,scope.row,"hot")'
-              v-model="scope.row.isHot"
-              active-color="#13ce66"
-              inactive-color="#ff4949">
+            @change='changeStatus($event,scope.row,"hot")'
+            v-model="scope.row.isHot"
+            active-color="#13ce66"
+            inactive-color="#ff4949">
           </el-switch>
 
         </template>
       </el-table-column>
       <el-table-column
-          header-align="center"
-          align="center"
-          label="是否轮播">
+        header-align="center"
+        align="center"
+        label="是否轮播">
         <template slot-scope="scope">
           <el-switch
-              @change='changeStatus($event,scope.row,"banner")'
-              v-model="scope.row.isBanner"
-              active-color="#13ce66"
-              inactive-color="#ff4949">
+            @change='changeStatus($event,scope.row,"banner")'
+            v-model="scope.row.isBanner"
+            active-color="#13ce66"
+            inactive-color="#ff4949">
           </el-switch>
         </template>
       </el-table-column>
       <el-table-column
-          prop="sort"
-          header-align="center"
-          align="center"
-          label="排序">
+        prop="sort"
+        header-align="center"
+        align="center"
+        label="排序">
       </el-table-column>
       <el-table-column
-          fixed="right"
-          header-align="center"
-          align="center"
-          width="150"
-          label="操作">
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="150"
+        label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
           <el-button v-hasPermi="['admin:activity:update']" type="text" size="small"
@@ -140,64 +140,65 @@
       </el-table-column>
     </el-table>
     <el-pagination
-        @size-change="sizeChangeHandle"
-        @current-change="currentChangeHandle"
-        :current-page="tableFrom.page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="tableFrom.limit"
-        :total="totalPage"
-        layout="total, sizes, prev, pager, next, jumper">
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="tableFrom.page"
+      :page-sizes="[10, 20, 50, 100]"
+      :page-size="tableFrom.limit"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
     <!--     表单弹窗, 新增数据和修改数据-->
     <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
 
 
     <el-dialog
-        title="活动预约记录"
-        :close-on-click-modal="false"
-        :visible.sync="logVisible"
-        width="80%"
-      >
+      title="活动预约记录"
+      :close-on-click-modal="false"
+      :visible.sync="logVisible"
+      width="80%"
+    >
       <el-table
-          :data="logList"
-          style="width: 100%;">
+        :data="logList"
+        style="width: 100%;">
         <el-table-column
-            width="150"
-            prop="userName"
-            header-align="center"
-            align="center"
-            label="预约人">
+          width="100"
+          prop="userName"
+          header-align="center"
+          align="center"
+          label="预约人">
         </el-table-column>
         <el-table-column
-            prop="cellPhone"
-            header-align="center"
-            align="center"
-            label="预约手机号">
+          prop="cellPhone"
+          header-align="center"
+          align="center"
+          label="预约手机号">
+        </el-table-column>
+<!--        <el-table-column-->
+<!--          width="120"-->
+<!--          prop="createDate"-->
+<!--          header-align="center"-->
+<!--          align="center"-->
+<!--          label="报名时间">-->
+<!--        </el-table-column>-->
+        <el-table-column
+          width="160"
+          prop="registerDate"
+          header-align="center"
+          align="center"
+          label="预约指定日期">
         </el-table-column>
         <el-table-column
-            prop="createDate"
-            header-align="center"
-            align="center"
-            label="报名时间">
+          prop="remark"
+          header-align="center"
+          align="center"
+          label="备注">
         </el-table-column>
         <el-table-column
-            prop="registerDate"
-            header-align="center"
-            align="center"
-            label="预约指定日期">
-        </el-table-column>
-
-        <el-table-column
-            prop="remark"
-            header-align="center"
-            align="center"
-            label="备注">
-        </el-table-column>
-        <el-table-column
-            prop="registerStatus"
-            header-align="center"
-            align="center"
-            label="预约状态">
+          prop="registerStatus"
+          header-align="center"
+          align="center"
+          label="预约状态">
 
           <template slot-scope="scope">
             <div class="demo-image__preview">
@@ -209,10 +210,10 @@
 
         </el-table-column>
         <el-table-column
-            prop="cancelData"
-            header-align="center"
-            align="center"
-            label="取消时间">
+          prop="cancelData"
+          header-align="center"
+          align="center"
+          label="取消时间">
 
           <template slot-scope="scope">
             <div class="demo-image__preview">
@@ -222,10 +223,10 @@
           </template>
         </el-table-column>
         <el-table-column
-            prop="cancelReason"
-            header-align="center"
-            align="center"
-            label="取消原因">
+          prop="cancelReason"
+          header-align="center"
+          align="center"
+          label="取消原因">
 
           <template slot-scope="scope">
             <div class="demo-image__preview">
@@ -236,27 +237,27 @@
         </el-table-column>
 
         <el-table-column
-            fixed="right"
-            header-align="center"
-            align="center"
-            width="150"
-            label="操作">
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+          label="操作">
           <template slot-scope="scope">
-<!--            <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>-->
-<!--            <el-button v-hasPermi="['admin:activity:update']" type="text" size="small"-->
-<!--                       @click="activityLog(scope.row.id)">预约记录-->
-<!--            </el-button>-->
-<!--            <el-button v-hasPermi="['admin:activity:delete']" type="text" size="small"-->
-<!--                       @click="deleteHandle(scope.row.id)">删除-->
-<!--            </el-button>-->
+            <!--            <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>-->
+            <!--            <el-button v-hasPermi="['admin:activity:update']" type="text" size="small"-->
+            <!--                       @click="activityLog(scope.row.id)">预约记录-->
+            <!--            </el-button>-->
+            <!--            <el-button v-hasPermi="['admin:activity:delete']" type="text" size="small"-->
+            <!--                       @click="deleteHandle(scope.row.id)">删除-->
+            <!--            </el-button>-->
           </template>
         </el-table-column>
       </el-table>
       <el-pagination
-          background
-          layout="prev, pager, next"
-          @current-change="handleCurrentChange"
-          :total="this.logParams.total">
+        background
+        layout="prev, pager, next"
+        @current-change="handleCurrentChange"
+        :total="this.logParams.total">
       </el-pagination>
 
 
@@ -280,10 +281,10 @@ export default {
       dataList: [],
       logList: [],
       logParams: {
-        activityId:"",
-        limit:10,
-        page:1,
-        total:1,
+        activityId: "",
+        limit: 10,
+        page: 1,
+        total: 1,
       },
       tableFrom: {
         page: 1,
@@ -303,10 +304,10 @@ export default {
   },
   methods: {
     //活动记录
-    activityLog(id){
+    activityLog(id) {
       this.logParams.activityId = id
       this.logVisible = true
-      activityLogListApi(this.logParams).then(res =>{
+      activityLogListApi(this.logParams).then(res => {
         this.logParams.limit = res.limit
         this.logParams.page = res.page
         this.logParams.total = res.total
@@ -314,8 +315,8 @@ export default {
       })
     },
     handleCurrentChange(val) {
-      this.logParams.page =  val
-      activityLogListApi(this.logParams).then(res =>{
+      this.logParams.page = val
+      activityLogListApi(this.logParams).then(res => {
         this.logParams.limit = res.limit
         this.logParams.page = res.page
         this.logParams.total = res.total