fe / YOHOBUYWAP · Commits

Go to a project

Authored by yangyang
Commit fc6fbb4c5308db247a64465ef1ec2fd0b4b66f96 2 parents 49cd7bb5 a68a1a8a

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

Inline Side-by-side
Showing 20 changed files with 674 additions and 131 deletions
@@ -888,9 +888,53 @@ @@ -888,9 +888,53 @@
888 costOfThisYear: 3000, 888 costOfThisYear: 3000,
889 percent: 80, //当前消费等级进度条 889 percent: 80, //当前消费等级进度条
890 costGap: 300, //距离升级所需消费金额(白金会员不传) 890 costGap: 300, //距离升级所需消费金额(白金会员不传)
891 - sumCost: 600 891 + sumCost: 600,
892 892
893 - //查看全部VIP特权页面  
894 - all: true 893 + privilege: [
  894 + {
  895 + pic: '',
  896 + title: '',
  897 + description: ''
  898 + },
  899 + ...
  900 + ]
  901 + }
  902 + }
  903 +
  904 +
  905 +### 我的订单
  906 + {
  907 + order: {
  908 + orders: [
  909 + ...
  910 + ]
895 } 911 }
  912 + }
  913 +
  914 +
  915 + //订单
  916 + {
  917 + orderNum: '',
  918 + tradingStatus: '',
  919 + goods: [
  920 + {
  921 + id: '',
  922 + thumb: '',
  923 + gift: true, //是否赠品
  924 + advanceBuy: true, //是否加价购
  925 + name: '',
  926 + color: '黄色',
  927 + size: 'X',
  928 + price: '588',
  929 + count: 2
  930 + },
  931 + ...
  932 + ],
  933 + count: 1,
  934 + sumCost: '199.00',
  935 + //status
  936 + completed: true, //已完成
  937 + unpaid: true, //or 未支付
  938 + unshipped: true, //or 未发货
  939 + unreceived: '', //or 未收货，查看物流URL
896 } 940 }
@@ -8,5 +8,6 @@ require('./js/home/entry'); @@ -8,5 +8,6 @@ require('./js/home/entry');
8 require('./js/index/entry'); 8 require('./js/index/entry');
9 require('./js/passport/entry'); 9 require('./js/passport/entry');
10 require('./js/product/entry'); 10 require('./js/product/entry');
  11 +require('./js/me/entry');
11 12
12 module.exports = yohobuy; 13 module.exports = yohobuy;
  1 +/**
  2 + * 个人中心js打包入口文件
  3 + * @author: xuqi<qi.xu@yoho.cn>
  4 + * @date: 2015/11/10
  5 + */
  6 +
  7 +require('./order');
  1 +/**
  2 + * 个人中心--我的订单
  3 + * @author: xuqi<qi.xu@yoho.cn>
  4 + * @date: 2015/11/10
  5 + */
  6 +
  7 +var $ = require('jquery'),
  8 + Hammer = require('yoho.hammer'),
  9 + lazyLoad = require('yoho.lazyload');
  10 +
  11 +var $navLi = $('#order-nav > li'),
  12 + $orderContainer = $('#order-container');
  13 +
  14 +var $curContainer = $orderContainer.children('.orders').first();//保存当前显示的order-container
  15 +
  16 +var navHammer;
  17 +
  18 +lazyLoad();
  19 +
  20 +navHammer = new Hammer(document.getElementById('order-nav'));
  21 +navHammer.on('tap', function(e) {
  22 + var $cur = $(e.target).closest('li'),
  23 + index;
  24 +
  25 + if ($cur.length === 0 || $cur.hasClass('active')) {
  26 + return;
  27 + }
  28 +
  29 + index = $cur.index();
  30 +
  31 + $navLi.filter('.active').removeClass('active');
  32 + $cur.addClass('active');
  33 +
  34 + $curContainer.addClass('hide');
  35 + $curContainer = $orderContainer.children(':eq(' + index + ')').removeClass('hide');
  36 +});
  37 +
  38 +
