w-front-end / select_good · Commits

Commit f5ef84260b792daf672f83618bad98ced280a326

Authored by zhiyangdu
1 parent b7c77fe1

优化

Inline Side-by-side
Showing 3 changed files with 7 additions and 1 deletions
src/components/receivingGiftsItem/receivingGiftsItem.vue
  View file @f5ef842
@@ -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"> 30 + <div v-if="item.get_gift_state != 7" :class="{btn:item.get_gift_state != 7}">
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
  View file @f5ef842
@@ -46,4 +46,8 @@ @@ -46,4 +46,8 @@
46 line-height: 45px; 46 line-height: 45px;
47 } 47 }
48 } 48 }
  49 + .item_box{
  50 + height: calc(100vh-100px);
  51 + overflow-y: auto;
  52 + }
49 } 53 }
src/pages/myGiftBox/myGiftBox.vue
  View file @f5ef842
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
12 <div class="desc">规则说明</div> 12 <div class="desc">规则说明</div>
13 </div> 13 </div>
14 <!--内容--> 14 <!--内容-->
  15 + <div class="item_box">
15 <div 16 <div
16 infinite-scroll-immediate-check="true" 17 infinite-scroll-immediate-check="true"
17 v-infinite-scroll="getorderGiftList" 18 v-infinite-scroll="getorderGiftList"
@@ -34,6 +35,7 @@ @@ -34,6 +35,7 @@
34 > 35 >
35 </giftGivingItem> 36 </giftGivingItem>
36 </div> 37 </div>
  38 + </div>
37 </div> 39 </div>
38 </template> 40 </template>
39 41