Showing
2 changed files
with
44 additions
and
24 deletions
| 1 | <!-- | 1 | <!-- |
| 2 | * @Date: 2022-09-21 11:59:20 | 2 | * @Date: 2022-09-21 11:59:20 |
| 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com | 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com |
| 4 | - * @LastEditTime: 2023-12-14 18:15:06 | 4 | + * @LastEditTime: 2023-12-19 10:43:00 |
| 5 | * @FilePath: /meihuaApp/src/components/navBar.vue | 5 | * @FilePath: /meihuaApp/src/components/navBar.vue |
| 6 | * @Description: 底部导航栏 | 6 | * @Description: 底部导航栏 |
| 7 | --> | 7 | --> |
| 8 | <template> | 8 | <template> |
| 9 | <view id="navbar-page" class="navbar-page"> | 9 | <view id="navbar-page" class="navbar-page"> |
| 10 | <view @tap="goTo('index')" class="home"> | 10 | <view @tap="goTo('index')" class="home"> |
| 11 | - <view style="height: 2rem;"> | 11 | + <view style="height: 1.5rem;"> |
| 12 | - <IconFont :name="icon_home" size="2rem" color="" /> | 12 | + <IconFont :name="icon_home" size="1.5rem" color="" /> |
| 13 | </view> | 13 | </view> |
| 14 | <view><text :style="homeStyle">首页</text></view> | 14 | <view><text :style="homeStyle">首页</text></view> |
| 15 | </view> | 15 | </view> |
| 16 | <view @tap="goTo('book')" class="book"> | 16 | <view @tap="goTo('book')" class="book"> |
| 17 | - <view style="height: 2rem;"> | 17 | + <view style="height: 1.5rem;"> |
| 18 | - <IconFont :name="icon_add" size="2rem" color="" /> | 18 | + <IconFont :name="icon_book" size="1.5rem" color="" /> |
| 19 | </view> | 19 | </view> |
| 20 | <view><text :style="bookStyle">订房</text></view> | 20 | <view><text :style="bookStyle">订房</text></view> |
| 21 | </view> | 21 | </view> |
| 22 | <view @tap="goTo('my')" class="my"> | 22 | <view @tap="goTo('my')" class="my"> |
| 23 | - <view style="height: 2rem;"> | 23 | + <view style="height: 1.5rem;"> |
| 24 | - <IconFont :name="icon_my" size="2rem" color="" /> | 24 | + <IconFont :name="icon_my" size="1.5rem" color="" /> |
| 25 | </view> | 25 | </view> |
| 26 | <view><text :style="myStyle">我的</text></view> | 26 | <view><text :style="myStyle">我的</text></view> |
| 27 | </view> | 27 | </view> |
| ... | @@ -31,11 +31,12 @@ | ... | @@ -31,11 +31,12 @@ |
| 31 | <script setup> | 31 | <script setup> |
| 32 | import Taro from '@tarojs/taro' | 32 | import Taro from '@tarojs/taro' |
| 33 | import { ref, defineProps, computed, onMounted } from 'vue' | 33 | import { ref, defineProps, computed, onMounted } from 'vue' |
| 34 | -import icon_home1 from '@/images/icon/home01@2x.png' | 34 | +import icon_home1 from '@/images/icon/icon_home1@2x.png' |
| 35 | -import icon_home2 from '@/images/icon/home02@2x.png' | 35 | +import icon_home2 from '@/images/icon/icon_home2@2x.png' |
| 36 | -import icon_my1 from '@/images/icon/my01@2x.png' | 36 | +import icon_my1 from '@/images/icon/icon_my1@2x.png' |
| 37 | -import icon_my2 from '@/images/icon/my02@2x.png' | 37 | +import icon_my2 from '@/images/icon/icon_my2@2x.png' |
| 38 | -import icon_add from '@/images/icon/new@2x.png' | 38 | +import icon_book1 from '@/images/icon/icon_book1@2x.png' |
| 39 | +import icon_book2 from '@/images/icon/icon_book2@2x.png' | ||
| 39 | import { hostListAPI } from '@/api/Host/index' | 40 | import { hostListAPI } from '@/api/Host/index' |
| 40 | import { IconFont } from '@nutui/icons-vue-taro'; | 41 | import { IconFont } from '@nutui/icons-vue-taro'; |
| 41 | 42 | ||
| ... | @@ -101,16 +102,23 @@ const icon_home = computed(() => { | ... | @@ -101,16 +102,23 @@ const icon_home = computed(() => { |
| 101 | } | 102 | } |
| 102 | }) | 103 | }) |
| 103 | const icon_my = computed(() => { | 104 | const icon_my = computed(() => { |
| 104 | - if (props.activated === 'index') { | 105 | + if (props.activated === 'my') { |
| 106 | + return icon_my1 | ||
| 107 | + } else { | ||
| 105 | return icon_my2 | 108 | return icon_my2 |
| 109 | + } | ||
| 110 | +}) | ||
| 111 | +const icon_book = computed(() => { | ||
| 112 | + if (props.activated === 'book') { | ||
| 113 | + return icon_book1 | ||
| 106 | } else { | 114 | } else { |
| 107 | - return icon_my1 | 115 | + return icon_book2 |
| 108 | } | 116 | } |
| 109 | }) | 117 | }) |
| 110 | 118 | ||
| 111 | if (props.activated === 'index') { | 119 | if (props.activated === 'index') { |
| 112 | homeStyle.value = { | 120 | homeStyle.value = { |
| 113 | - color: '#2A5F45', | 121 | + color: '#6A4925', |
| 114 | fontSize: '0.9rem' | 122 | fontSize: '0.9rem' |
| 115 | } | 123 | } |
| 116 | myStyle.value = { | 124 | myStyle.value = { |
| ... | @@ -121,17 +129,30 @@ if (props.activated === 'index') { | ... | @@ -121,17 +129,30 @@ if (props.activated === 'index') { |
| 121 | color: '#999999', | 129 | color: '#999999', |
| 122 | fontSize: '0.9rem' | 130 | fontSize: '0.9rem' |
| 123 | } | 131 | } |
| 132 | +} else if (props.activated === 'my') { | ||
| 133 | + homeStyle.value = { | ||
| 134 | + color: '#999999', | ||
| 135 | + fontSize: '0.9rem' | ||
| 136 | + } | ||
| 137 | + myStyle.value = { | ||
| 138 | + color: '#6A4925', | ||
| 139 | + fontSize: '0.9rem' | ||
| 140 | + } | ||
| 141 | + bookStyle.value = { | ||
| 142 | + color: '#999999', | ||
| 143 | + fontSize: '0.9rem' | ||
| 144 | + } | ||
| 124 | } else { | 145 | } else { |
| 125 | homeStyle.value = { | 146 | homeStyle.value = { |
| 126 | color: '#999999', | 147 | color: '#999999', |
| 127 | fontSize: '0.9rem' | 148 | fontSize: '0.9rem' |
| 128 | } | 149 | } |
| 129 | myStyle.value = { | 150 | myStyle.value = { |
| 130 | - color: '#2A5F45', | 151 | + color: '#999999', |
| 131 | fontSize: '0.9rem' | 152 | fontSize: '0.9rem' |
| 132 | } | 153 | } |
| 133 | bookStyle.value = { | 154 | bookStyle.value = { |
| 134 | - color: '#2A5F45', | 155 | + color: '#6A4925', |
| 135 | fontSize: '0.9rem' | 156 | fontSize: '0.9rem' |
| 136 | } | 157 | } |
| 137 | } | 158 | } | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Date: 2023-12-13 11:13:13 | 2 | * @Date: 2023-12-13 11:13:13 |
| 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com | 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com |
| 4 | - * @LastEditTime: 2023-12-19 10:12:17 | 4 | + * @LastEditTime: 2023-12-19 10:46:04 |
| 5 | * @FilePath: /meihuaApp/src/pages/my/index.vue | 5 | * @FilePath: /meihuaApp/src/pages/my/index.vue |
| 6 | * @Description: 文件描述 | 6 | * @Description: 文件描述 |
| 7 | --> | 7 | --> |
| ... | @@ -19,12 +19,12 @@ | ... | @@ -19,12 +19,12 @@ |
| 19 | </view> | 19 | </view> |
| 20 | <view style="position: absolute; left: 0%; right: 0%; bottom: 0%; height: 20rpx; width: 100%; background-color: #FFF; border-top-left-radius: 20rpx;border-top-right-radius: 20rpx;"></view> | 20 | <view style="position: absolute; left: 0%; right: 0%; bottom: 0%; height: 20rpx; width: 100%; background-color: #FFF; border-top-left-radius: 20rpx;border-top-right-radius: 20rpx;"></view> |
| 21 | </view> | 21 | </view> |
| 22 | - <view v-if="showContent"> | 22 | + <view> |
| 23 | <view id="title" style="padding-left: 1.5rem; font-size: 35rpx; font-weight: bold;">我的订单</view> | 23 | <view id="title" style="padding-left: 1.5rem; font-size: 35rpx; font-weight: bold;">我的订单</view> |
| 24 | <view> | 24 | <view> |
| 25 | <nut-tabs v-model="value" title-scroll title-gutter="0" name="tabName" background="#FFF" color="#6A4925" animated-time="0"> | 25 | <nut-tabs v-model="value" title-scroll title-gutter="0" name="tabName" background="#FFF" color="#6A4925" animated-time="0"> |
| 26 | <nut-tab-pane v-for="item in tabList" :title="item.title" :pane-key="item.key"> | 26 | <nut-tab-pane v-for="item in tabList" :title="item.title" :pane-key="item.key"> |
| 27 | - <view class="book-list"> | 27 | + <view v-if="showContent" class="book-list"> |
| 28 | <scroll-view :style="scrollStyle" :scroll-y="true" :scroll-with-animation="true" @scrolltolower="onScrollToLower"> | 28 | <scroll-view :style="scrollStyle" :scroll-y="true" :scroll-with-animation="true" @scrolltolower="onScrollToLower"> |
| 29 | <view v-for="(item, index) in 10" :key="index"> | 29 | <view v-for="(item, index) in 10" :key="index"> |
| 30 | <order-card :key="index" @onPay="onPay"></order-card> | 30 | <order-card :key="index" @onPay="onPay"></order-card> |
| ... | @@ -106,10 +106,9 @@ export default { | ... | @@ -106,10 +106,9 @@ export default { |
| 106 | // 设置首页封面高度 | 106 | // 设置首页封面高度 |
| 107 | const windowHeight = wx.getSystemInfoSync().windowHeight; | 107 | const windowHeight = wx.getSystemInfoSync().windowHeight; |
| 108 | // 处理切换显示白屏问题 | 108 | // 处理切换显示白屏问题 |
| 109 | - // setTimeout(() => { | 109 | + setTimeout(() => { |
| 110 | - // this.showContent = true; | 110 | + this.showContent = true; |
| 111 | - // }, 1); | 111 | + }, 100); |
| 112 | - this.showContent = true; | ||
| 113 | setTimeout(async () => { | 112 | setTimeout(async () => { |
| 114 | const navHeight = await $('#navbar-page').height(); | 113 | const navHeight = await $('#navbar-page').height(); |
| 115 | const avatorHeight = await $('#avator').height(); | 114 | const avatorHeight = await $('#avator').height(); | ... | ... |
-
Please register or login to post a comment