cloud-web-corejs 1.0.146 → 1.0.148

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.146",
+  "version": "1.0.148",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/lang/index.js

@@ -1,51 +1,56 @@
-import Vue from 'vue'
-import VueI18n from 'vue-i18n'
-
-import enLocale from 'element-ui/lib/locale/lang/en'
-import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
-import zhCN_vxe from 'vxe-table/lib/locale/lang/zh-CN'
-import enUS_vxe from 'vxe-table/lib/locale/lang/en-US'
-import VXETable from 'vxe-table'
-import ElementLocale from 'element-ui/lib/locale'
-import settingConfig from "@/settings";
-
-Vue.use(VueI18n);
-
-const messages = {
-  en: {
-    ...enLocale,
-    ...enUS_vxe
-  },
-  zh: {
-    ...zhLocale,
-    ...zhCN_vxe
-  }
-};
-
-/*const enLocaleMine = require.context('@/lang/locale/en', false, /\w+\.js/);
-const zhLocaleMine = require.context('@/lang/locale/zh', false, /\w+\.js/);
-
-zhLocaleMine.keys().map(fileName => {
-  let comp = zhLocaleMine(fileName).default;
-  Object.assign(messages["zh"], comp);
-});
-enLocaleMine.keys().map(fileName => {
-  let comp = enLocaleMine(fileName).default;
-  Object.assign(messages["en"], comp);
-});*/
-
-// Create VueI18n instance with options
-let i18nLang = localStorage.getItem("i18n-lang");
-const i18n = new VueI18n({
-  locale: i18nLang || settingConfig.languageCode || 'zh', // set locale
-  messages, // set locale messages
-});
-
-ElementLocale.i18n((key, value) => i18n.t(key, value));
-
-VXETable.setup({
-  // 对组件内置的提示语进行国际化翻译
-  i18n: (key, args) => i18n.t(key, args)
-});
-
-export default i18n;
+import Vue from 'vue'
+import VueI18n from 'vue-i18n'
+
+import enLocale from 'element-ui/lib/locale/lang/en'
+import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
+import zhCN_vxe from 'vxe-table/lib/locale/lang/zh-CN'
+import enUS_vxe from 'vxe-table/lib/locale/lang/en-US'
+import VXETable from 'vxe-table'
+import ElementLocale from 'element-ui/lib/locale'
+import settingConfig from "@/settings";
+
+import enLogin from "./locale/en/login.js"
+import zhLogin from "./locale/zh/login.js"
+
+Vue.use(VueI18n);
+
+const messages = {
+  en: {
+    ...enLocale,
+    ...enUS_vxe,
+    ...enLogin
+  },
+  zh: {
+    ...zhLocale,
+    ...zhCN_vxe,
+    ...zhLogin
+  }
+};
+
+/*const enLocaleMine = require.context('@/lang/locale/en', false, /\w+\.js/);
+const zhLocaleMine = require.context('@/lang/locale/zh', false, /\w+\.js/);
+
+zhLocaleMine.keys().map(fileName => {
+  let comp = zhLocaleMine(fileName).default;
+  Object.assign(messages["zh"], comp);
+});
+enLocaleMine.keys().map(fileName => {
+  let comp = enLocaleMine(fileName).default;
+  Object.assign(messages["en"], comp);
+});*/
+
+// Create VueI18n instance with options
+let i18nLang = localStorage.getItem("i18n-lang");
+const i18n = new VueI18n({
+  locale: i18nLang || settingConfig.languageCode || 'zh', // set locale
+  messages, // set locale messages
+});
+
+ElementLocale.i18n((key, value) => i18n.t(key, value));
+
+VXETable.setup({
+  // 对组件内置的提示语进行国际化翻译
+  i18n: (key, args) => i18n.t(key, args)
+});
+
+export default i18n;

package/src/views/user/login/default.vue

@@ -1,24 +1,49 @@
 <template>
-  <div class="login-container" :class="backgroundClass" ref="login-container" v-show="showContent">
-    <div class="login-main" style="height: auto;">
-      <el-tabs v-model="activeName">
-        <el-tab-pane label="账号登录" name="first">
-          <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="box-form login" autocomplete="on"
-                   label-position="left">
+  <div
+    class="login-container"
+    :class="backgroundClass"
+    ref="login-container"
+    v-show="showContent"
+  >
+    <div class="login-main" style="height: auto">
+      <el-tabs v-model="activeName" @tab-click="changeTab">
+        <el-tab-pane :label="$t1('账号登录')" name="first">
+          <el-form
+            ref="loginForm"
+            :model="loginForm"
+            :rules="loginRules"
+            class="box-form login"
+            autocomplete="on"
+            label-position="left"
+          >
             <el-form-item prop="username" class="txt">
