Merge branch 'develop' of http://git.dev.yoho.cn/ued/newgirlviews into develop

Conflicts:
	package.json

 {
+    "channel": "fashion",
     "header": {
         "title": "Experience Paris with Janice Man",
         "subtitle": "走躺巴黎开阔世界",
@@ -25,6 +26,12 @@
                         },
                         {
                             "src": "http://img02.yohoboys.com/contentimg/2015/01/21/09/02c6557ee3d99a51ecdac10be6cdb9e9ae.jpg?imageMogr2/thumbnail/738x424"
+                        },
+                        {
+                            "src": "http://img01.yohoboys.com/contentimg/2015/01/21/09/01b7f4d4008c20dc7f3e7d30400a9101ec.jpg?imageMogr2/thumbnail/738x424"
+                        },
+                        {
+                            "src": "http://img02.yohoboys.com/contentimg/2015/01/21/09/02c6557ee3d99a51ecdac10be6cdb9e9ae.jpg?imageMogr2/thumbnail/738x424"
                         }
                     ],
                     "smallImgList": [
@@ -42,6 +49,12 @@
                         },
                         {
                             "src": "http://img02.yohoboys.com/contentimg/2015/01/21/09/02c6557ee3d99a51ecdac10be6cdb9e9ae.jpg?imageMogr2/thumbnail/!0120x0070r/crop/0120x0070"
+                        },
+                        {
+                            "src": "http://img01.yohoboys.com/contentimg/2015/01/21/09/01b7f4d4008c20dc7f3e7d30400a9101ec.jpg?imageMogr2/thumbnail/!0120x0070r/crop/0120x0070"
+                        },
+                        {
+                            "src": "http://img02.yohoboys.com/contentimg/2015/01/21/09/02c6557ee3d99a51ecdac10be6cdb9e9ae.jpg?imageMogr2/thumbnail/!0120x0070r/crop/0120x0070"
                         }
                     ]
                 }
@@ -214,5 +227,9 @@
                 }
             ]
         }
+    },
+    "share": {
+        "url": "www.baidu.com",
+        "cover": "http://img02.yohoboys.com/contentimg/2015/04/20/09/02a4c1e4939921602302d4141326cc700b.jpg"
     }
 }