1 -@import "home", "vip-grade";  
  1 +@import "home", "vip-grade", "order", "personal-details";
  1 +.order-page {
  2 + background: #f0f0f0;
  3 +
  4 + .order {
  5 + background: #fff;
  6 + margin: 30rem / $pxConvertRem 0;
  7 + border-top: 1px solid #e0e0e0;
  8 + border-bottom: 1px solid #e0e0e0;
  9 +
  10 + .header, .footer {
  11 + height: 90rem / $pxConvertRem;
  12 + line-height: 90rem / $pxConvertRem;
  13 + font-size: 30rem / $pxConvertRem;
  14 + padding: 0 30rem / $pxConvertRem;
  15 + }
  16 +
  17 + .header {
  18 + border-bottom: 1px solid #e0e0e0;
  19 + }
  20 +
  21 + .trading-status {
  22 + float: right;
  23 + }
  24 +
  25 + .footer {
  26 + text-align: right;
  27 + border-top: 1px solid #e0e0e0;
  28 + }
  29 +
  30 + .sum-cost {
  31 + color: #e01;
  32 + }
  33 +
  34 + .order-opt {
  35 + padding: 30rem / $pxConvertRem 0;
  36 + padding-right: 30rem / $pxConvertRem;
  37 + border-top: 1px solid #e0e0e0;
  38 + text-align: right;
  39 +
  40 + > .btn {
  41 + display: inline-block;
  42 + box-sizing: border-box;
  43 + height: 60rem / $pxConvertRem;
  44 + line-height: 60rem / $pxConvertRem;
  45 + width: 140rem / $pxConvertRem;
  46 + font-size: 24rem / $pxConvertRem;
  47 + text-align: center;
  48 + }
  49 +
  50 + .cancel {
  51 + border: 1px solid #000;
  52 + }
  53 +
  54 + .pay {
  55 + background: #d0021b;
  56 + color: #fff;
  57 + margin-left: 20rem / $pxConvertRem;
  58 + }
  59 + }
  60 + }
  61 +}
  62 +
  63 +.order-nav {
  64 + border-bottom: 1px solid #e0e0e0;
  65 + background: #fff;
  66 +
  67 + > li{
  68 + float: left;
  69 + height: 90rem / $pxConvertRem;
  70 + width: 25%;
  71 + line-height: 90rem / $pxConvertRem;
  72 + color: #b0b0b0;
  73 + font-size: 26rem / $pxConvertRem;
  74 + text-align: center;
  75 +
  76 + &.active {
  77 + color: #000;
  78 + }
  79 + }
  80 +}
  81 +
  82 +.order-good {
  83 + position: relative;
  84 + padding: 20rem / $pxConvertRem 0;
  85 + margin-left: 34rem / $pxConvertRem;
  86 + height: 160rem / $pxConvertRem;
  87 + border-bottom: 1px solid #e0e0e0;
  88 + font-size: 26rem / $pxConvertRem;
  89 +
  90 + &:last-child {
  91 + border-bottom: none;
  92 + }
  93 +
  94 + .thumb-wrap {
  95 + position: relative;
  96 + float: left;
  97 + width: 120rem / $pxConvertRem;
  98 + height: 160rem / $pxConvertRem;
  99 + }
  100 +
  101 + .thumb {
  102 + width: 100%;
  103 + height: 100%;
  104 + }
  105 +
  106 + .tag {
  107 + position: absolute;
  108 + bottom: 0;
  109 + left: 0;
  110 + right: 0;
  111 + color: #fff;
  112 + text-align: center;
  113 + font-size: 12px;
  114 + }
  115 +
  116 + .gift-tag {
  117 + height: 25rem / $pxConvertRem;
  118 + background: #a1ce4e;
  119 + &:before {
  120 + content: '赠品';
  121 + }
  122 + }
  123 +
  124 + .advance-buy-tag {
  125 + height: 25rem / $pxConvertRem;
  126 + background: #eb76aa;
  127 + &:before {
  128 + content: '加价购';
  129 + }
  130 + }
  131 +
  132 + .deps {
  133 + margin-left: 135rem / $pxConvertRem;
  134 + }
  135 +
  136 + .name {
  137 + font-size: 28rem / $pxConvertRem;
  138 + max-width: 70%;
  139 + }
  140 +
  141 + .row:nth-child(2) {
  142 + height: 45rem / $pxConvertRem;
  143 + line-height: 45rem / $pxConvertRem;
  144 +
  145 + > span {
  146 + margin-right: 15rem / $pxConvertRem;
  147 + }
  148 + }
  149 +
  150 + .color, .size {
  151 + color: #b6b6b6;
  152 + }
  153 +
  154 + .price-wrap {
  155 + position: absolute;
  156 + top: 20rem / $pxConvertRem;
  157 + right: 30rem / $pxConvertRem;
  158 + }
  159 +
  160 + .price {
  161 + color: #e01;
  162 + }
  163 +
  164 + .count {
  165 + display: block;
  166 + color: #999;
  167 + text-align: right;
  168 + line-height: 45rem / $pxConvertRem;
  169 + }
  170 +}
  1 +.personal-details{
  2 + width: 100%;
  3 + height: auto;
  4 + overflow: hidden;
  5 + background-color:#fff;
  6 + border-bottom:1px solid #e0e0e0;
  7 + ul{
  8 + width: 95%;
  9 + height: auto;
  10 + overflow: hidden;
  11 + float:right;
  12 + li{
  13 + &:first-of-type{
  14 + height: 100rem / $pxConvertRem;
  15 + line-height:100rem / $pxConvertRem;
  16 + }
  17 + height: 80rem / $pxConvertRem;
  18 + border-bottom: 1px solid #e0e0e0;
  19 + span{
  20 + &:first-of-type{
  21 + color: #444;
  22 + line-height:100rem / $pxConvertRem;
  23 + }
  24 + width: 42%;
  25 + height: 100%;
  26 + line-height:80rem / $pxConvertRem;
  27 + font-size: 48em / $pxConvertRem;
  28 + margin-right: 8%;
  29 + float: left;
  30 + .head-portrait{
  31 + width:90rem / $pxConvertRem;
  32 + height: 90rem / $pxConvertRem;
  33 + float: right;
  34 + border-radius:50%;
  35 + background: #000;
  36 + }
  37 + .grade{
  38 + width:85rem / $pxConvertRem;
  39 + height: 30rem / $pxConvertRem;
  40 + overflow: hidden;
  41 + display: inline-block;
  42 + margin-top: 25rem / $pxConvertRem;
  43 + @include rem-sprite($vip, vip-1);
  44 + }
  45 + &:last-of-type{
  46 + color: #b0b0b0;
  47 + text-align: right;
  48 + }
  49 + }
  50 + &:last-of-type{
  51 + border-bottom:none;
  52 + }
  53 + }
  54 + }
  55 +}
  1 +.rank-main {
  2 + padding: (14rem / $pxConvertRem) 0 0 (30rem / $pxConvertRem);
  3 + background: #fff;
  4 +
  5 + li {
  6 + height: 230rem / $pxConvertRem;
  7 + overflow: hidden;
  8 +
  9 + .item-img {
  10 + float: left;
  11 + width: 150rem / $pxConvertRem;
  12 + height: 200rem / $pxConvertRem;
  13 + padding: (14rem / $pxConvertRem) 0;
  14 + line-height: 200rem / $pxConvertRem;
  15 + text-align: center;
  16 +
  17 + img {
  18 + max-width: 100%;
  19 + max-height: 100%;
  20 + vertical-align: middle;
  21 + }
  22 + }
  23 +
  24 + .item-content {
  25 + float: left;
  26 + width: 407rem / $pxConvertRem;
  27 + height: 213rem / $pxConvertRem;
  28 + margin: 0 0 0 (13rem / $pxConvertRem);
  29 + padding: (14rem / $pxConvertRem) 0 0 (30rem / $pxConvertRem);
  30 + border-top: 1px solid #e0e0e0;
  31 + overflow: hidden;
  32 +
  33 + .rank-icon {
  34 + display: block;
  35 + height: 45rem / $pxConvertRem;
  36 + width: 50rem / $pxConvertRem;
  37 + line-height: 50rem / $pxConvertRem;
  38 + text-align: center;
  39 + font-size: 22rem / $pxConvertRem;
  40 + color: #fff;
  41 + background: image-url("sale-icon/rank.png") no-repeat;
  42 + background-position: center top;
  43 + background-size: auto 100%;
  44 +
  45 + &.top {
  46 + background: image-url("sale-icon/rank-t.png") no-repeat;
  47 + background-position: center top;
  48 + background-size: 100%;
  49 + line-height: 58rem / $pxConvertRem;
  50 + }
  51 + }
  52 +
  53 + h2 {
  54 + margin: (15rem / $pxConvertRem) 0 0 !important;
  55 + padding: 0 !important;
  56 + width: 9.5rem;
  57 + line-height: 36rem / $pxConvertRem;
  58 + color: #444;
  59 + font-size: 28rem / $pxConvertRem;
  60 +
  61 + &.hasActive {
  62 + margin: (5rem / $pxConvertRem) 0 0 !important;
  63 + }
  64 + }
  65 +
  66 + p {
  67 + margin: 0 !important;
  68 + padding: 0 !important;
  69 + width: 9.5rem;
  70 + line-height: 36rem / $pxConvertRem;
  71 + font-size: 24rem / $pxConvertRem;
  72 + color: #d0021b;
  73 + text-overflow: ellipsis;
  74 + overflow: hidden;
  75 + white-space: nowrap;
  76 +
  77 + span {
  78 + text-decoration: line-through;
  79 + color: #b0b0b0;
  80 + margin-left: 10rem / $pxConvertRem;
  81 + }
  82 + }
  83 + }
  84 + }
  85 +
  86 + li:first-child {
  87 + .item-content {
  88 + border: none;
  89 + }
  90 + }
  91 +}
  92 +.goods-nav {
  93 + border-bottom: (2rem / $pxConvertRem) solid #e6e6e6;
  94 + height: 67rem / $pxConvertRem;
  95 + overflow: hidden;
  96 +
  97 + li {
  98 + float: left;
  99 + width: auto;
  100 + height: 67rem / $pxConvertRem;
  101 + line-height: 67rem / $pxConvertRem;
  102 + width: 145rem / $pxConvertRem;
  103 + text-align: center;
  104 + font-size: 28rem / $pxConvertRem;
  105 +
  106 + a {
  107 + display: inline-block;
  108 + padding: 0 (5rem / $pxConvertRem);
  109 + font-size: 28rem / $pxConvertRem;
  110 + color: #999;
  111 + height: 65rem / $pxConvertRem;
  112 + }
  113 + }
  114 +
  115 + li:first-child {
  116 + margin-left: 30rem / $pxConvertRem;
  117 + }
  118 +
  119 + li.focus {
  120 + a {
  121 + border-bottom: (4rem / $pxConvertRem) solid #000;
  122 + color: #000;
  123 + }
  124 + }
  125 +}
  126 +
  127 +.s-goods-nav {
  128 + overflow: hidden;
  129 +
  130 + li {
  131 + margin: 0 0 0 (50rem / $pxConvertRem);
  132 + width: auto;
  133 +
  134 + a {
  135 + padding: 0;
  136 + }
  137 + }
  138 +
  139 + li:first-child {
  140 + margin: 0 0 0 (39rem / $pxConvertRem);
  141 + }
  142 +}
