Merge branch 'feature/wap325' into develop

@@ -60,6 +60,8 @@ class CacheConfig
 
 
     const KEY_CODE_YOHOCOIN_BANNER = 'key_code_yohocoin_banner';// 有货币banner数据
     const KEY_CODE_YOHOCOIN_BANNER = 'key_code_yohocoin_banner';// 有货币banner数据
 
 
+    const KEY_CODE_LOGISTIC_BANNER = 'key_code_logistic_banner';// 物流详情banner数据
+
     const KEY_WEB_HOME_NAVBAR_DATA = 'key_web_home_navbar_data';//web的导航数据
     const KEY_WEB_HOME_NAVBAR_DATA = 'key_web_home_navbar_data';//web的导航数据
     const KEY_WEB_HOME_CHANNEL_DATA = 'key_web_home_channel_data';//web首页频道数据[boys, girls, kids, lifestyle]
     const KEY_WEB_HOME_CHANNEL_DATA = 'key_web_home_channel_data';//web首页频道数据[boys, girls, kids, lifestyle]
     const KEY_WEB_HOME_CHANNEL_NEWARRIVAL_DATA = 'key_web_home_newarrival_data';//web频道最新上架数据[boys, girls, kids, lifestyle]
     const KEY_WEB_HOME_CHANNEL_NEWARRIVAL_DATA = 'key_web_home_newarrival_data';//web频道最新上架数据[boys, girls, kids, lifestyle]