\ No newline at end of file

 {
+    "channel": "magazine",
     "magsNew": {
         "date": "2015.03.15",
         "title": "Now is good 趁现在",
@@ -25,7 +26,36 @@
     },
     "magsList": [
         {
-            
+            "mul": "http://www.yohoboys.com/channel/detail/magazine/id/100/show/web.html",
+            "date": "2015.03.01",
+            "dateContent": "100",
+            "imgzoomSrc": "http://img01.yohoboys.com/ezineimg/2015/04/01/16/01b20d2e6601620d5293edac8c4d8793e8.jpg",
+            "originalSrc": "http://img01.yohoboys.com/ezineimg/2015/04/01/16/01b20d2e6601620d5293edac8c4d8793e8.jpg?imageMogr2/thumbnail/!0255x0321r/crop/0255x0321",
+            "magazinePics": "%5B%22http%3A%5C%2F%5C%2Fimg01.yohoboys.com%5C%2Fezineimg%5C%2F2015%5C%2F04%5C%2F01%5C%2F16%5C%2F019beea3ec2e4134076b0bee3c4d552c98.jpg%22%2C%22http%3A%5C%2F%5C%2Fimg02.yohoboys.com%5C%2Fezineimg%5C%2F2015%5C%2F04%5C%2F01%5C%2F16%5C%2F0261ca6696e05c0fe96412e5b2fe70c907.jpg%22%2C%22http%3A%5C%2F%5C%2Fimg02.yohoboys.com%5C%2Fezineimg%5C%2F2015%5C%2F04%5C%2F01%5C%2F16%5C%2F020ecceef3d6fc2ca02214cd0461886889.jpg%22%2C%22http%3A%5C%2F%5C%2Fimg01.yohoboys.com%5C%2Fezineimg%5C%2F2015%5C%2F04%5C%2F01%5C%2F16%5C%2F01a3227a773b7fa4e2bce3a2839b9b38f6.jpg%22%2C%22http%3A%5C%2F%5C%2Fimg01.yohoboys.com%5C%2Fezineimg%5C%2F2015%5C%2F04%5C%2F01%5C%2F16%5C%2F01ecfd7ea95e4003a7745afc10c03c137b.jpg%22%2C%22http%3A%5C%2F%5C%2Fimg02.yohoboys.com%5C%2Fezineimg%5C%2F2015%5C%2F04%5C%2F01%5C%2F16%5C%2F029b777746026bb747170396ab63647612.jpg%22%2C%22http%3A%5C%2F%5C%2Fimg01.yohoboys.com%5C%2Fezineimg%5C%2F2015%5C%2F04%5C%2F01%5C%2F16%5C%2F013aa361ce678423ae9a2fed903fb61915.jpg%22%2C%22http%3A%5C%2F%5C%2Fimg01.yohoboys.com%5C%2Fezineimg%5C%2F2015%5C%2F04%5C%2F01%5C%2F16%5C%2F01014af4f135fffc140ae530f6db1cf88b.jpg%22%5D"
+        },
+        {
+            "mul": "http://www.yohoboys.com/channel/detail/magazine/id/100/show/web.html",
+            "date": "2015.03.01",
+            "dateContent": "100",
+            "imgzoomSrc": "http://img01.yohoboys.com/ezineimg/2015/04/01/16/01b20d2e6601620d5293edac8c4d8793e8.jpg",
+            "originalSrc": "http://img01.yohoboys.com/ezineimg/2015/04/01/16/01b20d2e6601620d5293edac8c4d8793e8.jpg?imageMogr2/thumbnail/!0255x0321r/crop/0255x0321",
+            "magazinePics": "%5B%22http%3A%5C%2F%5C%2Fimg01.yohoboys.com%5C%2Fezineimg%5C%2F2015%5C%2F04%5C%2F01%5C%2F16%5C%2F019beea3ec2e4134076b0bee3c4d552c98.jpg%22%2C%22http%3A%5C%2F%5C%2Fimg02.yohoboys.com%5C%2Fezineimg%5C%2F2015%5C%2F04%5C%2F01%5C%2F16%5C%2F0261ca6696e05c0fe96412e5b2fe70c907.jpg%22%2C%22http%3A%5C%2F%5C%2Fimg02.yohoboys.com%5C%2Fezineimg%5C%2F2015%5C%2F04%5C%2F01%5C%2F16%5C%2F020ecceef3d6fc2ca02214cd0461886889.jpg%22%2C%22http%3A%5C%2F%5C%2Fimg01.yohoboys.com%5C%2Fezineimg%5C%2F2015%5C%2F04%5C%2F01%5C%2F16%5C%2F01a3227a773b7fa4e2bce3a2839b9b38f6.jpg%22%2C%22http%3A%5C%2F%5C%2Fimg01.yohoboys.com%5C%2Fezineimg%5C%2F2015%5C%2F04%5C%2F01%5C%2F16%5C%2F01ecfd7ea95e4003a7745afc10c03c137b.jpg%22%2C%22http%3A%5C%2F%5C%2Fimg02.yohoboys.com%5C%2Fezineimg%5C%2F2015%5C%2F04%5C%2F01%5C%2F16%5C%2F029b777746026bb747170396ab63647612.jpg%22%2C%22http%3A%5C%2F%5C%2Fimg01.yohoboys.com%5C%2Fezineimg%5C%2F2015%5C%2F04%5C%2F01%5C%2F16%5C%2F013aa361ce678423ae9a2fed903fb61915.jpg%22%2C%22http%3A%5C%2F%5C%2Fimg01.yohoboys.com%5C%2Fezineimg%5C%2F2015%5C%2F04%5C%2F01%5C%2F16%5C%2F01014af4f135fffc140ae530f6db1cf88b.jpg%22%5D"
+        },
+        {
+            "mul": "http://www.yohoboys.com/channel/detail/magazine/id/100/show/web.html",
+            "date": "2015.03.01",
+            "dateContent": "100",
+            "imgzoomSrc": "http://img01.yohoboys.com/ezineimg/2015/04/01/16/01b20d2e6601620d5293edac8c4d8793e8.jpg",
+            "originalSrc": "http://img01.yohoboys.com/ezineimg/2015/04/01/16/01b20d2e6601620d5293edac8c4d8793e8.jpg?imageMogr2/thumbnail/!0255x0321r/crop/0255x0321",
+            "magazinePics": "%5B%22http%3A%5C%2F%5C%2Fimg01.yohoboys.com%5C%2Fezineimg%5C%2F2015%5C%2F04%5C%2F01%5C%2F16%5C%2F019beea3ec2e4134076b0bee3c4d552c98.jpg%22%2C%22http%3A%5C%2F%5C%2Fimg02.yohoboys.com%5C%2Fezineimg%5C%2F2015%5C%2F04%5C%2F01%5C%2F16%5C%2F0261ca6696e05c0fe96412e5b2fe70c907.jpg%22%2C%22http%3A%5C%2F%5C%2Fimg02.yohoboys.com%5C%2Fezineimg%5C%2F2015%5C%2F04%5C%2F01%5C%2F16%5C%2F020ecceef3d6fc2ca02214cd0461886889.jpg%22%2C%22http%3A%5C%2F%5C%2Fimg01.yohoboys.com%5C%2Fezineimg%5C%2F2015%5C%2F04%5C%2F01%5C%2F16%5C%2F01a3227a773b7fa4e2bce3a2839b9b38f6.jpg%22%2C%22http%3A%5C%2F%5C%2Fimg01.yohoboys.com%5C%2Fezineimg%5C%2F2015%5C%2F04%5C%2F01%5C%2F16%5C%2F01ecfd7ea95e4003a7745afc10c03c137b.jpg%22%2C%22http%3A%5C%2F%5C%2Fimg02.yohoboys.com%5C%2Fezineimg%5C%2F2015%5C%2F04%5C%2F01%5C%2F16%5C%2F029b777746026bb747170396ab63647612.jpg%22%2C%22http%3A%5C%2F%5C%2Fimg01.yohoboys.com%5C%2Fezineimg%5C%2F2015%5C%2F04%5C%2F01%5C%2F16%5C%2F013aa361ce678423ae9a2fed903fb61915.jpg%22%2C%22http%3A%5C%2F%5C%2Fimg01.yohoboys.com%5C%2Fezineimg%5C%2F2015%5C%2F04%5C%2F01%5C%2F16%5C%2F01014af4f135fffc140ae530f6db1cf88b.jpg%22%5D"
+        },
+        {
+            "mul": "http://www.yohoboys.com/channel/detail/magazine/id/100/show/web.html",
+            "date": "2015.03.01",
+            "dateContent": "100",
+            "imgzoomSrc": "http://img01.yohoboys.com/ezineimg/2015/04/01/16/01b20d2e6601620d5293edac8c4d8793e8.jpg",
+            "originalSrc": "http://img01.yohoboys.com/ezineimg/2015/04/01/16/01b20d2e6601620d5293edac8c4d8793e8.jpg?imageMogr2/thumbnail/!0255x0321r/crop/0255x0321",
+            "magazinePics": "%5B%22http%3A%5C%2F%5C%2Fimg01.yohoboys.com%5C%2Fezineimg%5C%2F2015%5C%2F04%5C%2F01%5C%2F16%5C%2F019beea3ec2e4134076b0bee3c4d552c98.jpg%22%2C%22http%3A%5C%2F%5C%2Fimg02.yohoboys.com%5C%2Fezineimg%5C%2F2015%5C%2F04%5C%2F01%5C%2F16%5C%2F0261ca6696e05c0fe96412e5b2fe70c907.jpg%22%2C%22http%3A%5C%2F%5C%2Fimg02.yohoboys.com%5C%2Fezineimg%5C%2F2015%5C%2F04%5C%2F01%5C%2F16%5C%2F020ecceef3d6fc2ca02214cd0461886889.jpg%22%2C%22http%3A%5C%2F%5C%2Fimg01.yohoboys.com%5C%2Fezineimg%5C%2F2015%5C%2F04%5C%2F01%5C%2F16%5C%2F01a3227a773b7fa4e2bce3a2839b9b38f6.jpg%22%2C%22http%3A%5C%2F%5C%2Fimg01.yohoboys.com%5C%2Fezineimg%5C%2F2015%5C%2F04%5C%2F01%5C%2F16%5C%2F01ecfd7ea95e4003a7745afc10c03c137b.jpg%22%2C%22http%3A%5C%2F%5C%2Fimg02.yohoboys.com%5C%2Fezineimg%5C%2F2015%5C%2F04%5C%2F01%5C%2F16%5C%2F029b777746026bb747170396ab63647612.jpg%22%2C%22http%3A%5C%2F%5C%2Fimg01.yohoboys.com%5C%2Fezineimg%5C%2F2015%5C%2F04%5C%2F01%5C%2F16%5C%2F013aa361ce678423ae9a2fed903fb61915.jpg%22%2C%22http%3A%5C%2F%5C%2Fimg01.yohoboys.com%5C%2Fezineimg%5C%2F2015%5C%2F04%5C%2F01%5C%2F16%5C%2F01014af4f135fffc140ae530f6db1cf88b.jpg%22%5D"
         }
     ]
 }
