update files

@@ -57,9 +57,11 @@ class NewsaleData
 		$param['client_secret'] = Sign::getSign($param);
 		$urlList['new'] = Yohobuy::httpBuildQuery(Yohobuy::API_URL,$param);
 		$param['dayLimit'] = 2;
+		unset($param['client_secret']);
 		$param['client_secret'] = Sign::getSign($param);
 		$urlList['week'] = Yohobuy::httpBuildQuery(Yohobuy::API_URL,$param);
 		$param['dayLimit'] = 3;
+		unset($param['client_secret']);
 		$param['client_secret'] = Sign::getSign($param);
 		$urlList['sale'] = Yohobuy::httpBuildQuery(Yohobuy::API_URL,$param);
 		//var_dump($urlList);exit;
@@ -120,7 +122,7 @@ class NewsaleData
 	 * @param  integer $page 		分页第几页, 默认第1页
 	 * @return array           		折扣专区商品数据
 	 */
-	public static function getSaleProducts($gender, $channel, $limit = 50, $page = 1)
+	public static function getSaleProducts($gender, $channel, $limit = 60, $page = 1)
 	{
 		$param = Yohobuy::param();
 		$param['method'] = 'app.search.sales';
@@ -133,16 +135,19 @@ class NewsaleData
 		$urlList = array();
 		$param['p_d'] = '0.1,0.3';
 		$param['client_secret'] = Sign::getSign($param);
-		$urlList['oneThree'] = Yohobuy::httpBuildQuery(Yohobuy::API_URL,$param);
+		$urlList['1-3折'] = Yohobuy::httpBuildQuery(Yohobuy::API_URL,$param);
 		$param['p_d'] = '0.4,0.6';
+		unset($param['client_secret']);
 		$param['client_secret'] = Sign::getSign($param);
-		$urlList['fourSix'] = Yohobuy::httpBuildQuery(Yohobuy::API_URL,$param);
+		$urlList['4-6折'] = Yohobuy::httpBuildQuery(Yohobuy::API_URL,$param);
 		$param['p_d'] = '0.7,0.9';
+		unset($param['client_secret']);
 		$param['client_secret'] = Sign::getSign($param);
-		$urlList['SevenNine'] = Yohobuy::httpBuildQuery(Yohobuy::API_URL,$param);
+		$urlList['7-9折'] = Yohobuy::httpBuildQuery(Yohobuy::API_URL,$param);
 		$param['p_d'] = '0.1,0.9';
+		unset($param['client_secret']);
 		$param['client_secret'] = Sign::getSign($param);
-		$urlList['OneNine'] = Yohobuy::httpBuildQuery(Yohobuy::API_URL,$param);
+		$urlList['ALL'] = Yohobuy::httpBuildQuery(Yohobuy::API_URL,$param);
 		
 		return Yohobuy::getMulti($urlList);
 	}

+<?php
+
+namespace Plugin\DataProcess;
+
+/**
+ * 分类数据处理类
+ */
+class ClassProcess
+{
+
+    /**
+     * 处理品类数据
+     * @param $data
+     * @return array 处理之后的品类数据
+     */
+    public static function getClassData($data)
+    {
+        $num = 1;
+        $classes = array();
+
+        foreach ($data as $k => $v){
+            $oneClass = array('name'=>$k, 'ca'=>array());
+            if($num === 1)
+            {
+                $oneClass['focus'] = true;
+            }
+
+            foreach ($v as $val) {
+                $item = array();
+                $item['name'] = $val['category_name'];
+                foreach ($val['sub'] as $value) {
+                    $subitem = array();
+                    $subitem['name'] = $value['category_name'];
+                    $subitem['url'] = $value['category_id'];
+                
+                    $item['sub'][] = $subitem;
+                }
+
+                $oneClass['ca'][] = $item;
+            }
+
+            $num++;
+            $classes[] = $oneClass;
+        }
+
+        return $classes;
+        
+    }
+}

 <?php
 
-namespace Plugin;
+namespace Plugin\DataProcess;
+use Plugin\Helpers;
 
 /**
  * 楼层数据处理类
@@ -78,14 +79,15 @@ class FloorProcess
      */
     private static function single_image($data, $type)
     {
-        $result = array();
-
+        if(empty($data)){
+            return array();
+        }
         foreach ($data as &$one) {
             $one['img'] = Helpers::getImageUrl($one['src'], 750, 364, 1);
+            unset($one['src']);
         }
-        $result['list'] = $data;
 
-        return array('singleImage'=>$result);
+        return array('banner'=>$data);
     }
 
     /**
@@ -215,7 +217,7 @@ class FloorProcess
             $one['img'] = Helpers::getImageUrl($one['src'], 186, 203, 1);
             unset($one['src']);
         }
-        $data['banner']['list'] = $data['big_image'];
+        $data['banner'] = $data['big_image'];
         unset($data['big_image']);
 
         foreach ($data['list'] as &$one) {
@@ -224,7 +226,7 @@ class FloorProcess
         }
         $result = $data;
 
-        return $result;
+        return array('creativeLife'=>$result);
     }
 
     /**
@@ -247,6 +249,23 @@ class FloorProcess
     }
 
     /**
+     * plus,star
+     * @param  array $data 单名字图片数据
+     * @param $type 类型 默认1:男首页 2:女首页  3:kids 4:lifestyle
+     * @return array       处理之后的单名字图片数据
+     */
+    private static function single_name_image($data,$type){
+        
+        if(empty($data)){
+            return array();
+        }
+        $data['name'] = $data['title'];
+        $data['img'] = Images::getImageUrl($data['src'], 640, 198, 2);
+        
+        return array('plusStar'=>$data['data']);
+    }
+
+    /**
      * 也许喜欢数据处理方法
      * @param  array $data 也许喜欢数据
      * @param $type 类型 默认1:男首页 2:女首页  3:kids 4:lifestyle

+<?php
+
+namespace Plugin\DataProcess;
+use Plugin\Helpers;
+
+/**
+ * 新品到着、折扣专区数据处理类
+ */
+class NewSaleProcess
+{
+
+    /**
+     * 处理新品到着、折扣专区数据
+     * 
+     * @param  array $data  接口传回的数据
+     * @return array       处理之后的数据
+     */
+    public static function newSaleData($focus, $products)
+    {
+        $result = array(
+            'headerBanner' => self::bannerData($focus)
+        );
+
+        $list = array('list'=>array());
+        foreach($products as $single)
+        {
+            $noTab = true;
+            if(isset($single['tabs']) && $noTab)
+            {
+                $list['tabs'] = array();
+                foreach ($single['tabs'] as $one)
+                {
+                    $list['tabs'][] = $one;
+                }
+                $noTab = false;
+            }
+
+            $list['list'][] = $single['product_list'];
+        }
+        $result['listNav'] = $list;
+        
+        return $result;
+    }
+
+    /**
+     * 处理页面顶部焦点图数据
+     * 
+     * @param  array $data 接口传回的焦点图数据
+     * @return array       处理之后的数据
+     */
+    private static function bannerData($data)
+    {
+        $result = array('list'=>array());
+
+        foreach ($data as $single)
+        {
+            foreach ($single['data'] as $one)
+            {
+                $banner = array();
+                $banner['img'] = Helpers::getImageUrl($one['src'], 750, 364, 1);
+                $banner['url'] = $one['url'];
+                $result['list'][] = $banner;
+            }
+        }
+
+        return $result;
+    }
+}

