Merge branch 'feature/brand' into develop

@@ -32,7 +32,7 @@ yoho币        |    /me/mycurrency     |
 意见反馈      |    /me/feedback     | 
 意见反馈      |    /me/feedback     | 
 关于我们      |    /me/about     | 
 关于我们      |    /me/about     | 
 物流详情      |    /me/logistic?order_code=1609827614  |
 物流详情      |    /me/logistic?order_code=1609827614  |
-退换货物流详情|    /me/logistic?order_code=1609827614&type=refund|
+退换货物流详情|    /me/logistic?order_code=1609827614&id=3&type=refund|change
 --------------------------------------------------------------------------------
 --------------------------------------------------------------------------------
 
 
 ### order 常亮
 ### order 常亮

@@ -149,7 +149,8 @@ const order = {
         orderModel.getOrderLogisticdate({
         orderModel.getOrderLogisticdate({
             uid: req.user.uid || '',
             uid: req.user.uid || '',
             type: req.query.type || '',
             type: req.query.type || '',
-            order_code: req.query.orderCode
+            order_code: req.query.orderCode,
+            id: req.query.id
         }).then(result => {
         }).then(result => {
             res.json(result);
             res.json(result);
         });
         });

@@ -92,6 +92,7 @@ exports.deleteOrder = (orderCode, uid) => {
  * @param {[int]} order_code 订单号
  * @param {[int]} order_code 订单号
  * @param {[int]} uid 用户uid
  * @param {[int]} uid 用户uid
  * @param {[string]} type 退换货物流(退货：refund,换货：change)
  * @param {[string]} type 退换货物流(退货：refund,换货：change)
+ * @param {[int]} id 退换货申请ID(type为refund | change，才有效)
  * @return {[array]}
  * @return {[array]}
  */
  */
 exports.getOrderLogisticdate = (params) => {
 exports.getOrderLogisticdate = (params) => {