fe / yoho-blk · Commits

Go to a project

Authored by 石坚
Commit 90b3b47c0f4c57ff951bab613be3625a1e8aade9 2 parents 00d1301d 9ea963a4

blk样式修改提交

Inline Side-by-side
Showing 6 changed files with 113 additions and 115 deletions
... ... @@ -7,7 +7,7 @@
<li>
<a data-key="{{key}}" href="{{brandDomain}}" target="_blank">
<img class="lazy" data-original="{{image brandIco 270 190}}">
<span>{{brandNameEn}}</span>
<span>{{#if brandNameEn}}{{brandNameEn}}{{else}}{{brandNameCn}}{{/if}}</span>
</a>
</li>
{{/each}}
... ...
... ... @@ -719,7 +719,6 @@ const getExchangeDetailData = (id, uid) => {
returnsAPI.getExchangeDetail(id, uid),
returnsAPI.getExpressCompanyAsync()
]).then(result => {
console.log(result);
let exchangeData = {};
Object.assign(exchangeData, _setSideMenu('我的退/换货'));
... ...
<div class="me-page blk-page">
<div class="center-content clearfix">
{{# content}}
{{!-- 头部面包屑 --}}
{{> path-nav}}
{{!-- 左侧菜单导航 --}}
<div class="me-navigation left">
<p class="title bold">MY YOHO!BLK</p>
<ul class="nav">
{{#each navigation}}
<li class="nav-row{{#if focus}} focus{{/if}}">
<a href="{{link}}">{{name}}</a>
</li>
{{/each}}
</ul>
{{#banner}}
{{#if image}}
<a href="{{url}}">
<img class="banner-img" data-original="{{image banner 150 120}}">
</a>
{{/if}}
{{/banner}}
</div>
{{!-- 右侧页面内容 --}}
<div class="me-main left">
{{!-- 我的订单 --}}
{{#if order}}
{{> order}}
{{/if}}
{{!-- 订单详情 --}}
{{#if orderDetail}}
{{> order-detail}}
{{/if}}
{{!-- 我的退换货 --}}
{{#if returns}}
{{> returns}}
{{/if}}
{{!-- 我的退换货列表 --}}
{{#if returnsList}}
{{> returns-list}}
{{/if}}
{{!-- 发起换货申请 --}}
{{#if returnsChange}}
{{> returns-change}}
{{/if}}
{{!-- 我的收藏 --}}
{{#if collection}}
{{> collection}}
{{/if}}
{{!-- 我的消息 --}}
{{#if message}}
{{> message}}
{{/if}}
{{!-- 我的YOHO币 --}}
{{#if currency}}
{{> currency}}
{{/if}}
{{!-- 个人设置 --}}
{{#if setting}}
{{> setting}}
{{/if}}
{{#if validateStep}}
{{> setting/act/step1}}
{{/if}}
{{#if operateStep}}
{{> setting/act/step2}}
{{/if}}
{{#if successStep}}
{{> setting/act/step3}}
{{/if}}
{{!-- 收货地址 --}}
{{#if address}}
{{> address}}
{{/if}}
</div>
{{/ content}}
</div>
{{!-- 在线客服和返回顶部 --}}
<div class="service-top">
<a class="service" href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=703953&configID=149819&jid=1099911094" target="_blank">
<span class="iconfont hide">&#xe61c;</span>
<span class="hover-text">在线<br>客服</span>
</a>
<div class="return-top hide">
<span class="iconfont bold">&#xe617;</span>
<span class="hover-text hide">返回<br>顶部</span>
</div>
</div>
</div>
<div class="me-page blk-page">
<div class="center-content clearfix">
{{# content}}
{{!-- 头部面包屑 --}}
{{> path-nav}}
{{!-- 左侧菜单导航 --}}
<div class="me-navigation left">
<p class="title bold">MY YOHO!BLK</p>
<ul class="nav">
{{#each navigation}}
<li class="nav-row{{#if focus}} focus{{/if}}">
<a href="{{link}}">{{name}}</a>
</li>
{{/each}}
</ul>
{{#banner}}
{{#if banner}}
<a href="{{url}}" target="_blank">
<img class="banner-img" data-original="{{image banner 150 120}}">
</a>
{{/if}}
{{/banner}}
</div>
{{!-- 右侧页面内容 --}}
<div class="me-main left">
{{!-- 我的订单 --}}
{{#if order}}
{{> order}}
{{/if}}
{{!-- 订单详情 --}}
{{#if orderDetail}}
{{> order-detail}}
{{/if}}
{{!-- 我的退换货 --}}
{{#if returns}}
{{> returns}}
{{/if}}
{{!-- 我的退换货列表 --}}
{{#if returnsList}}
{{> returns-list}}
{{/if}}
{{!-- 发起换货申请 --}}
{{#if returnsChange}}
{{> returns-change}}
{{/if}}
{{!-- 我的收藏 --}}
{{#if collection}}
{{> collection}}
{{/if}}
{{!-- 我的消息 --}}
{{#if message}}
{{> message}}
{{/if}}
{{!-- 我的YOHO币 --}}
{{#if currency}}
{{> currency}}
{{/if}}
{{!-- 个人设置 --}}
{{#if setting}}
{{> setting}}
{{/if}}
{{#if validateStep}}
{{> setting/act/step1}}
{{/if}}
{{#if operateStep}}
{{> setting/act/step2}}
{{/if}}
{{#if successStep}}
{{> setting/act/step3}}
{{/if}}
{{!-- 收货地址 --}}
{{#if address}}
{{> address}}
{{/if}}
</div>
{{/ content}}
</div>
{{!-- 在线客服和返回顶部 --}}
<div class="service-top">
<a class="service" href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=703953&configID=149819&jid=1099911094" target="_blank">
<span class="iconfont hide">&#xe61c;</span>
<span class="hover-text">在线<br>客服</span>
</a>
<div class="return-top hide">
<span class="iconfont bold">&#xe617;</span>
<span class="hover-text hide">返回<br>顶部</span>
</div>
</div>
</div>
... ...
... ... @@ -35,14 +35,14 @@
<dt>
<a href="{{link}}">{{name}}</a>
{{#if hot}}
<span class="hot"></span>
<span class="hot iconfont">&#xe650;</span>
{{/if}}
</dt>
{{^}}
<dd>
<a href="{{link}}">{{name}}</a>
{{#if hot}}
<span class="hot"></span>
<span class="hot iconfont">&#xe650;</span>
{{/if}}
</dd>
{{/if}}
... ...
... ... @@ -294,7 +294,6 @@ function bindConfirmEvent() {
return false;
}
$changeGood.each(function(index, good) {
var goodObj = {};
var $good = $(good);
... ... @@ -320,11 +319,13 @@ function bindConfirmEvent() {
$imgs = $specialReason.find('.right-content').find('.thumb-box');
$imgs.each(function(idx, img) {
imgs.push($(img).data('img'));
});
if ($imgs.length) {
$imgs.each(function(idx, img) {
imgs.push($(img).data('img'));
});
goodObj.evidence_images = imgs;
goodObj.evidence_images = imgs;
}
}
changeGoodsList.push(goodObj);
});
... ...
... ... @@ -433,11 +433,9 @@
}
.hot {
width: 26px;
height: 12px;
display: inline-block;
background: url("/layout/hot.png");
margin-left: 4px;
color: #fc0d1b;
font-size: 16px;
margin-left: 10px;
}
.show-detail {
... ...