李志伟 3 years ago
parent
commit
7ab1dcb1af

+ 7
- 0
src/pages/aboutUs/index.config.js View File

@@ -0,0 +1,7 @@
1
+export default {
2
+  navigationBarTitleText: '关于我们',
3
+  navigationStyle: 'custom',
4
+  styleIsolation: 'shared',
5
+  enableShareAppMessage: true,
6
+  disableScroll: true,
7
+}

+ 31
- 0
src/pages/aboutUs/index.jsx View File

@@ -0,0 +1,31 @@
1
+import { View, ScrollView, Image } from "@tarojs/components"
2
+import withLayout from '@/layouts'
3
+import CustomNav from "@/components/CustomNav"
4
+import micon from '@/assets/machinery/micon.png'
5
+import './style.less'
6
+
7
+export default withLayout((props) => {
8
+  return (
9
+    <View className='page-index'>
10
+      <View className='index-navbar'>
11
+        <CustomNav title='关于我们' />
12
+      </View>
13
+      <View className='index-container aboutUs'>
14
+        <ScrollView scrollY style={{ height: '100%' }}>
15
+          <View className='title'>
16
+            <Image src={micon} className='titleicon' />
17
+            智慧农机的介绍
18
+            <Image src={micon} className='titleicon' />
19
+          </View>
20
+          <View className='aboutUsContent'>
21
+            <View className='paragraph'>智慧农机旨在通过新一代物联网,大数据,3S等信息化技术有效整合省市县各级涉农资源</View>
22
+            <View className='paragraph'>以顶层设计方式建成“一个平台一个中心N个应用”汇聚农业产业。农业“两区”。 </View>
23
+            <View className='paragraph'>物联网、植保、农机、畜牧、农资、农经,科教等各级农业业务应用及数据,形成大农业”数据中心。</View>
24
+            <View className='paragraph'>构建互联共享的“互联网+农业”信息服务体系以最终实现科学指导农业生产经营管理,政府决策监管和社会公众服务。</View>
25
+            <View className='paragraph'>----------</View>
26
+          </View>
27
+        </ScrollView>
28
+      </View>
29
+    </View>
30
+  )
31
+})

+ 25
- 0
src/pages/aboutUs/style.less View File

@@ -0,0 +1,25 @@
1
+.aboutUs{
2
+  margin: 50px 30px;
3
+  .title{
4
+    font-size: 40px;
5
+    font-weight: bold;
6
+    color: #222222;
7
+    text-align: center;
8
+    margin-bottom: 60px;
9
+    .titleicon{
10
+      width: 33px;
11
+      height: 33px;
12
+      margin:0 31px;
13
+    }
14
+  }
15
+  .aboutUsContent{
16
+    text-align: left;
17
+    font-size: 30px;
18
+    font-weight: 400;
19
+    color: #121212;
20
+    line-height: 72px;
21
+    .paragraph{
22
+      text-indent: 2em;
23
+    }
24
+  }
25
+}

+ 6
- 2
src/pages/index/components/User/index.jsx View File

@@ -20,8 +20,12 @@ export default (props) => {
20 20
   const handleAccount = () => { 
21 21
     Taro.navigateTo({ url: '/pages/userInfo/index' });
22 22
    }
23
-  const handleAboutUs = () => { }
24
-  const handleUpdate = () => { }
23
+  const handleAboutUs = () => { 
24
+    Taro.navigateTo({ url: '/pages/aboutUs/index' });
25
+  }
26
+  const handleUpdate = () => {
27
+    Taro.navigateTo({ url: '/pages/versionUpdate/index' });
28
+   }
25 29
   const handleFeedback = () => { }
26 30
   const handleLogin = () => { 
27 31
     Taro.navigateTo({ url: '/pages/login/index' });

+ 7
- 0
src/pages/versionUpdate/index.config.js View File

@@ -0,0 +1,7 @@
1
+export default {
2
+  navigationBarTitleText: '版本更新',
3
+  navigationStyle: 'custom',
4
+  styleIsolation: 'shared',
5
+  enableShareAppMessage: true,
6
+  disableScroll: true,
7
+}

+ 32
- 0
src/pages/versionUpdate/index.jsx View File

@@ -0,0 +1,32 @@
1
+import { View, ScrollView, Image } from "@tarojs/components"
2
+import withLayout from '@/layouts'
3
+import CustomNav from "@/components/CustomNav"
4
+import micon from '@/assets/machinery/micon.png'
5
+import './style.less'
6
+
7
+export default withLayout((props) => {
8
+  return (
9
+    <View className='page-index'>
10
+      <View className='index-navbar'>
11
+        <CustomNav title='关于我们' />
12
+      </View>
13
+      <View className='index-container version'>
14
+        <ScrollView scrollY style={{ height: '100%' }}>
15
+          <View className='title'>
16
+            <Image src={micon} className='titleicon' />
17
+            版本V1.0
18
+            <Image src={micon} className='titleicon' />
19
+          </View>
20
+          <View className='updateContent'>
21
+            <View>本次更新:</View>
22
+            <View>--解决了一些已知问题--</View>
23
+          </View>
24
+          <View className='updateContent'>
25
+            <View>最近更新:</View>
26
+            <View>--aaaaaaaaaaaaaaaaaaaaaa--</View>
27
+          </View>
28
+        </ScrollView>
29
+      </View>
30
+    </View>
31
+  )
32
+})

+ 20
- 0
src/pages/versionUpdate/style.less View File

@@ -0,0 +1,20 @@
1
+.version{
2
+  margin: 50px 30px;
3
+  text-align: center;
4
+  .title{
5
+    font-size: 44px;
6
+    font-weight: bold;
7
+    color: #222222;
8
+    .titleicon{
9
+      width: 33px;
10
+      height: 33px;
11
+      margin:0 31px;
12
+    }
13
+  }
14
+  .updateContent{
15
+    margin-top: 80px;
16
+    font-size: 32px;
17
+    font-weight: bold;
18
+    color: #101010;
19
+  }
20
+}

+ 8
- 1
src/routes.js View File

@@ -46,7 +46,14 @@ const mainPages = [
46 46
     title: '个人信息',
47 47
     page: 'pages/userInfo/index',
48 48
   },
49
-  
49
+  {
50
+    title: '关于我们',
51
+    page: 'pages/aboutUs/index',
52
+  },  
53
+  {
54
+    title: '版本更新',
55
+    page: 'pages/versionUpdate/index',
56
+  },  
50 57
 ];
51 58
 
52 59
 // 所有的页面