\ No newline at end of file

@@ -2,8 +2,10 @@
     "defaultActionName": "index",
     "layout": {
         "default-layout": "new_layout",
-        "detail": "detail_layout",
-        "magazine": "detail_layout",
+        "detail": "common_layout",
+        "magazine": "common_layout",
+        "about/*": "common_layout",
+        "error": "common_layout",
         "default/index320": "new_layout320"
     },
     "renderOptions": {
@@ -43,6 +45,35 @@
                 "two": "two",
                 "three": "three"
             }
+        },
+        "comment/default/list": {
+            "status": true,
+            "code": 200,
+            "data": {
+                "comment": [
+                    {
+                        "username":"YOHO_9d5477",
+                        "userimg":"http:\/\/rescdn.yohoboys.com\/res\/new\/boys\/images\/detail\/user-img120.png",
+                        "type":"",
+                        "partnerType":"yoho",
+                        "isSelf":true,
+                        "content":"22",
+                        "id":"2116"
+                    },
+                    {
+                        "username":"YOHO_9d5477",
+                        "userimg":"http:\/\/rescdn.yohoboys.com\/res\/new\/boys\/images\/detail\/user-img120.png",
+                        "type":"",
+                        "partnerType":"yoho",
+                        "isSelf":true,
+                        "content":"33",
+                        "id":"2115"
+                    }
+                ],
+                "total":"2",
+                "page":"     "
+            },
+            "message":""
         }
     }
 }

