fe / yohobuy-node · Commits

Go to a project

Authored by htoooth
Commit 42d3df3ffa5881adb333555e5f2a4c6ee34cf9da 1 parent a0d1acf5

add css

Inline Side-by-side
Showing 9 changed files with 123 additions and 40 deletions
... ... @@ -1176,7 +1176,7 @@ const _detailDataPkg = (origin, uid, vipLevel, cookies) => {
let marketPriceNum = propOrigin('market_price', 0);
let salePriceNum = propOrigin('sales_price', 0);
if (marketPriceNum && salePriceNum) {
if (marketPriceNum && salePriceNum && marketPriceNum !== salePriceNum) {
result.promotion = ((salePriceNum / marketPriceNum) * 10).toFixed(1);
}
... ...
... ... @@ -27,8 +27,6 @@
<span class="presale-price">
<span class="title">预售价：</span>
<span class="price">{{presalePrice}}</span>
<span class="arrival-date">上市期：{{arrivalDate}}</span>
</span>
{{/if}}
... ... @@ -40,28 +38,32 @@
</span>
{{/if}}
{{#if promotion}}
<span class="promotion">{{promotion}}折</span>
{{/if}}
<span class="desc">
{{#if promotion}}
<span class="promotion">{{promotion}}折</span>
{{/if}}
{{# vipPrice}}
<span class="vip-price">
{{#if unLogin}}
登录后即可查看vip价格
<a class="login-url" href="{{unLogin}}">立即登录</a>
{{#if presalePrice}}
<span class="arrival-date">上市期：{{arrivalDate}}</span>
{{/if}}
{{#if normalUser}}
<span class="vip-price-item">您当前是普通会员，成为VIP享受更多优惠！</span>
{{# vipPrice}}
<span class="vip-price">
{{#if unLogin}}
登录后即可查看vip价格
<a class="login-url" href="{{unLogin}}">立即登录</a>
{{/if}}
{{# prices}}
<span class="vip-level"></span>
<span class="vip-level-{{vipLevel}}"> </span>
<em class="cur"> {{price}} </em>
{{/ prices}}
</span>
{{/ vipPrice}}
{{#if normalUser}}
<span class="vip-price-item">您当前是普通会员，成为VIP享受更多优惠！</span>
{{/if}}
{{# prices}}
<span class="vip-level"></span>
<span class="vip-level-{{vipLevel}}"> </span>
<em class="cur"> {{price}} </em>
{{/ prices}}
</span>
{{/ vipPrice}}
</span>
... ...
No preview for this file type
... ... @@ -2,7 +2,7 @@
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<svg xmlns="http://www.w3.org/2000/svg">
<metadata>
Created by FontForge 20120731 at Mon Dec 5 19:57:53 2016
Created by FontForge 20120731 at Tue Dec 6 20:32:22 2016
By admin
</metadata>
<defs>
... ... @@ -19,7 +19,7 @@ Created by FontForge 20120731 at Mon Dec 5 19:57:53 2016
bbox="-0.75 -212 1160 996"
underline-thickness="0"
underline-position="0"
unicode-range="U+0078-E696"
unicode-range="U+0078-E701"
/>
<missing-glyph
/>
... ... @@ -210,6 +210,10 @@ t-22 15.5v0zM751 552v83h-473v-83h206v-298h-72v237h-87v-237h-66v-84h506v84h-193v1
<glyph glyph-name="chahaoyuan" unicode="&#xe629;"
d="M511 833q-91 0 -174 -36t-143 -96t-95.5 -143t-35.5 -174t35.5 -174t95.5 -143t143 -95.5t174 -35.5t174 35.5t143 95.5t95.5 143t35.5 174t-35.5 174t-95.5 143t-143 96t-174 36zM770 193q15 -14 15 -34t-14.5 -34t-34 -14t-33.5 14l-192 191l-192 -191q-14 -14 -34 -14
t-34 14t-14 34t14 34l192 191l-192 192q-14 14 -14 34t14 34t34 14t34 -14l192 -192l192 192q14 14 33.5 14t34 -14t14.5 -34t-15 -34l-191 -192z" />
<glyph glyph-name="naozhong" unicode="&#xe701;"
d="M611 55h-39q-10 0 -10 -9q0 -21 -14.5 -36t-35.5 -15t-35.5 15t-14.5 36q0 9 -10 9h-40q-9 0 -9 -9q0 -45 32.5 -77t76.5 -32t76.5 32t32.5 77q0 9 -10 9v0zM920 105q0 6 -3 11q-6 48 -31.5 89t-65.5 69v170q0 96 -55 175t-145 113q-3 42 -34.5 70.5t-73.5 28.5
t-73.5 -28.5t-35.5 -70.5q-89 -34 -144 -113t-55 -175v-170q-40 -28 -65.5 -69t-31.5 -89q-4 -8 -2 -16q-1 -7 -1 -15q0 -9 10 -9h796q10 0 10 9q0 7 -1 15q1 3 1 5v0zM569 686q20 -5 39 -12q69 -29 111 -92.5t42 -137.5v-198q0 -6 5 -9q66 -33 87 -102h-682q21 70 87 102
q5 3 5 9v198q0 85 54 153.5t137 88.5q8 2 8 9v27q0 21 15 35.5t35 14.5t35 -14.5t15 -35.5v-27q0 -7 7 -9v0zM569 686z" />
<glyph glyph-name="wenhao1" unicode="&#xe628;"
d="M512 886q-102 0 -195 -39.5t-160.5 -107t-107 -160.5t-39.5 -195t39.5 -195t107 -160.5t160.5 -107t195 -39.5t195 39.5t160.5 107t107 160.5t39.5 195t-39.5 195t-107 160.5t-160.5 107t-195 39.5zM521 -15q-34 0 -58.5 24t-24.5 58.5t24.5 58.5t58.5 24t58 -24t24 -58
q1 -34 -23.5 -58.5t-58.5 -24.5zM738 477q-17 -34 -67 -83q-45 -43 -60 -61q-12 -16 -17 -35q-6 -22 -6 -61l1 -31h-142v30q0 56 9 90q11 38 30 64q17 23 62 71q43 44 52 60q8 13 8 44q0 28 -20 51q-20 21 -61 21q-29 0 -48.5 -9.5t-28.5 -27.5t-12.5 -36t-3.5 -43v-30h-142
... ...
No preview for this file type
No preview for this file type
<div>
<div>
<i class="iconfont ring">&#xe701; </i>
<span class="title">到货通知</span>
</div>
<div class="content">
商品一旦在 30 日内到货，我们将会第一时间<br/>
通知您，请及时关注哦！
<div class="content">
<i class="iconfont checked">&#xe613;</i>
<span>添加收藏夹</span>
</div>
<div class="row">
<a class='ok'>订阅</a>
<a class='cancel'>取消</a>
</div>
</div>
... ...
... ... @@ -50,6 +50,8 @@ var $saleReturn = $('#saleReturn');
var dialogTpl = require('hbs/product/coupon-dialog.hbs');
var notifyTpl = require('hbs/product/notify.hbs');
var $goodsIdArr = [],
pkgFn = '';
... ... @@ -163,14 +165,14 @@ bindEvent.add(function() {
$('#big').attr('src', src);
}
// 查看详情功能
var moveWidth = 135;
var w = 420;
var h = 560;
var _w = 1000;
var radio = w / _w;
var $moveObj = $('.move-object');
var $max = $('.max');
// 查看细节图功能
var moveWidth = 135,
w = 420,
h = 560,
_w = 1000,
radio = w / _w,
$moveObj = $('.move-object'),
$max = $('.max');
function move(e) {
var x = e.pageX - $imgShow.offset().left;
... ... @@ -455,7 +457,13 @@ bindEvent.add(function() {
});
$enableNotifyYou.on('click', function() {
new Alert('fjdsl').show();
var opt = {
className: 'notify-goods-wrapper',
closeIcon: true,
content: notifyTpl({msg: '测试信息！'})
};
new Dialog(opt).show();
});
// 增加购买数量
... ...
... ... @@ -204,12 +204,8 @@
color: red;
border: 1px red solid;
font-size: 12px;
margin-left: 20px;
padding: 2px 4px;
margin-right: 20px;
margin-bottom: 2px;
padding-left: 3px;
padding-right: 3px;
height: 16px;
}
.has-other-price {
... ... @@ -225,6 +221,12 @@
margin-left: 24px;
}
.desc {
display: inline-block;
height: 22px;
margin-left: 20px;
}
.vip-price {
line-height: 14px;
color: #707070;
... ... @@ -238,6 +240,7 @@
color: #f02200;
font-weight: bold;
font-size: 13px;
margin-left: 20px;
}
.vip-price-item {
... ... @@ -263,7 +266,6 @@
display: inline-block;
width: 30px;
height: 18px;
margin-right: 10px;
margin-bottom: -2px;
background: resolve("product/vip-1.png") no-repeat;
}
... ... @@ -272,7 +274,6 @@
display: inline-block;
width: 30px;
height: 18px;
margin-right: 10px;
margin-bottom: -2px;
background: resolve("product/vip-2.png") no-repeat;
}
... ... @@ -281,7 +282,6 @@
display: inline-block;
width: 30px;
height: 18px;
margin-right: 10px;
margin-bottom: -2px;
background: resolve("product/vip-3.png") no-repeat;
}
... ... @@ -2301,3 +2301,52 @@
border-top: 1px solid #ddd;
}
}
.notify-goods-wrapper {
.ring {
color: #d42838;
font-size: 32px;
}
.title {
font-size: 22px;
font-weight: bold;
}
.content {
font-size: 12px;
line-height: 20px;
margin-top: 20px;
}
.checked {
font-size:12px;
color: black;
}
.row {
height: 33px;
margin-bottom: 30px;
margin-top: 20px;
.ok {
display: inline-block;
background-color: #d42838;
color: white;
width: 130px;
height: 33px;
font-size: 15px;
line-height: 33px;
margin-right: 20px;
}
.cancel {
display: inline-block;
border: 1px solid black;
width: 130px;
height: 33px;
font-size: 15px;
line-height: 33px;
}
}
}
... ...