fe / yohobuy-node · Commits

Go to a project

Authored by 郝肖肖
Commit 6282a3d64a9aa4472a6b723d9a2eb5db26f0797e 2 parents 5afa96da cfd0a303

Merge branch 'feature/giftCart' into release/6.1

Inline Side-by-side
Showing 4 changed files with 29 additions and 268 deletions
... ... @@ -47,9 +47,9 @@
<div class="title">验证邮箱</div>
<div class="gift-group">您的账户还未绑定手机，绑定手机前需要验证您的邮箱</div>
<div class="gift-group">短信验证码已发送至您的邮箱“{{userInfo.email}}”</div>
<div class="verify-input">
<input type="text" placeholder="短信验证码" class="email-code" />
<input type="button" value="获取短信验证码" class="email-btn" />
<div class="gift-group verify-input">
<input type="text" placeholder="短信验证码" class="left email-code" />
<span class="left email-btn">获取短信验证码</span>
</div>
<div class="gift-group">
<div id="captcha" style="display: inline-block; position: relative;"></div>
... ... @@ -82,8 +82,8 @@
<input type="text" placeholder="请输入手机号" class="right mobile" />
</div>
<div class="gift-group">
<input type="text" placeholder="短信验证码" class="mobile-code" />
<input type="button" value="获取短信验证码" class="mobile-btn" />
<input type="text" placeholder="短信验证码" class="left mobile-code" />
<span class="left mobile-btn">获取短信验证码</span>
</div>
<div class="gift-group">
<div id="captcha" style="display: inline-block; position: relative;"></div>
... ...
... ... @@ -348,7 +348,7 @@ meGift = {
dg = new dialog.Dialog({
content: content,
className: 'me-gift-alert',
mask: mask || true,
mask: !!mask,
btns: [{
name: '我知道了',
id: 'alert-gift-cancel',
... ...
... ... @@ -88,6 +88,10 @@
.consume {
color: #d0021b;
}
div.content {
padding: 0 !important;
}
}
.me-gift-alert {
... ... @@ -133,7 +137,7 @@
}
.verify-input {
margin: 15px 10px;
font-size: 14px;
input {
height: 30px;
... ... @@ -146,13 +150,24 @@
box-sizing: border-box;
}
input[type=button] {
.email-btn,
.mobile-btn {
font-size: 13px;
background-color: #444;
color: #fff;
height: 29px;
height: 30px;
border: none;
cursor: pointer;
width: 110px;
line-height: 30px;
}
.email-code {
margin-left: 30px;
}
.email-btn {
margin-left: 20px;
}
.int-timer {
... ... @@ -257,7 +272,7 @@
}
.detail-gift-list {
width: 817px;
width: 797px;
min-height: 500px;
.me-pager {
... ... @@ -267,6 +282,10 @@
border-top: none;
}
}
div.content {
padding: 10px 30px;
}
}
.me-gift-confirm.me-page {
... ...
.me-gift-page {
.me-gift .me-content {
min-height: 370px;
}
.tabs li.add-gift {
margin-top: -5px;
background-image: none;
background-color: #000;
float: right;
a {
color: #fff;
}
}
.me-gift-table,
.me-gift-info-table {
display: table;
width: 775px;
text-align: center;
border: 1px solid #e6e6e6;
margin: 0 10px 30px;
.me-gift-header {
display: table-row;
background-color: #efefef;
div {
height: 30px;
display: table-cell;
vertical-align: middle;
font-size: 13px;
width: 120px;
&:first-child {
width: 174px;
}
}
}
.me-gift-tr {
display: table-row;
&:first-child div {
border-top: none;
}
div {
display: table-cell;
height: 50px;
vertical-align: middle;
font-size: 13px;
border-top: 1px solid #e6e6e6;
}
div.info-list {
color: #4a90e2;
cursor: pointer;
}
}
}
.me-gift-info-table .me-gift-tr div {
width: auto;
height: 40px;
}
.cart-list-empty {
background: resolve("home/gift.png") no-repeat center;
background-size: 110px 132px;
width: 775px;
height: 300px;
display: table-caption;
caption-side: bottom;
border: 1px solid #e6e6e6;
border-top: none;
}
.refund {
color: #86bf4a;
}
.consume {
color: #d0021b;
}
}
.me-gift-alert {
width: 350px;
height: 190px;
.content {
color: #444;
padding: 55px 0;
font-size: 18px;
p {
margin-top: 10px;
}
}
}
.me-gift-confirm {
color: #444;
.title,
.info-title {
font-size: 18px;
padding-bottom: 25px;
margin: 0 20px;
}
.info-title {
border-bottom: 1px solid #e6e6e6;
}
.gift-group {
margin-top: 10px;
overflow: hidden;
}
.left {
float: left;
}
.right {
float: right;
}
.verify-input {
margin: 15px 10px;
input {
height: 30px;
line-height: 28px;
padding: 0 5px;
font-size: 14px;
color: #444;
border: 1px solid #e6e6e6;
outline: none;
box-sizing: border-box;
}
input[type=button] {
background-color: #444;
color: #fff;
height: 29px;
border: none;
cursor: pointer;
width: 110px;
}
.intTimer {
background-color: #b0b0b0 !important;
}
}
input.mobile {
width: 260px;
border-left: none;
}
.mobile-area {
width: 70px;
line-height: 30px;
height: 30px;
text-align: center;
border: 1px solid #e6e6e6;
outline: none;
box-sizing: border-box;
border-right: none;
background-color: #fff;
cursor: pointer;
}
.ul-list {
position: absolute;
width: 130px;
margin-left: -25px;
background-color: #fff;
margin-top: -3px;
border: 1px solid #e6e6e6;
display: none;
cursor: pointer;
li {
border-bottom: 1px solid #e6e6e6;
height: 30px;
line-height: 30px;
&:hover {
color: #4a90e2;
}
}
}
input.mobile-code {
width: 217px;
}
.card-code,
.card-pwd {
width: 310px;
}
.border-top-info {
border-top: 1px solid #e6e6e6;
}
.info-gift-header {
width: 777px;
text-align: center;
margin: 25px 10px 30px;
font-size: 14px;
.text-left {
text-align: left;
}
.text-right {
text-align: right;
}
td {
height: 25px;
}
.validity-time {
width: 360px;
}
}
.gift-type {
background: resolve("home/gift-filter.png") no-repeat center;
background-size: 69px 21px;
width: 69px;
height: 21px;
line-height: 21px;
display: inline-block;
cursor: pointer;
}
.gift-filter .ul-list {
width: 69px;
margin-left: 52px;
margin-top: 0;
}
.img-check-main .img-check-tip {
top: auto;
}
.detail-gift-list {
width: 817px;
min-height: 500px;
}
}