# 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

rewards list  change hierarchy of data

See merge request !3

platform

See merge request !2

Feature

See merge request !1

兑现详情、兑换日志、兑换礼品、积分页礼品列表、活动列表、活动详情、邮寄订单 接口联调

首页nav栏入口增加，我的积分页面完成，增加图片，增加icon组件