Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0

@@ -590,6 +590,7 @@ const getChangeGoodsList = (orderCode, uid) => {
 const _setExchangeDetailData = (data) => {
     data = camelCase(data);
 
+    // console.log(data)
     let list = {};
 
     switch (data.status) {
@@ -606,7 +607,9 @@ const _setExchangeDetailData = (data) => {
             } else {
                 Object.assign(list, {
                     audit: true,
-                    reminder: true
+                    reminder: true,
+                    inDoor: true,
+                    cancel: true
                 });
             }
 
@@ -614,7 +617,8 @@ const _setExchangeDetailData = (data) => {
         case 10:
             Object.assign(list, {
                 through: true,
-                reminder: true
+                reminder: true,
+                location: true
             });
 
             if (data.deliveryTpyeName === '寄回换货') {
@@ -631,11 +635,16 @@ const _setExchangeDetailData = (data) => {
 
             break;
         case 20:
-
             if (data.deliveryTpyeName === '寄回换货') {
                 Object.assign(list, {
                     logistics: true
                 });
+            } else {
+                list.send = true;
+                list.reminder = true;
+                list.inDoor = true;
+                list.auditSuccess = true;
+                list.view = `//www.yohobuy.com/me/order/detail?code=${data.orderCode}`;
             }
 
             break;
@@ -644,6 +653,8 @@ const _setExchangeDetailData = (data) => {
                 list.takeGoods = true;
                 list.auditSuccess = true;
                 list.view = `//www.yohobuy.com/me/order/detail?code=${data.orderCode}`;
+            } else {
+                list.takeGoods = true;
             }
             break;
         case 50:
@@ -683,7 +694,7 @@ const getExchangeDetailData = (id, uid) => {
         returnsAPI.getExchangeDetail(id, uid),
         returnsAPI.getExpressCompanyAsync()
     ]).then(result => {
-
+        console.log(result);
         let exchangeData = {};
 
         Object.assign(exchangeData, _setSideMenu('我的退/换货'));

@@ -30,7 +30,11 @@
         <div class="way">
 
             {{#if takeGoods}}
+<<<<<<< HEAD
+            <p class="contact">我们会尽快将您的商品发出，请耐心等待，如有疑问，请联系<a href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409" target="_blank"><span class="iconfont">&#xe61c;</span></a>在线客服</p>
+=======
             <p class="contact">我们会尽快将您的商品发出，请耐心等待，如有疑问，请联系<a href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=703953&configID=149819&jid=1099911094"><span class="iconfont">&#xe61c;</span></a>在线客服</p>
+>>>>>>> 2673aeb43896d8f475f9e5d722a39214d6b8f888
             {{/if}}
 
             {{#if reminder}}
@@ -50,7 +54,7 @@
             {{/if}}
 
             {{#if doubt}}
-            <p class="contact">如有疑问，请联系<a href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409"><span class="iconfont">&#xe61c;</span></a>在线客服</p>
+            <p class="contact">如有疑问，请联系<a href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409" target="_blank"><span class="iconfont">&#xe61c;</span>在线客服</p></a>
             {{/if}}
 
             {{#if auditSuccess}}
@@ -111,17 +115,13 @@
 
         {{#if location}}
         <div class="address">
-            <p class="address-title">收货地址<span class="modify-btn">修改</span></p>
+            <p class="address-title">收货地址</p>
             <div class="address-detail">
                <p>所在区域：{{city}}{{county}}</p>
                <p>收 &nbsp货 &nbsp人：{{consigneeName}}</p> 
                <p>详细地址：{{address}}</p> 
                <p>联系电话：{{mobile}}</p> 
             </div>
-
-            <div class="address-modify">
-                
-            </div>
         </div>
         {{/if}}
     </div>
@@ -167,4 +167,5 @@
         </div>
     </div>
 </div>
-{{/ exchange}}
\ No newline at end of file
+{{/ exchange}}
+

@@ -3,7 +3,6 @@ var $ = require('yoho-jquery'),
 
 var id = $('.exchange-detail-page').data('id');
 
-
 var $mainWrap = $('.exchange-detail-page'),
     $submitExpress = $mainWrap.find('.submit-express'),
     $showExpress = $mainWrap.find('.show-content'),

@@ -29,6 +29,7 @@
     .way {
         font-size: 14px;
         border-bottom: 1px solid #eee;
+        padding-bottom: 10px;
 
         .way-title {
             margin-top: 10px;
@@ -111,6 +112,10 @@
             line-height: 40px;
         }
 
+        label {
+            margin-right: 5px;
+        }
+
         .modify-btn {
             font-size: 12px;
             float: right;
@@ -374,4 +379,18 @@
         }
     }
 
+    .input-group {
+        height: 35px;
+    }
+
+    .change-area {
+        display: block;
+        float: left;
+        height: 35px;
+        line-height: 35px;
+    }
+
+    .dist-item {
+        padding: 5px;
+    }
 }