From 27a6b50f5090ef558af14fc642d71a722382ac13 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 06 Sep 2021 14:31:27 +0800
Subject: [PATCH] 大部分的样式修改
---
pages/home/home.vue | 6 +-
static/myself/us003.png | 0
.hbuilderx/launch.json | 19 +++++++--
pages/groupChat/groupChat.vue | 2
static/myself/us003 - 副本.png | 0
static/myself/logout002.png | 0
static/myself/clock01.png | 0
static/myself/privacy01 - 副本.png | 0
static/myself/system02 - 副本.png | 0
static/myself/shu.png | 0
static/myself/clock01 - 副本.png | 0
static/myself/system02.png | 0
static/myself/logout002 - 副本.png | 0
pages.json | 58 +++++++++++++++-------------
static/images/index/top-bar/GPUCache/data_2 | 0
pages/myself/myself.vue | 6 +-
static/images/index/top-bar/GPUCache/data_1 | 0
static/images/index/top-bar/GPUCache/index | 0
static/images/index/top-bar/GPUCache/data_0 | 0
static/images/index/top-bar/GPUCache/data_3 | 0
static/myself/shu - 副本.png | 0
pages/article/article.vue | 2
static/myself/clock.png | 0
static/myself/clock - 副本.png | 0
pages/reported/reported.vue | 19 +++------
static/myself/privacy01.png | 0
26 files changed, 59 insertions(+), 53 deletions(-)
diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index c9abd4b..a97fd25 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -2,10 +2,19 @@
// launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
"version": "0.0",
"configurations": [{
- "type": "uniCloud",
- "default": {
- "launchtype": "local"
- }
- }
+ "app-plus" :
+ {
+ "launchtype" : "local"
+ },
+ "default" :
+ {
+ "launchtype" : "local"
+ },
+ "h5" :
+ {
+ "launchtype" : "local"
+ },
+ "type" : "uniCloud"
+ }
]
}
diff --git a/pages.json b/pages.json
index 6d193f5..61f39a3 100644
--- a/pages.json
+++ b/pages.json
@@ -17,7 +17,7 @@
"name": "loging",
"style": {
"navigationBarTitleText": "注册账号",
- "navigationBarBackgroundColor": "#0BB9C8",
+ "navigationBarBackgroundColor": "#103289",
"navigationBarTextStyle": "white"
// "app-plus": {
// "animationType": "fade-in",
@@ -26,19 +26,18 @@
}
},
{
- "path" : "pages/registerUser/idphoto",
- "style" :
- {
+ "path": "pages/registerUser/idphoto",
+ "style": {
"navigationBarTitleText": "人脸识别",
- "navigationStyle":"custom",
- "backgroundColor":"#000000"
- }
-
+ "navigationStyle": "custom",
+ "backgroundColor": "#000000"
+ }
+
},
{
"path": "pages/home/home",
"style": {
-
+
"navigationBarTitleText": "首页",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
@@ -48,7 +47,7 @@
"path": "pages/shengzs/index",
"style": {
"navigationBarTitleText": "能量树",
- "navigationBarBackgroundColor": "#0BB9C8",
+ "navigationBarBackgroundColor": "#103289",
"navigationBarTextStyle": "white"
}
},
@@ -57,8 +56,9 @@
"name": "myself",
"style": {
"navigationBarTitleText": "",
- "navigationBarBackgroundColor": "#0BB9C8",
- "navigationBarTextStyle": "white"
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white",
+ "navigationStyle": "custom"
}
},
{
@@ -66,7 +66,7 @@
"name": "aboutUs",
"style": {
"navigationBarTitleText": "关于我们",
- "navigationBarBackgroundColor": "#0BB9C8",
+ "navigationBarBackgroundColor": "#103289",
"navigationBarTextStyle": "white"
}
},
@@ -75,7 +75,7 @@
"name": "shezhi",
"style": {
"navigationBarTitleText": "系统设置",
- "navigationBarBackgroundColor": "#0BB9C8",
+ "navigationBarBackgroundColor": "#103289",
"navigationBarTextStyle": "white"
}
},
@@ -92,7 +92,7 @@
"name": "genxin",
"style": {
"navigationBarTitleText": "隐私政策",
- "navigationBarBackgroundColor": "#0BB9C8",
+ "navigationBarBackgroundColor": "#103289",
"navigationBarTextStyle": "white"
}
},
@@ -100,7 +100,7 @@
"path": "pages/business/business",
"style": {
"navigationBarTitleText": "工作台",
- "navigationBarBackgroundColor": "#0BB9C8",
+ "navigationBarBackgroundColor": "#103289",
"navigationBarTextStyle": "white"
}
},
@@ -159,8 +159,8 @@
"name": "groupChat",
"style": {
"navigationBarTitleText": "我要说",
- "navigationBarBackgroundColor": "#0BB9C8",
- "navigationBarTextStyle":"white"
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
}
},
{
@@ -228,7 +228,7 @@
"path": "pages/article/article",
"style": {
"navigationBarTitleText": "资讯",
- "navigationBarBackgroundColor": "#0BB9C8",
+ "navigationBarBackgroundColor": "#103289",
"navigationBarTextStyle": "white"
}
},
@@ -236,7 +236,9 @@
"path": "pages/article/article_detail",
"name": "equipment",
"style": {
- "navigationBarTitleText": "详情"
+ "navigationBarTitleText": "详情",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
}
},
{
@@ -244,7 +246,7 @@
"name": "equipment",
"style": {
"navigationBarTitleText": "巡逻任务",
- "navigationBarBackgroundColor": "#0BB9C8",
+ "navigationBarBackgroundColor": "#103289",
"navigationBarTextStyle": "white"
}
},
@@ -253,7 +255,7 @@
"name": "investigation",
"style": {
"navigationBarTitleText": "地图",
- "navigationBarBackgroundColor": "#0BB9C8",
+ "navigationBarBackgroundColor": "#103289",
"navigationBarTextStyle": "white"
}
},
@@ -270,7 +272,9 @@
{
"path": "pages/handle/handle",
"style": {
- "navigationBarTitleText": "我要办"
+ "navigationBarTitleText": "我要办",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
}
},
{
@@ -278,7 +282,7 @@
"name": "alarm_list",
"style": {
"navigationBarTitleText": "群防任务",
- "navigationBarBackgroundColor": "#0BB9C8",
+ "navigationBarBackgroundColor": "#103289",
"navigationBarTextStyle": "white"
}
},
@@ -294,7 +298,7 @@
"name": "map",
"style": {
"navigationBarTitleText": "群防任务",
- "navigationBarBackgroundColor": "#0BB9C8",
+ "navigationBarBackgroundColor": "#103289",
"navigationBarTextStyle": "white"
}
},
@@ -321,7 +325,7 @@
"name": "mapJQtijiao",
"style": {
"navigationBarTitleText": "处理结果",
- "navigationBarBackgroundColor": "#0BB9C8",
+ "navigationBarBackgroundColor": "#103289",
"navigationBarTextStyle": "white"
}
},
@@ -330,7 +334,7 @@
"name": "alarmOver",
"style": {
"navigationBarTitleText": "任务详情",
- "navigationBarBackgroundColor": "#0BB9C8",
+ "navigationBarBackgroundColor": "#103289",
"navigationBarTextStyle": "white"
}
},
diff --git a/pages/article/article.vue b/pages/article/article.vue
index 4991452..76b2f3c 100644
--- a/pages/article/article.vue
+++ b/pages/article/article.vue
@@ -174,7 +174,7 @@
.select('#articleBox')
.boundingClientRect(data => {
- that.swiperHeight = (safeArea.bottom - data.top - 44);
+ that.swiperHeight = (safeArea.bottom - data.top - 50);
})
.exec();
diff --git a/pages/groupChat/groupChat.vue b/pages/groupChat/groupChat.vue
index 9868ff0..e92578c 100644
--- a/pages/groupChat/groupChat.vue
+++ b/pages/groupChat/groupChat.vue
@@ -4,7 +4,7 @@
<!-- 自定义顶部导航栏 -->
<!-- <navBarTop :title="'聊天室'"></navBarTop> -->
<view class="tab">
- <u-tabs :list="list" :is-scroll="false" :current="current" active-color="#14B9C8" inactive-color="#595959"
+ <u-tabs :list="list" :is-scroll="false" :current="current" active-color="#103289" inactive-color="#595959"
height="100" @change="change"></u-tabs>
</view>
<swiper id="swiperBox" :style="{ height: swiperHeight + 'px' }" :current="current" @change="tabsChange">
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 1f90159..3bfdaf1 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -3,7 +3,7 @@
<!-- 头部 start -->
<view class="head">
<u-navbar :is-fixed="false" :border-bottom="false" :is-back="false" title=""
- :background="{ background: '#0BB9C8' }">
+ :background="{ background: '#103289' }">
<view class="nav-wrap">
<!-- <picker mode="selector" :range="positionArr" range-key="name" @change="changePicker"
class="picker-box">
@@ -269,7 +269,7 @@
left: 0;
z-index: 1;
}
-
+
.head-bg {
position: absolute;
left: 0px;
@@ -277,7 +277,7 @@
z-index: -1;
width: 750rpx;
height: 270rpx;
- background: #0bb9c8;
+ background: #103289;
}
.nav-wrap {
diff --git a/pages/myself/myself.vue b/pages/myself/myself.vue
index a54746d..78c731a 100644
--- a/pages/myself/myself.vue
+++ b/pages/myself/myself.vue
@@ -331,7 +331,7 @@
width: 100%;
height: 12rem;
border-radius: 0px 0px 12px 12px;
- background-image: linear-gradient(to bottom, #0BB9C8, #0BB9C8);
+ background-image: linear-gradient(to bottom, #103289, #174cd1);
color: #fff;
flex-direction: column;
@@ -376,7 +376,7 @@
width: 88%;
margin: 0 auto;
height: 2.4rem;
- background-image: linear-gradient(to right, #1D949F, #0BB9C8);
+ background-image: linear-gradient(to bottom, #103289, #174cd1);
box-shadow:0 0 0.1px 0.1px #0BB9C8;
// border: 1px solid #00ff00;
@@ -386,7 +386,7 @@
line-height: 1.8rem;
margin-left: 0.6rem;
margin-top: 0.3rem;
- background-image: linear-gradient(to right,#078893, #0CB5C4);
+ background-image: linear-gradient(to bottom, #103289, #174cd1);
.dept-name {
margin-left: 0.3rem;
diff --git a/pages/reported/reported.vue b/pages/reported/reported.vue
index 8c19247..1722161 100644
--- a/pages/reported/reported.vue
+++ b/pages/reported/reported.vue
@@ -1,14 +1,8 @@
<template>
<view class="policeDetails">
<!-- 自定义顶部导航栏 -->
- <u-navbar
- :is-back="true"
- title="事件上报"
- :background="background"
- back-icon-color="#FFF"
- title-color="#FFF"
- >
- <view class="navbar-right" slot="right">历史上报</view>
+ <u-navbar :is-back="true" title="事件上报" :background="background" back-icon-color="#FFF" title-color="#FFF">
+ <view class="navbar-right" slot="right">历史上报</view>
</u-navbar>
<!-- <view class="row address">
<view class="title">地址</view>
@@ -67,8 +61,8 @@
videos: [],
title: '事件上报',
backImage: '../../static/images/nav/back02.png',
- background:{
- backgroundColor:"#0BB9C8"
+ background: {
+ backgroundColor: "#103289"
}
}
},
@@ -245,8 +239,7 @@
</script>
<style lang="scss">
-
- .navbar-right{
+ .navbar-right {
color: #fff;
font-size: 0.7rem;
margin-right: 1.5rem;
@@ -404,7 +397,7 @@
.butb {
margin-bottom: 4.5rem;
width: 100%;
- height:3rem;
+ height: 3rem;
// border: 1px solid rgb(46, 118, 228);
border-radius: 8px;
display: flex;
diff --git a/static/images/index/top-bar/GPUCache/data_0 b/static/images/index/top-bar/GPUCache/data_0
new file mode 100644
index 0000000..d76fb77
--- /dev/null
+++ b/static/images/index/top-bar/GPUCache/data_0
Binary files differ
diff --git a/static/images/index/top-bar/GPUCache/data_1 b/static/images/index/top-bar/GPUCache/data_1
new file mode 100644
index 0000000..2e211f0
--- /dev/null
+++ b/static/images/index/top-bar/GPUCache/data_1
Binary files differ
diff --git a/static/images/index/top-bar/GPUCache/data_2 b/static/images/index/top-bar/GPUCache/data_2
new file mode 100644
index 0000000..c7e2eb9
--- /dev/null
+++ b/static/images/index/top-bar/GPUCache/data_2
Binary files differ
diff --git a/static/images/index/top-bar/GPUCache/data_3 b/static/images/index/top-bar/GPUCache/data_3
new file mode 100644
index 0000000..5eec973
--- /dev/null
+++ b/static/images/index/top-bar/GPUCache/data_3
Binary files differ
diff --git a/static/images/index/top-bar/GPUCache/index b/static/images/index/top-bar/GPUCache/index
new file mode 100644
index 0000000..37adda5
--- /dev/null
+++ b/static/images/index/top-bar/GPUCache/index
Binary files differ
diff --git "a/static/myself/clock - \345\211\257\346\234\254.png" "b/static/myself/clock - \345\211\257\346\234\254.png"
new file mode 100644
index 0000000..fc371fb
--- /dev/null
+++ "b/static/myself/clock - \345\211\257\346\234\254.png"
Binary files differ
diff --git a/static/myself/clock.png b/static/myself/clock.png
index fc371fb..d713bcd 100644
--- a/static/myself/clock.png
+++ b/static/myself/clock.png
Binary files differ
diff --git "a/static/myself/clock01 - \345\211\257\346\234\254.png" "b/static/myself/clock01 - \345\211\257\346\234\254.png"
new file mode 100644
index 0000000..aebb554
--- /dev/null
+++ "b/static/myself/clock01 - \345\211\257\346\234\254.png"
Binary files differ
diff --git a/static/myself/clock01.png b/static/myself/clock01.png
index aebb554..90101a4 100644
--- a/static/myself/clock01.png
+++ b/static/myself/clock01.png
Binary files differ
diff --git "a/static/myself/logout002 - \345\211\257\346\234\254.png" "b/static/myself/logout002 - \345\211\257\346\234\254.png"
new file mode 100644
index 0000000..1a854e9
--- /dev/null
+++ "b/static/myself/logout002 - \345\211\257\346\234\254.png"
Binary files differ
diff --git a/static/myself/logout002.png b/static/myself/logout002.png
index 1a854e9..737d8a9 100644
--- a/static/myself/logout002.png
+++ b/static/myself/logout002.png
Binary files differ
diff --git "a/static/myself/privacy01 - \345\211\257\346\234\254.png" "b/static/myself/privacy01 - \345\211\257\346\234\254.png"
new file mode 100644
index 0000000..4bfb0c5
--- /dev/null
+++ "b/static/myself/privacy01 - \345\211\257\346\234\254.png"
Binary files differ
diff --git a/static/myself/privacy01.png b/static/myself/privacy01.png
index 4bfb0c5..ec5a243 100644
--- a/static/myself/privacy01.png
+++ b/static/myself/privacy01.png
Binary files differ
diff --git "a/static/myself/shu - \345\211\257\346\234\254.png" "b/static/myself/shu - \345\211\257\346\234\254.png"
new file mode 100644
index 0000000..3ff95e9
--- /dev/null
+++ "b/static/myself/shu - \345\211\257\346\234\254.png"
Binary files differ
diff --git a/static/myself/shu.png b/static/myself/shu.png
index 3ff95e9..3d859c7 100644
--- a/static/myself/shu.png
+++ b/static/myself/shu.png
Binary files differ
diff --git "a/static/myself/system02 - \345\211\257\346\234\254.png" "b/static/myself/system02 - \345\211\257\346\234\254.png"
new file mode 100644
index 0000000..14e93c7
--- /dev/null
+++ "b/static/myself/system02 - \345\211\257\346\234\254.png"
Binary files differ
diff --git a/static/myself/system02.png b/static/myself/system02.png
index 14e93c7..5487c5b 100644
--- a/static/myself/system02.png
+++ b/static/myself/system02.png
Binary files differ
diff --git "a/static/myself/us003 - \345\211\257\346\234\254.png" "b/static/myself/us003 - \345\211\257\346\234\254.png"
new file mode 100644
index 0000000..fc15c20
--- /dev/null
+++ "b/static/myself/us003 - \345\211\257\346\234\254.png"
Binary files differ
diff --git a/static/myself/us003.png b/static/myself/us003.png
index fc15c20..06ae16f 100644
--- a/static/myself/us003.png
+++ b/static/myself/us003.png
Binary files differ
--
Gitblit v1.9.3