diff --git a/App.vue b/App.vue
index a4448a4..1adf5e3 100644
--- a/App.vue
+++ b/App.vue
@@ -57,6 +57,7 @@
\ No newline at end of file
diff --git a/pages/ofm/bookingRecord.vue b/pages/ofm/bookingRecord.vue
new file mode 100644
index 0000000..d9f9612
--- /dev/null
+++ b/pages/ofm/bookingRecord.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+ {{item.title}}
+ 预约日期:{{item.mdate}}
+ 参加人数:{{item.participant_count}}
+ 所属部门:{{item.belong_dept_name}}
+ 参会领导:{{item.key_participants}}
+ 预约会议室:{{item.mroom_name}}
+ 预约时间:{{range}}、
+ 备注:{{item.note}}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/ofm/mroom.vue b/pages/ofm/mroom.vue
new file mode 100644
index 0000000..c205553
--- /dev/null
+++ b/pages/ofm/mroom.vue
@@ -0,0 +1,112 @@
+
+
+
+
+
+
+
+
+
+ 容纳人数:{{item.capacity}}
+ 位置:{{item.location}}
+
+
+ 立即预定
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/static/huiyishi.png b/static/huiyishi.png
new file mode 100644
index 0000000..5e8b42a
Binary files /dev/null and b/static/huiyishi.png differ
diff --git a/static/iconfont.css b/static/iconfont.css
new file mode 100644
index 0000000..bb58f34
--- /dev/null
+++ b/static/iconfont.css
@@ -0,0 +1,93 @@
+@font-face {
+ font-family: "iconfont";
+ src: url('/static/iconfont.ttf') format('truetype');
+}
+
+.iconfont {
+ font-family: "iconfont" !important;
+ font-size: 16px;
+ font-style: normal;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-weikaishi2:before {
+ content: "\e744";
+}
+
+.icon-jinhangzhong2:before {
+ content: "\e64e";
+}
+
+.icon-jinhangzhong:before {
+ content: "\e72b";
+}
+
+.icon-weikaishi:before {
+ content: "\e72a";
+}
+
+.icon-yijieshu4:before {
+ content: "\e729";
+}
+
+.icon-weikaishi21:before {
+ content: "\e635";
+}
+
+.icon-arrow-up:before {
+ content: "\e612";
+}
+
+.icon-arrow-down:before {
+ content: "\e613";
+}
+
+.icon-RectangleCopy:before {
+ content: "\e6a2";
+}
+
+.icon-RectangleCopy1:before {
+ content: "\e6a9";
+}
+
+.icon-RectangleCopy2:before {
+ content: "\e6eb";
+}
+
+.icon-canyubiaojue:before {
+ content: "\e681";
+}
+
+.icon-shijian:before {
+ content: "\e684";
+}
+
+.icon-yiban-01:before {
+ content: "\e69d";
+}
+
+.icon-huiyi-01:before {
+ content: "\e69e";
+}
+
+.icon-yicheng-01:before {
+ content: "\e69f";
+}
+
+.icon-huanjieliebiao1-01:before {
+ content: "\e6a0";
+}
+
+.icon-lishihuiyi-01:before {
+ content: "\e6a1";
+}
+
+.icon-qiandaochaxun-01:before {
+ content: "\e6a3";
+}
+
+.icon-yonghu-01:before {
+ content: "\e6a4";
+}
+
diff --git a/static/iconfont.ttf b/static/iconfont.ttf
new file mode 100644
index 0000000..b115485
Binary files /dev/null and b/static/iconfont.ttf differ
diff --git a/static/meetingRecord.png b/static/meetingRecord.png
new file mode 100644
index 0000000..4684a47
Binary files /dev/null and b/static/meetingRecord.png differ
diff --git a/static/renyuan.png b/static/renyuan.png
new file mode 100644
index 0000000..56e5394
Binary files /dev/null and b/static/renyuan.png differ
diff --git a/static/yuding.png b/static/yuding.png
new file mode 100644
index 0000000..7a93def
Binary files /dev/null and b/static/yuding.png differ
diff --git a/utils/api.js b/utils/api.js
index 71bed5f..f7b6d8e 100644
--- a/utils/api.js
+++ b/utils/api.js
@@ -11,5 +11,15 @@ export default {
codeLogin:(data) => http('/auth/login_sms_code/', 'POST', data),
wxmpLogin: (data) => http('/auth/login_wxmp/', 'POST', data, true, false), //微信小程序登录
wxmpClogin: (data) => http('/auth/login_wxmp/', 'POST', data, true, false), //微信小程序登录(自动创建账号)
- getTicket:(query) => http('/wf/ticket/', 'GET', query),
+ getTicket:(data) => http('/wf/ticket/', 'GET', data),
+ ticketCreate:(data)=>http('/wf/ticket/', 'POST', data),
+ ticketHandle:(id,data)=>http(`/wf/ticket/${id}/handle/`, 'POST', data),
+ getMroom:(data) => http('/ofm/mroom/', 'GET', data),
+ getTransition:(id) => http(`/wf/ticket/${id}/transitions/`, 'GET'),
+ workflowInitkey:(key) => http(`/wf/workflow/${key}/init_key/`, 'GET'),
+ bookingList:(data) => http('/ofm/mroombooking/', 'GET', data),
+ bookingItem:(id,data) => http(`/ofm/mroombooking/${id}/`, 'GET', data),
+ bookingCreate:(data) => http(`/ofm/mroombooking/`, 'POST', data),
+ bookingUpdate:(id,data) => http(`/ofm/mroombooking/${id}/`, 'PUT', data),
+ bookingDelete:(id) => http(`/ofm/mroombooking/${id}/`, 'DELETE'),
}
\ No newline at end of file