# Conflicts:
#   src/static/lang/en.js
#   src/static/lang/zh.js

提货点

See merge request !13

组件引入有问题

See merge request !12

分享页面更换

See merge request !11

修复9/13的问题

See merge request !9

fenxiang

See merge request !8

# Conflicts:
#	src/static/lang/en/orderInfo.js
#	src/static/lang/zh/orderInfo.js

# Conflicts:
#	src/static/lang/en.js
#	src/static/lang/zh.js

# Conflicts:
#	src/static/lang/en.js
#	src/static/lang/zh.js

# Conflicts:
#	src/static/img/add.png
#	src/static/lang/en.js
#	src/static/lang/zh.js
#	src/store/index.js
#	src/utils/config.js

# Conflicts:
#	src/static/img/add.png
#	src/static/lang/en.js
#	src/static/lang/zh.js
#	src/store/index.js
#	src/utils/config.js

iocn

See merge request !7

member system status control

See merge request !6

t年月日格式

See merge request !5

inital commit

See merge request !4