fix: 合并冲突

f3d3b5bb · sxy · a55af7d3 · 3deded6e · f3d3b5bb
Commit f3d3b5bb authored Apr 28, 2020 by sxy
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 9 deletions

center-channel/app/base/api/impl/opaction/fgbusinesschance.js
+9 -9

No files found.
--- a/center-channel/app/base/api/impl/opaction/fgbusinesschance.js
+++ b/center-channel/app/base/api/impl/opaction/fgbusinesschance.js
@@ -33,28 +33,28 @@ class FgbusinesschanceAPI extends WEBBase {
                opResult = await this.utilsFgbusinesschancSve.getInfo(pobj, pobj.actionBody);
                break;
            // ------ 对蜂擎页面  -------
-            case "getCompanyInfo": // 获取工商信息
+            case "getCompanyInfo": // 获取工商信息--ok
                opResult = await this.toolSve.getEntregistryByCompanyName(pobj.actionBody, req);
                break;
-            case "getProductServiceLabel": // 获取产品服务标签
+            case "getCompanyLabel":// 三十秒认知客户--ok
+                opResult = await this.utilsFgbusinesschancSve.getCompanyLabel(pobj, pobj.actionBody);
+                break
+            case "getProductServiceLabel": // 获取产品服务标签--TODO:模拟
                opResult = await this.utilsFgbusinesschancSve.getProductServiceLabel(pobj, pobj.actionBody);
                break;
-            case "getRecommendProducts": // 获取推荐产品列表 TODO:模拟
+            case "getRecommendProducts": // 获取推荐产品列表--TODO:模拟
                opResult = await this.utilsFgbusinesschancSve.getRecommendProducts(pobj, pobj.actionBody);
                break;
-            case "getTalkContent": // 获取营销话术 TODO:模拟
+            case "getTalkContent": // 获取营销话术--TODO:模拟
                opResult = await this.utilsFgbusinesschancSve.getTalkContent(pobj, pobj.actionBody);
                break;
-            case "getOldOrder": // 获取已购产品 TODO:模拟
+            case "getOldOrder": // 获取已购产品--TODO:模拟
                opResult = await this.utilsFgbusinesschancSve.getOldOrder(pobj, pobj.actionBody);
                break;
            case "updateStatus"://更新商机跟进状态 TODO:模拟
                opResult = await this.utilsFgbusinesschancSve.updateStatus(pobj, pobj.actionBody);
                break;
-            case "getCompanyLabel":// 三十秒认知客户
+            case "getMoreInfoUrl":// 更多客户信息链接地址--TODO:模拟
-                opResult = await this.utilsFgbusinesschancSve.getCompanyLabel(pobj, pobj.actionBody);
-                break
-            case "getMoreInfoUrl":// 更多客户信息链接地址 TODO:模拟
                opResult = await this.utilsFgbusinesschancSve.getMoreInfoUrl(pobj, pobj.actionBody);
                break
            default: