Merge branch 'feature' into 'dev'

兑换操作提示添加网点字段

See merge request !27

src/lang/en.js

@@ -26,6 +26,7 @@ export default {
     deliveryAddress: "delivery Address",
     messageVerificationCode: "Please enter the verification code",
     title: "gift",
+    branch: "branch",
   },
   addressManager: {
     selectAddress: "Select the shipping address",

src/lang/zh.js

@@ -1125,6 +1125,7 @@ export default {
     deliveryAddress: "邮寄地址",
     messageVerificationCode: "请输入验证码",
     title: "礼品",
+    branch: "网点",
   },
   addressManager: {
     selectAddress: "选择收货地址",

src/views/jiedao/profile/exchangeOperate.vue

@@ -152,10 +152,15 @@
       width="30%"
       :before-close="handleClose"
     >
+      <div class="title number">
+        {{ $t("exchange.branch") }}：
+        {{ isChinese ? rewardDetailsInfo.nodeZh : rewardDetailsInfo.nodeEn }}
+      </div>
       <div class="title number">
         {{ $t("exchange.title") }}：
         {{ isChinese ? rewardDetailsInfo.titleZh : rewardDetailsInfo.titleEn }}
       </div>
+
       <div class="number">
         {{ $t("delivery.quantity") }}：{{ paramsInfo.rewardCount }}
       </div>