d

esign-admin/app/base/controller/impl/merchant/merchantCtl.js

@@ -27,7 +27,7 @@ class MerchantUserCtl extends CtlBase {
 
 
     async merchantOfInfo(params, pobj2, req) {
     async merchantOfInfo(params, pobj2, req) {
         try {
         try {
-            params.id = params.merchant_id;
+            params.id = params.id || params.merchant_id;
             let res = await this.merchantSve.merchantOfInfo(params);
             let res = await this.merchantSve.merchantOfInfo(params);
             if (res.data) {
             if (res.data) {
                 await this.userSve.setRowsUser([res.data], "bd_id", "bd");
                 await this.userSve.setRowsUser([res.data], "bd_id", "bd");

esign-admin/app/base/system.js

@@ -188,20 +188,20 @@ class System {
 			let dev = "http://39.107.234.14";
 			let dev = "http://39.107.234.14";
 			return {
 			return {
 				// 产品引擎
 				// 产品引擎
-				engine_product: local + ":3571" + path,
+				engine_product: dev + ":3571" + path,
 				// 计费引擎
 				// 计费引擎
-				engine_fee: local + ":3572" + path,
+				engine_fee: dev + ":3572" + path,
 				// 认证引擎
 				// 认证引擎
-				engine_auth: local + ":3573" + path,
+				engine_auth: dev + ":3573" + path,
 				// 签约引擎
 				// 签约引擎
-				engine_sign: local + ":3574" + path,
+				engine_sign: dev + ":3574" + path,
 
 
 				// 用户服务
 				// 用户服务
 				sve_uc: dev + ":3651" + path,
 				sve_uc: dev + ":3651" + path,
 				// 商户服务
 				// 商户服务
 				sve_merchant: dev + ":3652" + path,
 				sve_merchant: dev + ":3652" + path,
 				// 订单服务
 				// 订单服务
-				sve_order: local + ":3653" + path,
+				sve_order: dev + ":3653" + path,
 			}
 			}
 		} else {
 		} else {
 			return {
 			return {