Merge branch 'feature/removCamel' of git.yoho.cn:fe/yoho-blk into feature/removCamel

@@ -151,7 +151,7 @@ const _convertAddress = (addressList, createTime) => {
         };
 
         address.time = addr.acceptTime;
-        addr = addr.acceptAddress.split(' ');
+        addr = addr.accept_address.split(' ');
 
         if (addr.length > 1 && /市/.test(addr[0])) {
             address.city = addr[0].replace('市', '');

@@ -81,7 +81,7 @@ const getUserReturn = (uid, page) => {
         let paginationOpts = false;
 
         if (result && result.data) {
-            data = camelCase(result.data);
+            data = result.data;// camelCase(result.data);
 
             paginationOpts = data.total > pageSize ? {
                 paginationOpts: {
@@ -93,20 +93,20 @@ const getUserReturn = (uid, page) => {
 
             data.list.forEach(item => {
                 item.orderGoods = item.goods;
-                item.createTime = item.orderCreateTime;
+                item.createTime = item.order_create_time;
                 item.hidePrice = true;
                 item.showStatus = true;
-                item.refundStr = refundStr[item.refundType];
-                item.detailUrl = helpers.urlFormat(urlIndex[item.refundType], {
+                item.refundStr = refundStr[item.refund_type];
+                item.detailUrl = helpers.urlFormat(urlIndex[item.refund_type], {
                     orderCode: item.id
                 });
-                item.type = typeIndex[item.refundType];
+                item.type = typeIndex[item.refund_type];
 
                 item.orderGoods.forEach(good => {
-                    let cnAlphabet = good.cnAlphabet ? good.cnAlphabet : '';
+                    let cnAlphabet = good.cn_alphabet ? good.cn_alphabet : '';
 
                     good.hidePrice = true;
-                    good.goodUrl = helpers.urlFormat(`/product/pro_${good.productId}_${good.goodsId}/${cnAlphabet}.html`); // eslint-disable-line
+                    good.goodUrl = helpers.urlFormat(`/product/pro_${good.product_id}_${good.goods_id}/${cnAlphabet}.html`); // eslint-disable-line
                 });
             });
         }
@@ -615,12 +615,12 @@ const getChangeGoodsList = (orderCode, uid) => {
  * @return { Object } 模板渲染换货数据
  */
 const _setExchangeDetailData = (data) => {
-    data = camelCase(data);
+    // data = camelCase(data);
     let list = {};
 
     switch (data.status) {
         case 0:
-            if (data.deliveryTpyeName === '寄回换货') {
+            if (data.delivery_tpye_name === '寄回换货') {
                 Object.assign(list, {
                     audit: true,
                     reminder: true,
@@ -646,7 +646,7 @@ const _setExchangeDetailData = (data) => {
                 location: true
             });
 
-            if (data.deliveryTpyeName === '寄回换货') {
+            if (data.delivery_tpye_name === '寄回换货') {
                 Object.assign(list, {
                     logistics: true,
                     sendBack: true,
@@ -660,7 +660,7 @@ const _setExchangeDetailData = (data) => {
 
             break;
         case 20:
-            if (data.deliveryTpyeName === '寄回换货') {
+            if (data.delivery_tpye_name === '寄回换货') {
                 Object.assign(list, {
                     logistics: true
                 });
@@ -669,15 +669,15 @@ const _setExchangeDetailData = (data) => {
                 list.reminder = true;
                 list.inDoor = true;
                 list.auditSuccess = true;
-                list.view = `/me/order/detail/?orderCode=${data.orderCode}`;
+                list.view = `/me/order/detail/?orderCode=${data.order_code}`;
             }
 
             break;
         case 30:
-            if (data.deliveryTpyeName === '寄回换货') {
+            if (data.delivery_tpye_name === '寄回换货') {
                 list.takeGoods = true;
                 list.auditSuccess = true;
-                list.view = `/me/order/detail/?orderCode=${data.orderCode}`;
+                list.view = `/me/order/detail/?orderCode=${data.order_code}`;
             } else {
                 list.takeGoods = true;
             }
@@ -687,14 +687,14 @@ const _setExchangeDetailData = (data) => {
                 send: true,
                 doubt: true,
                 auditSuccess: true,
-                view: `/me/order/detail/?orderCode=${data.orderCode}`
+                view: `/me/order/detail/?orderCode=${data.order_code}`
             });
             break;
         case 40:
             Object.assign(list, {
                 finish: true,
                 auditSuccess: true,
-                view: `/me/order/detail/?orderCode=${data.orderCode}`
+                view: `/me/order/detail/?orderCode=${data.order_code}`
             });
             break;
         case 91:
@@ -746,7 +746,7 @@ const getExchangeDetailData = (id, uid) => {
                 exchangeData.exchangeDetail,
                 _setReturnStatus(data.statusList),
                 _setExchangeDetailData(data),
-                camelCase(data)
+                data// camelCase(data)
             );
         }
 

@@ -135,21 +135,21 @@
         </div>
 
         <div class="table">
-            {{# goodsList}}
+            {{# goods_list}}
             <div class="table-body">
                 <div class="goods-info">
-                    <img src="{{image goodsImage 70 90}}">
+                    <img src="{{image goods_image 70 90}}">
                     <div class="info">
-                        <p class="good-name">{{productName}}</p>
-                        <p>颜色：{{colorName}}&nbsp;尺码：{{sizeName}}</p>
+                        <p class="good-name">{{product_name}}</p>
+                        <p>颜色：{{color_name}}&nbsp;尺码：{{size_name}}</p>
                         <p>{{num}}</p>
                     </div>
                 </div>
                 <div class="common special-border">
-                    <p class="reason">{{reasonName}}</p>
+                    <p class="reason">{{reason_name}}</p>
                 </div>
                 <div class="common special-border operation">
-                    <p class="subtext">color: {{newColorName}}<br>size: {{newSizeName}}</p>
+                    <p class="subtext">color: {{new_color_name}}<br>size: {{new_size_name}}</p>
                 </div>
             </div>
             {{#if evidenceImages}}
@@ -166,7 +166,7 @@
                 </div>
             </div>
             {{/if}}
-            {{/ goodsList}}
+            {{/ goods_list}}
         </div>
     </div>
 </div>

 <div class="goods-container special-border {{#if hidePrice}}no-price{{/if}}">
-    {{#order_goods}}
+    {{#orderGoods}}
     {{> order/good-info}}
     {{#unless hidePrice}}
     <div class="sub-column right-border bold">
@@ -19,5 +19,5 @@
         <p class="bold">¥{{goods_amount}}</p>
     </div>
     {{/unless}}
-    {{/order_goods}}
+    {{/orderGoods}}
 </div>

 <ul class="header">
-    <li class="content">下单时间：{{create_time}}</li>
+    <li class="content">下单时间：{{createTime}}</li>
     <li class="content">订单编号：{{order_code}}</li>
     {{#if showMobile}}
     <li class="content"><span class="iconfont">&#xe62f;</span>手机订单</li>

@@ -16,7 +16,7 @@
             <div class="table-body">
             {{> order/goods-box}}
             <div class="common-column special-border">
-                <p class="refund-status">{{statusName}}</p>
+                <p class="refund-status">{{status_name}}</p>
                 <p class="subtext badge refund-type">{{refundStr}}</p>
             </div>
             <div class="common-column special-border operation">

@@ -22,9 +22,12 @@ module.exports = {
     },
     cookieDomain: 'yohoblk.com',
     domains: {
-        singleApi: 'http://single.yoho.cn/',
-        api: 'http://api.yoho.yohoops.org/',
-        service: 'http://service.yoho.yohoops.org/',
+        // singleApi: 'http://single.yoho.cn/',
+        // api: 'http://api.yoho.yohoops.org/',
+        // service: 'http://service.yoho.yohoops.org/',
+        api: 'http://dev-api.yohops.com:9999/',
+        service: 'http://dev-service.yohops.com:9999/',
+        singleApi: 'http://192.168.102.27:8092/',
         search: 'http://search.yohoops.org/yohosearch/'
 
         // api: 'http://api-test1.yohops.com:9999/',