Merge branch 'develop' into release/1.0

+
 Name     | Path                                 | Note
--------- | ---------------------------------------------- | ---------
+-------- | ------------------------------------ | ---------
 首页       | /                                    |
 侧边栏      | /sidebar                             | 只有 app 使用
-品牌列表     | /brand                                         |
+品牌列表     | /brands                              |
 品类       | /cate                                |
 全部分类     | /cate-all                            |
 商品列表    | /list?sort=1                  | 
 品牌店铺     | /product/shop?domain=sctest1         |
 品牌店铺分享页面 | /product/shop-share?domain=colormad |
-商品详情     | /item/{productId}.html                         |
+商品详情      | /product/{productId}                 |
 新品抢先看    | /new                         |
 搜索页        | /search?query=xxx           |
-资讯列表     | /editorial/list                                |
-资讯详情     | /editorial/{newsId}.html                       |
+资讯列表      | /news                                |
+资讯详情     | /news/{newsId}                       |
 个人中心      |    /me     |
 个人信息      |    /me/mydetails     |
 全部订单      |    /me/order?type=1     |    
 待付款        |    /me/order?type=2     |    
 待发货        |    /me/order?type=3     |    
 待收货        |    /me/order?type=4     |    
-订单详情     | /me/order-detail?orderCode=xxx                 |
+订单详情      |    /me/order/detail?orderCode=xxx     |    
 退换货列表         |  /me/return  | 
-退货申请     | /me/return/refund?orderId=160181661            |
-换货申请     | /me/return/exchange?orderId=160181661          |
-收藏商品     | /me/favorite                                   |
-收藏品牌     | /me/favorite?tab=brand                         |
+退货申请      |    /me/return/refund?orderCode=160181661       |
+换货申请      |    /me/return/exchange?orderCode=160181661       |
+收藏商品      |    /me/collection     |
+收藏品牌      |    /me/collection?tab=brand     | 
 yoho币        |    /me/mycurrency     |    
 帮助中心      |    /help     |  
 帮助中心详情  |    /help?id=xxx     | 
 意见反馈      |    /me/feedback     | 
 关于我们      |    /me/about     | 
 物流详情      |    /me/logistic?order_code=1609827614  |
-退换货物流详情  | /me/logistic?order_code=1609827614&type=refund |
-
---------------------------------------------------------------------------------
-
+退换货物流详情|    /me/logistic?order_code=1609827614&type=refund|
 --------------------------------------------------------------------------------
 
 ### order 常亮

