dg

xgg-deliver/app/base/controller/impl/uc/userCtl.js

@@ -20,18 +20,7 @@ class UserCtl extends CtlBase {
   async login(pobj, pobj2, req, res) {
   async login(pobj, pobj2, req, res) {
     var loginName = this.trim(pobj.loginName);
     var loginName = this.trim(pobj.loginName);
     var password = this.trim(pobj.password);
     var password = this.trim(pobj.password);
-    // var captchaKey = this.trim(pobj.captchaKey);
-    // var captchaCode = this.trim(pobj.captchaCode);
-
     try {
     try {
-      // var vrs = await this.captchaSve.valid({
-      //   key: captchaKey,
-      //   code: captchaCode,
-      // });
-      // if (vrs.status !== 0) {
-      //   return vrs;
-      // }
-
       var loginUser = await this.deliverSve.login({
       var loginUser = await this.deliverSve.login({
         ucname: loginName,
         ucname: loginName,
         password: password,
         password: password,
@@ -39,7 +28,6 @@ class UserCtl extends CtlBase {
       if (loginUser.status != 0) {
       if (loginUser.status != 0) {
         return loginUser;
         return loginUser;
       }
       }
-
       loginUser = loginUser.data;
       loginUser = loginUser.data;
       var loginKey = await this.setLogin(loginUser);
       var loginKey = await this.setLogin(loginUser);
       let ntapi = settings.ntapi();
       let ntapi = settings.ntapi();
@@ -55,6 +43,7 @@ class UserCtl extends CtlBase {
         taxLoginUrl: ntapi.taxLoginUrl + `?username=${loginUser.ucname}&cookieId=${subsid}&target=tax&baseurl=${loginBaseUrl}`,
         taxLoginUrl: ntapi.taxLoginUrl + `?username=${loginUser.ucname}&cookieId=${subsid}&target=tax&baseurl=${loginBaseUrl}`,
         finLoginUrl: ntapi.taxLoginUrl + `?username=${loginUser.ucname}&cookieId=${subsid}&baseurl=${loginBaseUrl}`,
         finLoginUrl: ntapi.taxLoginUrl + `?username=${loginUser.ucname}&cookieId=${subsid}&baseurl=${loginBaseUrl}`,
         loginname: loginUser.ucname,
         loginname: loginUser.ucname,
+        deliver_name:loginUser.deliver.name,
         auth: loginUser.auth,
         auth: loginUser.auth,
         isManager: loginUser.isManager,
         isManager: loginUser.isManager,
         menus: {gtArr: this.getOrderMenu(loginUser), pjArr: this.getInvoiceMenu(loginUser)},
         menus: {gtArr: this.getOrderMenu(loginUser), pjArr: this.getInvoiceMenu(loginUser)},

xgg-deliver/app/base/system.js

@@ -186,7 +186,7 @@ class System {
 			var wangkun = "http://192.168.201.149"
 			var wangkun = "http://192.168.201.149"
 			return {
 			return {
 				// 公共服务
 				// 公共服务
-				common: domain + ":3102" + path,
+				common: domain2 + ":3102" + path,
 				// common: "http://127.0.0.1:3102" + path,
 				// common: "http://127.0.0.1:3102" + path,
 				// common:wangkun+":3102"+ path,
 				// common:wangkun+":3102"+ path,