Merge branch 'dev' of github.com:dcloudio/uni-app into dev

package.json

@@ -58,6 +58,8 @@
 			"uni": true,
 			"Vue": true,
 			"wx": true,
+			"my": true,
+			"swan": true,
 			"__uniConfig": true,
 			"__uniRoutes": true,
 			"UniViewJSBridge": true,

src/platforms/mp-alipay/service/api/index.js

+export function setStorageSync (key, data) {
+  return my.setStorageSync({
+    key,
+    data
+  })
+}
+export function getStorageSync (key) {
+  const result = my.getStorageSync({
+    key
+  })
+  // 不知道会不会出现 success 为 false 情况，暂时这样处理下。
+  if (result.success) {
+    return result.data || ''
+  } else {
+    return ''
+  }
+}
+export function removeStorageSync (key) {
+  return my.removeStorageSync({
+    key
+  })
+}

src/platforms/mp-alipay/service/api/protocols.js

@@ -222,31 +222,12 @@ const protocols = { // 需要做转换的 API 列表
       type: false,
       altitude: false
     }
-    //     returnValue: {
-    //       speed: false,
-    //       altitude: false,
-    //       verticalAccuracy: false
-    //     }
   },
   openLocation: {
     args: {
       // TODO address 参数在阿里上是必传的
     }
   },
-  getSystemInfo: {
-    //     returnValue: {
-    //       brand: false,
-    //       statusBarHeight: false,
-    //       SDKVersion: false
-    //     }
-  },
-  getSystemInfoSync: {
-    //     returnValue: {
-    //       brand: false,
-    //       statusBarHeight: false,
-    //       SDKVersion: false
-    //     }
-  },
   getNetworkType: {
     returnValue: _handleNetworkInfo
   },