1083 Commits

Author SHA1 Message Date
kuaifan
5b079018e8 perf: 优化任务时间冲突提示 2023-07-21 12:15:07 +08:00
kuaifan
dac34c8988 perf: iOS部分点击事件存在阻塞的情况 2023-07-20 22:59:13 +08:00
kuaifan
026dca2d84 Merge commit 'f73ee2c13bd3eff393a768ecd2e83a213a75b678' into pro
# Conflicts:
#	public/site/css/help.css
#	public/site/en/help.html
2023-07-20 16:58:34 +08:00
weifashi
f73ee2c13b style:整理代码格式 2023-07-19 10:50:40 +08:00
weifashi
e272c06028 fix:修改任务时间给提示功能,排除当前任务 2023-07-19 00:50:30 +08:00
weifashi
ada0de8dbc refactor:更改模板名称 2023-07-19 00:41:55 +08:00
weifashi
874bf4b051 feat:添加任务 - 提示功能 - 100% 2023-07-19 00:35:06 +08:00
weifashi
f8e70bd7f7 feat:添加任务 - 提示功能 - 60% 2023-07-18 19:03:09 +08:00
kuaifan
f5fc2301bc build 2023-07-14 00:08:40 +08:00
kuaifan
ce82cc8dd9 site 2023-07-14 00:05:05 +08:00
kuaifan
bbb69b3ec2 no message 2023-07-13 22:58:16 +08:00
kuaifan
cbb5ab2ecc build 2023-07-13 00:56:21 +08:00
kuaifan
fc01f00915 Merge commit '986e2cf0b46144ae461825776eea00c3002a30d7' into pro 2023-07-13 00:32:53 +08:00
kuaifan
bf845208db Merge commit 'dd582fef65d377d001e93f45e883d01f3f04b792' into pro 2023-07-12 17:29:20 +08:00
kuaifan
7a47cb9031 no message 2023-07-11 15:50:04 +08:00
kuaifan
56da2a5725 perf: 整理官网页面 2023-07-11 15:48:22 +08:00
kuaifan
925667d840 perf: 任务详情页可见性选项默认不显示 2023-07-11 14:43:16 +08:00
kuaifan
87669010e3 perf: 避免删除后不关闭任务窗口 2023-07-11 13:59:31 +08:00
kuaifan
4703b03b82 perf: 添加任务支持自定义协助人 2023-07-11 13:39:38 +08:00
kuaifan
e27ea9e117 fix: 前端取消会议屏幕常亮 2023-07-11 11:31:24 +08:00
kuaifan
1df0a1dfb4 Merge commit '7b02bc006b397990c055e80a006e0d104387f40c' into pro
# Conflicts:
#	resources/assets/js/pages/manage/components/MeetingManager.vue
2023-07-11 11:29:11 +08:00
weifashi
7b02bc006b feat:修复加入会议的loadIng 2023-07-10 20:35:44 +08:00
weifashi
3096a6be79 feat:1.补充翻译,2给原生传翻译好的文本,3加入会议时appid不对,给出提示 2023-07-10 18:21:20 +08:00
kuaifan
ab23311851 Merge commit '035fba3fe5dacaae8ea00d8a5d296233e947ebf4' into pro 2023-07-09 18:17:39 +08:00
weifashi
035fba3fe5 fix:修复声网 id 改动问题 2023-07-09 17:52:27 +08:00
kuaifan
7d388cb10a build 2023-07-09 17:07:01 +08:00
kuaifan
5152cee99e Merge commit '220ce21a4aec28adb018cf71a8f472bfd54da433' into dev
# Conflicts:
#	resources/assets/js/App.vue
#	resources/assets/js/store/actions.js
2023-07-09 16:33:05 +08:00
kuaifan
1a011fd971 build 2023-07-09 16:24:21 +08:00
weifashi
220ce21a4a fix:发送会议名称给原生那边 2023-07-07 19:49:34 +08:00
weifashi
01b50c442e feat:发送会议名称给原生那边 2023-07-07 17:40:31 +08:00
weifashi
371c87f5a4 fix:统一字段名称 2023-07-07 17:02:13 +08:00
weifashi
155f42dd37 fix:打开会议窗口更改 2023-07-07 16:54:50 +08:00
kuaifan
9289591ba0 整理代码 2023-07-07 12:03:32 +08:00
kuaifan
99d8559c56 build 2023-07-07 11:59:00 +08:00
kuaifan
13560616c8 no message 2023-07-07 11:59:00 +08:00
kuaifan
621706b1ff build 2023-07-07 11:59:00 +08:00
kuaifan
a5ed59bd64 build 2023-07-07 11:59:00 +08:00
kuaifan
a6ce767532 fix: 发送消息失败再次编辑格式丢失的问题 2023-07-07 11:59:00 +08:00
weifashi
9ceb00bf54 feat:会议模块换成原生 - web端配合修改 2023-07-05 18:36:06 +08:00
weifashi
eabbe82b39 perf: 审批中心图片压缩优化 2023-07-03 11:09:12 +08:00
weifashi
01fd5f78e8 fix:审批中心 - 已知bug修复 2023-07-03 10:25:14 +08:00
weifashi
9adb825a88 fix:1.修复任务列表查询不出数据的问题 ,2.项目任务表添加项目id的索引 2, 修复任务详情-前端事件 2023-07-01 22:37:55 +08:00
kuaifan
cde9c819d1
Merge branch 'pro' into pro 2023-06-30 21:09:38 +08:00
weifashi
14195a2647 feat:翻译中文 2023-06-30 19:45:40 +08:00
kuaifan
a35f1505e3 整理代码 2023-06-30 17:24:06 +08:00
weifashi
287e3e378d style:调整代码格式,未修改代码逻辑 2023-06-30 16:15:05 +08:00
weifashi
41c2dabe26 style:调整代码格式,未修改代码逻辑 2023-06-30 15:47:24 +08:00
weifashi
5c00a28920 style:调整代码格式,未修改代码逻辑 2023-06-30 15:46:00 +08:00
weifashi
dc057b5ca7 fix:可见性下划线消失问题修复 2023-06-30 12:01:31 +08:00
gwok
a9585ed9cc
Merge branch 'pro' into pro 2023-06-29 23:32:41 +08:00