Merge branch 'feature' into 'release'

提货点

See merge request !13

src/static/lang/en/integral.js

@@ -8,8 +8,8 @@ export default {
   logExchange: 'exchange log',
   redeemGifts: 'redeem gifts',
   pointsCampaign: 'points campaign',
-  pointsRemark: 'Points can be redeemed differently at different outlets',
-  outlets: 'Please select a location',
+  pointsRemark: 'Redemption points are different at different pick-up points',
+  outlets: 'Please select the pick-up point',
   remainder: val => {
     return `剩余${val}份`
   },

src/static/lang/zh/integral.js

@@ -8,8 +8,8 @@ export default {
   logExchange: '兑换日志',
   redeemGifts: '兑换礼品',
   pointsCampaign: '积分活动',
-  pointsRemark: '不同网点兑换积分不同',
-  outlets: '请选择网点',
+  pointsRemark: '不同提货点兑换积分不同',
+  outlets: '请选择提货点',
   remainder: val => {
     return `剩余${val}份`
   },