diff --git a/src/views/modules/psychology/psychologyanswer-add-or-update.vue b/src/views/modules/psychology/psychologyanswer-add-or-update.vue
new file mode 100644
index 0000000..01b5e73
--- /dev/null
+++ b/src/views/modules/psychology/psychologyanswer-add-or-update.vue
@@ -0,0 +1,145 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="问题id" prop="questionId">
+          <el-input v-model="dataForm.questionId" placeholder="问题id"></el-input>
+      </el-form-item>
+          <el-form-item label="咨询师id（被绑定的管理端用户id）" prop="psychologistId">
+          <el-input v-model="dataForm.psychologistId" placeholder="咨询师id（被绑定的管理端用户id）"></el-input>
+      </el-form-item>
+          <el-form-item label="咨询师名称" prop="psychologistName">
+          <el-input v-model="dataForm.psychologistName" placeholder="咨询师名称"></el-input>
+      </el-form-item>
+          <el-form-item label="回复问题的内容" prop="answerContent">
+          <el-input v-model="dataForm.answerContent" placeholder="回复问题的内容"></el-input>
+      </el-form-item>
+          <el-form-item label="删除标记 0：未删除，1：已删除" prop="delFlag">
+          <el-input v-model="dataForm.delFlag" placeholder="删除标记 0：未删除，1：已删除"></el-input>
+      </el-form-item>
+          <el-form-item label="乐观锁" prop="revision">
+          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+      </el-form-item>
+          <el-form-item label="创建人" prop="createdBy">
+          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+      </el-form-item>
+          <el-form-item label="创建时间" prop="createdTime">
+          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+      </el-form-item>
+          <el-form-item label="更新人" prop="updatedBy">
+          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+      </el-form-item>
+          <el-form-item label="更新时间" prop="updatedTime">
+          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        questionId: '',
+        psychologistId: '',
+        psychologistName: '',
+        answerContent: '',
+        delFlag: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        questionId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        psychologistId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        psychologistName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        answerContent: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/property/psychologyanswer/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/property/psychologyanswer/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/psychology/psychologyanswer.vue b/src/views/modules/psychology/psychologyanswer.vue
new file mode 100644
index 0000000..6d6b9c7
--- /dev/null
+++ b/src/views/modules/psychology/psychologyanswer.vue
@@ -0,0 +1,75 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-__psychologyanswer}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission(':psychologyanswer:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission(':psychologyanswer:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="questionId" label="问题id" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="psychologistId" label="咨询师id（被绑定的管理端用户id）" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="psychologistName" label="咨询师名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="answerContent" label="回复问题的内容" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="delFlag" label="删除标记 0：未删除，1：已删除" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission(':psychologyanswer:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission(':psychologyanswer:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './psychologyanswer-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/property/psychologyanswer/page',
+        getDataListIsPage: true,
+        deleteURL: '/property/psychologyanswer',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>
diff --git a/src/views/modules/psychology/psychologyquestion-add-or-update.vue b/src/views/modules/psychology/psychologyquestion-add-or-update.vue
new file mode 100644
index 0000000..975e7ed
--- /dev/null
+++ b/src/views/modules/psychology/psychologyquestion-add-or-update.vue
@@ -0,0 +1,173 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="提问者 用户id" prop="userId">
+          <el-input v-model="dataForm.userId" placeholder="提问者 用户id"></el-input>
+      </el-form-item>
+          <el-form-item label="提问者用户名" prop="userName">
+          <el-input v-model="dataForm.userName" placeholder="提问者用户名"></el-input>
+      </el-form-item>
+          <el-form-item label="用户的头像" prop="userAvatar">
+          <el-input v-model="dataForm.userAvatar" placeholder="用户的头像"></el-input>
+      </el-form-item>
+          <el-form-item label="问题内容" prop="questionContent">
+          <el-input v-model="dataForm.questionContent" placeholder="问题内容"></el-input>
+      </el-form-item>
+          <el-form-item label="已匿名 0否  1是" prop="anonymousFlag">
+          <el-input v-model="dataForm.anonymousFlag" placeholder="已匿名 0否  1是"></el-input>
+      </el-form-item>
+          <el-form-item label="咨询师id （被绑定的管理端用户id）用户指定向谁提问" prop="psychologistId">
+          <el-input v-model="dataForm.psychologistId" placeholder="咨询师id （被绑定的管理端用户id）用户指定向谁提问"></el-input>
+      </el-form-item>
+          <el-form-item label="问题已几有人回复 " prop="answerNum">
+          <el-input v-model="dataForm.answerNum" placeholder="问题已几有人回复 "></el-input>
+      </el-form-item>
+          <el-form-item label="是否展示 0否 ，1是" prop="displayFlag">
+          <el-input v-model="dataForm.displayFlag" placeholder="是否展示 0否 ，1是"></el-input>
+      </el-form-item>
+          <el-form-item label="删除标记 0：未删除，1：已删除" prop="delFlag">
+          <el-input v-model="dataForm.delFlag" placeholder="删除标记 0：未删除，1：已删除"></el-input>
+      </el-form-item>
+          <el-form-item label="乐观锁" prop="revision">
+          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+      </el-form-item>
+          <el-form-item label="创建人" prop="createdBy">
+          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+      </el-form-item>
+          <el-form-item label="创建时间" prop="createdTime">
+          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+      </el-form-item>
+          <el-form-item label="更新人" prop="updatedBy">
+          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+      </el-form-item>
+          <el-form-item label="更新时间" prop="updatedTime">
+          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        userId: '',
+        userName: '',
+        userAvatar: '',
+        questionContent: '',
+        anonymousFlag: '',
+        psychologistId: '',
+        answerNum: '',
+        displayFlag: '',
+        delFlag: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        userId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        userName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        userAvatar: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        questionContent: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        anonymousFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        psychologistId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        answerNum: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        displayFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/property/psychologyquestion/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/property/psychologyquestion/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/psychology/psychologyquestion.vue b/src/views/modules/psychology/psychologyquestion.vue
new file mode 100644
index 0000000..188218b
--- /dev/null
+++ b/src/views/modules/psychology/psychologyquestion.vue
@@ -0,0 +1,132 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-__psychologyquestion}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="提问者名称">
+          <el-input v-model="dataForm.userName" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="userName" label="提问者名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="questionContent" label="问题内容" header-align="center" show-overflow-tooltip align="center"></el-table-column>
+        <el-table-column prop="answerNum" label="是否已被回复" header-align="center" align="center">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.answerNum === 0" size="small" type="danger">否</el-tag>
+            <el-tag v-else size="small" type="success">是</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="displayFlag" label="是否展示" header-align="center" align="center">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.displayFlag === '0'" size="small" type="danger">否</el-tag>
+            <el-tag v-else size="small" type="success">是</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="createdTime" label="提问时间" header-align="center" align="center"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission('psychology:question:hidden') && scope.row.displayFlag !== '0'" type="text" size="small" @click="hiddenQuestion(scope.row.id)">隐藏</el-button>
+            <el-button v-if="$hasPermission('psychology:question:hidden') && scope.row.displayFlag === '0'" type="text" size="small" @click="showQuestion(scope.row.id)">展示</el-button>
+            <el-button v-if="$hasPermission('psychology:question:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button v-if="$hasPermission('psychology:question:view')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">查看回复</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './psychologyquestion-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/property/psychologyquestion/page',
+        getDataListIsPage: true,
+        deleteURL: '/property/psychologyquestion',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: '',
+        displayFlag: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  },
+  methods: {
+    hiddenQuestion (id) {
+      this.$confirm('是否隐藏该问题?', this.$t('prompt.title'), {
+          confirmButtonText: this.$t('confirm'),
+          cancelButtonText: this.$t('cancel'),
+          type: 'warning'
+      }).then(() => {
+        this.dataForm.id = id;
+        this.dataForm.displayFlag= '0';
+        this.$http['put']('/property/psychologyquestion/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          });
+          this.getDataList();
+        }).catch(() => {
+          this.getDataList();
+        })
+      })
+    },
+    showQuestion (id) {
+      this.$confirm('是否展示该问题?', this.$t('prompt.title'), {
+        confirmButtonText: this.$t('confirm'),
+        cancelButtonText: this.$t('cancel'),
+        type: 'warning'
+      }).then(() => {
+        this.dataForm.id = id;
+        this.dataForm.displayFlag= '1';
+        this.$http['put']('/property/psychologyquestion/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          });
+          this.getDataList();
+        }).catch(() => {
+          this.getDataList();
+        })
+      })
+    }
+  }
+}
+</script>