-              <span class="svg-container"><i class="el-icon-user"/></span>
-              <el-input ref="username" v-model="loginForm.username" placeholder="请输入用户名" name="" type="text"
-                        tabindex="1" autocomplete="on" @keyup.enter.native="handleLogin"/>
+              <span class="svg-container"><i class="el-icon-user" /></span>
+              <el-input
+                ref="username"
+                v-model="loginForm.username"
+                :placeholder="$t1('请输入用户名')"
+                name=""
+                type="text"
+                tabindex="1"
+                autocomplete="on"
+                @keyup.enter.native="handleLogin"
+              />
             </el-form-item>
-            <el-tooltip :enterable="false" v-model="capsTooltip" content="Caps lock is On" placement="right" manual>
+            <el-tooltip
+              :enterable="false"
+              v-model="capsTooltip"
+              content="Caps lock is On"
+              placement="right"
+              manual
+            >
               <el-form-item prop="password" class="txt">
-                <span class="svg-container"><i class="el-icon-lock"/></span>
+                <span class="svg-container"><i class="el-icon-lock" /></span>
                 <el-input
                   :key="passwordType"
                   ref="password"
                   v-model="loginForm.password"
                   :type="passwordType"
-                  placeholder="请输入密码"
+                  :placeholder="$t1('请输入密码')"
                   name=""
                   tabindex="2"
                   autocomplete="on"
@@ -27,41 +52,101 @@
                   @blur="capsTooltip = false"
                   @keyup.enter.native="handleLogin"
                 />
-                <span class="show-pwd" @click="showPwd"><svg-icon
-                  :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'"/></span>
+                <span class="show-pwd" @click="showPwd"
+                  ><svg-icon
+                    :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'"
+                /></span>
               </el-form-item>
             </el-tooltip>
             <div class="">
-              <el-checkbox v-model="isRememberPassword">记住密码</el-checkbox>
+              <el-checkbox v-model="isRememberPassword">{{
+                $t1("记住密码")
+              }}</el-checkbox>
             </div>
-            <el-button :loading="loading" type="primary" @click.prevent.stop="handleLogin" class="btn">登录</el-button>
+            <el-button
+              :loading="loading"
+              type="primary"
+              @click.prevent.stop="handleLogin"
+              class="btn"
+              >{{ $t1("登录") }}</el-button
+            >
           </el-form>
         </el-tab-pane>
-        <el-tab-pane label="手机验证码登录" name="second">
-          <el-form ref="loginForm" :model="loginForm2" :rules="loginRules" class="box-form login" autocomplete="on"
-                   label-position="left">
-            <el-form-item prop="username" class="txt" style="width:66%">
-              <span class="svg-container"><i class="el-icon-mobile-phone"/></span>
-              <el-input ref="mobile" v-model="loginForm2.username" placeholder="请输入手机号" name="" type="text"
-                        tabindex="1" autocomplete="on" @keyup.enter.native="handleLogin"/>
+        <el-tab-pane
+          :label="$t1('手机登录')"
+          name="second"
+          v-if="settingConfig.mobileLoginEnabled"
+        >
+          <el-form
+            ref="loginForm"
+            :model="loginForm2"
+            :rules="loginRules"
+            class="box-form login"
+            autocomplete="on"
+            label-position="left"
+          >
+            <el-form-item prop="username" class="txt" style="width: 66%">
+              <span class="svg-container"><i class="el-icon-mobile-phone" /></span>
+              <el-input
+                ref="mobile"
+                v-model="loginForm2.username"
+                :placeholder="$t1('请输入手机号')"
+                name=""
+                type="text"
+                tabindex="1"
+                autocomplete="on"
+                @keyup.enter.native="handleLogin"
+              />
             </el-form-item>
-            <el-button class="btn-send" type="success" :class="{'gray-btn':isCounting}" @click="sendCode">
+            <el-button
+              class="btn-send"
+              type="success"
+              :class="{ 'gray-btn': isCounting }"
+              @click="sendCode"
+            >
               {{ buttonText }}
             </el-button>
             <el-form-item prop="smsCode" class="txt">
-              <span class="svg-container"><i class="el-icon-message"/></span>
-              <el-input ref="smsCode" v-model="loginForm2.smsCode" placeholder="请输入验证码" name="" type="text"
-                        tabindex="1" autocomplete="on" @keyup.enter.native="handleLogin"/>
+              <span class="svg-container"><i class="el-icon-message" /></span>
+              <el-input
+                ref="smsCode"
+                v-model="loginForm2.smsCode"
+                :placeholder="$t1('请输入验证码')"
+                name=""
+                type="text"
+                tabindex="1"
+                autocomplete="on"
+                @keyup.enter.native="handleLogin"
+              />
             </el-form-item>
