Merge branch 'develop' of git.yoho.cn:fe/yohoblk-wap into develop
Showing
17 changed files
with
17 additions
and
18 deletions
| 1 | -<div class="deal_main"> | 1 | +<div class="deal-main"> |
| 2 | <section class="detail"> | 2 | <section class="detail"> |
| 3 | <h4>商品到达以后可以当场验收商品吗？</h4> | 3 | <h4>商品到达以后可以当场验收商品吗？</h4> |
| 4 | 商品支持当面验收，如配送人员不配合您可以选择拒收商品。商品送达后您可当场确认商品与您订购的是否一致。您在验收商品时如发现商品短缺、配送错误、包装破损、商品存在质量问题等，请您向配送人员指出，并当场拒收全部商品，并在送货单上注明原因。相应的赠品和优惠商品应同时拒收，并请您在24小时内与客服联系进一步处理。 | 4 | 商品支持当面验收，如配送人员不配合您可以选择拒收商品。商品送达后您可当场确认商品与您订购的是否一致。您在验收商品时如发现商品短缺、配送错误、包装破损、商品存在质量问题等，请您向配送人员指出，并当场拒收全部商品，并在送货单上注明原因。相应的赠品和优惠商品应同时拒收，并请您在24小时内与客服联系进一步处理。 |
| 1 | var yoho = require('yoho'); | 1 | var yoho = require('yoho'); |
| 2 | var $ = require('jquery'); | 2 | var $ = require('jquery'); |
| 3 | const util = require('common/util'); | 3 | const util = require('common/util'); |
| 4 | + | ||
| 4 | if (!yoho.isLogin) { | 5 | if (!yoho.isLogin) { |
| 5 | $('.auth').addClass('no-intercept'); | 6 | $('.auth').addClass('no-intercept'); |
| 6 | $('.auth').on('click', function() { | 7 | $('.auth').on('click', function() { |
| @@ -7,7 +7,6 @@ | @@ -7,7 +7,6 @@ | ||
| 7 | } | 7 | } |
| 8 | 8 | ||
| 9 | .icon { | 9 | .icon { |
| 10 | - | ||
| 11 | /* use !important to prevent issues with browser extensions that change fonts */ | 10 | /* use !important to prevent issues with browser extensions that change fonts */ |
| 12 | font-family: "iconfont" !important; | 11 | font-family: "iconfont" !important; |
| 13 | speak: none; | 12 | speak: none; |
| @@ -79,7 +79,7 @@ | @@ -79,7 +79,7 @@ | ||
| 79 | text-align: right; | 79 | text-align: right; |
| 80 | color: #b0b0b0; | 80 | color: #b0b0b0; |
| 81 | background: transparent; | 81 | background: transparent; |
| 82 | - border: 1px solid #ffffff; | 82 | + border: 1px solid #fff; |
| 83 | height: 100%; | 83 | height: 100%; |
| 84 | flex-direction: row-reverse; | 84 | flex-direction: row-reverse; |
| 85 | } | 85 | } |
| @@ -98,13 +98,11 @@ | @@ -98,13 +98,11 @@ | ||
| 98 | } | 98 | } |
| 99 | 99 | ||
| 100 | input::-webkit-input-placeholder { | 100 | input::-webkit-input-placeholder { |
| 101 | - | ||
| 102 | /* WebKit browsers */ | 101 | /* WebKit browsers */ |
| 103 | text-align: center; | 102 | text-align: center; |
| 104 | } | 103 | } |
| 105 | 104 | ||
| 106 | input:-ms-input-placeholder { | 105 | input:-ms-input-placeholder { |
| 107 | - | ||
| 108 | /* Internet Explorer 10+ */ | 106 | /* Internet Explorer 10+ */ |
| 109 | text-align: center; | 107 | text-align: center; |
| 110 | } | 108 | } |
| @@ -236,12 +236,12 @@ $white: #fff; | @@ -236,12 +236,12 @@ $white: #fff; | ||
| 236 | color: #b0b0b0; | 236 | color: #b0b0b0; |
| 237 | } | 237 | } |
| 238 | 238 | ||
| 239 | - p:first-of-type{ | 239 | + p:first-of-type { |
| 240 | font-size: 34px; | 240 | font-size: 34px; |
| 241 | margin: 50px 0 20px; | 241 | margin: 50px 0 20px; |
| 242 | } | 242 | } |
| 243 | 243 | ||
| 244 | - a{ | 244 | + a { |
| 245 | display: inline-block; | 245 | display: inline-block; |
| 246 | width: 414px; | 246 | width: 414px; |
| 247 | height: 94px; | 247 | height: 94px; |
-
Please register or login to post a comment