1 -@import "new-arrival", "discount", "list", "detail", "suspend-cart";  
  1 +@import "new-arrival", "discount", "list", "detail", "suspend-cart", "hot-rank";
  1 +{{> layout/header}}
  2 +<div class="my-guang-page yoho-page">
  3 + <div class="info-list">
  4 + {{# myGuang}}
  5 + {{> guang/info}}
  6 + {{/ myGuang}}
  7 + </div>
  8 +</div>
  9 +{{> layout/footer}}
  1 +{{> layout/header}}
  2 +<div class="order-page yoho-page">
  3 + {{# order}}
  4 + <ul id="order-nav" class="order-nav clearfix">
  5 + <li class="active">
  6 + 全部
  7 + </li>
  8 + <li>
  9 + 待付款
  10 + </li>
  11 + <li>
  12 + 待发货
  13 + </li>
  14 + <li>
  15 + 待收货
  16 + </li>
  17 + </ul>
  18 +
  19 + <div id="order-container" class="order-container">
  20 + <div class="all orders">
  21 + {{#each orders}}
  22 + {{> me/order/order}}
  23 + {{/each}}
  24 + </div>
  25 + <div class="unpaid orders hide"></div>
  26 + <div class="unshipped orders hide"></div>
  27 + <div class="unreceived orders hide"></div>
  28 + </div>
  29 + {{/ order}}
  30 +</div>
  31 +{{> layout/footer}}
  1 +{{> layout/header}}
  2 + {{ #personalDetails}}
  3 + <div class="personal-details">
  4 + <ul>
  5 + <li><span>头像</span><span><i class="head-portrait"></i></span></li>
  6 + <li><span>昵称</span><span>{{ name }}</span></li>
  7 + <li><span>性别</span><span>{{ sex }}</span></li>
  8 + <li><span>生日</span><span>{{ time }}</span></li>
  9 + <li><span>会员等级</span><span><i class="grade"></i>&gt;</span></li>
  10 + </ul>
  11 + </div>
  12 + {{ /personalDetails}}
  13 +{{> layout/footer}}
@@ -3,51 +3,41 @@ @@ -3,51 +3,41 @@
3 {{# headerBanner}} 3 {{# headerBanner}}
4 {{> product/banner_swipe_and_single}} 4 {{> product/banner_swipe_and_single}}
5 {{/ headerBanner}} 5 {{/ headerBanner}}
6 -  
7 - <ul id="list-nav" class="list-nav clearfix">  
8 - <li class="new active">  
9 - <a href="javascript:void(0);">  
10 - <span class="spanTest">最新</span>  
11 - <span class="iconfont cur">&#xe616;</span>  
12 - </a>  
13 - </li>  
14 - <li class="price">  
15 - <a href="javascript:void(0);">  
16 - <span class="spanTest">价格</span>  
17 - <span class="icon">  
18 - <i class="iconfont up">&#xe615;</i>  
19 - <i class="iconfont down cur">&#xe616;</i>  
20 - </span>  
21 - </a>  
22 - </li>  
23 - <li class="discount">  
24 - <a href="javascript:void(0);">  
25 - <span class="spanTest">折扣</span>  
26 - <span class="icon">  
27 - <i class="iconfont up">&#xe615;</i>  
28 - <i class="iconfont down cur">&#xe616;</i>  
29 - </span>  
30 - </a>  
31 - </li>  
32 - <li class="filter">  
33 - <a href="javascript:void(0);">  
34 - <span class="spanTest">筛选</span>  
35 - <span class="iconfont">&#xe613;</span>  
36 - </a>  
37 - </li>  
38 - </ul>  
39 -  
40 - <div id="goods-container" class="goods-container">  
41 - <div class="new-goods container clearfix">  
42 - {{# goods}}  
43 - {{> good}}  
44 - {{/ goods}}  
45 - </div>  
46 - <div class="price-goods container hide clearfix"></div>  
47 - <div class="discount-goods container hide clearfix"></div>  
48 -  
49 - {{> filter}} 6 + {{# listNav}}
  7 + <div class="s-goods-nav goods-nav">
  8 + <ul class="swiper-wrapper clearfix">
  9 + {{# list}}
  10 + <li class="swiper-slide nav-item" data-sort="{{sort}}">
  11 + <span>{{textCn}}</span>
  12 + </li>
  13 + {{/ list}}
  14 + </ul>
50 </div> 15 </div>
  16 + {{/ listNav}}
  17 +
  18 + {{# rankList}}
  19 + <div class="rank-main">
  20 + <ul>
  21 + {{# list}}
  22 + <li>
  23 + <a class="clearfix" href="{{url}}">
  24 + <div class="item-img">
  25 + <img class="lazy" data-original="{{img}}">
  26 + </div>
  27 + <div class="item-content">
  28 + <i class="rank-icon top">{{rank}}</i>
  29 + <h2 {{# active}}class="hasActive"{{/ active}}>{{title}}</h2>
  30 + {{# active}}
  31 + <p>{{.}}</p>
  32 + {{/ active}}
  33 + <p>{{sPrice}}<span>{{price}}</span></p>
  34 + </div>
  35 + </a>
  36 + </li>
  37 + {{/ list}}
  38 + </ul>
  39 + </div>
  40 + {{/ rankList}}
51 41
52 {{#if brand}} 42 {{#if brand}}
53 <input id="brand" type="hidden" value={{brand}}> 43 <input id="brand" type="hidden" value={{brand}}>
@@ -143,6 +143,13 @@ @@ -143,6 +143,13 @@
143 seajs.use('js/index/footer'); 143 seajs.use('js/index/footer');
144 </script> 144 </script>
145 {{/if}} 145 {{/if}}
  146 +{{!-- 热门排行 --}}
  147 +{{#if hotrankPage}}
  148 +<script>
  149 + seajs.use('js/product/newsale/hot-rank');
  150 + seajs.use('js/index/footer');
  151 +</script>
  152 +{{/if}}
146 {{!-- 商品列表 --}} 153 {{!-- 商品列表 --}}
147 {{#if goodListPage}} 154 {{#if goodListPage}}
148 <script> 155 <script>
@@ -187,4 +194,11 @@ @@ -187,4 +194,11 @@
187 <script> 194 <script>
188 seajs.use('js/shopping-cart/gift-advance'); 195 seajs.use('js/shopping-cart/gift-advance');
189 </script> 196 </script>
  197 +{{/if}}
  198 +
  199 +{{!-- 个人中心 --}}
  200 +{{#if orderPage}}
  201 +<script>
  202 + seajs.use('js/me/order');
  203 +</script>
190 {{/if}} 204 {{/if}}
  1 +<div class="order-good" data-id={{id}}>
  2 + <div class="thumb-wrap">
  3 + <img class="thumb lazy" data-original={{thumb}}>
  4 + <p class="tag{{#if gift}} gift-tag{{/if}}{{#if advanceBuy}} advance-buy-tag{{/if}}"></p>
  5 + </div>
  6 + <div class="deps">
  7 + <p class="name row">{{name}}</p>
  8 + <p class="row">
  9 + {{#if color}}
  10 + <span class="color">
  11 + 颜色:{{color}}
  12 + </span>
  13 + {{/if}}
  14 +
  15 + {{#if size}}
  16 + <span class="size">
  17 + 尺码:{{size}}
  18 + </span>
  19 + {{/if}}
  20 + </p>
  21 + <p class="row price-wrap">
  22 + <span class="price">
  23 + ¥{{price}}
  24 + </span>
  25 + <span class="count">
  26 + ×{{count}}
  27 + </span>
  28 + </p>
  29 + </div>
  30 +</div>
  1 +<div class="order" data-id="{{orderNum}}">
  2 + <header class="header">
  3 + 订单编号：{{orderNum}}
  4 + <span class="trading-status">{{tradingStatus}}</span>
  5 + </header>
  6 + <section class="order-goods">
  7 + {{# goods}}
  8 + {{> me/order/good}}
  9 + {{/ goods}}
  10 + </section>
  11 + <footer class="footer">
  12 + 共{{count}}件商品 实付<span class="sum-cost">¥{{sumCost}}</span>
  13 + </footer>
  14 +
  15 + {{#if unpaid}}
  16 + <div class="order-opt">
  17 + <span class="btn cancel">取消订单</span>
  18 + <span class="btn pay">立即付款</span>
  19 + </div>
  20 + {{/if}}
  21 +
  22 + {{#with unreceived}}
  23 + <div class="order-opt">
  24 + <a class="check-logistics" href="{{.}}">查看物流</a>
  25 + </div>
  26 + {{/with}}
  27 +</div>
1 <ul> 1 <ul>
2 - <li>  
3 - <span class="icon icon-discount"></span>  
4 - <p>  
5 - {{#if vip3}}  
6 - 购物8.8折  
7 - {{/if}}  
8 -  
9 - {{#if vip2}}  
10 - 购物9.0折  
11 - {{/if}}  
12 -  
13 - {{#if vip1}}  
14 - 购物9.5折  
15 - {{/if}}  
16 -  
17 - {{#if all}}  
18 - 全场最高8.8折  
19 - {{/if}}  
20 - <span>在原折扣基础上享受VIP折上折</span>  
21 - </p>  
22 - </li>  
23 - <li>  
24 - <span class="icon icon-year"></span>  
25 - <p>  
26 - 年度优惠活动  
27 - <span>年度级的sale促销活动中，VIP会员可以享受优先购买权</span>  
28 - </p>  
29 - </li>  
30 - <li>  
31 - <span class="icon icon-vip"></span>  
32 - <p>  
33 - VIP活动优惠  
34 - <span>优先参加"VIP会员限定"活动</span>  
35 - </p>  
36 - </li>  
37 - <li>  
38 - <span class="icon icon-birth"></span>  
39 - <p>  
40 - 生日特惠  
41 - <span>赠送生日优惠券</span>  
42 - </p>  
43 - </li>  
44 - <li>  
45 - <span class="icon icon-msg"></span>  
46 - <p>  
47 - 优惠信息  
48 - <span>获得大量的潮流新品及优惠活动的信息</span>  
49 - </p>  
50 - </li>  
51 - <li>  
52 - <span class="icon icon-magazine"></span>  
53 - <p>  
54 - 杂志赠阅  
55 - <span>下载《YOHO!潮流志》电子版，浏览magazine版块，最新最权威的潮流资讯尽在掌握！</span>  
56 - </p>  
57 - </li>  
58 - {{#or vip3 vip2 all}} 2 + {{#each privilege}}
59 <li> 3 <li>
60 - <span class="icon icon-arrival-soon"></span> 4 + <img class="icon" src="{{pic}}">
61 <p> 5 <p>
62 - 快速送达  
63 - <span>  
64 - 白金卡会员的订单将采用最快速度进行配送  
65 - </span> 6 + {{title}}
  7 + <span>{{description}}</span>
66 </p> 8 </p>
67 </li> 9 </li>
68 - {{/or}}  
69 -  
70 - {{#or vip3 all}}  
71 - <li>  
72 - <span class="icon icon-gift"></span>  
73 - <p>  
74 - 纪念品赠送  
75 - <span>  
76 - 白金会员将有机会获得YOHO!与各潮流品牌和明显合作的联名款纪念品  
77 - </span>  
78 - </p>  
79 - </li>  
80 - {{/or}} 10 + {{/each}}
81 </ul> 11 </ul>
@@ -40,12 +40,46 @@ class HomeController extends AbstractAction @@ -40,12 +40,46 @@ class HomeController extends AbstractAction
40 */ 40 */
41 public function ordersAction() 41 public function ordersAction()
42 { 42 {
43 - $uid = $this->getUid();  
44 - $type = $this->get('type', 1);  
45 -  
46 - $orders = \Index\UserModel::getUserOrderData(967016, $type);  
47 -  
48 - print_r($orders); 43 + // $uid = $this->getUid();
  44 + // $type = $this->get('type', 1);
  45 +
  46 + // $orders = \Index\UserModel::getUserOrderData(967016, $type);
  47 +
  48 + $order = array(
  49 + 'orders' => array(
  50 + array(
  51 + 'orderNum' => '408539077',
  52 + 'tradingStatus' => '交易成功',
  53 + 'goods' => array(
  54 + array(
  55 + 'id' => 1,
  56 + 'thumb' => 'http://img11.static.yhbimg.com/goodsimg/2015/11/04/05/01ce2aff32fc3c90584f516167cd526d91.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
  57 + 'name' => 'Adidas Originals ZX FLUXM22508',
  58 + 'color' => '黄',
  59 + 'size' => '43',
  60 + 'price' => '699.00',
  61 + 'count' => '2'
  62 + ),
  63 + array(
  64 + 'id' => 1,
  65 + 'thumb' => 'http://img10.static.yhbimg.com/goodsimg/2015/11/04/05/0188f1aca49ac478a565ec029b5d2d4a6c.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
  66 + 'name' => 'B.Duck浴室玩伴mini浮水鸭',
  67 + 'gift' => true,
  68 + 'color' => '黄',
  69 + 'size' => '43',
  70 + 'price' => '0.00',
  71 + 'count' => '1'
  72 + )
  73 + ),
  74 + 'count' => 2,
  75 + 'sumCost' => '699.00',
  76 + 'unpaid' => true,
  77 + )
  78 + )
  79 + );
  80 +
  81 + $this->_view->display('order', array('order' => $order, 'orderPage' => true));
  82 + // print_r($orders);
49 } 83 }
50 84
51 /** 85 /**
@@ -111,6 +145,14 @@ class HomeController extends AbstractAction @@ -111,6 +145,14 @@ class HomeController extends AbstractAction
111 } 145 }
112 146
113 /** 147 /**
  148 + * 我的逛
  149 + */
  150 + public function myGuangAction()
  151 + {
  152 + echo 'My Guang';
  153 + }
  154 +
  155 + /**
114 * 意见反馈 156 * 意见反馈
115 */ 157 */
116 public function suggestAction() 158 public function suggestAction()
@@ -82,7 +82,7 @@ class NewsaleController extends AbstractAction @@ -82,7 +82,7 @@ class NewsaleController extends AbstractAction
82 $channel = Helpers::getChannelByCookie(); 82 $channel = Helpers::getChannelByCookie();
83 // 设置一些默认参数 83 // 设置一些默认参数
84 $data = array( 84 $data = array(
85 - 'discountPage' => true, 85 + 'hotrankPage' => true,
86 'headerBanner' => \Product\NewsaleModel::getNewFocus($channel), 86 'headerBanner' => \Product\NewsaleModel::getNewFocus($channel),
87 'showDownloadApp' => true, 87 'showDownloadApp' => true,
88 'pageFooter' => true, 88 'pageFooter' => true,