+<div class="about-container clearfix">
+    {{> about/about_nav}}
+    <div class="about-body">
+        <div class="about-section">
+            <h2>客户服务：</h2>
+            <p>Email：wen#yoho.cn (发送邮件时请将#换成@)</p>
+        </div>
+        <div class="about-section">
+            <h2>广告服务：</h2>
+            <p>北京：010-85253558-814</p>
+            <p>上海：021-51001909-8005</p>
+            <p>广州：020-83831060/83777600-811</p>
+            <p>Email：niki.li#yoho.cn (发送邮件时请将#换成@)</p>
+        </div>
+        <div class="about-section">
+            <h2>市场合作：</h2>
+            <p>上海：021-51001909-8013</p>
+            <p>Email：marketing#yoho.cn (发送邮件时请将#换成@)</p>
+        </div>
+        <div class="about-section">
+            <h2>网站合作：</h2>
+            <p>Email：community#yoho.cn (发送邮件时请将#换成@)</p>
+        </div>
+        <div class="about-section">
+            <h2>有货品牌合作：</h2>
+            <p>上海：021-51001909-8007</p>
+            <p>广州：020-83831060/83777600</p>
+            <p>Email：yhpp#yoho.cn (发送邮件时请将#换成@)</p>
+        </div>
+        <div class="about-section">
+            <h2>有货市场推广：</h2>
+            <p>Email：haizheng.zhao#yoho.cn(发送邮件时请将#换成@)</p>
+        </div>
+        <div class="about-section contact-us">
+            <h2>联系我们： </h2>
+            <div class="contact-us-qr">
+                <img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/about/qr-contact-us.png" alt="Yoho!Boys">
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file

+<div class="about-container clearfix">
+    {{> about/about_nav}}
+    <div class="about-body feedback-body">
+        <div class="comments-box feedback"></div>
+    </div>
+</div>

