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

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

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

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

@@ -5,8 +5,6 @@
 1. [获取收藏的logo](#getCollectibleLogoListByUser)
 1. [获取已购买的logo](#getPaidLogoListByUser)
 
-
-
 ## **<a name="singlelogo"> 生成logo</a>**
 [返回到目录](#menu)
 ##### URL
@@ -145,3 +143,57 @@
 }
 
 ```
+
+## **<a name="getPaidLogoListByUser"> 获取已购买的logo</a>**
+[返回到目录](#menu)
+##### URL
+[/web/action/logoOrderApi/springBoard]
+#### 参数格式  `JSON`
+#### HTTP请求方式 `POST`
+#### 请求头中需要增加userpin（用户登录后的凭证）的值
+#### 渠道执行的类型 actionType：getPaidLogoListByUser
+
+``` javascript
+{
+        "actionType":"getPaidLogoListByUser",
+        "actionBody":{
+        	"pageSize":20,
+        	"pageIndex":1
+		}
+ }
+```
+
+#### 返回结果
+```javascript
+{
+    "status":0,
+    "msg":"success",
+    "data":[
+        {
+            "id":226,
+            "orderNo":"LOGO22202004281713R8",
+            "sourceOrderNo":"LOGO22202004281713R8",
+            "deliveryContent":{
+                "logo_id":1147,
+                "pic_url":"https://gsb-zc.oss-cn-beijing.aliyuncs.com/generator_202004270425473400.png",
+                "description":"红色象征着热情，活泼，张扬"
+            },
+            "itemCode":"znlogosjcp"
+        },
+        {
+            "id":225,
+            "orderNo":"LOGO22202004281710nB",
+            "sourceOrderNo":"LOGO22202004281710nB",
+            "deliveryContent":{
+                "logo_id":1147,
+                "pic_url":"https://gsb-zc.oss-cn-beijing.aliyuncs.com/generator_202004270425473400.png",
+                "description":"红色象征着热情，活泼，张扬"
+            },
+            "itemCode":"znlogosjcp"
+        }
+    ],
+    "dataCount":2,
+    "requestId":"fb4f38b5d0c746ecb057f8d62ad84b3f"
+}
+
+```