Merge branch 'dev' into dev-provider

# Conflicts:
#	pages/tabBar/API.uvue

pages/tabBar/API.uvue

@@ -89,11 +89,11 @@
               {
                 name: 'env环境变量',
                 url: 'env'
-              },
-              {
-                name: '获取供应服务商Providers',
-                url: 'get-provider'
-              },
+              },
+              {
+                name: '获取供应服务商Providers',
+                url: 'get-provider'
+              },
               // #endif
               // #ifdef APP-ANDROID
               {
@@ -378,12 +378,10 @@
                 url: 'save-image-to-photos-album'
               },
               // #endif
-              // #ifndef APP-IOS
               {
                 name: "获取图片信息",
                 url: 'get-image-info'
               },
-              // #endif
               // #ifdef APP
               {
                 name: "压缩图片",
@@ -400,12 +398,10 @@
                 url: 'save-video-to-photos-album'
               },
               // #endif
-              // #ifndef APP-IOS
               {
                 name: "获取视频信息",
                 url: 'get-video-info'
               },
-              // #endif
               // #ifdef APP
               {
                 name: "压缩视频",