feat: 修改

src/pages/user/login/login.js

@@ -297,7 +297,7 @@ class Login {
       .getWateWayConfig(gateWayParam)
       .then(res => {
         // eslint-disable-next-line prettier/prettier, no-undef
-        const hasGateWay =!res || !res.data? false: _.isString(res.data)? JSON.parse(res.data): typeof res.data === 'boolean'? res.data: false;
+        const hasGateWay = !res || !res.data ? false : _.isString(res.data) ? JSON.parse(res.data) : typeof res.data === 'boolean' ? res.data : false;
         self.globalConfig.hasGateWay = hasGateWay;
         self.globalConfig.apiGatewayDomain = `${window.location.origin}${hasGateWay ? '/PandaCore/GateWay' : ''}`;
         if (hasGateWay) {
@@ -1199,12 +1199,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(),
       })
@@ -1229,7 +1223,6 @@ class Login {
           self.events.emit('loginError', response.msg);
           message.error(response.msg);
         }
->>>>>>> src/pages/user/login/login.js
       })
       .catch(error => {
         self.hasTry = true;
@@ -1238,6 +1231,7 @@ class Login {
         message.error('登录服务异常');
       });
   }
+
   phoneLoginFormHandler(userPhone, captcha) {
     this.login('', '', userPhone, '', SERVICE_APP_LOGIN_MODE.phone);
   }