system-clients 3.2.41 → 3.2.42

package/examples/LoginPage/main.js

@@ -1,15 +1,15 @@
-import Vue from 'vue'
-import App from './App'
-import all from 'vue-client/src/all'
-
-all()
-require('../../src/styles/less/bootstrap.less');
-
-Vue.component('login-page', (resolve) => { require(['../../src/components/server/LoginPage'], resolve) })
-Vue.component('login-view', (resolve) => { require(['../../src/components/server/LoginView'], resolve) })
-
-/* eslint-disable no-new */
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import App from './App'
+import all from 'vue-client/src/all'
+
+all()
+require('../../src/styles/less/bootstrap.less');
+
+Vue.component('login-page', (resolve) => { require(['../../src/components/server/LoginPage'], resolve) })
+Vue.component('login-view', (resolve) => { require(['../../src/components/server/LoginView'], resolve) })
+
+/* eslint-disable no-new */
+new Vue({
+  el: 'body',
+  components: { App }
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-clients",
-  "version": "3.2.41",
+  "version": "3.2.42",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {

package/src/filiale/furuike/Login.vue

@@ -1,5 +1,8 @@
 <template>
-  <div class="syslogin" v-if="showlogin">
+  <div class="ssoLoadingMain" v-show="!showlogin && isSso">
+    <img class="ssoLoadingImg" src="../../../static/newStyle/login-do.gif">
+  </div>
+  <div class="syslogin" v-show="showlogin">
     <img style="position: fixed; left: 50px; top: 50px; height: 70px" src="../../../static/furuike/logo2.jpg">
     <div class="login-title" >
       <div class="row auto">
@@ -247,6 +250,7 @@ export default {
   title: '登录',
   async ready () {
     if (window.location.href.includes('ticket')) {
+      this.isSso = true
       this.showlogin = false
       let url = window.location.href.split("?")[1]
       let obj = {}
@@ -261,6 +265,7 @@ export default {
       this.$resetpost('/sso/logic/serviceValidate', params,{resolveMsg: null, rejectMsg: null}).then((re) => {
         // this.$showMessage("re----" + JSON.stringify(re))
         if (re.data.code === 200) {
+          this.showlogin = false
           let condition = `ename = '${re.data.data.userName}'`
           this.$resetpost('rs/sql/singleTable', {data: { items: '*', tablename: 't_user', condition: condition}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
             if (res.data && res.data.length > 0) {
@@ -271,7 +276,10 @@ export default {
               return co(gen)
             }
           })
+        } else {
+          this.showlogin = true
         }
+        this.isSso = false
       })
     } else {
       this.titleShow = this.$appdata.getSingleValue('关于我们')
@@ -338,6 +346,7 @@ export default {
         serviceKey: '5d83a22dd2824234b1580ede32530e99'
       },
       showlogin: true,
+      isSso: false,
       titleShow: true, //标题显示
       otherLogin:false,
       login: false,
@@ -531,6 +540,7 @@ export default {
 
     async depPromptConfirm () {
       this.depPromptShow = false
+      this.showlogin = false
       return this.$goto('home-page', {functions: this.$login.f,config: this.config})
     },
 
@@ -555,4 +565,12 @@ export default {
 </script>
 
 <style>
+.ssoLoadingMain .ssoLoadingImg {
+  position: absolute;
+  top:0;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  margin: auto;
+}
 </style>