Commit e5aa130a0614035501391bb574c57d5dc1ded3ea
1 parent
f8ad6930
收货地址信息
Showing
2 changed files
with
11 additions
and
6 deletions
src/pages/pointsExchangeRecords/pointsExchangeRecords.less
| ... | ... | @@ -34,11 +34,16 @@ |
| 34 | 34 | } |
| 35 | 35 | .address_name{ |
| 36 | 36 | margin-top: 10px; |
| 37 | - height: 33px; | |
| 38 | 37 | font-size: 24px; |
| 39 | 38 | font-weight: 400; |
| 40 | 39 | color: #9B9B9B; |
| 41 | - line-height: 33px; | |
| 40 | + display: -webkit-box; | |
| 41 | + -webkit-line-clamp: 2; | |
| 42 | + /*! autoprefixer: off */ | |
| 43 | + -webkit-box-orient: vertical; | |
| 44 | + /*! autoprefixer: on */ | |
| 45 | + text-overflow: ellipsis; | |
| 46 | + overflow: hidden; | |
| 42 | 47 | } |
| 43 | 48 | .exchange_time{ |
| 44 | 49 | margin-top: 34px; |
| ... | ... | @@ -69,7 +74,7 @@ |
| 69 | 74 | display: block; |
| 70 | 75 | width: 22px; |
| 71 | 76 | height: 22px; |
| 72 | - margin: 6px 0 0 4px; | |
| 77 | + margin-left: 4px; | |
| 73 | 78 | } |
| 74 | 79 | } |
| 75 | 80 | } | ... | ... |
src/pages/pointsExchangeRecords/pointsExchangeRecords.vue
| ... | ... | @@ -22,13 +22,13 @@ |
| 22 | 22 | <div class="name"> |
| 23 | 23 | {{item.title}} |
| 24 | 24 | </div> |
| 25 | - <div class="address_name"> | |
| 26 | - 收货人 {{item.address_name}} | |
| 25 | + <div v-show="item.shop_type == 1 && item.address_name && item.address_address && item.address_phone" class="address_name"> | |
| 26 | + 收货地址: {{item.address_name}}{{item.address_phone}}{{item.address_address}} | |
| 27 | 27 | </div> |
| 28 | 28 | <div class="exchange_time"> |
| 29 | 29 | 兑换时间 {{item.create_time*1000 | datetime('yyyy-MM-dd hh:mm:ss')}} |
| 30 | 30 | </div> |
| 31 | - <div v-show="item.shop_type == 1 && !item.address_name && !item.address_name" class="btn-box"> | |
| 31 | + <div v-show="item.shop_type == 1 && !item.address_name && !item.address_address && !item.address_phone" class="btn-box"> | |
| 32 | 32 | <div @click="addAddressInfo(item)" class="btn"> |
| 33 | 33 | 填写地址 |
| 34 | 34 | <img src="static/img/red_right_icon.png" alt=""/> | ... | ... |