diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SiteInfoServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SiteInfoServiceImpl.java
index 1c80799..b783967 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SiteInfoServiceImpl.java
+++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SiteInfoServiceImpl.java
@@ -89,6 +89,16 @@ public class SiteInfoServiceImpl implements ISiteInfoService
             List<Long> showCompanyList = Arrays.asList(siteInfo.getShowCompanyTagId().split(",")).stream().map(Long::parseLong).collect(Collectors.toList());
             siteInfo.setShowCompanyTagArray(showCompanyList);
         }
+        // 处理弹窗活动小程序标签
+        if (StringUtils.isNotEmpty(siteInfo.getHandlerWechatTagId())){
+            List<Long> handlerWechatList = Arrays.asList(siteInfo.getHandlerWechatTagId().split(",")).stream().map(Long::parseLong).collect(Collectors.toList());
+            siteInfo.setHandlerWechatTagArray(handlerWechatList);
+        }
+        // 处理弹窗活动企微标签
+        if (StringUtils.isNotEmpty(siteInfo.getHandlerCompanyTagId())){
+            List<Long> handlerCompanyList = Arrays.asList(siteInfo.getHandlerCompanyTagId().split(",")).stream().map(Long::parseLong).collect(Collectors.toList());
+            siteInfo.setHandlerCompanyTagArray(handlerCompanyList);
+        }
         // 处理渠道展示
         if (StringUtils.isNotEmpty(siteInfo.getChannelId())) {
             List<Long> channelList = Arrays.asList(siteInfo.getChannelId().split(",")).stream().map(Long::parseLong).collect(Collectors.toList());
diff --git a/flossom-ui/src/views/system/siteCarouselInfo/index.vue b/flossom-ui/src/views/system/siteCarouselInfo/index.vue
index 0b3d9f7..58c08b5 100644
--- a/flossom-ui/src/views/system/siteCarouselInfo/index.vue
+++ b/flossom-ui/src/views/system/siteCarouselInfo/index.vue
@@ -1,10 +1,10 @@
 <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="operate">
+      <el-form-item label="轮播状态" prop="operate">
         <el-select
           v-model="queryParams.operate"
-          placeholder="请选择弹窗状态"
+          placeholder="请选择轮播图状态"
           :style="{ width: '100%' }"
           clearable
         >
@@ -13,19 +13,6 @@
           <el-option label="关闭" value="2" />
         </el-select>
       </el-form-item>
-      <el-form-item label="弹窗类型" prop="openType">
-        <el-select
-          v-model="queryParams.openType"
-          placeholder="请选择弹窗类型"
-          :style="{ width: '100%' }"
-          clearable
-        >
-          <el-option label="全部" value="" />
-          <el-option label="首页" value="1" />
-          <el-option label="发现模块" value="2" />
-          <el-option label="我的模块" value="3" />
-        </el-select>
-      </el-form-item>
       <el-form-item label="开启时间" prop="siteStartTime">
         <el-date-picker clearable
           v-model="queryParams.siteStartTime"
@@ -105,7 +92,7 @@
       </el-table-column>
       <el-table-column label="轮播封面" align="center" prop="fileUrl" >
         <template slot-scope="scope">
-          <el-image :src="scope.row.fileUrl" style="width: 60px;height: 80px">
+          <el-image :src="scope.row.fileUrl" style="width: 60px;height: 80px" :preview-src-list="[scope.row.fileUrl]">
             <div slot="placeholder" class="image-slot"><span class="dot"></span>
             </div>
           </el-image>
@@ -134,6 +121,13 @@
       </el-table-column>
       <el-table-column label="仪器" align="center" prop="machineName" />
       <el-table-column label="打卡显示活动" align="center" prop="signNumber" />
+      <el-table-column label="用户类型" align="center" prop="userType" >
+        <template slot-scope="scope">
+          <span v-show="scope.row.userType == 0">全部</span>
+          <span v-show="scope.row.userType == 1">游客</span>
+          <span v-show="scope.row.userType == 2">会员</span>
+        </template>
+      </el-table-column>
       <el-table-column label="跳转类型" align="center" prop="type" >
         <template slot-scope="scope">
           <span v-show="scope.row.type == 0">无跳转</span>
@@ -144,6 +138,11 @@
           <span v-show="scope.row.type == 5">导向视频号直播间</span>
         </template>
       </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="160">
+        <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
@@ -220,7 +219,7 @@
           </el-upload>
         </el-form-item>
         <el-form-item label="标题" prop="siteName">
-          <el-input v-model="form.siteName" placeholder="请输入标题" style="width: 80%" />
+          <el-input v-model="form.siteName" placeholder="请输入标题" style="width: 80%" maxlength="21" />
         </el-form-item>
         <el-form-item label="开启时间" prop="siteStartTime">
           <el-date-picker
@@ -244,40 +243,40 @@
             end-placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="弹窗类型" prop="openType">
-          <el-select v-model="form.openType">
-            <el-option label="首页" :value="1" :key="1"></el-option>
-            <el-option label="发现模块" :value="2" :key="2"></el-option>
-            <el-option label="活动模块" :value="3" :key="3"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="推送次数" prop="pushNumber">
-        <el-radio-group v-model="form.pushType">
-          <el-radio :label="1">永久一次</el-radio>
-          <el-radio :label="2">每次进入</el-radio>
-          <el-radio :label="3">自定义频次</el-radio>
-        </el-radio-group>
-        </el-form-item>
-        <el-row>
-          <el-col :span = "12">
-            <el-form-item label="每天" prop="pushNumber" v-if="form.pushType==3">
-              <el-input-number v-model="form.pushNumber" :min="1" :max="10" label="请选择多少次"></el-input-number>
-            </el-form-item>
-          </el-col>
-        <el-col :span = "12">
-            <el-form-item label="推送时间" prop="pushTimer"  v-if="form.pushType==3">
-              <el-select v-model="form.pushTimerArray" multiple placeholder="请选择" size="small">
-                <el-option label="星期一" :value="1" :key="1"></el-option>
-                <el-option label="星期二" :value="2" :key="2"></el-option>
-                <el-option label="星期三" :value="3" :key="3"></el-option>
-                <el-option label="星期四" :value="4" :key="4"></el-option>
-                <el-option label="星期五" :value="5" :key="5"></el-option>
-                <el-option label="星期六" :value="6" :key="6"></el-option>
-                <el-option label="星期日" :value="7" :key="7"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
+<!--        <el-form-item label="弹窗类型" prop="openType">-->
+<!--          <el-select v-model="form.openType">-->
+<!--            <el-option label="首页" :value="1" :key="1"></el-option>-->
+<!--            <el-option label="发现模块" :value="2" :key="2"></el-option>-->
+<!--            <el-option label="活动模块" :value="3" :key="3"></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="推送次数" prop="pushNumber">-->
+<!--        <el-radio-group v-model="form.pushType">-->
+<!--          <el-radio :label="1">永久一次</el-radio>-->
+<!--          <el-radio :label="2">每次进入</el-radio>-->
+<!--          <el-radio :label="3">自定义频次</el-radio>-->
+<!--        </el-radio-group>-->
+<!--        </el-form-item>-->
+<!--        <el-row>-->
+<!--          <el-col :span = "12">-->
+<!--            <el-form-item label="每天" prop="pushNumber" v-if="form.pushType==3">-->
+<!--              <el-input-number v-model="form.pushNumber" :min="1" :max="10" label="请选择多少次"></el-input-number>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        <el-col :span = "12">-->
+<!--            <el-form-item label="推送时间" prop="pushTimer"  v-if="form.pushType==3">-->
+<!--              <el-select v-model="form.pushTimerArray" multiple placeholder="请选择" size="small">-->
+<!--                <el-option label="星期一" :value="1" :key="1"></el-option>-->
+<!--                <el-option label="星期二" :value="2" :key="2"></el-option>-->
+<!--                <el-option label="星期三" :value="3" :key="3"></el-option>-->
+<!--                <el-option label="星期四" :value="4" :key="4"></el-option>-->
+<!--                <el-option label="星期五" :value="5" :key="5"></el-option>-->
+<!--                <el-option label="星期六" :value="6" :key="6"></el-option>-->
+<!--                <el-option label="星期日" :value="7" :key="7"></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
         <el-form-item label="可见小程序标签" prop="showWechatTagId" label-width="120px">
           <treeselect v-model="form.showWechatTagArray" :options="chatTagOptions" :multiple="true" :show-count="true" placeholder="请选择小程序标签" :disable-branch-nodes="true" />
         </el-form-item>
@@ -291,21 +290,21 @@
           <treeselect v-model="form.forbidCompanyTagArray" :options="tagOptions" :multiple="true" :show-count="true" placeholder="请选择企微标签" :disable-branch-nodes="true" />
         </el-form-item>
         <el-row>
-          <el-col :span = "12">
-            <el-form-item label="所属渠道" prop="channelId">
-              <el-select v-model="form.channelArray" multiple placeholder="请选择">
-                <el-option
-                  v-for="item in channelList"
-                  :key="item.id"
-                  :label="item.channelName"
-                  :value="item.id">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span = "12">
+<!--          <el-col :span = "12">-->
+<!--            <el-form-item label="所属渠道" prop="channelId">-->
+<!--              <el-select v-model="form.channelArray" multiple placeholder="请选择">-->
+<!--                <el-option-->
+<!--                  v-for="item in channelList"-->
+<!--                  :key="item.id"-->
+<!--                  :label="item.channelName"-->
+<!--                  :value="item.id">-->
+<!--                </el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+          <el-col :span = "24">
             <el-form-item label="仪器" prop="channelId">
-              <el-select v-model="form.machineArray" multiple placeholder="请选择">
+              <el-select v-model="form.machineArray" multiple placeholder="请选择" style="width: 80%">
                 <el-option
                   v-for="instrument in instrumentList"
                   :key="instrument.id"
@@ -502,6 +501,48 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        fileUrl: [
+          { required: true, message: "弹窗封面不能为空", trigger: "blur" }
+        ],
+        pushType: [
+          { required: true, message: "推送频次不能为空", trigger: "blur" }
+        ],
+        siteName: [
+          { required: true, message: "标题不能为空", trigger: "blur" }
+        ],
+        userType: [
+          { required: true, message: "用户类型不能为空", trigger: "blur" }
+        ],
+        orderNumber: [
+          { required: true, message: "排序不能为空", trigger: "blur" }
+        ],
+        type: [
+          { required: true, message: "跳转类型不能为空", trigger: "blur" }
+        ],
+        link: [
+          { required: true, message: "参数不能为空", trigger: "blur" }
+        ],
+        redirectAppid: [
+          { required: true, message: "APPID不能为空", trigger: "blur" }
+        ],
+        linkParams: [
+          { required: true, message: "跳转参数不能为空", trigger: "blur" }
+        ],
+        redirectUrl: [
+          { required: true, message: "页面链接不能为空", trigger: "blur" }
+        ],
+        videoNo: [
+          { required: true, message: "视频号ID不能为空", trigger: "blur" }
+        ],
+        feedId: [
+          { required: true, message: "视频号feedId不能为空", trigger: "blur" }
+        ],
+        pushTimer: [
+          { required: true, message: "自定义频次时间不能为空", trigger: "blur" }
+        ],
+        pushNumber: [
+          { required: true, message: "每天推送次数不能为空", trigger: "blur" }
+        ],
       }
     };
   },