@@ -18,7 +18,7 @@ class SideData
 {
 {
 
 
     const URI_LEFTNAV_ENTRANCE = 'operations/api/v5/entrance/getEntrance';
     const URI_LEFTNAV_ENTRANCE = 'operations/api/v5/entrance/getEntrance';
-    const URI_LEFTNAV_CATEGORY = 'operations/api/v5/category/getCategory';
+    const URI_LEFTNAV_CATEGORY = 'operations/api/v6/category/getCategory';
 
 
     /**
     /**
      * 左侧边栏的分类和图标数据
      * 左侧边栏的分类和图标数据
@@ -40,6 +40,7 @@ class SideData
 
 
         $param = Yohobuy::param();
         $param = Yohobuy::param();
         $param['client_type'] = 'h5'; // 调用H5手机网站的
         $param['client_type'] = 'h5'; // 调用H5手机网站的
+        $param['private_key'] = 'fd4ad5fcfa0de589ef238c0e7331b585'; // 调用Android的private_key不然会有参数验证错误的bug
         $param['client_secret'] = Sign::getSign($param);
         $param['client_secret'] = Sign::getSign($param);
 
 
         return Yohobuy::get(Yohobuy::SERVICE_URL . self::URI_LEFTNAV_CATEGORY, $param);
         return Yohobuy::get(Yohobuy::SERVICE_URL . self::URI_LEFTNAV_CATEGORY, $param);

@@ -52,13 +52,20 @@ class DetailData
      * 商品尺码信息
      * 商品尺码信息
      * 
      * 
      * @param int $productSkn 商品SKN号
      * @param int $productSkn 商品SKN号
+     * @param int $uid 用户ID
+     * @param int $udid 客户端唯一标识
      * @return array
      * @return array
      */
      */
-    public static function sizeInfo($productSkn)
+    public static function sizeInfo($productSkn, $uid, $udid)
     {
     {
         $param = Yohobuy::param();
         $param = Yohobuy::param();
         $param['method'] = 'h5.product.intro';
         $param['method'] = 'h5.product.intro';
         $param['productskn'] = $productSkn;
         $param['productskn'] = $productSkn;
+        if (!empty($uid)) {
+            $param['uid'] = $uid;
+        }
+        $param['udid'] = $udid;
+
         $param['client_secret'] = Sign::getSign($param);
         $param['client_secret'] = Sign::getSign($param);
 
 
         return Yohobuy::get(Yohobuy::API_URL, $param);
         return Yohobuy::get(Yohobuy::API_URL, $param);

@@ -4,8 +4,7 @@
  * @date: 2015/10/10
  * @date: 2015/10/10
  */
  */
 
 
-var $ = require('jquery'),
-    Swiper = require('yoho.iswiper');
+var $ = require('jquery');
 
 
 var info = require('./info'),
 var info = require('./info'),
     loadMore = info.loadMore;
     loadMore = info.loadMore;
@@ -24,18 +23,12 @@ var $infoList = $('#info-list'),
 
 
 var state = {};
 var state = {};
 
 
-var mySwiper;
-
 if ($loadMoreInfo.length > 0) {
 if ($loadMoreInfo.length > 0) {
     $loading = $loadMoreInfo.children('.loading');
     $loading = $loadMoreInfo.children('.loading');
     $noMore = $loadMoreInfo.children('.no-more');
     $noMore = $loadMoreInfo.children('.no-more');
 }
 }
 
 
-mySwiper = new Swiper('.swiper-container', {
-    lazyLoading: true,
-    pagination: '.swiper-pagination',
-    autoplay: 3000
-});
+info.initSwiper(curType);
 
 
 info.initInfosEvt($infoList);
 info.initInfosEvt($infoList);
 
 
@@ -86,6 +79,7 @@ $nav.on('touchend touchcancel', function(e) {
         $loading.addClass('hide');
         $loading.addClass('hide');
         $noMore.addClass('hide');
         $noMore.addClass('hide');
 
 
+        state[curType].isTab = true;
         loadMore($content, state[curType]);
         loadMore($content, state[curType]);
     } else {
     } else {
 
 

@@ -7,16 +7,19 @@
 var $ = require('jquery'),
 var $ = require('jquery'),
     Hammer = require('yoho.hammer'),
     Hammer = require('yoho.hammer'),
     ellipsis = require('mlellipsis'),
     ellipsis = require('mlellipsis'),
-    lazyLoad = require('yoho.lazyload');
+    lazyLoad = require('yoho.lazyload'),
+    Swiper = require('yoho.iswiper');
 
 
 var tip = require('../plugin/tip');
 var tip = require('../plugin/tip');
 var loading = require('../plugin/loading');
 var loading = require('../plugin/loading');
 
 
 var $loadMoreInfo = $('#load-more-info');
 var $loadMoreInfo = $('#load-more-info');
 var $loading = $(''),
 var $loading = $(''),
-    $noMore = $('');
+    $noMore = $(''),
+    $swiper = $('');
 
 
 var searching = false;
 var searching = false;
+var mySwiper = {};
 
 
 ellipsis.init();
 ellipsis.init();
 
 
@@ -25,6 +28,19 @@ if ($loadMoreInfo.length > 0) {
     $noMore = $loadMoreInfo.children('.no-more');
     $noMore = $loadMoreInfo.children('.no-more');
 }
 }
 
 
+//初始化swiper
+function initSwiper(typeId) {
+    if (typeof typeId === undefined) {
+        return;
+    }
+    mySwiper[typeId] = new Swiper('.swiper-cont-' + typeId, {
+        lazyLoading: true,
+        wrapperClass: 'swiper-wrap-' + typeId,
+        pagination: '.swiper-pagi-' + typeId,
+        autoplay: 3000
+    });
+}
+
 /**
 /**
  * 设置指定资讯项的Lazyload和文字截取
  * 设置指定资讯项的Lazyload和文字截取
  * @params $infos 资讯项
  * @params $infos 资讯项
@@ -175,6 +191,14 @@ function loadMore($container, opt, url) {
 
 
             $container.append(data);
             $container.append(data);
 
 
+            $swiper = $container.find('.swiper-container');
+            if ($swiper.length) {
+                $swiper.addClass('swiper-cont-' + opt.type);
+                $swiper.children('.swiper-wrapper').addClass('swiper-wrap-' + opt.type);
+                $swiper.children('.swiper-pagination').addClass('swiper-pagi-' + opt.type);
+                initSwiper(opt.type);
+            }
+
             if (num > 0) {
             if (num > 0) {
                 $newItems = $container.find('.guang-info:gt(' + (num - 1) + ')');
                 $newItems = $container.find('.guang-info:gt(' + (num - 1) + ')');
             } else {
             } else {
@@ -194,14 +218,19 @@ function loadMore($container, opt, url) {
             opt.page++;
             opt.page++;
 
 
             searching = false;
             searching = false;
+            delete opt.isTab;
         },
         },
         error: function() {
         error: function() {
             tip.show('网络断开连接了~');
             tip.show('网络断开连接了~');
             searching = false;
             searching = false;
+            delete opt.isTab;
         }
         }
     });
     });
 }
 }
 
 
+
+exports.mySwiper = mySwiper;
+exports.initSwiper = initSwiper;
 exports.initInfosEvt = initInfosEvt;
 exports.initInfosEvt = initInfosEvt;
 exports.setLazyLoadAndMellipsis = setLazyLoadAndMellipsis;
 exports.setLazyLoadAndMellipsis = setLazyLoadAndMellipsis;
 exports.loadMore = loadMore;
 exports.loadMore = loadMore;

@@ -7,20 +7,40 @@
     left: 0;
     left: 0;
     right: 100rem / $pxConvertRem;
     right: 100rem / $pxConvertRem;
     width: 540rem / $pxConvertRem;
     width: 540rem / $pxConvertRem;
+    background: #f0f0f0;
     overflow: hidden;
     overflow: hidden;
+    overflow-y: auto;
     @include transition(all .3s);
     @include transition(all .3s);
 
 
-    ul {
-        background: #f0f0f0;
+    > ul {
+        margin-bottom: 20rem / $pxConvertRem;
+        background: #fff;
+        border-top: 1px solid #e0e0e0;
+        border-bottom: 1px solid #e0e0e0;
     }
     }
 
 
     li {
     li {
         position: relative;
         position: relative;
-        height: 128rem / $pxConvertRem;
-        line-height: 128rem / $pxConvertRem;
-        border-bottom: 1px solid #e0e0e0;
+        height: 80rem / $pxConvertRem;
+        line-height: 80rem / $pxConvertRem;
         background: #fff;
         background: #fff;
 
 
+        &:after {
+            content: '';
+            position: absolute;
+            right: 0;
+            bottom: 0;
+            width: 430rem / $pxConvertRem;
+            height: 0;
+            border-top: 1px solid #e0e0e0;
+        }
+
+        &:last-child {
+            &:after {
+                content: none;
+            }
+        }
+
         a {
         a {
             display: block;
             display: block;
             height: 100%;
             height: 100%;
@@ -29,6 +49,15 @@
             font-size: 24rem / $pxConvertRem;
             font-size: 24rem / $pxConvertRem;
         }
         }
 
 
+        .title {
+            display: inline-block;
+            padding-left: 10rem / $pxConvertRem;
+            font-size: 30rem / $pxConvertRem;
+            vertical-align: baseline;
+            // 此处字体小于 12px， 先扩大，再scale缩小
+            @include transform(scale(0.75));
+        }
+
         .nav-icon, .nav-img {
         .nav-icon, .nav-img {
             position: absolute;
             position: absolute;
             width: 60rem / $pxConvertRem;
             width: 60rem / $pxConvertRem;
@@ -51,9 +80,38 @@
         }
         }
 
 
         em {
         em {
-            margin-right: 10rem / $pxConvertRem;
             font-weight: bold;
             font-weight: bold;
-            font-size: 34rem / $pxConvertRem;
+            font-size: 30rem / $pxConvertRem;
+        }
+    }
+
+    .first {
+
+        li {
+            height: 100rem / $pxConvertRem;
+            line-height: 100rem / $pxConvertRem;
+            border-bottom: 1px solid #e0e0e0;
+
+            &:last-child {
+                border-bottom: none;
+            }
+
+            &:after {
+                content: none;
+            }
+
+            a {
+                font-size: 40rem / $pxConvertRem;
+            }
+
+            em {
+                font-size: 40rem / $pxConvertRem;
+            }
+
+            .title {
+                font-size: 24rem / $pxConvertRem;
+                @include transform(scale(1));
+            }
         }
         }
     }
     }
 
 
@@ -85,17 +143,17 @@
         }
         }
     }
     }
 
 
-    li.new {
-        margin: (19rem / $pxConvertRem) 0 0;
-        border-top: 1px solid #e0e0e0;
-
-        a {}
-
-        i {
-            background: image-url("side-nav/new.png") no-repeat left center;
-            background-size: 100% 100%;
-        }
-    }
+    // li.new {
+    //     margin: (19rem / $pxConvertRem) 0 0;
+    //     border-top: 1px solid #e0e0e0;
+    //
+    //     a {}
+    //
+    //     i {
+    //         background: image-url("side-nav/new.png") no-repeat left center;
+    //         background-size: 100% 100%;
+    //     }
+    // }
 
 
     li.guang, li.trendfinder {
     li.guang, li.trendfinder {
         .nav-icon {
         .nav-icon {
@@ -123,16 +181,20 @@
     @include transition(transform 0.3s);
     @include transition(transform 0.3s);
 
 
     li {
     li {
-        height: 109rem / $pxConvertRem;
-        line-height: 109rem / $pxConvertRem;
+        height: 80rem / $pxConvertRem;
+        line-height: 80rem / $pxConvertRem;
         border: none;
         border: none;
+        border-bottom: 1px solid #e0e0e0;
+
+        &:after {
+            content: none;
+        }
 
 
         a {
         a {
             position: relative;
             position: relative;
             display: block;
             display: block;
             margin: 0 0 0 (30rem / $pxConvertRem);
             margin: 0 0 0 (30rem / $pxConvertRem);
             padding-left: 50rem / $pxConvertRem;
             padding-left: 50rem / $pxConvertRem;
-            border-bottom: 1px solid #e0e0e0;
             font-size: 36rem / $pxConvertRem;
             font-size: 36rem / $pxConvertRem;
             z-index: 2;
             z-index: 2;
         }
         }
@@ -173,7 +235,7 @@
         a {
         a {
             color: #fff;
             color: #fff;
             border-bottom: none;
             border-bottom: none;
-            padding-left: 110rem / $pxConvertRem;
+            padding-left: 70rem / $pxConvertRem;
         }
         }
 
 
         .nav-back {
         .nav-back {
@@ -185,6 +247,7 @@
 
 
 .sub-nav.show {
 .sub-nav.show {
     display: block;
     display: block;
+    z-index: 1;
     @include transform(translateX(0));
     @include transform(translateX(0));
     @include transition(transform 0.3s);
     @include transition(transform 0.3s);
 }
 }

 .browse-record-good {
 .browse-record-good {
     position: relative;
     position: relative;
     padding: 0.5rem 0 0.5rem 0.75rem;
     padding: 0.5rem 0 0.5rem 0.75rem;
+    display: block;
 
 
     .thumb {
     .thumb {
         float: left;
         float: left;

 {{> layout/header}}
 {{> layout/header}}
 <div class="guang-list-page guang-page yoho-page">
 <div class="guang-list-page guang-page yoho-page">
     {{# guang}}
     {{# guang}}
-        {{#if swiper}}
-            <div class="swiper-container">
-                <div class="swiper-wrapper">
-                    {{# swiper}}
-                        <div class="swiper-slide">
-                            <a href="{{url}}">
-                                <img class="swiper-lazy" data-src="{{img}}">
-                            </a>
-                            <div class="swiper-lazy-preloader"></div>
-                        </div>
-                    {{/ swiper}}
-                </div>
-                <div class="swiper-pagination"></div>
-            </div>
-        {{/if}}
 
 
         <ul id="guang-nav" class="guang-nav clearfix">
         <ul id="guang-nav" class="guang-nav clearfix">
             {{# navs}}
             {{# navs}}
@@ -28,6 +13,23 @@
         <div id="info-list" class="info-list-container">
         <div id="info-list" class="info-list-container">
             {{# infos}}
             {{# infos}}
                 <div class="info-list{{^show}} hide{{/show}}">
                 <div class="info-list{{^show}} hide{{/show}}">
+                    {{#if show}}
+                        {{#if ../swiper}}
+                            <div class="swiper-container swiper-cont-{{@index}}">
+                                <div class="swiper-wrapper swiper-wrap-{{@index}}">
+                                    {{# swiper}}
+                                        <div class="swiper-slide">
+                                            <a href="{{url}}">
+                                                <img class="swiper-lazy" data-src="{{img}}">
+                                            </a>
+                                            <div class="swiper-lazy-preloader"></div>
+                                        </div>
+                                    {{/ swiper}}
+                                </div>
+                                <div class="swiper-pagination swiper-pagi-{{@index}}"></div>
+                            </div>
+                        {{/if}}
+                    {{/if}}
                     {{# info}}
                     {{# info}}
                         {{> guang/info}}
                         {{> guang/info}}
                     {{/ info}}
                     {{/ info}}

+{{#if swiper}}
+    <div class="swiper-container">
+        <div class="swiper-wrapper">
+            {{# swiper}}
+                <div class="swiper-slide">
+                    <a href="{{url}}">
+                        <img class="swiper-lazy" data-src="{{img}}">
+                    </a>
+                    <div class="swiper-lazy-preloader"></div>
+                </div>
+            {{/ swiper}}
+        </div>
+        <div class="swiper-pagination"></div>
+    </div>
+{{/if}}
+
 {{# infos}}
 {{# infos}}
     {{> guang/info}}
     {{> guang/info}}
 {{/ infos}}
 {{/ infos}}

 {{# browseRecord}}
 {{# browseRecord}}
-    <div class="browse-record-good clearfix" data-skn="{{product_skn}}">
+    <a class="browse-record-good clearfix" data-skn="{{product_skn}}" href="{{link}}">
         <img class="thumb lazy" data-original="{{image}}">
         <img class="thumb lazy" data-original="{{image}}">
         <div class="deps clearfix">
         <div class="deps clearfix">
             <p class="name row">{{product_name}}</p>
             <p class="name row">{{product_name}}</p>
@@ -17,7 +17,7 @@
             </p>
             </p>
             <span class="iconfont del-icon">&#xe621;</span>
             <span class="iconfont del-icon">&#xe621;</span>
         </div>
         </div>
-    </div>
+    </a>
 {{/ browseRecord}}
 {{/ browseRecord}}
 
 
 {{#if noRecord}}
 {{#if noRecord}}

@@ -60,6 +60,12 @@
                     运费
                     运费
                     <span>{{freight}}</span>
                     <span>{{freight}}</span>
                 </li>
                 </li>
+                {{#if promo_code_amount}}
+                <li>
+                    优惠码
+                    <span>{{promo_code_amount}}</span>
+                </li>
+                {{/if}}
                 {{#if coupon}}
                 {{#if coupon}}
                 <li>
                 <li>
                     优惠券
                     优惠券

-<div class="shopping-cart-good clearfix" data-id="{{id}}">
+<div class="shopping-cart-good clearfix" data-id="{{id}}" data-skn="{{skn}}">
     {{#if inValid}}
     {{#if inValid}}
         <span class="few-tag-expire">失效</span>
         <span class="few-tag-expire">失效</span>
     {{/if}}
     {{/if}}

 <div class="side-nav">
 <div class="side-nav">
-    <ul>
     {{# sideNav}}
     {{# sideNav}}
+    <ul {{#if @first}}class="first"{{/if}}>
+        {{# this}}
         <li class="{{styleClass}}">
         <li class="{{styleClass}}">
-            {{# url}}
-            <a href="{{.}}">
-            {{/ url}}
-            {{^ url}}
-            <a href="javascript:;">
-            {{/ url}}
+            {{#if url}}
+            <a href="{{url}}" style="{{#if color}}color:{{color}};{{/if}}">
+            {{else}}
+            <a href="javascript:;" style="{{#if color}}color:{{color}};{{/if}}">
+            {{/if}}
                 {{# img}}
                 {{# img}}
                 <span class="nav-img" style="background-image: url({{.}})"></span>
                 <span class="nav-img" style="background-image: url({{.}})"></span>
                 {{/ img}}
                 {{/ img}}
                 {{^ img}}
                 {{^ img}}
                 <i class="nav-icon"></i>
                 <i class="nav-icon"></i>
                 {{/ img}}
                 {{/ img}}
-                <em>{{textCn}}</em>{{textEn}}
+                <em>{{textCn}}</em>
+                <span class="title">{{textEn}}</span>
                 {{# subNav}}
                 {{# subNav}}
                 <span class="enter-subnav iconfont">&#xe614;</span>
                 <span class="enter-subnav iconfont">&#xe614;</span>
                 {{/ subNav}}
                 {{/ subNav}}
@@ -22,13 +23,12 @@
             {{# subNav}}
             {{# subNav}}
             <ul class="sub-nav">
             <ul class="sub-nav">
                 {{# list}}
                 {{# list}}
-                <li class="{{# isSelect}}current{{/ isSelect}}" style="background-color:{{bgColor}}">
-                    {{# url}}
-                    <a href="{{.}}">
-                    {{/ url}}
-                    {{^ url}}
-                    <a href="javascript:;">
-                    {{/ url}}
+                <li class="{{# isSelect}}current{{/ isSelect}}" style="background-color:{{bgColor}};">
+                    {{#if url}}
+                        <a href="{{url}}" style="{{#if color}}color:{{color}};{{/if}}">
+                    {{else}}
+                        <a href="javascript:;" style="{{#if color}}color:{{color}};{{/if}}">
+                    {{/if}}
                         {{^ back}}
                         {{^ back}}
                         <span class="nav-point iconfont">&#xe60c;</span>
                         <span class="nav-point iconfont">&#xe60c;</span>
                         {{/ back}}
                         {{/ back}}
@@ -36,13 +36,14 @@
                         <i class="nav-back iconfont">&#xe610;</i>
                         <i class="nav-back iconfont">&#xe610;</i>
                         {{/ back}}
                         {{/ back}}
                         <em>{{textCn}}</em>
                         <em>{{textCn}}</em>
-                        {{textEn}}
+                        <span class="title">{{textEn}}</span>
                     </a>
                     </a>
                 </li>
                 </li>
                 {{/ list}}
                 {{/ list}}
             </ul>
             </ul>
             {{/ subNav}}
             {{/ subNav}}
         </li>
         </li>
-        {{/ sideNav}}
+        {{/ this}}
     </ul>
     </ul>
+    {{/sideNav}}
 </div>
 </div>

@@ -315,6 +315,52 @@ class IndexModel
     }
     }
 
 
     /**
     /**
+     * 获取切换逛类别或者分页时的文章数据
+     *
+     * @param string $gender "1,3"表示男, "2,3"表示女
+     * @param int $sortId 分类ID
+     * @param int $uid 用户ID
+     * @param string $udid 客户端唯一标识
+     * @param int $page 分页第几页, 默认第1页
+     * @param string $tag 标签
+     * @param string $authorId 作者ID
+     * @param boolean $isApp 是否是APP
+     * @param boolean $showAuthor 是否显示作者
+     * @param boolean $isTab 是否为tab切换操作
+     * @return array
+     */
+    public static function getPageData($gender, $sortId, $uid, $udid, $page, $tag, $authorId, $isApp, $showAuthor, $isTab)
+    {
+        $result = array();
+
+        do {
+            $article = ListData::article($gender, $sortId, $uid, $udid, $page, $tag, $authorId);
+            if (empty($article['data']['list']['artList'])) {
+                break;
+            }
+
+            // 广告列表
+            if ($isTab && !empty($article['data']['list']['adlist'])) {
+                foreach ($article['data']['list']['adlist'] as $value) {
+                    $build = array();
+                    $build['url'] = Helpers::getFilterUrl($value['url']);
+                    $build['img'] = Helpers::getImageUrl($value['src'], 830, 327);
+                    $result['swiper'][] = $build;
+                }
+            }
+
+            /* 构建资讯文章内容 */
+            $build = array();
+            foreach ($article['data']['list']['artList'] as $article) {
+                $build[] = Helpers::formatArticle($article, true, $isApp, $showAuthor, $uid);
+            }
+            $result['infos'] = $build;
+        } while (false);
+
+        return $result;
+    }
+
+    /**
      * 构建信息内容
      * 构建信息内容
      * 
      * 
      * @param array $data
      * @param array $data

@@ -2,6 +2,8 @@
 
 
 namespace Home;
 namespace Home;
 
 
+use Configs\CacheConfig;
+use LibModels\Wap\Home\IndexData;
 use LibModels\Wap\Home\OrderData;
 use LibModels\Wap\Home\OrderData;
 use Plugin\Helpers;
 use Plugin\Helpers;
 
 
@@ -14,6 +16,7 @@ class OrderModel
 
 
     const CODE_PAYMENT = '04cf5abaa7c20178325a07c4a833782c'; //支付订单资源码
     const CODE_PAYMENT = '04cf5abaa7c20178325a07c4a833782c'; //支付订单资源码
     const CODE_STROLL = 'a7989369aa86681c678bc40f171b8f1d'; //随便逛逛url地址资源码
     const CODE_STROLL = 'a7989369aa86681c678bc40f171b8f1d'; //随便逛逛url地址资源码
+    const CODE_LOGISTIC_BANNER = '1fc9b2484fcd559049f2f7e0db313f20'; // 物流详情banner资源码
 
 
     /**
     /**
      * 订单相关数据处理
      * 订单相关数据处理
@@ -99,9 +102,16 @@ class OrderModel
     {
     {
         $result = array();
         $result = array();
 
 
-        if (isset($orderCode) && is_numeric($uid)) {
+        do {
+            if (!isset($orderCode) || !is_numeric($uid)) {
+                break;
+            }
+
             $logistics = OrderData::LogisticsData($orderCode, $uid);
             $logistics = OrderData::LogisticsData($orderCode, $uid);
-            if (!empty($logistics['data'])) {
+            if (empty($logistics['data'])) {
+                break;
+            }
+
             $result['logisticUrl'] = $logistics['data']['url'];
             $result['logisticUrl'] = $logistics['data']['url'];
             $result['logisticImg'] = $logistics['data']['logo'];
             $result['logisticImg'] = $logistics['data']['logo'];
             $result['logisticCompany'] = $logistics['data']['caption'];
             $result['logisticCompany'] = $logistics['data']['caption'];
@@ -113,6 +123,56 @@ class OrderModel
                 $build['date'] = $value['acceptTime'];
                 $build['date'] = $value['acceptTime'];
                 $result['logisticDetail'][] = $build;
                 $result['logisticDetail'][] = $build;
             }
             }
+
+            // 获取物流详情页banner
+            $banner = self::getLogisterBanner();
+            if ($banner) {
+                $result['banner'] = $banner;
+            }
+
+        } while (false);
+
+        return $result;
+    }
+
+    /**
+     * 获取物流详情页banner
+     *
+     * @return array|bool
+     */
+    private static function getLogisterBanner()
+    {
+        $result = false;
+
+        if (USE_CACHE) {
+            // 先尝试获取一级缓存(master), 有数据则直接返回.
+            $result = Cache::get(CacheConfig::KEY_CODE_LOGISTIC_BANNER, 'master');
+            if (!empty($result)) {
+                return $result;
+            }
+        }
+
+        // 调用接口获取数据
+        $banner = IndexData::getBannerStart(self::CODE_LOGISTIC_BANNER);
+        if (isset($banner['code']) && $banner['code'] == 200 && !empty($banner['data'])) {
+            $result = array();
+            // 处理数据
+            foreach ($banner['data'] as $val) {
+                foreach ($val['data'] as $single) {
+                    $result['url'] = Helpers::getFilterUrl($single['url']);
+                    $result['img'] = Helpers::getImageUrl($single['src'], 640, 200);
+                }
+            }
+        }
+
+        if (USE_CACHE) {
+            // 接口调用异常时, 不害怕，从我们的二级缓存(slave)里再取数据.
+            if (empty($result)) {
+                $result = Cache::get(CacheConfig::KEY_CODE_LOGISTIC_BANNER, 'slave');
+            }
+            // 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存
+            else {
+                Cache::set(CacheConfig::KEY_CODE_LOGISTIC_BANNER, $result);
             }
             }
         }
         }
 
 
@@ -148,6 +208,10 @@ class OrderModel
                 $result['salePrice'] = self::filterOrderPrice($orderDetail['data']['promotion_amount']); // 活动金额
                 $result['salePrice'] = self::filterOrderPrice($orderDetail['data']['promotion_amount']); // 活动金额
                 $result['freight'] = $orderDetail['data']['shipping_cost']; // 运费
                 $result['freight'] = $orderDetail['data']['shipping_cost']; // 运费
                 $result['coupon'] = self::filterOrderPrice($orderDetail['data']['coupons_amount']); // 优惠券
                 $result['coupon'] = self::filterOrderPrice($orderDetail['data']['coupons_amount']); // 优惠券
+                if (isset($orderDetail['data']['promo_code_amount'])) {
+                    $result['promo_code_amount'] = self::filterOrderPrice($orderDetail['data']['promo_code_amount']); // 优惠码
+                }
+
                 $result['yohoCoin'] = self::filterOrderPrice($orderDetail['data']['yoho_coin_num']); // YOHO币
                 $result['yohoCoin'] = self::filterOrderPrice($orderDetail['data']['yoho_coin_num']); // YOHO币
                 $result['price'] = $orderDetail['data']['amount']; // 实付金额
                 $result['price'] = $orderDetail['data']['amount']; // 实付金额
                 $result['goodsAmount'] = $orderDetail['data']['payment_amount']; // 商品总金额没有人民币符号
                 $result['goodsAmount'] = $orderDetail['data']['payment_amount']; // 商品总金额没有人民币符号

@@ -224,8 +224,7 @@ class CartModel
 
 
         $product = CartData::cartProductData($uid, $skn);
         $product = CartData::cartProductData($uid, $skn);
         if (isset($product['code']) && $product['code'] === 200) {
         if (isset($product['code']) && $product['code'] === 200) {
-            $result['code'] = 200;
-            $result['data'] = self::procGoodsDetail($product['data'], $num);
+            $result = self::procGoodsDetail($product['data'], $num);
         }
         }
 
 
         return $result;
         return $result;
@@ -244,7 +243,7 @@ class CartModel
 
 
         $product = CartData::giftProductData($skn, $promotionId);
         $product = CartData::giftProductData($skn, $promotionId);
         if (isset($product['code']) && $product['code'] === 200) {
         if (isset($product['code']) && $product['code'] === 200) {
-            $result['data'] = self::procGoodsDetail($product['data']);
+            $result = self::procGoodsDetail($product['data']);
         }
         }
 
 
         return $result;
         return $result;

@@ -39,16 +39,47 @@ class SideModel
         // 调用接口获取后台配置的侧边栏数据
         // 调用接口获取后台配置的侧边栏数据
         $side = SideData::leftNav();
         $side = SideData::leftNav();
         if (!empty($side['data'])) {
         if (!empty($side['data'])) {
+            $group = array();
+            $num = 0;
+            $groupKey = 0;
+            $count = count(($side['data']));
             foreach ($side['data'] as $key => $value) {
             foreach ($side['data'] as $key => $value) {
+                if ($value['separative_sign'] === 'Y') {
+                    $result[$num] = $group;
+                    $num++;
+                    $groupKey = 0;
+                    $group = array();
+                }
+
                 // 逛的按照原来的做法，使用配置
                 // 逛的按照原来的做法，使用配置
                 if ($value['sort_name_en'] === 'TRENDFINDER') {
                 if ($value['sort_name_en'] === 'TRENDFINDER') {
                     continue;
                     continue;
                 }
                 }
-                $result[$key]['textCn'] = $value['sort_name'];
-                $result[$key]['textEn'] = $value['sort_name_en'];
-                $result[$key]['styleClass'] = strtolower($value['sort_name_en']);
-                $result[$key]['url'] = Helpers::getFilterUrl($value['sort_url']);
-                $result[$key]['img'] = Helpers::getImageUrl($value['sort_ico'], 60, 60, 1);
+                $group[$groupKey] = self::formatSideItem($value);
+
+                // 如果存在子菜单，就输出子菜单
+                if (isset($value['sub']) && !empty($value['sub'])) {
+                    $subs = array(
+                        array(
+                            'textCn' => $group[$groupKey]['textCn'],
+                            'textEn' => $group[$groupKey]['textEn'],
+                            'back' => true,
+                            'isSelect' => false,
+                            'bgColor' => self::getSideTopColor($guangChoosed)
+                        )
+                    );
+                    foreach ($value['sub'] as $oneSub) {
+                        $subs[] = self::formatSideItem($oneSub);
+                    }
+
+                    $group[$groupKey]['styleClass'] = 'guang';
+                    $group[$groupKey]['subNav']['list'] = $subs;
+                }
+                $groupKey++;
+
+                if ($count === $key + 1) {
+                    $result[$num] = $group;
+                }
             }
             }
         }
         }
 
 
@@ -78,16 +109,11 @@ class SideModel
     private static function genLeftNavGuang($guangChoosed = 'all')
     private static function genLeftNavGuang($guangChoosed = 'all')
     {
     {
         // 判断逛的背景色
         // 判断逛的背景色
-        $color = false;
-        if ($guangChoosed === 'girls') {
-            $color = '#FF88AE';
-        } else if ($guangChoosed === 'kids') {
-            $color = '#7ad9f9';
-        } else if ($guangChoosed === 'lifestyle') {
-            $color = '#4f4138';
-        }
+        $color = self::getSideTopColor($guangChoosed);
 
 
-        return array(
+        return
+            array(
+                array(
                 'textCn' => '逛',
                 'textCn' => '逛',
                 'textEn' => 'TRENDFINDER',
                 'textEn' => 'TRENDFINDER',
                 'styleClass' => 'guang',
                 'styleClass' => 'guang',
@@ -123,7 +149,51 @@ class SideModel
                         ),
                         ),
                     )
                     )
                 )
                 )
+            )
         );
         );
     }
     }
 
 
