Commits · 690edfa1c65d90cf520432f297e215ea9e7492d1 · 侯忠英 / ptfw-uniapp

06 Aug, 2019 14 commits
- 修复bug · 690edfa1
  刘攀 authored Aug 06, 2019
  
  690edfa1
- Merge remote-tracking branch 'origin/hotfix/20190806-bug' · 3282b308
  刘攀 authored Aug 06, 2019
  
  3282b308
- Merge remote-tracking branch 'origin/feature/20190806-clear-decorate' · 374ca871
  刘攀 authored Aug 06, 2019
  
  374ca871
- Merge remote-tracking branch 'origin/bugfix/20190805-fix-bug' · bd496afe
  刘攀 authored Aug 06, 2019
  
  bd496afe
- Merge remote-tracking branch 'origin/hotfix/20190805-bug' · 888ee7ca
  刘攀 authored Aug 06, 2019
  
  888ee7ca
- Merge remote-tracking branch 'origin/hotfix/20190805-order-bug' · 98b1a091
  刘攀 authored Aug 06, 2019
  
  98b1a091
- Merge remote-tracking branch 'origin/feature/20190805-minify-css' · 7da22a58
  刘攀 authored Aug 06, 2019
  
  7da22a58
- Merge remote-tracking branch 'origin/feature/20190731-tea-order-code' · 52b51c60
  刘攀 authored Aug 06, 2019
  
  52b51c60
- 商品分类名称展示修改 · 25096a26
  2839312464@qq.com authored Aug 06, 2019
  
  25096a26
- editExt · edd36c9f
  2839312464@qq.com authored Aug 06, 2019
  
  edd36c9f
- edit · 800b390a
  2839312464@qq.com authored Aug 06, 2019
  
  800b390a
- 移除装修功能 · 0a05d931
  刘攀 authored Aug 06, 2019
  
  0a05d931
- 修复多规格弹窗默认选择第一个有库存规格错误问题 · 906b319c
  DPFly authored Aug 06, 2019
  
  906b319c
- 优化 · 39ea3af0
  DPFly authored Aug 06, 2019
  
  39ea3af0
05 Aug, 2019 6 commits
- 修复精度计算问题 · cdfe16b4
  刘攀 authored Aug 05, 2019
  
  cdfe16b4
- 清除购物车中无效商品 · 124be4de
  DPFly authored Aug 05, 2019
  
  124be4de
- 修复地址超出配送范围后无法更换地址的BUG · fb78ab4e
  刘攀 authored Aug 05, 2019
  
  fb78ab4e
- 修复拼团入口组件groupInfo参数接受null时报错问题 · b574cf6a
  DPFly authored Aug 05, 2019
  
  b574cf6a
- 新增build构建时压缩CSS文件 · fbe703db
  DPFly authored Aug 05, 2019
  
  fbe703db
- Merge branch 'feature/20190802-disable-group-in-alipay' into 'master' · da349f08
  刘攀 authored Aug 05, 2019
```
支付宝小程序禁用拼团

See merge request !15
```
  da349f08
02 Aug, 2019 5 commits
- 修复买单授权失效问题 · 51454006
  刘攀 authored Aug 02, 2019
  
  51454006
- 支付宝小程序禁用拼团 · 5cac79c7
  DPFly authored Aug 02, 2019
  
  5cac79c7
- 格式化 · 6648f45b
  刘攀 authored Aug 02, 2019
  
  6648f45b
- 修复独立版小程序无法打开的bug、修复支付宝码进入小程序未接受store_id的问题 · a1b1a817
  刘攀 authored Aug 02, 2019
  
  a1b1a817
- 修复独立版小程序无法打开的bug、修复支付宝码进入小程序未接受store_id的问题 · 195ab843
  刘攀 authored Aug 02, 2019
  
  195ab843
01 Aug, 2019 15 commits
- 格式化 · d5847b82
  刘攀 authored Aug 01, 2019
  
  d5847b82
- 运费传goods_amount字段 · 701d3439
  刘攀 authored Aug 01, 2019
  
  701d3439
- Merge remote-tracking branch 'origin/feature/20190730-some-bug' · 2b576013
  刘攀 authored Aug 01, 2019
  
  2b576013
- Merge remote-tracking branch 'origin/feature/20190729-one-key-close' · 590e5643
  刘攀 authored Aug 01, 2019
  
  590e5643
- 修正点餐码进入时就餐人数提示框提示文字 · e544300e
  DPFly authored Aug 01, 2019
  
  e544300e
- 点餐码走扫码点餐流程，而非先吃后付流程 · e08c5efc
  DPFly authored Aug 01, 2019
  
  e08c5efc
- 弹窗组件增加自定义样式 · 61659e35
  DPFly authored Aug 01, 2019
  
  61659e35
- 为弹窗组件增加是否禁用页面滚动属性 · 70e29e24
  DPFly authored Aug 01, 2019
  
  70e29e24
- 多规格增加数量选择 · 5b9b486b
  DPFly authored Aug 01, 2019
  
  5b9b486b
- 一键关店后不提示就餐人数 · 238f049a
  DPFly authored Aug 01, 2019
  
  238f049a
- 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
- Update README.md · 950b216b
  刘攀 authored Aug 01, 2019
  
  950b216b
- Update README.md · 20212c3b
  刘攀 authored Aug 01, 2019
  
  20212c3b