@@ -17,13 +17,13 @@ const exchange = {
     // 订单 可换货商品列表
     order(req, res, next) {
         const uid = req.user.uid; // const udi = 8039837  //test account
-        const orderId = req.query.orderId;
+        const orderCode = req.query.orderCode;
 
-        if (!orderId) {
+        if (!orderCode) {
             return next();
         }
 
-        exchangeModel.getOrderData(uid, orderId).then(result => {
+        exchangeModel.getOrderData(uid, orderCode).then(result => {
             res.json(result);
         }).catch(next);
     },

@@ -15,13 +15,13 @@ const refund = {
     },
     order(req, res, next) {
         const uid = req.user.uid || 8050882;
-        const orderId = req.query.orderId;
+        const orderCode = req.query.orderCode;
 
-        if (!orderId) {
+        if (!orderCode) {
             return next();
         }
 
-        refundModel.getOrderData(uid, orderId).then(result => {
+        refundModel.getOrderData(uid, orderCode).then(result => {
             res.json(result);
         }).catch(next);
     },

@@ -20,31 +20,30 @@ const router = expressRouter();
 router.get('/me/', home.index); // 个人中心主页
 
 router.get('/me/order', order.orders); // 订单
-router.get('/me/order-detail', order.orderDetail); // 订单详情
-router.get('/me/get-orders', order.getOrderData); // 获取订单数据
-router.get('/me/get-order', order.getOrderDetailData); // 获取订单详情数据
-router.get('/me/order-detail', order.orderDetail); // 订单详情
-router.get('/me/order/cancel-reason', order.getCancelReason); // 获取订单原因
-router.post('/me/cancel-order', order.cancelOrder); // 取消订单
-router.post('/me/delete-order', order.deleteOrder); // 删除订单
-router.post('/me/confirm-order', order.confirmOrder); // 确认订单
+router.get('/me/order/detail', order.orderDetail);
+router.get('/me/getOrderList', order.getOrderData); // 获取订单数据
+router.get('/me/get-order', order.getOrderDetailData); // AJAX 获取订单详情数据
+router.get('/me/getCancelOrderReason', order.getCancelReason); // 获取订单原因
+router.post('/me/cancelOrder', order.cancelOrder); // 取消订单
+router.post('/me/deleteOrder', order.deleteOrder); // AJAX 删除订单
+router.post('/me/confirmReceive', order.confirmOrder); // 确认订单
 
 router.get('/me/mycurrency', order.coin); // yoho币
-router.get('/me/coin-detail', order.getCoinDetail); // yoho币明细
+router.get('/me/coin-detail', order.getCoinDetail); // ajax yoho币明细
 
 router.get('/me/service', home.service); // 在线客服
 router.get('/help', home.help); // 帮助中心列表页
 router.get('/me/feedback', home.feedback); // 个人中心-意见反馈
 router.post('/me/save-feedback', home.saveFeedback); // 个人中心-提交意见反馈
 
-router.get('/me/favorite', favorite.favorite); // 个人中心 - 收藏
-router.get('/me/favorite/favpaging', favorite.favpaging); // 个人中心 - 收藏商品/品牌(翻页)
+router.get('/me/collection', favorite.favorite); // 个人中心 - 收藏
+router.get('/me/collection/favpaging', favorite.favpaging); // 个人中心 - 收藏商品/品牌(翻页)
 router.post('/me/del-favdel', favorite.deletefav); // 个人中心 - 收藏商品/品牌(刪除)
 
 // 退换货
 router.get('/me/return', refund.refundOrders); // 退换货 - 订单列表
 router.get('/me/exchange-status', refund.exchangeGoods); // 退换货 - 换货状态
-router.get('/me/refund/get-orders', refund.getRefundOrders); // 退换货 - 获取订单列表数据
+router.get('/me/refund/getOrderLisst', refund.getRefundOrders); // 退换货 - 获取订单列表数据
 
 // 退货申请
 router.get('/me/return/refund', refund.refund); // 退货申请

@@ -51,11 +51,11 @@
         </a>
     </div>
      <div class="group-list">
-         <a class="list-item" href="/me/favorite">
+         <a class="list-item" href="/me/collection">
             收藏的商品
             <span class="num">{{product_favorite_total}}  <span class="icon icon-right"></span></span>
         </a>
-        <a class="list-item" href="/me/favorite?tab=brand">
+        <a class="list-item" href="/me/collection?tab=brand">
             收藏的品牌
              <span class="num">{{brand_favorite_total}}  <span class="icon icon-right"></span></span>
         </a>

@@ -74,11 +74,11 @@ const titleMap = {
         },
         ltitle: {
             des: '商品',
-            action: origin + '/me/favorite'
+            action: origin + '/me/collection'
         },
         rtitle: {
             des: '品牌',
-            action: origin + '/me/favorite?tab=brand'
+            action: origin + '/me/collection?tab=brand'
         },
         right: {
             des: '编辑',
@@ -132,7 +132,7 @@ const matchHeader = (url) => {
         return header;
     }
 
-    if (/\/me\/order-detail$/.test(path)) {
+    if (/\/me\/order\/detail$/.test(path)) {
         header = titleMap[2];
         header.title.des = '订单详情';
         header.title.right.action = origin + '/me/service';
@@ -188,7 +188,7 @@ module.exports = (url) => {
         let path = url.split('?')[0];
 
         // 个人中心收藏
-        if (/\/me\/favorite$/.test(path)) {
+        if (/\/me\/collection$/.test(path)) {
             let u = url.split('?')[1];
             let header = titleMap[5];
 

@@ -50,7 +50,7 @@
             return {
                 title: '请选择换货商品',
                 page: 'exchange',
-                orderCode: qs.orderId,
+                orderCode: qs.orderCode,
                 showFeatureSelector: false,
                 entity: {},
                 exchangeData: {},
@@ -81,7 +81,7 @@
             $.ajax({
                 url: '/me/return/exchange/order',
                 data: {
-                    orderId: this.orderCode
+                    orderCode: this.orderCode
                 }
             }).then(res => {
                 const self = this;
@@ -246,7 +246,7 @@
                         data
                     }).then(result => {
                         if (result.code === 200) {
-                            yoho.goNewPage({url: `/me/exchange-status?orderId=${self.orderCode}`});
+                            yoho.goNewPage({url: `/me/exchange-status?orderCode=${self.orderCode}`});
                         } else {
                             modal.alert(result.message);
                         }

@@ -59,7 +59,7 @@
 
                 this.busy = true;
                 $.ajax({
-                    url: '/me/favorite/favpaging',
+                    url: '/me/collection/favpaging',
                     data: {
                         page: ++_this.page,
                         tab: 'brand'

@@ -64,7 +64,7 @@
 
                 this.busy = true;
                 $.ajax({
-                    url: '/me/favorite/favpaging',
+                    url: '/me/collection/favpaging',
                     data: {
                         page: ++_this.page
                     }

@@ -87,13 +87,13 @@
                             {
                                 key: this.order.isSupportRefund,
                                 val: this.order.isSupportRefund === 'Y' ? '申请退货' : '<span class="overdue">申请退货（已过期限）</span>',
-                                url: '/me/return/refund?orderId=' + this.order.orderCode,
+                                url: '/me/return/refund?orderCode=' + this.order.orderCode,
                                 disabled: this.order.isSupportRefund !== 'Y'
                             },
                             {
                                 key: this.order.isSupportExchange,
                                 val: this.order.isSupportExchange === 'Y' ? '申请换货' : '<span class="overdue">申请换货（已过期限）</span>',
-                                url: '/me/return/exchange?orderId=' + this.order.orderCode,
+                                url: '/me/return/exchange?orderCode=' + this.order.orderCode,
                                 disabled: this.order.isSupportExchange !== 'Y'
                             },
                             {
@@ -129,7 +129,7 @@
                 let that = this;
 
                 $.ajax({
-                    url: '/me/order/cancel-reason',
+                    url: '/me/getCancelOrderReason',
                 }).then(result => {
                     if (result.data.length > 0) {
                         that.options = result.data;
@@ -142,7 +142,7 @@
                 return {
                     cancel(param, success, fail) {
                         $.ajax({
-                            url: '/me/cancel-order',
+                            url: '/me/cancelOrder',
                             type: 'post',
                             data: param
                         }).then(success).fail(fail);
@@ -174,7 +174,7 @@
                 Modal.confirm('确认删除订单？', '', function() {
                     this.hide();
                     $.ajax({
-                        url: '/me/delete-order',
+                        url: '/me/deleteOrder',
                         type: 'post',
                         data: {
                             orderCode: code
@@ -192,7 +192,7 @@
             },
             confirmGoods(code) {
                 $.ajax({
-                    url: '/me/confirm-order',
+                    url: '/me/confirmReceive',
                     type: 'post',
                     data: {
                         orderCode: code

@@ -22,7 +22,7 @@
                             <p>&yen; {{goods.goodsPrice}}</p>
                             <p>×{{goods.buyNumber}}</p>
                         </div>
-                        <a href="/me/order-detail?orderCode={{order.orderCode}}"></a>
+                        <a href="/me/order/detail?orderCode={{order.orderCode}}"></a>
                     </div>
                 </div>
                 <div class="order-option">
@@ -87,7 +87,7 @@
                     return;
                 }
                 $.ajax({
-                    url: '/me/get-orders',
+                    url: '/me/getOrderLisst',
                     data: {
                         page: ++this.page,
                         limit: this.limit,
@@ -128,7 +128,7 @@
                 let that = this;
 
                 $.ajax({
-                    url: '/me/order/cancel-reason',
+                    url: '/me/getCancelOrderReason',
                 }).then(result => {
                     if (result.data.length > 0) {
                         that.options = result.data;
@@ -152,7 +152,7 @@
                 return {
                     cancel(param, success, fail) {
                         $.ajax({
-                            url: '/me/cancel-order',
+                            url: '/me/cancelOrder',
                             type: 'post',
                             data: param
                         }).then(success).fail(fail);
@@ -174,7 +174,7 @@
                 Modal.confirm('确认删除订单？', '', function() {
                     this.hide();
                     $.ajax({
-                        url: '/me/delete-order',
+                        url: '/me/deleteOrder',
                         type: 'post',
                         data: {
                             orderCode: order.orderCode
@@ -192,7 +192,7 @@
             },
             confirmGoods(code) {
                 $.ajax({
-                    url: '/me/confirm-order',
+                    url: '/me/confirmReceive',
                     type: 'post',
                     data: {
                         orderCode: code

@@ -70,7 +70,7 @@
                     return;
                 }
                 $.ajax({
-                    url: '/me/refund/get-orders',
+                    url: '/me/refund/getOrderList',
                     data: {
                         page: ++this.page,
                         limit: this.limit

@@ -83,7 +83,7 @@
                 });
 
                 return {
-                    order_code: qs.orderId,
+                    order_code: qs.orderCode,
                     goods: JSON.stringify(goods),
                     payment: JSON.stringify(this.amount)
                 };
@@ -93,7 +93,7 @@
             $.ajax({
                 url: '/me/return/refund/order',
                 data: {
-                    orderId: qs.orderId
+                    orderCode: qs.orderCode
                 }
             }).then(res => {
                 if (res.data && res.data.goodsList) {