+    /**
+     * 根据选择的频道获取逛的背景色
+     * @param string $guangChoosed 逛默认选中项 "all"表示全部,"boys":只看男生,"girls":只看女生
+     * @return string color值
+     */
+    private static function getSideTopColor($guangChoosed)
+    {
+        // 判断逛的背景色
+        $color = false;
+        if ($guangChoosed === 'girls') {
+            $color = '#FF88AE';
+        } else if ($guangChoosed === 'kids') {
+            $color = '#7ad9f9';
+        } else if ($guangChoosed === 'lifestyle') {
+            $color = '#4f4138';
+        }
+
+        return $color;
+    }
+
+
+    /**
+     * 格式化侧边栏数据
+     *
+     * @param array $data 要格式化的侧边栏数据
+     * @return array
+     */
+    private static function formatSideItem($data)
+    {
+        $result = array();
+
+        $result['textCn'] = $data['sort_name'];
+        $result['textEn'] = $data['sort_name_en'];
+        $result['styleClass'] = strtolower($data['sort_name_en']);
+        $result['url'] = Helpers::getFilterUrl($data['sort_url']);
+        $result['img'] = Helpers::getImageUrl($data['sort_ico'], 60, 60, 1);
+        if (isset($data['sort_name_color'])) {
+            $result['color'] = $data['sort_name_color'];
+        }
+
+        return $result;
+    }
+
 }
 }

