Commit 276b9e04d6c737cb8bad1cf1ca7718a574b079a2
1 parent
f5ef8426
数据绑定
Showing
3 changed files
with
12 additions
and
4 deletions
src/components/giftGivingItem/giftGivingItem.vue
| @@ -8,8 +8,16 @@ | @@ -8,8 +8,16 @@ | ||
| 8 | > | 8 | > |
| 9 | <!--用户信息--> | 9 | <!--用户信息--> |
| 10 | <div class="user_info"> | 10 | <div class="user_info"> |
| 11 | - <div class="name">{{ item.create_time }}(赠礼)</div> | ||
| 12 | - <div class="gift_active">{{ item.status }}</div> | 11 | + <div class="name">{{item.create_time*1000 | datetime('yyyy-MM-dd hh:mm:ss')}}</div> |
| 12 | + <div class="gift_active"> | ||
| 13 | + <span v-if="item.status==0">待支付</span> | ||
| 14 | + <span v-else-if="item.status==1">分享</span> | ||
| 15 | + <span v-else-if="item.status==2">已领完</span> | ||
| 16 | + <span v-else-if="item.status==3">已关闭</span> | ||
| 17 | + <span v-else-if="item.status==4">部分退款中(可分享)</span> | ||
| 18 | + <span v-else-if="item.status==5">部分退款中(不可分享</span> | ||
| 19 | + <span v-else-if="item.status==6">退款中</span> | ||
| 20 | + </div> | ||
| 13 | </div> | 21 | </div> |
| 14 | <!--商品信息--> | 22 | <!--商品信息--> |
| 15 | <div class="item_info"> | 23 | <div class="item_info"> |
src/components/receivingGiftsItem/receivingGiftsItem.vue
| @@ -27,7 +27,7 @@ | @@ -27,7 +27,7 @@ | ||
| 27 | <div class="title"> | 27 | <div class="title"> |
| 28 | <span>¥</span>{{ item.goods.price }} | 28 | <span>¥</span>{{ item.goods.price }} |
| 29 | </div> | 29 | </div> |
| 30 | - <div v-if="item.get_gift_state != 7" :class="{btn:item.get_gift_state != 7}"> | 30 | + <div v-if="item.get_gift_state < 6" class="btn"> |
| 31 | <span v-if="item.get_gift_state < 3">点击收礼</span> | 31 | <span v-if="item.get_gift_state < 3">点击收礼</span> |
| 32 | <span v-else-if="item.get_gift_state == 3" | 32 | <span v-else-if="item.get_gift_state == 3" |
| 33 | >填写地址</span | 33 | >填写地址</span |
src/pages/myGiftBox/myGiftBox.less
| @@ -22,7 +22,7 @@ | @@ -22,7 +22,7 @@ | ||
| 22 | } | 22 | } |
| 23 | .van-tabs__line { | 23 | .van-tabs__line { |
| 24 | width: 26px !important; | 24 | width: 26px !important; |
| 25 | - height: 4px; | 25 | + height: 5px; |
| 26 | background: rgba(208, 2, 27, 1); | 26 | background: rgba(208, 2, 27, 1); |
| 27 | border-radius: 3px; | 27 | border-radius: 3px; |
| 28 | } | 28 | } |