From c4c846d44a6c30bd32fb1151893f86d24e748f3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?=
 <153298343@qq.com>
Date: Fri, 20 May 2022 17:30:17 +0800
Subject: [PATCH] up

---
 .gitignore                                    |  16 +++
 App.vue                                       |   4 +
 main.js                                       |   6 +-
 manifest.json                                 |  14 ++-
 package.json                                  |   5 +
 packageA/pages/generalList/generalList.vue    |  22 ++++
 .../pages/generalPatrol/generalPatrol.vue     | 106 ++++++++++++++++++
 pages.json                                    |  28 ++++-
 pages/index/index.vue                         |  75 ++++++++-----
 uni.scss                                      |   4 +-
 10 files changed, 248 insertions(+), 32 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 package.json
 create mode 100644 packageA/pages/generalList/generalList.vue
 create mode 100644 packageA/pages/generalPatrol/generalPatrol.vue

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9ad28d2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,16 @@
+.DS_Store
+node_modules/
+dist/
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+package-lock.json
+tests/**/coverage/
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
diff --git a/App.vue b/App.vue
index 99f6e28..5f7948d 100644
--- a/App.vue
+++ b/App.vue
@@ -1,3 +1,7 @@
+<style lang="scss">
+	/* 注意要写在第一行，同时给style标签加入lang="scss"属性 */
+	@import "uview-ui/index.scss";
+</style>
 <script>
 	export default {
 		onLaunch: function() {
diff --git a/main.js b/main.js
index 365eb09..d3d6850 100644
--- a/main.js
+++ b/main.js
@@ -18,4 +18,8 @@ export function createApp() {
     app
   }
 }
-// #endif
\ No newline at end of file
+// #endif
+
+// main.js
+import uView from "uview-ui";
+Vue.use(uView);
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index ea214ce..b46cf00 100644
--- a/manifest.json
+++ b/manifest.json
@@ -68,5 +68,17 @@
     "uniStatistics" : {
         "enable" : false
     },
-    "vueVersion" : "2"
+    "vueVersion" : "2",
+    "h5" : {
+        "sdkConfigs" : {
+            "maps" : {
+                "qqmap" : {
+                    "key" : "EUQBZ-MJALU-WZFVR-2HFNW-TIK2K-TNBJI"
+                }
+            }
+        },
+        "devServer" : {
+            "https" : false
+        }
+    }
 }
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..bbd71fa
--- /dev/null
+++ b/package.json
@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "uview-ui": "^1.8.4"
+  }
+}
diff --git a/packageA/pages/generalList/generalList.vue b/packageA/pages/generalList/generalList.vue
new file mode 100644
index 0000000..8183fd0
--- /dev/null
+++ b/packageA/pages/generalList/generalList.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/packageA/pages/generalPatrol/generalPatrol.vue b/packageA/pages/generalPatrol/generalPatrol.vue
new file mode 100644
index 0000000..31751a0
--- /dev/null
+++ b/packageA/pages/generalPatrol/generalPatrol.vue
@@ -0,0 +1,106 @@
+<template>
+	<view class="content">
+		<u-form :model="form" ref="uForm">
+			<u-form-item label="问题类型" label-position="top">
+				<u-input v-model="form.typeName" type="select" :border="true" @click="typeshow = true" />
+				<u-select v-model="typeshow" mode="single-column" :list="list" @confirm="confirmType"></u-select>
+			</u-form-item>
+			<u-form-item label="问题内容" label-position="top">
+				<u-input v-model="form.contentName" type="select" :border="true" @click="contentshow = true" />
+				<u-select v-model="contentshow" mode="single-column" :list="list" @confirm="confirmContent"></u-select>
+			</u-form-item>
+			<u-form-item label="位置" label-position="top">
+				<text>江苏省苏州市通园路66号</text>
+				<u-button shape="square" slot='right' size="mini" @click="showMap=true" type="info">重新获取</u-button>
+			</u-form-item>
+			<u-form-item label-position="top" label="描述" prop="intro">
+				<u-input v-model="form.intro" type='textarea' height='100' :border="true" />
+			</u-form-item>
+			<u-form-item label-position="top" label="附件上传" prop="intro">
+				<u-upload ref="uUpload" :action="action" upload-text="选择附件" :show-tips="false"></u-upload>
+			</u-form-item>
+		</u-form>
+		<u-button type="primary" @click="submit">提交</u-button>
+		<u-popup v-model="showMap" mode="center" closeable close-icon-color="#ffffff" border-radius="14">
+			<view>
+				<view class="popuptitle">选择位置</view>
+				<map :style="{width:width+'px',height:height+ 'px'}" :latitude="location.latitude"
+					:longitude="location.longitude">
+				</map>
+				<view>
+					<u-button type="success" shape="square">确认选择</u-button>
+				</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				showMap: false,
+				typeshow: false,
+				contentshow: false,
+				action: "",
+				location: {},
+				list: [{
+						value: '1',
+						label: '江'
+					},
+					{
+						value: '2',
+						label: '湖'
+					}
+				],
+				form: {
+					type: "",
+					content: "",
+					typeName: "",
+					contentName: ""
+				},
+				width: 300,
+				height: 300
+			}
+		},
+		onReady() {
+			let that = this;
+			uni.getLocation({
+				success(res) {
+					that.location = res;
+				}
+			})
+			uni.getSystemInfo({
+				complete(res) {
+					that.width = res.screenWidth * .8
+					that.height = res.screenHeight * .6
+				}
+			})
+
+		},
+		methods: {
+			submit() {},
+			confirmType(e) {
+				this.form.type = e[0].value
+				this.form.typeName = e[0].label
+			},
+			confirmContent(e) {
+				this.form.content = e[0].value
+				this.form.contentName = e[0].label
+			},
+
+		}
+	}
+</script>
+
+<style>
+	.content {
+		padding: 20rpx;
+	}
+
+	.popuptitle {
+		background: #2979ff;
+		color: #fff;
+		padding: 20rpx 30rpx;
+	}
+</style>
diff --git a/pages.json b/pages.json
index bf32f65..8723b11 100644
--- a/pages.json
+++ b/pages.json
@@ -1,15 +1,39 @@
 {
+	"easycom": {
+		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
+	},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "uni-app"
+				"navigationBarTitleText": "巡查养护",
+				"navigationStyle": "custom"
 			}
 		}
 	],
