Showing
29 changed files
with
270 additions
and
31 deletions
| @@ -117,6 +117,7 @@ | @@ -117,6 +117,7 @@ | ||
| 117 | "downloadFile": 10000 | 117 | "downloadFile": 10000 |
| 118 | }, | 118 | }, |
| 119 | "tabBar": { | 119 | "tabBar": { |
| 120 | + "custom": true, | ||
| 120 | "color": "#999999", | 121 | "color": "#999999", |
| 121 | "selectedColor": "#C0A369", | 122 | "selectedColor": "#C0A369", |
| 122 | "backgroundColor": "#262628", | 123 | "backgroundColor": "#262628", |
| @@ -52,6 +52,10 @@ Component({ | @@ -52,6 +52,10 @@ Component({ | ||
| 52 | type: Boolean, | 52 | type: Boolean, |
| 53 | value: false, | 53 | value: false, |
| 54 | }, | 54 | }, |
| 55 | + hasActivityRed:{//红包活动 tags | ||
| 56 | + type: Boolean, | ||
| 57 | + value: false, | ||
| 58 | + }, | ||
| 55 | }, | 59 | }, |
| 56 | 60 | ||
| 57 | /** | 61 | /** |
| @@ -78,13 +82,24 @@ Component({ | @@ -78,13 +82,24 @@ Component({ | ||
| 78 | init() { | 82 | init() { |
| 79 | let seller = this.data.seller | 83 | let seller = this.data.seller |
| 80 | seller.label_cstr='' | 84 | seller.label_cstr='' |
| 85 | + seller.label_carr=[] | ||
| 81 | if (seller && seller.label_c && seller.label_c.length > 0) { | 86 | if (seller && seller.label_c && seller.label_c.length > 0) { |
| 82 | - let label_cstr = []; | 87 | + let label_cstr = [] |
| 83 | seller.label_c.forEach(l => { | 88 | seller.label_c.forEach(l => { |
| 84 | label_cstr.push(l.name) | 89 | label_cstr.push(l.name) |
| 90 | + seller.label_carr.push({type:1,name:l.name}) | ||
| 85 | }) | 91 | }) |
| 86 | seller.label_cstr = label_cstr.join(' | ') | 92 | seller.label_cstr = label_cstr.join(' | ') |
| 87 | } | 93 | } |
| 94 | + if(seller.is_discount>0){ | ||
| 95 | + seller.label_carr.unshift({type:0,name:'商家补贴'}) | ||
| 96 | + } | ||
| 97 | + if(seller.isopen_md==1){ | ||
| 98 | + seller.label_carr.unshift({type:0,name:'瓜分百万'}) | ||
| 99 | + } | ||
| 100 | + if(seller.label_carr.length>3){ | ||
| 101 | + seller.label_carr=seller.label_carr.slice(0,3) | ||
| 102 | + } | ||
| 88 | this.setData({ | 103 | this.setData({ |
| 89 | se: seller, | 104 | se: seller, |
| 90 | }) | 105 | }) |
| @@ -11,12 +11,12 @@ | @@ -11,12 +11,12 @@ | ||
| 11 | <view style="max-width: 100%;width: 100%;"> | 11 | <view style="max-width: 100%;width: 100%;"> |
| 12 | <view class="name Semibold flex-ll"> | 12 | <view class="name Semibold flex-ll"> |
| 13 | <view class="sellername">{{seller.sellername}}</view> | 13 | <view class="sellername">{{seller.sellername}}</view> |
| 14 | - <view class="ActivityShort" wx:if="{{hasActivityShort && seller.is_discount>0}}"></view> | ||
| 15 | - <view class="isopen_md" wx:if="{{hasActivityShort && seller.isopen_md==1}}">买单</view> | 14 | + <!--<view class="ActivityShort" wx:if="{{hasActivityShort && seller.is_discount>0}}"></view>--> |
| 15 | + <view class="isopen_md flex-vc" wx:if="{{hasActivityShort && seller.isopen_md==1}}">在线买单</view> | ||
| 16 | </view> | 16 | </view> |
| 17 | <view wx:if="{{hasSlogan && seller.slogan}}" class="slogan">“{{seller.slogan}}”</view> | 17 | <view wx:if="{{hasSlogan && seller.slogan}}" class="slogan">“{{seller.slogan}}”</view> |
| 18 | <view class="text flex-ll" wx:if="{{seller.cate.length>0}}"> | 18 | <view class="text flex-ll" wx:if="{{seller.cate.length>0}}"> |
| 19 | - <view class="text-item" wx:for="{{seller.cate}}" wx:key="seller.cate.key" wx:if="{{index<3}}">{{item.name}}</view> | 19 | + <view class="text-item" wx:for="{{seller.cate}}" wx:key="sellercatekey" wx:if="{{index<3}}">{{item.name}}</view> |
| 20 | </view> | 20 | </view> |
| 21 | <view class="text flex-ll"> | 21 | <view class="text flex-ll"> |
| 22 | <view class="text-item" wx:if="{{seller.room_num>0}}">{{seller.room_num}}个包间</view> | 22 | <view class="text-item" wx:if="{{seller.room_num>0}}">{{seller.room_num}}个包间</view> |
| @@ -36,7 +36,7 @@ | @@ -36,7 +36,7 @@ | ||
| 36 | vertical | 36 | vertical |
| 37 | circular | 37 | circular |
| 38 | > | 38 | > |
| 39 | - <block wx:for="{{seller.activity}}" wx:key="seller.activity.key" > | 39 | + <block wx:for="{{seller.activity}}" wx:key="selleractivitykey" > |
| 40 | <swiper-item> | 40 | <swiper-item> |
| 41 | <view class="activity-item"> | 41 | <view class="activity-item"> |
| 42 | {{item.title}} | 42 | {{item.title}} |
| @@ -48,16 +48,20 @@ | @@ -48,16 +48,20 @@ | ||
| 48 | <view class="activity-mask"></view> | 48 | <view class="activity-mask"></view> |
| 49 | </view> | 49 | </view> |
| 50 | <view wx:if="{{hasActivityTags && seller.activity.length>0}}" class="activity flex-ll"> | 50 | <view wx:if="{{hasActivityTags && seller.activity.length>0}}" class="activity flex-ll"> |
| 51 | - <text wx:for="{{seller.activity}}" class="activity-item" wx:key="seller.activity.key" wx:if="{{index<3}}">{{['','满减','满赠','折扣','代金券','会员价'][item.type]}}</text> | 51 | + <text wx:for="{{seller.activity}}" class="activity-item" wx:key="selleractivitykey" wx:if="{{index<3}}">{{['','满减','满赠','折扣','代金券','会员价'][item.type]}}</text> |
| 52 | </view> | 52 | </view> |
| 53 | <view wx:if="{{hasActivityTese && se.label_cstr}}" class="activity hasActivityTese flex-ll"> | 53 | <view wx:if="{{hasActivityTese && se.label_cstr}}" class="activity hasActivityTese flex-ll"> |
| 54 | <text class="activity-item">{{se.label_cstr}}</text> | 54 | <text class="activity-item">{{se.label_cstr}}</text> |
| 55 | </view> | 55 | </view> |
| 56 | + <view wx:if="{{hasActivityRed && se.label_carr.length>0}}" class="activity flex-ll"> | ||
| 57 | + <view wx:for="{{se.label_carr}}" class="activity-item flex-vc" wx:key="selleractivitykey">{{item.name}}</view> | ||
| 58 | + </view> | ||
| 56 | </view> | 59 | </view> |
| 57 | <view class="price flex-lr"> | 60 | <view class="price flex-lr"> |
| 58 | <view class="number Semibold"> | 61 | <view class="number Semibold"> |
| 59 | <block wx:if="{{seller.average>0 && hasAverage}}">¥{{seller.average}}元/人</block> | 62 | <block wx:if="{{seller.average>0 && hasAverage}}">¥{{seller.average}}元/人</block> |
| 60 | </view> | 63 | </view> |
| 64 | + <!-- | ||
| 61 | <view class="phone flex-cc" id="reserve-button" catchtap="tapButton" data-type="oncall"> | 65 | <view class="phone flex-cc" id="reserve-button" catchtap="tapButton" data-type="oncall"> |
| 62 | <block wx:if="{{se.is_online_reserve==1}}"> | 66 | <block wx:if="{{se.is_online_reserve==1}}"> |
| 63 | <view class="reserve-icon"></view> | 67 | <view class="reserve-icon"></view> |
| @@ -65,6 +69,10 @@ | @@ -65,6 +69,10 @@ | ||
| 65 | </block> | 69 | </block> |
| 66 | <text class="reserve-text" wx:else="">联系餐厅</text> | 70 | <text class="reserve-text" wx:else="">联系餐厅</text> |
| 67 | </view> | 71 | </view> |
| 72 | + --> | ||
| 73 | + <view class="reserve-button flex-vc" id="reserve-button" catchtap="tapButton"> | ||
| 74 | + 订包间 | ||
| 75 | + </view> | ||
| 68 | </view> | 76 | </view> |
| 69 | </view> | 77 | </view> |
| 70 | </view> | 78 | </view> |
| @@ -128,20 +128,16 @@ | @@ -128,20 +128,16 @@ | ||
| 128 | line-height: 34rpx; | 128 | line-height: 34rpx; |
| 129 | } | 129 | } |
| 130 | .activity .activity-item{ | 130 | .activity .activity-item{ |
| 131 | - font-size: 24rpx; | ||
| 132 | - height: 24rpx; | ||
| 133 | - padding: 0 10rpx 0; | ||
| 134 | - line-height: 24rpx; | ||
| 135 | - overflow: hidden; | ||
| 136 | - max-height: 36rpx; | ||
| 137 | - border-radius: 6rpx; | 131 | + height:36rpx; |
| 132 | + border-radius:6rpx; | ||
| 133 | + border:2rpx solid #F98E47; | ||
| 138 | margin-left: 10rpx; | 134 | margin-left: 10rpx; |
| 139 | - text-align: center; | ||
| 140 | - overflow: hidden; | ||
| 141 | - white-space:nowrap; | ||
| 142 | - background: linear-gradient(to right, #F98E47, #F05522); | ||
| 143 | - text-shadow:0 2rpx 6rpx #C51B41; | ||
| 144 | - color:#F8E6C4; | 135 | + |
| 136 | + font-size:22rpx; | ||
| 137 | + font-family:PingFangSC-Medium,PingFang SC; | ||
| 138 | + font-weight:500; | ||
| 139 | + color:rgba(240,85,34,1); | ||
| 140 | + padding: 0 10rpx; | ||
| 145 | } | 141 | } |
| 146 | .activity .activity-item:first-child{ | 142 | .activity .activity-item:first-child{ |
| 147 | margin-left: 0; | 143 | margin-left: 0; |
| @@ -221,6 +217,7 @@ | @@ -221,6 +217,7 @@ | ||
| 221 | background-color: #FFF5EB; | 217 | background-color: #FFF5EB; |
| 222 | margin-left: 0; | 218 | margin-left: 0; |
| 223 | border-radius: 0; | 219 | border-radius: 0; |
| 220 | + border-width: 0; | ||
| 224 | } | 221 | } |
| 225 | .sellername{ | 222 | .sellername{ |
| 226 | overflow: hidden; | 223 | overflow: hidden; |
| @@ -235,15 +232,27 @@ | @@ -235,15 +232,27 @@ | ||
| 235 | margin-right: 10rpx; | 232 | margin-right: 10rpx; |
| 236 | } | 233 | } |
| 237 | .isopen_md{ | 234 | .isopen_md{ |
| 238 | - width:52rpx; | 235 | + width:92rpx; |
| 239 | height:32rpx; | 236 | height:32rpx; |
| 237 | + background:rgba(255,243,240,1); | ||
| 240 | border-radius:4rpx; | 238 | border-radius:4rpx; |
| 241 | - border:2rpx solid rgba(146,231,61,1); | 239 | + |
| 242 | font-size:20rpx; | 240 | font-size:20rpx; |
| 243 | font-family:PingFangSC-Semibold,PingFang SC; | 241 | font-family:PingFangSC-Semibold,PingFang SC; |
| 244 | font-weight:600; | 242 | font-weight:600; |
| 245 | - color:rgba(125,199,66,1); | 243 | + color:rgba(254,142,103,1); |
| 246 | line-height:32rpx; | 244 | line-height:32rpx; |
| 247 | - text-align: center; | ||
| 248 | - margin-left: 6rpx; | 245 | + |
| 246 | + margin-left: 20rpx; | ||
| 247 | +} | ||
| 248 | +.reserve-button{ | ||
| 249 | + width:130rpx; | ||
| 250 | + height:62rpx; | ||
| 251 | + background:linear-gradient(360deg,rgba(249,142,71,1) 0%,rgba(240,85,34,1) 100%); | ||
| 252 | + border-radius:31rpx; | ||
| 253 | + | ||
| 254 | + font-size:30rpx; | ||
| 255 | + font-family:PingFangSC-Semibold,PingFang SC; | ||
| 256 | + font-weight:600; | ||
| 257 | + color:rgba(255,255,255,1); | ||
| 249 | } | 258 | } |
| 1 | <!--components/tips/boost.wxml--> | 1 | <!--components/tips/boost.wxml--> |
| 2 | -<view class="mask" bindtap="hide" wx:if="{{disp}}"> | 2 | +<view class="mask" bindtap="hide" wx:if="{{disp}}" style="z-index: 99999"> |
| 3 | <view class="boost" catchtap="catchtap"> | 3 | <view class="boost" catchtap="catchtap"> |
| 4 | <view class="header flex-lr" bindtap="hide"> | 4 | <view class="header flex-lr" bindtap="hide"> |
| 5 | <view> </view> | 5 | <view> </view> |
custom-tab-bar/index.js
0 → 100644
| 1 | +// components/book/tabBar/tabBar.js | ||
| 2 | +import util from '../utils/util' | ||
| 3 | +Component({ | ||
| 4 | + /** | ||
| 5 | + * 组件的属性列表 | ||
| 6 | + */ | ||
| 7 | + properties: {}, | ||
| 8 | + | ||
| 9 | + /** | ||
| 10 | + * 组件的初始数据 | ||
| 11 | + */ | ||
| 12 | + data: { | ||
| 13 | + pi: 0, | ||
| 14 | + dot:0, | ||
| 15 | + list: [ | ||
| 16 | + { | ||
| 17 | + "pagePath": "pages/reserve/index", | ||
| 18 | + "text": "订座", | ||
| 19 | + "iconPath": "pages/image/tabicon1.png", | ||
| 20 | + "selectedIconPath": "pages/image/tabicon1.active.png" | ||
| 21 | + }, | ||
| 22 | + { | ||
| 23 | + "pagePath": "pages/me/follow", | ||
| 24 | + "text": "关注", | ||
| 25 | + "iconPath": "pages/image/follow.png", | ||
| 26 | + "selectedIconPath": "pages/image/follow.active.png" | ||
| 27 | + }, | ||
| 28 | + { | ||
| 29 | + "pagePath": "pages/customer/list", | ||
| 30 | + "text": "日程", | ||
| 31 | + "iconPath": "pages/image/tabicon3.png", | ||
| 32 | + "selectedIconPath": "pages/image/tabicon3.active.png" | ||
| 33 | + }, | ||
| 34 | + { | ||
| 35 | + "pagePath": "pages/me/index", | ||
| 36 | + "text": "我的", | ||
| 37 | + "iconPath": "pages/image/tabicon4.png", | ||
| 38 | + "selectedIconPath": "pages/image/tabicon4.active.png" | ||
| 39 | + } | ||
| 40 | + ] | ||
| 41 | + }, | ||
| 42 | + lifetimes: { | ||
| 43 | + ready(){ | ||
| 44 | + console.log('custom-tab-bar.ready') | ||
| 45 | + }, | ||
| 46 | + attached: function() { | ||
| 47 | + // 在组件实例进入页面节点树时执行 | ||
| 48 | + console.log('custom-tab-bar.attached') | ||
| 49 | + }, | ||
| 50 | + detached: function() { | ||
| 51 | + // 在组件实例被从页面节点树移除时执行 | ||
| 52 | + console.log('custom-tab-bar.detached') | ||
| 53 | + }, | ||
| 54 | + moved:function() { | ||
| 55 | + console.log('custom-tab-bar.moved') | ||
| 56 | + }, | ||
| 57 | + }, | ||
| 58 | + | ||
| 59 | + /** | ||
| 60 | + * 组件的方法列表 | ||
| 61 | + */ | ||
| 62 | + methods: { | ||
| 63 | + redirectTo(e){ | ||
| 64 | + let url = util.attr(e, 'url'); | ||
| 65 | + let pages = getCurrentPages(); | ||
| 66 | + let p = pages[pages.length - 1]; | ||
| 67 | + if (url.indexOf(p.route) < 0) { | ||
| 68 | + wx.switchTab({ | ||
| 69 | + url: '/'+url, | ||
| 70 | + }) | ||
| 71 | + } | ||
| 72 | + }, | ||
| 73 | + } | ||
| 74 | +}) |
custom-tab-bar/index.json
0 → 100644
custom-tab-bar/index.wxml
0 → 100644
| 1 | +<!--components/book/tabBar/tabBar.wxml--> | ||
| 2 | +<view class="tabBar flex-cc" > | ||
| 3 | + <block wx:for="{{list}}" wx:key="list"> | ||
| 4 | + <view class="item flex-vc" bindtap="redirectTo" data-url="{{item.pagePath}}"> | ||
| 5 | + <view class="flex-tb {{(selected==index)?'checked':''}}" style="height: 82rpx;"> | ||
| 6 | + <view class="icon tabicon{{index+1}}"></view> | ||
| 7 | + <view class="text">{{item.text}}</view> | ||
| 8 | + </view> | ||
| 9 | + </view> | ||
| 10 | + </block> | ||
| 11 | +</view> |
custom-tab-bar/index.wxss
0 → 100644
| 1 | +/* components/book/tabBar/tabBar.wxss */ | ||
| 2 | +@import "../app.wxss"; | ||
| 3 | +.tabBar{ | ||
| 4 | + height: 98rpx; | ||
| 5 | + background:rgba(249,249,249,1); | ||
| 6 | + box-shadow:0rpx 0rpx 8rpx 0rpx rgba(224,224,224,1); | ||
| 7 | + width:100%; | ||
| 8 | + position: fixed; | ||
| 9 | + bottom: 0; | ||
| 10 | + z-index: 9; | ||
| 11 | + | ||
| 12 | + box-sizing: border-box; | ||
| 13 | + padding: 8rpx 0; | ||
| 14 | +} | ||
| 15 | +.tabBar .text{ | ||
| 16 | + height:32rpx; | ||
| 17 | + font-size:22rpx; | ||
| 18 | + font-family:PingFangSC-Medium,PingFang SC; | ||
| 19 | + font-weight:500; | ||
| 20 | + color:rgba(102,102,102,1); | ||
| 21 | + line-height:32rpx; | ||
| 22 | +} | ||
| 23 | +.tabBar .checked .text{ | ||
| 24 | + color: #C28C56; | ||
| 25 | +} | ||
| 26 | +.tabBar .item{ | ||
| 27 | + width: 33%; | ||
| 28 | + min-width: 20%; | ||
| 29 | +} | ||
| 30 | +.dot{ | ||
| 31 | + position: absolute; | ||
| 32 | + width: 16rpx; | ||
| 33 | + height: 16rpx; | ||
| 34 | + background-color: #F05522; | ||
| 35 | + border-radius: 50%; | ||
| 36 | + right:-14rpx; | ||
| 37 | + top:-8rpx; | ||
| 38 | +} | ||
| 39 | +.tabBar .icon{ | ||
| 40 | + width: 48rpx; | ||
| 41 | + height: 48rpx; | ||
| 42 | + background-size: 100%; | ||
| 43 | + position: relative; | ||
| 44 | +} | ||
| 45 | +.tabBar .icon image{ | ||
| 46 | + width: 100%; | ||
| 47 | + height: 100%; | ||
| 48 | +} | ||
| 49 | + | ||
| 50 | +.tabBar .tabicon1{ | ||
| 51 | + width: 46rpx; | ||
| 52 | + height: 46rpx; | ||
| 53 | + background-image: url("http://nosqn.colorcun.com/mapmenu/tabicon1.png"); | ||
| 54 | +} | ||
| 55 | +.tabBar .checked .tabicon1{ | ||
| 56 | + background-image: url("http://nosqn.colorcun.com/mapmenu/tabicon1.active.png"); | ||
| 57 | +} | ||
| 58 | + | ||
| 59 | +.tabBar .tabicon2{ | ||
| 60 | + width:40rpx; | ||
| 61 | + height:38rpx; | ||
| 62 | + background-image: url("http://nosqn.colorcun.com/mapmenu/tabicon2.png"); | ||
| 63 | +} | ||
| 64 | +.tabBar .checked .tabicon2{ | ||
| 65 | + background-image: url("http://nosqn.colorcun.com/mapmenu/tabicon2.active.png"); | ||
| 66 | +} | ||
| 67 | + | ||
| 68 | +.tabBar .tabicon3{ | ||
| 69 | + width:44rpx; | ||
| 70 | + height:40rpx; | ||
| 71 | + background-image: url("http://nosqn.colorcun.com/mapmenu/tabicon3.png"); | ||
| 72 | +} | ||
| 73 | +.tabBar .checked .tabicon3{ | ||
| 74 | + background-image: url("http://nosqn.colorcun.com/mapmenu/tabicon3.active.png"); | ||
| 75 | +} | ||
| 76 | + | ||
| 77 | +.tabBar .tabicon4{ | ||
| 78 | + width:40rpx; | ||
| 79 | + height:40rpx; | ||
| 80 | + background-image: url("http://nosqn.colorcun.com/mapmenu/tabicon4.png"); | ||
| 81 | +} | ||
| 82 | +.tabBar .checked .tabicon4{ | ||
| 83 | + background-image: url("http://nosqn.colorcun.com/mapmenu/tabicon4.active.png"); | ||
| 84 | +} | ||
| 85 | + | ||
| 86 | + |
| @@ -38,6 +38,12 @@ Page({ | @@ -38,6 +38,12 @@ Page({ | ||
| 38 | * 生命周期函数--监听页面显示 | 38 | * 生命周期函数--监听页面显示 |
| 39 | */ | 39 | */ |
| 40 | onShow: function () { | 40 | onShow: function () { |
| 41 | + if (typeof this.getTabBar === 'function' && | ||
| 42 | + this.getTabBar()) { | ||
| 43 | + this.getTabBar().setData({ | ||
| 44 | + selected: 2 | ||
| 45 | + }) | ||
| 46 | + } | ||
| 41 | if(this.options.hasRelaTip){ | 47 | if(this.options.hasRelaTip){ |
| 42 | this.selectComponent("#showModal").show({ | 48 | this.selectComponent("#showModal").show({ |
| 43 | 49 |
pages/image/follow.active.png
deleted
100644 → 0
2.82 KB
pages/image/follow.png
deleted
100644 → 0
2.49 KB
pages/image/tabicon1.active.png
deleted
100644 → 0
4.77 KB
pages/image/tabicon1.png
deleted
100644 → 0
4.11 KB
pages/image/tabicon2.active.png
deleted
100644 → 0
3.1 KB
pages/image/tabicon2.png
deleted
100644 → 0
2.74 KB
pages/image/tabicon3.active.png
deleted
100644 → 0
3.43 KB
pages/image/tabicon3.png
deleted
100644 → 0
3.03 KB
pages/image/tabicon4.active.png
deleted
100644 → 0
2.94 KB
pages/image/tabicon4.png
deleted
100644 → 0
2.55 KB
| @@ -59,6 +59,12 @@ Page({ | @@ -59,6 +59,12 @@ Page({ | ||
| 59 | */ | 59 | */ |
| 60 | hasOnShow:true, | 60 | hasOnShow:true, |
| 61 | onShow: function () { | 61 | onShow: function () { |
| 62 | + if (typeof this.getTabBar === 'function' && | ||
| 63 | + this.getTabBar()) { | ||
| 64 | + this.getTabBar().setData({ | ||
| 65 | + selected: 1 | ||
| 66 | + }) | ||
| 67 | + } | ||
| 62 | if(this.data.sellers.length==0){ | 68 | if(this.data.sellers.length==0){ |
| 63 | wx.showLoading({ | 69 | wx.showLoading({ |
| 64 | title: '加载中', | 70 | title: '加载中', |
| @@ -48,6 +48,12 @@ Page({ | @@ -48,6 +48,12 @@ Page({ | ||
| 48 | * 生命周期函数--监听页面显示 | 48 | * 生命周期函数--监听页面显示 |
| 49 | */ | 49 | */ |
| 50 | onShow: function () { | 50 | onShow: function () { |
| 51 | + if (typeof this.getTabBar === 'function' && | ||
| 52 | + this.getTabBar()) { | ||
| 53 | + this.getTabBar().setData({ | ||
| 54 | + selected:3 | ||
| 55 | + }) | ||
| 56 | + } | ||
| 51 | App.User.GetBalance().then(res=>{ | 57 | App.User.GetBalance().then(res=>{ |
| 52 | this.setData({ | 58 | this.setData({ |
| 53 | user:res.data | 59 | user:res.data |
| @@ -148,6 +148,12 @@ Page({ | @@ -148,6 +148,12 @@ Page({ | ||
| 148 | * 生命周期函数--监听页面显示 | 148 | * 生命周期函数--监听页面显示 |
| 149 | */ | 149 | */ |
| 150 | onShow: async function (e) { | 150 | onShow: async function (e) { |
| 151 | + if (typeof this.getTabBar === 'function' && | ||
| 152 | + this.getTabBar()) { | ||
| 153 | + this.getTabBar().setData({ | ||
| 154 | + selected: 0 | ||
| 155 | + }) | ||
| 156 | + } | ||
| 151 | console.log({ | 157 | console.log({ |
| 152 | 'this.hasGetLocation':this.hasGetLocation, | 158 | 'this.hasGetLocation':this.hasGetLocation, |
| 153 | 'this.hasOnLoad':this.hasOnLoad, | 159 | 'this.hasOnLoad':this.hasOnLoad, |
| @@ -77,7 +77,7 @@ | @@ -77,7 +77,7 @@ | ||
| 77 | <sb-tr seller="{{item.seller}}" | 77 | <sb-tr seller="{{item.seller}}" |
| 78 | hasActivityTags="{{false}}" | 78 | hasActivityTags="{{false}}" |
| 79 | hasActivityShort="{{true}}" | 79 | hasActivityShort="{{true}}" |
| 80 | - hasBrand="true" hasActivityTese="true" | 80 | + hasBrand="true" hasActivityRed="true" |
| 81 | hasSuggestion="{{hasSuggestion}}" | 81 | hasSuggestion="{{hasSuggestion}}" |
| 82 | hasSlogan="{{false}}"></sb-tr> | 82 | hasSlogan="{{false}}"></sb-tr> |
| 83 | </view> | 83 | </view> |
| 1 | /* pages/reservr/index.wxss */ | 1 | /* pages/reservr/index.wxss */ |
| 2 | + | ||
| 2 | page{ | 3 | page{ |
| 3 | background-color: #efefef; | 4 | background-color: #efefef; |
| 5 | + --barHeight:98rpx; | ||
| 4 | } | 6 | } |
| 5 | .pages{ | 7 | .pages{ |
| 6 | width: 100%; | 8 | width: 100%; |
| @@ -19,7 +21,7 @@ page{ | @@ -19,7 +21,7 @@ page{ | ||
| 19 | } | 21 | } |
| 20 | .moveToLocation{ | 22 | .moveToLocation{ |
| 21 | position: fixed; | 23 | position: fixed; |
| 22 | - bottom: 520rpx; | 24 | + bottom: calc(520rpx + var(--barHeight)); |
| 23 | right: 20rpx; | 25 | right: 20rpx; |
| 24 | width: 62rpx; | 26 | width: 62rpx; |
| 25 | height: 62rpx; | 27 | height: 62rpx; |
| @@ -292,7 +294,7 @@ page{ | @@ -292,7 +294,7 @@ page{ | ||
| 292 | .seller-view{ | 294 | .seller-view{ |
| 293 | height: 470rpx; | 295 | height: 470rpx; |
| 294 | position:fixed; | 296 | position:fixed; |
| 295 | - bottom: 0; | 297 | + bottom: calc(0rpx + var(--barHeight)); |
| 296 | width: 100%; | 298 | width: 100%; |
| 297 | background-color: #fefefe; | 299 | background-color: #fefefe; |
| 298 | border-radius: 20rpx 20rpx 0 0; | 300 | border-radius: 20rpx 20rpx 0 0; |
| @@ -338,7 +340,7 @@ page{ | @@ -338,7 +340,7 @@ page{ | ||
| 338 | background-color: #000; | 340 | background-color: #000; |
| 339 | width: calc(100% - 272rpx); | 341 | width: calc(100% - 272rpx); |
| 340 | position: fixed; | 342 | position: fixed; |
| 341 | - bottom:490rpx; | 343 | + bottom:calc(490rpx + var(--barHeight)); |
| 342 | color: #fefefe; | 344 | color: #fefefe; |
| 343 | height:60rpx; | 345 | height:60rpx; |
| 344 | font-size:26rpx; | 346 | font-size:26rpx; |
| @@ -352,7 +354,7 @@ page{ | @@ -352,7 +354,7 @@ page{ | ||
| 352 | background-color: #000; | 354 | background-color: #000; |
| 353 | width: calc(100% - 72rpx); | 355 | width: calc(100% - 72rpx); |
| 354 | position: fixed; | 356 | position: fixed; |
| 355 | - bottom:430rpx; | 357 | + bottom:calc(430rpx + var(--barHeight)); |
| 356 | color: #fefefe; | 358 | color: #fefefe; |
| 357 | height:60rpx; | 359 | height:60rpx; |
| 358 | font-size:26rpx; | 360 | font-size:26rpx; |
| @@ -55,7 +55,7 @@ | @@ -55,7 +55,7 @@ | ||
| 55 | <sb-tr seller="{{item}}" | 55 | <sb-tr seller="{{item}}" |
| 56 | hasActivityTags="{{false}}" | 56 | hasActivityTags="{{false}}" |
| 57 | hasActivityShort="{{true}}" | 57 | hasActivityShort="{{true}}" |
| 58 | - hasBrand="true" hasActivityTese="true" | 58 | + hasBrand="true" hasActivityRed="true" |
| 59 | hasSlogan="{{false}}" | 59 | hasSlogan="{{false}}" |
| 60 | hasSuggestion="{{hasSuggestion}}" | 60 | hasSuggestion="{{hasSuggestion}}" |
| 61 | sellerStyle="noborder noshadow noradius"></sb-tr> | 61 | sellerStyle="noborder noshadow noradius"></sb-tr> |
-
Please register or login to post a comment