dd

xgg-saas-merchant/app/base/api/impl/h5/merchantApi.js

@@ -75,9 +75,9 @@ class TestAPI extends APIBase {
             if (vcode != noteCode) {
             if (vcode != noteCode) {
                 return this.returnFail("短信验证码错误，请重新填写");
                 return this.returnFail("短信验证码错误，请重新填写");
             }
             }
-
             let openID = "gtbh5_" + obj.mobile;
             let openID = "gtbh5_" + obj.mobile;
-            let merchant_id = system.decryption(obj.merchant_id);
+
+            let merchant_id = system.decryption(decodeURIComponent(obj.merchant_id));
             let params = {
             let params = {
                 saas_merchant_id: merchant_id,
                 saas_merchant_id: merchant_id,
                 saas_id: null,
                 saas_id: null,
@@ -103,7 +103,7 @@ class TestAPI extends APIBase {
     //验证登录
     //验证登录
     async loginUser(obj) {
     async loginUser(obj) {
         // let merchant_id = decodeURIComponent(obj.merchant_id);
         // let merchant_id = decodeURIComponent(obj.merchant_id);
-        let merchant_id = system.decryption(obj.merchant_id);
+        let merchant_id = system.decryption(decodeURIComponent(obj.merchant_id));
         let user = await this.getLoginUser(merchant_id, obj.openid);
         let user = await this.getLoginUser(merchant_id, obj.openid);
         return this.returnSuccess(user);
         return this.returnSuccess(user);
     }
     }

xgg-saas-merchant/app/base/system.js

 var fs = require("fs");
 var fs = require("fs");
 var objsettings = require("../config/objsettings");
 var objsettings = require("../config/objsettings");
 var settings = require("../config/settings");
 var settings = require("../config/settings");
-
+const crypto = require("crypto");
 class System {
 class System {
 	static declare(ns) {
 	static declare(ns) {
 		var ar = ns.split('.');
 		var ar = ns.split('.');