Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

-commit 7229af7cecf40861c6fb3987c1f38ac3da2faef9
-Author: Lynnic <gunix@foxmail.com>
-Date:   Fri Nov 13 17:45:31 2015 +0800
-
-    update
-
-commit 2c21a46be447a1bc1982d8ad3cad7f8c00a63a0f
-Author: xuqi <xuqi9010@gmail.com>
-Date:   Fri Nov 13 17:27:02 2015 +0800
-
-    rm temp file
-
-commit 34763241edf84698b24ecb2aa2f2bfa1e37afc32
-Author: liangzhifeng <zhifeng.liang@yoho.cn>
-Date:   Fri Nov 13 16:58:28 2015 +0800
-
-    update yas version
-
-commit 3b4a6cd6177ec9cef8ab953b165da1d222974382
-Merge: c1b68bb 7ccb30d
-Author: liangzhifeng <zhifeng.liang@yoho.cn>
-Date:   Fri Nov 13 16:39:59 2015 +0800
-
-    Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
-
-commit c1b68bb739bb2535d9d8a205aa198ccc1844752d
-Author: liangzhifeng <zhifeng.liang@yoho.cn>
-Date:   Fri Nov 13 16:39:26 2015 +0800
-
-    update yas version
-
-commit 7ccb30d2ca3d45bf82638f63c8ae0e0db27b3a5f
-Author: Lynnic <gunix@foxmail.com>
-Date:   Fri Nov 13 15:37:18 2015 +0800
-
-    changed the name of conflicted function
-
-commit e5569a46931588f42607e84bec1db64a8cf46bcd
-Merge: a7552b8 b4b964e
-Author: Lynnic <gunix@foxmail.com>
-Date:   Fri Nov 13 14:50:09 2015 +0800
-
-    Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
-
-commit b4b964e589b88c0821e1138e46d56dca3f139bcd
-Merge: 6f68082 7a6895e
-Author: ccbikai <ccbikai@qq.com>
-Date:   Fri Nov 13 14:35:33 2015 +0800
-
-    Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
-
-commit 6f6808272a6a6e40e425bc3df69eff26512e5c80
-Author: ccbikai <ccbikai@qq.com>
-Date:   Fri Nov 13 14:35:28 2015 +0800
-
-    修改地址页面样式
-
-commit 7a6895ebfa302d46b791f78196614b9a6d9404ce
-Merge: 8413e20 0ff1e35
-Author: uedxwg <xieweiguang11@163.com>
-Date:   Fri Nov 13 14:23:11 2015 +0800
-
-    Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
-
-commit 8413e2059464cec3c386bbcb25cd5f7f9bc3e2da
-Author: uedxwg <xieweiguang11@163.com>
-Date:   Fri Nov 13 14:22:31 2015 +0800
-
-    'hotrank'
-
-commit a7552b8af3de3fba625736b885aac3d6aeb57b0a
-Author: lynnic <gunix@foxmail.com>
-Date:   Fri Nov 13 13:40:22 2015 +0800
-
-    update
-
-commit 9ce2bf2913bc9909a5fac0fa4a30777ba4db23c3
-Author: ccbikai <ccbikai@qq.com>
-Date:   Fri Nov 13 13:35:07 2015 +0800
-
-    增
-
-commit 0ff1e35337c656c288243a40602bd0cb7a85fdb4
-Merge: 88ef01d cdba827
-Author: ccbikai <ccbikai@qq.com>
-Date:   Fri Nov 13 13:30:37 2015 +0800
-
-    merge code
-
-commit 88ef01d3931dc8b61657019bde2e02186c0222e3
-Author: ccbikai <ccbikai@qq.com>
-Date:   Fri Nov 13 13:29:45 2015 +0800
-
-    地址模板修改
-
-commit 072785ab101cff6bcd3f5548165cad6d18c79aa1
-Merge: 5e3e194 cdba827
-Author: liangzhifeng <zhifeng.liang@yoho.cn>
-Date:   Fri Nov 13 13:25:15 2015 +0800
-
-    Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
-
-commit cdba82787e574d2274025227bdcfd97553fbe30e
-Merge: 91cebbc 35dbe8b
-Author: hf <fei.hong@yoho.cn>
-Date:   Fri Nov 13 13:24:46 2015 +0800
-
-    merge master css js code
-
-commit 91cebbc682532eab919ea903c7668f3ff9fb01a1
-Author: hf <fei.hong@yoho.cn>
-Date:   Fri Nov 13 13:24:01 2015 +0800
-
-    merge master css js code
-
-commit 5e3e194ef858a371f65b0a6e2965f79ec65fdb49
-Merge: 9cb6944 35dbe8b
-Author: liangzhifeng <zhifeng.liang@yoho.cn>
-Date:   Fri Nov 13 13:23:02 2015 +0800
-
-    Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
-
-commit 35dbe8bc57c1accce337e199df6d323d4e7b7ead
-Author: ccbikai <ccbikai@qq.com>
-Date:   Fri Nov 13 13:22:34 2015 +0800
-
-    地址管理增加数据
-
-commit 9cb6944ea59db8f2958f10de518db079aa0bc3ad
-Merge: 09500b4 bfaf6f7
-Author: liangzhifeng <zhifeng.liang@yoho.cn>
-Date:   Fri Nov 13 13:22:11 2015 +0800
-
-    Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
-
-commit f735917c59165291cfb3fcb064e06bb424e64b40
-Author: lynnic <gunix@foxmail.com>
-Date:   Fri Nov 13 13:19:56 2015 +0800
-
-    product detail
-
-commit bfaf6f7da9e7b3f15ca3e2223af4b04e890f7181
-Merge: ddb8634 da2dd89
-Author: ccbikai <ccbikai@qq.com>
-Date:   Fri Nov 13 11:47:23 2015 +0800
-
-    Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
-
-commit ddb8634a6229dafd38b4380cdb4861d768cb207c
-Author: ccbikai <ccbikai@qq.com>
-Date:   Fri Nov 13 11:47:18 2015 +0800
-
-    地址管理页面样式
-
-commit 09500b4de29d35d7edb9526feaef5cfda53bc48b
-Merge: b3d45dc da2dd89
-Author: liangzhifeng <zhifeng.liang@yoho.cn>
-Date:   Fri Nov 13 11:18:17 2015 +0800
-
-    Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
-
-commit b3d45dcfe30770f888ccde298a1aa65c7b06c829
-Author: liangzhifeng <zhifeng.liang@yoho.cn>
-Date:   Fri Nov 13 11:17:43 2015 +0800
-
-    update the version of yas
-
-commit da2dd89e32be5bb319141af09fe5b8f1404e192d
-Author: hf <fei.hong@yoho.cn>
-Date:   Fri Nov 13 11:15:06 2015 +0800
-
-    merge master css js code
-
-commit e677bad09bfc0959d667a29a035375cf9feba5d2
-Merge: cef0926 f1ec957
-Author: hf <fei.hong@yoho.cn>
-Date:   Fri Nov 13 10:52:10 2015 +0800
-
-    merge master css js code
-
-commit cef09262f23a1ba1fadef9c56fb2088cfd75cde5
-Merge: d927c9f 1483b13
-Author: hf <fei.hong@yoho.cn>
-Date:   Fri Nov 13 10:51:02 2015 +0800
-
-    do merge master code
-
-commit 1483b137ec3273153d3dfa8f47aadd6b4b88fb9c
-Author: ccbikai <ccbikai@qq.com>
-Date:   Fri Nov 13 10:18:43 2015 +0800
-
-    个人中心首页完善
-
-commit 2b3507b2e6319697d96723e7ca3d72fcdce8bedc
-Merge: a772911 67b011f
-Author: ccbikai <ccbikai@qq.com>
-Date:   Fri Nov 13 09:39:53 2015 +0800
-
-    Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
-
-commit 67b011f1647426d9d4e59daf67cd75e2e29d1acb
-Merge: 9c12951 a7a3613
-Author: uedxwg <xieweiguang11@163.com>
-Date:   Thu Nov 12 18:40:33 2015 +0800
-
-    Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
-
-commit 9c12951e3d4aaa06cc99b8d76da2d8aa1b3bfcc1
-Author: uedxwg <xieweiguang11@163.com>
-Date:   Thu Nov 12 18:39:49 2015 +0800
-
-    'hotrank'
-
-commit a7a36134fbca6e9d5f4cb60e40fb9a9a83cb2c1a
-Merge: d336ffb 47f54e6
-Author: Rock Zhang <iamgtskk@gmail.com>
-Date:   Thu Nov 12 18:30:47 2015 +0800
-
-    Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
-    
-    Conflicts:
-    	framework
-
-commit d336ffb79bb7ead39b230b751f6a7a296cec4b78
-Author: Rock Zhang <iamgtskk@gmail.com>
-Date:   Thu Nov 12 18:30:23 2015 +0800
-
-    完成个人中心部分功能
-
-commit f1ec957452269f97436356c5e718460847d32b52
-Author: hf <fei.hong@yoho.cn>
-Date:   Thu Nov 12 18:18:41 2015 +0800
-
-    modify to search goods list style
-
-commit 47f54e6c63dbfdf87d125c17c7538cfd73c9fab9
-Merge: 1ba211d a72e1a2
-Author: lore-w <metro-cpu@hotmail.com>
-Date:   Thu Nov 12 18:16:56 2015 +0800
-
-    Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
-    
-    Conflicts:
-    	static/js/me/entry.js
-    	static/sass/me/_index.scss
-    	template/m.yohobuy.com/partials/layout/use.phtml
-
-commit afe58b17129e155698bf1114ef95ea25e867f43b
-Author: hf <fei.hong@yoho.cn>
-Date:   Thu Nov 12 18:12:58 2015 +0800
-
-    modify to search goods list style
-
-commit 32827f6aa9b9c3fe39a213e3c4001399868a10f0
-Merge: 76c5106 80adb41
-Author: hf <fei.hong@yoho.cn>
-Date:   Thu Nov 12 18:12:27 2015 +0800
-
-    Merge remote-tracking branch 'origin/hotfix'
-
-commit 1ba211d6670de1f88538065b9276bdd63be55aef
-Author: lore-w <metro-cpu@hotmail.com>
-Date:   Thu Nov 12 18:11:25 2015 +0800
-
-    收藏、意见反馈
-
-commit 80adb4135a73c332ce435693a83fd5610c20721e
-Author: ccbikai <ccbikai@qq.com>
-Date:   Thu Nov 12 18:09:40 2015 +0800
-
-    取消搜索不 focus
-
-commit 76c51067fd3afdb2e04ece7f3cf21c7a3d98fb8d
-Author: hf <fei.hong@yoho.cn>
-Date:   Thu Nov 12 18:01:57 2015 +0800
-
-    modify to search goods list style
-
-commit ebf90d5f499facf9b0b38d3afe3a421273e319f7
-Author: hf <fei.hong@yoho.cn>
-Date:   Thu Nov 12 18:01:37 2015 +0800
-
-    modify to search goods list style
-
-commit 74c6939a6c0af5dea824447eedd57b40d5d36e8e
-Merge: d874739 4be2273
-Author: hf <fei.hong@yoho.cn>
-Date:   Thu Nov 12 18:

