Merge remote-tracking branch 'origin/master'

# Conflicts:
#	manifest.json

config/index.js

@@ -1,4 +1,4 @@
-const env =  'test';
+const env =  'prod';
 const configs = {
 	LocalTest: {
 	    apiBaseUrl: 'https://warehouse.szjixun.cn/oa_backend',
@@ -6,7 +6,7 @@ const configs = {
 	},
     dev: {
         apiBaseUrl: 'https://warehouse.szjixun.cn/oa_backend',
-        h5Url:'https://192.168.88.27:8080/#/'
+        h5Url:'http://192.168.88.44:8080/#/'
     },
     test: {
         apiBaseUrl: 'https://warehouse.szjixun.cn/oa_backend',

manifest.json

@@ -2,11 +2,14 @@
     "name" : "oa考勤系统",
     "appid" : "__UNI__4796942",
     "description" : "",
-    "versionName" : "2.1.1",
+    "versionName" : "2.1.5",
-    "versionCode" : 211,
+    "versionCode" : 215,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
+        "compatible": {
+            "ignoreVersion": true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持
+        },
         "usingComponents" : true,
         "nvueStyleCompiler" : "uni-app",
         "compilerVersion" : 3,
@@ -21,6 +24,7 @@
             "Camera" : {},
             "Geolocation" : {},
             "Maps" : {},
+            "Push" : {},
             "LivePusher" : {}
         },
         /* 应用发布信息 */
@@ -32,13 +36,11 @@
                     "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
                     "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
                     "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-feature android:name=\"android.hardware.camera\"/>",