Commit e344b7c13688b398e517527e6cfe9a77f9f58a6c
1 parent
46806bfc
优化
Showing
3 changed files
with
28 additions
and
28 deletions
src/components/receivingGiftsItem/receivingGiftsItem.less
| @@ -194,28 +194,28 @@ | @@ -194,28 +194,28 @@ | ||
| 194 | color: rgba(51, 51, 51, 1); | 194 | color: rgba(51, 51, 51, 1); |
| 195 | line-height: 40px; | 195 | line-height: 40px; |
| 196 | } | 196 | } |
| 197 | - .oredr_link_box { | ||
| 198 | - display: flex; | ||
| 199 | - width: 158px; | ||
| 200 | - height: 52px; | ||
| 201 | - background: rgba(208, 2, 27, 1); | ||
| 202 | - border-radius: 100px 0px 0px 100px; | ||
| 203 | - font-size: 26px; | ||
| 204 | - font-weight: 500; | ||
| 205 | - color: rgba(255, 255, 255, 1); | ||
| 206 | - line-height: 52px; | ||
| 207 | - position: fixed; | ||
| 208 | - right:0; | ||
| 209 | - z-index: 1000; | ||
| 210 | - div{ | ||
| 211 | - margin-left: 18px; | ||
| 212 | - } | ||
| 213 | - .icon{ | ||
| 214 | - width: 20px; | ||
| 215 | - height: 20px; | ||
| 216 | - margin: 13px 0; | ||
| 217 | - } | ||
| 218 | - } | 197 | + // .oredr_link_box { |
| 198 | + // display: flex; | ||
| 199 | + // width: 158px; | ||
| 200 | + // height: 52px; | ||
| 201 | + // background: rgba(208, 2, 27, 1); | ||
| 202 | + // border-radius: 100px 0px 0px 100px; | ||
| 203 | + // font-size: 26px; | ||
| 204 | + // font-weight: 500; | ||
| 205 | + // color: rgba(255, 255, 255, 1); | ||
| 206 | + // line-height: 52px; | ||
| 207 | + // position: fixed; | ||
| 208 | + // right:0; | ||
| 209 | + // z-index: 1000; | ||
| 210 | + // div{ | ||
| 211 | + // margin-left: 18px; | ||
| 212 | + // } | ||
| 213 | + // .icon{ | ||
| 214 | + // width: 20px; | ||
| 215 | + // height: 20px; | ||
| 216 | + // margin: 13px 0; | ||
| 217 | + // } | ||
| 218 | + // } | ||
| 219 | } | 219 | } |
| 220 | .noGift { | 220 | .noGift { |
| 221 | height: calc(100vh-364px); | 221 | height: calc(100vh-364px); |
src/components/receivingGiftsItem/receivingGiftsItem.vue
| @@ -165,7 +165,7 @@ | @@ -165,7 +165,7 @@ | ||
| 165 | <!-- 显示文字 --> | 165 | <!-- 显示文字 --> |
| 166 | <div class="text_tip" v-else>完成</div> | 166 | <div class="text_tip" v-else>完成</div> |
| 167 | <!-- 商品订单按钮 --> | 167 | <!-- 商品订单按钮 --> |
| 168 | - <div | 168 | + <!-- <div |
| 169 | @click="OrderLink" | 169 | @click="OrderLink" |
| 170 | v-if="index == 0" | 170 | v-if="index == 0" |
| 171 | class="oredr_link_box" | 171 | class="oredr_link_box" |
| @@ -173,7 +173,7 @@ | @@ -173,7 +173,7 @@ | ||
| 173 | > | 173 | > |
| 174 | <div>商品订单</div> | 174 | <div>商品订单</div> |
| 175 | <van-icon class="icon" name="arrow" /> | 175 | <van-icon class="icon" name="arrow" /> |
| 176 | - </div> | 176 | + </div> --> |
| 177 | </div> | 177 | </div> |
| 178 | </div> | 178 | </div> |
| 179 | <!-- 您还未收到过礼物哦～--> | 179 | <!-- 您还未收到过礼物哦～--> |
| @@ -212,9 +212,9 @@ export default { | @@ -212,9 +212,9 @@ export default { | ||
| 212 | this.$emit("onUserInfo", item); | 212 | this.$emit("onUserInfo", item); |
| 213 | }, | 213 | }, |
| 214 | // 跳转到商品订单 | 214 | // 跳转到商品订单 |
| 215 | - OrderLink() { | ||
| 216 | - this.$emit("OrderLink"); | ||
| 217 | - } | 215 | + // OrderLink() { |
| 216 | + // this.$emit("OrderLink"); | ||
| 217 | + // } | ||
| 218 | } | 218 | } |
| 219 | }; | 219 | }; |
| 220 | </script> | 220 | </script> |
src/pages/myGiftBox/myGiftBox.vue
| @@ -5,7 +5,7 @@ | @@ -5,7 +5,7 @@ | ||
| 5 | <!--tab切换--> | 5 | <!--tab切换--> |
| 6 | <div | 6 | <div |
| 7 | class="top_box" | 7 | class="top_box" |
| 8 | - :style="'padding-top: ' + ($parent.top.value) + 'px'" | 8 | + :style="'padding-top: ' + ($parent.top.value+12.5) + 'px'" |
| 9 | > | 9 | > |
| 10 | <img @click="$parent.back" src="static/img/icon_back.png" /> | 10 | <img @click="$parent.back" src="static/img/icon_back.png" /> |
| 11 | <div class="tabs"> | 11 | <div class="tabs"> |