Home Explore Help
Sign In
CocoRoboLabs
/
pbl_admin_table
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

update

lsc 2 weeks ago
parent
9befa63939
commit
aff8315285
6 changed files with 46 additions and 41 deletions
Split View Show Diff Stats
  1. 0 0
      dist/css/app.741210fb.css
  2. 1 1
      dist/index.html
  3. 0 0
      dist/js/app.21dbd876.js
  4. 0 0
      dist/js/app.21dbd876.js.map
  5. 43 40
      src/store/modules/user.js
  6. 2 0
      src/views/login/loginPage.vue

File diff suppressed because it is too large
+ 0 - 0
dist/css/app.741210fb.css


+ 1 - 1
dist/index.html
View File 

@@ -36,7 +36,7 @@
 
         width: 100%;
 
         background: #e6eaf0;
 
         font-family: '黑体';
 
-      }</style><script defer="defer" src="/js/chunk-vendors.3da6042e.js"></script><script defer="defer" src="/js/app.9c29b855.js"></script><link href="/css/chunk-vendors.7cfe4581.css" rel="stylesheet"><link href="/css/app.1a58c279.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but pblAdminTable doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html><script>function stopSafari() {
 
+      }</style><script defer="defer" src="/js/chunk-vendors.3da6042e.js"></script><script defer="defer" src="/js/app.21dbd876.js"></script><link href="/css/chunk-vendors.7cfe4581.css" rel="stylesheet"><link href="/css/app.741210fb.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but pblAdminTable doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

File diff suppressed because it is too large
+ 0 - 0
dist/js/app.21dbd876.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/app.21dbd876.js.map


+ 43 - 40
src/store/modules/user.js
View File 

@@ -88,46 +88,49 @@ const mutations = {
 
 const actions = {
 
   login({ commit }) { //, dispatch
 
     return new Promise((resolve, reject) => {
 
-      eduGet()
 
-        .then((response) => {
 
-          console.log(response);
 
-          var _user = response.data[0][0];
 
-          // const allowedIds = [
 
-          //   "0abcb118-9110-11eb-80ad-005056b86db5",
 
-          //   "b7ccc834-aae5-11ea-a8d4-52540005ab01",
 
-          //   "a77e9404-efec-11e9-96f9-028edca3b798",
 
-          //   "0e8d50c3-50b5-2f1c-9f1a-bd346a0bf817",
 
-          //   "5943e08c-b7d4-11ed-8d51-005056b86db5"
 
-          // ];
 
-          // if (allowedIds.includes(_user.userid)) {
 
-            commit("SET_ID", _user.userid);
 
-            commit("SET_TOKEN", _user.userid);
 
-            setToken(_user.userid);
 
-            resolve(_user.userid);
 
-            
-          // } else if(_user.userid){
 
-          //   loginOut()
 
-          //   .then(async () => {
 
-          //     dispatch('user/logout', null, { root: true });
 
-          //   })
 
-          //   .catch(err => {
 
-          //     console.error(err);
 
-          //   });
 
-          //   Message({
 
-          //     message: "该用户ID不允许登录",
 
-          //     type: "error"
 
-          //   });
 
-          //   reject("该用户ID不允许登录");
 
-          // }
 
-        })
 
-        .catch((error) => {
 
-          // var _user = { userid: "6c56ec0e-2c74-11ef-bee5-005056b86db5" };
 
-          // commit("SET_ID", _user.userid);
 
-          // commit("SET_TOKEN", _user.userid);
 
-          // setToken(_user.userid);
 
-          // resolve(_user.userid);
 
-          reject(error);
 
-        });
 
+      let loginType = window.topU.U.UF.Cookie.get("cocoroboLoginType");
 
+      if(loginType != 1){
 
+        eduGet()
 
+          .then((response) => {
 
+            console.log(response);
 
+            var _user = response.data[0][0];
 
+            // const allowedIds = [
 
+            //   "0abcb118-9110-11eb-80ad-005056b86db5",
 
+            //   "b7ccc834-aae5-11ea-a8d4-52540005ab01",
 
+            //   "a77e9404-efec-11e9-96f9-028edca3b798",
 
+            //   "0e8d50c3-50b5-2f1c-9f1a-bd346a0bf817",
 
+            //   "5943e08c-b7d4-11ed-8d51-005056b86db5"
 
+            // ];
 
+            // if (allowedIds.includes(_user.userid)) {
 
+              commit("SET_ID", _user.userid);
 
+              commit("SET_TOKEN", _user.userid);
 
+              setToken(_user.userid);
 
+              resolve(_user.userid);
 
+              
+            // } else if(_user.userid){
 
+            //   loginOut()
 
+            //   .then(async () => {
 
+            //     dispatch('user/logout', null, { root: true });
 
+            //   })
 
+            //   .catch(err => {
 
+            //     console.error(err);
 
+            //   });
 
+            //   Message({
 
+            //     message: "该用户ID不允许登录",
 
+            //     type: "error"
 
+            //   });
 
+            //   reject("该用户ID不允许登录");
 
+            // }
 
+          })
 
+          .catch((error) => {
 
+            // var _user = { userid: "6c56ec0e-2c74-11ef-bee5-005056b86db5" };
 
+            // commit("SET_ID", _user.userid);
 
+            // commit("SET_TOKEN", _user.userid);
 
+            // setToken(_user.userid);
 
+            // resolve(_user.userid);
 
+            reject(error);
 
+          });
 
+        }
 
     });
 
   },
 
   getInfo({ commit, state }) {

+ 2 - 0
src/views/login/loginPage.vue
View File 

@@ -287,6 +287,7 @@ export default {
 
 						if (_data.active === 1) {
 
 							window.localStorage["identity"] = JSON.stringify(_data.identity);
 
 							this.$message.success("登录成功");
 
+							window.topU.U.UF.Cookie.set("cocoroboLoginType=2");
 
 							await this.login();
 
 							this.addOp3('1', "", { type:this.prefixL + "login" }, "success",_data.userid)
 
 							if (
 
@@ -561,6 +562,7 @@ export default {
 
 					if (_data.active === 1) {
 
 						window.localStorage["identity"] = JSON.stringify(_data.identity);
 
 						this.$message.success("登录成功");
 
+						window.topU.U.UF.Cookie.set("cocoroboLoginType=2");
 
 						await this.login();
 
 						this.addOp3('1', "", { type:this.prefixL + "login" }, "success",_data.userid)
 
 						if (

Some files were not shown because too many files changed in this diff