Commits · 4ef5c8fb4afc9da782868be705ca7cd83a3c53f4 · 和慭琛 / take_order

07 Apr, 2021 6 commits
- 水印文字 · 4ef5c8fb
  李超鹏 authored Apr 07, 2021
  
  4ef5c8fb
- Merge branch 'dev-photo-v2' · 7aa7b434
  李超鹏 authored Apr 07, 2021
  
  7aa7b434
- 增加图片清空 · 26d3331b
  李超鹏 authored Apr 07, 2021
  
  26d3331b
- Merge branch 'dev-photo-v2' · 5c4be0b7
  李超鹏 authored Apr 07, 2021
```
# Conflicts:
#	take-order/pages/photo/list.vue
#	take-order/pages/photo/preview.vue
#	take-order/pages/photo/setting.vue
```
  5c4be0b7
- 增加图片清空 · 7766596c
  李超鹏 authored Apr 07, 2021
  
  7766596c
- Merge remote-tracking branch 'origin/dev-photo-v2' into dev-photo-v2 · 40ca5a73
  李超鹏 authored Apr 07, 2021
```
# Conflicts:
#	take-order/pages/photo/list.vue
```
  40ca5a73
06 Apr, 2021 9 commits
- 水印设置页面要等后台返回结果之后才能操作 · 2ebfe4e1
  Facius authored Apr 06, 2021
  
  2ebfe4e1
- 文字部分未显示 · a1fff412
  李俊赕 authored Apr 06, 2021
  
  a1fff412
- 编辑字段 · 3f1013b2
  李俊赕 authored Apr 06, 2021
  
  3f1013b2
- 问题修复 · b80d2800
  李俊赕 authored Apr 06, 2021
  
  b80d2800
- resolve-bug · 975c9ef5
  李俊赕 authored Apr 06, 2021
  
  975c9ef5
- 修复iphone11问题 · 9d330f06
  李俊赕 authored Apr 06, 2021
  
  9d330f06
- iphone6 适配 · bc930476
  李俊赕 authored Apr 06, 2021
  
  bc930476
- 初始化继续按钮返回 · 0a2d0fb9
  李俊赕 authored Apr 06, 2021
  
  0a2d0fb9
- change-prod · ef220f8a
  李俊赕 authored Apr 06, 2021
  
  ef220f8a
02 Apr, 2021 12 commits
- Merge branch 'dev-photo-v2' of https://git.banshouhui.com/heyinchen/take_order into dev-photo-v2 · 84147aec
  Facius authored Apr 02, 2021
  
  84147aec
- 序号对齐微调 · 6fed55ea
  Facius authored Apr 02, 2021
  
  6fed55ea
- Merge branch 'dev-photo-v2' of https://git.banshouhui.com/heyinchen/take_order into dev-photo-v2 · 4b67b4c7
  李俊赕 authored Apr 02, 2021
  
  4b67b4c7
- 修改样式 · 9cc240c0
  李俊赕 authored Apr 02, 2021
  
  9cc240c0
- Merge branch 'dev-photo-v2' of https://git.banshouhui.com/heyinchen/take_order into dev-photo-v2 · 01ab96af
  Facius authored Apr 02, 2021
  
  01ab96af
- 字号修改,间距修改 · 8b03416c
  Facius authored Apr 02, 2021
  
  8b03416c
- 预览图样式修改 · 4b30687f
  李俊赕 authored Apr 02, 2021
  
  4b30687f
- 第二轮测试bug修复 · 295cad1c
  李俊赕 authored Apr 02, 2021
  
  295cad1c
- change-take · edac86b7
  李俊赕 authored Apr 02, 2021
  
  edac86b7
- Merge remote-tracking branch 'origin/dev-photo-v2' into dev-photo-v2 · 318d43f5
  李超鹏 authored Apr 02, 2021
```
# Conflicts:
#	take-order/pages/photo/list.vue
```
  318d43f5
- 修改用户token 增加提示 · 6bba43b6
  李超鹏 authored Apr 02, 2021
  
  6bba43b6
- Merge branch 'dev-photo-v2' of https://git.banshouhui.com/heyinchen/take_order into dev-photo-v2 · 9e8f03cf
  李俊赕 authored Apr 02, 2021
  
  9e8f03cf
01 Apr, 2021 13 commits
- 拍照项最多一条显示10张 · f203ebc8
  Facius authored Apr 01, 2021
  
  f203ebc8
- Merge branch 'dev-photo-v2' of https://git.banshouhui.com/heyinchen/take_order into dev-photo-v2 · 2c105e51
  李俊赕 authored Apr 01, 2021
  
  2c105e51
- 按钮防抖处理 · f262da98
  李俊赕 authored Apr 01, 2021
  
  f262da98
- Merge branch 'dev-photo-v2' of https://git.banshouhui.com/heyinchen/take_order into dev-photo-v2 · 550dfe9c
  Facius authored Apr 01, 2021
  
  550dfe9c
- 有照片无照片时候的颜色 · f6897dca
  Facius authored Apr 01, 2021
  
  f6897dca
- 保存本地和上传异步执行 · 0f115d95
  李超鹏 authored Apr 01, 2021
  
  0f115d95
- 修改拍照时页面 · 5dfaa271
  李俊赕 authored Apr 01, 2021
  
  5dfaa271
- Merge branch 'dev-photo-v2' of https://git.banshouhui.com/heyinchen/take_order into dev-photo-v2 · cdaf3ce7
  李俊赕 authored Apr 01, 2021
  
  cdaf3ce7
- edit · cefd36fb
  李俊赕 authored Apr 01, 2021
  
  cefd36fb
- Merge remote-tracking branch 'origin/dev-photo-v2' into dev-photo-v2 · 495e2482
  李超鹏 authored Apr 01, 2021
  
  495e2482
- 修改云函数bug · a1cd1203
  李超鹏 authored Apr 01, 2021
  
  a1cd1203
- Merge branch 'dev-photo-v2' of https://git.banshouhui.com/heyinchen/take_order into dev-photo-v2 · e3a33888
  李俊赕 authored Apr 01, 2021
  
  e3a33888
- 拍照优化 · dee29850
  李俊赕 authored Apr 01, 2021
  
  dee29850