Merge branch 'feature' into 'dev'

注册跳转

See merge request !19

src/views/login/index.vue

 <template>
   <div style="width: 100%; height: 100%; position: relative">
     <div style="height: 100%; width: 55%; position: relative">
-      <img src="@/assets/login/login.png" style="width: 100%; height: 100%" />
+      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,11 +12,10 @@
             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;
@@ -25,14 +24,13 @@
             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;
@@ -41,11 +39,10 @@
                 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;
@@ -54,11 +51,10 @@
                 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;
@@ -67,11 +63,10 @@
                 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;
@@ -80,11 +75,10 @@
                 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;
@@ -93,11 +87,10 @@
                 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;
@@ -106,8 +99,7 @@
                 line-height: 24px;
                 margin-left: 5px;
               "
-              >{{ $t("login.bgTitle8") }}</span
-            >
+            >{{ $t("login.bgTitle8") }}</span>
           </div>
         </div>
       </div>
@@ -118,7 +110,7 @@
           <img
             src="@/assets/setting/user.png"
             style="width: 30px; height: 30px"
-          />
+          >
           <span
             style="
               font-size: 24px;
@@ -127,8 +119,7 @@
               line-height: 34px;
               margin-left: 10px;
             "
-            >{{ $t("login.title") }}</span
-          >
+          >{{ $t("login.title") }}</span>
         </div>
         <div>
           <el-select
@@ -139,7 +130,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"
@@ -176,8 +167,7 @@
             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">{{
@@ -190,49 +180,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() {
@@ -240,14 +230,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>