Merge branch 'feature' into 'dev'

Feature

See merge request !25

src/lang/en.js

@@ -23,6 +23,9 @@ export default {
     submitOrder: "submit Order",
     to: "to",
     success: "Successful exchange",
+    deliveryAddress: "delivery Address",
+    messageVerificationCode: "Please enter the verification code",
+    title: "gift",
   },
   addressManager: {
     selectAddress: "Select the shipping address",

src/lang/zh.js

@@ -1122,6 +1122,9 @@ export default {
     submitOrder: "提交订单",
     to: "至",
     success: "兑换成功",
+    deliveryAddress: "邮寄地址",
+    messageVerificationCode: "请输入验证码",
+    title: "礼品",
   },
   addressManager: {
     selectAddress: "选择收货地址",

src/views/jiedao/profile/exchangeOperate.vue

@@ -152,7 +152,8 @@
       width="30%"
       :before-close="handleClose"
     >
-      <div class="title">
+      <div class="title number">
+        {{ $t("exchange.title") }}：
         {{ isChinese ? rewardDetailsInfo.titleZh : rewardDetailsInfo.titleEn }}
       </div>
       <div class="number">
@@ -164,6 +165,9 @@
       <div class="number">
         {{ $t("exchange.exchangeMethod") }}：{{ getExcahngeType() }}
       </div>
+      <div v-if="addressInfo.id && paramsInfo.redeemType != 1" class="number">
+        {{ $t("exchange.deliveryAddress") }}：{{ addressInfo.address }}
+      </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">{{
           $t("customer.cancel")
@@ -230,6 +234,10 @@ export default {
     parseTime,
     // 兑换
     handleSubmitRedeem() {
+      if (!this.paramsInfo.code) {
+        this.$message.error(this.$t("exchange.messageVerificationCode"));
+        return;
+      }
       this.dialogVisible = true;
     },
     confirmSubmit() {
@@ -245,7 +253,7 @@ export default {
           type: "success",
         });
         this.dialogVisible = false;
-        this.$router.push({ path: "/jiedao/jd-exchange-log" });
+        this.$router.push({ path: "/jiedao/jd-integral" });
       });
     },
     getExcahngeType() {
@@ -322,6 +330,9 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.number {
+  padding-bottom: 8px;
+}
 ::v-deep .headerTab .el-tabs__nav-scroll {
   height: 100px;
   background: #d3e6ff;

src/views/login/index.vue

 <template>
   <div style="width: 100%; height: 100%; position: relative">
     <div style="height: 100%; width: 55%; position: relative">
-      5
       <div style="position: absolute; left: 56px; top: 56px; display: flex">
-        <img src="@/assets/login/logo.png" style="width: 84px; height: 84px">
+        <img src="@/assets/login/logo.png" style="width: 84px; height: 84px" />
         <span
           style="
             font-size: 48px;
@@ -12,10 +11,11 @@
             line-height: 84px;
             margin-left: 20px;
           "
-        >{{ $t("login.bgTitle1") }}{{ env }}</span>
+          >{{ $t("login.bgTitle1") }}{{ env }}</span
+        >
       </div>
       <div style="position: absolute; left: 160px; top: 170px; display: flex">
-        <img src="@/assets/login/1.png" style="width: 36px; height: 36px">
+        <img src="@/assets/login/1.png" style="width: 36px; height: 36px" />
         <span
           style="
             font-size: 32px;
@@ -24,13 +24,14 @@
             line-height: 36px;
             margin-left: 8px;
           "
-        >{{ $t("login.bgTitle2") }}</span>
+          >{{ $t("login.bgTitle2") }}</span
+        >
       </div>
       <div style="position: absolute; left: 130px; top: 250px; display: flex">
-        <img src="@/assets/login/8.png" style="width: 320px; height: 322px">
+        <img src="@/assets/login/8.png" style="width: 320px; height: 322px" />
         <div style="position: absolute; top: 20px; left: 30px; width: 500px">
           <div style="display: flex; margin-top: 20px">
-            <img src="@/assets/login/2.png" style="width: 24px; height: 24px">
+            <img src="@/assets/login/2.png" style="width: 24px; height: 24px" />
             <span
               style="
                 font-size: 14px;
@@ -39,10 +40,11 @@
                 line-height: 24px;
                 margin-left: 5px;
               "
-            >{{ $t("login.bgTitle3") }}</span>
+              >{{ $t("login.bgTitle3") }}</span
+            >
           </div>
           <div style="display: flex; margin-top: 20px">
-            <img src="@/assets/login/3.png" style="width: 24px; height: 24px">
+            <img src="@/assets/login/3.png" style="width: 24px; height: 24px" />
             <span
               style="
                 font-size: 14px;
@@ -51,10 +53,11 @@
                 line-height: 24px;
                 margin-left: 5px;
               "
-            >{{ $t("login.bgTitle4") }}</span>
+              >{{ $t("login.bgTitle4") }}</span
+            >
           </div>
           <div style="display: flex; margin-top: 20px">
-            <img src="@/assets/login/4.png" style="width: 24px; height: 24px">
+            <img src="@/assets/login/4.png" style="width: 24px; height: 24px" />
             <span
               style="
                 font-size: 14px;
@@ -63,10 +66,11 @@
                 line-height: 24px;
                 margin-left: 5px;
               "
-            >{{ $t("login.bgTitle5") }}</span>
+              >{{ $t("login.bgTitle5") }}</span
+            >
           </div>
           <div style="display: flex; margin-top: 20px">
-            <img src="@/assets/login/5.png" style="width: 24px; height: 24px">
+            <img src="@/assets/login/5.png" style="width: 24px; height: 24px" />
             <span
               style="
                 font-size: 14px;
@@ -75,10 +79,11 @@
                 line-height: 24px;
                 margin-left: 5px;
               "
-            >{{ $t("login.bgTitle6") }}</span>
+              >{{ $t("login.bgTitle6") }}</span
+            >
           </div>
           <div style="display: flex; margin-top: 20px">
-            <img src="@/assets/login/6.png" style="width: 24px; height: 24px">
+            <img src="@/assets/login/6.png" style="width: 24px; height: 24px" />
             <span
               style="
                 font-size: 14px;
@@ -87,10 +92,11 @@
                 line-height: 24px;
                 margin-left: 5px;
               "
-            >{{ $t("login.bgTitle7") }}</span>
+              >{{ $t("login.bgTitle7") }}</span
+            >
           </div>
           <div style="display: flex; margin-top: 20px">
-            <img src="@/assets/login/7.png" style="width: 24px; height: 24px">
+            <img src="@/assets/login/7.png" style="width: 24px; height: 24px" />
             <span
               style="
                 font-size: 14px;
@@ -99,7 +105,8 @@
                 line-height: 24px;
                 margin-left: 5px;
               "
-            >{{ $t("login.bgTitle8") }}</span>
+              >{{ $t("login.bgTitle8") }}</span
+            >
           </div>
         </div>
       </div>
@@ -110,7 +117,7 @@
           <img
             src="@/assets/setting/user.png"
             style="width: 30px; height: 30px"
-          >
+          />
           <span
             style="
               font-size: 24px;
@@ -119,7 +126,8 @@
               line-height: 34px;
               margin-left: 10px;
             "
-          >{{ $t("login.title") }}</span>
+            >{{ $t("login.title") }}</span
+          >
         </div>
         <div>
           <el-select
@@ -130,7 +138,7 @@
             @change="handleSetLanguage"
           >
             <div slot="prefix" style="padding: 4px">
-              <img src="@/assets/lang.png" style="width: 20px; height: 20px">
+              <img src="@/assets/lang.png" style="width: 20px; height: 20px" />
             </div>
             <el-option
               v-for="item in locale"
@@ -167,7 +175,8 @@
             round
             style="width: 70%"
             @click="toHome"
-          >{{ $t("common.returnIndex") }}</el-button>
+            >{{ $t("common.returnIndex") }}</el-button
+          >
         </div>
         <div style="width: 100%; text-align: center; margin-top: 20px">
           <el-link href="/ucenter/#/registered" style="color: #5ba8dc">{{
@@ -180,49 +189,49 @@
 </template>
 
 <script>
-import UserLogin from './components/userLogin'
-import MobileLogin from './components/mobileLogin'
-import { locale } from '@/api/country'
+import UserLogin from "./components/userLogin";
+import MobileLogin from "./components/mobileLogin";
+import { locale } from "@/api/country";
 
 export default {
-  name: 'Login',
+  name: "Login",
   components: { UserLogin, MobileLogin },
   data() {
     return {
       showDialog: false,
       loading: false,
-      loginType: '1',
+      loginType: "1",
       locale: [],
-      env: ''
-    }
+      env: "",
+    };
   },
   computed: {
     homeUrl() {
-      return process.env.VUE_APP_HOME_API
+      return process.env.VUE_APP_HOME_API;
     },
     language: {
       get() {
-        return this.$store.getters.language
+        return this.$store.getters.language;
       },
       set(val) {
-        this.handleSetLanguage(val)
-      }
-    }
+        this.handleSetLanguage(val);
+      },
+    },
   },
   watch: {
     loginType: {
-      handler: function() {},
-      deep: true
-    }
+      handler: function () {},
+      deep: true,
+    },
   },
   created() {
-    if (process.env.NODE_ENV === 'development') {
-      this.env = '-测试版'
+    if (process.env.NODE_ENV === "development") {
+      this.env = "-测试版";
     }
     // window.addEventListener('storage', this.afterQRScan)
     locale().then((r) => {
-      this.locale = r.data
-    })
+      this.locale = r.data;
+    });
   },
   mounted() {},
   destroyed() {
@@ -230,14 +239,14 @@ export default {
   },
   methods: {
     handleSetLanguage(lang) {
-      this.$i18n.locale = lang
-      this.$store.dispatch('app/setLanguage', lang)
+      this.$i18n.locale = lang;
+      this.$store.dispatch("app/setLanguage", lang);
     },
     toHome() {
-      window.location.href = this.homeUrl
-    }
-  }
-}
+      window.location.href = this.homeUrl;
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>