+<div class="about-container clearfix">
+    {{> about/about_nav}}
+    <div class="about-body">
+        <h2>YOHO！GIRLS</h2>
+        <div class="about-section">
+            <p>www.yohogirls.com 是新生代女生的时尚网站，</p>
+            <p>这里进驻了中国、香港、日本三地的</p>
+            <p>时装编辑、摄影师、It Girls、美容达人。</p>
+        </div>
+        <div class="about-section">
+            <p>她们突破二维与平面的界限，</p>
+            <p>定期在《YOHO!GIRL》以好玩有趣的方式，</p>
+            <p>发布自己在时装、美容、设计、生活等方面的内容。</p>
+        </div>
+        <div class="about-us-qr">
+            <div class="product girl clearfix">
+                <div class="product-wrap">
+                    <img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/download_boy_icon.png" alt="">
+                    <span>YOHO!BOYS</span>
+                </div>
+                <div class="product-wrap product-wrap-right">
+                    <img class="qr-img" src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/yohoboyqr.png" alt="">
+                    <em>iPhone / Android</em>
+                </div>          
+            </div>
+            <div class="product yoho clearfix">
+                <div class="product-wrap">
+                    <img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/about/qr-yoho-icon.png" alt="">
+                    <span>YOHO!有货</span>
+                </div>
+                <div class="product-wrap product-wrap-right">
+                    <img class="qr-img" src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/about/qr-yoho-img.png" alt="">
+                    <em>iPhone / Android</em>
+                </div>
+            </div>
+            <div class="product show clearfix">
+                <div class="product-wrap">
+                    <img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/about/qr-show-icon.png" alt="">
+                    <span>Show</span>
+                </div>
+                <div class="product-wrap product-wrap-right">
+                    <img class="qr-img" src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/about/qr-show-img.png" alt="">
+                    <em>iPhone / Android</em>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

+<div class="about-container clearfix">
+    {{> about/about_nav}}
+    <div class="about-body">
+        <div class="about-section"> 
+            <h2>文字链接：</h2>
+            <ul class="links-list clearfix">
+                <li><a href="http://www.yoho.cn" target="_blank">YOHO!</a></li>
+                <li><a href="http://www.yohobuy.com" target="_blank">YOHO!BUY</a></li>
+                <li><a href="http://www.yohoshow.com" target="_blank">YOHO!SHOW</a></li>
+                <li><a href="http://www.yohogirls.com" target="_blank">YOHO!GIRLS</a></li>
+            </ul>
+        </div>
+        <div class="about-section">
+            <h2>LOGO链接：</h2>
+            <ul class="links-pic-list clearfix">
+                <li><a target="_blank" href="http://app.yohoshow.com/"><img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/about/links06.png" alt=""></a></li>
+                <li><a target="_blank" href="http://www.yohogirls.com/"><img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/about/links07.png" alt=""></a></li>
+            </ul>
+        </div>
+    </div>
+</div>

+
+<div class="about-container clearfix">
+    {{> about/about_nav}}
+    <div class="about-body">
+        <div class="about-section">
+            <h2>1.简介</h2>
+            <p>YOHO!新力传媒(我们，本公司)，如无特别说明，下文提到的"本产品"均指YOHO!潮流志。</p>
+            <p>《YOHO!潮流志》是百万年轻人潮流风向标,是中国影响力最大、权威性最高、发行量最广的潮流类杂志。每月两次出版,囊括了年轻人最喜爱的服饰、文化、数码、娱乐等各类信息,为你及时传播最新鲜有趣的世界潮流变化。每月两期,全国各大城市报刊亭、便利店等有售。</p>
+            <p>《YOHO!潮流志》 iPhone版YOHO!E-FASHION，通过文字、图片、动画、音频、视频等各种形式素材的整合,更快速的为你提供潮流信息、街拍指导,以及最引领潮流的生活方式,并及时互动。我们力图为您提供世界领先的数字阅读体验和丰富多彩的阅读内容。每月三期。</p>
+            <p>《YOHO!潮流志》 及本产品由新力传媒荣誉出品。新力传媒, 内地最具影响力的传媒机构之一。公司专注于国内外潮流文化以及年轻态人群的生活理念和生活方式的引领,其目标是成为中国潮流产品的传播者、引领者和创造者。</p>
+        </div>
+        <div class="about-section">
+            <h2>2.个人信息的收集</h2>
+            <p>当用户在YOHO!潮流志App中选择免费订阅之后，会被询问是否允许App Store共享个人信息给开发商NewPower Co.。如果用户选择了允许，我们会得到App Store提供给我们的用户个人信息（包括姓名、电子邮件、邮政编码等）。</p>
+        </div>
+        <div class="about-section">
+            <h2>3.个人信息的使用</h2>
+            <p>我们可能在本产品升级、推广、研究客户需求等情形下通过我们收集的个人信息发送给您做参考。我们还会将个人信息用于审计、数据分析和研究等目的，以改进我们的服务和与客户之间的沟通。如果您参与抽奖、竞赛或类似推广活动，我们会将您提供的信息用于管理此类活动。</p>
+        </div>
+        <div class="about-section">
+            <h2>4.向第三方披露</h2>
+            <p>除下列情形外，在未得到您的同意前，我们不会公开对外披露您的个人信息：</p>
+            <p>a) 基于国家法律之规定；</p>
+            <p>b) 基于司法机关或其它有权国家机关基于法定程序的要求； </p>
+            <p>c) 为保障本公司的财产及权益不受侵害； </p>
+            <p>d) 如果发生重组、合并或出售。</p>
+            <p>此外，有时我们会向关联企业、合作伙伴提供某些个人信息。该等情况下，我们承诺只会为提供或改进我们的服务和广告宣传之目的，在合理范围内搜集、处理、保存、传递及使用个人信息，而不会为第三方的营销目的与第三方共享个人信息。</p>          
+        </div>
+        <div class="about-section">
+            <h2>5.个人信息的保护</h2>
+            <p>我们将采取可能的预防措施，包括行政、技术和实际的措施，以保障您的个人信息免遭丢失、盗用和误用，以及被擅自取阅、披露、更改或销毁。</p>
+        </div>
+        <div class="about-section">
+            <h2>6.全公司对您隐私的承诺</h2>
+            <p>为确保您个人信息的安全，我们将公司的隐私和安全准则告知全体雇员，并将在公司内部严格执行隐私保护措施。</p>
+        </div>
+        <div class="about-section">
+            <h2>7.隐私问题</h2>
+            <p>如果您对本隐私政策或数据处理有任何问题或顾虑，请联系： help@yoho.cn</p>
+            <p>我们有权在必要时对隐私政策加以更新。如果我们对隐私政策作出重大变更，我们会通过公司官网 www.yoho.cn公布该等更新，请您留意。</p>
+        </div>
+    </div>
+</div>

