Merge branch 'feature' into 'dev'

兑换操作添加网点提示

See merge request !22

src/pages/order_mail/order_mail.vue

@@ -146,6 +146,10 @@
         @close="dialogClose"
       >
         <view class="content">
+          <view
+            >{{ $lang.lang.integral.branch }}
+            {{ locale === 'zh' ? orderInfo.nodeZh : orderInfo.nodeEn }}
+          </view>
           <view
             >{{ $lang.lang.integral.gift }}
             {{ locale === 'zh' ? orderInfo.titleZh : orderInfo.titleEn }}
@@ -161,9 +165,7 @@
           <view
             >{{ $lang.lang.integral.exchangeType }}
             {{
-              locale === 'zh'
-                ? orderInfo.pickMethodList[current ? current - 1 : 0].labelZh
-                : orderInfo.pickMethodList[current ? current - 1 : 0].labelEn
+              locale === 'zh' ? handleExchangeSelected().labelZh : handleExchangeSelected().labelEn
             }}
           </view>
           <view v-if="current != 1 && addressId"
@@ -351,6 +353,12 @@ export default {
       let str = this.locale === 'zh' ? 'Zh' : 'En'
       return list.map((item) => item[`label${str}`]).join('/')
     },
+    //获取选中的兑换类型
+    handleExchangeSelected() {
+      return this.orderInfo.pickMethodList.filter((element) => {
+        return this.current == element.value
+      })[0]
+    },
     // 提交订单
     bindSubmitOrder() {
       if (!this.code) {

src/static/lang/en/integral.js

@@ -36,5 +36,6 @@ export default {
   Num: 'Quantity:',
   total: 'Total Score:',
   exchangeType: 'Exchange Method:',
-  deliveryAddress: 'Delivery Address:'
+  deliveryAddress: 'Delivery Address:',
+  branch: 'branch:'
 }

src/static/lang/zh/integral.js

@@ -36,5 +36,6 @@ export default {
   Num: '数量:',
   total: '合计积分:',
   exchangeType: '兑换方式:',
-  deliveryAddress: '邮寄地址:'
+  deliveryAddress: '邮寄地址:',
+  branch: '网点:'
 }