-            <el-button :loading="loading" type="primary" @click.prevent.stop="handleLogin" class="btn">登录</el-button>
+            <el-button
+              :loading="loading"
+              type="primary"
+              @click.prevent.stop="handleLogin"
+              class="btn"
+              >{{ $t1("登录") }}</el-button
+            >
           </el-form>
         </el-tab-pane>
+        <el-tab-pane
+          :label="$t1('扫码登录')"
+          name="third"
+          v-if="settingConfig.qrLoginEnabled"
+        >
+          <div class="login-qr">
+            <img class="qr__img" :src="qrBase64" v-if="activeName === 'third'" />
+            <span class="qr__txt">{{ $t1("扫一扫，登录系统") }}</span>
+            <div v-if="qrExpired" @click="initQR" class="qr__lose">
+              <span><i class="el-icon-refresh"></i>{{ $t1("二维码失效") }}</span>
+            </div>
+          </div>
+        </el-tab-pane>
       </el-tabs>
     </div>
     <div class="tc copyright">
       <slot name="footer">
-        © 广州同望科技发展有限公司
-        <span style="margin-left:50px;">4000646100</span>
+        © {{ $t1("广州同望科技发展有限公司") }}
+        <span style="margin-left: 50px">4000646100</span>
       </slot>
     </div>
   </div>
@@ -71,12 +156,12 @@
 import mixin from "./indexMixin";
 
 export default {
-  name: 'Login',
-  mixins: [mixin]
-}
+  name: "Login",
+  mixins: [mixin],
+};
 </script>
 <style lang="scss" scoped>
