品牌字母排序问题

@@ -32,67 +32,56 @@ const handleBrandList = origin => {
         indexList: []
         indexList: []
     };
     };
 
 
+    let keyList = [];
+
     // 标记是否有数字，有数字先暂存
     // 标记是否有数字，有数字先暂存
     let hasNum = false;
     let hasNum = false;
     let numTemp = {};
     let numTemp = {};
 
 
     _.forEach(origin, (value, key) => {
     _.forEach(origin, (value, key) => {
-        let brands = [];
 
 
         if (_.size(value) <= 0) {
         if (_.size(value) <= 0) {
             return;
             return;
         }
         }
 
 
+        _.forEach(value, function(subValue) {
+            subValue.brandUrl = '//m.yohobuy.com/product/index/brand?domain=' + subValue.brand_domain + '&app_type=1';
+            subValue.name = subValue.brand_name_en || subValue.brand_name_cn || subValue.brand_name;
+            subValue.domain = subValue.brand_domain;
+        });
+
         if (key === '0~9') {
         if (key === '0~9') {
             hasNum = true;
             hasNum = true;
             numTemp = origin[key];
             numTemp = origin[key];
         } else {
         } else {
-            _.forEach(value, (subValue) => {
-                brands.push({
-                    name: subValue.brand_name_en || subValue.brand_name_cn || subValue.brand_name,
-                    logo: subValue.brand_ico,
-                    domain: subValue.brand_domain,
-                    brandUrl: '//m.yohobuy.com/product/index/brand?domain=' + subValue.brand_domain + '&app_type=1'
-                });
-            });
 
 
-            dest.ListData.push({
-                index: key,
-                brands: brands
-            });
-
-            dest.indexList.push({
-                index: key,
-                name: key === '0~9' ? '0' : key
-            });
+            keyList.push(key);
         }
         }
 
 
     });
     });
 
 
-    // 商品列表排序一次
-    _.sortBy(dest.ListData, o => {
-        return o.index.charCodeAt();
-    });
+    keyList.sort();
+
+    _.forEach(keyList, function(key) {
+        let keyName = key;
 
 
-    // 字母列表排序一次
-    _.sortBy(dest.indexList, o => {
-        return o.index.charCodeAt();
+        dest.ListData.push({
+            index: keyName,
+            brands: origin[key]
+        });
+
+        dest.indexList.push({
+            index: keyName,
+            name: key === '0~9' ? '0' : key
+        });
     });
     });
 
 
     // 如果有数字，单独处理
     // 如果有数字，单独处理
     if (hasNum) {
     if (hasNum) {
-        let brands = [];
 
 
-        _.forEach(numTemp, (subValue) => {
-            brands.push({
-                name: subValue.brand_name_en || subValue.brand_name_cn || subValue.brand_name,
-                logo: subValue.brand_ico,
-                domain: subValue.brand_domain
-            });
-        });
         dest.ListData.push({
         dest.ListData.push({
             index: '0~9',
             index: '0~9',
-            brands: brands
+            brands: numTemp
         });
         });
 
 
         dest.indexList.push({
         dest.indexList.push({
@@ -167,6 +156,7 @@ const _getBrandListOriginData = (channel) => {
     });
     });
 };
 };
 
 
+// 全部分类数据
 const _processCateData = (list, channel, appType) => {
 const _processCateData = (list, channel, appType) => {
     let nav = ['MEN男士', 'WOMEN女士'];
     let nav = ['MEN男士', 'WOMEN女士'];
 
 
@@ -301,8 +291,6 @@ const brandListData = (code, gender) => {
     });
     });
 };
 };
 
 
-
-
 module.exports = {
 module.exports = {
     indexData,
     indexData,
     brandListData
     brandListData

@@ -31,7 +31,7 @@
                     <div class="brand-box">
                     <div class="brand-box">
                         <a href="{{brandUrl}}">
                         <a href="{{brandUrl}}">
                             <div class="brand-logo">
                             <div class="brand-logo">
-                                <img src="{{image logo 136 136}}">
+                                <img src="{{image brand_ico 136 136}}">
                             </div>
                             </div>
                             <span class="brand-name">
                             <span class="brand-name">
                                 {{name}}
                                 {{name}}

@@ -58,6 +58,13 @@ function loadData(channel) {
             $brandContent.html(data);
             $brandContent.html(data);
 
 
             initialize();
             initialize();
+
+            $('html,body').animate({
+                scrollTop: 0
+            }, 100, function() {
+                $tabBox.removeClass('fastening');
+                $contentIndex.removeClass('distance');
+            });
         }
         }
     });
     });
 }
 }

@@ -190,7 +190,7 @@
 
 
     .list-box {
     .list-box {
         position: fixed;
         position: fixed;
-        width: 30px;
+        width: 35px;
         margin: 0;
         margin: 0;
         padding: 6px 0;
         padding: 6px 0;
         right: 0;
         right: 0;