Commit bc3482b1028d85537d92a04bd51c2488c4dcacaf
1 parent
feb4fc70
送礼人列表页
Showing
2 changed files
with
153 additions
and
11 deletions
src/components/giftGivingItem/giftGivingItem.less
| ... | ... | @@ -11,7 +11,7 @@ |
| 11 | 11 | justify-content: space-between; |
| 12 | 12 | position: relative; |
| 13 | 13 | padding-bottom: 22px; |
| 14 | - border-bottom: solid 1px rgba(247, 247, 248, 1); | |
| 14 | + // border-bottom: solid 1px rgba(247, 247, 248, 1); | |
| 15 | 15 | .name { |
| 16 | 16 | height: 50px; |
| 17 | 17 | font-size: 28px; |
| ... | ... | @@ -44,14 +44,76 @@ |
| 44 | 44 | line-height: 40px; |
| 45 | 45 | } |
| 46 | 46 | } |
| 47 | + .shop_info { | |
| 48 | + display: flex; | |
| 49 | + height: 50px; | |
| 50 | + margin-top: 30px; | |
| 51 | + position: relative; | |
| 52 | + img { | |
| 53 | + width: 40px; | |
| 54 | + height: 40px; | |
| 55 | + border-radius: 40px; | |
| 56 | + } | |
| 57 | + .name { | |
| 58 | + height: 40px; | |
| 59 | + font-size: 28px; | |
| 60 | + font-weight: 400; | |
| 61 | + color: rgba(34, 40, 51, 1); | |
| 62 | + line-height: 40px; | |
| 63 | + margin-left: 30px; | |
| 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 | + z-index: 1000; | |
| 79 | + div { | |
| 80 | + margin-left: 18px; | |
| 81 | + } | |
| 82 | + .icon { | |
| 83 | + width: 20px; | |
| 84 | + height: 20px; | |
| 85 | + margin: 13px 0; | |
| 86 | + } | |
| 87 | + } | |
| 88 | + } | |
| 89 | + .statu_list { | |
| 90 | + width: auto; | |
| 91 | + height: auto; | |
| 92 | + margin-top: 20px; | |
| 93 | + display: flex; | |
| 94 | + flex-wrap:wrap; | |
| 95 | + align-content: flex-start; | |
| 96 | + .btn { | |
| 97 | + min-width: 78px; | |
| 98 | + height: 52px; | |
| 99 | + color: #999999; | |
| 100 | + background-color: #f9f9f9; | |
| 101 | + border-radius: 8px; | |
| 102 | + padding: 0 20px; | |
| 103 | + font-size: 26px; | |
| 104 | + line-height: 52px; | |
| 105 | + text-align: center; | |
| 106 | + margin: 10px; | |
| 107 | + } | |
| 108 | + } | |
| 47 | 109 | .item_info { |
| 48 | 110 | display: flex; |
| 49 | 111 | margin-top: 30px; |
| 50 | 112 | padding-bottom: 30px; |
| 51 | 113 | border-bottom: solid 1px rgba(247, 247, 248, 1); |
| 52 | 114 | img { |
| 53 | - width: 159px; | |
| 54 | - height: 160px; | |
| 115 | + width: 200px; | |
| 116 | + height: 200px; | |
| 55 | 117 | border-radius: 10px; |
| 56 | 118 | } |
| 57 | 119 | .box { |
| ... | ... | @@ -62,6 +124,7 @@ |
| 62 | 124 | font-size: 28px; |
| 63 | 125 | font-weight: 400; |
| 64 | 126 | color: rgba(51, 51, 51, 1); |
| 127 | + height: 80px; | |
| 65 | 128 | max-height: 80px; |
| 66 | 129 | /*! autoprefixer: off */ |
| 67 | 130 | -webkit-box-orient: vertical; |
| ... | ... | @@ -71,11 +134,20 @@ |
| 71 | 134 | overflow: hidden; |
| 72 | 135 | white-space: normal; |
| 73 | 136 | } |
| 137 | + .num_desc { | |
| 138 | + height: 33px; | |
| 139 | + font-size: 24px; | |
| 140 | + font-weight: 400; | |
| 141 | + color: rgba(153, 153, 153, 1); | |
| 142 | + line-height: 33px; | |
| 143 | + margin-top: 4px; | |
| 144 | + } | |
| 74 | 145 | .pirce { |
| 75 | 146 | width: 100%; |
| 76 | - position: absolute; | |
| 77 | - left: 0; | |
| 78 | - bottom: 0; | |
| 147 | + // position: absolute; | |
| 148 | + // left: 0; | |
| 149 | + // bottom: 0; | |
| 150 | + margin-top: 34px; | |
| 79 | 151 | display: flex; |
| 80 | 152 | justify-content: space-between; |
| 81 | 153 | .title { |
| ... | ... | @@ -103,6 +175,39 @@ |
| 103 | 175 | } |
| 104 | 176 | } |
| 105 | 177 | } |
| 178 | + .fold_box { | |
| 179 | + width: 630px; | |
| 180 | + height: 80px; | |
| 181 | + line-height: 80px; | |
| 182 | + background: rgba(249, 249, 249, 1); | |
| 183 | + border-radius: 5px; | |
| 184 | + font-size: 24px; | |
| 185 | + color: #999; | |
| 186 | + text-align: center; | |
| 187 | + display: flex; | |
| 188 | + justify-content: center; | |
| 189 | + .fold { | |
| 190 | + display: flex; | |
| 191 | + .triangle_top { | |
| 192 | + width: 0px; | |
| 193 | + height: 0px; | |
| 194 | + border-width: 10px; | |
| 195 | + border-style: solid; | |
| 196 | + margin-top: 25px; | |
| 197 | + margin-left: 14px; | |
| 198 | + border-color: #fff #fff #999 #fff; | |
| 199 | + } | |
| 200 | + .triangle_bottom { | |
| 201 | + width: 0px; | |
| 202 | + height: 0px; | |
| 203 | + border-width: 10px; | |
| 204 | + border-style: solid; | |
| 205 | + margin-top: 35px; | |
| 206 | + margin-left: 14px; | |
| 207 | + border-color: #999 #fff #fff #fff; | |
| 208 | + } | |
| 209 | + } | |
| 210 | + } | |
| 106 | 211 | .text_tip { |
| 107 | 212 | height: 40px; |
| 108 | 213 | font-size: 28px; | ... | ... |
src/components/giftGivingItem/giftGivingItem.vue
| ... | ... | @@ -29,6 +29,27 @@ |
| 29 | 29 | <span v-else-if="item && item.status == 6">退款中</span> |
| 30 | 30 | </div> |
| 31 | 31 | </div> |
| 32 | + <!-- 店铺信息 --> | |
| 33 | + <div class="shop_info"> | |
| 34 | + <img | |
| 35 | + v-on:click.stop="onUserInfo(item)" | |
| 36 | + src="static/img/1.png"/> | |
| 37 | + <div class="name"> | |
| 38 | + 店铺名字 | |
| 39 | + </div> | |
| 40 | + <!-- 商品订单按钮 --> | |
| 41 | + <div | |
| 42 | + @click="OrderLink" | |
| 43 | + v-if="index == 0" | |
| 44 | + class="oredr_link_box"> | |
| 45 | + <div>商品订单</div> | |
| 46 | + <van-icon class="icon" name="arrow" /> | |
| 47 | + </div> | |
| 48 | + </div> | |
| 49 | + <!-- 订单状态集合 --> | |
| 50 | + <div class="statu_list"> | |
| 51 | + <div class="btn">可分享</div> | |
| 52 | + </div> | |
| 32 | 53 | <!--商品信息--> |
| 33 | 54 | <div class="item_info"> |
| 34 | 55 | <img |
| ... | ... | @@ -38,10 +59,11 @@ |
| 38 | 59 | <div class="box"> |
| 39 | 60 | <div |
| 40 | 61 | v-if="item && item.goods && item.goods.title" |
| 41 | - class="name" | |
| 42 | - > | |
| 62 | + class="name"> | |
| 43 | 63 | {{ item.goods.title }} |
| 44 | 64 | </div> |
| 65 | + <!-- 每人多少件 --> | |
| 66 | + <div class="num_desc">每人 1 件</div> | |
| 45 | 67 | <div class="pirce"> |
| 46 | 68 | <div |
| 47 | 69 | v-if="item && item.goods && item.goods.price" |
| ... | ... | @@ -58,8 +80,14 @@ |
| 58 | 80 | </div> |
| 59 | 81 | </div> |
| 60 | 82 | </div> |
| 83 | + <!-- 展开和折叠按钮 --> | |
| 84 | + <div class="fold_box" @click="onLoginMore"> | |
| 85 | + <div class="fold"> | |
| 86 | + 共五件 <div :class="[triangle?'triangle_top':'triangle_bottom']"> </div> | |
| 87 | + </div> | |
| 88 | + </div> | |
| 61 | 89 | <!-- 显示文字 --> |
| 62 | - <div class="text_tip"> | |
| 90 | + <div v-show="item.status != 3" class="text_tip"> | |
| 63 | 91 | <span v-show="item && item.total_num && item.status ==1" |
| 64 | 92 | >可分享<span>{{ item.total_num }}</span |
| 65 | 93 | >人<span v-show="item && item.give_num || item.no_address_num|| item.refund_num">,</span></span |
| ... | ... | @@ -77,7 +105,7 @@ |
| 77 | 105 | > |
| 78 | 106 | </div> |
| 79 | 107 | <!-- 按钮 --> |
| 80 | - <div class="btn_list"> | |
| 108 | + <div v-show="item.status != 3" class="btn_list"> | |
| 81 | 109 | <div v-show="item.status == 0" class="box"> |
| 82 | 110 | <div |
| 83 | 111 | v-on:click.stop="onCancelPayment(item)" |
| ... | ... | @@ -118,7 +146,7 @@ |
| 118 | 146 | export default { |
| 119 | 147 | name: "giftGivingItem", |
| 120 | 148 | data() { |
| 121 | - return {}; | |
| 149 | + return {triangle:false}; | |
| 122 | 150 | }, |
| 123 | 151 | props: ["giftGivingItem", "isData"], |
| 124 | 152 | created() {}, |
| ... | ... | @@ -138,6 +166,15 @@ export default { |
| 138 | 166 | // 分享礼物 |
| 139 | 167 | giftToShare(item){ |
| 140 | 168 | this.$emit("giftToShare", item); |
| 169 | + }, | |
| 170 | + // 跳转到商品订单 | |
| 171 | + OrderLink() { | |
| 172 | + this.$emit("OrderLink"); | |
| 173 | + }, | |
| 174 | + // 展开加载更多 | |
| 175 | + onLoginMore(){ | |
| 176 | + this.triangle = !this.triangle; | |
| 177 | + | |
| 141 | 178 | } |
| 142 | 179 | } |
| 143 | 180 | }; | ... | ... |