fe / YOHOBUYPC · Commits

Go to a project

Authored by 周少峰
Commit bb12086d34fb6385e25afb942fd4f24a2fd5ac7f 2 parents e0f07104 5aad7e45

Merge remote-tracking branch 'origin/hotfix/editDetail'

Inline Side-by-side
Showing 18 changed files with 53 additions and 52 deletions
@@ -107,7 +107,7 @@ @@ -107,7 +107,7 @@
107 </p> 107 </p>
108 </div> 108 </div>
109 </td> 109 </td>
110 - <td class="productPrice">￥{{productPrice}}</td> 110 + <td class="productPrice">¥{{productPrice}}</td>
111 <td>{{yohoIcon}}个</td> 111 <td>{{yohoIcon}}个</td>
112 <td class="adjust-cart-num"> 112 <td class="adjust-cart-num">
113 {{#if isGift}} 113 {{#if isGift}}
@@ -123,7 +123,7 @@ @@ -123,7 +123,7 @@
123 {{/if}} 123 {{/if}}
124 {{/if}} 124 {{/if}}
125 </td> 125 </td>
126 - <td class="sub-total">￥{{productSubtotal}}</td> 126 + <td class="sub-total">¥{{productSubtotal}}</td>
127 <td class="cart-operation"> 127 <td class="cart-operation">
128 <span class="cart-del-btn"><span>删除</span></span> 128 <span class="cart-del-btn"><span>删除</span></span>
129 </td> 129 </td>
@@ -158,7 +158,7 @@ @@ -158,7 +158,7 @@
158 </p> 158 </p>
159 </div> 159 </div>
160 </td> 160 </td>
161 - <td><span class="productPrice">￥{{productPrice}}</span> 161 + <td><span class="productPrice">¥{{productPrice}}</span>
162 {{#isVipPrice}} 162 {{#isVipPrice}}
163 <span class="vipPrice">(VIP)</span> 163 <span class="vipPrice">(VIP)</span>
164 {{/isVipPrice}} 164 {{/isVipPrice}}
@@ -180,10 +180,10 @@ @@ -180,10 +180,10 @@
180 </td> 180 </td>
181 <td class="sub-total"> 181 <td class="sub-total">
182 {{#if xForOne}} 182 {{#if xForOne}}
183 - <del>￥{{productSubtotal}}</del> 183 + <del>¥{{productSubtotal}}</del>
184 <span class="free"></span> 184 <span class="free"></span>
185 {{^}} 185 {{^}}
186 - ￥{{productSubtotal}} 186 + ¥{{productSubtotal}}
187 {{/if}} 187 {{/if}}
188 </td> 188 </td>
189 <td class="cart-operation"> 189 <td class="cart-operation">
@@ -261,7 +261,7 @@ @@ -261,7 +261,7 @@
261 </td> 261 </td>
262 <td style="width:7%;">{{yohoIcon}}个</td> 262 <td style="width:7%;">{{yohoIcon}}个</td>
263 <td style="width:10%;">1</td> 263 <td style="width:10%;">1</td>
264 - <td style="width:10%;">￥{{subjoinPrice}}</td> 264 + <td style="width:10%;">¥{{subjoinPrice}}</td>
265 <td style="width:20%; border-right: none;"> 265 <td style="width:20%; border-right: none;">
266 {{#isPriceGift}} 266 {{#isPriceGift}}
267 <a href="javascript:void(0);" data-id="{{id}}" class="cart-add-btn order"><span></span></a> 267 <a href="javascript:void(0);" data-id="{{id}}" class="cart-add-btn order"><span></span></a>
@@ -317,11 +317,11 @@ @@ -317,11 +317,11 @@
317 </div> 317 </div>
318 {{/unless}} 318 {{/unless}}
319 <div class="right"> 319 <div class="right">
320 - <p class="sum">商品总价（￥{{cartEnsure.productAmmount}}）- 活动（￥{{cartEnsure.activeSale}}）= 商品金额总计（￥{{cartEnsure.productAllA}}）</p> 320 + <p class="sum">商品总价（¥{{cartEnsure.productAmmount}}）- 活动（¥{{cartEnsure.activeSale}}）= 商品金额总计（¥{{cartEnsure.productAllA}}）</p>
321 <p> 321 <p>
322 <a href="/help/?category_id=87" class="yoho-coin" target="_blank"></a> 322 <a href="/help/?category_id=87" class="yoho-coin" target="_blank"></a>
323 共返YOHO币：{{cartEnsure.getYoho}}个　商品总价（不含运费）： 323 共返YOHO币：{{cartEnsure.getYoho}}个　商品总价（不含运费）：
324 - <strong>￥{{cartEnsure.productAllA}}</strong> 元 324 + <strong>¥{{cartEnsure.productAllA}}</strong> 元
325 </p> 325 </p>
326 </div> 326 </div>
327 </div> 327 </div>
@@ -169,7 +169,7 @@ @@ -169,7 +169,7 @@
169 {{#each carriageList}} 169 {{#each carriageList}}
170 <div class="express-list"> 170 <div class="express-list">
171 <input {{# checked}}checked{{/ checked}} class="radio" type="radio" name="carriagegroup" id="common-{{id}}" value="{{id}}"/> 171 <input {{# checked}}checked{{/ checked}} class="radio" type="radio" name="carriagegroup" id="common-{{id}}" value="{{id}}"/>
172 - <label for="common-express">{{name}}：&nbsp;&nbsp;运费 ￥{{value}} {{desc}}</label> 172 + <label for="common-express">{{name}}：&nbsp;&nbsp;运费 ¥{{value}} {{desc}}</label>
173 </div> 173 </div>
174 {{/each}} 174 {{/each}}
175 <div class="express-list express-tips">注：配送会由于天气，交通等不可抗拒的客观因素造成您收货时间延迟，请您知悉。 175 <div class="express-list express-tips">注：配送会由于天气，交通等不可抗拒的客观因素造成您收货时间延迟，请您知悉。
@@ -212,9 +212,9 @@ @@ -212,9 +212,9 @@
212 <p class="next"> 212 <p class="next">
213 </p> 213 </p>
214 {{#if fee}} 214 {{#if fee}}
215 - <p class="express-fee">运费：￥{{fee}}元(原价{{orign}}元,优惠{{count}}元)</p> 215 + <p class="express-fee">运费：¥{{fee}}元(原价{{orign}}元,优惠{{count}}元)</p>
216 {{else}} 216 {{else}}
217 - <p class="express-fee">运费：￥0.00元</p> 217 + <p class="express-fee">运费：¥0.00元</p>
218 {{/if}} 218 {{/if}}
219 </div> 219 </div>
220 {{/each}} 220 {{/each}}
@@ -387,7 +387,7 @@ @@ -387,7 +387,7 @@
387 {{#if redEnvelopes}} 387 {{#if redEnvelopes}}
388 <div class="red-envelopes active"> 388 <div class="red-envelopes active">
389 <div class="use-envelopes"> 389 <div class="use-envelopes">
390 - <input checked value="0" data-all="{{redEnvelopes}}" data-use="{{useRedEnvelopes}}" type="checkbox" />使用现金红包支付：<span>-￥{{useRedEnvelopes}}</span> 390 + <input checked value="0" data-all="{{redEnvelopes}}" data-use="{{useRedEnvelopes}}" type="checkbox" />使用现金红包支付：<span>-¥{{useRedEnvelopes}}</span>
391 </div> 391 </div>
392 <div class="has-envelopes">您的现金红包余额：<span></span></div> 392 <div class="has-envelopes">您的现金红包余额：<span></span></div>
393 </div> 393 </div>
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 <p class="na-good-name">{{name}}</p> 11 <p class="na-good-name">{{name}}</p>
12 </a> 12 </a>
13 13
14 - <span class="na-price{{#if salePrice}} has-sale{{/if}}">￥{{marketPrice}}</span> 14 + <span class="na-price{{#if salePrice}} has-sale{{/if}}">¥{{marketPrice}}</span>
15 15
16 {{#if salePrice}} 16 {{#if salePrice}}
17 <span class="na-price">{{salePrice}}</span> 17 <span class="na-price">{{salePrice}}</span>
@@ -68,7 +68,7 @@ @@ -68,7 +68,7 @@
68 <a href="{{href}}"> 68 <a href="{{href}}">
69 <img class="thumb" src="{{thumb}}"> 69 <img class="thumb" src="{{thumb}}">
70 <p class="name">{{name}}</p> 70 <p class="name">{{name}}</p>
71 - <span class="price">￥{{price}}</span> 71 + <span class="price">¥{{price}}</span>
72 </a> 72 </a>
73 </li> 73 </li>
74 {{/ newArrival}} 74 {{/ newArrival}}
@@ -100,7 +100,7 @@ @@ -100,7 +100,7 @@
100 <a href="{{href}}" data-id='{{productId}}' target="_blank"> 100 <a href="{{href}}" data-id='{{productId}}' target="_blank">
101 <img class="thumb" src="{{thumb}}"> 101 <img class="thumb" src="{{thumb}}">
102 <p class="name">{{name}}</p> 102 <p class="name">{{name}}</p>
103 - <span class="price">￥{{price}}</span> 103 + <span class="price">¥{{price}}</span>
104 </a> 104 </a>
105 </li> 105 </li>
106 {{/ recommend}} 106 {{/ recommend}}
@@ -18,11 +18,12 @@ @@ -18,11 +18,12 @@
18 {{#if operation.goPay}} 18 {{#if operation.goPay}}
19 <a class="go-pay oo-btn" href="{{operation.goPay}}">立即付款</a> 19 <a class="go-pay oo-btn" href="{{operation.goPay}}">立即付款</a>
20 {{/if}} 20 {{/if}}
21 - {{#if virtualGoods}} 21 + {{#unless virtualGoods}}
22 <!--虚拟商品--> 22 <!--虚拟商品-->
23 - {{else if changeable}}  
24 - <span class="edit-order oo-btn">修改订单</span>  
25 - {{/if}} 23 + {{#if changeable}}
  24 + <span class="edit-order oo-btn">修改订单</span>
  25 + {{/if}}
  26 + {{/unless}}
26 {{#if operation.cancelOrder}} 27 {{#if operation.cancelOrder}}
27 <span class="cancel-order oo-btn">取消订单</span> 28 <span class="cancel-order oo-btn">取消订单</span>
28 {{/if}} 29 {{/if}}
@@ -197,9 +198,9 @@ @@ -197,9 +198,9 @@
197 <p class="next"> 198 <p class="next">
198 </p> 199 </p>
199 {{#if fee}} 200 {{#if fee}}
200 - <p>运费：￥{{fee}}元(原价{{orign}}元,优惠{{count}}元)</p> 201 + <p>运费：¥{{fee}}元(原价{{orign}}元,优惠{{count}}元)</p>
201 {{else}} 202 {{else}}
202 - <p>运费：￥0.00元</p> 203 + <p>运费：¥0.00元</p>
203 {{/if}} 204 {{/if}}
204 </div> 205 </div>
205 {{/each}} 206 {{/each}}
@@ -211,7 +211,7 @@ @@ -211,7 +211,7 @@
211 {{/ goods}} 211 {{/ goods}}
212 <tr> 212 <tr>
213 <td colspan="5"> 213 <td colspan="5">
214 - <p class="re-tips">订单金额：￥{{amount}} （￥{{cash}} 现金 - ￥{{yohoCoin}} YOHO币 - ￥{{coupon}} 优惠券）</p> 214 + <p class="re-tips">订单金额：¥{{amount}} （¥{{cash}} 现金 - ¥{{yohoCoin}} YOHO币 - ¥{{coupon}} 优惠券）</p>
215 </td> 215 </td>
216 </tr> 216 </tr>
217 </table> 217 </table>
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 <div class="vip-level"> 30 <div class="vip-level">
31 <span class="level">年度累计金额：</span> 31 <span class="level">年度累计金额：</span>
32 <div class="year-amount"> 32 <div class="year-amount">
33 - <div class="amount">￥{{yearCost}}</div> 33 + <div class="amount">¥{{yearCost}}</div>
34 <span class="ps">VIP金额累计需要订单成功签收且无退换货</span> 34 <span class="ps">VIP金额累计需要订单成功签收且无退换货</span>
35 {{#if platinum}} 35 {{#if platinum}}
36 <div class="plalevel"></div> 36 <div class="plalevel"></div>
@@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
48 </div> 48 </div>
49 <div class="change-img{{level}}"></div> 49 <div class="change-img{{level}}"></div>
50 <div class="balance"> 50 <div class="balance">
51 - <p>还差￥<span class="balan">{{balan}}</span>元就可以升级为{{vipLevel}}！</p> 51 + <p>还差¥<span class="balan">{{balan}}</span>元就可以升级为{{vipLevel}}！</p>
52 <a href="{{morePreferences}}">更多优惠</a> 52 <a href="{{morePreferences}}">更多优惠</a>
53 </div> 53 </div>
54 {{/if}} 54 {{/if}}
@@ -57,7 +57,7 @@ @@ -57,7 +57,7 @@
57 57
58 <div class="history"> 58 <div class="history">
59 <div class="level">历史消费总额： 59 <div class="level">历史消费总额：
60 - <span class="hisamout">￥{{totalCost}}</span> 60 + <span class="hisamout">¥{{totalCost}}</span>
61 </div> 61 </div>
62 </div> 62 </div>
63 63
@@ -68,7 +68,7 @@ @@ -68,7 +68,7 @@
68 <a href="{{href}}"> 68 <a href="{{href}}">
69 <img class="thumb" src="{{thumb}}"> 69 <img class="thumb" src="{{thumb}}">
70 <p class="name">{{name}}</p> 70 <p class="name">{{name}}</p>
71 - <span class="price">￥{{price}}</span> 71 + <span class="price">¥{{price}}</span>
72 </a> 72 </a>
73 </li> 73 </li>
74 {{/ newArrival}} 74 {{/ newArrival}}
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 <p class="na-good-name">{{name}}</p> 11 <p class="na-good-name">{{name}}</p>
12 </a> 12 </a>
13 13
14 - <span class="na-price{{#if salePrice}} has-sale{{/if}}">￥{{marketPrice}}</span> 14 + <span class="na-price{{#if salePrice}} has-sale{{/if}}">¥{{marketPrice}}</span>
15 15
16 {{#if salePrice}} 16 {{#if salePrice}}
17 <span class="na-price">{{salePrice}}</span> 17 <span class="na-price">{{salePrice}}</span>
@@ -191,7 +191,7 @@ @@ -191,7 +191,7 @@
191 {{/ goods}} 191 {{/ goods}}
192 <tr> 192 <tr>
193 <td colspan="5"> 193 <td colspan="5">
194 - <p class="re-tips">订单金额：￥{{amount}} （￥{{cash}} 现金 - ￥{{yohoCoin}} YOHO币 - ￥{{coupon}} 优惠券）</p> 194 + <p class="re-tips">订单金额：¥{{amount}} （¥{{cash}} 现金 - ¥{{yohoCoin}} YOHO币 - ¥{{coupon}} 优惠券）</p>
195 </td> 195 </td>
196 </tr> 196 </tr>
197 </table> 197 </table>
@@ -68,7 +68,7 @@ @@ -68,7 +68,7 @@
68 <a href="{{href}}"> 68 <a href="{{href}}">
69 <img class="thumb" src="{{thumb}}"> 69 <img class="thumb" src="{{thumb}}">
70 <p class="name">{{name}}</p> 70 <p class="name">{{name}}</p>
71 - <span class="price">￥{{price}}</span> 71 + <span class="price">¥{{price}}</span>
72 </a> 72 </a>
73 </li> 73 </li>
74 {{/ newArrival}} 74 {{/ newArrival}}
@@ -170,7 +170,7 @@ @@ -170,7 +170,7 @@
170 {{#each carriagelist}} 170 {{#each carriagelist}}
171 <div class="express-list"> 171 <div class="express-list">
172 <input class="radio" type="radio" name="carriagegroup" id="common-{id}" value="{{value}}"/> 172 <input class="radio" type="radio" name="carriagegroup" id="common-{id}" value="{{value}}"/>
173 - <label for="common-express">{{name}}：&nbsp;&nbsp;运费 ￥{{value}} {{desc}}</label> 173 + <label for="common-express">{{name}}：&nbsp;&nbsp;运费 ¥{{value}} {{desc}}</label>
174 </div> 174 </div>
175 {{/each}} 175 {{/each}}
176 <div class="express-list express-tips">注：配送会由于天气，交通等不可抗拒的客观因素造成您收货时间延迟，请您知悉。</div> 176 <div class="express-list express-tips">注：配送会由于天气，交通等不可抗拒的客观因素造成您收货时间延迟，请您知悉。</div>
@@ -252,11 +252,11 @@ @@ -252,11 +252,11 @@
252 </div> 252 </div>
253 <div class="play-right"> 253 <div class="play-right">
254 <ul class="play-total"> 254 <ul class="play-total">
255 - <li><label>发票抬头:</label>+￥<em>0.00</em></li>  
256 - <li><label>活动:</label>-￥<em>0.00</em></li>  
257 - <li class="red"><label>运费:</label>+￥<em>0.00</em></li>  
258 - <li><label>优惠券支付<a href="javascript:void(0);" to="play-juan-pan">[修改]</a>:</label>-￥<em>0.00</em></li>  
259 - <li><label>使用YOHO币<a href="javascript:void(0);" to="play-bi-pan">[修改]</a>:</label>-￥<em>0.00</em></li> 255 + <li><label>发票抬头:</label>+¥<em>0.00</em></li>
  256 + <li><label>活动:</label>-¥<em>0.00</em></li>
  257 + <li class="red"><label>运费:</label>+¥<em>0.00</em></li>
  258 + <li><label>优惠券支付<a href="javascript:void(0);" to="play-juan-pan">[修改]</a>:</label>-¥<em>0.00</em></li>
  259 + <li><label>使用YOHO币<a href="javascript:void(0);" to="play-bi-pan">[修改]</a>:</label>-¥<em>0.00</em></li>
260 </ul> 260 </ul>
261 <dl class="play-juan-pan pan"> 261 <dl class="play-juan-pan pan">
262 <dt>使用优惠卷支付</dt> 262 <dt>使用优惠卷支付</dt>
@@ -170,7 +170,7 @@ @@ -170,7 +170,7 @@
170 {{#each carriagelist}} 170 {{#each carriagelist}}
171 <div class="express-list"> 171 <div class="express-list">
172 <input class="radio" type="radio" name="carriagegroup" id="common-{id}" value="{{value}}"/> 172 <input class="radio" type="radio" name="carriagegroup" id="common-{id}" value="{{value}}"/>
173 - <label for="common-express">{{name}}：&nbsp;&nbsp;运费 ￥{{value}} {{desc}}</label> 173 + <label for="common-express">{{name}}：&nbsp;&nbsp;运费 ¥{{value}} {{desc}}</label>
174 </div> 174 </div>
175 {{/each}} 175 {{/each}}
176 <div class="express-list express-tips">注：配送会由于天气，交通等不可抗拒的客观因素造成您收货时间延迟，请您知悉。</div> 176 <div class="express-list express-tips">注：配送会由于天气，交通等不可抗拒的客观因素造成您收货时间延迟，请您知悉。</div>
@@ -252,11 +252,11 @@ @@ -252,11 +252,11 @@
252 </div> 252 </div>
253 <div class="play-right"> 253 <div class="play-right">
254 <ul class="play-total"> 254 <ul class="play-total">
255 - <li><label>发票抬头:</label>+￥<em>0.00</em></li>  
256 - <li><label>活动:</label>-￥<em>0.00</em></li>  
257 - <li class="red"><label>运费:</label>+￥<em>0.00</em></li>  
258 - <li><label>优惠券支付<a href="javascript:void(0);" to="play-juan-pan">[修改]</a>:</label>-￥<em>0.00</em></li>  
259 - <li><label>使用YOHO币<a href="javascript:void(0);" to="play-bi-pan">[修改]</a>:</label>-￥<em>0.00</em></li> 255 + <li><label>发票抬头:</label>+¥<em>0.00</em></li>
  256 + <li><label>活动:</label>-¥<em>0.00</em></li>
  257 + <li class="red"><label>运费:</label>+¥<em>0.00</em></li>
  258 + <li><label>优惠券支付<a href="javascript:void(0);" to="play-juan-pan">[修改]</a>:</label>-¥<em>0.00</em></li>
  259 + <li><label>使用YOHO币<a href="javascript:void(0);" to="play-bi-pan">[修改]</a>:</label>-¥<em>0.00</em></li>
260 </ul> 260 </ul>
261 <dl class="play-juan-pan pan"> 261 <dl class="play-juan-pan pan">
262 <dt>使用优惠卷支付</dt> 262 <dt>使用优惠卷支付</dt>
@@ -84,12 +84,12 @@ @@ -84,12 +84,12 @@
84 <a class="brand-name" href="{{brandUrl}}">{{brandName}}</a> 84 <a class="brand-name" href="{{brandUrl}}">{{brandName}}</a>
85 <p class="market-price {{#if salePrice}}with-sale{{/unless}}"> 85 <p class="market-price {{#if salePrice}}with-sale{{/unless}}">
86 <span class="title">市场价：</span> 86 <span class="title">市场价：</span>
87 - <span class="price">￥{{marketPrice}}</span> 87 + <span class="price">¥{{marketPrice}}</span>
88 </p> 88 </p>
89 {{#if salePrice}} 89 {{#if salePrice}}
90 <p class="sale-price"> 90 <p class="sale-price">
91 <span class="title">促销价：</span> 91 <span class="title">促销价：</span>
92 - <span class="price">￥{{salePrice}}</span> 92 + <span class="price">¥{{salePrice}}</span>
93 </p> 93 </p>
94 {{/if}} 94 {{/if}}
95 95
@@ -33,10 +33,10 @@ @@ -33,10 +33,10 @@
33 </div> 33 </div>
34 <div class="price"> 34 <div class="price">
35 \{{#if marketPrice}} 35 \{{#if marketPrice}}
36 - <del>￥\{{marketPrice}}</del> 36 + <del>¥\{{marketPrice}}</del>
37 37
38 \{{/if}} 38 \{{/if}}
39 - ￥\{{price}}</div> 39 + ¥\{{price}}</div>
40 <div class="op"> 40 <div class="op">
41 <a href="javascript:void(0);" data-id="\{{id}}" class="btn_view_s"></a> 41 <a href="javascript:void(0);" data-id="\{{id}}" class="btn_view_s"></a>
42 </div> 42 </div>
@@ -63,10 +63,10 @@ @@ -63,10 +63,10 @@
63 <p class="na-good-name">\{{name}}</p> 63 <p class="na-good-name">\{{name}}</p>
64 </a> 64 </a>
65 65
66 - <span class="na-price\{{#if salePrice}} has-sale\{{/if}}">￥\{{marketPrice}}</span> 66 + <span class="na-price\{{#if salePrice}} has-sale\{{/if}}">¥\{{marketPrice}}</span>
67 67
68 \{{#if salePrice}} 68 \{{#if salePrice}}
69 - <span class="na-price">￥\{{salePrice}}</span> 69 + <span class="na-price">¥\{{salePrice}}</span>
70 \{{/if}} 70 \{{/if}}
71 </li> 71 </li>
72 \{{/ naGoods}} 72 \{{/ naGoods}}
@@ -174,7 +174,7 @@ @@ -174,7 +174,7 @@
174 </div> 174 </div>
175 <div class="goods-price float-left"> 175 <div class="goods-price float-left">
176 <h3 class="priceandnum"> 176 <h3 class="priceandnum">
177 - <span class="price">￥\{\{show_price\}\}</span> 177 + <span class="price">¥\{\{show_price\}\}</span>
178 x 178 x
179 <span class="num">\{\{buy_number\}\}</span> 179 <span class="num">\{\{buy_number\}\}</span>
180 </h3> 180 </h3>
@@ -189,7 +189,7 @@ @@ -189,7 +189,7 @@
189 <li class="activity-item"> 189 <li class="activity-item">
190 <span class="activity-name">活动</span> 190 <span class="activity-name">活动</span>
191 <h3 class="activity-content"> 191 <h3 class="activity-content">
192 - \{\{#if fit_outlet_promotion \}\}购outlet商品，满￥1999再享9折 192 + \{\{#if fit_outlet_promotion \}\}购outlet商品，满¥1999再享9折
193 \{\{/if\}\} 193 \{\{/if\}\}
194 \{\{#if has_other_promotion\}\} 194 \{\{#if has_other_promotion\}\}
195 <span class="mycart_i_down" title="更多" ></span> 195 <span class="mycart_i_down" title="更多" ></span>
@@ -203,7 +203,7 @@ @@ -203,7 +203,7 @@
203 \{\{#if fit_free_shipping \}\} 203 \{\{#if fit_free_shipping \}\}
204 <li class="activity-item"> 204 <li class="activity-item">
205 <span class="activity-name">免运费</span> 205 <span class="activity-name">免运费</span>
206 - <h3 class="activity-content">全场满 ￥\{\{fit_free_shipping\}\}免运费</h3> 206 + <h3 class="activity-content">全场满 ¥\{\{fit_free_shipping\}\}免运费</h3>
207 </li> 207 </li>
208 \{\{/if\}\} 208 \{\{/if\}\}
209 </ul> 209 </ul>
@@ -560,7 +560,7 @@ class ShopModel @@ -560,7 +560,7 @@ class ShopModel
560 'productId' => $resource['productId'], 560 'productId' => $resource['productId'],
561 'title' => $resource['productName'], 561 'title' => $resource['productName'],
562 'productSkn' => $resource['productSkn'], 562 'productSkn' => $resource['productSkn'],
563 - 'price' => '￥' . number_format(trim($resource['salesPrice'], '￥'), 2, '.', ''), 563 + 'price' => '¥' . number_format(trim($resource['salesPrice'], '¥'), 2, '.', ''),
564 'img' => self::imageView2($resource['src'], 250, 250), 564 'img' => self::imageView2($resource['src'], 250, 250),
565 'url' => Helpers::getProductUrl($resource['productId'], $resource['productSkn'], $resource['productName']), 565 'url' => Helpers::getProductUrl($resource['productId'], $resource['productSkn'], $resource['productName']),
566 ); 566 );
@@ -582,7 +582,7 @@ class ShopModel @@ -582,7 +582,7 @@ class ShopModel
582 'productId' => $resource['productId'], 582 'productId' => $resource['productId'],
583 'title' => $resource['productName'], 583 'title' => $resource['productName'],
584 'productSkn' => $resource['productSkn'], 584 'productSkn' => $resource['productSkn'],
585 - 'price' => '￥' . number_format(trim($resource['salesPrice'], '￥'), 2, '.', ''), 585 + 'price' => '¥' . number_format(trim($resource['salesPrice'], '¥'), 2, '.', ''),
586 'img' => self::imageView2($resource['src'], 250, 250), 586 'img' => self::imageView2($resource['src'], 250, 250),
587 'url' => Helpers::getProductUrl($resource['productId'], $resource['productSkn'], $resource['productName']), 587 'url' => Helpers::getProductUrl($resource['productId'], $resource['productSkn'], $resource['productName']),
588 'index' => $key + 1 588 'index' => $key + 1