diff --git a/src/views/admin/meeting/RoomServeList.vue b/src/views/admin/meeting/RoomServeList.vue
index 36442b2..0a1f1f4 100644
--- a/src/views/admin/meeting/RoomServeList.vue
+++ b/src/views/admin/meeting/RoomServeList.vue
@@ -1,59 +1,64 @@
 <template>
-  <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="48">
-          <a-col :md="5" :sm="15">
-            <a-form-item label="服务名称">
-              <a-input placeholder="请输入服务名称" v-model="queryParam.serveName"/>
+  <a-card :bordered='false'>
+    <div class='table-page-search-wrapper'>
+      <a-form layout='inline'>
+        <a-row :gutter='48'>
+          <a-col :md='5' :sm='15'>
+            <a-form-item label='服务名称'>
+              <a-input placeholder='请输入服务名称' v-model='queryParam.serveName' />
             </a-form-item>
           </a-col>
-          <a-col :md="5" :sm="15">
-            <a-form-item label="服务时间30分钟起步">
-              <a-input placeholder="请输入服务时间30分钟起步" v-model="queryParam.serveTime"/>
+          <a-col :md='5' :sm='15'>
+            <a-form-item label='服务时间30分钟起步'>
+              <a-input placeholder='请输入服务时间30分钟起步' v-model='queryParam.serveTime' />
             </a-form-item>
           </a-col>
-          <a-col :md="8" :sm="24">
-            <span class="table-page-search-submitButtons">
-              <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-              <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
+          <a-col :md='8' :sm='24'>
+            <span class='table-page-search-submitButtons'>
+              <a-button type='primary' @click='$refs.table.refresh(true)'>查询</a-button>
+              <a-button style='margin-left: 8px' @click='() => queryParam = {}'>重置</a-button>
             </span>
           </a-col>
         </a-row>
       </a-form>
     </div>
-    <div class="table-operator">
-      <a-button v-if="addEnable" type="primary" icon="plus" @click="$refs.modal.add()">新建</a-button>
-      <a-dropdown v-if="removeEnable&&selectedRowKeys.length > 0">
-        <a-button type="danger" icon="delete" @click="delByIds(selectedRowKeys)">删除</a-button>
+    <div class='table-operator'>
+      <a-button v-if='addEnable' type='primary' icon='plus' @click='$refs.modal.add()'>新建</a-button>
+      <a-dropdown v-if='removeEnable&&selectedRowKeys.length > 0'>
+        <a-button type='danger' icon='delete' @click='delByIds(selectedRowKeys)'>删除</a-button>
       </a-dropdown>
     </div>
     <s-table
-      size="default"
-      ref="table"
-      rowKey="id"
-      :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-      :columns="columns"
-      :data="loadData"
+      size='default'
+      ref='table'
+      rowKey='id'
+      :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
+      :columns='columns'
+      :data='loadData'
     >
-      <span slot="action" slot-scope="text, record">
-        <a v-if="editEnabel" @click="handleEdit(record)">编辑</a>
-        <a-divider type="vertical" />
-        <a v-if="removeEnable" @click="delByIds([record.id])">删除</a>
+      <span slot="serveType" slot-scope="text">
+        {{ text | serveTypeFilter }}
+      </span>
+      <span slot='action' slot-scope='text, record'>
+        <a v-if='editEnabel' @click='handleEdit(record)'>编辑</a>
+        <a-divider type='vertical' />
+        <a v-if='removeEnable' @click='delByIds([record.id])'>删除</a>
       </span>
     </s-table>
-    <roomServe-modal ref="modal" @ok="handleOk"/>
+    <roomServe-modal ref='modal' @ok='handleOk' />
   </a-card>
 </template>
 
 <script>
-    import {STable} from '@/components'
+import { STable } from '@/components'
 
-    import {delRoomServe,getRoomServeList } from '@/api/admin/meeting/roomServe'
-    import RoomServeModal from './modules/RoomServeModal.vue'
-    import {checkPermission} from '@/utils/permissions'
+import { delRoomServe, getRoomServeList } from '@/api/admin/meeting/roomServe'
+import RoomServeModal from './modules/RoomServeModal.vue'
+import { checkPermission } from '@/utils/permissions'
+import { getDictArray } from '@/utils/dict'
 
