Commits · 6ba6b3edb77823feb93432c6ef9ca94e66849345 · viitto / pptist

05 Dec, 2023 1 commit
- 新增 typeId 酒店景餐id · 6ba6b3ed
  zhengke authored Dec 05, 2023
  
  6ba6b3ed
04 Dec, 2023 18 commits
- Merge branch 'master' of http://gitlab.oytour.com/viitto/pptist · 685435b3
  罗超 authored Dec 04, 2023
  
  685435b3
- 新增是否裁剪内容的提示 · bd6b6235
  罗超 authored Dec 04, 2023
  
  bd6b6235
- 修复封面图 dom bug · 52182e89
  zhengke authored Dec 04, 2023
  
  52182e89
- 优化上传封面 · a7d3e047
  zhengke authored Dec 04, 2023
  
  a7d3e047
- Merge branch 'master' of http://gitlab.oytour.com/viitto/pptist · 85cedd8e
  zhengke authored Dec 04, 2023
  
  85cedd8e
- 封面图上传调整 · 745bc7a1
  zhengke authored Dec 04, 2023
  
  745bc7a1
- Merge branch 'master' of http://gitlab.oytour.com/viitto/pptist · 68170b9a
  罗超 authored Dec 04, 2023
  
  68170b9a
- 解决图片生成时，字体失效的问题 · 7013aff1
  罗超 authored Dec 04, 2023
  
  7013aff1
- 修复上传行程特色 · a64bb7a7
  zhengke authored Dec 04, 2023
  
  a64bb7a7
- 封面，行程生成图，横屏竖屏动态width · cf2b8035
  zhengke authored Dec 04, 2023
  
  cf2b8035
- 修复提交等待时间过长 · e2e74903
  zhengke authored Dec 04, 2023
  
  e2e74903
- 行程图排序 · 11cc8a87
  zhengke authored Dec 04, 2023
  
  11cc8a87
- 行程特色图异常不进行处理 · c7493f63
  zhengke authored Dec 04, 2023
  
  c7493f63
- no message · 3b189f7d
  zhengke authored Dec 04, 2023
  
  3b189f7d
- no message · 66e7e46d
  zhengke authored Dec 04, 2023
  
  66e7e46d
- FiledTypeStr 改成 contentStr 纯文本内容 · 4e84451e
  zhengke authored Dec 04, 2023
  
  4e84451e
- 修复 UploadAsync 返回数据 · 7d7a65bd
  zhengke authored Dec 04, 2023
  
  7d7a65bd
- 行程图生成及上传 · 10810a7e
  zhengke authored Dec 04, 2023
  
  10810a7e
02 Dec, 2023 12 commits
- Merge branch 'master' of http://gitlab.oytour.com/viitto/pptist · 1883b6a2
  罗超 authored Dec 02, 2023
```
# Conflicts:
#	src/views/Editor/Canvas/index.vue
```
  1883b6a2
- 提交图片导出测试功能 · b4c750b6
  罗超 authored Dec 02, 2023
  
  b4c750b6
- 修复行程内容初始化渲染时，图片尺寸问题 · 288c6e0f
  罗超 authored Dec 02, 2023
  
  288c6e0f
- 修复提交报错 · 647f5312
  zhengke authored Dec 02, 2023
  
  647f5312
- 修复组件提示层级关系，解决滚动画布区域，顶部被滚出视线外 · dbd4acb7
  zhengke authored Dec 02, 2023
  
  dbd4acb7
- 修复导出图渲染 · a8c3af0e
  zhengke authored Dec 02, 2023
  
  a8c3af0e
- 修复导出行程特色img，修改数据源并更新 · d63299d0
  zhengke authored Dec 02, 2023
  
  d63299d0
- 修改首页样式，替换分页为滚动加载 · 8fd06b25
  罗超 authored Dec 02, 2023
  
  8fd06b25
- 优化数据源更新 · 25e84c88
  zhengke authored Dec 02, 2023
  
  25e84c88
- 初始化行程数据排序 · d980bc80
  zhengke authored Dec 02, 2023
  
  d980bc80
- Merge branch 'master' of http://gitlab.oytour.com/viitto/pptist · 8347851f
  zhengke authored Dec 02, 2023
  
  8347851f
- 排序,页面类型 · 30d47dc9
  zhengke authored Dec 02, 2023
  
  30d47dc9
01 Dec, 2023 9 commits
- 解决跨图层进行底图移动问题，解决导入模板数据问题 · d62b7e48
  罗超 authored Dec 01, 2023
  
  d62b7e48
- Merge branch 'master' of http://gitlab.oytour.com/viitto/pptist · e2557fa5
  zhengke authored Dec 01, 2023
  
  e2557fa5
- 生成封面调整、数据源非必选调整，数据源可清空 · ee767eee
  zhengke authored Dec 01, 2023
  
  ee767eee
- 修正 Font 位置偏移，修正画板位置，修改横版比例 · ef2028e4
  罗超 authored Dec 01, 2023
  
  ef2028e4
- 行程保存成功，通知erp · eafb1e8b
  zhengke authored Dec 01, 2023
  
  eafb1e8b
- 修复行程初始化 · 7bc80462
  zhengke authored Dec 01, 2023
  
  7bc80462
- Merge branch 'master' of http://gitlab.oytour.com/viitto/pptist · f2a7de83
  zhengke authored Dec 01, 2023
  
  f2a7de83
- no message · fc73730a
  zhengke authored Dec 01, 2023
  
  fc73730a
- Merge branch 'master' of http://gitlab.oytour.com/viitto/pptist · e6abb973
  罗超 authored Dec 01, 2023
```
# Conflicts:
#	src/views/Editor/EditorHeader/index.vue
```
  e6abb973