+<div class="about-container clearfix">
+    {{> about/about_nav}}
+    <div class="about-body copyright">
+        <h2>版权声明</h2>
+        <div class="about-section">
+            <p>《YOHO!GIRL》上所刊载的所有内容，包括但不限于文字报导、图片、声音、录
+                像、图表、标志、标识、广告、商标、商号、域名、软件、程序、版面设计、专栏
+                目录与名称、内容分类标准以及为注册用户提供的任何或所有信息，均受《中华人
+                民共和国著作权法》、《中华人民共和国商标法》、《中华人民共和国专利法》及
+                适用之国际公约中有关著作权、商标权、专利权及其它财产所有权法律的保护，为
+                新力传媒或相关权利人专属所有或持有或合法使用。</p>
+            <p> 凡《YOHO!GIRL》上注明“《YOHO!GIRL》”以及特别注明版权的内容，包括但
+                不限于本软件上刊载的所有与《YOHO！潮流志》杂志内容相关的文字、图片、图
+                表、音频、视频等网上内容，版权属于新力传媒或相关权利人所有，任何媒体、网
+                站或个人未经新力传媒或相关权利人书面授权或同意不得转载、摘编或利用其它方
+                式使用上述作品；已经书面授权的，应在授权范围内使用，并注明 “来源：《YOHO！潮流志》版X期X页”。违反上述声明者，本公司将追究其相关法律责任。
+                《YOHO!GIRL》上刊载的内容未注明来源于“《YOHO!GIRL》”的作品均为转载
+                稿，本软件转载并不意味着认同其观点或真实性。如其他媒体、网站或个人转载使
+                用，须保留本网注明的"稿件来源"，并自负法律责任。 未经新力传媒或相关权利人
+                的书面许可，对于《YOHO!GIRL》上拥有版权和或其他知识产权的任何内容，任何
+                人不得变更、发行、播送、转载、复制、重制、改动、散布、表演、展示或利用网
+                络的局部或全部的内容或服务或在非网络所属的服务器上作镜像，否则以侵权论，
+                依法追究法律责任。 已经新力传媒或相关权利人授权使用作品的，应在授权范围内
+                使用。著作权人发现本杂志载有侵害其合法权益的内容或作品，要求本杂志提供侵
+                权人注册资料或删除所谓侵权内容，应向本网律师提供下列材料：</p>
+            <p>1． 本人的身份证明文件；</p>
+            <p>2． 著作权权属证明；</p>
+            <p>3． 侵害著作权作品在本网站的所在位置；</p>
+            <p>4． 著作权人的必要的真实的联系方法；</p>
+            <p>5． 对于自身提供的上述资料的真实性的书面保证；</p>
+            <p>6． 法律明文要求的其他资料。</p>
+        </div>
+        <div class="about-section">
+        <p>律所名称：北京市中伦律师事务所上海分所</p>
+        <p>律师姓名：葛永彬合伙人、董剑平资深律师</p>
+        <p>地址：上海市浦东新区世纪大道8号国金中心二期10-11楼</p>
+        <p>邮编：200120</p>
+        <p>电话：86-21-60613698/86-21-60613621</p>
+        <p>传真：86-21-60613555</p>
+        <p>Email：geyongbin@zhonglun.com/dongjianping@zhonglun.com</p>
+    </div>
+    </div>
+</div>

