Merge branch 'feature' into 'dev'

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

See merge request !19

src/pages/my_info/cityListPicker.vue

@@ -132,7 +132,7 @@ export default {
       this.$emit('reLoad', this.form)
     },
     // 搜索查询
-    async searchChange(e) {
+    searchChange(e) {
       this.reset()
     },
     reset() {

src/static/lang/en/integral.js

@@ -10,14 +10,14 @@ export default {
   pointsCampaign: 'points campaign',
   pointsRemark: 'Redemption points are different at different pick-up points',
   outlets: 'Please select the pick-up point',
-  remainder: val => {
+  remainder: (val) => {
     return `剩余${val}份`
   },
   orderMail: 'Confirm the order',
   code: 'Get a verification code',
   codePlaceloader: 'Please enter a verification code',
   codeError: 'The verification code is incorrect',
-  codeTimeText: val => {
+  codeTimeText: (val) => {
     return `${val}秒后重新获取`
   },
   remark: 'Please enter a comment',
@@ -25,11 +25,16 @@ export default {
   redeemType: 'Redemption Method',
   activityTime: 'Event time',
   textLength: 'Enter up to 100 words',
-  totalScore: num => {
+  totalScore: (num) => {
     return `已选${num}件，合计积分：`
   },
   totalScore1: 'integral',
   addAddress: 'new address for additional shipments',
   totalScoreError: 'Insufficient points',
   to: 'to',
+  gift: 'gift:',
+  Num: 'Quantity:',
+  total: 'Total Score:',
+  exchangeType: 'Exchange Method:',
+  deliveryAddress: 'Delivery Address:'
 }

src/static/lang/zh/integral.js

@@ -10,14 +10,14 @@ export default {
   pointsCampaign: '积分活动',
   pointsRemark: '不同提货点兑换积分不同',
   outlets: '请选择提货点',
-  remainder: val => {
+  remainder: (val) => {
     return `剩余${val}份`
   },
   orderMail: '确定订单',
   code: '获取验证码',
   codePlaceloader: '请输入验证码',
   codeError: '验证码错误',
-  codeTimeText: val => {
+  codeTimeText: (val) => {
     return `${val}秒后重新获取`
   },
   remark: '请输入备注',
@@ -25,11 +25,16 @@ export default {
   redeemType: '兑换方式',
   activityTime: '活动时间',
   textLength: '最多输入100字',
-  totalScore: num => {
+  totalScore: (num) => {
     return `已选${num}件，合计积分：`
   },
   totalScore1: '积分',
   addAddress: '新增收货地址',
   totalScoreError: '积分不足',
   to: '至',
+  gift: '礼品:',
+  Num: '数量:',
+  total: '合计积分:',
+  exchangeType: '兑换方式:',
+  deliveryAddress: '邮寄地址:'
 }