明星原创 位置修改

@@ -15,7 +15,7 @@ var mySwiper;
 
 lazyLoad($('img.lazy'));
 
-$('.star-content li').each(function(key, item) {
+$contents.find('li').each(function(key, item) {
     $(item).find('.swiper-container').addClass('swiper-' + key);
 
     mySwiper = new Swiper('.swiper-' + key, {

 {{>layout/header}}
 <div class="ps-list-page ps-page yoho-page">
-    {{# ps}}
+    {{#if ps}}
         <ul id="nav-tab" class="nav-tab clearfix">
-            <li class="star-nav focus">{{sName}}</li>
-            <li class="plus-nav">{{pName}}</li>
+            {{# ps}}
+                <li {{#if focus}} class="focus" {{/if}} >{{name}}</li>
+            {{/ps}}
         </ul>
         <div id="ps-content" class="ps-content">
-            <ul class="star-content content">
-                {{# star}}
-                    {{> guang/ps_item}}
-                {{/ star}}
-            </ul>
-            <ul class="plus-content content hide">
-                {{# plus}}
+            {{# ps}}
+                <ul class="content{{#if focus}}{{^}} hide {{/if}}">
+                    {{# list}}
                         {{> guang/ps_item}}
-                {{/ plus}}
+                    {{/list}}
                 </ul>
+            {{/ps}}
         </div>
-    {{/ ps}}
+    {{/if}}
 </div>
 {{>layout/footer}}
\ No newline at end of file

@@ -61,8 +61,20 @@ class PlusstarModel
             return $result;
         }
         
-        $result['ps']['star'] = self::formatData($brandList['recom']['data']['list'][0]['data'], $gender, true);
-        $result['ps']['plus'] = self::formatData($brandList['all']['data']['list'][0]['data'], $gender, true);
+        if (!empty($brandList['recom']['data']['list'][0]['data'])) {
+            $result['ps'][] = array(
+                'list' => self::formatData($brandList['recom']['data']['list'][0]['data'], $gender, true),
+                'focus' => true,
+                'name' => '设计师',
+            );
+        }
+
+        if (!empty($brandList['all']['data']['list'][0]['data'])) {
+            $result['ps'][] = array(
+                'list' => self::formatData($brandList['all']['data']['list'][0]['data'], $gender, true),
+                'name' => '经典潮牌',
+            );
+        }
 
         // 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存
         if (USE_CACHE) {
@@ -104,13 +116,22 @@ class PlusstarModel
         }
 
         $result = array();
+        $star = array();
+
         $brandList = PlusstarData::brandList($gender, $channel);
-        if (!empty($brandList['star']['data']['list'][0]['data'])) {
-            $result['ps']['star'] = self::formatData($brandList['star']['data']['list'][0]['data'], $gender, false);
+        if (!empty($brandList['original']['data']['list'][0]['data'])) {
+            $result['ps'][] = array(
+                'list' => self::formatData($brandList['original']['data']['list'][0]['data'], $gender, true),
+                'focus' => true,
+                'name' => '原创潮牌',
+            );
         }
 
-        if (!empty($brandList['original']['data']['list'][0]['data'])) {
-            $result['ps']['plus'] = self::formatData($brandList['original']['data']['list'][0]['data'], $gender, true);
+        if (!empty($brandList['star']['data']['list'][0]['data'])) {
+            $result['ps'][] = array(
+                'list' => self::formatData($brandList['star']['data']['list'][0]['data'], $gender, false),
+                'name' => '明星潮品',
+            );
         }
 
         if (USE_CACHE) {

@@ -29,10 +29,7 @@ class PlusstarController extends AbstractAction
 
             $data = Guang\PlusstarModel::getBrands($gender);
             $data['psList'] = true; // 控制模板中的JS使用
-            $data['ps']['sName'] = '明星潮品';
-            $data['ps']['pName'] = '原创潮牌';
             $data['pageFooter'] = true;
-
             $this->_view->display('list', $data);
         } else {
             $this->setTitle('国际优选');
@@ -40,8 +37,6 @@ class PlusstarController extends AbstractAction
 
             $data = Guang\PlusstarModel::getFirstBrands($gender);
             $data['psList'] = true; // 控制模板中的JS使用
-            $data['ps']['sName'] = '设计师';
-            $data['ps']['pName'] = '经典潮牌';
             $data['pageFooter'] = true;
 
             $this->_view->display('list', $data);
@@ -61,8 +56,6 @@ class PlusstarController extends AbstractAction
 
         $data = Guang\PlusstarModel::getBrands($gender);
         $data['psList'] = true; // 控制模板中的JS使用
-        $data['ps']['sName'] = '明星潮品';
-        $data['ps']['pName'] = '原创潮牌';
 
         $this->_view->display('list', $data);
     }