+	"subPackages": [{
+		"root": "packageA/pages",
+		"pages": [{
+			"path": "generalPatrol/generalPatrol",
+			"style": {
+				"navigationBarTitleText": "通用巡查",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "generalList/generalList",
+			"style": {
+				"navigationBarTitleText": "通用巡查",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}]
+	}],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "uni-app",
+		"navigationBarTitleText": "巡查养护",
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8"
 	}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 4ca2b92..1d95a15 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,52 +1,73 @@
 <template>
-	<view class="content">
-		<image class="logo" src="/static/logo.png"></image>
-		<view class="text-area">
-			<text class="title">{{title}}</text>
-		</view>
+	<view class="wrap">
+		<u-row gutter="16">
+			<u-col span="3">
+				<view class="demo-layout bg-purple" @click="togeneral">
+					通用巡查
+				</view>
+			</u-col>
+			<u-col span="4">
+				<view class="demo-layout bg-purple-light"></view>
+			</u-col>
+			<u-col span="5">
+				<view class="demo-layout bg-purple-dark"></view>
+			</u-col>
+		</u-row>
+		<u-row gutter="16" justify="space-between">
+			<u-col span="3">
+				<view class="demo-layout bg-purple"></view>
+			</u-col>
+			<u-col span="9">
+				<view class="demo-layout bg-purple-light"></view>
+			</u-col>
+		</u-row>
 	</view>
 </template>
-
 <script>
 	export default {
 		data() {
 			return {
-				title: 'Hello'
+				title: ''
 			}
 		},
 		onLoad() {
 
 		},
 		methods: {
-
+			togeneral() {
+				uni.navigateTo({
+					url: "/packageA/pages/generalPatrol/generalPatrol"
+				})
+			}
 		}
 	}
 </script>
 
-<style>
-	.content {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
+<style scoped lang="scss">
+	.wrap {
+		padding: 24rpx;
+	}
+
+	.u-row {
+		margin: 40rpx 0;
+	}
+
+	.demo-layout {
+		height: 80rpx;
+		border-radius: 8rpx;
+		line-height: 80rpx;
+		text-align: center;
 	}
 
-	.logo {
-		height: 200rpx;
-		width: 200rpx;
-		margin-top: 200rpx;
-		margin-left: auto;
-		margin-right: auto;
-		margin-bottom: 50rpx;
+	.bg-purple {
+		background: #d3dce6;
 	}
 
-	.text-area {
-		display: flex;
-		justify-content: center;
+	.bg-purple-light {
+		background: #e5e9f2;
 	}
 
-	.title {
-		font-size: 36rpx;
-		color: #8f8f94;
+	.bg-purple-dark {
+		background: #99a9bf;
 	}
 </style>
diff --git a/uni.scss b/uni.scss
index a9a742d..06f1183 100644
--- a/uni.scss
+++ b/uni.scss
@@ -4,7 +4,9 @@
  * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
  * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
  *
- */
+ */
+/* uni.scss */
+@import 'uview-ui/theme.scss';
 
 /**
  * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能