修改登录埋点

src/mixins/mixin.js

@@ -5,12 +5,23 @@ export const myMixin = {
     ...mapGetters(['userinfo']),
     roleUser(){
       return Object.keys(this.userinfo).length != 0 ? this.userinfo : this.userJson
+    },
+    prefixL(){
+        let liyuan = window.location.href.includes("liyuan")
+        let liyuan2 = window.location.href.includes("lyxx")
+        let newArr = ''
+        if (liyuan || liyuan2) {
+          newArr = "liyuan_"
+        }else{
+          newArr = "admin_"
+        }
+        return newArr
     }
   },
   data() {
     return {
         userJson: {},
-        prefixL: window.location.href.includes("/liyuan") ? "liyuan_" : "admin_"
+        // prefixL: window.location.href.includes("liyuan") ? "liyuan_" : "admin_"
     };
   },
   methods: {
@@ -43,10 +54,11 @@ export const myMixin = {
       }
     },
     async addOp3(userTime, loadTime, object, status,account) {
-      if (!this.roleUser.userid) return
+      console.log('this.roleUser.userid',this.roleUser.userid,account);
+      if (!this.roleUser.userid && !account) return
 
       try {
-        if(!this.roleUser || !this.roleUser.accountNumber){
+        if(!this.roleUser.userid || !this.roleUser.accountNumber){
             let res = await this.$ajax.get('https://pbl.cocorobo.cn/api/pbl/selectUser', {
               userid: account
             });

src/store/modules/user.js

@@ -173,7 +173,7 @@ const actions = {
           oid: state.userinfo.organizeid, //学校id
         }];
 
-      console.log('params',params);
+      // console.log('params',params);
       // 获取学校权限与组织权限,优先使用学校权限,其次使用组织权限
       // 第一步
       let res = await axios.post(API_CONFIG.baseUrl, params)
@@ -304,7 +304,7 @@ const actions = {
 			});
 
       commit('SET_FROM', perData)
-      console.log('state.fromL',state.fromL);
+      // console.log('state.fromL',state.fromL);
   },
   async logout({ commit }) {
     return new Promise((resolve) => {

src/views/login/loginPage.vue

@@ -351,7 +351,8 @@ export default {
 				};
 				this.loading = true;
 				axios.defaults.withCredentials = true;
-				console.log("👇");
+				console.log("👇",this.prefixL);
+				// this.addOp3('1', "", { type:this.prefixL + "login" }, "success",'0c3735c9-a2ef-11ef-9b30-005056b86db5')
 				axios
 					.post("https://beta.api.cocorobo.cn/api/user", qs.stringify(params))
 					.then(async (res) => {
@@ -365,7 +366,6 @@ export default {
 							window.topU.U.UF.Cookie.set("cocoroboLoginType=2");
 							window.topU ? window.topU.US.userInfo = _data : window.top.US.userInfo = _data
 							await this.login();
-							this.addOp3('1', "", { type:this.prefixL + "login" }, "success",_data.userid)
 							if (
 								userjson.data[0][0].type == 1 &&
 								userjson.data[0][0].role == 1 &&
@@ -376,6 +376,7 @@ export default {
 							} else {
 								this.$router.push({ path: this.redirect || "/" });
 							}
+							this.addOp3('1', "", { type:this.prefixL + "login" }, "success",_data.userid)
 						} else {
 							this.$message.error("登录失败");
 						}
@@ -510,7 +511,7 @@ export default {
 							
 							// liyuan走这里
 							if(this.allowOrgList.findIndex((i) => i.area) != -1){
-								console.log('1111');
+								// console.log('1111');
 								try {
 									let _index = this.allowOrgList.findIndex((i) => i.area);
 									let _list = this.allowOrgList[_index].list;
@@ -521,13 +522,13 @@ export default {
 								}
 							}else{
 								// admin走这里
-								console.log('2222');
+								// console.log('2222');
 
 								let mergedList = this.allowOrgList.reduce((acc, curr) => {
 									return [...acc, ...curr.list];
 								}, []);
-								console.log('mergedList',mergedList);
-								console.log('mergedList2',this.OrgOptions.filter(i=>!mergedList.includes(i.id)).length);
+								// console.log('mergedList',mergedList);
+								// console.log('mergedList2',this.OrgOptions.filter(i=>!mergedList.includes(i.id)).length);
 								
 								if(this.OrgOptions.filter(i=>!mergedList.includes(i.id)).length==1) return this.$message.error("账号不可登录，请使用您的专属网址");
 								this.$message.error("该账号须使用“组织号登陆”");
@@ -665,7 +666,6 @@ export default {
 						window.topU.U.UF.Cookie.set("cocoroboLoginType=2");
 						window.topU ? window.topU.US.userInfo = _data : window.top.US.userInfo = _data
 						await this.login();
-						this.addOp3('1', "", { type:this.prefixL + "login" }, "success",_data.userid)
 						if (
 							userjson.data[0][0].type == 1 &&
 							userjson.data[0][0].role == 1 &&
@@ -676,6 +676,7 @@ export default {
 						} else {
 							this.$router.push({ path: this.redirect || "/" });
 						}
+						this.addOp3('1', "", { type:this.prefixL + "login" }, "success",_data.userid)
 					} else {
 						this.$message.error("登录失败");
 					}