+/**
+ *  商品详情
+ * @author: liangzhifeng<zhifeng.liang@yoho.cn>
+ * @date: 2015/11/18
+ */

@@ -7,4 +7,5 @@
 require('./newsale/newarrival');
 require('./newsale/newarrival');
 require('./newsale/discount');
 require('./newsale/discount');
 require('./list');
 require('./list');
-require('./detail/detail');
+require('./detail/detail');
+require('./detail/desc');

@@ -310,11 +310,12 @@ class HomeController extends AbstractAction
         $page = $this->get('page', 1);
         $page = $this->get('page', 1);
         $limit = $this->get('limit', 10);
         $limit = $this->get('limit', 10);
         $uid = $this->getUid();
         $uid = $this->getUid();
-        $yh_channel = Helpers::getChannelByCookie();
-        $uid=5687179;
         $gender = Helpers::getGenderByCookie();
         $gender = Helpers::getGenderByCookie();
+        $yh_channel = Helpers::getChannelByCookie();
         $guangInfo = \home\GuangModel::getMyGuang($uid, $page,$yh_channel,$gender, $limit);
         $guangInfo = \home\GuangModel::getMyGuang($uid, $page,$yh_channel,$gender, $limit);
-        $this->_view->display('my-guang', array('myGuang'=>$guangInfo));
+        $this->setTitle('我收藏的');
+        $this->setNavHeader('我收藏的', true, '');
+        $this->_view->display('my-guang', array( 'myGuangPage' => true,'myGuang'=>$guangInfo,'pageFooter' => true));
     }
     }
 
 
     /**
     /**

@@ -13,68 +13,19 @@ class GuangModel
 {
 {
 
 
     //获取我的逛列表
     //获取我的逛列表
-    public static function getMyGuang($uid, $page,$yh_channel=1, $gender = '1,3', $limit = 10)
+    public static function getMyGuang($uid, $page, $yh_channel = 1, $gender = '1,3', $limit = 10)
     {
     {
         $result = array();
         $result = array();
         //调用接口获取数据
         //调用接口获取数据
-        $res = GuangData::getGuangInfo($uid, $page, $yh_channel,$gender, $limit);
-        $guangInfo = $res['data']['data'];
-        if ($guangInfo)
+        $res = GuangData::getGuangInfo($uid, $page, $yh_channel, $gender, $limit);
+        if (!empty($res['data']['data']))
         {
         {
-            foreach ($guangInfo as $k => $v)
+            foreach ($res['data']['data'] as $k => $v)
             {
             {
-                $result[$k]['id'] = $v['id'];
-                $result[$k]['author'] = $v['author'];
-                $tag = self::getTag(TRUE, intval($v['category_id']));
-                $result[$k]['url'] = $v['url'];
-                $result[$k]['img'] = $v['src'];
-                $result[$k]['title'] = $v['title'];
-                $result[$k]['text'] = $v['intro'];
-                $result[$k]['pageView'] = $v['views_num'];
-                $result[$k]['publish_time'] = $v['publish_time'];
-                $like = ($v['isPraise'] == "Y") ? true : false;
-                $collect = ($v['isFavor'] == "Y") ? true : false;
-                $result[$k]['like'] = array('isLiked' => $like, 'count' => $v['praise_num']);
-                $result[$k]['collect'] = array('isCollected' => $collect, 'url' => $v['url']);
-                $result[$k] += $tag;
-                $result[$k]['share'] = $v['url'];
+                $result[$k] = Helpers::formatArticle($v, true, false, true, $uid);
             }
             }
         }
         }
-
         return $result;
         return $result;
     }
     }
 
 
-    //【标签】isTip-小贴士;isCollocation-搭配 isFashionMan-潮人 isFashionGood-潮品 isTopic-话题
-    private static function getTag($isShow, $tagId)
-    {
-        $ret['showTags'] = $isShow;
-        $ret['isTopic'] = false;
-        $ret['isCollocation'] = false;
-        $ret['isFashionMan'] = false;
-        $ret['isFashionGood'] = false;
-        $ret['isTip'] = false;
-        switch ($tagId)
-        {
-            case 1:
-                $ret['isTopic'] = true;
-                break;
-            case 2:
-                $ret['isCollocation'] = true;
-                break;
-            case 3:
-                $ret['isFashionMan'] = true;
-                break;
-            case 4:
-                $ret['isFashionGood'] = true;
-                break;
-            case 5:
-                $ret['isTip'] = true;
-                break;
-            default:
-                $ret['showTags'] = FALSE;
-                break;
-        }
-        return $ret;
-    }
-
 }
 }