Merge remote-tracking branch 'origin/master'

rk

21 小时以前 fa4c7baec36d58b4bdca66159ece743b5a45a9c8

 app/manifest.json

@@ -2,8 +2,8 @@
    "name" : "宁畅行-轻松行",
    "appid" : "__UNI__965A7DA",
    "description" : "",
    "versionName" : "1.0.1",
    "versionCode" : 101,
    "versionName" : "1.0.3",
    "versionCode" : 103,
    "transformPx" : false,
    "sassImplementationName" : "node-sass",
    /* 5+App特有相关 */
@@ -52,7 +52,8 @@
                "metadata" : {
                    "JPUSH_APPKEY" : "bb8fd4bd06c8dcb004f4ee1e"
                },
                "targetSdkVersion" : 30
                "targetSdkVersion" : 30,
                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
            },
            /* ios打包配置 */
            "ios" : {
@@ -70,7 +71,7 @@
                "geolocation" : {
                    "amap" : {
                        "name" : "amapCjzaQfPPK",
                        "__platform__" : [ "android" ],
                        "__platform__" : [ "ios", "android" ],
                        "appkey_ios" : "9fda68f2ed645548d623f4b5834cc291",
                        "appkey_android" : "9fda68f2ed645548d623f4b5834cc291"
                    }
@@ -83,13 +84,37 @@
                    "xhdpi" : "static/logo.png",
                    "xxhdpi" : "static/logo.png",
                    "xxxhdpi" : "static/logo.png"
                },
                "ios" : {
                    "iphone" : {
                        "app@2x" : "static/logo_120.png",
                        "app@3x" : "static/logo_180(1).png",
                        "spotlight@2x" : "static/logo_80(1).png",
                        "spotlight@3x" : "static/logo_120.png",
                        "settings@2x" : "static/logo_58(1).png",
                        "settings@3x" : "static/logo_87(1).png",
                        "notification@2x" : "static/logo_40(1).png",
                        "notification@3x" : "static/logo_60(1).png"
                    },
                    "appstore" : "static/logo_1024(1).png",
                    "ipad" : {
                        "app" : "static/logo_76(1).png",
                        "app@2x" : "static/logo_152(1).png",
                        "proapp@2x" : "static/logo_167(1).png",
                        "spotlight" : "static/logo_40(1).png",
                        "spotlight@2x" : "static/logo_80(1).png",
                        "settings" : "static/logo_29(1).png",
                        "settings@2x" : "static/logo_58(1).png",
                        "notification" : "static/logo_20(1).png",
                        "notification@2x" : "static/logo_40(1).png"
                    }
                }
            }
        },
        "nativePlugins" : {
            "JG-JCore" : {
                "JPUSH_APPKEY_ANDROID" : "bb8fd4bd06c8dcb004f4ee1e",
                "JPUSH_APPKEY_IOS" : "",
                "JPUSH_APPKEY_IOS" : "bb8fd4bd06c8dcb004f4ee1e",
                "JPUSH_CHANNEL_IOS" : "",
                "JPUSH_CHANNEL_ANDROID" : "",
                "__plugin_info__" : {
@@ -135,10 +160,10 @@
                "JPUSH_ADVERTISINGID_IOS" : "",
                "JPUSH_MEIZU_APPKEY" : "",
                "JPUSH_OPPO_APPID" : "",
                "JPUSH_DEFAULTINITJPUSH_IOS" : "",
                "JPUSH_DEFAULTINITJPUSH_IOS" : "true",
                "JPUSH_VIVO_APPKEY" : "",
                "JPUSH_VIVO_APPID" : "",
                "JPUSH_ISPRODUCTION_IOS" : "",
                "JPUSH_ISPRODUCTION_IOS" : "true",
                "JPUSH_XIAOMI_APPID" : "",
                "__plugin_info__" : {
                    "name" : "JG-JPush",