Authored by hf

fixes some bugs to gzip css and js

@@ -19,7 +19,6 @@ @@ -19,7 +19,6 @@
19 </div> 19 </div>
20 {{/ freebie}} 20 {{/ freebie}}
21 {{/if}} 21 {{/if}}
22 -  
23 <div id="chose-panel"></div> 22 <div id="chose-panel"></div>
24 </div> 23 </div>
25 {{> layout/footer}} 24 {{> layout/footer}}
1 {{> layout/header}} 1 {{> layout/header}}
2 <div id="mainCart" class="shopping-cart-page yoho-page"> 2 <div id="mainCart" class="shopping-cart-page yoho-page">
3 {{# shoppingCart}} 3 {{# shoppingCart}}
4 - {{#if showLoginInfo}}  
5 - <p class="login-info">  
6 - <span class="iconfont">&#xe628;</span>  
7 - 请您先  
8 - <a class="btn btn-login" href="{{signurl}}">登录</a>  
9 - 可以同步电脑和手机中的商品  
10 - </p>  
11 - {{/if}}  
12 - {{#if isEmptyCart}}  
13 - <div class="cart-zero">  
14 - <i class="iconfont">&#xe640;</i>  
15 - <p>您的购物车暂无商品</p>  
16 - <a href="/product/new">随便逛逛</a> 4 + {{#if showLoginInfo}}
  5 + <p class="login-info">
  6 + <span class="iconfont">&#xe628;</span>
  7 + 请您先
  8 + <a class="btn btn-login" href="{{signurl}}">登录</a>
  9 + 可以同步电脑和手机中的商品
  10 + </p>
  11 + {{/if}}
  12 + {{#if isEmptyCart}}
  13 + <div class="cart-zero">
  14 + <i class="iconfont">&#xe640;</i>
  15 + <p>您的购物车暂无商品</p>
  16 + <a href="/product/new">随便逛逛</a>
  17 + </div>
  18 + {{> product/recommend-for-you}}
  19 + {{^}}
  20 + {{#if cartNav}}
  21 + <ul class="cart-nav clearfix">
  22 +
  23 + <li class="active" id="common-cart-nav">
  24 + <span >
  25 + 普通商品({{commonGoodsCount}})
  26 + </span>
  27 + </li>
  28 + <li id="presell-cart-nav">
  29 + <span >
  30 + 预售商品({{presellGoodsCount}})
  31 + </span>
  32 + <div id="presell-tip" class="presell-tip hide">
  33 + <div class="triangle"></div>
  34 + <p class="pt-content">预售商品点这里结算哦~</p>
17 </div> 35 </div>
18 - {{> product/recommend-for-you}}  
19 - {{^}}  
20 - {{#if cartNav}}  
21 - <ul class="cart-nav clearfix">  
22 - <li class="active" id="common-cart-nav">  
23 - <span >  
24 - 普通商品({{commonGoodsCount}})  
25 - </span>  
26 - </li>  
27 - <li id="presell-cart-nav">  
28 - <span >  
29 - 预售商品({{presellGoodsCount}})  
30 - </span>  
31 - <div id="presell-tip" class="presell-tip hide">  
32 - <div class="triangle"></div>  
33 - <p class="pt-content">预售商品点这里结算哦~</p>  
34 - </div>  
35 - </li>  
36 - </ul>  
37 - {{/if}}  
38 -  
39 - {{# commonCart}}  
40 - <div class="cart-content common">  
41 - {{> cart/cart-content}}  
42 - </div>  
43 - {{/ commonCart}}  
44 -  
45 - {{# preSellCart}}  
46 - <div class="cart-content presell hide">  
47 - <p class="presell-info">  
48 - <span class="iconfont">&#xe61a;</span>  
49 - <span class="txt">预售商品全场包邮,到货后立即发货</span>  
50 - <span class="txt">预售商品不参加活动,不可使用优惠券</span>  
51 - </p>  
52 - {{> cart/cart-content}}  
53 - </div>  
54 - {{/ preSellCart}}  
55 - {{/if}}  
56 -  
57 - <input id="cartType" type="hidden" value="{{cartType}}"> 36 + </li>
  37 +
  38 + </ul>
  39 + {{/if}}
  40 + {{# commonCart}}
  41 + <div class="cart-content common">
  42 + {{> cart/cart-content}}
  43 + </div>
  44 + {{/ commonCart}}
  45 + {{# preSellCart}}
  46 + <div class="cart-content presell hide">
  47 + <p class="presell-info">
  48 + <span class="iconfont">&#xe61a;</span>
  49 + <span class="txt">预售商品全场包邮,到货后立即发货</span>
  50 + <span class="txt">预售商品不参加活动,不可使用优惠券</span>
  51 + </p>
  52 + {{> cart/cart-content}}
  53 + </div>
  54 + {{/ preSellCart}}
  55 + {{/if}}
  56 + <input id="cartType" type="hidden" value="{{cartType}}">
58 {{/ shoppingCart}} 57 {{/ shoppingCart}}
59 </div> 58 </div>
60 {{> layout/footer}} 59 {{> layout/footer}}
1 {{> layout/header}} 1 {{> layout/header}}
2 <div class="order-ensure-page yoho-page"> 2 <div class="order-ensure-page yoho-page">
3 {{# orderEnsure}} 3 {{# orderEnsure}}
4 - <a class="address-wrap block" data-id="{{addressId}}" data-support="{{isSupport}}" href="/cart/index/selectAddress">  
5 - <p class="infos">  
6 - 收货地址  
7 - <span class="per-info">{{name}} {{phoneNum}}</span>  
8 - <span class="address">{{area}} {{address}}</span>  
9 - </p>  
10 - <span class="iconfont">&#xe614;</span>  
11 - </a> 4 + <a class="address-wrap block" data-id="{{addressId}}" data-support="{{isSupport}}" href="/cart/index/selectAddress">
  5 + <p class="infos">
  6 + 收货地址
  7 + <span class="per-info">{{name}} {{phoneNum}}</span>
  8 + <span class="address">{{area}} {{address}}</span>
  9 + </p>
  10 + <span class="iconfont">&#xe614;</span>
  11 + </a>
12 12
13 - <section class="dispatch block">  
14 - <div class="sub-block">  
15 - <h3 class="title">配送方式</h3>  
16 - <ul class="dispatch-mode clearfix">  
17 - {{#each dispatchMode}}  
18 - <li {{#if isSelected}}class="chosed"{{/if}} data-id="{{id}}">{{name}}</li>  
19 - {{/each}}  
20 - </ul>  
21 - </div>  
22 -  
23 - <div class="sub-block">  
24 - <h3 class="title">送货时间</h3>  
25 - <ul class="dispatch-time clearfix">  
26 - {{#each dispatchTime}}  
27 - <li {{#if isSelected}}class="chosed"{{/if}} data-id="{{id}}">{{name}}</li>  
28 - {{/each}}  
29 - </ul>  
30 - </div>  
31 - </section>  
32 -  
33 - <section class="block">  
34 - <h3 class="title">商品</h3>  
35 - <div class="goods">  
36 - {{#each goods}}  
37 - {{> me/order/good}} 13 + <section class="dispatch block">
  14 + <div class="sub-block">
  15 + <h3 class="title">配送方式</h3>
  16 + <ul class="dispatch-mode clearfix">
  17 + {{#each dispatchMode}}
  18 + <li {{#if isSelected}}class="chosed"{{/if}} data-id="{{id}}">{{name}}</li>
38 {{/each}} 19 {{/each}}
39 - </div>  
40 - </section> 20 + </ul>
  21 + </div>
41 22
42 - <section class="block">  
43 - <ul class="sale-invoice">  
44 - {{#if isOrdinaryCart}}  
45 - <li class="coupon">  
46 - <a href="/cart/index/selectCoupon">  
47 - <span class="title">优惠券</span>  
48 - {{# coupon}}  
49 - <span class="coupon-count">  
50 - {{count}}张可用  
51 - </span> 23 + <div class="sub-block">
  24 + <h3 class="title">送货时间</h3>
  25 + <ul class="dispatch-time clearfix">
  26 + {{#each dispatchTime}}
  27 + <li {{#if isSelected}}class="chosed"{{/if}} data-id="{{id}}">{{name}}</li>
  28 + {{/each}}
  29 + </ul>
  30 + </div>
  31 + </section>
52 32
53 - {{#if couponName}}  
54 - <span class="used coupon-use" data-name="{{couponName}}">  
55 - {{couponName}}  
56 - <i class="iconfont">&#xe614;</i>  
57 - </span>  
58 - {{^}}  
59 - <span class="not-used coupon-use">  
60 - 未使用  
61 - <i class="iconfont">&#xe614;</i>  
62 - </span>  
63 - {{/if}}  
64 - {{/coupon}}  
65 - </a>  
66 - </li>  
67 - {{/if}}  
68 - <li class="coin" data-yoho-coin="{{yohoCoin}}">  
69 - <span class="title">YOHO币</span> 33 + <section class="block">
  34 + <h3 class="title">商品</h3>
  35 + <div class="goods">
  36 + {{#each goods}}
  37 + {{> me/order/good}}
  38 + {{/each}}
  39 + </div>
  40 + </section>
70 41
71 - {{#if yohoCoin}}  
72 - <span class="desc used {{#unless useYohoCoin}}hide{{/if}}">已抵¥{{useYohoCoin}}</span>  
73 - <span class="desc can-use {{#if useYohoCoin}}hide{{/if}}">可抵¥{{yohoCoin}}</span> 42 + <section class="block">
  43 + <ul class="sale-invoice">
  44 + {{#if isOrdinaryCart}}
  45 + <li class="coupon">
  46 + <a href="/cart/index/selectCoupon">
  47 + <span class="title">优惠券</span>
  48 + {{# coupon}}
  49 + <span class="coupon-count">
  50 + {{count}}张可用
  51 + </span>
74 52
75 - {{#if useYohoCoin}}  
76 - <span class="coin-check">  
77 - <em>- ¥ {{useYohoCoin}}</em>  
78 - <i class="iconfont checkbox icon-cb-checked"></i>  
79 - </span>  
80 - {{else}}  
81 - <span class="coin-check">  
82 - <em style="display: none;">- ¥ {{useYohoCoin}}</em>  
83 - <i class="iconfont checkbox icon-checkbox"></i>  
84 - </span>  
85 - {{/if}} 53 + {{#if couponName}}
  54 + <span class="used coupon-use" data-name="{{couponName}}">
  55 + {{couponName}}
  56 + <i class="iconfont">&#xe614;</i>
  57 + </span>
86 {{^}} 58 {{^}}
87 - <span class="not-used coin-check">  
88 - 无YOHO币可用  
89 - </span> 59 + <span class="not-used coupon-use">
  60 + 未使用
  61 + <i class="iconfont">&#xe614;</i>
  62 + </span>
90 {{/if}} 63 {{/if}}
91 - </li> 64 + {{/coupon}}
  65 + </a>
  66 + </li>
  67 + {{/if}}
  68 + <li class="coin" data-yoho-coin="{{yohoCoin}}">
  69 + <span class="title">YOHO币</span>
92 70
93 - {{#if invoice}}  
94 - <li class="invoice {{#if needInvoice}}focus{{/if}}">  
95 - <span class="title">发票</span>  
96 - <span class="iconfont checkbox {{#if needInvoice}}icon-cb-checked{{else}}icon-checkbox{{/if}}"></span>  
97 - <form id="invoice">  
98 - <input type="text" name="invoice-title" value="{{invoiceText}}" maxlength="30" placeholder="发票抬头">  
99 - <label>  
100 - 发票类型  
101 - <select class="invoice-type" name="invoice-type">  
102 - {{# invoice}}  
103 - <option value="{{id}}" {{#if isSelected}}selected{{/if}}>{{name}}</option>  
104 - {{/ invoice}}  
105 - </select>  
106 - </label>  
107 - </form>  
108 - </li> 71 + {{#if yohoCoin}}
  72 + <span class="desc used {{#unless useYohoCoin}}hide{{/if}}">已抵¥{{useYohoCoin}}</span>
  73 + <span class="desc can-use {{#if useYohoCoin}}hide{{/if}}">可抵¥{{yohoCoin}}</span>
  74 +
  75 + {{#if useYohoCoin}}
  76 + <span class="coin-check">
  77 + <em>- ¥ {{useYohoCoin}}</em>
  78 + <i class="iconfont checkbox icon-cb-checked"></i>
  79 + </span>
  80 + {{else}}
  81 + <span class="coin-check">
  82 + <em style="display: none;">- ¥ {{useYohoCoin}}</em>
  83 + <i class="iconfont checkbox icon-checkbox"></i>
  84 + </span>
109 {{/if}} 85 {{/if}}
110 - </ul> 86 + {{^}}
  87 + <span class="not-used coin-check">
  88 + 无YOHO币可用
  89 + </span>
  90 + {{/if}}
  91 + </li>
111 92
112 - <form id="msg" action="" method="post">  
113 - <input type="text" name="msg" value="{{msg}}" maxlength="40" placeholder="留言">  
114 - </form>  
115 - </section> 93 + {{#if invoice}}
  94 + <li class="invoice {{#if needInvoice}}focus{{/if}}">
  95 + <span class="title">发票</span>
  96 + <span class="iconfont checkbox {{#if needInvoice}}icon-cb-checked{{else}}icon-checkbox{{/if}}"></span>
  97 + <form id="invoice">
  98 + <input type="text" name="invoice-title" value="{{invoiceText}}" maxlength="30" placeholder="发票抬头">
  99 + <label>
  100 + 发票类型
  101 + <select class="invoice-type" name="invoice-type">
  102 + {{# invoice}}
  103 + <option value="{{id}}" {{#if isSelected}}selected{{/if}}>{{name}}</option>
  104 + {{/ invoice}}
  105 + </select>
  106 + </label>
  107 + </form>
  108 + </li>
  109 + {{/if}}
  110 + </ul>
116 111
117 - <section class="price-cal block">  
118 - <ul class="total">  
119 - {{#cartPayData}}  
120 - <li>  
121 - <span>{{promotion}}</span>  
122 - &nbsp;&nbsp;{{promotion_amount}}  
123 - </li>  
124 - {{/cartPayData}}  
125 - <li class="cost">  
126 - 应付金额: <em>¥{{price}}</em>  
127 - </li>  
128 - </ul>  
129 - </section> 112 + <form id="msg" action="" method="post">
  113 + <input type="text" name="msg" value="{{msg}}" maxlength="40" placeholder="留言">
  114 + </form>
  115 + </section>
130 116
131 - <ul class="pay-mode">  
132 - {{# paymentWay}}  
133 - {{#if isSupport}}  
134 - <li class="{{#if recommend}}default{{/if}}" data-pay-type="{{paymentType}}" data-pay-id="{{id}}">  
135 - <span class="iconfont">  
136 - {{#if recommend}}  
137 - &#xe62f;  
138 - {{else}}  
139 - &#xe62e;  
140 - {{/if}}  
141 - </span>  
142 - {{name}} 117 + <section class="price-cal block">
  118 + <ul class="total">
  119 + {{#cartPayData}}
  120 + <li>
  121 + <span>{{promotion}}</span>
  122 + &nbsp;&nbsp;{{promotion_amount}}
  123 + </li>
  124 + {{/cartPayData}}
  125 + <li class="cost">
  126 + 应付金额: <em>¥{{price}}</em>
143 </li> 127 </li>
144 - {{/if}}  
145 - {{/ paymentWay}}  
146 </ul> 128 </ul>
  129 + </section>
  130 +
  131 + <ul class="pay-mode">
  132 + {{# paymentWay}}
  133 + {{#if isSupport}}
  134 + <li class="{{#if recommend}}default{{/if}}" data-pay-type="{{paymentType}}" data-pay-id="{{id}}">
  135 + <span class="iconfont">
  136 + {{#if recommend}}
  137 + &#xe62f;
  138 + {{else}}
  139 + &#xe62e;
  140 + {{/if}}
  141 + </span>
  142 + {{name}}
  143 + </li>
  144 + {{/if}}
  145 + {{/ paymentWay}}
  146 + </ul>
147 {{/ orderEnsure}} 147 {{/ orderEnsure}}
148 </div> 148 </div>
149 <script id="tmpl-price" type="text/tmpl"> 149 <script id="tmpl-price" type="text/tmpl">
150 <ul class="total"> 150 <ul class="total">
151 - \{{#cartPayData}}  
152 - <li>  
153 - <span>\{{promotion}}</span>  
154 - &nbsp;&nbsp;\{{promotion_amount}}  
155 - </li>  
156 - \{{/cartPayData}}  
157 - <li class="cost">  
158 - 应付金额: <em>¥\{{price}}</em>  
159 - </li> 151 + \{{#cartPayData}}
  152 + <li>
  153 + <span>\{{promotion}}</span>
  154 + &nbsp;&nbsp;\{{promotion_amount}}
  155 + </li>
  156 + \{{/cartPayData}}
  157 + <li class="cost">
  158 + 应付金额: <em>¥\{{price}}</em>
  159 + </li>
160 </ul> 160 </ul>
161 </script> 161 </script>
162 {{> layout/footer}} 162 {{> layout/footer}}
1 -{{#if goods}}  
2 - <div class="cart-goods">  
3 - {{# goods}}  
4 - {{> cart/good}}  
5 - {{/ goods}}  
6 - </div>  
7 -{{/if}} 1 +<div class="cart-goods">
  2 + {{# goods}}
  3 + {{> cart/good}}
  4 + {{/ goods}}
  5 +</div>
8 6
9 {{#if notValidGoods}} 7 {{#if notValidGoods}}
10 <div class="invalid-goods"> 8 <div class="invalid-goods">