fe / YOHOBUYPC · Commits

Go to a project

Authored by 周少峰
Commit eb240847d824786ef50c67356585cc85973ac75f 2 parents 2d7a1118 6173d3a3

Merge branch 'release/5.4' of git.yoho.cn:fe/YOHOBUYPC into release/5.4

Inline Side-by-side
Showing 8 changed files with 61 additions and 61 deletions
... ... @@ -14,14 +14,14 @@
<a href="javascript:void(0);" class="btn_close" title="关闭"></a>
<strong>温馨提示：</strong>亲爱的顾客，您还没有 <a href="{{cartEnsure.loginUrl}}" class="a_eu">登录</a> 哦，所有商品价格、活动信息以登录后显示为准.
</div>
</div>
</div>
{{^}}
<div class="cartnew-tips">
<div class="tipsbox" id="tipsbox">
<a href="javascript:void(0);" class="btn_close" title="关闭"></a>
<strong>温馨提示：</strong>1. 选购单中的商品不保留库存，请及时结算。 2. 商品的价格、相关活动信息及库存以订单提交时为准。
</div>
</div>
</div>
{{/if}}
<div class="order-pay">
{{#if cartEnsure.isEmpty}}
... ... @@ -39,7 +39,7 @@
<th style="width:20%;">操作</th>
</tr>
</thead>
<tbody>
<tbody>
<tr class="pre-sell-box">
<td colspan="6" class="cart-empty">
<a href="{{cartEnsure.guangUrl}}">选购商品</a>
... ... @@ -323,7 +323,7 @@
<div class="right">
<p class="sum">商品总价（¥{{cartEnsure.productAmmount}}）- 活动（¥{{cartEnsure.activeSale}}）= 商品金额总计（¥{{cartEnsure.productAllA}}）</p>
<p>
<a href="/help/?category_id=87" class="yoho-coin" target="_blank"></a>
<a href="/help/detail?id=105" class="yoho-coin" target="_blank"></a>
共返有货币：{{cartEnsure.getYoho}}个　商品总价（不含运费）：
<strong>¥{{cartEnsure.productAllA}}</strong> 元
</p>
... ... @@ -336,7 +336,7 @@
<div class="go_cash_tips" id="cannotPayNotice" style="display: none;">
<span>请将普通商品与预售商品分开结算，普通商品订单我们将为您优先发货。</span>
</div>
</div>
</div>
{{/if}}
</div>
</div>
... ... @@ -350,12 +350,12 @@
</div>
<!-- 商品详细信息窗口 -->
<script type="text/javascript">
(function (d) {
window.bd_cpro_rtid="P1fsPWc";
var s = d.createElement("script");s.type = "text/javascript";s.async = true;s.src = location.protocol + "//cpro.baidu.com/cpro/ui/rt.js";
var s0 = d.getElementsByTagName("script")[0];s0.parentNode.insertBefore(s, s0);
})(document);
<script type="text/javascript">
(function (d) {
window.bd_cpro_rtid="P1fsPWc";
var s = d.createElement("script");s.type = "text/javascript";s.async = true;s.src = location.protocol + "//cpro.baidu.com/cpro/ui/rt.js";
var s0 = d.getElementsByTagName("script")[0];s0.parentNode.insertBefore(s, s0);
})(document);
</script>
<script type="text/javascript" src="//static.criteo.net/js/ld/ld.js" async="true"></script>
<script type="text/javascript">
... ... @@ -363,13 +363,13 @@ window.criteo_q = window.criteo_q || [];
window.criteo_q.push(
{event:"setAccount", account: 16184},
{event:"setCustomerId", id: "{{uid}}"},
{event:"setSiteType", type: "d"},
{event:"setSiteType", type: "d"},
{event:"viewBasket", item: {{{cartEnsure.criteo}}} }
);
</script>
<!-- 聚效 -->
<script type="text/javascript">
var _mvq = window._mvq || [];
var _mvq = window._mvq || [];
window._mvq = _mvq;
_mvq.push(['$setAccount', 'm-23428-1']);
_mvq.push(['$setGeneral', 'cartview', '', /*用户名*/ '', '{{uid}}']);
... ... @@ -377,4 +377,4 @@ _mvq.push(['$logConversion']);
_mvq.push(['$addItem', '', /*商品id*/ '{{cartEnsure.ids}}', '', '']);
_mvq.push(['$logData']);
</script>
{{> layout/footer}}
\ No newline at end of file
{{> layout/footer}}
... ...
... ... @@ -176,7 +176,7 @@
{{/each}}
<div class="express-list express-tips">注：配送会由于天气，交通等不可抗拒的客观因素造成您收货时间延迟，请您知悉。
</div>
<div class="express-list hide is-sup"><span class="sf">您所选择的区域暂不在顺丰派送范围内,</span><a style="text-decoration: none;" target="_blank" href="{{sfUrl}}">点击查看详情</a></div>
<div class="express-list hide is-sup"><span class="sf">您所选择的区域暂不在顺丰派送范围内,</span><a style="text-decoration: none;" target="_blank" href="{{sfUrl}}" class="hide">点击查看详情</a></div>
<div class="express-list sf hide">如您购买的商品为航空禁运品顺丰会用陆运的方式给您派送，预计3-5天送达，请您见谅</div>
</div>
</div>
... ... @@ -330,7 +330,7 @@
</div>
<div class="play-right">
<div class="back-coin">
<a href="/help/?category_id=87" class="yoho-coin" target="_blank"></a>共返有货币：{{totalYoho}}个
<a href="/help/detail?id=105" class="yoho-coin" target="_blank"></a>共返有货币：{{totalYoho}}个
</div>
<ul class="play-total">
{{#each promotionFormulaList}}
... ... @@ -405,7 +405,7 @@
<input type="button" class="cancel cancel-bi" value="取消"/>
</div>
<div class="float-right">
<a class="yoho-coin-help-link" href="/help/?category_id=87" target="_blank">有货币使用规则？</a>
<a class="yoho-coin-help-link" href="/help/detail?id=105" target="_blank">有货币使用规则？</a>
</div>
</li>
</ul>
... ...
... ... @@ -149,7 +149,7 @@
<input type="button" class="cancel cancel-bi" value="取消"/>
</div>
<div class="float-right">
<a class="yoho-coin-help-link" href="/help/?category_id=87" target="_blank">有货币使用规则？</a>
<a class="yoho-coin-help-link" href="/help/detail?id=105" target="_blank">有货币使用规则？</a>
</div>
</li>
</ul>
... ...
... ... @@ -56,7 +56,7 @@
<label>{{labelText}}</label>
{{#each selects}}
<select id="{{key}}" name="{{key}}">
</select>
{{/each}}
{{else}}
... ... @@ -66,7 +66,7 @@
<span class="form-prompt form-info" id="{{key}}-tip">
{{tips}}
{{#isSelect}}
<a href="{{tipsUrl}}" class="a-underline" target="_blank">
<a href="{{tipsUrl}}" class="a-underline hide" target="_blank">
查看货到付款地区
</a>
{{/isSelect}}
... ...
... ... @@ -160,7 +160,7 @@
<span>电话号码：{{phone}}</span>
</div>
</div>
{{/ virtualPayMode}}
{{/ virtualPayMode}}
<div class="good-list">
<p class="sub-title">
<span class="icon"></span>
... ... @@ -188,7 +188,7 @@
<li>
<a href={{link}}>
<img src={{src}}/>
</a>
{{#if goodsType}}
<p class="{{classname}}" >{{goodsType}}</p>
... ... @@ -263,7 +263,7 @@
</table>
<div class="order-balance">
<p class="back-coin">
<a href="/help/?category_id=87" class="yoho-coin" target="_blank"></a>共返有货币：{{totalYoho}}个
<a href="/help/detail?id=105" class="yoho-coin" target="_blank"></a>共返有货币：{{totalYoho}}个
</p>
{{#each orderBalance}}
<p>
... ...
... ... @@ -11,17 +11,17 @@
</h1>
</div>
<div class="list-box">
<div class="list-t">
<div class="list-t">
<div class="li-1">订单号</div>
<div class="li-2">实际支付金额</div>
<div class="li-3">支付方式</div>
<div class="li-4">
<a href="/help/?category_id=87" class="yoho-coin" target="_blank"></a>
<a href="/help/detail?id=105" class="yoho-coin" target="_blank"></a>
共返有货币
</div>
<div class="li-5">获得VIP累计金额</div>
</div>
<div class="list">
<div class="list">
<div class="li-1">
<a href="{{checkOrderUrl}}" class="f-e" target="_blank">
{{orderNum}}
... ... @@ -36,10 +36,10 @@
<a href="{{yohoCoinUrl}}" class="f-e" target="_blank">有货币能做什么</a>
</div>
<div class="li-5">
<strong class="f-rz">{{count}}</strong>
<strong class="f-rz">{{count}}</strong>
<a href="{{vipUrl}}" class="f-e" target="_blank">查看VIP特权</a>
</div>
</div>
</div>
</div>
<div class="list-b">
... ... @@ -48,7 +48,7 @@
<a href="{{ordersUrl}}" class="f-e" target="_blank">订单中心</a>查询快递发货详情。<br>
3.有货网支持"开箱验货"和"15天退换货保障"收货后请当面验货，如果发现商品有任何问题请致电客服电话400-889-9646，
<a href="{{backGoodsUrl}}" class="f-e" target="_blank">退换货政策</a><br>
4.VIP金额的累计，将在您订单签收15天后积累到您的账户，请您知悉。<br>
4.VIP金额的累计，将在您订单签收15天后积累到您的账户，请您知悉。<br>
5.购买商品及参与促销活动赠送的有货币，将在您订单签收7天后积累到您的账户，您可以在个人中心-我的有货币中查看。<br>
<b>6.尊敬的用户：近期为网络诈骗高发期，有货郑重声明，不会以任何形式索取客户的账户信息或引导转账，敬请提高警惕，谨防诈骗。
</b>
... ... @@ -65,4 +65,4 @@
{{!-- criteo统计代码 --}}
{{> pay/pay-analysis}}
{{> layout/footer}}
\ No newline at end of file
{{> layout/footer}}
... ...
... ... @@ -206,19 +206,19 @@
<ul class="clearfix">
<li class="left">
<p>
<span>新手指南</span>
<span>新手专区</span>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=81#help_b00reg" target="_blank">注册登录</a>
<a href="//www.yohobuy.com/help/detail?id=25" target="_blank">注册登录</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=83" target="_blank">选购商品</a>
<a href="//www.yohobuy.com/help/detail?id=27" target="_blank">购物结算</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=103" target="_blank">订单支付</a>
<a href="//www.yohobuy.com/help/detail?id=29" target="_blank">下单支付</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=85" target="_blank">收货退款</a>
<a href="//www.yohobuy.com/help/detail?id=31" target="_blank">收货评价</a>
</p>
</li>
<li class="left">
... ... @@ -226,16 +226,16 @@
<span>会员中心</span>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=87" target="_blank">有货币</a>
<a href="//www.yohobuy.com/help/detail?id=7" target="_blank">会员制度</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=91" target="_blank">会员制度</a>
<a href="//www.yohobuy.com/help/detail?id=9" target="_blank">会员优惠</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=89" target="_blank">账户管理</a>
<a href="//www.yohobuy.com/help/detail?id=11" target="_blank">账户管理</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=93" target="_blank">密码管理</a>
<a href="//www.yohobuy.com/help/detail?id=13" target="_blank">密码管理</a>
</p>
</li>
<li class="left">
... ... @@ -243,16 +243,16 @@
<span>购物指南</span>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=95" target="_blank">全球购专区</a>
<a href="//www.yohobuy.com/help/detail?id=33" target="_blank">发票</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=97" target="_blank">尺码选择</a>
<a href="//www.yohobuy.com/help/detail?id=35" target="_blank">尺码对照</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=99" target="_blank">发票</a>
<a href="//www.yohobuy.com/help/detail?id=37" target="_blank">尺码解读</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=101" target="_blank">商品咨询</a>
<a href="//www.yohobuy.com/help/detail?id=39" target="_blank">商品咨询</a>
</p>
</li>
<li class="left">
... ... @@ -260,16 +260,16 @@
<span>支付方式</span>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=105" target="_blank">在线支付</a>
<a href="//www.yohobuy.com/help/detail?id=43" target="_blank">在线支付</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=107" target="_blank">货到付款</a>
<a href="//www.yohobuy.com/help/detail?id=45" target="_blank">货到付款</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=109" target="_blank">优惠券</a>
<a href="//www.yohobuy.com/help/detail?id=47" target="_blank">分期支付</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=111" target="_blank">有货币支付</a>
<a href="//www.yohobuy.com/help/detail?id=105" target="_blank">优惠券、有货币</a>
</p>
</li>
<li class="left">
... ... @@ -277,16 +277,16 @@
<span>配送方式</span>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=113" target="_blank">配送时间</a>
<a href="//www.yohobuy.com/help/detail?id=109" target="_blank">配送说明</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=115" target="_blank">配送范围</a>
<a href="//www.yohobuy.com/help/detail?id=111" target="_blank">运费说明</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=119" target="_blank">顺丰速运</a>
<a href="//www.yohobuy.com/help/detail?id=113" target="_blank">验货签收</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=117" target="_blank">商品验收与签收</a>
<a href="//www.yohobuy.com/help/detail?id=115" target="_blank">收货样品</a>
</p>
</li>
<li class="left">
... ... @@ -294,16 +294,16 @@
<span>售后服务</span>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=121" target="_blank">退换货政策</a>
<a href="//www.yohobuy.com/help/detail?id=49" target="_blank">退换货政策</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=123" target="_blank">退换货流程</a>
<a href="//www.yohobuy.com/help/detail?id=51" target="_blank">退换货流程</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=125" target="_blank">退款方式与时效</a>
<a href="//www.yohobuy.com/help/detail?id=53" target="_blank">时效承诺</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=127" target="_blank">投诉与建议</a>
<a href="//www.yohobuy.com/help/detail?id=55" target="_blank">投诉与建议</a>
</p>
</li>
<li class="left">
... ... @@ -311,16 +311,16 @@
<span>APP常见问题</span>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=133" target="_blank">IPhone版</a>
<a href="//www.yohobuy.com/help/detail?id=57" target="_blank">IPhone版</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=135" target="_blank">Android版</a>
<a href="//www.yohobuy.com/help/detail?id=59" target="_blank">Android版</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=137" target="_blank">wap版</a>
<a href="//www.yohobuy.com/help/detail?id=61" target="_blank">wap版</a>
</p>
<p>
<a href="//www.yohobuy.com/help/?category_id=139" target="_blank">IPAD版</a>
<a href="//www.yohobuy.com/help/detail?id=63" target="_blank">IPAD版</a>
</p>
</li>
</ul>
... ... @@ -370,4 +370,4 @@
<div class="return-top hide">
<span class="iconfont">&#xe610;</span>
</div>
</div>
\ No newline at end of file
</div>
... ...
... ... @@ -28,7 +28,7 @@ class CurrencyModel
$currency = self::currencyList($uid, $condition);
$result['currency'] = $currency['list'];
$result['pager'] = $currency['pager'];
$result['coinHelperUrl'] = '//www.yohobuy.com/help/?category_id=87';//有货币帮助
$result['coinHelperUrl'] = '//www.yohobuy.com/help/detail?id=105';//有货币帮助
$result['tabs'] = self::currencyTabs($condition['queryType']);
$result['options'] = self::currencyOptions($condition);
return $result;
... ...