diff --git a/package-lock.json b/package-lock.json
index 0e405bc..c6a4403 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17869,6 +17869,16 @@
           "integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=",
           "dev": true
         },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
         "cacache": {
           "version": "13.0.1",
           "resolved": "https://registry.npm.taobao.org/cacache/download/cacache-13.0.1.tgz?cache=0&sync_timestamp=1594427999421&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcacache%2Fdownload%2Fcacache-13.0.1.tgz",
@@ -17901,6 +17911,34 @@
           "integrity": "sha1-48mzFWnhBoEd8kL3FXJaH0xJQyA=",
           "dev": true
         },
+        "chalk": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true,
+          "optional": true
+        },
         "css-loader": {
           "version": "3.6.0",
           "resolved": "https://registry.npm.taobao.org/css-loader/download/css-loader-3.6.0.tgz?cache=0&sync_timestamp=1604507107408&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcss-loader%2Fdownload%2Fcss-loader-3.6.0.tgz",
@@ -17954,6 +17992,13 @@
             "universalify": "^0.1.0"
           }
         },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true,
+          "optional": true
+        },
         "icss-utils": {
           "version": "4.1.1",
           "resolved": "https://registry.npm.taobao.org/icss-utils/download/icss-utils-4.1.1.tgz?cache=0&sync_timestamp=1602527330977&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ficss-utils%2Fdownload%2Ficss-utils-4.1.1.tgz",
@@ -18068,6 +18113,16 @@
             "minipass": "^3.1.1"
           }
         },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
         "terser-webpack-plugin": {
           "version": "2.3.8",
           "resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-2.3.8.tgz?cache=0&sync_timestamp=1603881757308&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-2.3.8.tgz",
@@ -18084,6 +18139,32 @@
             "terser": "^4.6.12",
             "webpack-sources": "^1.4.3"
           }
+        },
+        "vue-loader-v16": {
+          "version": "npm:vue-loader@16.1.2",
+          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.1.2.tgz",
+          "integrity": "sha512-8QTxh+Fd+HB6fiL52iEVLKqE9N1JSlMXLR92Ijm6g8PZrwIxckgpqjPDWRP5TWxdiPaHR+alUWsnu1ShQOwt+Q==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chalk": "^4.1.0",
+            "hash-sum": "^2.0.0",
+            "loader-utils": "^2.0.0"
+          },
+          "dependencies": {
+            "loader-utils": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+              "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "big.js": "^5.2.2",
+                "emojis-list": "^3.0.0",
+                "json5": "^2.1.2"
+              }
+            }
+          }
         }
       }
     },
@@ -21176,8 +21257,13 @@
     },
     "dompurify": {
       "version": "2.2.6",
+<<<<<<< HEAD
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.2.6.tgz",
+      "integrity": "sha512-7b7ZArhhH0SP6W2R9cqK6RjaU82FZ2UPM7RO8qN1b1wyvC/NY1FNWcX1Pu00fFOAnzEORtwXe4bPaClg6pUybQ=="
+=======
       "resolved": "https://registry.npm.taobao.org/dompurify/download/dompurify-2.2.6.tgz?cache=0&sync_timestamp=1608303432721&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdompurify%2Fdownload%2Fdompurify-2.2.6.tgz",
       "integrity": "sha1-VJRdxcC0XOWuIocFd36OWdey7cQ="
+>>>>>>> 22a59e921e93c75b42a22d145077df33831527d1
     },
     "domready": {
       "version": "1.0.8",
@@ -28576,8 +28662,8 @@
     },
     "vue-dompurify-html": {
       "version": "2.3.0",
-      "resolved": "https://registry.npm.taobao.org/vue-dompurify-html/download/vue-dompurify-html-2.3.0.tgz",
-      "integrity": "sha1-sXXt2lc2LPewPShkRo+mROBaKtA=",
+      "resolved": "https://registry.npmjs.org/vue-dompurify-html/-/vue-dompurify-html-2.3.0.tgz",
+      "integrity": "sha512-Iz9wI4iiJF+rzC2x3r8quw/VXrkwgMsWXt9p0Le4wXtolBXwMDJOmK3QNMiNg36bzU2b0f3En/wjidoeRVNZ7A==",
       "requires": {
         "dompurify": "^2.0.0"
       }
@@ -28635,87 +28721,6 @@
         }
       }
     },
-    "vue-loader-v16": {
-      "version": "npm:vue-loader@16.0.0-rc.1",
-      "resolved": "https://registry.npm.taobao.org/vue-loader/download/vue-loader-16.0.0-rc.1.tgz?cache=0&sync_timestamp=1604764704943&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-loader%2Fdownload%2Fvue-loader-16.0.0-rc.1.tgz",
-      "integrity": "sha1-nB8WhOLQHIpyIW+dTbEZ4VxiJkU=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "hash-sum": "^2.0.0",
-        "loader-utils": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1601839122515&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
-          "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-4.1.0.tgz",
-          "integrity": "sha1-ThSHCmGNni7dl92DRf2dncMVZGo=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
-          "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
-          "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-          "dev": true,
-          "optional": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-4.0.0.tgz",
-          "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-          "dev": true,
-          "optional": true
-        },
-        "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
-          "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1598611732186&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
-          "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "vue-quill-editor": {
       "version": "3.0.6",
       "resolved": "https://registry.npm.taobao.org/vue-quill-editor/download/vue-quill-editor-3.0.6.tgz",
diff --git a/src/components/Activity/ActivityDate.vue b/src/components/Activity/ActivityDate.vue
index 5df2288..4c08a8e 100644
--- a/src/components/Activity/ActivityDate.vue
+++ b/src/components/Activity/ActivityDate.vue
@@ -110,7 +110,7 @@
                 <span v-if="record.intro">{{ record.intro }}</span>
                 <span v-else>暂无内容</span>
               </div>
-              <div v-if="record.info && record.intro">
+              <div>
                 <span class="font-bold-14">详情：</span>
                 <span v-dompurify-html="record.info.content" v-if="record.info.content"></span>
                 <span v-else>暂无内容</span>
diff --git a/src/components/Banner/BannerAdd.vue b/src/components/Banner/BannerAdd.vue
index a0278ab..dcd3cad 100644
--- a/src/components/Banner/BannerAdd.vue
+++ b/src/components/Banner/BannerAdd.vue
@@ -3,67 +3,34 @@
     <!-- 添加 -->
     <a-modal :closable="false" footer title="添加轮播图" v-model="visible" width="700px">
       <a-form :form="form" @submit="handleSubmit">
-        <!-- 页面路径 -->
-        <a-form-item
-          :label-col="formItemLayout.labelCol"
-          :wrapper-col="formItemLayout.wrapperCol"
-          label="页面路径"
-        >
-          <a-input
-            placeholder="页面路径"
-            v-decorator="[
-                      'pagePath',
-                      {
-                        rules: [
-                          { required: true, message: '页面路径不能为空' },
-                          { whitespace: true, message: '页面路径不能为空' },
-                          { max: 140, massage: '页面路径最多140个字符' },
-                        ],
-                      },
-                    ]"
-          />
-        </a-form-item>
-        <!-- 排序 -->
-        <a-form-item
-          :label-col="formItemLayout.labelCol"
-          :wrapper-col="formItemLayout.wrapperCol"
-          label="排序"
-        >
-          <a-input
-            placeholder="排序"
-            v-decorator="[
-                      'sort',
-                      {
-                        rules: [
-                          { required: true, message: '排序不能为空' },
-                          { whitespace: true, message: '排序不能为空' },
-                          { max: 140, massage: '排序最多140个字符' },
-                        ],
-                      },
-                    ]"
-          />
+        <!-- 跳转类型 -->
+        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="跳转类型">
+          <a-select @change="getUse($event, 'jumpType')" class="ml-3" default-value="正常" style="width: 150px">
+            <a-select-option :key="item" :value="index" v-for="(item, index) in enable">{{ item }}</a-select-option>
+          </a-select>
         </a-form-item>
         <!-- 跳转路径 -->
-        <a-form-item
-          :label-col="formItemLayout.labelCol"
-          :wrapper-col="formItemLayout.wrapperCol"
-          label="跳转路径"
-        >
-          <a-input
-            placeholder="跳转路径"
-            v-decorator="[
-                      'jumpPath',
-                      {
-                        rules: [
-                          { required: true, message: '跳转路径不能为空' },
-                          { whitespace: true, message: '跳转路径不能为空' },
-                          { max: 140, massage: '跳转路径最多140个字符' },
-                        ],
-                      },
-                    ]"
-          />
+        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="图片跳转路径">
+          <a-input placeholder="图片跳转路径" class="ml-3" />
+        </a-form-item>
+        <!-- 状态 -->
+        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="状态">
+          <a-select @change="getUse($event, 'recStatus')" class="ml-3" default-value="启用" style="width: 150px">
+            <a-select-option :key="item" :value="index" v-for="(item, index) in enable">{{ item }}</a-select-option>
+          </a-select>
+        </a-form-item>
+        <!-- 页面显示位置 -->
+        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="页面显示位置">
+          <a-select @change="getUse($event, 'showPage')" class="ml-3" default-value="首页" style="width: 100%">
+            <a-select-option :key="item.page" :value="item.page" v-for="item in enable2">{{ item.name }}</a-select-option>
+          </a-select>
+        </a-form-item>
+        <!-- 图片 -->
+        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="图片">
+          <a-upload :before-upload="beforeUpload" class="ml-3" :action="upload" list-type="picture" name="files" @change="handleChange">
+            <a-button v-show="fileList.length - 0 === 0"> <a-icon type="upload" /> 选择图片 </a-button>
+          </a-upload>
         </a-form-item>
-
         <a-form-item class="d-flex flex-row-reverse">
           <a-button @click="$emit('closeModal')" class="mr-3">取消</a-button>
           <a-button class="white--text" html-type="submit" type="primary">保存</a-button>
@@ -74,7 +41,7 @@
 </template>
 
 <script>
