From 2aab583a99f72e380e150af9eec7d8c49a7ee17b Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 02 Jul 2021 10:48:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
static/images/home/handle001.png | 0
pages/home/home.vue | 8 +++-
static/images/home/handle.png | 0
static/images/home/report002.png | 0
static/images/home/partrol.png | 0
api/mock/home.js | 8 ++--
pages/business/business.vue | 6 ++
App.vue | 2
pages/myself/myself.vue | 6 ++
static/images/home/search004.png | 0
store/state.js | 30 ++++++++++++++
static/images/home/report.png | 0
static/images/home/more.png | 0
static/images/home/report001.png | 0
pages/article/article.vue | 6 ++
static/images/home/say.png | 0
static/images/home/search02.png | 0
static/images/home/look.png | 0
pages/index/index.vue | 14 ++++++
static/images/home/search003.png | 0
static/images/home/searchs.png | 0
21 files changed, 68 insertions(+), 12 deletions(-)
diff --git a/App.vue b/App.vue
index d7878ee..089d960 100644
--- a/App.vue
+++ b/App.vue
@@ -3,7 +3,7 @@
export default {
data() {
return {
- login: '',
+ login: '',//cc
}
},
methods: {
diff --git a/api/mock/home.js b/api/mock/home.js
index 6af0a4b..a4f49cf 100644
--- a/api/mock/home.js
+++ b/api/mock/home.js
@@ -114,12 +114,12 @@
},
{
name: '我要查',
- img: '/static/images/home/s2.png',
+ img: '/static/images/home/search004.png',
url: ''
},
{
name: '我要报',
- img: '/static/images/home/s3.png',
+ img: '/static/images/home/report001.png',
url: ''
},
{
@@ -129,12 +129,12 @@
},
{
name: '我要巡',
- img: '/static/images/home/s5.png',
+ img: '/static/images/home/s6.png',
url: ''
},
{
name: '我要办',
- img: '/static/images/home/s6.png',
+ img: '/static/images/home/handle001.png',
url: ''
}
];
diff --git a/pages/article/article.vue b/pages/article/article.vue
index 32cd362..a865b2d 100644
--- a/pages/article/article.vue
+++ b/pages/article/article.vue
@@ -37,6 +37,9 @@
</view>
</view>
</view>
+
+ <!-- 底部导航条 -->
+ <u-tabbar :list="tabbar" :mid-button="false"></u-tabbar>
</view>
</template>
@@ -60,7 +63,8 @@
titleNum: 0,
articleTabArr: ['全部', '视频', '社会', '经济', '热点'],
articleTabNum: 0,
- navbarTopHeight: "10px"
+ navbarTopHeight: "10px",
+ tabbar:this.$store.state.tabbar
}
},
mounted() {
diff --git a/pages/business/business.vue b/pages/business/business.vue
index 189c6ae..87a86b2 100644
--- a/pages/business/business.vue
+++ b/pages/business/business.vue
@@ -30,6 +30,9 @@
</navigator>
</view>
</view>
+ <!-- 底部导航条 -->
+ <u-tabbar :list="tabbar" :mid-button="false"></u-tabbar>
+
</view>
</template>
@@ -45,7 +48,8 @@
title: '设备提交',
imgSrc: '../../static/img/cancel.png',
goHref: '../equipment/equipment'
- }]
+ }],
+ tabbar:this.$store.state.tabbar
}
}
}
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 8a186c4..7032c1e 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -36,7 +36,7 @@
</view>
<!-- 头部 end -->
- <!-- 服务按钮 start -->
+ <!-- 服务按钮 start 业务办理-->
<view class="service-box">
<u-grid :col="4" :border="false">
<u-grid-item bg-color="transparent" v-for="(item, index) in serviceButton" :key="index">
@@ -111,6 +111,9 @@
</view>
<!-- 新闻模块 end -->
</view>
+
+ <!-- 底部导航条 -->
+ <u-tabbar :list="tabbar" :mid-button="false"></u-tabbar>
</view>
</template>
@@ -136,7 +139,8 @@
noticeList: [],
newsList: [{}, {}],
navButton: [],
- serviceButton: []
+ serviceButton: [],
+ tabbar:this.$store.state.tabbar
};
},
onLoad() {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index f985cd7..c3d4f7d 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -5,6 +5,7 @@
<text class="title">{{title}}__{{userName}}1.4</text>
<button type="default" @click="cc"></button>
</view>
+ <u-tabbar v-model="current" :list="list"></u-tabbar>
</view>
</template>
@@ -12,7 +13,18 @@
export default {
data() {
return {
- title: 'Hello'
+ title: 'Hello',
+ current:0,
+ list:[
+ {
+ iconPath: "home",
+ selectedIconPath: "home-fill",
+ text: '首页',
+ count: 2,
+ isDot: true,
+
+ }
+ ]
}
},
onLoad() {
diff --git a/pages/myself/myself.vue b/pages/myself/myself.vue
index 2d13e41..64950b4 100644
--- a/pages/myself/myself.vue
+++ b/pages/myself/myself.vue
@@ -36,6 +36,9 @@
</view>
<uniPopup :textmsg="textmsg" @cancel='operation(1)' @confirm='operation(2)' v-show="showTextmsg">
</uniPopup>
+
+ <!-- 底部导航条 -->
+ <u-tabbar :list="tabbar" :mid-button="false"></u-tabbar>
</view>
</template>
@@ -90,7 +93,8 @@
open: 'outIn',
},
- ]
+ ],
+ tabbar:this.$store.state.tabbar
}
},
components: {
diff --git a/static/images/home/handle.png b/static/images/home/handle.png
new file mode 100644
index 0000000..80ce56a
--- /dev/null
+++ b/static/images/home/handle.png
Binary files differ
diff --git a/static/images/home/handle001.png b/static/images/home/handle001.png
new file mode 100644
index 0000000..5170b50
--- /dev/null
+++ b/static/images/home/handle001.png
Binary files differ
diff --git a/static/images/home/look.png b/static/images/home/look.png
new file mode 100644
index 0000000..610c8a6
--- /dev/null
+++ b/static/images/home/look.png
Binary files differ
diff --git a/static/images/home/more.png b/static/images/home/more.png
new file mode 100644
index 0000000..0a9a229
--- /dev/null
+++ b/static/images/home/more.png
Binary files differ
diff --git a/static/images/home/partrol.png b/static/images/home/partrol.png
new file mode 100644
index 0000000..cdffdca
--- /dev/null
+++ b/static/images/home/partrol.png
Binary files differ
diff --git a/static/images/home/report.png b/static/images/home/report.png
new file mode 100644
index 0000000..1c3637b
--- /dev/null
+++ b/static/images/home/report.png
Binary files differ
diff --git a/static/images/home/report001.png b/static/images/home/report001.png
new file mode 100644
index 0000000..6378116
--- /dev/null
+++ b/static/images/home/report001.png
Binary files differ
diff --git a/static/images/home/report002.png b/static/images/home/report002.png
new file mode 100644
index 0000000..909f76e
--- /dev/null
+++ b/static/images/home/report002.png
Binary files differ
diff --git a/static/images/home/say.png b/static/images/home/say.png
new file mode 100644
index 0000000..84672b6
--- /dev/null
+++ b/static/images/home/say.png
Binary files differ
diff --git a/static/images/home/search003.png b/static/images/home/search003.png
new file mode 100644
index 0000000..1a7e884
--- /dev/null
+++ b/static/images/home/search003.png
Binary files differ
diff --git a/static/images/home/search004.png b/static/images/home/search004.png
new file mode 100644
index 0000000..97e25bd
--- /dev/null
+++ b/static/images/home/search004.png
Binary files differ
diff --git a/static/images/home/search02.png b/static/images/home/search02.png
new file mode 100644
index 0000000..cf47d06
--- /dev/null
+++ b/static/images/home/search02.png
Binary files differ
diff --git a/static/images/home/searchs.png b/static/images/home/searchs.png
new file mode 100644
index 0000000..a2823a6
--- /dev/null
+++ b/static/images/home/searchs.png
Binary files differ
diff --git a/store/state.js b/store/state.js
index 93b8c35..83c37e6 100644
--- a/store/state.js
+++ b/store/state.js
@@ -10,7 +10,35 @@
puserID: '',
puserIphone:'',
avatar:"../../static/logo.png",
- UserData: {}
+ UserData: {},
+ tabbar:[{
+ iconPath: "/static/tabbar/index01.png",
+ selectedIconPath: "/static/tabbar/index02.png",
+ text: '首页',
+
+ pagePath: "/pages/home/home"
+ },
+ {
+ iconPath: "/static/tabbar/article.png",
+ selectedIconPath: "/static/tabbar/articleH.png",
+ text: '资讯',
+ pagePath: "/pages/article/article"
+ },
+ {
+ iconPath: "/static/tabbar/workbench.png",
+ selectedIconPath: "/static/tabbar/workbenchH.png",
+ text: '工作台',
+ count: 2,
+ isDot: false,
+ pagePath: "/pages/business/business"
+ },
+ {
+ iconPath: "/static/tabbar/my.png",
+ selectedIconPath: "/static/tabbar/my-blue.png",
+ text: '我的',
+ pagePath: "/pages/myself/myself"
+ },
+ ]
}
export default state
--
Gitblit v1.9.3