From 4aceb9e1367144e9d05c74c8e1a3048d1695ff5e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 30 Jun 2021 18:19:53 +0800
Subject: [PATCH] 1.首页更换 2.群防任务页面顶部导航条修改
---
pages.json | 2 +-
pages/alarm_list/alarm_list.vue | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
pages/article/article.vue | 2 +-
pages/loging/loging.vue | 2 +-
4 files changed, 54 insertions(+), 6 deletions(-)
diff --git a/pages.json b/pages.json
index 8c526ed..3863890 100644
--- a/pages.json
+++ b/pages.json
@@ -286,7 +286,7 @@
"selectedColor": "#0faeff",
"backgroundColor": "#ffffff",
"list": [{
- "pagePath": "pages/alarm_list/alarm_list",
+ "pagePath": "pages/index/index",
"text": "首页",
"iconPath": "static/tabbar/index01.png",
"selectedIconPath": "static/tabbar/index02.png"
diff --git a/pages/alarm_list/alarm_list.vue b/pages/alarm_list/alarm_list.vue
index eb1d697..5afca7c 100644
--- a/pages/alarm_list/alarm_list.vue
+++ b/pages/alarm_list/alarm_list.vue
@@ -1,8 +1,13 @@
<template>
<view class="alarm-list">
<!-- 自定义顶部导航栏 -->
- <navBarTop :title="'我要查'"></navBarTop>
-
+ <!-- <navBarTop :title="'我要查'"></navBarTop> -->
+ <uni-nav-bar class="uni-nav-bar-info" :fixed="true" :status-bar="true" >
+ <view class="title" slot="default">群防任务</view>
+ <view slot="left" class="uni-nav-bar-left" @click="goBack()">
+ <image src="../../static/images/nav/back02.png"></image>
+ </view>
+ </uni-nav-bar>
<view class="navigation-bar">
<view class="alarm-bar-total" :style="{color:totalColor,borderBottom:totalBoder}" @click="getAlarmListInfo(1)">全部({{totalNumber}})</view>
<view class="alarm-bar-noload" :style="{color:noloadColor,borderBottom:noloadBoder}" @click="getAlarmListInfo(2)">未处理({{untreatedNumber}})</view>
@@ -85,6 +90,11 @@
this.getAlarmListInfo(1);
},
methods:{
+ //返回上一页
+ goBack(){
+ uni.navigateBack({
+ })
+ },
// 获取滚动窗口高度
getSysteminfo() {
@@ -93,7 +103,7 @@
//顶部状态栏高度
this.systemBarHeight = res.statusBarHeight;
//res.screenHeight为屏幕高度，顶部导航栏和底部导航栏 默认高度为 50 px ,43为tab标签高度
- this.scrollHeight = res.screenHeight - this.systemBarHeight-100-43;
+ this.scrollHeight = res.screenHeight - this.systemBarHeight-50-43;
//得到数据内容滚动窗口高度
this.scrollHeight = this.scrollHeight + "px";
}
@@ -283,6 +293,44 @@
display: flex;
}
+ .uni-nav-bar-info {
+ // font-weight: 550;
+
+ .title{
+ position: fixed;
+ right: 42%;
+ font-weight: 550;
+ letter-spacing: 1px;
+ }
+
+ .uni-nav-bar-left{
+ display: flex;
+ justify-items: center;
+
+ image{
+ // background-color: #00BFFF;
+ margin-left: 1rem;
+ width: 1.6rem;
+ height: 1.6rem;
+ border-radius: 100px;
+ }
+ }
+
+ .right{
+ display: flex;
+
+ .title-right{
+ position: relative;
+ font-size: 0.7rem;
+ color: #808080;
+ right: 0.5rem;
+ top: 0.2rem;
+ }
+ }
+
+
+ }
+
.alarm-list{
width: 100%;
flex-direction: column;
diff --git a/pages/article/article.vue b/pages/article/article.vue
index 4c96254..32cd362 100644
--- a/pages/article/article.vue
+++ b/pages/article/article.vue
@@ -58,7 +58,7 @@
data: [],
titleList: ['推荐', '要闻', '新思想'],
titleNum: 0,
- articleTabArr: ['全部', '视频', '社会', '经济', '关注'],
+ articleTabArr: ['全部', '视频', '社会', '经济', '热点'],
articleTabNum: 0,
navbarTopHeight: "10px"
}
diff --git a/pages/loging/loging.vue b/pages/loging/loging.vue
index e535600..97f0060 100644
--- a/pages/loging/loging.vue
+++ b/pages/loging/loging.vue
@@ -105,7 +105,7 @@
this.passwords = '******';
uni.hideNavigationBarLoading();
uni.reLaunch({
- url: '../alarm_list/alarm_list'
+ url: '../index/index'
})
return '成功登录'
} else {
--
Gitblit v1.9.3