auto commit

manifest.json

@@ -25,7 +25,9 @@
             "delay" : 0
         },
         /* 模块配置 */
-        "modules" : {},
+        "modules" : {
+            "Maps" : {}
+        },
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */
@@ -35,27 +37,21 @@
                     "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    /* 百度地图 */
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\" />",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\" />",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\" />",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\" />",
-                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\" />",
-                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\" />",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\" />",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
-                    /* 高德地图 */
-                    "<uses-permission android:name=\"android.permission.INTERNET\" />",
-                    "<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\" />",
-                    "<uses-permission android:name=\"android.permission.BLUETOOTH\" />",
-                    "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\" />"
+                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ]
             },
             /* ios打包配置 */
@@ -64,8 +60,8 @@
             "sdkConfigs" : {
                 "maps" : {
                     "amap" : {
-                        "appkey_ios" : "",
-                        "appkey_android" : ""
+                        "appkey_ios" : "565ad55bec6d286e33a95a9ff1911b55",
+                        "appkey_android" : "565ad55bec6d286e33a95a9ff1911b55"
                     }
                 },
                 "geolocation" : {},

pages.json

@@ -100,6 +100,7 @@
 			"path": "pages/deviceList/deviceListType2/deviceInfo",//车位锁备详情
 			"style": {
 				"navigationStyle":"custom",// 隐藏系统导航栏
+				"backgroundColor":"#F3F3F3",
 				"navigationBarTitleText": "设备详情"
 			}
 		},

pages/center/message/messageInfo.vue

@@ -70,7 +70,7 @@
 
 	.content {
 		text-indent: 2em;
-		padding: 20rpx 40rpx;
+		padding: 20rpx 30rpx;
 		line-height: 44rpx;
 	}
 </style>

pages/clockIn/clockIn.scss

@@ -1,6 +1,3 @@
-page{
-	background-color: #F4F4F4;
-}
 .wrap{margin-top: 30rpx;}
 .road-select-cell{
 	background-color: #fff;
@@ -41,6 +38,7 @@ page{
 		width: 100%;
 		height: 25vh;
 		margin-top: 80rpx;
+		z-index: 1;
 	}
 }
 

pages/clockIn/clockIn.vue

@@ -360,7 +360,9 @@
 		}
 	}
 </script>
-
+<style>
+page{background-color: #F4F4F4;}
+</style>
 <style lang="scss">
 	@import  './clockIn.scss'
 </style>

pages/deviceList/deviceList.vue

@@ -136,9 +136,10 @@
 		}
 	}
 </script>
-
+<style>
+	page{background: #fff;}
+</style>
 <style lang="scss" scoped>
-	page{background-color: #fff;}
 	// @import  './deviceList.scss'
 	.device-list{
 		margin: 24rpx 0;

pages/deviceList/deviceListType1/deviceInfo.vue

@@ -37,7 +37,7 @@
 			bg-color="#F1F8FF" 
 			color="#010101" 
 			border-color="#6d6d6d">设备心跳</u-divider>
-			<mescroll-uni ref="mescrollRef01" @init="mescrollInit" :top="config.platform=='h5'?dividerBottom+30:300" :down="downOption" @down="downCallback" :up="upOption" @up="upCallback" @emptyclick="emptyClick">
+			<mescroll-uni ref="mescrollRef01" @init="mescrollInit" :top="config.platform=='h5'?dividerBottom+30:dividerBottom+30" :down="downOption" @down="downCallback" :up="upOption" @up="upCallback" @emptyclick="emptyClick">
 				<view class="device-list u-text-center ">
 					<view v-if="dataList.length>=1" class="list-header u-flex u-row-around">
 						<view class="u-flex-2">时间</view>
@@ -288,10 +288,11 @@
 		}
 	}
 </script>
-
+<style>
+	page{background: #F1F8FF;}
+</style>
 <style lang="scss" scoped>
 // @import  './login.scss'
-page{background: #F1F8FF;}
 .base-info{
 	background-color: #fff;
 	padding: 30rpx 30rpx 40rpx;

pages/deviceList/deviceListType1/deviceListType1.vue

@@ -182,9 +182,10 @@
 		}
 	}
 </script>
-
+<style>
+	page{background-color: #F3F3F3;}
+</style>
 <style lang="scss" scoped>
-page{background-color: #F3F3F3;}
 .device-list{
 	margin: 24rpx 0;
 	.device-list-item{

pages/deviceList/deviceListType2/deviceInfo.vue

@@ -37,7 +37,7 @@
 			bg-color="#F1F8FF" 
 			color="#010101" 
 			border-color="#6d6d6d">设备心跳</u-divider>
-			<mescroll-uni ref="mescrollRef01" @init="mescrollInit" :top="config.platform=='h5'?dividerBottom+30:300" :down="downOption" @down="downCallback" :up="upOption" @up="upCallback" @emptyclick="emptyClick">
+			<mescroll-uni ref="mescrollRef01" @init="mescrollInit" :top="config.platform=='h5'?dividerBottom+30:dividerBottom+30" :down="downOption" @down="downCallback" :up="upOption" @up="upCallback" @emptyclick="emptyClick">
 				<view class="device-list u-text-center ">
 					<view v-if="dataList.length>=1" class="list-header u-flex u-row-around">
 						<view class="u-flex-2">时间</view>
@@ -290,10 +290,11 @@
 		}
 	}
 </script>
-
+<style>
+	page{background: #F1F8FF;}
+</style>
 <style lang="scss" scoped>
 // @import  './login.scss'
-page{background: #F1F8FF;}
 .base-info{
 	background-color: #fff;
 	padding: 30rpx 30rpx 40rpx;

pages/deviceList/deviceListType2/deviceListType2.vue

@@ -200,9 +200,10 @@
 		}
 	}
 </script>
-
+<style>
+	page{background: #F3F3F3;}
+</style>
 <style lang="scss" scoped>
-page{background-color: #F3F3F3;}
 .device-list{
 	margin: 24rpx 0;
 	.device-list-item{

pages/deviceList/deviceListType3/deviceInfo.vue

@@ -239,10 +239,11 @@
 		}
 	}
 </script>
-
+<style>
+	page{background: #fff;}
+</style>
 <style lang="scss" scoped>
 // @import  './login.scss'
-page{background: #fff;}
 .base-info{
 	background-color: #fff;
 	padding: 30rpx 30rpx 40rpx;

pages/deviceList/deviceListType3/deviceListType3.vue

@@ -195,9 +195,10 @@
 		}
 	}
 </script>
-
+<style>
+	page{background: #F3F3F3;}
+</style>
 <style lang="scss" scoped>
-page{background-color: #F3F3F3;}
 .device-list{
 	margin: 24rpx 0;
 	.device-list-item{

pages/index/index.vue

@@ -161,9 +161,10 @@
 		}
 	}
 </script>
-
+<style>
+	page{background: #F6F6F6;}
+</style>
 <style lang="scss" scoped>
-	page{background-color: #F6F6F6;}
 	.header-wrap{
 		overflow: hidden;
 		.header{

pages/ownersQuery/queryList/queryList.vue

@@ -148,12 +148,11 @@
 		}
 	}
 </script>
-
+<style>
+	page{background: #f7f7f7;}
+</style>
 <style lang="scss" scoped>
 	// @import  './warningCenter.scss'
-	page{
-		background-color: #f7f7f7;
-	}
 	.owelist{
 		margin: 31rpx auto;
 		padding: 24rpx;