@mpxjs/api-proxy 2.9.13 → 2.9.14

package/src/platform/api/get-user-info/index.js

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

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

@@ -0,0 +1,36 @@
+import { changeOpts, handleSuccess } from '../../../common/js'
+
+function previewImage (options = {}) {
+  const opts = changeOpts(options)
+
+  if (opts.current) {
+    const idx = options.urls.indexOf(opts.current)
+    opts.current = idx !== -1 ? idx : 0
+  }
+
+  my.previewImage(opts)
+}
+
+function compressImage (options = {}) {
+  const opts = changeOpts(options, {
+    quality: ''
+  }, {
+    compressLevel: Math.round(options.quality / 100 * 4), // 支付宝图片压缩质量为 0 ~ 4，微信是 0 ~ 100
+    apFilePaths: [options.src]
+  })
+
+  handleSuccess(opts, res => {
+    return changeOpts(
+      res,
+      { apFilePaths: '' },
+      { tempFilePath: res.apFilePaths[0] }
+    )
+  })
+
+  my.compressImage(opts)
+}
+
+export {
+  previewImage,
+  compressImage
+}

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

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

package/src/{web/api/preview-image/index.js → platform/api/image/index.web.js}

@@ -1,4 +1,5 @@
 import Preview from './Preview'
+import { envError } from '../../../common/js'
 
 let preview = null
 
@@ -6,7 +7,13 @@ let preview = null
  * 预览图片
  * @param {Object} options - 预览图片的配置项
  */
-export const previewImage = (options) => {
+const previewImage = (options) => {
   if (!preview) preview = new Preview()
   preview.show(options)
 }
+const compressImage = envError('compressImage')
+
+export {
+  previewImage,
+  compressImage
+}

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

@@ -0,0 +1,15 @@
+import { changeOpts, handleSuccess } from '../../../common/js'
+
+function login (options = {}) {
+  const opts = changeOpts(options)
+
+  handleSuccess(opts, res => {
+    return changeOpts(res, { authCode: 'code' }, { errMsg: 'login:ok' })
+  })
+
+  my.getAuthCode(opts)
+}
+
+export {
+  login
+}

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

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

package/src/platform/api/make-phone-call/index.ali.js

@@ -0,0 +1,12 @@
+import { changeOpts } from '../../../common/js'
+
+function makePhoneCall (options = {}) {
+  const opts = changeOpts(options, {
+    phoneNumber: 'number'
+  })
+  my.makePhoneCall(opts)
+}
+
+export {
+  makePhoneCall
+}

package/src/platform/api/make-phone-call/index.js

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

package/src/{web → platform}/api/modal/Modal.js

@@ -1,4 +1,4 @@
-import { ToPromise, createDom, getRootElement, webHandleSuccess } from '../../../common/js'
+import { createDom, getRootElement, webHandleSuccess } from '../../../common/js'
 import '../../../common/stylus/Modal.styl'
 // import { forEach } from '@didi/mpx-fetch/src/util'
 // 汉字为两个字符，字母/数字为一个字符
@@ -13,9 +13,8 @@ const _getLength = (t) => {
   }
   return len
 }
-export default class Modal extends ToPromise {
+export default class Modal {
   constructor () {
-    super()
     this.defaultOpts = {
       title: '',
       content: '',
@@ -82,7 +81,6 @@ export default class Modal extends ToPromise {
         confirm: false
       }
       webHandleSuccess(result, opts.success, opts.complete)
-      this.toPromiseResolve(result)
     }
     this.confirmBtn.onclick = () => {
       this.hide()
@@ -92,12 +90,9 @@ export default class Modal extends ToPromise {
         confirm: true
       }
       webHandleSuccess(result, opts.success, opts.complete)
-      this.toPromiseResolve(result)
     }
 
     this.modal.classList.add('show')
-
-    return this.toPromiseInitPromise()
   }
 
   hide () {

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

@@ -0,0 +1,32 @@
+import { changeOpts, handleSuccess } from '../../../common/js'
+
+function showModal (options = {}) {
+  let opts
+
+  if (options.showCancel === undefined || options.showCancel) {
+    opts = changeOpts(options, {
+      confirmText: 'confirmButtonText',
+      cancelText: 'cancelButtonText'
+    })
+
+    handleSuccess(opts, res => {
+      return changeOpts(res, undefined, { cancel: !res.confirm })
+    })
+
+    my.confirm(opts)
+  } else {
+    opts = changeOpts(options, {
+      confirmText: 'buttonText'
+    })
+
+    handleSuccess(opts, res => {
+      return changeOpts(res, undefined, { cancel: false, confirm: true })
+    })
+
+    my.alert(opts)
+  }
+}
+
+export {
+  showModal
+}

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

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

package/src/platform/api/next-tick/index.ali.js

@@ -0,0 +1,7 @@
+function nextTick (fn) {
+  Promise.resolve().then(fn)
+}
+
+export {
+  nextTick
+}

package/src/platform/api/next-tick/index.js

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

package/src/platform/api/next-tick/index.tt.js

@@ -0,0 +1,7 @@
+function nextTick (fn) {
+  Promise.resolve().then(fn)
+}
+
+export {
+  nextTick
+}

package/src/platform/api/page-scroll-to/index.js

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

package/src/platform/api/pull-down/index.js

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

package/src/{web/api/pull-down/index.js → platform/api/pull-down/index.web.js}

@@ -20,17 +20,13 @@ function stopPullDownRefresh (options = {}) {
         }
       }
     }
-    return new Promise((resolve, reject) => {
-      if (err) {
-        const res = { errMsg: `stopPullDownRefresh:fail ${err}` }
-        webHandleFail(res, options.fail, options.complete)
-        reject(res)
-      } else {
-        const res = { errMsg: 'stopPullDownRefresh:ok' }
-        webHandleSuccess(res, options.success, options.complete)
-        resolve(res)
-      }
-    })
+    if (err) {
+      const res = { errMsg: `stopPullDownRefresh:fail ${err}` }
+      webHandleFail(res, options.fail, options.complete)
+    } else {
+      const res = { errMsg: 'stopPullDownRefresh:ok' }
+      webHandleSuccess(res, options.success, options.complete)
+    }
   }
 }
 