-// import { addTeam } from 'config/api'
+import { upload, addCarousel } from 'config/api';
 
 const formItemLayout = {
   labelCol: { span: 6 },
@@ -82,33 +49,127 @@ const formItemLayout = {
 };
 const tailItemLayout = { wrapperCol: { span: 16, offset: 6 } };
 export default {
-  name: "BannerAdd",
+  name: 'BannerAdd',
   props: { visible: { type: Boolean, default: false } },
   data() {
     return {
       formItemLayout,
       tailItemLayout,
       form: this.$form.createForm(this, { name: 'r-d-add' }),
-    }
+      enable: ['启用', '禁用'],
+      enable1: ['不跳转', 'H5'],
+      enable2: [
+        {
+          name: '首页',
+          page: 0,
+        },
+        {
+          name: '关于我们-公司介绍',
+          page: 11,
+        },
+        {
+          name: '关于我们-组织机构',
+          page: 12,
+        },
+        {
+          name: '创新平台-创新资源平台',
+          page: 32,
+        },
+        {
+          name: '创新平台-科技创新服务',
+          page: 33,
+        },
+        {
+          name: ':孵化平台-众创空间',
+          page: 41,
+        },
+        {
+          name: '孵化平台-公共实验室',
+          page: 42,
+        },
+        {
+          name: '孵化平台-中试基地',
+          page: 43,
+        },
+        {
+          name: '孵化平台-创业导师',
+          page: 44,
+        },
+        {
+          name: '孵化平台-孵化场所',
+          page: 45,
+        },
+        {
+          name: '孵化平台-创业服务',
+          page: 46,
+        },
+        {
+          name: '孵化平台-众创空间-虚拟众创空间',
+          page: 48,
+        },
+        {
+          name: '孵化平台-众创空间-实体众创空间',
+          page: 49,
+        },
+        {
+          name: '产业平台-产业服务',
+          page: 52,
+        },
+      ],
+      upload: upload,
+      paramD: {
+        jumpType: 0,
+        jumpUrl: '',
+        param: '',
+        url: '',
+        recStatus: 0,
+        showPage: 0,
+      },
+      fileList: [],
+      //限制文件上传的格式和大小
+      beforeUpload: file => {
+        const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
+        if (!isJpgOrPng) {
+          this.$message.error('仅支持 JPG/PNG 格式的图片!');
+        }
+        return isJpgOrPng;
+      },
+    };
   },
 
   methods: {
+    // 改变搜索条件
+    getUse(value, str) {
+      this.paramD[str] = value;
+      console.log(this.paramD[str]);
+    },
+    handleChange(info) {
+      // this.fileList = fileList;
+      console.log(info);
+      if (info.file.status === 'done') {
+        this.fileList.push(info.file.response.data[0].visitUrl);
+      } else if (info.file.status === 'removed') {
+        this.fileList = info.fileList;
+      }
+    },
     // 提交表单
     handleSubmit(e) {
       e.preventDefault();
+      this.paramD.url = this.fileList[0];
       this.form.validateFieldsAndScroll(async (err, values) => {
         if (!err) {
           try {
-            // const params = { param: values };
-            // const res = await addTeam(params);
-            // const { data, msg, code } = res.data;
-            // this.$emit('closeModal');
-            // if (code === 200) {
-            //   this.$message.success('添加成功')
-            //   // TODO: 填到列表中
-            // } else {
-            //   throw msg;
-            // }
+            const params = { param: this.paramD };
+            const res = await addCarousel(params);
+            const { data, msg, code } = res.data;
+            this.$emit('closeModal');
+            this.$emit('handleTableChange');
+            if (code === 200) {
+              this.$message.success('添加成功');
+              // TODO: 填到列表中
+            } else {
+              throw msg;
+            }
           } catch (error) {
             this.$message.error(error || '添加失败');
           }
diff --git a/src/components/Banner/BannerDate.vue b/src/components/Banner/BannerDate.vue
index 640ab06..b49d438 100644
--- a/src/components/Banner/BannerDate.vue
+++ b/src/components/Banner/BannerDate.vue
@@ -1,21 +1,34 @@
 <template>
   <div class="main flex-1">
-    <div style="width:100%" v-if="lists && lists.length > 0">
+    <div style="width: 100%" v-if="lists && lists.list">
       <a-table
         :columns="columns"
-        :data-source="lists"
+        :data-source="lists.list"
         :loading="loading"
         :row-key="record => record.id"
+        :pagination="pagination"
+        @change="handleTableChange"
         bordered
         class="white"
+        :scroll="{ y: height }"
       >
         <template slot="id" slot-scope="text, record, index">
           <span>{{ index + 1 }}</span>
         </template>
-
+        <template slot="url" slot-scope="text, record">
+          <img :src="record.url" style="width: 300px; height: 80px" alt="" />
+        </template>
+        <template slot="jumpType" slot-scope="text, record">
+          <span v-if="record.jumpType - 0 === 0">不跳转</span>
+          <span v-if="record.jumpType - 0 === 1">H5</span>
+        </template>
+        <template slot="jumpUrl" slot-scope="text, record">
+          <span v-if="record.jumpUrl">{{ jumpUrl }}</span>
+          <span v-else>无</span>
+        </template>
         <template slot="edit" slot-scope="text, record">
           <a-icon @click="showEditModal(record)" class="pointer" theme="twoTone" type="edit" />
-          <a-popconfirm @confirm="() => onDelete(record.id)" title="确定要删除这一条?" v-if="lists.length">
+          <a-popconfirm @confirm="() => onDelete(record.id)" title="确定要删除这一条?" v-if="lists.list">
             <a-icon class="ml-4 pointer" theme="twoTone" two-tone-color="#ff0000" type="delete" />
           </a-popconfirm>
           <a-switch checked-children="启用" class="ml-4" default-checked un-checked-children="禁用" />
@@ -25,12 +38,12 @@
     <a-empty v-else />
 
     <!-- 编辑 -->
-    <banner-edit :editItem="editItem" :editVisible="editVisible" @closeModal="closeModal" />
+    <banner-edit :edit-item="editItem" :edit-visible="editVisible" @closeModal="closeModal" />
   </div>
 </template>
 
 <script>
-import BannerEdit from "components/Banner/BannerEdit.vue";
+import BannerEdit from 'components/Banner/BannerEdit.vue';
 // import { delTeam } from 'config/api';
 
 const columns = [
@@ -42,25 +55,47 @@ const columns = [
     scopedSlots: { customRender: 'id' },
   },
   {
-    title: '页面路径',
+    title: '图片',
+    align: 'center',
+    dataIndex: 'url',
+    key: 'url',
+    width: 350,
+    scopedSlots: { customRender: 'url' },
+  },
+  {
+    title: '显示位置',
     align: 'center',
-    dataIndex: 'pagePath',
-    key: 'pagePath',
-    scopedSlots: { customRender: 'pagePath' },
+    dataIndex: 'showPage',
+    key: 'showPage',
+    scopedSlots: { customRender: 'showPage' },
   },
   {
-    title: '排序',
+    title: '跳转类型',
     align: 'center',
-    dataIndex: 'sort',
-    key: 'sort',
-    scopedSlots: { customRender: 'sort' },
+    dataIndex: 'jumpType',
+    key: 'jumpType',
+    scopedSlots: { customRender: 'jumpType' },
   },
   {
     title: '跳转路径',
     align: 'center',
-    dataIndex: 'jumpPath',
-    key: 'jumpPath',
-    scopedSlots: { customRender: 'jumpPath' },
+    dataIndex: 'jumpUrl',
+    key: 'jumpUrl',
+    scopedSlots: { customRender: 'jumpUrl' },
+  },
+  {
+    title: '图片参数',
+    align: 'center',
+    dataIndex: 'param',
+    key: 'param',
+    scopedSlots: { customRender: 'param' },
+  },
+  {
+    title: '创建时间',
+    align: 'center',
+    dataIndex: 'updatedAt',
+    key: 'updatedAt',
+    scopedSlots: { customRender: 'updatedAt' },
   },
   {
     title: '编辑',
@@ -72,54 +107,55 @@ const columns = [
   },
 ];
 
-const lists = [
-  {
-    id:'001',
-    pagePath:'http://localhost:8080/',
-    sort:1,
-    jumpPath: 'https://test.tall.wiki/pt-dev/user/login?redirect=%2F',
-  },
-  {
-    id:'002',
-    pagePath:'http://localhost:8080/',
-    sort:2,
-    jumpPath: 'https://test.tall.wiki/pt-dev/user/login?redirect=%2F',
-  }
-];
-
 export default {
-  name: "BannerDate",
-  components: {
-    BannerEdit,
+  name: 'BannerDate',
+  components: { BannerEdit },
+  props: {
+    lists: {
+      type: Object,
+      default: () => {},
+    },
+    pagination: {
+      type: Object,
+      default: () => {},
+    },
   },
   data() {
-    this.cacheData = lists.map(item => ({ ...item }));
     return {
       columns,
-      lists,
       loading: false,
       editingKey: '',
       height: '',
       editVisible: false,
       editItem: null, // 修改的那条
-    }
+    };
   },
-
   mounted() {
-    this.height = document.getElementsByClassName('main')[0].offsetHeight - 150;
+    let th = 200;
+    let wh = window.innerHeight;
+    this.height = wh - th;
+    window.onresize = () => {
+      return (() => {
+        wh = window.innerHeight;
+        this.height = wh - th;
+      })();
+    };
   },
 
   methods: {
-    showEditModal(record){
-      console.log('record: ', record);
+    showEditModal(record) {
       this.editItem = record;
       this.editVisible = true;
     },
 
-    closeModal(){
+    closeModal() {
       this.editVisible = false;
     },
-
+    handleTableChange(pagination) {
+      const { current, pageSize } = pagination;
+      const condition = { current, pageSize };
+      this.$emit('getListData', condition);
+    },
     // 删除
     async onDelete(teamId) {
       try {
@@ -140,10 +176,10 @@ export default {
     },
 
     // 打开报名
-    openSignUp(){
+    openSignUp() {
       const { query } = this.$route;
       this.$router.push({ path: '/sign-up', query });
-    }
+    },
   },
 };
 </script>
diff --git a/src/components/Banner/BannerEdit.vue b/src/components/Banner/BannerEdit.vue
index a768f05..b932050 100644
--- a/src/components/Banner/BannerEdit.vue
+++ b/src/components/Banner/BannerEdit.vue
@@ -1,69 +1,57 @@
 <template>
   <div class="d-flex flex-wrap pb-3">
     <!-- 编辑 -->
-    <a-modal :closable="false" footer title="修改轮播图" v-model="editVisible" width="700px">
-      <a-form :form="form" @submit="handleSubmit">
+    <a-modal :closable="false" footer title="修改轮播图" v-model="editVisible" width="700px" @cancel="$emit('closeModal')">
+      <a-form :form="form" @submit="handleSubmit" v-if="editItem">
         <!-- 页面路径 -->
-        <a-form-item
-          :label-col="formItemLayout.labelCol"
-          :wrapper-col="formItemLayout.wrapperCol"
-          label="页面路径"
-        >
+        <!-- <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="页面路径">
           <a-input
             placeholder="页面路径"
             v-decorator="[
-                      'pagePath',
-                      {
-                        rules: [
-                          { required: true, message: '页面路径不能为空' },
-                          { whitespace: true, message: '页面路径不能为空' },
-                          { max: 140, massage: '页面路径最多140个字符' },
-                        ],
-                      },
-                    ]"
-          />
-        </a-form-item>
-        <!-- 排序 -->
-        <a-form-item
-          :label-col="formItemLayout.labelCol"
-          :wrapper-col="formItemLayout.wrapperCol"
-          label="排序"
-        >
-          <a-input
-            placeholder="排序"
-            v-decorator="[
-                      'sort',
-                      {
-                        rules: [
-                          { required: true, message: '排序不能为空' },
-                          { whitespace: true, message: '排序不能为空' },
-                          { max: 140, massage: '排序最多140个字符' },
-                        ],
-                      },
-                    ]"
+              'pagePath',
+              {
+                rules: [
+                  { required: true, message: '页面路径不能为空' },
+                  { whitespace: true, message: '页面路径不能为空' },
+                  { max: 140, massage: '页面路径最多140个字符' },
+                ],
+              },
+            ]"
           />
+        </a-form-item> -->
+        <!-- 跳转类型 -->
+        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="跳转类型">
+          <a-select @change="getUse($event, 'jumpType')" class="ml-3" :default-value="enable1[editItem.jumpType]" style="width: 150px">
+            <a-select-option :key="item" :value="index" v-for="(item, index) in enable1">{{ item }}</a-select-option>
+          </a-select>
         </a-form-item>
         <!-- 跳转路径 -->
         <a-form-item
+          v-if="editItem.jumpType === 1"
           :label-col="formItemLayout.labelCol"
           :wrapper-col="formItemLayout.wrapperCol"
-          label="跳转路径"
+          label="图片跳转路径"
         >
-          <a-input
-            placeholder="跳转路径"
-            v-decorator="[
-                      'jumpPath',
-                      {
-                        rules: [
-                          { required: true, message: '跳转路径不能为空' },
-                          { whitespace: true, message: '跳转路径不能为空' },
-                          { max: 140, massage: '跳转路径最多140个字符' },
-                        ],
-                      },
-                    ]"
-          />
+          <a-input v-model="editItem.jumpUrl" placeholder="图片跳转路径" class="ml-3" />
+        </a-form-item>
+        <!-- 状态 -->
+        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="状态">
+          <a-select @change="getUse($event, 'recStatus')" class="ml-3" :default-value="enable[editItem.recStatus]" style="width: 150px">
+            <a-select-option :key="item" :value="index" v-for="(item, index) in enable">{{ item }}</a-select-option>
+          </a-select>
+        </a-form-item>
+        <!-- 页面显示位置 -->
+        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="页面显示位置">
+          <a-select @change="getUse($event, 'showPage')" class="ml-3" :default-value="editItem.showPage" style="width: 100%">
+            <a-select-option :key="item.page" :value="item.page" v-for="item in enable2">{{ item.name }}</a-select-option>
+          </a-select>
+        </a-form-item>
+        <!-- 图片 -->
+        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="图片">
+          <a-upload :before-upload="beforeUpload" class="ml-3" :action="upload" list-type="picture" name="files" @change="handleChange">
+            <a-button v-show="fileList.length - 0 === 0"> <a-icon type="upload" /> 选择图片 </a-button>
+          </a-upload>
         </a-form-item>
-
         <a-form-item class="d-flex flex-row-reverse">
           <a-button @click="$emit('closeModal')" class="mr-3">取消</a-button>
           <a-button class="white--text" html-type="submit" type="primary">保存</a-button>
@@ -75,6 +63,7 @@
 
 <script>
 // import { upTeam } from 'config/api';
+import { upload, addCarousel } from 'config/api';
 
 const formItemLayout = {
   labelCol: { span: 6 },
@@ -84,19 +73,119 @@ const formItemLayout = {
 const tailItemLayout = { wrapperCol: { span: 16, offset: 6 } };
 
 export default {
-  name: "BannerEdit",
-  props: { editVisible: { type: Boolean, default: false },editItem: { type: Object, default: () => {} } },
+  name: 'BannerEdit',
+  props: { editVisible: { type: Boolean, default: false }, editItem: { type: Object, default: () => {} } },
   data() {
     return {
       formItemLayout,
       tailItemLayout,
       form: this.$form.createForm(this, { name: 'r-d-add' }),
-    }
+      enable: ['启用', '禁用'],
+      enable1: ['不跳转', 'H5'],
+      enable2: [
+        {
+          name: '首页',
+          page: 0,
+        },
+        {
+          name: '关于我们-公司介绍',
+          page: 11,
+        },
+        {
+          name: '关于我们-组织机构',
+          page: 12,
+        },
+        {
+          name: '创新平台-创新资源平台',
+          page: 32,
+        },
+        {
+          name: '创新平台-科技创新服务',
+          page: 33,
+        },
+        {
+          name: ':孵化平台-众创空间',
+          page: 41,
+        },
+        {
+          name: '孵化平台-公共实验室',
+          page: 42,
+        },
+        {
+          name: '孵化平台-中试基地',
+          page: 43,
+        },
+        {
+          name: '孵化平台-创业导师',
+          page: 44,
+        },
+        {
+          name: '孵化平台-孵化场所',
+          page: 45,
+        },
+        {
+          name: '孵化平台-创业服务',
+          page: 46,
+        },
+        {
+          name: '孵化平台-众创空间-虚拟众创空间',
+          page: 48,
+        },
+        {
+          name: '孵化平台-众创空间-实体众创空间',
+          page: 49,
+        },
+        {
+          name: '产业平台-产业服务',
+          page: 52,
+        },
+      ],
+      upload: upload,
+      fileList: [],
+      //限制文件上传的格式和大小
+      beforeUpload: file => {
+        const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
+        if (!isJpgOrPng) {
+          this.$message.error('仅支持 JPG/PNG 格式的图片!');
+        }
+        return isJpgOrPng;
+      },
+    };
+  },
+  watch: {
+    editItem(val) {
+      console.log(val);
+    },
   },
-
   methods: {
+    // 改变搜索条件
+    getUse(e, str) {
+      this.editItem[str] = e;
+      if (str === 'jumpType' && e === 0) {
+        this.editItem.jumpUrl = '';
+      }
+    },
+    showPageNums(nums) {
+      for (let i = 0; i < this.enable2.length; i++) {
+        if (nums - 0 === this.enable2[i].page - 0) {
+          return this.enable2[i].name;
+        } else if (i === this.enable2.length - 1) {
+          return '';
+        }
+      }
+    },
+    // 上传文件事件
+    handleChange(info) {
+      // this.fileList = fileList;
+      if (info.file.status === 'done') {
+        this.fileList.push(info.file.response.data[0].visitUrl);
+      } else if (info.file.status === 'removed') {
+        this.fileList = info.fileList;
+      }
+    },
     // 提交表单
     handleSubmit(e) {
+      console.log(this.editItem);
       e.preventDefault();
       this.form.validateFieldsAndScroll(async (err, values) => {
         if (!err) {
diff --git a/src/components/Banner/BannerSearch.vue b/src/components/Banner/BannerSearch.vue
index 18c565a..69d40bd 100644
--- a/src/components/Banner/BannerSearch.vue
+++ b/src/components/Banner/BannerSearch.vue
@@ -4,8 +4,16 @@
   <div class="d-flex flex-wrap pb-3">
     <div>
       <!-- 启用 -->
-      <a-select @change="getUse" class="ml-3" default-value="启用" style="width: 150px">
-        <a-select-option :key="use" :value="use" v-for="use in enable">{{ use }}</a-select-option>
+      <a-select @change="getUse($event, 'recStatus')" class="ml-3" default-value="启用" style="width: 150px">
+        <a-select-option :key="item" :value="index" v-for="(item, index) in enable">{{ item }}</a-select-option>
+      </a-select>
+      <!-- 跳转类型 -->
+      <a-select @change="getUse($event, 'jumpType')" class="ml-3" default-value="不跳转" style="width: 150px">
+        <a-select-option :key="item" :value="index" v-for="(item, index) in enable1">{{ item }}</a-select-option>
+      </a-select>
+      <!-- 页面显示位置 -->
+      <a-select allow-clear @change="getUse($event, 'showPage')" class="ml-3" placeholder="查询全部" style="width: 250px">
+        <a-select-option :key="item.name" :value="item.page" v-for="item in enable2">{{ item.name }}</a-select-option>
       </a-select>
       <a-button @click="handleTableChange" class="mx-2" type="primary">搜索</a-button>
     </div>
@@ -15,7 +23,7 @@
     <a-button @click="showModal" class="editable-add-btn" type="primary">增加</a-button>
 
     <!-- 添加 -->
-    <banner-add :visible="visible" @closeModal="closeModal" />
+    <banner-add :visible="visible" @closeModal="closeModal" @handleTableChange="handleTableChange" />
   </div>
 </template>
 
@@ -25,14 +33,75 @@ import BannerAdd from 'components/Banner/BannerAdd.vue';
 
 export default {
   name: 'BannerSearch',
-  components: {
-    BannerAdd,
-  },
+  components: { BannerAdd },
   data() {
     return {
       visible: false,
       enable: ['启用', '禁用'],
-      use: '',
+      enable1: ['不跳转', 'H5'],
+      enable2: [
+        {
+          name: '首页',
+          page: 0,
+        },
+        {
+          name: '关于我们-公司介绍',
+          page: 11,
+        },
+        {
+          name: '关于我们-组织机构',
+          page: 12,
+        },
+        {
+          name: '创新平台-创新资源平台',
+          page: 32,
+        },
+        {
+          name: '创新平台-科技创新服务',
+          page: 33,
+        },
+        {
+          name: ':孵化平台-众创空间',
+          page: 41,
+        },
+        {
+          name: '孵化平台-公共实验室',
+          page: 42,
+        },
+        {
+          name: '孵化平台-中试基地',
+          page: 43,
+        },
+        {
+          name: '孵化平台-创业导师',
+          page: 44,
+        },
+        {
+          name: '孵化平台-孵化场所',
+          page: 45,
+        },
+        {
+          name: '孵化平台-创业服务',
+          page: 46,
+        },
+        {
+          name: '孵化平台-众创空间-虚拟众创空间',
+          page: 48,
+        },
+        {
+          name: '孵化平台-众创空间-实体众创空间',
+          page: 49,
+        },
+        {
+          name: '产业平台-产业服务',
+          page: 52,
+        },
+      ],
+      paramData: {
+        jumpType: 0, // 跳转类型
+        recStatus: 0, // 状态
+        showPage: '', // 显示位置
+      },
     };
   },
   methods: {
@@ -44,26 +113,14 @@ export default {
       this.visible = false;
     },
 
-    // 类型
-    getUse(value) {
-      console.log('value: ', value);
-      this.use = value;
+    // 改变搜索条件
+    getUse(value, str) {
+      this.paramData[str] = value;
+      console.log(this.paramData[str]);
     },
 
-    async handleTableChange() {
-      try {
-        // const params = { param: {publishingPlatform: this.publishingPlatform} };
-        // const res = await selLikeTeam(params);
-        // const { data, msg, code } = res.data;
-        // if (code === 200) {
-        //   console.log('搜索结果',data);
-        //   // TODO: 填到列表中
-        // } else {
-        //   throw msg;
-        // }
-      } catch (error) {
-        this.$message.error(error);
-      }
+    handleTableChange() {
+      this.$emit('getListData', this.paramData);
     },
   },
 };
diff --git a/src/components/BtnCom/BtnCon.vue b/src/components/BtnCom/BtnCon.vue
index 802a5c8..6c6c815 100644
--- a/src/components/BtnCom/BtnCon.vue
+++ b/src/components/BtnCom/BtnCon.vue
@@ -9,6 +9,8 @@
     <div @click="jump('/event-announcement')" class="btn">活动公告</div>
     <div @click="jump('/innovation-policy')" class="btn">创新政策</div>
     <div @click="jump('/talent-recruitment')" class="btn">人才招聘</div>
+    <div @click="jump('/cooperative-partner')" class="btn">合作伙伴</div>
+    <div @click="jump('/derivative-enterprise')" class="btn">衍生企业</div>
 
     <div class="font-bold-24">创新部</div>
     <div @click="jump('/cooperation-intention')" class="btn">合作意向</div>
@@ -24,6 +26,7 @@
     <div @click="jump('/virtual-application')" class="btn">入驻虚拟申请</div>
     <div @click="jump('/incubation-services')" class="btn">服务</div>
     <div @click="jump('/entrepreneurial-mentor')" class="btn">需求填报</div>
+    <div @click="jump('/cooperative-partner')" class="btn">合作伙伴</div>
 
     <div class="font-bold-24">产业部</div>
     <div @click="jump('/industrial-services')" class="btn">服务</div>
diff --git a/src/components/Community/CommentDate.vue b/src/components/Community/CommentDate.vue
new file mode 100644
index 0000000..0b82c5d
--- /dev/null
+++ b/src/components/Community/CommentDate.vue
@@ -0,0 +1,184 @@
+<template>
+  <div class="main flex-1">
+    <a-spin :spinning="spinning">
+      <div style="width:100%" v-if="lists && lists.length > 0">
+        <a-table
+          :columns="columns"
+          :data-source="lists"
+          :loading="loading"
+          :pagination="pagination"
+          :row-key="record => record.id"
+          :scroll="{ y: height }"
+          @change="handleTableChange"
+          bordered
+          class="white"
+        >
+          <template slot="id" slot-scope="text, record, index">
+            <span>{{ index + 1 }}</span>
+          </template>
+
+          <!-- 用户头像 -->
+          <template slot="avatarUrl" slot-scope="text, record">
+            <img :src="record.avatarUrl" class="img" />
+          </template>
+
+          <!-- 审核状态 -->
+          <template slot="comStatus" slot-scope="text, record">
+            <a-tag
+              :color="record.comStatus === 0 ? 'green' : 'red'"
+            >{{ record.comStatus === 0 ? '正常' : '禁用' }}</a-tag>
+          </template>
+
+          <template slot="examine" slot-scope="text, record">
+            <a-button
+              @click="handleUpTopping({id:record.id,comStatus:0})"
+              size="small"
+              type="primary"
+              v-if="record.comStatus != 0"
+            >正常</a-button>
+            <a-button
+              @click="handleUpTopping({id:record.id,comStatus:1})"
+              size="small"
+              type="danger"
+              v-else
+            >禁用</a-button>
+          </template>
+
+          <div
+            class="d-flex flex-column"
+            slot="expandedRowRender"
+            slot-scope="record"
+            style="margin: 0"
+          >
+            <div>
+              <span class="font-bold-14">帖子内容：</span>
+              <span v-dompurify-html="record.content" v-if="record.content"></span>
+              <span v-else>暂无内容</span>
+            </div>
+          </div>
+        </a-table>
+      </div>
+      <a-empty v-else />
+    </a-spin>
+  </div>
+</template>
+
+<script>
+import { upTopping } from 'config/api';
+
+const columns = [
+  {
+    title: '序号',
+    align: 'center',
+    dataIndex: 'id',
+    key: 'id',
+    width: '7%',
+    scopedSlots: { customRender: 'id' },
+  },
+  {
+    title: '跟帖人',
+    align: 'center',
+    dataIndex: 'userName',
+    key: 'userName',
+  },
+  {
+    title: '用户头像',
+    align: 'center',
+    dataIndex: 'avatarUrl',
+    key: 'avatarUrl',
+    scopedSlots: { customRender: 'avatarUrl' },
+  },
+  {
+    title: '跟帖时间',
+    align: 'center',
+    dataIndex: 'creatTime',
+    key: 'creatTime',
+  },
+  {
+    title: '跟帖状态',
+    align: 'center',
+    dataIndex: 'comStatus',
+    key: 'comStatus',
+    scopedSlots: { customRender: 'comStatus' },
+  },
+  {
+    title: '审核',
+    align: 'center',
+    dataIndex: 'examine',
+    key: 'examine',
+    scopedSlots: { customRender: 'examine' },
+  },
+];
+
+export default {
+  name: 'CommunityDate',
+  props: { lists: { type: Array, default: () => [] }, pagination: { type: Object, default: () => {} } },
+  data() {
+    return {
+      columns,
+      loading: false,
+      height: '',
+      spinning: false,
+    };
+  },
+
+  mounted() {
+    let th = 250;
+    let wh = window.innerHeight;
+    this.height = wh - th;
+    window.onresize = () => {
+      return (() => {
+        wh = window.innerHeight;
+        this.height = wh - th;
+      })();
+    };
+  },
+
+  methods: {
+    // 换页
+    handleTableChange(pagination) {
+      const { current, pageSize } = pagination;
+      const condition = { current, pageSize };
+      this.$emit('getSelectTeam', condition);
+    },
+
+    // 置顶/审核
+    async handleUpTopping(options) {
+      try {
+        this.spinning = true;
+        const params = { param: { id: options.id } };
+        if (options) {
+          if (options.comStatus !== null) {
+            params.param.comStatus = options.comStatus;
+          }
+          if (options.topping !== null) {
+            params.param.topping = options.topping;
+          }
+        }
+        const res = await upTopping(params);
+        const { data, msg, code } = res.data;
+        this.spinning = false;
+        if (code === 200) {
+          this.$message.success('修改成功');
+          this.$emit('getSelectTeam');
+        } else {
+          throw msg;
+        }
+      } catch (error) {
+        this.spinning = false;
+        this.$message.error(error || '修改失败');
+      }
+    },
+  },
+};
+</script>
+
+<style lang="stylus" scoped>
+.main .img {
+  width: 100%;
+}
+
+.main .big_img {
+  width: 200px;
+}
+</style>
diff --git a/src/components/Community/CommentSearch.vue b/src/components/Community/CommentSearch.vue
new file mode 100644
index 0000000..f067bf6
--- /dev/null
+++ b/src/components/Community/CommentSearch.vue
@@ -0,0 +1,53 @@
+<template>
+  <div class="d-flex flex-wrap pb-3">
+    <div>
+      <!-- 帖子状态 -->
+      <a-select
+        @change="handleChangeSelect('comStatus',$event)"
+        class="ml-3"
+        placeholder="跟帖状态"
+        style="width: 150px"
+      >
+        <a-select-option
+          :key="index"
+          :value="state.id"
+          v-for="(state, index) in items"
+        >{{ state.value }}</a-select-option>
+      </a-select>
+      <a-button @click="handleTableChange" class="ml-3" type="primary">搜索</a-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ForumSearch',
+  data() {
+    return {
+      items: [
+        { id: 0, value: '正常' },
+        { id: 1, value: '禁用' },
+      ],
+      category: '',
+    };
+  },
+  methods: {
+    handleChangeSelect(type, value) {
+      this[type] = value;
+    },
+
+    // 搜索
+    async handleTableChange() {
+      const { comStatus } = this;
+      // 传参
+      const condition = {
+        comStatus,
+      };
+      await this.$emit('getSelectTeam', condition);
+    },
+  },
+};
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped lang="stylus"></style>
diff --git a/src/components/Community/CommunityDate.vue b/src/components/Community/CommunityDate.vue
new file mode 100644
index 0000000..90c82ef
--- /dev/null
+++ b/src/components/Community/CommunityDate.vue
@@ -0,0 +1,255 @@
+<template>
+  <div class="main flex-1">
+    <a-spin :spinning="spinning">
+      <div style="width:100%" v-if="lists && lists.length > 0">
+        <a-table
+          :columns="columns"
+          :data-source="lists"
+          :loading="loading"
+          :pagination="pagination"
+          :row-key="record => record.id"
+          :scroll="{ y: height }"
+          @change="handleTableChange"
+          bordered
+          class="white"
+        >
+          <template slot="id" slot-scope="text, record, index">
+            <span>{{ index + 1 }}</span>
+          </template>
+
+          <!-- 标题图片 -->
+          <template slot="visitLocation" slot-scope="text, record">
+            <img :src="record.visitLocation" class="img" />
+          </template>
+
+          <!-- 用户头像 -->
+          <template slot="avatarUrl" slot-scope="text, record">
+            <img :src="record.avatarUrl" class="img" />
+          </template>
+
+          <!-- 审核状态 -->
+          <template slot="comStatus" slot-scope="text, record">
+            <a-tag
+              :color="record.comStatus === 0 ? 'green' : 'red'"
+            >{{ record.comStatus === 0 ? '正常' : '禁用' }}</a-tag>
+          </template>
+
+          <!-- 置顶 -->
+          <template slot="topping" slot-scope="text, record">
+            <a-switch
+              :checked="text === 1"
+              @change="onChange($event,record.id)"
+              checked-children="是"
+              class="ml-4"
+              un-checked-children="否"
+            />
+          </template>
+
+          <template slot="examine" slot-scope="text, record">
+            <a-button
+              @click="handleUpTopping({id:record.id,comStatus:0})"
+              size="small"
+              type="primary"
+              v-if="record.comStatus != 0"
+            >正常</a-button>
+            <a-button
+              @click="handleUpTopping({id:record.id,comStatus:1})"
+              size="small"
+              type="danger"
+              v-else
+            >禁用</a-button>
+          </template>
+
+          <template slot="edit" slot-scope="text, record">
+            <a-button @click="openComment(record.id)" size="small" type="primary">查看跟帖</a-button>
+          </template>
+
+          <div
+            class="d-flex flex-column"
+            slot="expandedRowRender"
+            slot-scope="record"
+            style="margin: 0"
+          >
+            <div>
+              <span class="font-bold-14">帖子内容：</span>
+              <span v-dompurify-html="record.content" v-if="record.content"></span>
+              <span v-else>暂无内容</span>
+            </div>
+          </div>
+        </a-table>
+      </div>
+      <a-empty v-else />
+    </a-spin>
+  </div>
+</template>
+
+<script>
+import { upTopping } from 'config/api';
+
+const columns = [
+  {
+    title: '序号',
+    align: 'center',
+    dataIndex: 'id',
+    key: 'id',
+    width: '7%',
+    scopedSlots: { customRender: 'id' },
+  },
+  {
+    title: '标题',
+    align: 'center',
+    dataIndex: 'title',
+    key: 'title',
+  },
+  {
+    title: '标题图片',
+    align: 'center',
+    dataIndex: 'visitLocation',
+    key: 'visitLocation',
+    scopedSlots: { customRender: 'visitLocation' },
+  },
+  {
+    title: '发帖人',
+    align: 'center',
+    dataIndex: 'userName',
+    key: 'userName',
+  },
+  {
+    title: '用户头像',
+    align: 'center',
+    dataIndex: 'avatarUrl',
+    key: 'avatarUrl',
+    scopedSlots: { customRender: 'avatarUrl' },
+  },
+  {
+    title: '发布时间',
+    align: 'center',
+    dataIndex: 'createdTime',
+    key: 'createdTime',
+  },
+  {
+    title: '评论数',
+    align: 'center',
+    dataIndex: 'commentNum',
+    key: 'commentNum',
+  },
+  {
+    title: '置顶',
+    align: 'center',
+    dataIndex: 'topping',
+    key: 'topping',
+    scopedSlots: { customRender: 'topping' },
+  },
+  {
+    title: '审核状态',
+    align: 'center',
+    dataIndex: 'comStatus',
+    key: 'comStatus',
+    scopedSlots: { customRender: 'comStatus' },
+  },
+  {
+    title: '审核',
+    align: 'center',
+    dataIndex: 'examine',
+    key: 'examine',
+    scopedSlots: { customRender: 'examine' },
+  },
+  {
+    title: '跟帖',
+    align: 'center',
+    dataIndex: 'edit',
+    key: 'edit',
+    scopedSlots: { customRender: 'edit' },
+  },
+];
+
+export default {
+  name: 'CommunityDate',
+  props: { lists: { type: Array, default: () => [] }, pagination: { type: Object, default: () => {} } },
+  data() {
+    return {
+      columns,
+      loading: false,
+      height: '',
+      imgVisible: false,
+      spinning: false,
+    };
+  },
+
+  mounted() {
+    let th = 250;
+    let wh = window.innerHeight;
+    this.height = wh - th;
+    window.onresize = () => {
+      return (() => {
+        wh = window.innerHeight;
+        this.height = wh - th;
+      })();
+    };
+  },
+
+  methods: {
+    onChange(checked, id) {
+      const index = this.lists.findIndex(item => item.id === id);
+      if (this.lists[index].topping === 1) {
+        const options = { id, topping: 0 };
+        this.handleUpTopping(options);
+      } else {
+        const options = { id, topping: 1 };
+        this.handleUpTopping(options);
+      }
+    },
+
+    // 换页
+    handleTableChange(pagination) {
+      const { current, pageSize } = pagination;
+      const condition = { current, pageSize };
+      this.$emit('getSelectTeam', condition);
+    },
+
+    // 置顶/审核
+    async handleUpTopping(options) {
+      try {
+        this.spinning = true;
+        const params = { param: { id: options.id } };
+        if (options) {
+          if (options.comStatus !== null) {
+            params.param.comStatus = options.comStatus;
+          }
+          if (options.topping !== null) {
+            params.param.topping = options.topping;
+          }
+        }
+        const res = await upTopping(params);
+        const { data, msg, code } = res.data;
+        this.spinning = false;
+        if (code === 200) {
+          this.$message.success('修改成功');
+          this.$emit('getSelectTeam');
+        } else {
+          throw msg;
+        }
+      } catch (error) {
+        this.spinning = false;
+        this.$message.error(error || '修改失败');
+      }
+    },
+
+    // 跟帖
+    openComment(id) {
+      const { query } = this.$route;
+      this.$router.push({ path: `/comment?id=${id}`, query });
+    },
+  },
+};
+</script>
+
+<style lang="stylus" scoped>
+.main .img {
+  width: 100%;
+}
+
+.main .big_img {
+  width: 200px;
+}
+</style>
diff --git a/src/components/Community/CommunitySearch.vue b/src/components/Community/CommunitySearch.vue
new file mode 100644
index 0000000..216fb9f
--- /dev/null
+++ b/src/components/Community/CommunitySearch.vue
@@ -0,0 +1,74 @@
+<template>
+  <div class="d-flex flex-wrap pb-3">
+    <div>
+      <!-- 标题 -->
+      <a-input class="ml-3" placeholder="标题" style="width: 150px" v-model="title" />
+      <!-- 发帖类别 -->
+      <a-select
+        @change="handleChangeSelect('category',$event)"
+        class="ml-3"
+        placeholder="发帖类别"
+        style="width: 150px"
+      >
+        <a-select-option :key="state.id" :value="state.id" v-for="state in status">{{ state.value }}</a-select-option>
+      </a-select>
+      <!-- 帖子状态 -->
+      <a-select
+        @change="handleChangeSelect('comStatus',$event)"
+        class="ml-3"
+        placeholder="帖子状态"
+        style="width: 150px"
+      >
+        <a-select-option
+          :key="index"
+          :value="state.id"
+          v-for="(state, index) in items"
+        >{{ state.value }}</a-select-option>
+      </a-select>
+      <a-button @click="handleTableChange" class="ml-3" type="primary">搜索</a-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ForumSearch',
+  data() {
+    return {
+      title: '',
+      items: [
+        { id: 0, value: '正常' },
+        { id: 1, value: '禁用' },
+      ],
+      comStatus: '',
+      status: [
+        { id: 0, value: '主题论坛' },
+        { id: 1, value: '创新社区' },
+        { id: 2, value: '孵化社区' },
+        { id: 3, value: '产业社区' },
+      ],
+      category: '',
+    };
+  },
+  methods: {
+    handleChangeSelect(type, value) {
+      this[type] = value;
+    },
+
+    // 搜索
+    async handleTableChange() {
+      const { title, comStatus, category } = this;
+      // 传参
+      const condition = {
+        title,
+        comStatus,
+        category,
+      };
+      await this.$emit('getSelectTeam', condition);
+    },
+  },
+};
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped lang="stylus"></style>
diff --git a/src/components/Forum/ForumDate.vue b/src/components/Forum/ForumDate.vue
deleted file mode 100644
index 6c5b52e..0000000
--- a/src/components/Forum/ForumDate.vue
+++ /dev/null
@@ -1,172 +0,0 @@
-<template>
-  <div class="main flex-1">
-    <div style="width:100%" v-if="lists && lists.length > 0">
-      <a-table
-        :columns="columns"
-        :data-source="lists"
-        :loading="loading"
-        :row-key="record => record.id"
-        bordered
-        class="white"
-      >
-        <template slot="id" slot-scope="text, record, index">
-          <span>{{ index + 1 }}</span>
-        </template>
-
-        <!-- 置顶 -->
-        <template slot="topping" slot-scope="text, record">
-          <a-switch checked-children="是" class="ml-4" default-checked un-checked-children="否" />
-        </template>
-
-        <!-- 审核状态 -->
-        <template slot="auditStatus" slot-scope="text, record">
-          <a-tag :color="record.auditStatus === '通过' ? 'green' : 'red'">{{ record.auditStatus }}</a-tag>
-        </template>
-
-        <template slot="examine" slot-scope="text, record">
-          <a-button size="small" type="primary" v-if="record.auditStatus != '通过'">通过</a-button>
-          <a-button size="small" type="danger" v-else>不通过</a-button>
-        </template>
-      </a-table>
-    </div>
-    <a-empty v-else />
-  </div>
-</template>
-
-<script>
-const columns = [
-  {
-    title: '序号',
-    align: 'center',
-    dataIndex: 'id',
-    key: 'id',
-    width: '7%',
-    scopedSlots: { customRender: 'id' },
-  },
-  {
-    title: '标题',
-    align: 'center',
-    dataIndex: 'title',
-    key: 'title',
-  },
-  {
-    title: '发帖人',
-    align: 'center',
-    dataIndex: 'postedBy',
-    key: 'postedBy',
-  },
-  {
-    title: '板块',
-    align: 'center',
-    dataIndex: 'plate',
-    key: 'plate',
-  },
-  {
-    title: '置顶',
-    align: 'center',
-    dataIndex: 'topping',
-    key: 'topping',
-    scopedSlots: { customRender: 'topping' },
-  },
-  {
-    title: '审核状态',
-    align: 'center',
-    dataIndex: 'auditStatus',
-    key: 'auditStatus',
-    scopedSlots: { customRender: 'auditStatus' },
-  },
-  {
-    title: '发布时间',
-    align: 'center',
-    dataIndex: 'releaseTime',
-    key: 'releaseTime',
-    scopedSlots: { customRender: 'releaseTime' },
-  },
-  {
-    title: '审核',
-    align: 'center',
-    dataIndex: 'examine',
-    key: 'examine',
-    scopedSlots: { customRender: 'examine' },
-  },
-];
-
-const lists = [
-  {
-    id:'001',
-    title:'传控科技',
-    postedBy: '张三',
-    plate:'一',
-    topping: 5,
-    auditStatus: '通过',
-    releaseTime: '2020/11/18 18:00',
-  },
-  {
-    id:'002',
-    title:'中绿环保',
-    postedBy: '张三',
-    plate:'二',
-    topping: 6,
-    auditStatus: '未通过',
-    releaseTime: '2020/11/18 18:00',
-  }
-];
-
-export default {
-  name: "ForumDate",
-  data() {
-    this.cacheData = lists.map(item => ({ ...item }));
-    return {
-      columns,
-      lists,
-      loading: false,
-      height: '',
-      editVisible: false,
-      imgVisible: false,
-    }
-  },
-
-  mounted() {
-    this.height = document.getElementsByClassName('main')[0].offsetHeight - 150;
-  },
-
-  methods: {
-    showEditModal(){
-      this.editVisible = true;
-    },
-
-    closeModal(){
-      this.editVisible = false;
-    },
-
-    // 删除
-    async onDelete(teamId) {
-      try {
-        const params = { param: { teamId } };
-        // const res = await delTeam(params);
-        // const { data, msg, code } = res.data;
-        // if (code === 200) {
-        //   this.$message.success('删除成功');
-        //   const arr = [...this.lists];
-        //   this.lists = arr.filter(item => item.id !== teamId);
-        //   // TODO: 填到列表中
-        // } else {
-        //   throw msg;
-        // }
-      } catch (error) {
-        this.$message.error(error || '删除失败');
-      }
-    },
-  },
-};
-</script>
-
-<style lang="stylus" scoped>
-.main .img {
-  width: 100%;
-}
-
-.main .big_img {
-  width: 200px;
-}
-</style>
diff --git a/src/components/Forum/ForumSearch.vue b/src/components/Forum/ForumSearch.vue
deleted file mode 100644
index 4c54263..0000000
--- a/src/components/Forum/ForumSearch.vue
+++ /dev/null
@@ -1,96 +0,0 @@
-<template>
-  <div class="d-flex flex-wrap pb-3">
-    <div>
-      <!-- 板块 -->
-      <a-input
-        @change="handleChange('plate',$event)"
-        placeholder="板块"
-        style="width: 150px"
-        v-model="plate"
-      />
-      <!-- 标题 -->
-      <a-input
-        @change="handleChange('title',$event)"
-        class="ml-3"
-        placeholder="标题"
-        style="width: 150px"
-        v-model="title"
-      />
-      <!-- 置顶 -->
-      <a-select
-        @change="handleChangeSelect('topping',$event)"
-        class="ml-3"
-        default-value="置顶"
-        style="width: 150px"
-      >
-        <a-select-option
-          :key="index"
-          :value="topping"
-          v-for="(topping, index) in items"
-        >{{ topping }}</a-select-option>
-      </a-select>
-      <!-- 审核 -->
-      <a-select
-        @change="handleChangeSelect('state',$event)"
-        class="ml-3"
-        default-value="审核通过"
-        style="width: 150px"
-      >
-        <a-select-option
-          :key="state.id"
-          :value="state.value"
-          v-for="state in status"
-        >{{ state.value }}</a-select-option>
-      </a-select>
-      <!-- 发布时间 -->
-      <a-range-picker @change="onChange" class="ml-3" format="YYYY/MM/DD HH:mm:ss" show-time />
-      <a-button @click="handleSearch" class="ml-3" type="primary">搜索</a-button>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "ForumSearch",
-  data() {
-    return {
-      plate: '',
-      title: '',
-      items: ['置顶','不置顶'],
-      topping: '',
-      status: [
-        { id:1, value:'审核通过' },
-        { id:2, value:'审核未通过' }
-      ],
-      state: '',
-    }
-  },
-  methods: {
-    handleChange(type, e) {
-      this[type] = e.target.value;
-    },
-
-    handleChangeSelect(type, value) {
-      this[type] = value;
-    },
-
-    // 发布时间
-    onChange(dates, dateStrings) {
-      console.log('From: ', dates[0], ', to: ', dates[1]);
-      console.log('From: ', dateStrings[0], ', to: ', dateStrings[1]);
-    },
-
-    // 搜索
-    handleSearch(){
-      console.log('搜索');
-      console.log('plate',this.plate);
-      console.log('title',this.title);
-      console.log('topping',this.topping);
-      console.log('state',this.state);
-    }
-  },
-};
-</script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped lang="stylus"></style>
diff --git a/src/components/Policy/PolicyAdd.vue b/src/components/Policy/PolicyAdd.vue
index c4d9bb0..d82de07 100644
--- a/src/components/Policy/PolicyAdd.vue
+++ b/src/components/Policy/PolicyAdd.vue
@@ -32,7 +32,7 @@
           <a-input
             placeholder="发布部门"
             v-decorator="[
-                      'department',
+                      'pushDep',
                       {
                         rules: [
                           { required: true, message: '发布部门不能为空' },
@@ -48,80 +48,46 @@
           :label-col="formItemLayout.labelCol"
           :wrapper-col="formItemLayout.wrapperCol"
           label="发布时间"
+          required
         >
-          <a-date-picker
-            @change="onChange"
-            format="YYYY/MM/DD HH:mm:ss"
-            show-time
-            style="width:100%"
-          />
-        </a-form-item>
-        <!-- 截止时间 -->
-        <a-form-item
-          :label-col="formItemLayout.labelCol"
-          :wrapper-col="formItemLayout.wrapperCol"
-          label="截止时间"
-        >
-          <a-date-picker
-            @change="onChange"
-            format="YYYY/MM/DD HH:mm:ss"
-            show-time
-            style="width:100%"
-          />
+          <a-date-picker @change="onChange" format="YYYY-MM-DD" show-time style="width:100%" />
         </a-form-item>
-        <!-- 政策类型 -->
+        <!-- 审核状态 -->
         <a-form-item
           :label-col="formItemLayout.labelCol"
           :wrapper-col="formItemLayout.wrapperCol"
-          label="政策类型"
+          label="审核状态"
+          required
         >
-          <a-select @change="getType" placeholder="政策类型" style="width: 200px">
+          <a-select @change="getStatus" placeholder="审核状态" style="width: 200px">
             <a-select-option
               :key="index"
-              :value="policyType"
-              v-for="(policyType, index) in types"
-            >{{ policyType }}</a-select-option>
+              :value="item.id"
+              v-for="(item, index) in applyStatus"
+            >{{ item.name }}</a-select-option>
           </a-select>
         </a-form-item>
-        <!-- 标签 -->
+        <!-- 原文链接 -->
         <a-form-item
           :label-col="formItemLayout.labelCol"
           :wrapper-col="formItemLayout.wrapperCol"
-          label="标签"
+          label="原文链接"
         >
           <a-input
-            placeholder="标签"
+            placeholder="原文链接"
             v-decorator="[
-                      'tag',
-                      {
-                        rules: [
-                          { required: true, message: '标签不能为空' },
-                          { whitespace: true, message: '标签不能为空' },
-                          { max: 6, massage: '标签最多6个字符' },
-                        ],
-                      },
+                      'url',
                     ]"
           />
         </a-form-item>
-        <!-- 原文链接 -->
+        <!-- 政策内容 -->
         <a-form-item
           :label-col="formItemLayout.labelCol"
           :wrapper-col="formItemLayout.wrapperCol"
-          label="原文链接"
+          label="政策内容"
+          required
         >
-          <a-input
-            placeholder="原文链接"
-            v-decorator="[
-                      'link',
-                      {
-                        rules: [
-                          { required: true, message: '原文链接不能为空' },
-                          { whitespace: true, message: '原文链接不能为空' },
-                          { max: 140, massage: '原文链接最多140个字符' },
-                        ],
-                      },
-                    ]"
-          />
+          <quill-editor :max-size="maxSize" :placeholder="placeholder" @changeInput="changeInput" />
         </a-form-item>
 
         <a-form-item class="d-flex flex-row-reverse">
@@ -134,38 +100,69 @@
 </template>
 
 <script>
-// import { addTeam } from 'config/api'
+import { addPolicy } from 'config/api';
+import QuillEditor from 'components/QuillEditor/QuillEditor.vue';
+
 const formItemLayout = {
   labelCol: { span: 6 },
   wrapperCol: { span: 16 },
 };
 const tailItemLayout = { wrapperCol: { span: 16, offset: 6 } };
 export default {
-  name: "PolicyAdd",
+  name: 'PolicyAdd',
   props: { visible: { type: Boolean, default: false } },
+  components: { QuillEditor },
   data() {
     return {
       formItemLayout,
       tailItemLayout,
-      form: this.$form.createForm(this, { name: 'r-d-add' }),
-      releaseTime: '',
-      deadline: '',
-      types: ['单选框','多选框','富文本框'],
-      policyType: '',
-      value: 1
-    }
+      form: this.$form.createForm(this, { name: 'policy-edit' }),
+      applyStatus: [
+        { id: 0, name: '审核中' },
+        { id: 1, name: '未通过' },
+        { id: 2, name: '已通过' },
+      ],
+      status: null,
+      maxSize: 2048,
+      content: '',
+      placeholder: '请输入...',
+      pushTime: '', // 发布时间
+    };
   },
 
   methods: {
-    // 展示类型
-    getType(value){
-      this.policyType = value;
+    // 政策类型
+    getStatus(value) {
+      console.log('value: ', value);
+      this.status = value;
+    },
+
+    // 修改内容
+    changeInput(value) {
+      this.content = value;
+    },
+
+    // 发布时间
+    onChange(date, dateString) {
+      console.log(date, dateString);
+      this.pushTime = dateString;
     },
 
-     // 发布时间
-    onChange(dates, dateStrings) {
-      console.log('From: ', dates[0], ', to: ', dates[1]);
-      console.log('From: ', dateStrings[0], ', to: ', dateStrings[1]);
+    // 验证
+    verification() {
+      if (!this.pushTime) {
+        this.$message.error('发布时间不能为空');
+        return false;
+      }
+      if (this.status === null) {
+        this.$message.error('审核状态不能为空');
+        return false;
+      }
+      if (!this.content) {
+        this.$message.error('政策内容不能为空');
+        return false;
+      }
+      return true;
     },
 
     // 提交表单
@@ -174,16 +171,22 @@ export default {
       this.form.validateFieldsAndScroll(async (err, values) => {
         if (!err) {
           try {
-            // const params = { param: values };
-            // const res = await addTeam(params);
-            // const { data, msg, code } = res.data;
-            // this.$emit('closeModal');
-            // if (code === 200) {
-            //   this.$message.success('添加成功')
-            //   // TODO: 填到列表中
-            // } else {
-            //   throw msg;
-            // }
+            if (!this.verification()) return;
+            const { pushTime, status, content } = this;
+            const params = { param: values };
+            params.param.pushTime = pushTime;
+            params.param.status = status;
+            params.param.content = content;
+            console.log('params: ', params);
+            const res = await addPolicy(params);
+            const { data, msg, code } = res.data;
+            if (code === 200) {
+              this.$message.success('添加成功');
+              this.$emit('closeModal');
+            } else {
+              this.$emit('closeModal');
+              throw msg;
+            }
           } catch (error) {
             this.$message.error(error || '添加失败');
           }
diff --git a/src/components/Policy/PolicyDate.vue b/src/components/Policy/PolicyDate.vue
index 2aa4663..caf2a80 100644
--- a/src/components/Policy/PolicyDate.vue
+++ b/src/components/Policy/PolicyDate.vue
@@ -213,8 +213,9 @@ export default {
       this.editVisible = true;
     },
 
-    closeModal() {
+    async closeModal() {
       this.editVisible = false;
+      await this.$emit('getSelectTeam');
     },
 
     // 打开报名
diff --git a/src/components/Policy/PolicyEdit.vue b/src/components/Policy/PolicyEdit.vue
index d3ee39b..6d3833e 100644
--- a/src/components/Policy/PolicyEdit.vue
+++ b/src/components/Policy/PolicyEdit.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="d-flex flex-wrap pb-3">
     <!-- 编辑 -->
-    <a-modal :closable="false" footer title="修改创新挑战" v-model="editVisible" width="700px">
-      <a-form :form="form" @submit="handleSubmit">
+    <a-modal :closable="false" footer title="修改创新政策" v-model="editVisible" width="700px">
+      <a-form :form="form" @submit="handleSubmit" v-if="editVisible && editItem">
         <!-- 标题 -->
         <a-form-item
           :label-col="formItemLayout.labelCol"
@@ -14,6 +14,7 @@
             v-decorator="[
                       'title',
                       {
+                        initialValue: editItem.title,
                         rules: [
                           { required: true, message: '标题不能为空' },
                           { whitespace: true, message: '标题不能为空' },
@@ -32,8 +33,9 @@
           <a-input
             placeholder="发布部门"
             v-decorator="[
-                      'department',
+                      'pushDep',
                       {
+                        initialValue: editItem.publishDepartName,
                         rules: [
                           { required: true, message: '发布部门不能为空' },
                           { whitespace: true, message: '发布部门不能为空' },
@@ -48,60 +50,50 @@
           :label-col="formItemLayout.labelCol"
           :wrapper-col="formItemLayout.wrapperCol"
           label="发布时间"
+          required
         >
           <a-date-picker
             @change="onChange"
-            format="YYYY/MM/DD HH:mm:ss"
-            show-time
-            style="width:100%"
-          />
-        </a-form-item>
-        <!-- 截止时间 -->
-        <a-form-item
-          :label-col="formItemLayout.labelCol"
-          :wrapper-col="formItemLayout.wrapperCol"
-          label="截止时间"
-        >
-          <a-date-picker
-            @change="onChange"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD"
             show-time
             style="width:100%"
+            v-decorator="[
+                      'pushTime',
+                      {
+                        initialValue: editItem.publishTime,
+                        rules: [
+                          { required: true, message: '发布时间不能为空' },
+                        ],
+                      },
+                    ]"
           />
         </a-form-item>
-        <!-- 政策类型 -->
+        <!-- 审核状态 -->
         <a-form-item
           :label-col="formItemLayout.labelCol"
           :wrapper-col="formItemLayout.wrapperCol"
-          label="政策类型"
+          label="审核状态"
         >
-          <a-select @change="getType" placeholder="政策类型" style="width: 200px">
-            <a-select-option
-              :key="index"
-              :value="policyType"
-              v-for="(policyType, index) in types"
-            >{{ policyType }}</a-select-option>
-          </a-select>
-        </a-form-item>
-        <!-- 标签 -->
-        <a-form-item
-          :label-col="formItemLayout.labelCol"
-          :wrapper-col="formItemLayout.wrapperCol"
-          label="标签"
-        >
-          <a-input
-            placeholder="标签"
+          <a-select
+            @change="getStatus"
+            placeholder="审核状态"
+            style="width: 200px"
             v-decorator="[
-                      'tag',
+                      'status',
                       {
+                        initialValue: editItem.status,
                         rules: [
-                          { required: true, message: '标签不能为空' },
-                          { whitespace: true, message: '标签不能为空' },
-                          { max: 6, massage: '标签最多6个字符' },
+                          { required: true, message: '审核状态不能为空' },
                         ],
                       },
                     ]"
-          />
+          >
+            <a-select-option
+              :key="index"
+              :value="item.id"
+              v-for="(item, index) in applyStatus"
+            >{{ item.name }}</a-select-option>
+          </a-select>
         </a-form-item>
         <!-- 原文链接 -->
         <a-form-item
@@ -112,17 +104,27 @@
           <a-input
             placeholder="原文链接"
             v-decorator="[
-                      'link',
+                      'url',
                       {
-                        rules: [
-                          { required: true, message: '原文链接不能为空' },
-                          { whitespace: true, message: '原文链接不能为空' },
-                          { max: 140, massage: '原文链接最多140个字符' },
-                        ],
+                        initialValue: editItem.titleUrl,
                       },
                     ]"
           />
         </a-form-item>
+        <!-- 政策内容 -->
+        <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="政策内容"
+          required
+        >
+          <quill-editor
+            :max-size="maxSize"
+            :placeholder="placeholder"
+            :value="(editItem && editItem.content) ? editItem.content : content"
+            @changeInput="changeInput"
+          />
+        </a-form-item>
 
         <a-form-item class="d-flex flex-row-reverse">
           <a-button @click="$emit('closeModal')" class="mr-3">取消</a-button>
@@ -134,7 +136,8 @@
 </template>
 
 <script>
-// import { upTeam } from 'config/api';
+import { addPolicy } from 'config/api';
+import QuillEditor from 'components/QuillEditor/QuillEditor.vue';
 
 const formItemLayout = {
   labelCol: { span: 6 },
@@ -144,31 +147,42 @@ const formItemLayout = {
 const tailItemLayout = { wrapperCol: { span: 16, offset: 6 } };
 
 export default {
-  name: "PolicyEdit",
-  props: { editVisible: { type: Boolean, default: false },editItem: { type: Object, default: () => {} } },
+  name: 'PolicyEdit',
+  props: { editVisible: { type: Boolean, default: false }, editItem: { type: Object, default: () => {} } },
+  components: { QuillEditor },
   data() {
     return {
       formItemLayout,
       tailItemLayout,
-      form: this.$form.createForm(this, { name: 'r-d-add' }),
-      releaseTime: '',
-      deadline: '',
-      types: ['单选框','多选框','富文本框'],
-      policyType: '',
-      value: 1
-    }
+      form: this.$form.createForm(this, { name: 'policy-edit' }),
+      applyStatus: [
+        { id: 0, name: '审核中' },
+        { id: 1, name: '未通过' },
+        { id: 2, name: '已通过' },
+      ],
+      status: null,
+      maxSize: 2048,
+      content: '',
+      placeholder: '请输入...',
+      pushTime: '', // 发布时间
+    };
   },
 
   methods: {
     // 政策类型
-    getType(value){
-      this.policyType = value;
+    getStatus(value) {
+      this.status = value;
+    },
+
+    // 修改内容
+    changeInput(value) {
+      this.content = value;
     },
 
-     // 发布时间
-    onChange(dates, dateStrings) {
-      console.log('From: ', dates[0], ', to: ', dates[1]);
-      console.log('From: ', dateStrings[0], ', to: ', dateStrings[1]);
+    // 发布时间
+    onChange(date, dateString) {
+      console.log(date, dateString);
+      this.pushTime = dateString;
     },
 
     // 提交表单
@@ -177,16 +191,21 @@ export default {
       this.form.validateFieldsAndScroll(async (err, values) => {
         if (!err) {
           try {
-            // const params = { param: values };
-            // const res = await upTeam(params);
-            // const { data, msg, code } = res.data;
-            // this.$emit('closeModal');
-            // if (code === 200) {
-            //   this.$message.success('修改成功')
-            //   // TODO: 填到列表中
-            // } else {
-            //   throw msg;
-            // }
+            const { pushTime, status, content, editItem } = this;
+            const params = { param: values };
+            params.param.id = editItem.id;
+            params.param.pushTime = pushTime || editItem.publishTime;
+            params.param.status = status || editItem.status;
+            params.param.content = content || editItem.content;
+            const res = await addPolicy(params);
+            const { data, msg, code } = res.data;
+            if (code === 200) {
+              this.$message.success('修改成功');
+              this.$emit('closeModal');
+            } else {
+              this.$emit('closeModal');
+              throw msg;
+            }
           } catch (error) {
             this.$message.error(error || '修改失败');
           }
diff --git a/src/components/Policy/PolicySearch.vue b/src/components/Policy/PolicySearch.vue
index 6bbc8b6..653976e 100644
--- a/src/components/Policy/PolicySearch.vue
+++ b/src/components/Policy/PolicySearch.vue
@@ -17,7 +17,7 @@
       <a-range-picker
         @change="onChangeTime"
         class="ml-3 mb-3 flex-1"
-        format="YYYY-MM-DD HH:mm:ss"
+        format="YYYY-MM-DD"
         show-time
       />
     </div>
@@ -87,8 +87,9 @@ export default {
       this.visible = true;
     },
 
-    closeModal() {
+    async closeModal() {
       this.visible = false;
+      await this.$emit('getSelectTeam');
     },
 
     // 勾选
diff --git a/src/config/api.js b/src/config/api.js
index d080c2b..5368119 100644
--- a/src/config/api.js
+++ b/src/config/api.js
@@ -10,12 +10,17 @@ const greenvalley = `${proxyUrl}/greenvalley`;
 const policy = `${proxyUrl}/policy`; // 创新政策接口
 const researchTeam = `${greenvalley}/researchTeam`; // 创新平台相关操作
 const page = `${greenvalley}/page`; // 页面管理相关操作
+const carousel = `${greenvalley}/carousel`; // 轮播图相关接口
+
+// 上传附件
+export const upload = `${greenvalley}/file/upload`;
 const industryInfo = `${greenvalley}/industryInfo`; // 行业资讯相关操作
 const activity = `${greenvalley}/activity`; // 活动公告相关操作
 const creatingPlatform = `${greenvalley}/creatingPlatform`; // 合作意向相关操作
 const serviceProject = `${greenvalley}/serviceProject`; // 创新部服务相关操作
 const institute = `${greenvalley}/institute`; // 实验室(研究院)相关操作
-const achInstr = `${greenvalley}/achInstr`; // 创新部类型、仪器、成果相关操作
+const achInstr = `${greenvalley}/achInstr`; // 创新部类型相关操作
+const comment = `${greenvalley}/comment`; // 交流社区相关操作
 
 // websocket基础地址
 export const WS_BASE_URL = msgUrl;
@@ -77,6 +82,18 @@ export const selLikePolicyBack = params => axios.post(`${policy}/policy/selLikeP
 // 政策审批
 export const upPolicy = params => axios.post(`${policy}/policy/upPolicy`, params);
 
+// 增加/修改一条政策
+export const addPolicy = params => axios.post(`${policy}/policy/addPolicy`, params);
+
+// 发帖查询
+export const selCommentH = params => axios.post(`${comment}/selCommentH`, params);
+
+// 置顶和取消置顶帖子。修改发帖内容，修改发帖标题，
+export const upTopping = params => axios.post(`${comment}/upTopping`, params);
+
+// 跟帖查询
+export const selCommunityH = params => axios.post(`${comment}/selCommunityH`, params);
+
 // 合作意向列表查询
 export const getCreatingPlatformSearch = params => axios.post(`${creatingPlatform}/search`, params);
 
@@ -127,3 +144,16 @@ export const upTeam = params => axios.post(`${researchTeam}/upTeam`, params);
 
 // 根据团队名称搜索团队
 export const selLikeTeam = params => axios.post(`${researchTeam}/selLikeTeam`, params);
+
+// // 页面列表查询
+// export const getPageList = params => axios.post(`${page}/list`, params);
+
+// // 页面配置添加
+// export const addPage = params => axios.post(`${page}/add`, params);
+
+// // 页面配置删除
+// export const deletePage = params => axios.post(`${page}/delete`, params);
+// 查询轮播图列表
+export const queryCarousel = params => axios.post(`${carousel}/queryCarousel`, params);
+// 查询轮播图列表
+export const addCarousel = params => axios.post(`${carousel}/addCarousel`, params);
diff --git a/src/router/index.js b/src/router/index.js
index d83ca5e..2bd8cfb 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -41,6 +41,12 @@ const routes = [
     name: 'CommunicationCommunity',
     component: () => import(/* webpackChunkName: "communication-community" */ 'views/CommunicationCommunity/CommunicationCommunity.vue'),
   },
+  // 跟帖
+  {
+    path: '/comment',
+    name: 'Comment',
+    component: () => import(/* webpackChunkName: "comment" */ 'views/CommunicationCommunity/Comment.vue'),
+  },
   // 活动公告--活动通知
   {
     path: '/event-announcement',
@@ -65,6 +71,18 @@ const routes = [
     name: 'TalentRecruitment',
     component: () => import(/* webpackChunkName: "talent-recruitment" */ 'views/TalentRecruitment/TalentRecruitment.vue'),
   },
+  // 合作伙伴
+  {
+    path: '/cooperative-partner',
+    name: 'CooperativePartner',
+    component: () => import(/* webpackChunkName: "cooperative-partner" */ 'views/CooperativePartner/CooperativePartner.vue'),
+  },
+  // 衍生企业
+  {
+    path: '/derivative-enterprise',
+    name: 'DerivativeEnterprise',
+    component: () => import(/* webpackChunkName: "derivative-enterprise" */ 'views/DerivativeEnterprise/DerivativeEnterprise.vue'),
+  },
   //  -------创新部
   // 合作意向
   {
diff --git a/src/views/BannerManage/BannerManage.vue b/src/views/BannerManage/BannerManage.vue
index 8de9931..0d5f567 100644
--- a/src/views/BannerManage/BannerManage.vue
+++ b/src/views/BannerManage/BannerManage.vue
@@ -1,37 +1,69 @@
 <template>
   <div class="pa-3 white fill-height d-flex flex-column">
-    <banner-search />
-    <banner-date />
+    <banner-search @getListData="getListData" />
+    <banner-date :lists="lists" :pagination="pagination" @getListData="getListData" />
   </div>
 </template>
 
 <script>
-import BannerSearch from "components/Banner/BannerSearch.vue";
-import BannerDate from "components/Banner/BannerDate.vue";
-// import { getSelectTeam } from 'config/api';
+import BannerSearch from 'components/Banner/BannerSearch.vue';
+import BannerDate from 'components/Banner/BannerDate.vue';
+import { queryCarousel } from 'config/api';
 
 export default {
-  name: "BannerManage",
+  name: 'BannerManage',
   components: {
     BannerSearch,
     BannerDate,
   },
 
+  data() {
+    return {
+      str: '轮播图管理界面',
+      lists: {},
+      pagination: { current: 1, pageSize: 10 },
+      pageNum: 1,
+      pageSize: 10,
+      paramData: {
+        showPage: '',
+        jumpType: 0,
+        recStatus: 0,
+      },
+    };
+  },
+
   created() {
-    // this.getSelectTeam()
+    this.getListData();
   },
 
   methods: {
-    /**
-     * 根据团队id查看研发团队相关信息
-     * @param { String } competeTimeId 第几届信息的id
-     */
-    async getSelectTeam() {
+    // 获取轮播图列表
+    async getListData(condition) {
       try {
-        const params = {param:{}}
-        const res = await getSelectTeam(params);
+        if (condition && condition.current) {
+          this.pageNum = condition.current;
+          this.pageSize = condition.pageSize;
+        } else if (condition && !condition.pageNum) {
+          this.paramData = condition;
+        }
+        const params = {
+          param: {
+            showPage: this.paramData.showPage,
+            jumpType: this.paramData.jumpType,
+            recStatus: this.paramData.recStatus,
+            pageNum: this.pageNum,
+            pageSize: this.pageSize,
+          },
+        };
+        const res = await queryCarousel(params);
         const { code, msg, data } = res.data;
         if (code === 200) {
+          this.lists = data;
+          const paper = { ...this.pagination };
+          paper.current = data.pageNum;
+          paper.total = +data.total;
+          paper.pageSize = data.pageSize;
+          this.pagination = paper;
         } else {
           throw msg || '获取失败';
         }
diff --git a/src/views/CommunicationCommunity/Comment.vue b/src/views/CommunicationCommunity/Comment.vue
new file mode 100644
index 0000000..2e36fe1
--- /dev/null
+++ b/src/views/CommunicationCommunity/Comment.vue
@@ -0,0 +1,71 @@
+<template>
+  <div class="pa-3 white fill-height d-flex flex-column">
+    <comment-search @getSelectTeam="getSelectTeam" />
+    <comment-date :lists="lists" :pagination="pagination" @getSelectTeam="getSelectTeam" />
+  </div>
+</template>
+
+<script>
+import CommentSearch from 'components/Community/CommentSearch.vue';
+import CommentDate from 'components/Community/CommentDate.vue';
+import { selCommunityH } from 'config/api';
+
+export default {
+  name: 'CommunicationCommunity',
+  components: {
+    CommentSearch,
+    CommentDate,
+  },
+
+  data() {
+    return {
+      lists: [],
+      pagination: { current: 1, pageSize: 10 },
+    };
+  },
+
+  created() {
+    this.getSelectTeam();
+  },
+
+  methods: {
+    /**
+     * 发帖查询
+     * @param { String } category 发帖类别
+     * @param { String } comStatus 帖子状态
+     * @param { String } title 发帖标题
+     */
+    async getSelectTeam(condition) {
+      try {
+        const { query } = this.$route;
+        const params = {
+          param: {
+            commentId: query.id,
+            pageNum: (condition && condition.current) || 1,
+            pageSize: (condition && condition.pageSize) || 10,
+          },
+        };
+        if (condition) {
+          if (condition.comStatus !== '') {
+            params.param.comStatus = condition.comStatus;
+          }
+        }
+        const res = await selCommunityH(params);
+        const { code, msg, data } = res.data;
+        if (code === 200) {
+          this.lists = data.list;
+          const paper = { ...this.pagination };
+          paper.current = data.pageNum;
+          paper.total = +data.total;
+          paper.pageSize = data.pageSize;
+          this.pagination = paper;
+        } else {
+          throw msg || '获取失败';
+        }
+      } catch (error) {
+        this.$message.error(error);
+      }
+    },
+  },
+};
+</script>
diff --git a/src/views/CommunicationCommunity/CommunicationCommunity.vue b/src/views/CommunicationCommunity/CommunicationCommunity.vue
index f673aed..6f1f51b 100644
--- a/src/views/CommunicationCommunity/CommunicationCommunity.vue
+++ b/src/views/CommunicationCommunity/CommunicationCommunity.vue
@@ -1,19 +1,75 @@
 <template>
   <div class="pa-3 white fill-height d-flex flex-column">
-    <forum-search />
-    <forum-date />
+    <community-search @getSelectTeam="getSelectTeam" />
+    <community-date :lists="lists" :pagination="pagination" @getSelectTeam="getSelectTeam" />
   </div>
 </template>
 
 <script>
-import ForumSearch from 'components/Forum/ForumSearch.vue';
-import ForumDate from 'components/Forum/ForumDate.vue';
+import CommunitySearch from 'components/Community/CommunitySearch.vue';
+import CommunityDate from 'components/Community/CommunityDate.vue';
+import { selCommentH } from 'config/api';
 
 export default {
-  name: 'ForumManage',
+  name: 'CommunicationCommunity',
   components: {
-    ForumSearch,
-    ForumDate,
+    CommunitySearch,
+    CommunityDate,
+  },
+
+  data() {
+    return {
+      lists: [],
+      pagination: { current: 1, pageSize: 10 },
+    };
+  },
+
+  created() {
+    this.getSelectTeam();
+  },
+
+  methods: {
+    /**
+     * 发帖查询
+     * @param { String } category 发帖类别
+     * @param { String } comStatus 帖子状态
+     * @param { String } title 发帖标题
+     */
+    async getSelectTeam(condition) {
+      try {
+        const params = {
+          param: {
+            pageNum: (condition && condition.current) || 1,
+            pageSize: (condition && condition.pageSize) || 10,
+          },
+        };
+        if (condition) {
+          if (condition.title) {
+            params.param.title = condition.title;
+          }
+          if (condition.comStatus !== '') {
+            params.param.comStatus = condition.comStatus;
+          }
+          if (condition.category !== '') {
+            params.param.category = condition.category;
+          }
+        }
+        const res = await selCommentH(params);
+        const { code, msg, data } = res.data;
+        if (code === 200) {
+          this.lists = data.list;
+          const paper = { ...this.pagination };
+          paper.current = data.pageNum;
+          paper.total = +data.total;
+          paper.pageSize = data.pageSize;
+          this.pagination = paper;
+        } else {
+          throw msg || '获取失败';
+        }
+      } catch (error) {
+        this.$message.error(error);
+      }
+    },
   },
 };
 </script>
diff --git a/src/views/CooperativePartner/CooperativePartner.vue b/src/views/CooperativePartner/CooperativePartner.vue
new file mode 100644
index 0000000..2e70428
--- /dev/null
+++ b/src/views/CooperativePartner/CooperativePartner.vue
@@ -0,0 +1,79 @@
+<template>
+  <div class="pa-3 white fill-height d-flex flex-column">
+    <activity-search @getBackendSearch="getBackendSearch" />
+    <activity-date :lists="lists" :pagination="pagination" @getBackendSearch="getBackendSearch" />
+  </div>
+</template>
+
+<script>
+import ActivitySearch from 'components/IndustryInfo/ActivitySearch.vue';
+import ActivityDate from 'components/IndustryInfo/ActivityDate.vue';
+import { getBackendSearch } from 'config/api';
+
+export default {
+  name: 'ActivityBulletin',
+  components: {
+    ActivitySearch,
+    ActivityDate,
+  },
+
+  data() {
+    return {
+      lists: [],
+      pagination: { current: 1, pageSize: 10 },
+    };
+  },
+
+  created() {
+    this.getBackendSearch();
+  },
+
+  methods: {
+    /**
+     * 根据团队id查看研发团队相关信息
+     * @param { String } competeTimeId 第几届信息的id
+     */
+    async getBackendSearch(condition) {
+      try {
+        const params = {
+          param: {
+            pageNum: (condition && condition.current) || 1,
+            pageSize: (condition && condition.pageSize) || 10,
+          },
+        };
+        if (condition) {
+          if (condition.title) {
+            params.param.title = condition.title;
+          }
+          if (condition.spreadDepartment) {
+            params.param.spreadDepartment = condition.spreadDepartment;
+          }
+          if (condition.startTime) {
+            params.param.startTime = condition.startTime;
+          }
+          if (condition.endTime) {
+            params.param.endTime = condition.endTime;
+          }
+          if (condition.site) {
+            params.param.site = condition.site;
+          }
+        }
+        const res = await getBackendSearch(params);
+        const { code, msg, data } = res.data;
+        if (code === 200) {
+          this.lists = data.list;
+          const paper = { ...this.pagination };
+          paper.current = data.pageNum;
+          paper.total = +data.total;
+          paper.pageSize = data.pageSize;
+          this.pagination = paper;
+        } else {
+          throw msg || '获取失败';
+        }
+      } catch (error) {
+        this.$message.error(error);
+      }
+    },
+  },
+};
+</script>