@mpxjs/api-proxy 2.8.39 → 2.8.40-test.1

package/src/platform/api/request-payment/index.ali.js

@@ -0,0 +1,45 @@
+import { changeOpts, error, noop } from '../../../common/js'
+
+const TIPS_NAME = '支付宝环境 mpx'
+
+function requestPayment (options = {}) {
+  if (!options.tradeNO) {
+    error(`请在支付函数 ${TIPS_NAME}.requestPayment 中添加 tradeNO 参数用于支付宝支付`)
+  }
+
+  const opts = changeOpts(options, {
+    timeStamp: '',
+    nonceStr: '',
+    package: '',
+    signType: '',
+    paySign: ''
+  })
+
+  const cacheSuc = opts.success || noop
+  const cacheFail = opts.fail || noop
+
+  // 抹平用微信的 complete
+  if (typeof opts.complete === 'function') {
+    const cacheComplete = opts.complete
+    opts.complete = function (res) {
+      if (+res.resultCode === 9000) {
+        res.errMsg = 'requestPayment:ok'
+        cacheComplete.call(this, res)
+      }
+    }
+  }
+
+  opts.success = function (res) {
+    if (+res.resultCode === 9000) {
+      cacheSuc.call(this, res)
+    } else {
+      cacheFail.call(this, res)
+    }
+  }
+
+  my.tradePay(opts)
+}
+
+export {
+  requestPayment
+}

package/src/platform/api/request-payment/index.js

@@ -0,0 +1,9 @@
+import { getEnvObj, envError } from '../../../common/js'
+
+const ENV_OBJ = getEnvObj()
+
+const requestPayment = ENV_OBJ.requestPayment || envError('requestPayment')
+
+export {
+  requestPayment
+}

package/src/platform/api/route/index.js

@@ -0,0 +1,21 @@
+import { getEnvObj, envError } from '../../../common/js'
+
+const ENV_OBJ = getEnvObj()
+
+const redirectTo = ENV_OBJ.redirectTo || envError('redirectTo')
+
+const navigateTo = ENV_OBJ.navigateTo || envError('navigateTo')
+
+const navigateBack = ENV_OBJ.navigateBack || envError('navigateBack')
+
+const reLaunch = ENV_OBJ.reLaunch || envError('reLaunch')
+
+const switchTab = ENV_OBJ.switchTab || envError('switchTab')
+
+export {
+  redirectTo,
+  navigateTo,
+  navigateBack,
+  reLaunch,
+  switchTab
+}

package/src/{web/api/route/index.js → platform/api/route/index.web.js}

@@ -1,6 +1,8 @@
 import { webHandleSuccess, webHandleFail, isTabBarPage } from '../../../common/js'
 import { EventChannel } from '../event-channel'
 