@@ -613,6 +654,8 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加站点管理";
+      this.form.orderNumber = 1000;
+      this.form.userType = 2;
     },
     /** 修改按钮操作 */
     handleUpdate(row, operate) {
@@ -651,12 +694,16 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          if (!this.form.fileUrl) {
+            this.$modal.msgError("弹窗封面不能为空");
+            return;
+          }
           // 处理时间
-          if(this.form.startTime.length > 0) {
+          if(this.form.startTime && this.form.startTime.length > 0) {
             this.form.siteStartTime = this.form.startTime[0];
             this.form.siteEndTime = this.form.startTime[1];
           }
-          if(this.form.registerTime.length > 0) {
+          if(this.form.registerTime && this.form.registerTime.length > 0) {
             this.form.userRegisterStartTime = this.form.registerTime[0];
             this.form.userRegisterEndTime = this.form.registerTime[1];
           }
diff --git a/flossom-ui/src/views/system/siteInfo/index.vue b/flossom-ui/src/views/system/siteInfo/index.vue
index f6f886e..cfe21f3 100644
--- a/flossom-ui/src/views/system/siteInfo/index.vue
+++ b/flossom-ui/src/views/system/siteInfo/index.vue
@@ -105,7 +105,7 @@
       </el-table-column>
       <el-table-column label="弹窗封面" align="center" prop="fileUrl" >
         <template slot-scope="scope">
-          <el-image :src="scope.row.fileUrl" style="width: 60px;height: 80px">
+          <el-image :src="scope.row.fileUrl" style="width: 60px;height: 80px" :preview-src-list="[scope.row.fileUrl]">
             <div slot="placeholder" class="image-slot"><span class="dot"></span>
             </div>
           </el-image>