From e811bbe22ee3b1f25d0547e663bf934a3f28155e Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Mon, 18 Mar 2024 18:53:54 +0800
Subject: [PATCH] 更新
---
pages/home/index.vue | 15 ++++++++++-----
pages.json | 14 +++++++-------
components/tabBar/tabBar.vue | 16 +++++++++++++++-
3 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/components/tabBar/tabBar.vue b/components/tabBar/tabBar.vue
index 02129d0..9c7932a 100644
--- a/components/tabBar/tabBar.vue
+++ b/components/tabBar/tabBar.vue
@@ -3,6 +3,20 @@
<u-tabbar class="custom-tabbar" zIndex="100" :value="current" :fixed="true" :active-color="activeColor"
:inactive-color="inactiveColor" @change='change'>
<u-tabbar-item v-for="(item,index) in curTabList" :icon="item.icon" :key="index" :text="item.name">
+ <image class="tabbar-icon" slot="active-icon" :src="iconPathSelected"></image>
+ <image class="tabbar-icon" slot="inactive-icon" :src="iconPath"></image>
+ </u-tabbar-item>
+ <u-tabbar-item v-for="(item,index) in curTabList" :icon="item.icon" :key="index" :text="item.name">
+ <image class="tabbar-icon" slot="active-icon" :src="iconPathSelected"></image>
+ <image class="tabbar-icon" slot="inactive-icon" :src="iconPath"></image>
+ </u-tabbar-item>
+ <u-tabbar-item text="驾驶舱">
+ <image class="tabbar-icon" slot="active-icon" :src="iconPathSelected"></image>
+ <image class="tabbar-icon" slot="inactive-icon" :src="iconPath"></image>
+ </u-tabbar-item>
+ <u-tabbar-item text="个人中心">
+ <image class="tabbar-icon" slot="active-icon" :src="iconPathSelected"></image>
+ <image class="tabbar-icon" slot="inactive-icon" :src="iconPath"></image>
</u-tabbar-item>
</u-tabbar>
</view>
@@ -90,7 +104,7 @@
</script>
<style lang="scss" scoped>
- .u-page_item_slot_icon {
+ .tabbar-icon {
width: 40rpx;
height: 40rpx;
}
diff --git a/pages.json b/pages.json
index de67526..d58ab73 100644
--- a/pages.json
+++ b/pages.json
@@ -931,7 +931,7 @@
"backgroundColor": "#4586FE"
},
"tabBar": {
- "custom": true,
+ // "custom": true,
"color": "#AFB8C3",
"selectedColor": "#5086FA",
"borderStyle": "white",
@@ -942,12 +942,12 @@
"iconPath": "static/img/tabbar-01.png",
"text": "首页"
},
- {
- "pagePath": "pages/circle/index",
- "iconPath": "static/img/tabbar-02.png",
- "selectedIconPath": "static/img/tabbar-02-selected.png",
- "text": "圈子"
- },
+ // {
+ // "pagePath": "pages/circle/index",
+ // "iconPath": "static/img/tabbar-02.png",
+ // "selectedIconPath": "static/img/tabbar-02-selected.png",
+ // "text": "圈子"
+ // },
{
"pagePath": "pages/statistics/index",
"iconPath": "static/img/tabbar-02.png",
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 1883a0d..edcae17 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -65,7 +65,8 @@
<view class="block flex a-i-c j-c-s-b mb-20" v-if="roleType == 3">
- <view @click="scan" class="block-item" style="width:47%; background:#5673B7">
+ <view @click="scan" class="block-item"
+ style="width:47%; background:linear-gradient( #00176C 0%, rgba(1,97,203,0.2) 99%)">
<!-- <image class="block-item-bg" src="/static/icon/nav-bg-04.png" mode="aspectFill"
style="width:100%;" /> -->
<view class="block-item-box flex a-i-c j-c-c " style="width:100%;">
@@ -78,7 +79,7 @@
</view>
<view class="block-item" @click="navigatorPage('/subPackage/task/index')"
- style="width:47%;background:#5673B7">
+ style="width:47%;background:linear-gradient( #00176C 0%, rgba(1,97,203,0.2) 99%)">
<!-- <image class="block-item-bg" src="/static/icon/nav-bg-04.png" mode="aspectFill"
style="width:100%;" /> -->
<view class="block-item-box flex a-i-c j-c-c" style="width:100%;">
@@ -262,7 +263,7 @@
@close="selectBoxShow = false" :show="selectBoxShow" keyName="name" ref="uPicker" :columns="siteColumns"
@confirm="confirmSite" @change="changeSite" @cancel="selectBoxShow = false"></u-picker>
</view>
-
+ <!-- <tabBar :current="0" /> -->
</view>
</template>
@@ -293,12 +294,13 @@
getCountTypeNumber
} from "@/api/task/task.js"
-
+ import tabBar from "@/components/tabBar/tabBar.vue"
export default {
components: {
noticeList,
- captionRow
+ captionRow,
+ tabBar
},
data() {
return {
@@ -559,6 +561,9 @@
handler(newVal, oldVal) {
if (newVal) {
this.$store.commit("setSiteInfo", this.curSelectSite)
+ if (this.roleType == 3) {
+ this.getTaskCount()
+ }
}
},
deep: true,
--
Gitblit v1.9.3