-    export default {
+const serveTypeMap = {}
+export default {
   name: 'TableList',
   components: {
     STable,
@@ -75,6 +80,7 @@
       advanced: false,
       // 查询参数
       queryParam: {},
+      serveTypeMap,
       // 表头
       columns: [
         {
@@ -83,7 +89,8 @@
         },
         {
           title: '服务类型',
-          dataIndex: 'serveType'
+          dataIndex: 'serveType',
+          scopedSlots: { customRender: 'serveType' }
         },
         {
           title: '服务时间30分钟起步',
@@ -112,8 +119,15 @@
     }
   },
   filters: {
+    serveTypeFilter (serveType) {
+      return serveTypeMap[serveType].text
+    }
   },
-  created () {
+  async created () {
+    const serveTypeData = await getDictArray('serve_type')
+    serveTypeData.map(d => {
+      serveTypeMap[d.dictValue] = { text: d.dictLabel }
+    })
   },
   methods: {
     onSelectChange (selectedRowKeys, selectedRows) {
diff --git a/src/views/admin/meeting/TicketList.vue b/src/views/admin/meeting/TicketList.vue
index 3b50d7e..3d950de 100644
--- a/src/views/admin/meeting/TicketList.vue
+++ b/src/views/admin/meeting/TicketList.vue
@@ -132,7 +132,7 @@
         },
         {
           title: '结束时间',
-          dataIndex: 'endTime',
+          dataIndex: 'endDate',
           sorter: true
         },
         {
diff --git a/src/views/admin/meeting/modules/RoomServeModal.vue b/src/views/admin/meeting/modules/RoomServeModal.vue
index 94d4976..317b762 100644
--- a/src/views/admin/meeting/modules/RoomServeModal.vue
+++ b/src/views/admin/meeting/modules/RoomServeModal.vue
@@ -17,18 +17,18 @@
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="服务名称">
         <a-input placeholder="服务名称" v-decorator="['serveName']"/>
       </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="服务名称">
+        <a-select placeholder="服务类型"  v-decorator="['serveType', {initialValue:'0',rules: [{  message: '请选择服务类型' }]}]">
+          <a-select-option :value="'1'">免费服务</a-select-option>
+          <a-select-option :value="'2'">会务服务</a-select-option>
+          <a-select-option :value="'3'">其他服务</a-select-option>
+        </a-select>
+
+      </a-form-item>
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="服务时间30分钟起步">
         <a-input placeholder="服务时间30分钟起步" v-decorator="['serveTime']"/>
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="创建者">
-        <a-input placeholder="创建者" v-decorator="['createBy']"/>
-      </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="更新者">
-        <a-input placeholder="更新者" v-decorator="['updateBy']"/>
-      </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="版本">
-        <a-input placeholder="版本" v-decorator="['version']"/>
-      </a-form-item>
+
     </a-form>
   </a-modal>
 </template>
diff --git a/src/views/admin/meeting/modules/TicketModal.vue b/src/views/admin/meeting/modules/TicketModal.vue
index 55221a5..61ece49 100644
--- a/src/views/admin/meeting/modules/TicketModal.vue
+++ b/src/views/admin/meeting/modules/TicketModal.vue
@@ -1,60 +1,52 @@
 <template>
   <a-modal
-    title="操作"
-    style="top: 20px;"
-    :width="800"
-    v-model="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleSubmit"
+    title='操作'
+    style='top: 20px;'
+    :width='800'
+    v-model='visible'
+    :confirmLoading='confirmLoading'
+    @ok='handleSubmit'
   >
-    <a-form :form="form">
-      <a-form-item style="display:none">
-        <a-input v-decorator="['id']"/>
+    <a-form :form='form'>
+      <a-form-item style='display:none'>
+        <a-input v-decorator="['id']" />
       </a-form-item>
-      <a-form-item style="display:none">
-        <a-input v-decorator="['version']"/>
+      <a-form-item style='display:none'>
+        <a-input v-decorator="['version']" />
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称">
-        <a-input placeholder="名称" v-decorator="['title']"/>
+      <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='名称'>
+        <a-input placeholder='名称' v-decorator="['title']" />
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="描述">
-        <a-input placeholder="描述" v-decorator="['content']"/>
+      <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='描述'>
+        <a-input placeholder='描述' v-decorator="['content']" />
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="金额">
-        <a-input placeholder="金额" v-decorator="['money']"/>
+      <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='金额'>
+        <a-input placeholder='金额' v-decorator="['money']" />
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="地址">
-        <a-input placeholder="地址" v-decorator="['address']"/>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="开始时间">
+        <a-date-picker @change="onChange" v-decorator="['startTime']" placeholder="开始时间" />
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="是否需要核销">
-        <a-input placeholder="是否需要核销" v-decorator="['isVerification']"/>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结束日期">
+        <a-date-picker @change="onChange" v-decorator="['endDate']" placeholder="结束日期" />
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="是否需要展示">
-        <a-input placeholder="是否需要展示" v-decorator="['isShow']"/>
+      <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='是否需要核销'>
+        <a-input placeholder='是否需要核销' v-decorator="['isVerification']" />
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="版本">
-        <a-input placeholder="版本" v-decorator="['version']"/>
-      </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="创建者">
-        <a-input placeholder="创建者" v-decorator="['createBy']"/>
-      </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="更新者">
-        <a-input placeholder="更新者" v-decorator="['updateBy']"/>
+      <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='是否需要展示'>
+        <a-input placeholder='是否需要展示' v-decorator="['isShow']" />
       </a-form-item>
     </a-form>
   </a-modal>
 </template>
 <script>
-    import {saveTicket} from '@/api/admin/meeting/ticket'
-    import pick from 'lodash.pick'
+import { saveTicket } from '@/api/admin/meeting/ticket'
+import pick from 'lodash.pick'
 
-    export default {
+export default {
   name: 'TicketModal',
-  props: {
-  },
-  components: {
-  },
-  data () {
+  props: {},
+  components: {},
+  data() {
     return {
       visible: false,
       labelCol: {
@@ -75,18 +67,24 @@
   created () {
   },
   methods: {
-    add () {
+    onChange (date, dateString) {
+      this.form.startTime = dateString[0]
+      this.form.endDate = dateString[1]
+      console.log(this.form.startTime)
+    },
+
+    add() {
       this.form.resetFields()
       this.edit({ id: 0 })
     },
-    edit (record) {
+    edit(record) {
       this.mdl = Object.assign(record)
       this.visible = true
       this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.mdl, 'id', 'title', 'content', 'type', 'money', 'address', 'isVerification', 'isShow', 'startTime', 'endTime', 'remark', 'isDefault', 'version', 'deleteFlag', 'createBy', 'createTime', 'updateBy', 'updateTime'))
+        this.form.setFieldsValue(pick(this.mdl, 'id', 'title', 'content', 'type', 'money', 'address', 'isVerification', 'isShow', 'startTime', 'endDate', 'remark', 'isDefault', 'version', 'deleteFlag', 'createBy', 'createTime', 'updateBy', 'updateTime'))
       })
     },
-    handleSubmit (e) {
+    handleSubmit(e) {
       e.preventDefault()
       this.form.validateFields((err, values) => {
         if (!err) {