parent:
02b1cee4
|
补丁 |
提交
refactor: 消耗明细入口从 yueyangZone 组件迁移至专区页面
| .. | .. |
|---|
| 9 | 9 | </view> |
|---|
| 10 | 10 | </view> |
|---|
| 11 | 11 | <view class="points-right"> |
|---|
| 12 | | - <image src="https://ossacmall.bluedeer.com.cn/app/static/images/yueyang_jifen.png" class="lottery-btn" mode="widthFix" |
|---|
| 13 | | - @click="goLottery"></image> |
|---|
| 14 | | - </view> |
|---|
| 15 | | - <view class="detail-btn" @click="goDetail"> |
|---|
| 16 | | - <text>消耗明细</text> |
|---|
| 17 | | - </view> |
|---|
| 18 | | - </view> |
|---|
| 12 | + <image src="https://ossacmall.bluedeer.com.cn/app/static/images/yueyang_jifen.png" class="lottery-btn" mode="widthFix" |
|---|
| 13 | + @click="goLottery"></image> |
|---|
| 14 | + </view> |
|---|
| 15 | + </view> |
|---|
| 19 | 16 | |
|---|
| 20 | 17 | <!-- 优惠券兑换区 --> |
|---|
| 21 | 18 | <view class="coupon-area"> |
|---|
| .. | .. |
|---|
| 133 | 130 | }, |
|---|
| 134 | 131 | onShow() {}, |
|---|
| 135 | 132 | methods: { |
|---|
| 136 | | - goDetail() { |
|---|
| 137 | | - uni.navigateTo({ |
|---|
| 138 | | - url: '/pages/consumption/index?zoneId=' + this.zoneInfo.id |
|---|
| 139 | | - }) |
|---|
| 140 | | - }, |
|---|
| 141 | 133 | goLottery() { |
|---|
| 142 | 134 | this.$emit('goLottery') |
|---|
| 143 | 135 | }, |
|---|
| .. | .. |
|---|
| 322 | 314 | height: 57rpx; |
|---|
| 323 | 315 | } |
|---|
| 324 | 316 | |
|---|
| 325 | | - .detail-btn { |
|---|
| 326 | | - border: 2rpx solid #fff; |
|---|
| 327 | | - /* border-radius: 10rpx; */ |
|---|
| 328 | | - border-top-left-radius: 20rpx; |
|---|
| 329 | | - border-bottom-left-radius: 20rpx; |
|---|
| 330 | | - padding: 10rpx; |
|---|
| 331 | | - background-color: #daf2b2; |
|---|
| 332 | | - color: #1e984f; |
|---|
| 333 | | - width: 50rpx; |
|---|
| 334 | | - position: fixed; |
|---|
| 335 | | - top: 200rpx; |
|---|
| 336 | | - right: 0rpx; |
|---|
| 337 | | - line-height: 1rem; |
|---|
| 338 | | - } |
|---|
| 317 | + |
|---|
| 339 | 318 | |
|---|
| 340 | 319 | .coupon-area { |
|---|
| 341 | 320 | display: flex; |
|---|
| .. | .. |
|---|
| 14 | 14 | <view :style="{ height: marTop + 'px' }"></view> |
|---|
| 15 | 15 | <yueyangZone ref=yueyangZoneRef v-if="isYueyangZone" :zoneInfo="info" :careBeanRate="careBeanRate" |
|---|
| 16 | 16 | style="position: relative;z-index: 2;" @goLottery="goLottery" :relationKey="relationKey"></yueyangZone> |
|---|
| 17 | + <view v-if="isYueyangZone" class="detail-btn" @click="goDetail"> |
|---|
| 18 | + <text>消耗明细</text> |
|---|
| 19 | + </view> |
|---|
| 17 | 20 | <view v-else> |
|---|
| 18 | 21 | <view class="expireTime" v-if="expireTime && expireTime.length"> |
|---|
| 19 | 22 | <text>专区将在</text> |
|---|
| .. | .. |
|---|
| 1195 | 1198 | // that.myCareBean = res2.data.totalCareBeans; |
|---|
| 1196 | 1199 | }); |
|---|
| 1197 | 1200 | }, |
|---|
| 1201 | + goDetail() { |
|---|
| 1202 | + uni.navigateTo({ |
|---|
| 1203 | + url: '/pages/consumption/index?zoneId=' + this.info.id |
|---|
| 1204 | + }) |
|---|
| 1205 | + }, |
|---|
| 1198 | 1206 | goLottery() { |
|---|
| 1199 | 1207 | let that = this; |
|---|
| 1200 | 1208 | var data = { |
|---|
| .. | .. |
|---|
| 1836 | 1844 | transform: translate(0, -50%); |
|---|
| 1837 | 1845 | } |
|---|
| 1838 | 1846 | |
|---|
| 1847 | +.detail-btn { |
|---|
| 1848 | + border: 2rpx solid #fff; |
|---|
| 1849 | + border-top-left-radius: 20rpx; |
|---|
| 1850 | + border-bottom-left-radius: 20rpx; |
|---|
| 1851 | + padding: 10rpx; |
|---|
| 1852 | + background-color: #daf2b2; |
|---|
| 1853 | + color: #1e984f; |
|---|
| 1854 | + width: 50rpx; |
|---|
| 1855 | + position: fixed; |
|---|
| 1856 | + top: 200rpx; |
|---|
| 1857 | + right: 0rpx; |
|---|
| 1858 | + line-height: 1rem; |
|---|
| 1859 | + z-index: 99; |
|---|
| 1860 | +} |
|---|
| 1861 | + |
|---|
| 1839 | 1862 | .head_img { |
|---|
| 1840 | 1863 | width: 750rpx; |
|---|
| 1841 | 1864 | height: 422rpx; |
|---|