Merge remote-tracking branch 'origin/center-channel' into center-channel-417

center-channel/app/base/api/impl/action/logoOrderApi.js

@@ -33,8 +33,8 @@ class LogoOrderAPI extends APIBase {
             case "singlelogo"://生成logo
             case "singlelogo"://生成logo
                 opResult = await this.centerorderSve.singlelogo(pobj);
                 opResult = await this.centerorderSve.singlelogo(pobj);
                 break;
                 break;
-            case "getLogoListByUser"://获取已购买的logo
-                opResult = system.getResultSuccess(null, "测试成功");
+            case "getPaidLogoListByUser"://获取已购买的logo
+                opResult = await this.centerorderSve.reqCenterOrderApi(pobj,"action/logoOrderApi/springBoard");
                 break;
                 break;
             case "getCollectibleLogoListByUser"://获取收藏的logo
             case "getCollectibleLogoListByUser"://获取收藏的logo
                 opResult = system.getResultSuccess(null, "测试成功");
                 opResult = system.getResultSuccess(null, "测试成功");

center-channel/app/config/routes/api.js

@@ -113,7 +113,8 @@ module.exports = function (app) {
 			"submitIcpProgramme", "submitIcpMaterial", "acceptIcpPartnerNotification", "abolishIcpProgramme",
 			"submitIcpProgramme", "submitIcpMaterial", "acceptIcpPartnerNotification", "abolishIcpProgramme",
 			"addOrder", "getH5PayUrl", "getOrderQrCode", "queryOrderStatus", "getOrderInfo", "getOrderDeliveryInfo", "getOrderDetails",
 			"addOrder", "getH5PayUrl", "getOrderQrCode", "queryOrderStatus", "getOrderInfo", "getOrderDeliveryInfo", "getOrderDetails",
 			"getOrderDeliveryFlowInfo", "getOrderDeliveryFlowList", "getOrderLogInfo", "updateContacts", "updateTmOrder", "delOrder",
 			"getOrderDeliveryFlowInfo", "getOrderDeliveryFlowList", "getOrderLogInfo", "updateContacts", "updateTmOrder", "delOrder",
-			"submitProgramme", "getProgrammeListByUser", "getProgrammeInfoByNeedNo", "abolishProgramme", "getAliPayInfo"
+			"submitProgramme", "getProgrammeListByUser", "getProgrammeInfoByNeedNo", "abolishProgramme", "getAliPayInfo",
+			"getPaidLogoListByUser","getCollectibleLogoListByUser","collectLogo"
 		];
 		];
 		if (lst.indexOf(req.body.actionType) >= 0) {
 		if (lst.indexOf(req.body.actionType) >= 0) {
 			var userpin = req.headers["userpin"] || "";
 			var userpin = req.headers["userpin"] || "";

center-channel/app/front/entry/public/apidoc/platform/logoOrder.md

 <a name="menu" href="/doc">返回主目录</a>
 <a name="menu" href="/doc">返回主目录</a>
 
 
 1. [生成logo](#singlelogo)
 1. [生成logo](#singlelogo)
-1. [获取已购买的logo](#getLogoListByUser)
+1. [获取已购买的logo](#getPaidLogoListByUser)
 1. [获取收藏的logo](#getCollectibleLogoListByUser)
 1. [获取收藏的logo](#getCollectibleLogoListByUser)
 1. [收藏logo](#collectLogo)
 1. [收藏logo](#collectLogo)