diff --git a/src/views/sylive/activity/components/activity-edit.vue b/src/views/sylive/activity/components/activity-edit.vue
index 39d819e..8b65988 100644
--- a/src/views/sylive/activity/components/activity-edit.vue
+++ b/src/views/sylive/activity/components/activity-edit.vue
@@ -185,6 +185,60 @@
           新增分享文案
         </el-button>
       </el-form-item>
+      <el-form-item label="黑名单:">
+        <el-radio-group v-model="form.blacklist">
+          <el-radio :label="0">否</el-radio>
+          <el-radio :label="1">是</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="弹幕颜色:">
+        <el-radio-group v-model="form.barrage.color">
+          <el-radio :label="0">黑</el-radio>
+          <el-radio :label="1">白</el-radio>
+        </el-radio-group>
+        <el-input
+          clearable
+          v-model="form.barrage.title"
+          placeholder="请输入弹幕标题"
+        />
+      </el-form-item>
+      <el-form-item label="报名预约:">
+        <el-radio-group v-model="form.signBespeak.status">
+          <el-radio :label="0">否</el-radio>
+          <el-radio :label="1">是</el-radio>
+        </el-radio-group>
+        <el-select
+          v-if="form.signBespeak.status"
+          v-model="form.signBespeak.itemId"
+          placeholder="请选择关联商品"
+          clearable
+          class="ele-fluid"
+        >
+          <el-option
+            v-for="item in goodsList"
+            :key="item.itemId"
+            :value="item.itemId"
+            :label="item.title"
+          />
+        </el-select>
+        <el-input
+          v-if="form.signBespeak.status"
+          v-model="form.signBespeak.title"
+          style="padding-top: 10px"
+          clearable
+          placeholder="请输入弹窗标题"
+        />
+        <div
+          style="padding-top: 10px"
+          v-if="form.signBespeak.status && editVersion"
+        >
+          <tinymce-editor
+            :init="editoption"
+            v-model="form.signBespeak.content"
+            placeholder="请输入弹窗内容"
+          />
+        </div>
+      </el-form-item>
       <el-form-item label="活动底部:">
         <el-table :data="form.bottoms" :border="true" style="width: 100%">
           <el-table-column label="标题">
@@ -264,24 +318,6 @@
           新增活动底部菜单
         </el-button>
       </el-form-item>
-      <el-form-item label="黑名单:">
-        <el-radio-group v-model="form.blacklist">
-          <el-radio :label="0">否</el-radio>
-          <el-radio :label="1">是</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="报名预约:">
-        <el-radio-group v-model="form.signBespeak">
-          <el-radio :label="0">否</el-radio>
-          <el-radio :label="1">是</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="弹幕颜色:">
-        <el-radio-group v-model="form.barrageColor">
-          <el-radio :label="0">黑</el-radio>
-          <el-radio :label="1">白</el-radio>
-        </el-radio-group>
-      </el-form-item>
       <el-form-item label="客服链接:">
         <el-input
           clearable
@@ -304,7 +340,7 @@
           <tinymce-editor
             :init="editoption"
             v-model="form.protocol"
-            placeholder="请输入活动协议"
+            placeholder="请输入协议内容"
           />
         </div>
       </el-form-item>
@@ -324,6 +360,7 @@
   import EleImageUpload from 'ele-admin/es/ele-image-upload';
   import request from '@/utils/request';
   import { addActivity, updateActivity } from '@/api/sylive/activity';
+  import { listGoods } from '@/api/sylive/goods';
   export default {
     components: {
       TinymceEditor,
@@ -359,11 +396,12 @@
         serviceLink: '',
         bottoms: [],
         blacklist: 0,
-        signBespeak: 0,
-        barrageColor: 0,
+        signBespeak: { status: 0, title: '', content: '', itemId: '' },
+        barrage: { color: 0, title: '' },
         pay: { way: 1, price: '', img: [] }
       };
       return {
+        goodsList: [],
         editVersion: false,
         editoption: {
           height: 300,
@@ -433,6 +471,19 @@
       }
     },
     methods: {
+      /* 查询商品 */
+      goodsQuery() {
+        if (!this.form.activityId) {
+          return false;
+        }
+        listGoods({ activityId: this.form.activityId, price: 0 })
+          .then((list) => {
+            this.goodsList = list;
+          })
+          .catch((e) => {
+            this.$message.error(e.message);
+          });
+      },
       /* 添加海报描述 */
       addShareTitle() {
         this.form.shareTitle.push('');
@@ -697,6 +748,7 @@
             if (this.form.shareTitle.length == 0) {
               this.form.shareTitle.push('');
             }
+            this.goodsQuery();
           } else {
             this.form.bottoms = [];
             this.form.bgImg = [];