fixed defect | 501 |  APP确认兑换提交成功后，应返回兑换礼品页面，不是返回首页

See merge request !19

fexed defect | 590 509 | APP与web端 个人设置页面 & 海运拼柜的订单v值活动详情中积分说明单位错误

See merge request !16

Release

See merge request !15

# 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