合并冲突

api/common.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+
+// 获取小区字典值
+export function getAreaList() {
+	// const data = {
+	//   district
+	// }
+  return request({
+    'url': '/zdsz/area/getAreaList',
+    'method': 'get',
+	// 'data': data
+  })
+}
+// 获取楼宇字典值
+export function getBuildingList(areaId) {
+	const data = {
+	  areaId
+	}
+  return request({
+    'url': '/zdsz/building/getBuildingList',
+    'method': 'get',
+	'data': data
+  })
+}
+// 获取单元字典值
+export function getUnitList(buildingId) {
+	const data = {
+	  buildingId
+	}
+  return request({
+    'url': '/zdsz/unit/getUnitList',
+    'method': 'get',
+	'data': data
+  })
+}
+// 获取房间字典值
+export function getHousesList(unitId) {
+	const data = {
+	  unitId
+	}
+  return request({
+    'url': '/zdsz/house/getHousesList',
+    'method': 'get',
+	'data': data
+  })
+}

pages.json

@@ -118,6 +118,17 @@
 			"style": {
 				"navigationBarTitleText": "架空"
 			}
+		}, {
+			"path": "pages/statistics/index",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/statistics/sss",
+			"style": {
+				"navigationBarTitleText": "sticky-list"
+			}
 		}
 	],
 	"tabBar": {
@@ -147,4 +158,5 @@
 		"navigationBarTitleText": "RuoYi",
 		"navigationBarBackgroundColor": "#FFFFFF"
 	}
-}
+}
+