diff --git a/weapp/src/app.config.js b/weapp/src/app.config.js
index 7bbd532a..18a9b86e 100644
--- a/weapp/src/app.config.js
+++ b/weapp/src/app.config.js
@@ -4,6 +4,12 @@ export default {
'pages/user/index',
'pages/auth/login/login'
],
+ subPackages: [{
+ 'root': 'packages/',
+ 'pages': [
+ 'patrol/index',
+ ]
+ }],
permission: {
"scope.userLocation": {
"desc": '需要获取您的地理位置'
@@ -23,7 +29,7 @@ export default {
'pagePath': 'pages/home/index',
'iconPath': 'static/img/tabbar/shouye.png',
'selectedIconPath': 'static/img/tabbar/shouye-active.png',
- 'text': '首页'
+ 'text': '巡查'
},
{
'pagePath': 'pages/user/index',
diff --git a/weapp/src/packages/patrol/index.config.js b/weapp/src/packages/patrol/index.config.js
new file mode 100644
index 00000000..e69de29b
diff --git a/weapp/src/packages/patrol/index.jsx b/weapp/src/packages/patrol/index.jsx
new file mode 100644
index 00000000..d7d8cfd7
--- /dev/null
+++ b/weapp/src/packages/patrol/index.jsx
@@ -0,0 +1,10 @@
+import React from 'react'
+import { View } from '@tarojs/components';
+
+const Index = () => {
+ return (
+ 巡查养护
+ )
+}
+
+export default Index
\ No newline at end of file
diff --git a/weapp/src/packages/patrol/index.scss b/weapp/src/packages/patrol/index.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/weapp/src/pages/auth/login/login.config.js b/weapp/src/pages/auth/login/login.config.js
index 7203b1cd..41f6950e 100644
--- a/weapp/src/pages/auth/login/login.config.js
+++ b/weapp/src/pages/auth/login/login.config.js
@@ -1,4 +1,5 @@
export default {
navigationBarTitleText: '登录',
disableScroll: true,
+ navigationStyle: 'custom'
}
\ No newline at end of file
diff --git a/weapp/src/pages/auth/login/login.jsx b/weapp/src/pages/auth/login/login.jsx
index 0f8b422c..70779dc8 100644
--- a/weapp/src/pages/auth/login/login.jsx
+++ b/weapp/src/pages/auth/login/login.jsx
@@ -1,10 +1,13 @@
import React, { useState } from 'react';
import Taro from '@tarojs/taro';
import { View, Button, Input, Form, Image } from '@tarojs/components';
+import { AtDivider } from 'taro-ui';
import { login } from '@/actions/auth';
import { getLoginUrl } from '@/services/api';
import cfg from '../../../config';
import LoginBg from '../../../static/img/login/bg.png';
+import PhoneIcon from '../../../static/img/login/phone.png';
+import PswdIcon from '../../../static/img/login/pswd.png';
import './login.scss'
const { pcode } = cfg;
@@ -36,36 +39,37 @@ const LoginPage = (props) => {
- 欢迎使用
- 公路监管系统
+ 南 昌 县 智 慧 交 通
+
-
-
-
+
+
+
+
+
);
}
diff --git a/weapp/src/pages/auth/login/login.scss b/weapp/src/pages/auth/login/login.scss
index bf2d1d23..647103f5 100644
--- a/weapp/src/pages/auth/login/login.scss
+++ b/weapp/src/pages/auth/login/login.scss
@@ -1,3 +1,5 @@
+@import "~taro-ui/dist/style/components/divider.scss";
+
.page {
height: 100vh;
background: #fff;
@@ -16,24 +18,19 @@
.head {
width: 100%;
- margin: 0 auto;
- padding: 0 5vw;
-
- .label {
- color: #EFF3FE;
- margin: 8px 0;
- font-size: 44px;
- }
+ height: 300px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
.title {
color: #fff;
- font-size: 46px;
+ font-size: 48px;
}
}
.form {
height: 100vh;
- background: #fff;
border-radius: 26px;
padding: 20px 8vw;
box-sizing: border-box;
@@ -49,6 +46,8 @@
.form-label {
font-weight: 600;
+ font-size: 36px;
+ color: #eee;
}
.form-input {
@@ -56,12 +55,45 @@
margin: 18rpx 0;
border-bottom: 1px solid #EEEEEE;
padding: 8rpx 0px;
+ display: flex;
+ justify-content: left;
+ align-items: center;
+ color: #fff;
+
+ .icon-phone {
+ width: 24px;
+ height: 36px;
+ margin-left: 6px;
+ margin-right: 6px + 20px;
+ }
+ .icon-pswd {
+ width: 36px;
+ height: 36px;
+ margin-right: 20px;
+ }
+
+ .input-placeholder {
+ color: #ddd;
+ }
}
.btn {
- background: #2C66F3;
+ background: #4797e4;
font-size: 28px;
padding: 8px 0;
+ border: solid 1px #fff;
border-radius: 50px;
}
-}
\ No newline at end of file
+
+ .footer {
+ position: fixed;
+ width: 84%;
+ bottom: 100px;
+
+ .at-divider__content {
+ background: #499be7;
+ font-size: 24rpx;
+ }
+ }
+}
+
diff --git a/weapp/src/pages/home/index.jsx b/weapp/src/pages/home/index.jsx
index 3aac15a2..2ff925f4 100644
--- a/weapp/src/pages/home/index.jsx
+++ b/weapp/src/pages/home/index.jsx
@@ -1,19 +1,25 @@
import React, { useEffect, useState } from 'react';
import Taro from '@tarojs/taro';
-import { View, Map, CoverView, CoverImage, Picker } from '@tarojs/components';
+import { View } from '@tarojs/components';
import { useIndustry } from '@/actions/business';
import './index.scss';
-
-
const Index = () => {
- // const { data: industryData } = useIndustry()
- return (
-
- 首页
-
- );
+ function toPatrol() {
+ Taro.navigateTo({
+ url: '/packages/patrol/index'
+ })
+ }
+
+ return (
+
+
+ 巡 查 养 护
+ 填报
+
+
+ );
}
export default Index;
diff --git a/weapp/src/pages/home/index.scss b/weapp/src/pages/home/index.scss
index 50b77615..4761576f 100644
--- a/weapp/src/pages/home/index.scss
+++ b/weapp/src/pages/home/index.scss
@@ -1,111 +1,29 @@
.page {
- .top {
- height: 16vh;
- background: #EFF4FF;
- color: #575F71;
- font-size: 30px;
- display: flex;
- flex-direction: column;
- justify-content: center;
-
- .select {
- display: flex;
- align-items: center;
- margin: 12px auto;
- width: 90vw;
-
- .label {
- margin-right: 20px;
- white-space: nowrap;
- }
-
- .content {
- width: 70vw;
- border: 1px solid #3288FF;
- border-radius: 5px;
- padding: 10px 8px;
-
- .custom-picker {
- display: flex;
- align-items: center;
- justify-content: space-between;
-
- .text {}
-
- }
- }
- }
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+
+ .fill {
+ margin-top: 30px;
+ padding: 10px;
+ width: 94%;
+ height: 360px;
+ background: url('../../static/img/patrol//fill-bg.svg') no-repeat;
+ background-size:100% 100%;
}
- .map {
- width: 100vw;
-
- .cover-wrap {
- position: absolute;
- bottom: 10px;
- width: 96%;
- left: 2%;
- margin: 0 auto;
- box-sizing: border-box;
-
- .tablist {
- width: 100%;
- margin: 0 auto;
- box-shadow: 0px 2px 8px 0px rgba(0, 0, 0, 0.22);
- border-radius: 11px;
- background: #fff;
- display: flex;
- justify-content: space-around;
- padding: 20px 0;
-
- .tab {
- width: 25%;
- display: flex;
- flex-direction: column;
- justify-content: center;
- align-items: center;
- font-size: 28px;
-
- .img {
- width: 42px;
- height: 42px;
- margin-bottom: 4px;
- }
- }
- }
- }
-
- .cover-left {
- position: absolute;
- bottom: 24vh;
- left: 12px;
- margin: 0 auto;
- box-sizing: border-box;
-
- .list {
- margin: 0 auto;
- box-shadow: 0px 2px 8px 0px rgba(0, 0, 0, 0.22);
- border-radius: 11px;
- background: #fff;
- display: flex;
- flex-direction: column;
- justify-content: space-around;
- padding: 20px 8px;
- box-sizing: border-box;
-
- .cell {
- font-size: 26px;
- display: flex;
- align-items: center;
- margin: 10px 0;
+ .title {
+ margin: 50px 0 0 48px;
+ color: #fff;
+ font-size: 48px;
+ }
- .img {
- width: 36px;
- height: 36px;
- margin-right: 8px;
- }
- }
- }
- }
+ .btn {
+ margin: 20px 0 0 50px;
+ color: #fff;
+ text-align: center;
+ width: 200px;
+ border: solid 1px #fff;
+ border-radius: 10px;
}
}
\ No newline at end of file
diff --git a/weapp/src/static/img/login/bg.png b/weapp/src/static/img/login/bg.png
index eca105b8..361ea681 100644
Binary files a/weapp/src/static/img/login/bg.png and b/weapp/src/static/img/login/bg.png differ
diff --git a/weapp/src/static/img/login/phone.png b/weapp/src/static/img/login/phone.png
new file mode 100644
index 00000000..1096a028
Binary files /dev/null and b/weapp/src/static/img/login/phone.png differ
diff --git a/weapp/src/static/img/login/pswd.png b/weapp/src/static/img/login/pswd.png
new file mode 100644
index 00000000..44277b7a
Binary files /dev/null and b/weapp/src/static/img/login/pswd.png differ
diff --git a/weapp/src/static/img/patrol/fill-bg.svg b/weapp/src/static/img/patrol/fill-bg.svg
new file mode 100644
index 00000000..0a4b818d
--- /dev/null
+++ b/weapp/src/static/img/patrol/fill-bg.svg
@@ -0,0 +1,126 @@
+
+
\ No newline at end of file