@@ -54,17 +50,13 @@ function startPullDownRefresh (options = {}) {
         }
       }
     }
-    return new Promise((resolve, reject) => {
-      if (err) {
-        const res = { errMsg: `startPullDownRefresh:fail ${err}` }
-        webHandleFail(res, options.fail, options.complete)
-        reject(res)
-      } else {
-        const res = { errMsg: 'startPullDownRefresh:ok' }
-        webHandleSuccess(res, options.success, options.complete)
-        resolve(res)
-      }
-    })
+    if (err) {
+      const res = { errMsg: `startPullDownRefresh:fail ${err}` }
+      webHandleFail(res, options.fail, options.complete)
+    } else {
+      const res = { errMsg: 'startPullDownRefresh:ok' }
+      webHandleSuccess(res, options.success, options.complete)
+    }
   }
 }
 

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

@@ -0,0 +1,26 @@
+import { changeOpts, handleSuccess } from '../../../common/js'
+
+function request (options = {}) {
+  const opts = changeOpts(options, {
+    header: 'headers'
+  })
+
+  handleSuccess(opts, res => {
+    return changeOpts(res, {
+      headers: 'header',
+      status: 'statusCode'
+    })
+  })
+
+  // request 在 1.11.0 以上版本才支持
+  // httpRequest 即将被废弃，钉钉端仍需要使用
+  if (my.canIUse('request')) {
+    return my.request(opts)
+  } else {
+    return my.httpRequest(opts)
+  }
+}
+
+export {
+  request
+}

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

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

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

@@ -51,13 +51,11 @@ function request (options = { url: '' }) {
       clarifyTimeoutError: false
     }
   }
-
   if (method === 'GET') {
     rOptions.params = rOptions.data || {}
     delete rOptions.data
   }
-
-  const promise = axios(rOptions).then(res => {
+  axios(rOptions).then(res => {
     let data = res.data
     if (dataType === 'json' && typeof data === 'string') {
       try {
@@ -81,8 +79,7 @@ function request (options = { url: '' }) {
     }
   })
 
-  promise.__returned = requestTask
-  return promise
+  return requestTask
 }
 
 export {

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}

@@ -15,30 +15,24 @@ function redirectTo (options = {}) {
       webHandleFail(res, options.fail, options.complete)
       return Promise.reject(res)
     }
-    router.__mpxAction = {
-      type: 'redirect'
-    }
+    router.__mpxAction = { type: 'redirect' }
     if (routeCount === 0 && router.currentRoute.query.routeCount) routeCount = router.currentRoute.query.routeCount
-    return new Promise((resolve, reject) => {
-      router.replace(
-        {
-          path: options.url,
-          query: {
-            routeCount: ++routeCount
-          }
-        },
-        () => {
-          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)
+    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)
+      }
+    )
   }
 }
 
@@ -63,26 +57,22 @@ function navigateTo (options = {}) {
       eventChannel._addListeners(options.events)
     }
     if (routeCount === 0 && router.currentRoute.query.routeCount) routeCount = router.currentRoute.query.routeCount
-    return new Promise((resolve, reject) => {
-      router.push(
-        {
-          path: options.url,
-          query: {
-            routeCount: ++routeCount
-          }
-        },
-        () => {
-          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)
+    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)
+      }
+    )
   }
 }
 
@@ -105,7 +95,6 @@ function navigateBack (options = {}) {
     router.go(-delta)
     const res = { errMsg: 'navigateBack:ok' }
     webHandleSuccess(res, options.success, options.complete)
-    return Promise.resolve(res)
   }
 }
 
@@ -129,30 +118,25 @@ function reLaunch (options = {}) {
       router.go(-delta)
     } else {
       router.__mpxAction.replaced = true
-      return new Promise((resolve, reject) => {
-        router.replace(
-          {
-            path: options.url,
-            query: {
-              routeCount
-            }
-          },
-          () => {
-            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)
   }
 }
 
@@ -181,28 +165,23 @@ function switchTab (options = {}) {
         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
+}