-@import '@/resources/css/login.scss';
+@import "@/resources/css/login.scss";
 
 .login-container.tc {
   background: url(~@/resources/images/bg-login5.jpg) center center/cover no-repeat;
@@ -94,7 +179,9 @@ export default {
   right: 5px;
   top: 25px;
 }
-
+.box-form {
+  height: 330px;
+}
 ::v-deep .login-main .el-tabs__header {
   margin-bottom: 0;
 
@@ -128,4 +215,44 @@ export default {
     color: #8a8686;
   }
 }
+
+::v-deep .login-main .el-tabs__header .el-tabs__nav .el-tabs__item {
+  width: 33%;
+}
+.login-qr {
+  height: 330px;
+  text-align: center;
+  position: relative;
+  .qr__img {
+    width: 220px;
+    margin-top: 40px;
+  }
+  .qr__txt {
+    color: #666;
+    font-size: 15px;
+    display: block;
+  }
+  .qr__lose {
+    position: absolute;
+    cursor: pointer;
+    width: 192px;
+    height: 192px;
+    background: rgb(255 255 255 / 76%);
+    top: 60px;
+    left: 136px;
+    color: #000;
+    line-height: 64px;
+    font-weight: 600;
+    font-size: 26px;
+    span {
+      line-height: 1;
+      margin-top: 30px;
+    }
+    i {
+      display: block;
+      font-size: 42px;
+      margin-top: 46px;
+    }
+  }
+}
 </style>

package/src/views/user/login/indexMixin.js

@@ -1,5 +1,6 @@
 import {encode} from "js-base64";
 import settingConfig from "@/settings";
+import QRcode from "qrcode";
 
 function getUrlParams(url) {
   let result = {};
@@ -13,12 +14,16 @@ function getUrlParams(url) {
 
 export default {
   name: 'Login',
+  props:{
+    lang: [String,Function]
+  },
   components: {},
   data() {
     return {
       isCounting: false,
       countdown: 0,
-      buttonText: '获取验证码',
+      buttonText: this.$t1('获取验证码'),
+      smsTimer: null,
       isRememberPassword: false,
       loginForm: {
         username: '',
@@ -54,7 +59,15 @@ export default {
       },
       activeName: "first",
       searchParam: {},
-      showContent: true
+      showContent: true,
+
+      qrTimer1: null,
+      qrTimer2: null,
+      qrContent: null,
+      qrCodeFlag: 0,
+      qrBase64: "",
+      settingConfig: settingConfig,
+      qrExpired: false
     };
   },
   watch: {
@@ -69,6 +82,10 @@ export default {
       immediate: true
     }
   },
+  beforeDestroy() {
+    this.clearQrLoginTimer();
+    this.clearSmsTimer();
+  },
   created() {
     this.init();
   },
@@ -84,7 +101,22 @@ export default {
     window.removeEventListener('keydown', this.keyDown, false);
   },
   methods: {
+    initLang(){
+      let lang = this.$route.query.lang;
+      if(!lang && !!this.lang){
+        if(typeof this.lang === "function"){
+          lang = this.lang();
+        }else{
+          lang = this.lang;
+        }
+      }
+      if(lang){
+        this.$i18n.locale = lang;
+        localStorage.setItem("i18n-lang", lang);
+      }
+    },
     init() {
+      this.initLang();
       let searchParam = getUrlParams(location.search);
       this.searchParam = searchParam;
       //小熊SSO返回判断--目前因为小熊单点返回ticket有问题要特殊处理
@@ -110,6 +142,7 @@ export default {
       if (e.keyCode == 13 && e.target.nodeName != 'INPUT') {
         let closeBtn = document.querySelector('.el-dialog__close');
         closeBtn && closeBtn.click();
+        if (this.activeName == "third") return
         this.handleLogin();
       }
     },
@@ -140,7 +173,7 @@ export default {
         let username = this.loginForm2.username;
         let smsCode = this.loginForm2.smsCode;
         if (!username || !smsCode) {
-          this.$baseAlert("请输入手机号和验证码");
+          this.$baseAlert(this.$t1('请输入手机号和验证码'));
           return;
         }
         loadingObj = this.$baseLoading();
@@ -325,6 +358,7 @@ export default {
         this.$baseAlert("请输入手机号");
         return
       }
+
       this.$http({
         url: USER_PREFIX + '/auth/sendSmsCode',
         method: `post`,
@@ -338,20 +372,27 @@ export default {
           });
           this.isCounting = true
           this.countdown = 60
-          this.buttonText = '60秒后重新获取'
-          const times = setInterval(() => {
+          this.buttonText = this.$t1('60秒后重新获取')
+          this.clearSmsTimer();
+          this.smsTimer = setInterval(() => {
             this.countdown--;
-            this.buttonText = this.countdown + '秒后重新获取'
+            this.buttonText = this.$t1('{time}秒后重新获取',{time:this.countdown})
             if (this.countdown == 0) {
-              clearInterval(times);
+              this.clearSmsTimer();
               this.isCounting = false
-              this.buttonText = '获取验证码'
+              this.buttonText = this.$t1('获取验证码')
             }
           }, 1000)
         }
       });
 
     },
+    clearSmsTimer() {
+      if (this.smsTimer) {
+        clearInterval(this.smsTimer);
+        this.smsTimer = null;
+      }
+    },
     mobileLogin() {
 
     },
@@ -420,6 +461,97 @@ export default {
             });
           }
         });
+    },
+
+    /**二维码登录begin*/
+    guid() {
+      return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function (t) {
+        var e = 16 * Math.random() | 0;
+        return ("x" == t ? e : 3 & e | 8).toString(16);
+      });
+    },
+    initQR() {
+      this.clearQrLoginTimer();
+      this.qrExpired = true;
+      let option = {width: 300, height: 300};
+      this.qrContent = this.guid();
+      this.createQR(this.qrContent, option).then(url => {
+        this.qrExpired = false;
+        this.qrBase64 = url
+        this.createQrLoginTimer();
+      })
+    },
+    // 生成二维码
+    createQR(content, options) {
+      return new Promise((resolve, reject) => {
+        QRcode.toDataURL(content, options).then(url => {
+          resolve(url)
+        })
+      })
+    },
+    changeTab() {
+      // this.initQR();
+      // return
+      if (this.activeName == "third") {
+        this.initQR();
+      } else {
+        this.clearQrLoginTimer();
+      }
+    },
+    clearQrLoginTimer() {
+      if (this.qrTimer1) {
+        clearTimeout(this.qrTimer1)
+        this.qrTimer1 = null;
+      }
+      if (this.qrTimer2) {
+        clearTimeout(this.qrTimer2)
+        this.qrTimer2 = null;
+      }
+    },
+    createQrLoginTimer() {
+      this.checkQrLoginTimerHanlde()
+      this.qrTimer2 = setTimeout(() => {
+        this.qrExpired = true;
+        this.clearQrLoginTimer();
+      }, 60000)
+    },
+    checkQrLoginTimerHanlde() {
+      this.qrTimer1 = setTimeout(() => {
+        this.checkQrLoginStatusHanlde();
+      }, 3000)
+    },
+    checkQrLoginStatusHanlde() {
+      if (this.qrExpired) {
+        return
+      }
+      this.$http({
+        url: USER_PREFIX + '/auth/login',
+        method: `post`,
+        data: {as: this.qrContent},
+        // isLoading: true,
+        failMsg: false,
+        success: res => {
+          let token = res.objx;
+          if (token) {
+            this.$message({
+              message: this.$t1('登录成功'),
+              type: 'success'
+            });
+            this.clearQrLoginTimer();
+            this.$store.dispatch('user/addToken', {token}).then(res => {
+              localStorage.removeItem('currentMenuId');
+              this.rememberPassword();
+              this.loading = false;
+              window.removeEventListener('keydown', this.keyDown, false);
+              this.handleRedirectUrl();
+            });
+          } else {
+            this.checkQrLoginTimerHanlde();
+          }
+        }
+      });
     }
+    /**二维码登录end*/
+
   }
 }