fix: 处理冲突

src/pages/user/login/login.js

@@ -74,13 +74,8 @@ class Login {
 
   gztransformLoginHander(response, isRememberPWD, pwd) {
     const self = this;
-    const token =
-      response &&
-      (response.token
-        ? response.token
-        : response.access_token !== null && response.user_token !== null
-          ? response.user_token
-          : '');
+    // eslint-disable-next-line prettier/prettier
+    const token = response && (response.token ? response.token : response.access_token !== null && response.user_token !== null ? response.user_token : '');
     if (token) {
       const exp = 86400000;
       self.globalConfig.token = token;
@@ -247,7 +242,7 @@ class Login {
               ? this.globalConfig.userInfo.fullName
               : '',
         })
-        .catch(error => { });
+        .catch(error => {});
     }
 
     if (window.location.host === 'panda-water.com') {
@@ -261,7 +256,7 @@ class Login {
               ? this.globalConfig.userInfo.fullName
               : '',
         })
-        .catch(error => { });
+        .catch(error => {});
     }
   }
 
@@ -274,13 +269,14 @@ class Login {
         }
       });
     }
+    // eslint-disable-next-line prettier/prettier
     if (!flag && this.isSignIn && this.globalConfig.userInfo.Industries.length && this.globalConfig.userInfo.Industries.length > 1) {
       this.createContext(this);
       this.updateConfig && this.updateConfig(this.globalConfig);
       this.history.push('/industry');
       return false;
     }
-    //跳转到集成登录引导页_xule_2023-08-28
+    // 跳转到集成登录引导页_xule_2023-08-28
     if (!flag && this.isSignIn && this.globalConfig.isIntegration >= 1) {
       this.history.push('/industry');
       return false;
@@ -390,7 +386,8 @@ class Login {
               mqttConfig.mqtt_mess.TcpPort = DEFAULT_TCP_PORT;
               mqttConfig.mqtt_IsSSL = `${mqttConfig.mqtt_mess.TcpIP}:${mqttConfig.mqtt_mess.TcpPort}`;
             }
-            mqttConfig.mqtt_iotIP = `${mqttConfig.mqtt_mess.TcpIP}:${mqttConfig.mqtt_mess.TcpPort ? mqttConfig.mqtt_mess.TcpPort : '443'
+            mqttConfig.mqtt_iotIP = `${mqttConfig.mqtt_mess.TcpIP}:${
+              mqttConfig.mqtt_mess.TcpPort ? mqttConfig.mqtt_mess.TcpPort : '443'
             }`;
 
             self.globalConfig = Object.assign(self.globalConfig, {
@@ -737,7 +734,7 @@ class Login {
       height: '400',
     });
 
-    const handleMessage = function (event) {
+    const handleMessage = function(event) {
       const { origin } = event;
       // Logger.log('origin', event.origin);
       if (origin === 'https://login.dingtalk.com') {
@@ -1194,12 +1191,6 @@ class Login {
       .getJiangXiManage({
         username: usr,
         password: btoa(pwd),
-<<<<<<< src/pages/user/login/login.js
-        'request.preventCache': Date.now(),
-      })
-      .then(response => {
-        self.transformLoginHander({ token: response.data.user_token }, isRememberPWD, pwd);
-=======
         IsGateWay: window.globalConfig.hasGateWay,
         'request.preventCache': Date.now(),
       })
@@ -1224,7 +1215,6 @@ class Login {
           self.events.emit('loginError', response.msg);
           message.error(response.msg);
         }
->>>>>>> src/pages/user/login/login.js
       })
       .catch(error => {
         self.hasTry = true;