fe / YOHOBUYPC · Commits

Go to a project

Authored by 周少峰
Commit b3021696c518f5ce30e2dda9201f4505701f1432 2 parents 34e53af8 d1584ad3

Merge branch 'feature/colorLength' into release/5.3

Inline Side-by-side
Showing 17 changed files with 103 additions and 9 deletions
0 info it worked if it ends with ok
1 verbose cli [ '/usr/local/bin/node', '/usr/local/bin/npm', 'run', 'dev' ]
2 info using npm@3.8.7
3 info using node@v4.4.3
4 verbose stack Error: ENOENT: no such file or directory, open '/Users/gexuhui/Documents/workspace/yohoPc/YOHOBUYPC/package.json'
4 verbose stack at Error (native)
5 verbose cwd /Users/gexuhui/Documents/workspace/yohoPc/YOHOBUYPC
6 error Darwin 15.3.0
7 error argv "/usr/local/bin/node" "/usr/local/bin/npm" "run" "dev"
8 error node v4.4.3
9 error npm v3.8.7
10 error path /Users/gexuhui/Documents/workspace/yohoPc/YOHOBUYPC/package.json
11 error code ENOENT
12 error errno -2
13 error syscall open
14 error enoent ENOENT: no such file or directory, open '/Users/gexuhui/Documents/workspace/yohoPc/YOHOBUYPC/package.json'
15 error enoent ENOENT: no such file or directory, open '/Users/gexuhui/Documents/workspace/yohoPc/YOHOBUYPC/package.json'
15 error enoent This is most likely not a problem with npm itself
15 error enoent and is related to npm not being able to find a file.
16 verbose exit [ -2, true ]
... ...
... ... @@ -154,7 +154,7 @@
</a>
<p class="pay-pro-info">
<a href="{{link}}" target="_blank">{{productTitle}}<br /></a>
<span>颜色：{{productColor}} 尺码：{{productSize}}</span>
<span><b title="{{productColor}}">颜色：{{productColor}}</b> 尺码：{{productSize}}</span>
</p>
</div>
</td>
... ...
... ... @@ -257,7 +257,7 @@
<a href="{{link}}" target="_blank">{{productTitle}}</a>
<span>
{{#if productColor}}
颜色：{{productColor}}
<b title="{{productColor}}">颜色：{{productColor}}</b>
{{/if}}
{{#if productSize}}
尺码：{{productSize}}
... ...
... ... @@ -240,7 +240,7 @@
{{/if}}
{{else}}
{{#if color}}
颜色：{{color}}
<b title="{{color}}">颜色：{{color}}</b>
{{/if}}
{{#if size}}
... ...
... ... @@ -41,7 +41,7 @@
<a class="name" href="{{href}}" title="{{name}}">{{name}}</a>
<span class="color-size">
{{#if color}}
颜色：{{color}}&nbsp;&nbsp;
<b title="{{color}}">颜色：{{color}}&nbsp;&nbsp;</b>
{{/if}}
{{#if size}}
... ...
... ... @@ -46,7 +46,7 @@
{{/if}}
{{else}}
{{#if color}}
颜色：{{color}}&nbsp;&nbsp;
<b title="{{color}}">颜色：{{color}}&nbsp;&nbsp;</b>
{{/if}}
{{#if size}}
... ...
... ... @@ -168,7 +168,7 @@
<h3 class="content"><a href="\{\{product_url\}\}">\{\{product_name\}\}</a></h3>
<h3 class="style">
颜色：
<span class="color">\{\{color_name\}\}</span>
<span class="color" title="\{\{factory_goods_name\}\}" >\{\{factory_goods_name\}\}</span>
尺码：
<span class="size">\{\{size_name\}\}</span>
</h3>
... ...
... ... @@ -24,7 +24,7 @@
<a class="name" href="{{href}}">{{name}}</a>
<span class="color-size">
{{#if color}}
颜色：{{color}}&nbsp;&nbsp;
<b title="{{color}}">颜色：{{color}}&nbsp;&nbsp;</b>
{{/if}}
{{#if size}}
... ...
No preview for this file type
No preview for this file type
... ... @@ -976,6 +976,15 @@
line-height: 14px;
font-size: 14px;
color: #b0b0b0;
.color {
display: inline-block;
width: 50px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
vertical-align: bottom;
}
}
}
... ...
... ... @@ -188,10 +188,20 @@
padding-top: 10px;
margin-left: 0;
float: left;
a{
a {
width: 200px;
}
b {
display: inline-block;
vertical-align: bottom;
max-width: 130px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-style: normal;
font-weight: 400;
}
}
.pre-sell-box {
.cart-empty{
... ...
... ... @@ -97,6 +97,17 @@
.color-size {
color: #999;
b{
display: inline-block;
vertical-align: bottom;
max-width: 130px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-style: normal;
font-weight: 400;
}
}
.arrival-date {
... ...
... ... @@ -384,6 +384,17 @@
color: #999;
padding-top: 12px;
text-align: left;
b{
display: inline-block;
vertical-align: bottom;
max-width: 130px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-style: normal;
font-weight: 400;
}
}
.name {
... ...
... ... @@ -72,6 +72,17 @@
.color-size {
color: #999;
b{
display: inline-block;
vertical-align: bottom;
font-weight: 400;
max-width: 130px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-style: normal;
}
}
}
... ... @@ -98,6 +109,17 @@
.color-size {
display: block;
line-height: 18px;
b{
display: inline-block;
vertical-align: bottom;
font-weight: 400;
max-width: 130px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-style: normal;
}
}
.pay {
... ...
... ... @@ -85,6 +85,17 @@
text-decoration: underline;
}
}
b{
display: inline-block;
vertical-align: bottom;
font-weight: 400;
max-width: 130px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-style: normal;
}
}
.section-play {
... ...
... ... @@ -1475,7 +1475,7 @@ class CartModel
$goods['is_advance'] = $val['is_advance'];
$goods['default_img'] = Helpers::getImageUrl($val['goods_images'], 46, 62);
$goods['product_name'] = $val['product_name'];
$goods['color_name'] = $val['color_name'];
$goods['factory_goods_name'] = $val['factory_goods_name'];
$goods['size_name'] = $val['size_name'];
$goods['show_price'] = $val['real_price'];
$goods['buy_number'] = $val['buy_number'];
... ...