Commits · 4dcdc82a1a3a342459b54e42726a6fd114b6e42d · viitto / mallapp

28 May, 2020 2 commits
- rrr · 4dcdc82a
  zhengke authored May 28, 2020
  
  4dcdc82a
- 21212 · c5d70189
  zhengke authored May 28, 2020
  
  c5d70189
27 May, 2020 6 commits
- 购物车的修改 · c32f9ecf
  zhangjianguo authored May 27, 2020
  
  c32f9ecf
- 路径 · e4f98ee1
  zhangjianguo authored May 27, 2020
  
  e4f98ee1
- Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp · 8016a70e
  zhangjianguo authored May 27, 2020
  
  8016a70e
- 余额 · f92a566c
  zhangjianguo authored May 27, 2020
  
  f92a566c
- Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp · a6040332
  罗超 authored May 27, 2020
```
# Conflicts:
#	pages/cart/cart.vue
```
  a6040332
- 修改部分BUG · ba161133
  罗超 authored May 27, 2020
  
  ba161133
26 May, 2020 9 commits
- 样式的一些小改动 · 29d5b80b
  zhangjianguo authored May 26, 2020
  
  29d5b80b
- 解决冲突 · ed135fc2
  zhangjianguo authored May 26, 2020
  
  ed135fc2
- 样式的修改 · 6009139c
  zhangjianguo authored May 26, 2020
  
  6009139c
- 修改搜索链接页面 · 276d0d5e
  罗超 authored May 26, 2020
  
  276d0d5e
- Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp · fc4583ce
  罗超 authored May 26, 2020
  
  fc4583ce
- 完成搜索页面，优化商品列表组件，修改Storage访问方式 · cd2e8609
  罗超 authored May 26, 2020
  
  cd2e8609
- 判断失效在编辑的时候 · fadcb43a
  zhangjianguo authored May 26, 2020
  
  fadcb43a
- 购物车的失效样式添加 · 78ed026a
  zhangjianguo authored May 26, 2020
  
  78ed026a
- 购物车修改和我的足迹日期选择 · 35a35d6a
  zhangjianguo authored May 26, 2020
  
  35a35d6a
25 May, 2020 3 commits
- 修改购物车部分样式 · 2c4edcd2
  罗超 authored May 25, 2020
  
  2c4edcd2
- 完善商品列表功能 · d46d0a6e
  罗超 authored May 25, 2020
  
  d46d0a6e
- 完善购物流程 · 48892116
  罗超 authored May 25, 2020
  
  48892116
22 May, 2020 2 commits
- Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp · e6250ddb
  罗超 authored May 22, 2020
  
  e6250ddb
- 新增配送相关逻辑 · eabe32b1
  罗超 authored May 22, 2020
  
  eabe32b1
21 May, 2020 4 commits
- 我的足迹模块 · 5b384f8f
  zhangjianguo authored May 21, 2020
  
  5b384f8f
- Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp · 448bff0f
  罗超 authored May 21, 2020
```
# Conflicts:
#	pages.json
#	pages/cart/cart.vue
```
  448bff0f
- 新增订单确认页面 · 08cc844b
  罗超 authored May 21, 2020
  
  08cc844b
- 地区和我的收藏 · 8068963f
  zhangjianguo authored May 21, 2020
  
  8068963f
20 May, 2020 1 commit
- 1 · 07d296de
  zhangjianguo authored May 20, 2020
  
  07d296de
19 May, 2020 5 commits
- 跳转 · 3c4cea40
  zhangjianguo authored May 19, 2020
  
  3c4cea40
- Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp · cf17f48d
  zhangjianguo authored May 19, 2020
  
  cf17f48d
- 个人中心页面和收货地址的初始页面 · 555741c7
  zhangjianguo authored May 19, 2020
  
  555741c7
- Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp · 14c25d3b
  罗超 authored May 19, 2020
  
  14c25d3b
- 完善商品详情 · f2954b96
  罗超 authored May 19, 2020
  
  f2954b96
18 May, 2020 1 commit
- 购物车页面 · 2190ac56
  zhangjianguo authored May 18, 2020
  
  2190ac56
15 May, 2020 2 commits
- 初始化项目 · b449fe68
  罗超 authored May 15, 2020
  
  b449fe68
- Initial commit · 9953edf6
  罗超 authored May 15, 2020
  
  9953edf6