+let routeCount = 0
+
 function redirectTo (options = {}) {
   const router = global.__mpxRouter
   if (router) {
@@ -10,23 +12,23 @@ function redirectTo (options = {}) {
       return Promise.reject(res)
     }
     router.__mpxAction = { type: 'redirect' }
-    return new Promise((resolve, reject) => {
-      router.replace(
-        {
-          path: options.url
-        },
-        () => {
-          const res = { errMsg: 'redirectTo:ok' }
-          webHandleSuccess(res, options.success, options.complete)
-          resolve(res)
-        },
-        err => {
-          const res = { errMsg: `redirectTo:fail ${err}` }
-          webHandleFail(res, options.fail, options.complete)
-          reject(res)
+    if (routeCount === 0 && router.currentRoute.query.routeCount) routeCount = router.currentRoute.query.routeCount
+    router.replace(
+      {
+        path: options.url,
+        query: {
+          routeCount: ++routeCount
         }
-      )
-    })
+      },
+      () => {
+        const res = { errMsg: 'redirectTo:ok' }
+        webHandleSuccess(res, options.success, options.complete)
+      },
+      err => {
+        const res = { errMsg: `redirectTo:fail ${err}` }
+        webHandleFail(res, options.fail, options.complete)
+      }
+    )
   }
 }
 
@@ -46,30 +48,34 @@ function navigateTo (options = {}) {
     if (options.events) {
       eventChannel._addListeners(options.events)
     }
-    return new Promise((resolve, reject) => {
-      router.push(
-        {
-          path: options.url
-        },
-        () => {
-          const res = { errMsg: 'navigateTo:ok', eventChannel }
-          webHandleSuccess(res, options.success, options.complete)
-          resolve(res)
-        },
-        err => {
-          const res = { errMsg: err }
-          webHandleFail(res, options.fail, options.complete)
-          reject(res)
+    if (routeCount === 0 && router.currentRoute.query.routeCount) routeCount = router.currentRoute.query.routeCount
+    router.push(
+      {
+        path: options.url,
+        query: {
+          routeCount: ++routeCount
         }
-      )
-    })
+      },
+      () => {
+        const res = { errMsg: 'navigateTo:ok', eventChannel }
+        webHandleSuccess(res, options.success, options.complete)
+      },
+      err => {
+        const res = { errMsg: err }
+        webHandleFail(res, options.fail, options.complete)
+      }
+    )
   }
 }
 
 function navigateBack (options = {}) {
   const router = global.__mpxRouter
   if (router) {
-    const delta = options.delta || 1
+    let delta = options.delta || 1
+    const stackLength = router.stack.length
+    if (stackLength > 1 && delta >= stackLength) {
+      delta = stackLength - 1
+    }
     router.__mpxAction = {
       type: 'back',
       delta
@@ -77,52 +83,44 @@ function navigateBack (options = {}) {
     router.go(-delta)
     const res = { errMsg: 'navigateBack:ok' }
     webHandleSuccess(res, options.success, options.complete)
-    return Promise.resolve(res)
   }
 }
 
-let reLaunchCount = 0
-
 function reLaunch (options = {}) {
   const router = global.__mpxRouter
   if (router) {
-    if (reLaunchCount === 0 && router.currentRoute.query.reLaunchCount) reLaunchCount = router.currentRoute.query.reLaunchCount
-    const delta = router.stack.length - 1
+    if (routeCount === 0 && router.currentRoute.query.routeCount) routeCount = router.currentRoute.query.routeCount
     router.__mpxAction = {
       type: 'reLaunch',
       path: options.url,
-      reLaunchCount: ++reLaunchCount,
+      routeCount: ++routeCount,
       replaced: false
     }
+    const delta = router.stack.length - 1
     // 在需要操作后退时，先操作后退，在beforeEach中基于当前action通过next()进行replace操作，避免部分浏览器的表现不一致
     if (delta > 0) {
       router.go(-delta)
     } else {
       router.__mpxAction.replaced = true
-      return new Promise((resolve, reject) => {
-        router.replace(
-          {
-            path: options.url,
-            query: {
-              reLaunchCount
-            }
-          },
-          () => {
-            const res = { errMsg: 'reLaunch:ok' }
-            webHandleSuccess(res, options.success, options.complete)
-            resolve(res)
-          },
-          err => {
-            const res = { errMsg: err }
-            webHandleFail(res, options.fail, options.complete)
-            !options.fail && reject(res)
+      router.replace(
+        {
+          path: options.url,
+          query: {
+            routeCount
           }
-        )
-      })
+        },
+        () => {
+          const res = { errMsg: 'reLaunch:ok' }
+          webHandleSuccess(res, options.success, options.complete)
+        },
+        err => {
+          const res = { errMsg: err }
+          webHandleFail(res, options.fail, options.complete)
+        }
+      )
     }
     const res = { errMsg: 'reLaunch:ok' }
     webHandleSuccess(res, options.success, options.complete)
-    return Promise.resolve(res)
   }
 }
 
@@ -137,38 +135,33 @@ function switchTab (options = {}) {
         webHandleFail(res, options.fail, options.complete)
         return Promise.reject(res)
       }
-      const delta = router.stack.length - 1
       router.__mpxAction = {
         type: 'switch',
         path: options.url,
         replaced: false
       }
+      const delta = router.stack.length - 1
       if (delta > 0) {
         router.go(-delta)
       } else {
         router.__mpxAction.replaced = true
-        return new Promise((resolve, reject) => {
-          router.replace(
-            {
-              path: options.url
-            },
-            () => {
-              const res = { errMsg: 'switchTab:ok' }
-              webHandleSuccess(res, options.success, options.complete)
-              resolve(res)
-            },
-            err => {
-              const res = { errMsg: err }
-              webHandleFail(res, options.fail, options.complete)
-              !options.fail && reject(res)
-            }
-          )
-        })
+        router.replace(
+          {
+            path: options.url
+          },
+          () => {
+            const res = { errMsg: 'switchTab:ok' }
+            webHandleSuccess(res, options.success, options.complete)
+          },
+          err => {
+            const res = { errMsg: err }
+            webHandleFail(res, options.fail, options.complete)
+          }
+        )
       }
     }
     const res = { errMsg: 'switchTab:ok' }
     webHandleSuccess(res, options.success, options.complete)
-    return Promise.resolve(res)
   }
 }
 

package/src/platform/api/scan-code/index.ali.js

@@ -0,0 +1,17 @@
+import { changeOpts, handleSuccess } from '../../../common/js'
+
+function scanCode (options = {}) {
+  const opts = changeOpts(options, {
+    onlyFromCamera: 'hideAlbum'
+  })
+
+  handleSuccess(opts, res => {
+    return changeOpts(res, { code: 'result' })
+  })
+
+  my.scan(opts)
+}
+
+export {
+  scanCode
+}

package/src/platform/api/scan-code/index.js

@@ -0,0 +1,9 @@
+import { getEnvObj, envError } from '../../../common/js'
+
+const ENV_OBJ = getEnvObj()
+
+const scanCode = ENV_OBJ.scanCode || envError('scanCode')
+
+export {
+  scanCode
+}

package/src/platform/api/screen-brightness/index.ali.js

@@ -0,0 +1,26 @@
+import { changeOpts, handleSuccess } from '../../../common/js'
+
+function setScreenBrightness (options = {}) {
+  const opts = changeOpts(options, {
+    value: 'brightness'
+  })
+  handleSuccess(opts, res => {
+    return changeOpts(res, {}, { errMsg: 'setScreenBrightness:ok' })
+  })
+  my.setScreenBrightness(opts)
+}
+
+function getScreenBrightness (options = {}) {
+  const opts = changeOpts(options)
+
+  handleSuccess(opts, res => {
+    return changeOpts(res, { brightness: 'value' }, { errMsg: 'getScreenBrightness:ok' })
+  })
+
+  my.getScreenBrightness(opts)
+}
+
+export {
+  setScreenBrightness,
+  getScreenBrightness
+}

package/src/platform/api/screen-brightness/index.js

@@ -0,0 +1,12 @@
+import { getEnvObj, envError } from '../../../common/js'
+
+const ENV_OBJ = getEnvObj()
+
+const setScreenBrightness = ENV_OBJ.setScreenBrightness || envError('setScreenBrightness')
+
+const getScreenBrightness = ENV_OBJ.getScreenBrightness || envError('getScreenBrightness')
+
+export {
+  setScreenBrightness,
+  getScreenBrightness
+}

package/src/platform/api/set-navigation-bar/index.ali.js

@@ -0,0 +1,25 @@
+import { changeOpts, handleSuccess } from '../../../common/js'
+
+function setNavigationBarTitle (options = {}) {
+  handleSuccess(options, res => {
+    return changeOpts(res, {}, { errMsg: 'setScreenBrightness:ok' })
+  })
+  if (my.canIUse('setNavigationBarTitle')) {
+    my.setNavigationBarTitle(options)
+    return
+  }
+  my.setNavigationBar(options)
+}
+
+function setNavigationBarColor (options = {}) {
+  if (my.canIUse('setNavigationBarColor')) {
+    my.setNavigationBarColor(options)
+    return
+  }
+  my.setNavigationBar(options)
+}
+
+export {
+  setNavigationBarTitle,
+  setNavigationBarColor
+}

package/src/platform/api/set-navigation-bar/index.js

@@ -0,0 +1,12 @@
+import { getEnvObj, envError } from '../../../common/js'
+
+const ENV_OBJ = getEnvObj()
+
+const setNavigationBarTitle = ENV_OBJ.setNavigationBarTitle || envError('setNavigationBarTitle')
+
+const setNavigationBarColor = ENV_OBJ.setNavigationBarColor || envError('setNavigationBarColor')
+
+export {
+  setNavigationBarTitle,
+  setNavigationBarColor
+}

package/src/{web/api/set-navigation-bar/index.js → platform/api/set-navigation-bar/index.web.js}

@@ -2,7 +2,6 @@ import { webHandleSuccess } from '../../../common/js'
 
 function setNavigationBarTitle (options = {}) {
   const { title, success, complete } = options
-
   if (document.title !== title) {
     document.title = title
   }

package/src/{web → platform}/api/socket/SocketTask.js

@@ -56,7 +56,7 @@ class SocketTask {
     }
   }
 
-  close (options) {
+  close (options = {}) {
     const { code = 1000, reason = '', success, fail, complete } = options
     this._closeData = {
       code,

package/src/platform/api/socket/index.js

@@ -0,0 +1,9 @@
+import { getEnvObj, envError } from '../../../common/js'
+
+const ENV_OBJ = getEnvObj()
+
+const connectSocket = ENV_OBJ.connectSocket || envError('connectSocket')
+
+export {
+  connectSocket
+}

package/src/platform/api/storage/index.ali.js

@@ -0,0 +1,59 @@
+function setStorage (options) {
+  my.setStorage(options)
+}
+
+function setStorageSync (key, data) {
+  my.setStorageSync({
+    key,
+    data
+  })
+}
+
+function getStorage (options) {
+  my.getStorage(options)
+}
+
+function getStorageSync (key) {
+  return my.getStorageSync({
+    key
+  }).data
+}
+
+function getStorageInfo (options) {
+  return my.getStorageInfo(options)
+}
+
+function getStorageInfoSync () {
+  return my.getStorageInfoSync()
+}
+
+function removeStorage (options) {
+  return my.removeStorage(options)
+}
+
+function removeStorageSync (key) {
+  my.removeStorageSync({
+    key
+  })
+}
+
+function clearStorage (options) {
+  my.clearStorage(options)
+}
+
+function clearStorageSync (options) {
+  my.clearStorageSync(options)
+}
+
+export {
+  setStorage,
+  setStorageSync,
+  getStorage,
+  getStorageSync,
+  getStorageInfo,
+  getStorageInfoSync,
+  removeStorage,
+  removeStorageSync,
+  clearStorage,
+  clearStorageSync
+}

package/src/platform/api/storage/index.js

@@ -0,0 +1,36 @@
+import { getEnvObj, envError } from '../../../common/js'
+
+const ENV_OBJ = getEnvObj()
+
+const setStorage = ENV_OBJ.setStorage || envError('setStorage')
+
+const setStorageSync = ENV_OBJ.setStorageSync || envError('setStorageSync')
+
+const getStorage = ENV_OBJ.getStorage || envError('getStorage')
+
+const getStorageSync = ENV_OBJ.getStorageSync || envError('getStorageSync')
+
+const getStorageInfo = ENV_OBJ.getStorageInfo || envError('getStorageInfo')
+
+const getStorageInfoSync = ENV_OBJ.getStorageInfoSync || envError('getStorageInfoSync')
+
+const removeStorage = ENV_OBJ.removeStorage || envError('removeStorage')
+
+const removeStorageSync = ENV_OBJ.removeStorageSync || envError('removeStorageSync')
+
+const clearStorage = ENV_OBJ.clearStorage || envError('clearStorage')
+
+const clearStorageSync = ENV_OBJ.clearStorageSync || envError('clearStorageSync')
+
+export {
+  setStorage,
+  setStorageSync,
+  getStorage,
+  getStorageSync,
+  getStorageInfo,
+  getStorageInfoSync,
+  removeStorage,
+  removeStorageSync,
+  clearStorage,
+  clearStorageSync
+}

package/src/{web/api/storage/index.js → platform/api/storage/index.web.js}

@@ -8,11 +8,9 @@ function setStorage (options = {}) {
 
     const res = { errMsg: 'setStorage:ok' }
     webHandleSuccess(res, success, complete)
-    return Promise.resolve(res)
   } catch (err) {
     const res = { errMsg: `setStorage:fail ${err}` }
     webHandleFail(res, fail, complete)
-    return Promise.reject(res)
   }
 }
 
@@ -34,11 +32,9 @@ function getStorage (options = {}) {
   if (result) {
     const res = { errMsg: 'getStorage:ok', data: data }
     webHandleSuccess(res, success, complete)
-    return Promise.resolve(res)
   } else {
     const res = { errMsg: 'getStorage:fail', data: null }
     webHandleFail(res, fail, complete)
-    return Promise.reject(res)
   }
 }
 
@@ -71,11 +67,9 @@ function getStorageInfo (options = {}) {
 
     const res = Object.assign({}, { errMsg: 'getStorageInfo:ok' }, info)
     webHandleSuccess(res, success, complete)
-    return Promise.resolve(res)
   } catch (err) {
     const res = { errMsg: `getStorageInfo:fail ${err}` }
     webHandleFail(res, fail, complete)
-    return Promise.reject(res)
   }
 }
 
@@ -95,11 +89,9 @@ function removeStorage (options = { key: '' }) {
 
     const res = { errMsg: 'removeStorage:ok' }
     webHandleSuccess(res, success, complete)
-    return Promise.resolve(res)
   } catch (err) {
     const res = { errMsg: `removeStorage:fail ${err}` }
     webHandleFail(res, fail, complete)
-    return Promise.reject(res)
   }
 }
 
@@ -115,11 +107,9 @@ function clearStorage (options = {}) {
 
     const res = { errMsg: 'clearStorage:ok' }
     webHandleSuccess(res, success, complete)
-    return Promise.resolve(res)
   } catch (err) {
     const res = { errMsg: `clearStorage:fail ${err}` }
     webHandleFail(res, fail, complete)
-    return Promise.reject(res)
   }
 }
 

