fe / YOHOBUYPC · Commits

Go to a project

Authored by yyq
Commit 5aad7e45744c8e6638c5a3799abca5fdaae3c532 2 parents d162889a 87722470

Merge branch 'hotfix/orderDetail' into hotfix/editDetail

Inline Side-by-side
Showing 18 changed files with 48 additions and 48 deletions
... ... @@ -107,7 +107,7 @@
</p>
</div>
</td>
<td class="productPrice">￥{{productPrice}}</td>
<td class="productPrice">¥{{productPrice}}</td>
<td>{{yohoIcon}}个</td>
<td class="adjust-cart-num">
{{#if isGift}}
... ... @@ -123,7 +123,7 @@
{{/if}}
{{/if}}
</td>
<td class="sub-total">￥{{productSubtotal}}</td>
<td class="sub-total">¥{{productSubtotal}}</td>
<td class="cart-operation">
<span class="cart-del-btn"><span>删除</span></span>
</td>
... ... @@ -158,7 +158,7 @@
</p>
</div>
</td>
<td><span class="productPrice">￥{{productPrice}}</span>
<td><span class="productPrice">¥{{productPrice}}</span>
{{#isVipPrice}}
<span class="vipPrice">(VIP)</span>
{{/isVipPrice}}
... ... @@ -180,10 +180,10 @@
</td>
<td class="sub-total">
{{#if xForOne}}
<del>￥{{productSubtotal}}</del>
<del>¥{{productSubtotal}}</del>
<span class="free"></span>
{{^}}
￥{{productSubtotal}}
¥{{productSubtotal}}
{{/if}}
</td>
<td class="cart-operation">
... ... @@ -261,7 +261,7 @@
</td>
<td style="width:7%;">{{yohoIcon}}个</td>
<td style="width:10%;">1</td>
<td style="width:10%;">￥{{subjoinPrice}}</td>
<td style="width:10%;">¥{{subjoinPrice}}</td>
<td style="width:20%; border-right: none;">
{{#isPriceGift}}
<a href="javascript:void(0);" data-id="{{id}}" class="cart-add-btn order"><span></span></a>
... ... @@ -317,11 +317,11 @@
</div>
{{/unless}}
<div class="right">
<p class="sum">商品总价（￥{{cartEnsure.productAmmount}}）- 活动（￥{{cartEnsure.activeSale}}）= 商品金额总计（￥{{cartEnsure.productAllA}}）</p>
<p class="sum">商品总价（¥{{cartEnsure.productAmmount}}）- 活动（¥{{cartEnsure.activeSale}}）= 商品金额总计（¥{{cartEnsure.productAllA}}）</p>
<p>
<a href="/help/?category_id=87" class="yoho-coin" target="_blank"></a>
共返YOHO币：{{cartEnsure.getYoho}}个　商品总价（不含运费）：
<strong>￥{{cartEnsure.productAllA}}</strong> 元
<strong>¥{{cartEnsure.productAllA}}</strong> 元
</p>
</div>
</div>
... ...
... ... @@ -169,7 +169,7 @@
{{#each carriageList}}
<div class="express-list">
<input {{# checked}}checked{{/ checked}} class="radio" type="radio" name="carriagegroup" id="common-{{id}}" value="{{id}}"/>
<label for="common-express">{{name}}：&nbsp;&nbsp;运费 ￥{{value}} {{desc}}</label>
<label for="common-express">{{name}}：&nbsp;&nbsp;运费 ¥{{value}} {{desc}}</label>
</div>
{{/each}}
<div class="express-list express-tips">注：配送会由于天气，交通等不可抗拒的客观因素造成您收货时间延迟，请您知悉。
... ... @@ -212,9 +212,9 @@
<p class="next">
</p>
{{#if fee}}
<p class="express-fee">运费：￥{{fee}}元(原价{{orign}}元,优惠{{count}}元)</p>
<p class="express-fee">运费：¥{{fee}}元(原价{{orign}}元,优惠{{count}}元)</p>
{{else}}
<p class="express-fee">运费：￥0.00元</p>
<p class="express-fee">运费：¥0.00元</p>
{{/if}}
</div>
{{/each}}
... ... @@ -387,7 +387,7 @@
{{#if redEnvelopes}}
<div class="red-envelopes active">
<div class="use-envelopes">
<input checked value="0" data-all="{{redEnvelopes}}" data-use="{{useRedEnvelopes}}" type="checkbox" />使用现金红包支付：<span>-￥{{useRedEnvelopes}}</span>
<input checked value="0" data-all="{{redEnvelopes}}" data-use="{{useRedEnvelopes}}" type="checkbox" />使用现金红包支付：<span>-¥{{useRedEnvelopes}}</span>
</div>
<div class="has-envelopes">您的现金红包余额：<span></span></div>
</div>
... ...
... ... @@ -11,7 +11,7 @@
<p class="na-good-name">{{name}}</p>
</a>
<span class="na-price{{#if salePrice}} has-sale{{/if}}">￥{{marketPrice}}</span>
<span class="na-price{{#if salePrice}} has-sale{{/if}}">¥{{marketPrice}}</span>
{{#if salePrice}}
<span class="na-price">{{salePrice}}</span>
... ...
... ... @@ -68,7 +68,7 @@
<a href="{{href}}">
<img class="thumb" src="{{thumb}}">
<p class="name">{{name}}</p>
<span class="price">￥{{price}}</span>
<span class="price">¥{{price}}</span>
</a>
</li>
{{/ newArrival}}
... ... @@ -100,7 +100,7 @@
<a href="{{href}}" data-id='{{productId}}' target="_blank">
<img class="thumb" src="{{thumb}}">
<p class="name">{{name}}</p>
<span class="price">￥{{price}}</span>
<span class="price">¥{{price}}</span>
</a>
</li>
{{/ recommend}}
... ...
... ... @@ -198,9 +198,9 @@
<p class="next">
</p>
{{#if fee}}
<p>运费：￥{{fee}}元(原价{{orign}}元,优惠{{count}}元)</p>
<p>运费：¥{{fee}}元(原价{{orign}}元,优惠{{count}}元)</p>
{{else}}
<p>运费：￥0.00元</p>
<p>运费：¥0.00元</p>
{{/if}}
</div>
{{/each}}
... ...
... ... @@ -211,7 +211,7 @@
{{/ goods}}
<tr>
<td colspan="5">
<p class="re-tips">订单金额：￥{{amount}} （￥{{cash}} 现金 - ￥{{yohoCoin}} YOHO币 - ￥{{coupon}} 优惠券）</p>
<p class="re-tips">订单金额：¥{{amount}} （¥{{cash}} 现金 - ¥{{yohoCoin}} YOHO币 - ¥{{coupon}} 优惠券）</p>
</td>
</tr>
</table>
... ...
... ... @@ -30,7 +30,7 @@
<div class="vip-level">
<span class="level">年度累计金额：</span>
<div class="year-amount">
<div class="amount">￥{{yearCost}}</div>
<div class="amount">¥{{yearCost}}</div>
<span class="ps">VIP金额累计需要订单成功签收且无退换货</span>
{{#if platinum}}
<div class="plalevel"></div>
... ... @@ -48,7 +48,7 @@
</div>
<div class="change-img{{level}}"></div>
<div class="balance">
<p>还差￥<span class="balan">{{balan}}</span>元就可以升级为{{vipLevel}}！</p>
<p>还差¥<span class="balan">{{balan}}</span>元就可以升级为{{vipLevel}}！</p>
<a href="{{morePreferences}}">更多优惠</a>
</div>
{{/if}}
... ... @@ -57,7 +57,7 @@
<div class="history">
<div class="level">历史消费总额：
<span class="hisamout">￥{{totalCost}}</span>
<span class="hisamout">¥{{totalCost}}</span>
</div>
</div>
... ...
... ... @@ -68,7 +68,7 @@
<a href="{{href}}">
<img class="thumb" src="{{thumb}}">
<p class="name">{{name}}</p>
<span class="price">￥{{price}}</span>
<span class="price">¥{{price}}</span>
</a>
</li>
{{/ newArrival}}
... ...
... ... @@ -11,7 +11,7 @@
<p class="na-good-name">{{name}}</p>
</a>
<span class="na-price{{#if salePrice}} has-sale{{/if}}">￥{{marketPrice}}</span>
<span class="na-price{{#if salePrice}} has-sale{{/if}}">¥{{marketPrice}}</span>
{{#if salePrice}}
<span class="na-price">{{salePrice}}</span>
... ...
... ... @@ -191,7 +191,7 @@
{{/ goods}}
<tr>
<td colspan="5">
<p class="re-tips">订单金额：￥{{amount}} （￥{{cash}} 现金 - ￥{{yohoCoin}} YOHO币 - ￥{{coupon}} 优惠券）</p>
<p class="re-tips">订单金额：¥{{amount}} （¥{{cash}} 现金 - ¥{{yohoCoin}} YOHO币 - ¥{{coupon}} 优惠券）</p>
</td>
</tr>
</table>
... ...
... ... @@ -68,7 +68,7 @@
<a href="{{href}}">
<img class="thumb" src="{{thumb}}">
<p class="name">{{name}}</p>
<span class="price">￥{{price}}</span>
<span class="price">¥{{price}}</span>
</a>
</li>
{{/ newArrival}}
... ...
... ... @@ -170,7 +170,7 @@
{{#each carriagelist}}
<div class="express-list">
<input class="radio" type="radio" name="carriagegroup" id="common-{id}" value="{{value}}"/>
<label for="common-express">{{name}}：&nbsp;&nbsp;运费 ￥{{value}} {{desc}}</label>
<label for="common-express">{{name}}：&nbsp;&nbsp;运费 ¥{{value}} {{desc}}</label>
</div>
{{/each}}
<div class="express-list express-tips">注：配送会由于天气，交通等不可抗拒的客观因素造成您收货时间延迟，请您知悉。</div>
... ... @@ -252,11 +252,11 @@
</div>
<div class="play-right">
<ul class="play-total">
<li><label>发票抬头:</label>+￥<em>0.00</em></li>
<li><label>活动:</label>-￥<em>0.00</em></li>
<li class="red"><label>运费:</label>+￥<em>0.00</em></li>
<li><label>优惠券支付<a href="javascript:void(0);" to="play-juan-pan">[修改]</a>:</label>-￥<em>0.00</em></li>
<li><label>使用YOHO币<a href="javascript:void(0);" to="play-bi-pan">[修改]</a>:</label>-￥<em>0.00</em></li>
<li><label>发票抬头:</label>+¥<em>0.00</em></li>
<li><label>活动:</label>-¥<em>0.00</em></li>
<li class="red"><label>运费:</label>+¥<em>0.00</em></li>
<li><label>优惠券支付<a href="javascript:void(0);" to="play-juan-pan">[修改]</a>:</label>-¥<em>0.00</em></li>
<li><label>使用YOHO币<a href="javascript:void(0);" to="play-bi-pan">[修改]</a>:</label>-¥<em>0.00</em></li>
</ul>
<dl class="play-juan-pan pan">
<dt>使用优惠卷支付</dt>
... ...
... ... @@ -170,7 +170,7 @@
{{#each carriagelist}}
<div class="express-list">
<input class="radio" type="radio" name="carriagegroup" id="common-{id}" value="{{value}}"/>
<label for="common-express">{{name}}：&nbsp;&nbsp;运费 ￥{{value}} {{desc}}</label>
<label for="common-express">{{name}}：&nbsp;&nbsp;运费 ¥{{value}} {{desc}}</label>
</div>
{{/each}}
<div class="express-list express-tips">注：配送会由于天气，交通等不可抗拒的客观因素造成您收货时间延迟，请您知悉。</div>
... ... @@ -252,11 +252,11 @@
</div>
<div class="play-right">
<ul class="play-total">
<li><label>发票抬头:</label>+￥<em>0.00</em></li>
<li><label>活动:</label>-￥<em>0.00</em></li>
<li class="red"><label>运费:</label>+￥<em>0.00</em></li>
<li><label>优惠券支付<a href="javascript:void(0);" to="play-juan-pan">[修改]</a>:</label>-￥<em>0.00</em></li>
<li><label>使用YOHO币<a href="javascript:void(0);" to="play-bi-pan">[修改]</a>:</label>-￥<em>0.00</em></li>
<li><label>发票抬头:</label>+¥<em>0.00</em></li>
<li><label>活动:</label>-¥<em>0.00</em></li>
<li class="red"><label>运费:</label>+¥<em>0.00</em></li>
<li><label>优惠券支付<a href="javascript:void(0);" to="play-juan-pan">[修改]</a>:</label>-¥<em>0.00</em></li>
<li><label>使用YOHO币<a href="javascript:void(0);" to="play-bi-pan">[修改]</a>:</label>-¥<em>0.00</em></li>
</ul>
<dl class="play-juan-pan pan">
<dt>使用优惠卷支付</dt>
... ...
... ... @@ -84,12 +84,12 @@
<a class="brand-name" href="{{brandUrl}}">{{brandName}}</a>
<p class="market-price {{#if salePrice}}with-sale{{/unless}}">
<span class="title">市场价：</span>
<span class="price">￥{{marketPrice}}</span>
<span class="price">¥{{marketPrice}}</span>
</p>
{{#if salePrice}}
<p class="sale-price">
<span class="title">促销价：</span>
<span class="price">￥{{salePrice}}</span>
<span class="price">¥{{salePrice}}</span>
</p>
{{/if}}
... ...
... ... @@ -33,10 +33,10 @@
</div>
<div class="price">
\{{#if marketPrice}}
<del>￥\{{marketPrice}}</del>
<del>¥\{{marketPrice}}</del>
\{{/if}}
￥\{{price}}</div>
¥\{{price}}</div>
<div class="op">
<a href="javascript:void(0);" data-id="\{{id}}" class="btn_view_s"></a>
</div>
... ...
... ... @@ -63,10 +63,10 @@
<p class="na-good-name">\{{name}}</p>
</a>
<span class="na-price\{{#if salePrice}} has-sale\{{/if}}">￥\{{marketPrice}}</span>
<span class="na-price\{{#if salePrice}} has-sale\{{/if}}">¥\{{marketPrice}}</span>
\{{#if salePrice}}
<span class="na-price">￥\{{salePrice}}</span>
<span class="na-price">¥\{{salePrice}}</span>
\{{/if}}
</li>
\{{/ naGoods}}
... ...
... ... @@ -174,7 +174,7 @@
</div>
<div class="goods-price float-left">
<h3 class="priceandnum">
<span class="price">￥\{\{show_price\}\}</span>
<span class="price">¥\{\{show_price\}\}</span>
x
<span class="num">\{\{buy_number\}\}</span>
</h3>
... ... @@ -189,7 +189,7 @@
<li class="activity-item">
<span class="activity-name">活动</span>
<h3 class="activity-content">
\{\{#if fit_outlet_promotion \}\}购outlet商品，满￥1999再享9折
\{\{#if fit_outlet_promotion \}\}购outlet商品，满¥1999再享9折
\{\{/if\}\}
\{\{#if has_other_promotion\}\}
<span class="mycart_i_down" title="更多" ></span>
... ... @@ -203,7 +203,7 @@
\{\{#if fit_free_shipping \}\}
<li class="activity-item">
<span class="activity-name">免运费</span>
<h3 class="activity-content">全场满 ￥\{\{fit_free_shipping\}\}免运费</h3>
<h3 class="activity-content">全场满 ¥\{\{fit_free_shipping\}\}免运费</h3>
</li>
\{\{/if\}\}
</ul>
... ...
... ... @@ -560,7 +560,7 @@ class ShopModel
'productId' => $resource['productId'],
'title' => $resource['productName'],
'productSkn' => $resource['productSkn'],
'price' => '￥' . number_format(trim($resource['salesPrice'], '￥'), 2, '.', ''),
'price' => '¥' . number_format(trim($resource['salesPrice'], '¥'), 2, '.', ''),
'img' => self::imageView2($resource['src'], 250, 250),
'url' => Helpers::getProductUrl($resource['productId'], $resource['productSkn'], $resource['productName']),
);
... ... @@ -582,7 +582,7 @@ class ShopModel
'productId' => $resource['productId'],
'title' => $resource['productName'],
'productSkn' => $resource['productSkn'],
'price' => '￥' . number_format(trim($resource['salesPrice'], '￥'), 2, '.', ''),
'price' => '¥' . number_format(trim($resource['salesPrice'], '¥'), 2, '.', ''),
'img' => self::imageView2($resource['src'], 250, 250),
'url' => Helpers::getProductUrl($resource['productId'], $resource['productSkn'], $resource['productName']),
'index' => $key + 1
... ...