+<div class="error-container">
+    <div class="error-img">
+        <img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/other/error.png" alt="404 page">
+    </div>
+    <div class="error-btn clearfix">
+        <a class="back-btn" href="javascript:;" onclick="history.go(-1);">返回上一页</a>
+        <a class="home-btn" href="">网站首页</a>
+    </div>
+</div>

 <div class="mags-container">
     {{> magazine/mags_newest}}
-    
-    <?php $picArr = array(); $picArrRes = array(); $pics = ''; ?> 
     <div class="column-slide magazine-list">
         <div class="swiper-container slide-box">
             <ul class="slide-piclist clearfix" data-url="/channel/magazine/page?type=1&p=">
@@ -11,53 +9,7 @@
             </ul>
         </div>
     </div>
-    
-    <div class="mags-column">
-        <h2>E&nbsp;-&nbsp;ZINE</h2>
-        <div class="column-slide e-zine">
-            <h4>YOHO!BOY</h4>
-            <div class="slide-box">
-                <img class="loading-img" src="<?php echo SITE_IMG; ?>/loading.gif" alt=" ">
-            </div>
-            <div class="slide-ctrl" style="display: none;">
-                <a class="slide-ctrl-prev" href="javascript:;" style="display: none;"></a>
-                <a class="slide-ctrl-next" href="javascript:;"></a>
-            </div>
-        </div>
-    </div>
-    <div class="column-slide mags-app-download">
-        <div class="slide-box">
-            <ul class="slide-piclist clearfix">
-                <li class="column-slide01"><img src="<?php echo SITE_IMG; ?>/magazine/app-column01.png" alt=" "></li>
-                <li class="column-slide02"><img style="margin:11px 0 0 70px;" src="<?php echo SITE_IMG; ?>/magazine/app-column02.png" alt=" "></li>
-                <li class="column-slide03"><img src="<?php echo SITE_IMG; ?>/magazine/app-column03.png" alt="扫一扫下载YOHO!潮流志"><span>iPhone | Android</span></li>
-                <li>
-                    <h6>YOHO!BOY</h6>
-                    <p>线上周刊，一周一会，
-                        免费喂饱你的潮流胃！</p>
-                    <strong>扫一扫即刻下载</strong>
-                </li>
-            </ul>
-        </div>
-    </div>
-    
-    <?php $img_s = ''; $img_d = ''; ?> 
-    <div class="column-slide rule">
-        <h2>RULES OF YOHO!BOY</h2>
-        <div class="slide-box">
-            <ul class="slide-piclist clearfix" data-url="/channel/magazine/rules?p=">
-              <?php foreach ($this->view->rulesData as $r): ?>
-                <?php $img_s = Lib_Images::getImageUrl($r['static_img'], 'source', 'rulesimg'); ?>
-                <?php $img_d = Lib_Images::getImageUrl($r['dynamic_img'], 'source', 'rulesimg'); ?> 
-                <li>
-                    <a href="javascript:;">
-                        <img class="lazy static-img" data-original="<?php echo $img_s; ?>" data-imgzoom="<?php echo $img_d; ?>" src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" alt="<?php echo $r['title']; ?>">
-                        <span><?php echo $r['title']; ?></span>
-                    </a>
-                </li>
-              <?php endforeach; ?>
-            </ul>
-        </div>
-    </div>
+    {{> magazine/e_zine}}
+    {{> magazine/mags_app_download}}
 </div>
 {{> common/share}}
\ No newline at end of file

@@ -145,5 +145,12 @@
 
         {{{body}}}
     </body>
