d

xgg-saas-platform/app/base/controller/impl/saas/merchantCtl.js

@@ -5,6 +5,7 @@ class MerchantCtl extends CtlBase {
     super();
     super();
     this.merchantSve = system.getObject("service.saas.merchantSve");
     this.merchantSve = system.getObject("service.saas.merchantSve");
     this.merchantuserSve = system.getObject("service.uc.merchantuserSve");
     this.merchantuserSve = system.getObject("service.uc.merchantuserSve");
+    this.baseUrl = "https://xxxxxxxxxxxx";
   }
   }
 
 
   async dics(params, pobj2, req) {
   async dics(params, pobj2, req) {
@@ -36,7 +37,11 @@ class MerchantCtl extends CtlBase {
     try {
     try {
       params.is_sign = 1;
       params.is_sign = 1;
       this.doTimeCondition(params, ["createBegin", "createEnd"]);
       this.doTimeCondition(params, ["createBegin", "createEnd"]);
-      return await this.merchantSve.page(params);
+      let list = await this.merchantSve.page(params);
+      for (let item of list.data.rows) {
+        item.qrcode = encodeURIComponent(this.baseUrl + "?mechtId=" +item.id);
+      }
+      return system.getResult(list);
     } catch (error) {
     } catch (error) {
       return system.getResult(null, `系统错误 错误信息 ${error}`);
       return system.getResult(null, `系统错误 错误信息 ${error}`);
     }
     }

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

@@ -191,7 +191,7 @@ class System {
       let dev = "http://39.107.234.14";
       let dev = "http://39.107.234.14";
       return {
       return {
         // 公共服务
         // 公共服务
-        common: local + ":3102" + path,
+        common: dev + ":3102" + path,
 
 
         // 商户服务
         // 商户服务
         merchant: dev + ":3101" + path,
         merchant: dev + ":3101" + path,