Authored by 徐祁xuqi

Merge remote-tracking branch 'origin/hotfix/brandOrder'

@@ -108,12 +108,14 @@ class BrandModel @@ -108,12 +108,14 @@ class BrandModel
108 $list['url'] = Helpers::url('', null, $row['brand_domain']); 108 $list['url'] = Helpers::url('', null, $row['brand_domain']);
109 $build['list'][] = $list; 109 $build['list'][] = $list;
110 } 110 }
111 - $result['brandList'][] = $build; 111 + if ($char !== '0~9') {
  112 + $result['brandList'][] = $build;
  113 + } else {
  114 + $lastBrand = $build;
  115 + }
112 } 116 }
113 - //第一个元素放到最后  
114 - $lastBrand = $result['brandList'][0];  
115 - unset($result['brandList'][0]);  
116 $result['brandList'][] = $lastBrand; 117 $result['brandList'][] = $lastBrand;
  118 + //第一个元素放到最后
117 $result['brandList'] = array_values($result['brandList']); 119 $result['brandList'] = array_values($result['brandList']);
118 } 120 }
119 //新入驻品牌 121 //新入驻品牌