Commits · e544300e0bd36adb2994f2375302697c20c75db5 · 侯忠英 / ptfw-uniapp

01 Aug, 2019 5 commits
- 修正点餐码进入时就餐人数提示框提示文字 · e544300e
  DPFly authored Aug 01, 2019
  
  e544300e
- 点餐码走扫码点餐流程，而非先吃后付流程 · e08c5efc
  DPFly authored Aug 01, 2019
  
  e08c5efc
- Merge branch 'test' into 'feature/20190731-tea-order-code' · fe056ee4
  DPFly authored Aug 01, 2019
```
# Conflicts:
#   src/pages/order/detail/index.vue
```
  fe056ee4
- Merge branch 'feature/20190730-some-bug' into 'test' · 6cc461e1
  DPFly authored Aug 01, 2019
```
代码格式化

See merge request !8
```
  6cc461e1
- 代码格式化 · 4a50ad57
  DPFly authored Aug 01, 2019
  
  4a50ad57
31 Jul, 2019 19 commits
- 增加茶饮点餐码 · bfe4d824
  DPFly authored Jul 31, 2019
  
  bfe4d824
- Merge branch 'feature/20190730-some-bug' into test · e0b094a1
  冯伟 authored Jul 31, 2019
  
  e0b094a1
- Merge remote-tracking branch 'origin/develop' into feature/20190730-some-bug · 1f15347b
  冯伟 authored Jul 31, 2019
  
  1f15347b
- 修复扫码提示不显示 · 40432335
  冯伟 authored Jul 31, 2019
  
  40432335
- fix · a2703327
  刘攀 authored Jul 31, 2019
  
  a2703327
- fix · c1e2b343
  刘攀 authored Jul 31, 2019
  
  c1e2b343
- 区分微信不传referer · 6691764b
  刘攀 authored Jul 31, 2019
  
  6691764b
- 添加referer · d8a41ef2
  刘攀 authored Jul 31, 2019
  
  d8a41ef2
- Merge branch 'feature/20190729-one-key-close' into 'test' · 9df2b48e
  DPFly authored Jul 31, 2019
```
Feature/20190729 one key close

See merge request !5
```
  9df2b48e
- Merge branch 'feature/20190729-one-key-close' of... · f187c8e9
  DPFly authored Jul 31, 2019
```
Merge branch 'feature/20190729-one-key-close' of git.zmcms.cn:houzhongying/ptfw-uniapp into feature/20190729-one-key-close
```
  f187c8e9
- 增加基础弹窗组件 · deb02c76
  DPFly authored Jul 30, 2019
  
  deb02c76
- 增加一键关店功能 · 68efb0e1
  DPFly authored Jul 30, 2019
  
  68efb0e1
- Merge branch 'feature/20190730-some-bug' into test · 5aea5bbf
  冯伟 authored Jul 31, 2019
  
  5aea5bbf
- Merge remote-tracking branch 'origin/develop' into feature/20190730-some-bug · 4b659551
  冯伟 authored Jul 31, 2019
  
  4b659551
- 限制就餐人数为30人 · 9c9f1c47
  冯伟 authored Jul 31, 2019
  
  9c9f1c47
- Merge branch 'V2.15.0' into test · 6bdb959d
  刘攀 authored Jul 31, 2019
  
  6bdb959d
- 修复无法使用关闭支付广告 · 09803c1e
  刘攀 authored Jul 31, 2019
  
  09803c1e
- Merge branch 'V2.15.0' into test · 9aa69955
  刘攀 authored Jul 31, 2019
  
  9aa69955
- 更改菜品逻辑调整 · 7a83989a
  刘攀 authored Jul 31, 2019
  
  7a83989a
30 Jul, 2019 6 commits
- dataType设置为json · ac085a5d
  刘攀 authored Jul 30, 2019
  
  ac085a5d
- 统一接口日志格式、防止日志接口出错导致死循环 · 7c0dd9c9
  刘攀 authored Jul 30, 2019
  
  7c0dd9c9
- 增加基础弹窗组件 · f9a07293
  DPFly authored Jul 30, 2019
  
  f9a07293
- 增加一键关店功能 · 0205babd
  DPFly authored Jul 30, 2019
  
  0205babd
- Merge remote-tracking branch 'origin/feature/20190730-some-bug' into test · 3eeecb4e
  刘攀 authored Jul 30, 2019
  
  3eeecb4e
- 就具人数,先吃后付订单详情不显示商品,加料加价不显示 · c1b94272
  冯伟 authored Jul 30, 2019
  
  c1b94272
29 Jul, 2019 6 commits
- Merge branch 'V2.15.0' into test · a6d093be
  刘攀 authored Jul 29, 2019
  
  a6d093be
- 修复菜品更改的提示逻辑 · 8ee3fe8a
  刘攀 authored Jul 29, 2019
  
  8ee3fe8a
- fix · 25f27209
  刘攀 authored Jul 29, 2019
  
  25f27209
- 减配送费的优惠顺序调整 · 35e97c2c
  刘攀 authored Jul 29, 2019
  
  35e97c2c
- fix · ca426249
  刘攀 authored Jul 29, 2019
  
  ca426249
- 统一日志返回格式、计算运费 amount 改为商品总价、防止日志接口出错导致死循环 · 95e507fa
  刘攀 authored Jul 29, 2019
  
  95e507fa
26 Jul, 2019 4 commits
- 修复外卖订单未计算运费 · 5700f509
  刘攀 authored Jul 26, 2019
  
  5700f509
- 拼团代码格式化 · ca4d28e0
  DPFly authored Jul 26, 2019
  
  ca4d28e0
- 修复多规格选择组件问题 · 40d93c54
  DPFly authored Jul 26, 2019
  
  40d93c54
- Merge remote-tracking branch 'origin/V2.14.1' into V2.15.0 · da447b28
  刘攀 authored Jul 26, 2019
  
  da447b28