@@ -8,6 +8,30 @@ var gulp = require('gulp'),
     compass = require('gulp-compass'),
     cp = require('child_process');
 
+var fs = require('fs'),
+    ftp = require('gulp-ftp'),
+    gutil = require('gulp-util'),
+    uglify = require('gulp-uglify'),
+    Package = require('father').SpmPackage,
+    transport = require('gulp-spm'),
+    concat = require('gulp-concat');
+
+var config = JSON.parse(fs.readFileSync('./package.json').toString());
+
+var rootDist = 'dist/myohobuy/',
+    ftpConfig = {
+        host: '218.94.75.58',
+        user: 'php',
+        pass: 'yoho9646'
+    };
+
+var distDir = {
+    js: rootDist + config.version,
+    css: rootDist + config.version,
+    img: rootDist + 'assets/img',
+    font: rootDist + 'assets/font'
+};
+
 gulp.task('default', ['compass', 'compass-watch', 'spm-doc']);
 
 // compass
@@ -45,4 +69,122 @@ gulp.task('spm-doc', function() {
     sd.on('exit', function(code) {
         console.log('process spm doc exit with code ' + code);
     });
+});
+
+//发布
+gulp.task('dist', ['assets', 'compass-production', 'build'], function() {
+    var ftpstream = ftp(ftpConfig);
+
+    return gulp.src('dist/**/')
+        .pipe(ftpstream)
+        .pipe(gutil.noop());
+});
+
+//font+img->dist/assets
+gulp.task('assets', function() {
+    gulp.src('img/**')
+        .pipe(gulp.dest(distDir.img));
+    gulp.src('font/*')
+        .pipe(gulp.dest(distDir.font));
+});
+
+//compass
+gulp.task('compass-production', ['assets'], function() {
+    gulp.src('sass/index.scss')
+        .pipe(
+            compass({
+                css: distDir.css,
+                sass: 'sass',
+                image: distDir.image,
+                font: distDir.font,
+                http_path: '/',
+                style: 'compressed'
+            })
+        )
+        .on('error', function(error) {
+            console.log(error);
+            this.emit('end');
+        });
+});
+
+//spm build
+gulp.task('build', ['libs', 'business']);
+
+//libs
+gulp.task('libs', ['pre-libs', 'concat-min-libs', 'clear-libs']);
+
+gulp.task('pre-libs', function() {
+    var obj = {
+        name: '',
+        version: config.version,
+        spm: config.spm
+    };
+    var packages = [],
+        libsjs = '';
+
+    var libCon, key, i;
+
+    var pkg;
+
+    obj.spm.main = 'libs.js';
+    obj.spm.buildArgs = '--idleading {{}} --include all';
+
+    libCon = JSON.stringify(obj);
+
+    fs.renameSync('package.json', 'package.bak.json');
+    fs.writeFileSync('package.json', libCon);
+
+    for (key in obj.spm.dependencies) {
+        if (obj.spm.inside && obj.spm.inside[key]) {
+            packages.push(obj.spm.inside[key]);
+        } else {
+            packages.push(key);
+        }
+    }
+
+    for (i = 0; i < packages.length; i++) {
+        libsjs += 'require("' + packages[i] + '");';
+    }
+
+    fs.writeFileSync('libs.js', libsjs); //重写入口文件
+
+    pkg = new Package(__dirname);
+
+    return gulp.src(pkg.main)
+        .pipe(transport({
+            pkg: pkg
+        }))
+        .pipe(gulp.dest(distDir.js));
+});
+
+gulp.task('concat-min-libs', ['pre-libs'], function() {
+    var path = distDir.js + '/libs.js';
+    var jsStr = fs.readFileSync(path).toString();
+
+    fs.writeFileSync(path, jsStr.substr(jsStr.indexOf('});') + 4));
+
+    return gulp.src(['js/sea.js', distDir + '/libs.js'])
+        .pipe(concat('lib.js'))
+        .pipe(uglify())
+        .pipe(gulp.dest(distDir.js));
+});
+
+gulp.task('clear-libs', ['concat-min-libs'], function() {
+    fs.renameSync('package.bak.json', 'package.json');
+    fs.unlinkSync('./libs.js');
+    fs.unlinkSync(distDir.js + '/libs.js');
+});
+
+gulp.task('business', ['libs'], function() {
+    var pkg = new Package(__dirname);
+
+    return gulp.src(pkg.main)
+        .pipe(transport({
+            pkg: pkg
+        }))
+        .pipe(concat('index-debug.js'))
+        .pipe(gulp.dest(distDir.js))
+        .pipe(uglify())
+        .pipe(concat('index.js'))
+        .pipe(gulp.dest(distDir.js));
 });
\ No newline at end of file

@@ -18,22 +18,32 @@
     "dependencies": {
       "yoho.zepto": "1.1.60",
       "yoho.jquery": "1.8.3",
-      "yoho.lazyload":"1.1.0",
+      "yoho.lazyload": "1.1.0",
       "mlellipsis": "0.0.6",
       "yoho.iswiper": "3.0.1",
-      "iscroll": "5.1.2"
+      "iscroll": "5.1.2",
+      "import-style": "1.0.0"
     },
     "devDependencies": {
       "expect.js": "0.3.1"
+    },
+    "inside": {
+      "iscroll": "iscroll/iscroll-probe"
     }
   },
   "devDependencies": {
-    "spm": "3",
+    "father": "^1.0.0",
     "gulp": "^3.9.0",
-    "gulp-compass": "^2.1.0"
+    "gulp-compass": "^2.1.0",
+    "gulp-concat": "^2.6.0",
+    "gulp-ftp": "^1.0.4",
+    "gulp-spm": "^0.11.3",
+    "gulp-uglify": "^1.4.2",
+    "gulp-util": "^3.0.6",
+    "spm": "3"
   },
   "scripts": {
     "test": "spm test",
     "build": "spm build"
   }
