解决冲突

wuye-manager-uniapp/manifest.json

@@ -5,7 +5,6 @@
   "versionName": "1.0.0",
   "versionCode": "100",
   "transformPx": false,
-  /* 5+App特有相关 */
   "app-plus": {
     "usingComponents": true,
     "nvueStyleCompiler": "uni-app",
@@ -14,17 +13,15 @@
       "alwaysShowBeforeRender": true,
       "waiting": true,
       "autoclose": true,
-      "delay": 0
+      "delay": 0,
+      "useOriginalMsgbox": true
     },
-    /* 模块配置 */
     "modules": {
       "Geolocation": {},
       "Camera": {},
       "Push": {}
     },
-    /* 应用发布信息 */
     "distribute": {
-      /* android打包配置 */
       "android": {
         "permissions": [
           "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
@@ -44,11 +41,19 @@
           "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
         ]
       },
-      /* ios打包配置 */
       "ios": {
-        "dSYMs": false
+        "dSYMs": false,
+        "privacyDescription": {
+          "NSPhotoLibraryUsageDescription": "需要访问相册选择图片",
+          "NSPhotoLibraryAddUsageDescription": "需要保存图片到相册",
+          "NSCameraUsageDescription": "需要使用摄像头进行扫码/拍照",
+          "NSLocationWhenInUseUsageDescription": "需要获取位置信息",
+          "NSLocationAlwaysAndWhenInUseUsageDescription": "需要获取位置信息"
+        },
+        "urltypes": [{
+          "urlschemes": ["unionpaycashier"]
+        }]
       },
-      /* SDK配置 */
       "sdkConfigs": {
         "push": {
           "unipush": {
@@ -63,141 +68,15 @@
             "fcm": {}
           }
         },
-<<<<<<< .mine
-        /* 模块配置 */
-        "modules" : {
-            "Geolocation" : {},
-            "Camera" : {},
-            "Push" : {}
-        },
-        /* 应用发布信息 */
-        "distribute" : {
-            /* android打包配置 */
-            "android" : {
-                "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<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\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
-            },
-            /* ios打包配置 */
-            "ios" : {
-                "dSYMs" : false
-            },
-            /* SDK配置 */
-            "sdkConfigs" : {
-                "push" : {
-                    "unipush" : {
-                        "version" : "2",
-                        "offline" : true,
-                        "hms" : {},
-                        "oppo" : {},
-                        "vivo" : {},
-                        "mi" : {},
-                        "meizu" : {},
-                        "honor" : {},
-                        "fcm" : {},
-                        "icons" : {
-                            "small" : {
-                                "mdpi" : "D:/图片文档/logo-app.png"
-                            }
-                        }
-                    }
-                },
         "geolocation": {
           "system": {
             "__platform__": ["ios", "android"]
           }
         }
-            },
-            "splashscreen" : {
-                "useOriginalMsgbox" : true
-            }
-=======
-        "geolocation": {
-          "system": {
-            "__platform__": ["ios", "android"]
-          }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
->>>>>>> .theirs
-        }
-      },
-      "splashscreen": {
-        "useOriginalMsgbox": true
       }
     }
   },
-  /* 快应用特有相关 */
   "quickapp": {},
-  /* 小程序特有相关 */
   "mp-weixin": {
     "appid": "wx40625124315d2de1",
     "usingComponents": true,
@@ -219,5 +98,3 @@
   "locale": "zh-Hans",
   "fallbackLocale": "zh-Hans"
 }
-/* ios打包配置 */
-/* SDK配置 */