diff --git a/src/views/sylive/activity/components/activity-edit.vue b/src/views/sylive/activity/components/activity-edit.vue
index e3e7045..1bcedef 100644
--- a/src/views/sylive/activity/components/activity-edit.vue
+++ b/src/views/sylive/activity/components/activity-edit.vue
@@ -79,6 +79,17 @@
           class="ele-fluid"
         />
       </el-form-item>
+      <el-form-item label="抽奖码:">
+        <el-input
+          clearable
+          :maxlength="30"
+          v-model="form.drawCode"
+          placeholder="请输入抽奖码"
+        />
+      </el-form-item>
+      <el-form-item label="收款账户:" prop="mchId">
+        <activity-mch-id-select v-model="form.mchId" />
+      </el-form-item>
       <el-form-item label="支付方式:">
         <el-select
           clearable
@@ -90,14 +101,6 @@
           <el-option label="经销商支付" :value="2" />
         </el-select>
       </el-form-item>
-      <el-form-item label="抽奖码:">
-        <el-input
-          clearable
-          :maxlength="30"
-          v-model="form.drawCode"
-          placeholder="请输入抽奖码"
-        />
-      </el-form-item>
       <el-form-item label="支付价格:" v-show="form.pay.way == 1 ? false : true">
         <el-input
           clearable
@@ -194,6 +197,24 @@
           新增分享文案
         </el-button>
       </el-form-item>
+      <el-form-item label="协议标题:">
+        <el-input
+          clearable
+          :maxlength="60"
+          v-model="form.protocolTitle"
+          placeholder="请输入活动标题"
+        />
+      </el-form-item>
+      <el-form-item label="协议内容:">
+        <!-- 编辑器 -->
+        <div v-if="editVersion">
+          <tinymce-editor
+            :init="editoption"
+            v-model="form.protocol"
+            placeholder="请输入活动协议"
+          />
+        </div>
+      </el-form-item>
     </el-form>
     <template v-slot:footer>
       <el-button @click="updateVisible(false)">取消</el-button>
@@ -205,11 +226,13 @@
 </template>
 
 <script>
+  import TinymceEditor from '@/components/TinymceEditor/index.vue';
+  import ActivityMchIdSelect from './activity-mch-id-select.vue';
   import EleImageUpload from 'ele-admin/es/ele-image-upload';
   import request from '@/utils/request';
   import { addActivity, updateActivity } from '@/api/sylive/activity';
   export default {
-    components: { EleImageUpload },
+    components: { TinymceEditor, ActivityMchIdSelect, EleImageUpload },
     props: {
       // 弹窗是否打开
       visible: Boolean,
@@ -236,9 +259,20 @@
         banner: [],
         sharePhoto: [],
         drawCode: '',
+        mchId: '1604032585',
+        protocolTitle: '',
+        protocol: '',
         pay: { way: 1, price: '', img: [] }
       };
       return {
+        editVersion: false,
+        editoption: {
+          height: 300,
+          toolbar: [
+            'code | forecolor backcolor bold italic underline strikethrough link anchor | alignleft aligncenter alignright alignjustify outdent indent | fontsizeselect | bullist numlist | \
+    table emoticons hr preview | fullscreen | bdmap indent2em lineheight formatpainter axupimgs| image emoticons hr '
+          ]
+        },
         defaultForm,
         // 表单数据
         form: { ...defaultForm },
@@ -480,7 +514,9 @@
     },
     watch: {
       visible(visible) {
+        this.editVersion = false;
         if (visible) {
+          this.editVersion = true;
           if (this.data) {
             this.$util.assignObject(this.form, {
               ...this.data
diff --git a/src/views/sylive/activity/components/activity-mch-id-select.vue b/src/views/sylive/activity/components/activity-mch-id-select.vue
new file mode 100644
index 0000000..7330dbf
--- /dev/null
+++ b/src/views/sylive/activity/components/activity-mch-id-select.vue
@@ -0,0 +1,57 @@
+<!-- 选择下拉框 -->
+<template>
+  <el-select
+    clearable
+    :value="value"
+    class="ele-fluid"
+    :placeholder="placeholder"
+    @input="updateValue"
+  >
+    <el-option
+      v-for="item in data"
+      :key="item.dictDataId"
+      :value="item.dictDataCode"
+      :label="item.dictDataName"
+    />
+  </el-select>
+</template>
+
+<script>
+  import { listDictionaryData } from '@/api/system/dictionary-data';
+
+  export default {
+    props: {
+      // 选中的数据(v-modal)
+      value: String,
+      // 提示信息
+      placeholder: {
+        type: String,
+        default: '请选择收款账户'
+      }
+    },
+    data() {
+      return {
+        // 机构类型数据
+        data: []
+      };
+    },
+    created() {
+      /* 获取数据 */
+      listDictionaryData({
+        dictCode: 'receiving_account'
+      })
+        .then((list) => {
+          this.data = list;
+        })
+        .catch((e) => {
+          this.$message.error(e.message);
+        });
+    },
+    methods: {
+      /* 更新选中数据 */
+      updateValue(value) {
+        this.$emit('input', value);
+      }
+    }
+  };
+</script>