Commits · 3b82b1ca4403dcb4f6006672f43f3f0637d81f87 · bp / op-web-service

17 Sep, 2021 1 commit
- add: 自提点管理 · 3b82b1ca
  gengshaojing authored Sep 17, 2021
  
  3b82b1ca
15 Sep, 2021 4 commits
- Merge branch 'lwh/head-distribution' · d181c7c3
  liwenhong authored Sep 15, 2021
  
  d181c7c3
- fix: 优惠券金额单位 · bba638dc
  liwenhong authored Sep 15, 2021
  
  bba638dc
- fix: 隐藏旧订单入口 · 3b2f0e14
  gengshaojing authored Sep 15, 2021
  
  3b2f0e14
- fix: 隐藏旧订单入口 · 0e92a582
  gengshaojing authored Sep 15, 2021
  
  0e92a582
14 Sep, 2021 11 commits
- Merge branch 'lwh/head-distribution' · 8ec2d5e5
  liwenhong authored Sep 14, 2021
  
  8ec2d5e5
- fix:金额字符类型 · 7109a7fe
  liwenhong authored Sep 14, 2021
  
  7109a7fe
- Merge branch 'feature/merchant-managemet' · 7d128317
  liwenhong authored Sep 14, 2021
  
  7d128317
- fix: 商家管理页码 · fe4269c8
  liwenhong authored Sep 14, 2021
  
  fe4269c8
- Merge branch 'feature/merchant-managemet' · b8979b9d
  liwenhong authored Sep 14, 2021
  
  b8979b9d
- add: merchant pagination · efc4aac3
  liwenhong authored Sep 14, 2021
  
  efc4aac3
- Merge branch 'feature/merchant-managemet' · e797f20d
  liwenhong authored Sep 14, 2021
  
  e797f20d
- add:lint · abcaa05b
  liwenhong authored Sep 14, 2021
  
  abcaa05b
- Merge branch 'feature/merchant-managemet' · f68b9f3a
  liwenhong authored Sep 14, 2021
  
  f68b9f3a
- delete：删除冗余代码 · fdd89408
  jisiyu authored Sep 14, 2021
  
  fdd89408
- add:订单数量 · 7fa45289
  liwenhong authored Sep 14, 2021
  
  7fa45289
13 Sep, 2021 6 commits
- fix:修改is_normal · be835c20
  jisiyu authored Sep 13, 2021
  
  be835c20
- fix:弹窗修改完成后，清除缓存数据 · a42db4be
  jisiyu authored Sep 13, 2021
  
  a42db4be
- add:增加is_normal参数 · 175f1ef1
  jisiyu authored Sep 13, 2021
  
  175f1ef1
- Merge branch 'master' into feature/merchant-managemet · a10dc8ee
  jisiyu authored Sep 13, 2021
```
# Conflicts:
#	server/controllers/goods.js
#	server/router.js
#	src/pages/Groupmeal/components/PageHeader/config.js
#	src/router/Groupmeal/index.js
#	src/service/Goods/goods.js
```
  a10dc8ee
- add:增加启用功能 · 72b7c588
  jisiyu authored Sep 13, 2021
  
  72b7c588
- add: 商家管家 · 7e0bb981
  jisiyu authored Sep 13, 2021
  
  7e0bb981
10 Sep, 2021 3 commits
- add: 商家管理 · d94838c6
  jisiyu authored Sep 10, 2021
  
  d94838c6
- add:商家管理 · ec4be6d4
  jisiyu authored Sep 10, 2021
  
  ec4be6d4
- Merge branch 'lwh/head-distribution' · f37987f3
  liwenhong authored Sep 10, 2021
  
  f37987f3
09 Sep, 2021 7 commits
- fix: 商品库存问题 · b5482fcf
  gengshaojing authored Sep 09, 2021
  
  b5482fcf
- fix: 商品库存问题 · b90d0c24
  gengshaojing authored Sep 09, 2021
  
  b90d0c24
- add：配置上限 · bd9cacae
  liwenhong authored Sep 09, 2021
  
  bd9cacae
- fix：活动配置 · cf04f334
  liwenhong authored Sep 09, 2021
  
  cf04f334
- fix：时间格式 · b46a54fe
  liwenhong authored Sep 09, 2021
  
  b46a54fe
- fix: 当天配置 · e2e85eba
  liwenhong authored Sep 09, 2021
  
  e2e85eba
- fix: 安档位提示 · 0aeaad91
  liwenhong authored Sep 09, 2021
  
  0aeaad91
08 Sep, 2021 8 commits
- add:自提点地址 · 5e9d8134
  liwenhong authored Sep 08, 2021
  
  5e9d8134
- add:优惠券按分单位传参 · 8703cbd3
  liwenhong authored Sep 08, 2021
  
  8703cbd3
- add · 8fe4b8a8
  liwenhong authored Sep 08, 2021
  
  8fe4b8a8
- add:活动配置禁用时间 · 774acafe
  liwenhong authored Sep 08, 2021
  
  774acafe
- add：自提点展示 · e9554a1c
  liwenhong authored Sep 08, 2021
  
  e9554a1c
- Merge branch 'master' into lwh/head-distribution · 47d2f36d
  liwenhong authored Sep 08, 2021
```
# Conflicts:
#	server/config.js
#	server/controllers/goods.js
#	src/pages/Goods/List/index.vue
#	src/pages/Groupmeal/newOrderManagement/index.vue
#	src/service/Goods/goods.js
```
  47d2f36d
- fix: 新订单管理页面去掉商品合计 · df096fa1
  gengshaojing authored Sep 08, 2021
  
  df096fa1
- fix: 新订单管理页面去掉商品合计 · eea052c7
  gengshaojing authored Sep 08, 2021
  
  eea052c7