-    <script type="text/javascript" src="http://localhost:8000/dist/yohogirls-frontend-web/0.0.1/seajs.js?nowrap"></script>
+    <script type="text/javascript" src="http://localhost:8000/dist/yohogirls-frontend-web/0.0.1/all-debug.js?nowrap"></script>
+    <script type="text/javascript">
+        seajs.use(['yohogirls-frontend-web/0.0.1/js/channel/detail-debug'], function(detail) {
+            if (detail) {
+                detail.init();
+            }
+        });
+    </script>
 </html>
\ No newline at end of file

+<div class="about-nav">
+    <ul>
+        <li class="about"><a href="">关于</a></li>
+        <li class="contactus"><a href="">联系我们</a></li>
+        <li class="servers"><a href="">版权声明</a></li>
+        <li class="privacy"><a href="">隐私条款</a></li>
+        <li class="feedback"><a href="">意见反馈</a></li>
+        <li class="links"><a href="">友情链接</a></li>
+    </ul>
+</div>
\ No newline at end of file

-<div class="share" data-link="">
+{{# share}}
+<div class="share" data-link="{{url}}" cover-url="{{cover}}">
     <h4>分享：</h4>
     <ul>
         <li class="yohoo-share-button-sina"><a href="javascript:;"><img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/detail/share-sina-btn.png" alt="微信"></a></li>
@@ -16,4 +17,5 @@
         </li>
         <li class="yohoo-share-button-qq"><a href="javascript:;"><img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/detail/share-qq-btn.png" alt="QQ空间"></a></li>
     </ul>
-</div>
\ No newline at end of file
+</div>
+{{/ share}}
\ No newline at end of file

+default_test
\ No newline at end of file

 {{# bigImg}}
 <div class="pic-body">
-    <img src="{{src}}" alt="">
+    <img class="lazy" data-original="{{src}}" alt="">
 </div>
 {{/ bigImg}}
\ No newline at end of file

@@ -3,14 +3,14 @@
     <div class="detail-slide-body">
         <ul class="detail-slide-piclist clearfix">
             {{# imgList}}
-            <li><img src="{{src}}" alt=""></li>
+            <li><img class="lazy" data-original="{{src}}" alt=""></li>
             {{/ imgList}}
         </ul>
     </div>
     <div class="detail-slide-ctrl">
         <ul class="detail-slide-ctrl-tabs clearfix">
             {{# smallImgList}}
-            <li><a href="javascript:;"><span class="border"></span><span class="arrow"></span><img src="{{src}}" alt=""></a></li>
+            <li><a href="javascript:;"><span class="border"></span><span class="arrow"></span><img class="lazy" data-original="{{src}}" alt=""></a></li>
             {{/ smallImgList}}
         </ul>
         <a href="javascript:;" class="detail-slide-ctrl-prev"></a>

+<div class="mags-column">
+    <h2>E&nbsp;-&nbsp;ZINE</h2>
+    <div class="column-slide e-zine">
+        <div class="slide-box">
+            <img class="loading-img" src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/loading.gif" alt=" ">
+        </div>
+        <div class="slide-ctrl" style="display: none;">
+            <a class="slide-ctrl-prev" href="javascript:;" style="display: none;"></a>
+            <a class="slide-ctrl-next" href="javascript:;"></a>
+        </div>
+    </div>
+</div>
\ No newline at end of file

+ <div class="column-slide mags-app-download">
+    <div class="slide-box">
+        <ul class="slide-piclist clearfix">
+            <li class="column-slide01"><img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/magazine/app-column01.png" alt=" "></li>
+            <li class="column-slide02"><img style="margin:11px 0 0 70px;" src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/magazine/app-column02.png" alt=" "></li>
+            <li class="column-slide03"><img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/magazine/app-column03.png" alt="扫一扫下载YOHO!潮流志"><span>iPhone | Android</span></li>
+            <li>
+                <h6>YOHO!GIRL</h6>
+                <p>线上周刊，一周一会，
+                    免费喂饱你的潮流胃！</p>
+                <strong>扫一扫即刻下载</strong>
+            </li>
+        </ul>
+    </div>
+</div>
\ No newline at end of file

@@ -9,7 +9,7 @@
         </div>
         {{# buyUrl}}
         <div class="mags-buy">
-            <a target="_blank" href="<?php echo $this->view->firstData['buy_url']; ?>" class="buy-btn">立即购买</a>
+            <a target="_blank" href="{{url}}" class="buy-btn">立即购买</a>
         </div>
         {{/ buyUrl}} 
     </div>