-}
\ No newline at end of file
+}

@@ -16,11 +16,6 @@
         {{# twoColumnGoods}}
             {{> common/two_column_goods}}
         {{/ twoColumnGoods}}
-        
-        {{! 底部banner}}
-        {{# bannerBottom}}
-            {{> common/banner_bottom}}
-        {{/ bannerBottom}}
 
         <div class="overlay"></div>
     </div>

@@ -16,11 +16,6 @@
         {{# maybeLike}}
             {{> common/maybe_like}}
         {{/ maybeLike}}
-
-        {{! 底部banner}}
-        {{# bannerBottom}}
-            {{> common/banner_bottom}}
-        {{/ bannerBottom}}
         <div class="overlay"></div>
     </div>
     

@@ -8,7 +8,7 @@
         
         {{! 首页header}}
         {{# homeHeader}}
-            {{> home_header}}
+            {{> common/home_header}}
         {{/ homeHeader}}
         
         {{> common/content}}

-<div class="banner-bottom">
-    <a href="{{url}}">
-        <img class="lazy" data-original="{{img}}" alt="">
-    </a>
-</div>
\ No newline at end of file

@@ -11,9 +11,9 @@
                     {{/ iconsEnter}}
  
                     {{! 中间banner}}
-                    {{# bannerCenter}}
-                        {{> common/banner_center}}
-                    {{/ bannerCenter}}
+                    {{# banner}}
+                        {{> common/banner}}
+                    {{/ banner}}
                
                     {{! 热门品类}}
                     {{# hotCategory}}
@@ -60,9 +60,5 @@
                     {{# maybeLike}}
                         {{> common/maybe_like}}
                     {{/ maybeLike}}
-
-                    {{! 底部banner}}
-                    {{# bannerBottom}}
-                        {{> common/banner_bottom}}
-                    {{/ bannerBottom}}
+                    
         {{/ content}}
\ No newline at end of file

 {{> common/floor_header_more}}
 <div class="creative-life">
-    <a class="banner" href="{{url}}">
-        <img class="lazy" data-original="{{banner}}">
-    </a>
+    {{# banner}}
+        <a class="banner" href="{{url}}">
+            <img class="lazy" data-original="{{img}}">
+        </a>
+    {{/ banner}}
     <ul class="classify-list clearfix">
-        {{# classify}}
+        {{# list}}
             <li class="classify">
                 <a href="{{url}}">
                     <div class="classify-logo">
@@ -13,6 +15,6 @@
                     <p class="classify-name">{{name}}</p>
                 </a>
             </li>
-        {{/ classify}}
+        {{/ list}}
     </ul>
 </div>
\ No newline at end of file

-{{# title}}
-    <div class="floor-header">
-        <h2>{{name}}</h2>
-    </div>
-{{/ title}}
+<div class="floor-header">
+    <h2>{{name}}</h2>
+</div>

@@ -2,7 +2,7 @@
 
 use Action\AbstractAction;
 use LibModels\Wap\Home\IndexData;
-use Plugin\FloorProcess;
+use Plugin\DataProcess\FloorProcess;
 /**
  * 男生首页
  */
@@ -19,7 +19,7 @@ class BoysController extends AbstractAction
         // 设置顶部信息（搜索）
         $this->setHomeChannelHeader();
 
-		$data = array();
+		$data = array('boysHomePage'=>true);
 
 		// 频道数据
 		$channelData = IndexData::getUserChannelData(0, '1,3', '201504091403001');

@@ -2,7 +2,7 @@
 
 use Action\AbstractAction;
 use LibModels\Wap\Home\IndexData;
-use Plugin\FloorProcess;
+use Plugin\DataProcess\FloorProcess;
 /**
  * 女生首页
  */
@@ -19,7 +19,7 @@ class GirlsController extends AbstractAction
         // 设置顶部信息（搜索）
         $this->setHomeChannelHeader();
 
-		$data = array();
+		$data = array('grilsHomePage' => true);
 
 		// 频道数据
 		$channelData = IndexData::getUserChannelData(0, '2,3', '201504091403002');
@@ -39,438 +39,6 @@ class GirlsController extends AbstractAction
 			$data['content'][] = array('maybeLike' =>$maybeLike);
 		}*/
  
-		$data = array(
-			'grilsHomePage' => true,
-		    'headerDownload' => array(
-		        'img' => 'http://img11.static.yhbimg.com/adpic/2015/02/28/18/01d83bfad41c8fca8fd1ad334216d7d733.jpg?imageView/2/w/640/h/480',
-		        'url' => 'http://www.baidu.com'
-		    ),
-		    'homeHeader' => array(
-		        'bgColor' => '#FF88AE',
-		        'searchUrl' => ''
-		    ),
-		    'sideNav' => array(
-		        array(
-		            'textCn' => '男生',
-		            'textEn' => 'Boys',
-		            'styleClass' => 'boys',
-		            'url' => ''
-		        ),
-		        array(
-		            'textCn' => '女生',
-		            'textEn' => 'GIRLS',
-		            'styleClass' => 'girls',
-		            'url' => ''
-		        ),
-		        array(
-		            'textCn' => '潮童',
-		            'textEn' => 'KIDS',
-		            'styleClass' => 'kids',
-		            'url' => ''
-		        ),
-		        array(
-		            'textCn' => '创意生活',
-		            'textEn' => 'LIFE STYLE',
-		            'styleClass' => 'life',
-		            'url' => ''
-		        ),
-		        array(
-		            'textCn' => '逛',
-		            'textEn' => 'TRENDFINDER',
-		            'styleClass' => 'guang',
-		            'subNav' => array(
-		                'list' => array(
-		                    array(
-		                        'textCn' => '逛',
-		                        'textEn' => 'TrendFinder',
-		                        'back' => true,
-		                        'bgColor' => '#fd307f'
-		                    ),
-		                    array(
-		                        'textCn' => '查看全部',
-		                        'url' => ''
-		                    ),
-		                    array(
-		                        'textCn' => '只看男生',
-		                        'textEn' => 'Boys',
-		                        'url' => ''
-		                    ),
-		                    array(
-		                        'textCn' => '只看女生',
-		                        'textEn' => 'Girls',
-		                        'url' => '',
-		                        'isSelect' => true
-		                    )
-		                )
-		            )
-		        )
-		    ),
-		    'content' => array(
-		        'bannerTop' => array(
-		            'list' => array(
-		                array(
-		                    'url' => '',
-		                    'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg'
-		                ),
-		                array(
-		                    'url' => '',
-		                    'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg'
-		                ),
-		                array(
-		                    'url' => '',
-		                    'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg'
-		                )
-		            )
-		        ),
-		        'iconsEnter' => array(
-		            'list' => array(
-		                array(
-		                    'url' => '',
-		                    'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
-		                    'text' => '新品到着'
-		                ),
-		                array(
-		                    'url' => '',
-		                    'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
-		                    'text' => '全球优选'
-		                ),
-		                array(
-		                    'url' => '',
-		                    'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
-		                    'text' => '明星潮牌'
-		                ),
-		                array(
-		                    'url' => '',
-		                    'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
-		                    'text' => '全部品类'
-		                ),
-		                array(
-		                    'url' => '',
-		                    'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
-		                    'text' => '逛'
-		                ),
-		                array(
-		                    'url' => '',
-		                    'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
-		                    'text' => '搭配指南'
-		                ),
-		                array(
-		                    'url' => '',
-		                    'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
-		                    'text' => '潮品推荐'
-		                ),
-		                array(
-		                    'url' => '',
-		                    'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
-		                    'text' => '折扣精选'
-		                )
-		            )
-		        ),
-                'bannerCenter' => array(
-                    'img' => 'http://img02.yohoboys.com/staticimg/2015/06/24/16/02ee02f1dd11c9103f7cf7995eafdaa605.jpg',
-                    'url' => ''
-                ),
-
-		        'hotCategory' => array(
-		            'title' => array(
-                        'name' => '热门品类'
-                     ),
-		            'list' => array(
-		                array(
-		                    'textCn' => '卫衣',
-		                    'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-		                    'url' => ''
-		                ),
-		                array(
-		                    'textCn' => 'T恤',
-		                    'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-		                    'url' => ''
-		                ),
-		                array(
-		                    'textCn' => '打底衫',
-		                    'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-		                    'url' => ''
-		                ),
-		                array(
-		                    'textCn' => '打底衫',
-		                    'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-		                    'url' => ''
-		                ),
-		                array(
-		                    'textCn' => '打底衫',
-		                    'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-		                    'url' => ''
-		                ),
-		                array(
-		                    'textCn' => '打底衫',
-		                    'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-		                    'url' => ''
-		                ),
-		                array(
-		                    'textCn' => '打底衫',
-		                    'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-		                    'url' => ''
-		                ),
-		                array(
-		                    'textCn' => '打底衫',
-		                    'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-		                    'url' => ''
-		                ) 
-		            )
-		        ),
-		        'hotBrands' => array(
-                    'title' => array(
-                        'name' => '热门品牌'
-                     ),
-		            'list' => array(
-		                array(
-		                    'textCn' => 'Moussy',
-		                    'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-		                    'url' => ''
-		                ),
-		                array(
-		                    'textCn' => 'Moussy',
-		                    'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-		                    'url' => ''
-		                ),
-		                array(
-		                    'textCn' => 'Moussy',
-		                    'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-		                    'url' => ''
-		                ),
-		                array(
-		                    'textCn' => 'Moussy',
-		                    'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-		                    'url' => ''
-		                ),
-		                array(
-		                    'textCn' => 'Moussy',
-		                    'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-		                    'url' => ''
-		                ),
-		                array(
-		                    'textCn' => 'Moussy',
-		                    'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-		                    'url' => ''
-		                )
-		            )
-		        ),
-		       
-		        'trendColloaction' => array(
-                    'title' => array(
-                        'title' => '潮人  ▪  搭配',
-                        'more_name' => '...',
-                        'more_url'  => 'http://www.yohobuy.com?openby:yohobuy={"action":"go.guangchannel","params":{"id":3,"name":"\u6f6e\u4eba"}}'
-                     ),	           
-		            'article' => array(
-		                array(
-                            'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-                            'url' => ''
-                        ),
-                        array(
-                            'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-                            'url' => ''
-                        ) 
-		            ),
-		             
-		            'recommend_collocation' => array(
-		                array(
-		                    'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-		                    'url' => ''
-		                ),
-		                array(
-		                    'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-		                    'url' => ''
-		                ),
-		                array(
-		                    'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-		                    'url' => ''
-		                ),
-		                array(
-		                    'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-		                    'url' => ''
-		                ),
-		                array(
-		                    'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-		                    'url' => ''
-		                )
-		            )
-		        ),
-		        'trendTopics' => array(	           
-                    'title' => array(
-                        'title' => '潮品  ▪  话题',
-                        'more_name' => '...',
-                        'more_url'  => 'http://www.yohobuy.com?openby:yohobuy={"action":"go.guangchannel","params":{"id":3,"name":"\u6f6e\u4eba"}}'
-                     ), 
-		            'list' => array(
-		                array(
-		                    'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-		                    'url' => '',
-		                    'title' => '现代裁剪',
-		                    'time' => '2月13日 12:34'
-		                ),
-		                array(
-		                    'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-		                    'url' => '',
-		                    'title' => '现代裁剪',
-		                    'time' => '2月13日 12:34'
-		                ),
-		                array(
-		                    'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-		                    'url' => '',
-		                    'title' => '现代裁剪',
-		                    'time' => '2月13日 12:34'
-		                )
-		            )
-		        ),
-		        'goodsCategory' => array(
-		            'title' => array(
-                        'title' => '潮流时装',
-                        'more_name' => '...',
-                        'more_url'  => 'http://www.yohobuy.com?openby:yohobuy={"action":"go.guangchannel","params":{"id":3,"name":"\u6f6e\u4eba"}}'
-                     ), 
-		            'big_image' => array(
-		                'list' => array(
-		                    array(
-		                        'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-		                        'url' => ''
-		                    )
-		                )
-		            ),
-		            'list' => array(
-		                array(
-		                    'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-		                    'url' => '',
-		                    'textCn' => '手表'
-		                ),
-		                array(
-		                    'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-		                    'url' => '',
-		                    'textCn' => '烛台'
-		                ),
-		                array(
-		                    'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-		                    'url' => '',
-		                    'textCn' => '围巾'
-		                ),
-		                array(
-		                    'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-		                    'url' => '',
-		                    'textCn' => '盘子'
-		                ),
-		                array(
-		                    'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-		                    'url' => '',
-		                    'textCn' => '耳机'
-		                )
-		            )
-		        ),
-               'creativeLife' => array(
-                    'title' => array(
-                        'title' => '新入住品牌',
-                        'more_name' => '...',
-                        'more_url'  => 'http://www.yohobuy.com?openby:yohobuy={"action":"go.guangchannel","params":{"id":3,"name":"\u6f6e\u4eba"}}'
-                     ), 
-                    'banner' => 'http://img10.static.yhbimg.com/yhb-img01/2015/07/09/18/0119ffceddb0819d36d74b408bd743b4a9.jpg?imageView/2/w/640/h/640',
-                    'classify' => array(
-                     array(   
-                        'url' => '',
-                        'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/04/10/05/029bef1041343ea2e31dc0423f2f176589.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
-                        'name' => '手表'
-                    ), array(
-                        'url' => '',
-                        'img' => 'http://img12.static.yhbimg.com/goodsimg/2015/07/07/09/02271a775d17649860abec4387b4559e26.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
-                        'name' => '烛台'
-                    ), array(
-                        'url' => '',
-                        'img' => 'http://img12.static.yhbimg.com/goodsimg/2015/05/19/07/02a269d20ed44803eee33e255fe88d7873.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
-                        'name' => '围巾'
-                    ), array(
-                        'url' => '',
-                        'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/06/01/07/02fe94083352435ce53b5d90812cc5bdbd.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
-                        'name' => '盘子'
-                    ), array(
-                        'url' => '',
-                        'img' => 'http://img12.static.yhbimg.com/goodsimg/2015/07/08/07/028db8a2afbe4ecbf37bebc7e98e8e1e80.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
-                        'name' => '耳机'
-                    ), array(
-                        'url' => '',
-                        'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/04/22/02/02a1b688b6dafd786f391e0624aea1e93b.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
-                        'name' => '生活'
-                    )
-                )
-            ), 
- 
-
-		    'plusStar' => array(
-		    	array(
-                    'name' => 'PLUS 全球优选',
-		            'url' => '',
-		            'img' => 'http://img11.static.yhbimg.com/yhb-img01/2015/07/13/15/014f7ba48071160053ac3b8f045b9fc264.jpg?imageView/2/w/640/h/640'
-                 ), 
-		    	 array(
-                    'name' => 'PLUS 全球优选',
-		            'url' => '',
-		            'img' => 'http://img11.static.yhbimg.com/yhb-img01/2015/07/13/15/014f7ba48071160053ac3b8f045b9fc264.jpg?imageView/2/w/640/h/640'
-                )
-		    ),
- 
-		    'maybeLike' => array(
-		        'goods' => array(
-		             array(   
-		                'id' => 1,
-		                'thumb' => 'http://img11.static.yhbimg.com/goodsimg/2015/03/02/07/01ebfb219e22770ffb0c2c3a2cbb2b4bef.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
-		                'name' => 'GAWS DIGI 丛林数码印花拼接卫衣',
-		                'isLike' => false,
-		                'price' => 1268,
-		                'salePrice' => 589,
-		                'isSale' => true,
-		                'isFew' => true,
-		                'isNew' => false,
-		                'url' => ''
-		            ), array(
-		                'id' => 2,
-		                'thumb' => 'http://img13.static.yhbimg.com/goodsimg/2015/03/03/08/023d70c59e81ccbfb39404487aaf642da2.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
-		                'name' => 'CLOTtee 撞色连帽外套',
-		                'isLike' => false,
-		                'price' => 488,
-		                'salePrice' => 139,
-		                'isSale' => true,
-		                'isFew' => true,
-		                'isNew' => false,
-		                'url' => ''
-		            ), array(
-		                'id' => 3,
-		                'thumb' => 'http://img12.static.yhbimg.com/goodsimg/2015/03/02/08/02e2d44125e95495e3152aa459fa6b9b0c.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
-		                'name' => 'HALFGIRL 插肩棒球服短裙套装',
-		                'isLike' => true,
-		                'price' => 478,
-		                'salePrice' => 208,
-		                'isSale' => true,
-		                'isFew' => true,
-		                'isNew' => false,
-		                'url' => ''
-		            ), array(
-		                'id' => 4,
-		                'thumb' => 'http://img12.static.yhbimg.com/goodsimg/2015/03/03/08/022f25fbe177ee12803c522f04fcce06d0.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
-		                'name' => '黄伟文Wyman X yohood联名商品YYYOHOOD连帽卫衣',
-		                'isLike' => false,
-		                'salePrice' => 148,
-		                'isSale' => false,
-		                'isFew' => false,
-		                'isNew' => true,
-		                'url' => ''
-		            )
-		        )
-		    ),
-
-		    'bannerBottom' => array(
-		        'img' => 'http://img02.yohoboys.com/staticimg/2015/06/24/16/02ee02f1dd11c9103f7cf7995eafdaa605.jpg',
-		        'url' => ''
-		    )
-
-		));
- 
 		$this->_view->assign('title', 'YOHO!有货');
 		$this->_view->display('index', $data);
 	}

@@ -2,7 +2,7 @@
 
 use Action\AbstractAction;
 use LibModels\Wap\Home\IndexData;
-use Plugin\FloorProcess;
+use Plugin\DataProcess\FloorProcess;
 /**
  * 儿童首页
  */
@@ -20,7 +20,7 @@ class KidsController extends AbstractAction
         // 设置顶部信息（搜索）
         $this->setHomeChannelHeader();
 
-        $data = array();
+        $data = array('kidsHomePage'=>true);
 
         // 频道数据
         $channelData = IndexData::getUserChannelData(0, '', 'e9875682c1599a886bfbdb965b740022');

@@ -2,7 +2,7 @@
 
 use Action\AbstractAction;
 use LibModels\Wap\Home\IndexData;
-use Plugin\FloorProcess;
+use Plugin\DataProcess\FloorProcess;
 
 /**
  * 创意生活首页
@@ -20,14 +20,14 @@ class LifestyleController extends AbstractAction
         // 设置顶部信息（搜索）
         $this->setHomeChannelHeader();
 
-        $data = array();
+        $data = array('lifestyleHomePage'=>true);
 
         // 频道数据
-        $channelData = IndexData::getUserChannelData(0, '2,3', '201504091403002');
+        $channelData = IndexData::getUserChannelData(0, '', '9aa25f5133f011ec96c2045eb15ae425');
         $channels = array();
         if($channelData['code'] == 200)
         {
-            $data['content'] = FloorProcess::getContent($channelData['data'], 2);
+            $data['content'] = FloorProcess::getContent($channelData['data'], 4);
         }
 
         /*// 也许喜欢
@@ -40,437 +40,6 @@ class LifestyleController extends AbstractAction
             $data['content'][] = array('maybeLike' =>$maybeLike);
         }*/
  
-        $data = array(
-            'headerDownload' => array(
-                'img' => 'http://img11.static.yhbimg.com/adpic/2015/02/28/18/01d83bfad41c8fca8fd1ad334216d7d733.jpg?imageView/2/w/640/h/480',
-                'url' => 'http://www.baidu.com'
-            ),
-            'homeHeader' => array(
-                'bgColor' => '#FF88AE',
-                'searchUrl' => ''
-            ),
-            'sideNav' => array(
-                array(
-                    'textCn' => '男生',
-                    'textEn' => 'Boys',
-                    'styleClass' => 'boys',
-                    'url' => ''
-                ),
-                array(
-                    'textCn' => '女生',
-                    'textEn' => 'GIRLS',
-                    'styleClass' => 'girls',
-                    'url' => ''
-                ),
-                array(
-                    'textCn' => '潮童',
-                    'textEn' => 'KIDS',
-                    'styleClass' => 'kids',
-                    'url' => ''
-                ),
-                array(
-                    'textCn' => '创意生活',
-                    'textEn' => 'LIFE STYLE',
-                    'styleClass' => 'life',
-                    'url' => ''
-                ),
-                array(
-                    'textCn' => '逛',
-                    'textEn' => 'TRENDFINDER',
-                    'styleClass' => 'guang',
-                    'subNav' => array(
-                        'list' => array(
-                            array(
-                                'textCn' => '逛',
-                                'textEn' => 'TrendFinder',
-                                'back' => true,
-                                'bgColor' => '#fd307f'
-                            ),
-                            array(
-                                'textCn' => '查看全部',
-                                'url' => ''
-                            ),
-                            array(
-                                'textCn' => '只看男生',
-                                'textEn' => 'Boys',
-                                'url' => ''
-                            ),
-                            array(
-                                'textCn' => '只看女生',
-                                'textEn' => 'Girls',
-                                'url' => '',
-                                'isSelect' => true
-                            )
-                        )
-                    )
-                )
-            ),
-            'content' => array(
-                'bannerTop' => array(
-                    'list' => array(
-                        array(
-                            'url' => '',
-                            'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg'
-                        ),
-                        array(
-                            'url' => '',
-                            'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg'
-                        ),
-                        array(
-                            'url' => '',
-                            'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg'
-                        )
-                    )
-                ),
-                'iconsEnter' => array(
-                    'list' => array(
-                        array(
-                            'url' => '',
-                            'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
-                            'text' => '新品到着'
-                        ),
-                        array(
-                            'url' => '',
-                            'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
-                            'text' => '全球优选'
-                        ),
-                        array(
-                            'url' => '',
-                            'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
-                            'text' => '明星潮牌'
-                        ),
-                        array(
-                            'url' => '',
-                            'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
-                            'text' => '全部品类'
-                        ),
-                        array(
-                            'url' => '',
-                            'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
-                            'text' => '逛'
-                        ),
-                        array(
-                            'url' => '',
-                            'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
-                            'text' => '搭配指南'
-                        ),
-                        array(
-                            'url' => '',
-                            'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
-                            'text' => '潮品推荐'
-                        ),
-                        array(
-                            'url' => '',
-                            'img' => 'http://img02.yohoboys.com/staticimg/2015/06/30/21/02912cd7f0b2c67939404c71ef00e3f513.jpg',
-                            'text' => '折扣精选'
-                        )
-                    )
-                ),
-                'bannerCenter' => array(
-                    'img' => 'http://img02.yohoboys.com/staticimg/2015/06/24/16/02ee02f1dd11c9103f7cf7995eafdaa605.jpg',
-                    'url' => ''
-                ),
-
-                'hotCategory' => array(
-                    'title' => array(
-                        'name' => '热门品类'
-                     ),
-                    'list' => array(
-                        array(
-                            'textCn' => '卫衣',
-                            'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-                            'url' => ''
-                        ),
-                        array(
-                            'textCn' => 'T恤',
-                            'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-                            'url' => ''
-                        ),
-                        array(
-                            'textCn' => '打底衫',
-                            'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-                            'url' => ''
-                        ),
-                        array(
-                            'textCn' => '打底衫',
-                            'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-                            'url' => ''
-                        ),
-                        array(
-                            'textCn' => '打底衫',
-                            'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-                            'url' => ''
-                        ),
-                        array(
-                            'textCn' => '打底衫',
-                            'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-                            'url' => ''
-                        ),
-                        array(
-                            'textCn' => '打底衫',
-                            'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-                            'url' => ''
-                        ),
-                        array(
-                            'textCn' => '打底衫',
-                            'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-                            'url' => ''
-                        ) 
-                    )
-                ),
-                'hotBrands' => array(
-                    'title' => array(
-                        'name' => '热门品牌'
-                     ),
-                    'list' => array(
-                        array(
-                            'textCn' => 'Moussy',
-                            'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-                            'url' => ''
-                        ),
-                        array(
-                            'textCn' => 'Moussy',
-                            'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-                            'url' => ''
-                        ),
-                        array(
-                            'textCn' => 'Moussy',
-                            'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-                            'url' => ''
-                        ),
-                        array(
-                            'textCn' => 'Moussy',
-                            'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-                            'url' => ''
-                        ),
-                        array(
-                            'textCn' => 'Moussy',
-                            'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-                            'url' => ''
-                        ),
-                        array(
-                            'textCn' => 'Moussy',
-                            'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-                            'url' => ''
-                        )
-                    )
-                ),
-               
-                'trendColloaction' => array(
-                    'title' => array(
-                        'title' => '潮人  ▪  搭配',
-                        'more_name' => '...',
-                        'more_url'  => 'http://www.yohobuy.com?openby:yohobuy={"action":"go.guangchannel","params":{"id":3,"name":"\u6f6e\u4eba"}}'
-                     ),            
-                    'article' => array(
-                        array(
-                            'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-                            'url' => ''
-                        ),
-                        array(
-                            'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-                            'url' => ''
-                        ) 
-                    ),
-                     
-                    'recommend_collocation' => array(
-                        array(
-                            'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-                            'url' => ''
-                        ),
-                        array(
-                            'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-                            'url' => ''
-                        ),
-                        array(
-                            'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-                            'url' => ''
-                        ),
-                        array(
-                            'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-                            'url' => ''
-                        ),
-                        array(
-                            'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-                            'url' => ''
-                        )
-                    )
-                ),
-                'trendTopics' => array(            
-                    'title' => array(
-                        'title' => '潮品  ▪  话题',
-                        'more_name' => '...',
-                        'more_url'  => 'http://www.yohobuy.com?openby:yohobuy={"action":"go.guangchannel","params":{"id":3,"name":"\u6f6e\u4eba"}}'
-                     ), 
-                    'list' => array(
-                        array(
-                            'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-                            'url' => '',
-                            'title' => '现代裁剪',
-                            'time' => '2月13日 12:34'
-                        ),
-                        array(
-                            'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-                            'url' => '',
-                            'title' => '现代裁剪',
-                            'time' => '2月13日 12:34'
-                        ),
-                        array(
-                            'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-                            'url' => '',
-                            'title' => '现代裁剪',
-                            'time' => '2月13日 12:34'
-                        )
-                    )
-                ),
-                'goodsCategory' => array(
-                    'title' => array(
-                        'title' => '潮流时装',
-                        'more_name' => '...',
-                        'more_url'  => 'http://www.yohobuy.com?openby:yohobuy={"action":"go.guangchannel","params":{"id":3,"name":"\u6f6e\u4eba"}}'
-                     ), 
-                    'big_image' => array(
-                        'list' => array(
-                            array(
-                                'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-                                'url' => ''
-                            )
-                        )
-                    ),
-                    'list' => array(
-                        array(
-                            'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-                            'url' => '',
-                            'textCn' => '手表'
-                        ),
-                        array(
-                            'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-                            'url' => '',
-                            'textCn' => '烛台'
-                        ),
-                        array(
-                            'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-                            'url' => '',
-                            'textCn' => '围巾'
-                        ),
-                        array(
-                            'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-                            'url' => '',
-                            'textCn' => '盘子'
-                        ),
-                        array(
-                            'img' => 'http://img.alicdn.com/imgextra/i1/2086467111/TB2CsqHdXXXXXaDXpXXXXXXXXXX_!!2086467111.jpg',
-                            'url' => '',
-                            'textCn' => '耳机'
-                        )
-                    )
-                ),
-               'creativeLife' => array(
-                    'title' => array(
-                        'title' => '新入住品牌',
-                        'more_name' => '...',
-                        'more_url'  => 'http://www.yohobuy.com?openby:yohobuy={"action":"go.guangchannel","params":{"id":3,"name":"\u6f6e\u4eba"}}'
-                     ), 
-                    'banner' => 'http://img10.static.yhbimg.com/yhb-img01/2015/07/09/18/0119ffceddb0819d36d74b408bd743b4a9.jpg?imageView/2/w/640/h/640',
-                    'classify' => array(
-                     array(   
-                        'url' => '',
-                        'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/04/10/05/029bef1041343ea2e31dc0423f2f176589.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
-                        'name' => '手表'
-                    ), array(
-                        'url' => '',
-                        'img' => 'http://img12.static.yhbimg.com/goodsimg/2015/07/07/09/02271a775d17649860abec4387b4559e26.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
-                        'name' => '烛台'
-                    ), array(
-                        'url' => '',
-                        'img' => 'http://img12.static.yhbimg.com/goodsimg/2015/05/19/07/02a269d20ed44803eee33e255fe88d7873.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
-                        'name' => '围巾'
-                    ), array(
-                        'url' => '',
-                        'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/06/01/07/02fe94083352435ce53b5d90812cc5bdbd.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
-                        'name' => '盘子'
-                    ), array(
-                        'url' => '',
-                        'img' => 'http://img12.static.yhbimg.com/goodsimg/2015/07/08/07/028db8a2afbe4ecbf37bebc7e98e8e1e80.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
-                        'name' => '耳机'
-                    ), array(
-                        'url' => '',
-                        'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/04/22/02/02a1b688b6dafd786f391e0624aea1e93b.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
-                        'name' => '生活'
-                    )
-                )
-            ), 
- 
-
-            'plusStar' => array(
-                array(
-                    'name' => 'PLUS 全球优选',
-                    'url' => '',
-                    'img' => 'http://img11.static.yhbimg.com/yhb-img01/2015/07/13/15/014f7ba48071160053ac3b8f045b9fc264.jpg?imageView/2/w/640/h/640'
-                 ), 
-                 array(
-                    'name' => 'PLUS 全球优选',
-                    'url' => '',
-                    'img' => 'http://img11.static.yhbimg.com/yhb-img01/2015/07/13/15/014f7ba48071160053ac3b8f045b9fc264.jpg?imageView/2/w/640/h/640'
-                )
-            ),
- 
-            'maybeLike' => array(
-                'goods' => array(
-                     array(   
-                        'id' => 1,
-                        'thumb' => 'http://img11.static.yhbimg.com/goodsimg/2015/03/02/07/01ebfb219e22770ffb0c2c3a2cbb2b4bef.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
-                        'name' => 'GAWS DIGI 丛林数码印花拼接卫衣',
-                        'isLike' => false,
-                        'price' => 1268,
-                        'salePrice' => 589,
-                        'isSale' => true,
-                        'isFew' => true,
-                        'isNew' => false,
-                        'url' => ''
-                    ), array(
-                        'id' => 2,
-                        'thumb' => 'http://img13.static.yhbimg.com/goodsimg/2015/03/03/08/023d70c59e81ccbfb39404487aaf642da2.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
-                        'name' => 'CLOTtee 撞色连帽外套',
-                        'isLike' => false,
-                        'price' => 488,
-                        'salePrice' => 139,
-                        'isSale' => true,
-                        'isFew' => true,
-                        'isNew' => false,
-                        'url' => ''
-                    ), array(
-                        'id' => 3,
-                        'thumb' => 'http://img12.static.yhbimg.com/goodsimg/2015/03/02/08/02e2d44125e95495e3152aa459fa6b9b0c.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
-                        'name' => 'HALFGIRL 插肩棒球服短裙套装',
-                        'isLike' => true,
-                        'price' => 478,
-                        'salePrice' => 208,
-                        'isSale' => true,
-                        'isFew' => true,
-                        'isNew' => false,
-                        'url' => ''
-                    ), array(
-                        'id' => 4,
-                        'thumb' => 'http://img12.static.yhbimg.com/goodsimg/2015/03/03/08/022f25fbe177ee12803c522f04fcce06d0.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
-                        'name' => '黄伟文Wyman X yohood联名商品YYYOHOOD连帽卫衣',
-                        'isLike' => false,
-                        'salePrice' => 148,
-                        'isSale' => false,
-                        'isFew' => false,
-                        'isNew' => true,
-                        'url' => ''
-                    )
-                )
-            ),
-
-            'bannerBottom' => array(
-                'img' => 'http://img02.yohoboys.com/staticimg/2015/06/24/16/02ee02f1dd11c9103f7cf7995eafdaa605.jpg',
-                'url' => ''
-            )
-
-        ));
- 
         $this->_view->assign('title', 'YOHO!有货');
         $this->_view->display('index', $data);
     }

 <?php
 use Action\AbstractAction;
-// use LibModels\Wap\Category\ClassData;
+use LibModels\Wap\Category\ClassData;
+use Plugin\DataProcess\ClassProcess;
 
 /**
  * 品牌
@@ -9,86 +10,17 @@ class ClassController extends AbstractAction
 {
     public function indexAction()
     {
-  //   	$brandsData = ClassData::getClassesData();
+    	$brandsData = ClassData::getClassesData();
 
-  //   	$classes = array();
-  //   	if($brandsData['code'] == 200)
-  //   	{
-  //   		$classes =  $brandsData['data'];
-  //   	}
+    	$classes = array();
+    	if($brandsData['code'] == 200)
+    	{
+    		$classes =  ClassProcess::getClassData($brandsData['data']);
+    	}
 
-  //   	echo '<pre>';
-  //   	var_dump($classes);exit;
-
-		// $this->_view->assign('title', 'YOHO!有货');
-  //   	$this->_view->display('class', compact('classes'));
         $data = array(
             "searchUrl" => "",
-            "class" => array(
-                array(
-                    "name" => "Boy",
-                    "focus" => true,
-                    "ca" => array(
-                        array(
-                            "name" => "上衣",
-                            "sub" => array(
-                                array(
-                                    "name" => "全部上衣",
-                                    "url" => ""
-                                ),
-                                array(
-                                    "name" => "卫衣",
-                                    "url" => ""
-                                )
-                            )
-                        ),
-                        array(
-                            "name" => "裤装",
-                            "sub" => array(
-                                array(
-                                    "name" => "全部裤装",
-                                    "url" => ""
-                                ),
-                                array(
-                                    "name" => "牛仔裤",
-                                    "url" => ""
-                                )
-                            )
-                        )
-                    )
-                ),
-                array(
-                    "name" => "Girl",
-                    "ca" => array(
-                        array(
-                            "name" => "裙装",
-                            "sub" => array(
-                                array(
-                                    "name" => "全部裙装",
-                                    "url" => ""
-                                ),
-                                array(
-                                    "name" => "短裙",
-                                    "url" => ""
-                                )
-                            )
-                        ),
-                        array(
-                            "name" => "鞋靴",
-                            "sub" => array(
-                                array(
-                                    "name" => "全部鞋靴",
-                                    "url" => ""
-                                ),
-                                array(
-                                    "name" => "休闲鞋",
-                                    "url" => ""
-                                )
-                            )
-                        )
-                    )
-                )
-            )
+            "class" => $classes
         );
 
         $this->_view->assign('title', 'YOHO!有货');

@@ -52,7 +52,59 @@ class NewsaleController extends AbstractAction
                       array(
                           'title' => '销量'
                       )
-             )       
+             ),
+             'goodsContainer'  => array(
+                 'goods'  => array(
+                      array(
+                          'id' => '',
+                          'thumb' => 'http://img12.static.yhbimg.com/adpic/2015/08/14/12/0205a06e86edb30a7d1833477a9e886577.jpg?imageView/2/w/640/h/480',
+                          'name'  => 'GAWS DIGI 丛林数码印花拼接卫衣',
+                          'isLike'  => false,
+                          'price'  => 1268,
+                          'salePrice'  => 589,
+                          'isSale'  => true,
+                          'isFew'  => true,
+                          'isNew'  => false,
+                          'url'  => ''
+                      ),
+                      array(
+                          'id' => '',
+                          'thumb' => 'http://img12.static.yhbimg.com/adpic/2015/08/14/12/0205a06e86edb30a7d1833477a9e886577.jpg?imageView/2/w/640/h/480',
+                          'name'  => 'GAWS DIGI 丛林数码印花拼接卫衣',
+                          'isLike'  => false,
+                          'price'  => 1268,
+                          'salePrice'  => 589,
+                          'isSale'  => true,
+                          'isFew'  => true,
+                          'isNew'  => false,
+                          'url'  => ''
+                      ),
+                      array(
+                          'id' => '',
+                          'thumb' => 'http://img12.static.yhbimg.com/adpic/2015/08/14/12/0205a06e86edb30a7d1833477a9e886577.jpg?imageView/2/w/640/h/480',
+                          'name'  => 'GAWS DIGI 丛林数码印花拼接卫衣',
+                          'isLike'  => false,
+                          'price'  => 1268,
+                          'salePrice'  => 589,
+                          'isSale'  => true,
+                          'isFew'  => true,
+                          'isNew'  => false,
+                          'url'  => ''
+                      ),
+                      array(
+                          'id' => '',
+                          'thumb' => 'http://img12.static.yhbimg.com/adpic/2015/08/14/12/0205a06e86edb30a7d1833477a9e886577.jpg?imageView/2/w/640/h/480',
+                          'name'  => 'GAWS DIGI 丛林数码印花拼接卫衣',
+                          'isLike'  => false,
+                          'price'  => 1268,
+                          'salePrice'  => 589,
+                          'isSale'  => true,
+                          'isFew'  => true,
+                          'isNew'  => false,
+                          'url'  => ''
+                      )
+                  )
+             )      
         );
 
         $this->_view->assign('title', '新品到着');
@@ -147,7 +199,7 @@ class NewsaleController extends AbstractAction
                           'url'  => ''
                       )
                   )
-             ), 
+             )
         );
  
         /*$this->_view->assign('title', '折扣专区');
@@ -158,7 +210,7 @@ class NewsaleController extends AbstractAction
         $focus = array();
         if($focusData['code'] == 200)
         {
-        	foreach ($focusData['data'] as $single)
+            foreach ($focusData['data'] as $single)
             {
                 foreach ($single['data'] as $val) {
                     $val['src'] = Helpers::getImageUrl($val['src'], 375, 667, 1);