package/src/platform/api/system/index.ali.js

@@ -0,0 +1,38 @@
+import { changeOpts, handleSuccess } from '../../../common/js'
+
+function getSystemInfo (options = {}) {
+  const opts = changeOpts(options)
+
+  handleSuccess(opts, res => {
+    res.system = `${res.platform} ${res.system}`
+    res.SDKVersion = my.SDKVersion
+
+    // 支付宝 windowHeight 可能为 0
+    if (!res.windowHeight) {
+      res.windowHeight = Math.floor(res.screenHeight * res.windowWidth / res.screenWidth) - 50
+    }
+
+    return res
+  })
+
+  my.getSystemInfo(opts)
+}
+
+function getSystemInfoSync () {
+  const res = my.getSystemInfoSync() || {}
+
+  res.system = `${res.platform} ${res.system}`
+  res.SDKVersion = my.SDKVersion
+
+  // 支付宝 windowHeight 可能为 0
+  if (!res.windowHeight) {
+    res.windowHeight = Math.floor(res.screenHeight * res.windowWidth / res.screenWidth) - 50
+  }
+
+  return res
+}
+
+export {
+  getSystemInfo,
+  getSystemInfoSync
+}

package/src/platform/api/system/index.js

@@ -0,0 +1,12 @@
+import { getEnvObj, envError } from '../../../common/js'
+
+const ENV_OBJ = getEnvObj()
+
+const getSystemInfo = ENV_OBJ.getSystemInfo || envError('getSystemInfo')
+
+const getSystemInfoSync = ENV_OBJ.getSystemInfoSync || envError('getSystemInfoSync')
+
+export {
+  getSystemInfo,
+  getSystemInfoSync
+}

package/src/{web/api/system/index.js → platform/api/system/index.web.js}

@@ -69,7 +69,6 @@ function getSystemInfo (options = {}) {
   const info = getSystemInfoSync()
   const res = Object.assign({ errMsg: 'getSystemInfo:ok' }, info)
   webHandleSuccess(res, options.success, options.complete)
-  return Promise.resolve(res)
 }
 
 export {

package/src/platform/api/tab-bar/index.js

@@ -0,0 +1,18 @@
+import { getEnvObj, envError } from '../../../common/js'
+
+const ENV_OBJ = getEnvObj()
+
+const setTabBarItem = ENV_OBJ.setTabBarItem || envError('setTabBarItem')
+
+const setTabBarStyle = ENV_OBJ.setTabBarStyle || envError('setTabBarStyle')
+
+const showTabBar = ENV_OBJ.showTabBar || envError('showTabBar')
+
+const hideTabBar = ENV_OBJ.hideTabBar || envError('hideTabBar')
+
+export {
+  setTabBarItem,
+  setTabBarStyle,
+  showTabBar,
+  hideTabBar
+}