exchange

@@ -42,7 +42,6 @@ const _processListData = (list) => {
         //     key: index,
         //     brands: value
         // });
-
     });
 
     listKey.sort();

@@ -7,7 +7,7 @@
                 <li>
                     <a data-key="{{key}}" href="{{brandDomain}}" target="_blank">
                         <img class="lazy" data-original="{{image brandIco 270 190}}">
-                        <span>{{brandName}}</span>
+                        <span>{{brandNameEn}}</span>
                     </a>
                 </li>
                 {{/each}}

@@ -628,8 +628,6 @@ const _setExchangeDetailData = (data) => {
                     sendBack: true,
                     cancel: true,
                     location: true
-
-                    // takeGoods: true
                 });
             } else {
                 Object.assign(list, {
@@ -722,7 +720,7 @@ const getExchangeDetailData = (id, uid) => {
         returnsAPI.getExpressCompanyAsync()
     ]).then(result => {
         let exchangeData = {};
-
+// console.log(result)
         Object.assign(exchangeData, _setSideMenu('我的退/换货'));
         exchangeData = {
             title: '换货申请',
@@ -731,6 +729,7 @@ const getExchangeDetailData = (id, uid) => {
 
         if (result[0] && result[0].data) {
             let data = result[0].data;
+            data.expressId = data.notice.express_id;
 
             if (result[1] && result[1].data) {
                 data.expressList = _setExpressData(result[1].data);

@@ -66,7 +66,7 @@
         {{#if logistics}}
         <div class="return-express">
             {{#if expressNumber}}
-                <div class="show-content" data-id="{{id}}">
+                <div class="show-content" data-id="{{expressId}}">
                     <h4 class="third-title">寄回物流信息 <label class="reset-express btn white">修改</label></h4>
                     <p>请您耐心等待，我们会在收到货物后快速为您处理</p>
                     <p>物流公司：{{expressCompany}}</p>
@@ -89,7 +89,7 @@
                     </dd>
                     <dd>
                         快递单号：
-                        <input type="text" class="express-code" placeholder="填写快递单号" value="{{number}}">
+                        <input type="text" class="express-code" placeholder="填写快递单号" value="{{expressNumber}}">
                     </dd>
                     <dd>
                         <span class="submit-express btn">提交</span>

@@ -44,3 +44,12 @@ $('.editorial-list-page').on('click', '.like-icon', function() {
 }).on('mouseenter mouseleave', '.like-icon', function() {
     $(this).closest('.like').toggleClass('hover');
 });
+
+$('.msg-title').each(function() {
+    var $this = $(this),
+        $text = $this.text();
+
+    if ($text.length > 68) {
+        $this.html($text.substring(0, 64) + '...');
+    }
+});
\ No newline at end of file

@@ -76,7 +76,7 @@ $submitExpress.click(function() {
 $showExpress.on('click', '.reset-express', function() {
     var expressId = $showExpress.data('id');
 
-    $expressCode.val(expressId);
+    $expressCompany.val(expressId);
     $showExpress.addClass('hide');
     $editExpress.removeClass('hide');
 });