fe / yohoblk-wap · Commits

Go to a project

Authored by ccbikai
Commit 3cce02ce438e64ff52108b65f3b80a7893f54359 2 parents ac0cda16 bb1dcce7

Merge branch 'develop' into release/1.0

Inline Side-by-side
Showing 5 changed files with 12 additions and 12 deletions
... ... @@ -82,12 +82,12 @@
"stylelint-processor-html": "^1.0.0",
"vue": "1.0.26",
"vue-infinite-scroll": "0.2.3",
"vue-lazyload": "^0.5.0",
"vue-loader": "^8.5.3",
"vue-lazyload": "^0.7.0",
"vue-loader": "^8.5.2",
"vue-swipe": "0.2.6",
"vue-touch": "1.1.0",
"webpack": "^1.13.2",
"webpack-dashboard": "^0.1.1",
"webpack-dashboard": "^0.1.6",
"webpack-dev-server": "^1.14.1",
"webpack-stream": "^3.1.0",
"yoho-cookie": "1.2.0",
... ...
... ... @@ -3,11 +3,9 @@
padding-top: 20px;
.coin-total {
padding: 40px 0;
padding: 38px 0;
background: white;
text-align: center;
border-top: 1px solid #eee;
border-bottom: 1px solid #eee;
p:first-child {
font-size: 34px;
... ... @@ -39,10 +37,10 @@
.coin-detail-list {
padding: 0 30px;
background: white;
border-top: 1px solid #eee;
border-bottom: 1px solid #eee;
li {
height: 128px;
display: flex;
padding: 20px 0;
border-bottom: 1px solid #eee;
... ...
... ... @@ -164,7 +164,7 @@ body {
}
.goods-status {
background-color: #4A90E2;
background-color: #4a90e2;
color: #fffefe;
font-size: 22px;
border-radius: 15px;
... ... @@ -181,17 +181,17 @@ body {
li {
font-size: 28px;
margin-left: 50%;
label {
display: inline-block;
width: 180px;
text-align: left;
float: left;
color: #b0b0b0;
}
span {
display: inline-block;
width: 120px;
text-align: right;
}
... ...
... ... @@ -103,8 +103,8 @@
.card-label {
margin: 0 0 10px;
font-size: 24px;
line-height: 28px;
height: 65px;
line-height: 1.4;
height: 67.1999999999px;
font-weight: normal;
}
}
... ...
... ... @@ -429,6 +429,8 @@
this.cartCount = result.data.goods_count;
selector.playAnimation();
} else {
result.message = '添加购物车失败 >_<';
}
this.showFeatureSelector = false;
... ...