Commit e761b5cabf9e1d35f64357da9cc48d57cb0bf47c
1 parent
5f0d17b9
优化
Showing
6 changed files
with
33 additions
and
65 deletions
src/components/giftGivingItem/giftGivingItem.less
| @@ -62,28 +62,6 @@ | @@ -62,28 +62,6 @@ | ||
| 62 | line-height: 40px; | 62 | line-height: 40px; |
| 63 | margin-left: 30px; | 63 | margin-left: 30px; |
| 64 | } | 64 | } |
| 65 | - .oredr_link_box { | ||
| 66 | - position: absolute; | ||
| 67 | - right: -60px; | ||
| 68 | - top: 0; | ||
| 69 | - display: flex; | ||
| 70 | - width: 158px; | ||
| 71 | - height: 50px; | ||
| 72 | - background: rgba(208, 2, 27, 1); | ||
| 73 | - border-radius: 100px 0px 0px 100px; | ||
| 74 | - font-size: 26px; | ||
| 75 | - font-weight: 500; | ||
| 76 | - color: rgba(255, 255, 255, 1); | ||
| 77 | - line-height: 52px; | ||
| 78 | - div { | ||
| 79 | - margin-left: 18px; | ||
| 80 | - } | ||
| 81 | - .icon { | ||
| 82 | - width: 20px; | ||
| 83 | - height: 20px; | ||
| 84 | - margin: 13px 0; | ||
| 85 | - } | ||
| 86 | - } | ||
| 87 | } | 65 | } |
| 88 | .statu_list { | 66 | .statu_list { |
| 89 | width: auto; | 67 | width: auto; |
src/components/giftGivingItem/giftGivingItem.vue
| @@ -41,14 +41,6 @@ | @@ -41,14 +41,6 @@ | ||
| 41 | <div class="name"> | 41 | <div class="name"> |
| 42 | 店铺名字 | 42 | 店铺名字 |
| 43 | </div> | 43 | </div> |
| 44 | - <!-- 商品订单按钮 --> | ||
| 45 | - <div | ||
| 46 | - @click="OrderLink" | ||
| 47 | - v-if="index == 0" | ||
| 48 | - class="oredr_link_box"> | ||
| 49 | - <div>商品订单</div> | ||
| 50 | - <van-icon class="icon" name="arrow" /> | ||
| 51 | - </div> | ||
| 52 | </div> | 44 | </div> |
| 53 | <!--商品信息--> | 45 | <!--商品信息--> |
| 54 | <div class="item_info"> | 46 | <div class="item_info"> |
src/components/receivingGiftsItem/receivingGiftsItem.less
| @@ -69,28 +69,6 @@ | @@ -69,28 +69,6 @@ | ||
| 69 | line-height: 40px; | 69 | line-height: 40px; |
| 70 | margin-left: 30px; | 70 | margin-left: 30px; |
| 71 | } | 71 | } |
| 72 | - .oredr_link_box { | ||
| 73 | - position: absolute; | ||
| 74 | - right: -60px; | ||
| 75 | - top: 0; | ||
| 76 | - display: flex; | ||
| 77 | - width: 158px; | ||
| 78 | - height: 50px; | ||
| 79 | - background: rgba(208, 2, 27, 1); | ||
| 80 | - border-radius: 100px 0px 0px 100px; | ||
| 81 | - font-size: 26px; | ||
| 82 | - font-weight: 500; | ||
| 83 | - color: rgba(255, 255, 255, 1); | ||
| 84 | - line-height: 52px; | ||
| 85 | - div { | ||
| 86 | - margin-left: 18px; | ||
| 87 | - } | ||
| 88 | - .icon { | ||
| 89 | - width: 20px; | ||
| 90 | - height: 20px; | ||
| 91 | - margin: 13px 0; | ||
| 92 | - } | ||
| 93 | - } | ||
| 94 | } | 72 | } |
| 95 | .statu_list { | 73 | .statu_list { |
| 96 | width: auto; | 74 | width: auto; |
src/components/receivingGiftsItem/receivingGiftsItem.vue
| @@ -41,15 +41,6 @@ | @@ -41,15 +41,6 @@ | ||
| 41 | > | 41 | > |
| 42 | 店铺名字 | 42 | 店铺名字 |
| 43 | </div> | 43 | </div> |
| 44 | - <!-- 商品订单按钮 --> | ||
| 45 | - <div | ||
| 46 | - @click="OrderLink" | ||
| 47 | - v-if="index == 0" | ||
| 48 | - class="oredr_link_box" | ||
| 49 | - > | ||
| 50 | - <div>商品订单</div> | ||
| 51 | - <van-icon class="icon" name="arrow" /> | ||
| 52 | - </div> | ||
| 53 | </div> | 44 | </div> |
| 54 | <!--商品信息--> | 45 | <!--商品信息--> |
| 55 | <div class="item_info"> | 46 | <div class="item_info"> |
src/pages/myGiftBox/myGiftBox.less
| @@ -222,6 +222,29 @@ | @@ -222,6 +222,29 @@ | ||
| 222 | font-size: 26px; | 222 | font-size: 26px; |
| 223 | color: #999; | 223 | color: #999; |
| 224 | } | 224 | } |
| 225 | + .oredr_link_box { | ||
| 226 | + position: fixed; | ||
| 227 | + right: 0; | ||
| 228 | + top: 0; | ||
| 229 | + display: flex; | ||
| 230 | + width: 158px; | ||
| 231 | + height: 50px; | ||
| 232 | + background: rgba(208, 2, 27, 1); | ||
| 233 | + border-radius: 100px 0px 0px 100px; | ||
| 234 | + font-size: 26px; | ||
| 235 | + font-weight: 500; | ||
| 236 | + color: rgba(255, 255, 255, 1); | ||
| 237 | + line-height: 52px; | ||
| 238 | + z-index: 1000; | ||
| 239 | + div { | ||
| 240 | + margin-left: 18px; | ||
| 241 | + } | ||
| 242 | + .icon { | ||
| 243 | + width: 20px; | ||
| 244 | + height: 20px; | ||
| 245 | + margin: 13px 0; | ||
| 246 | + } | ||
| 247 | + } | ||
| 225 | .van-picker__cancel, | 248 | .van-picker__cancel, |
| 226 | .van-picker__confirm { | 249 | .van-picker__confirm { |
| 227 | font-size: 30px; | 250 | font-size: 30px; |
src/pages/myGiftBox/myGiftBox.vue
| @@ -49,8 +49,7 @@ | @@ -49,8 +49,7 @@ | ||
| 49 | <!--内容--> | 49 | <!--内容--> |
| 50 | <div | 50 | <div |
| 51 | class="item_box" | 51 | class="item_box" |
| 52 | - :style="'padding-top: ' + ($parent.top.value + 80) + 'px'" | ||
| 53 | - > | 52 | + :style="'padding-top: ' + ($parent.top.value + 80) + 'px'"> |
| 54 | <div | 53 | <div |
| 55 | ref="boxx" | 54 | ref="boxx" |
| 56 | infinite-scroll-immediate-check="true" | 55 | infinite-scroll-immediate-check="true" |
| @@ -104,8 +103,7 @@ | @@ -104,8 +103,7 @@ | ||
| 104 | class="screenPopup" | 103 | class="screenPopup" |
| 105 | v-model="popupShow" | 104 | v-model="popupShow" |
| 106 | position="right" | 105 | position="right" |
| 107 | - :style="{ height: '100vh', width: '285px' }" | ||
| 108 | - > | 106 | + :style="{ height: '100vh', width: '285px' }"> |
| 109 | <div :style="'padding-top: ' + ($parent.top.value + 15) + 'px'" class="screen_box"> | 107 | <div :style="'padding-top: ' + ($parent.top.value + 15) + 'px'" class="screen_box"> |
| 110 | <!-- 标题 --> | 108 | <!-- 标题 --> |
| 111 | <div class="title">筛选订单</div > | 109 | <div class="title">筛选订单</div > |
| @@ -135,6 +133,14 @@ | @@ -135,6 +133,14 @@ | ||
| 135 | <div @click="onConfirm" class="confirm">确定</div> | 133 | <div @click="onConfirm" class="confirm">确定</div> |
| 136 | </div> | 134 | </div> |
| 137 | </van-popup> | 135 | </van-popup> |
| 136 | + <!-- 商品订单按钮 --> | ||
| 137 | + <div | ||
| 138 | + @click="OrderLink" | ||
| 139 | + v-if="index == 0" | ||
| 140 | + class="oredr_link_box"> | ||
| 141 | + <div>商品订单</div> | ||
| 142 | + <van-icon class="icon" name="arrow" /> | ||
| 143 | + </div> | ||
| 138 | </div> | 144 | </div> |
| 139 | </template> | 145 | </template> |
| 140 | 146 |