@@ -378,6 +378,11 @@ class UserModel
         return $result;
         return $result;
     }
     }
 
 
+    /**
+     * 获取有货币页面的banner数据
+     *
+     * @return array|bool|mixed
+     */
     public static function getYohoCoinBanner()
     public static function getYohoCoinBanner()
     {
     {
         $result = false;
         $result = false;

@@ -335,15 +335,17 @@ class DetailModel
      * 商品尺码信息
      * 商品尺码信息
      *
      *
      * @param int $productSkn
      * @param int $productSkn
+     * @param int $uid 用户ID
+     * @param int $udid 客户端唯一标识
      * @return array
      * @return array
      */
      */
-    public static function getSizeInfo($productSkn)
+    public static function getSizeInfo($productSkn, $uid, $udid)
     {
     {
         $result = array();
         $result = array();
 
 
         if (is_numeric($productSkn)) {
         if (is_numeric($productSkn)) {
             // 调用服务
             // 调用服务
-            $sizeInfo = DetailData::sizeInfo($productSkn);
+            $sizeInfo = DetailData::sizeInfo($productSkn, $uid, $udid);
 
 
             // 商品信息
             // 商品信息
             if (isset($sizeInfo['productDescBo']['erpProductId'])) {
             if (isset($sizeInfo['productDescBo']['erpProductId'])) {

@@ -195,7 +195,9 @@ class IndexController extends AbstractAction
             $result['num'] = $num;
             $result['num'] = $num;
         }
         }
 
 
-        $this->echoJson($result);
+        $this->_view->display('gift-info', array(
+            'cartInfo' => $result
+        ));
     }
     }
 
 
 //    /*
 //    /*
@@ -223,7 +225,7 @@ class IndexController extends AbstractAction
 
 
         $this->_view->display('gift-info', array(
         $this->_view->display('gift-info', array(
             'promotionId' => $promotionId,
             'promotionId' => $promotionId,
-            'cartInfo' => $result['data']
+            'cartInfo' => $result
         ));
         ));
     }
     }
 
 

 <?php
 <?php
 
 
 use Action\AbstractAction;
 use Action\AbstractAction;
+use Guang\IndexModel;
 use LibModels\Wap\Guang\ListData;
 use LibModels\Wap\Guang\ListData;
 use Plugin\Helpers;
 use Plugin\Helpers;
 use Plugin\Cache;
 use Plugin\Cache;
@@ -42,7 +43,7 @@ class IndexController extends AbstractAction
 //            $this->setNavSide();
 //            $this->setNavSide();
 //        }
 //        }
 
 
-        $this->_view->display('index', Guang\IndexModel::getArticle($gender, $type, $uid, $udid));
+        $this->_view->display('index', IndexModel::getArticle($gender, $type, $uid, $udid));
     }
     }
 
 
     /**
     /**
@@ -91,7 +92,7 @@ class IndexController extends AbstractAction
 
 
         // 标签聚合内容列表
         // 标签聚合内容列表
         //$article = ListData::article($gender, 0, $uid, $udid, 1, $tag);
         //$article = ListData::article($gender, 0, $uid, $udid, 1, $tag);
-        $article = Guang\IndexModel::getArticleByTagOrEditor($gender, 0, $uid, $udid, 1, $tag);
+        $article = IndexModel::getArticleByTagOrEditor($gender, 0, $uid, $udid, 1, $tag);
         // 标签聚合内容不存在, 跳到错误页面
         // 标签聚合内容不存在, 跳到错误页面
         if (empty($article['data']['list']['artList'])) {
         if (empty($article['data']['list']['artList'])) {
             $this->error();
             $this->error();
@@ -184,7 +185,7 @@ class IndexController extends AbstractAction
 
 
         // 标签聚合内容列表
         // 标签聚合内容列表
         //$article = ListData::article($gender, 0, $uid, $udid, 1, null, $id);
         //$article = ListData::article($gender, 0, $uid, $udid, 1, null, $id);
-        $article = Guang\IndexModel::getArticleByTagOrEditor($gender, 0, $uid, $udid, 1, null, $id);
+        $article = IndexModel::getArticleByTagOrEditor($gender, 0, $uid, $udid, 1, null, $id);
         // 构建资讯文章内容
         // 构建资讯文章内容
         if (!empty($article['data']['list']['artList'])) {
         if (!empty($article['data']['list']['artList'])) {
             $build = array();
             $build = array();
@@ -227,6 +228,7 @@ class IndexController extends AbstractAction
             $gender = $this->get('gender');
             $gender = $this->get('gender');
             $authorId = $this->get('authorId');
             $authorId = $this->get('authorId');
             $isApp = $this->get('isApp', false);
             $isApp = $this->get('isApp', false);
+            $isTab = $this->get('isTab', false); // 是否为tab切换操作
             $showAuthor = true;
             $showAuthor = true;
             if (!empty($sortId) && !is_numeric($sortId)) {
             if (!empty($sortId) && !is_numeric($sortId)) {
                 break;
                 break;
@@ -247,18 +249,7 @@ class IndexController extends AbstractAction
                 $udid = $this->getUdid();
                 $udid = $this->getUdid();
             }
             }
             //$page = intval($page) + 1;
             //$page = intval($page) + 1;
-            $article = ListData::article($gender, $sortId, $uid, $udid, $page, $tag, $authorId);
-            if (empty($article['data']['list']['artList'])) {
-                break;
-            }
-
-            /* 构建资讯文章内容 */
-            $data = array();
-            $build = array();
-            foreach ($article['data']['list']['artList'] as $article) {
-                $build[] = Helpers::formatArticle($article, true, $isApp, $showAuthor, $uid);
-            }
-            $data['infos'] = $build;
+            $data = IndexModel::getPageData($gender, $sortId, $uid, $udid, $page, $tag, $authorId, $isApp, $showAuthor, $isTab);
         } while (false);
         } while (false);
 
 
         if (isset($data)) {
         if (isset($data)) {

@@ -90,7 +90,11 @@ class DetailController extends AbstractAction
         if (!is_numeric($productSkn)) {
         if (!is_numeric($productSkn)) {
             echo ' ';
             echo ' ';
         }
         }
-        $data = \Product\DetailModel::getSizeInfo($productSkn);
+
+        // 加入uid和udid参数，为了实现记录浏览记录的功能
+        $uid = $this->getUid();
+        $udid = $this->getUdid();
+        $data = \Product\DetailModel::getSizeInfo($productSkn, $uid, $udid);
         if (array() === $data) {
         if (array() === $data) {
             echo ' ';
             echo ' ';
             exit();
             exit();