wl-design-mobile 0.7.9 → 0.8.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wl-design-mobile",
-  "version": "0.7.9",
+  "version": "0.8.1",
   "description": "",
   "main": "index.js",
   "author": "finch",

package/util/jssdk-sczy.js

@@ -2,48 +2,6 @@ import wx from "weixin-js-sdk";
 import config from '../config/config'
 import {axios} from '../util/axios'
 
-const SIGNATURE_CACHE_KEY = 'sczy_js_signature_cache'
-const SIGNATURE_CACHE_TTL = 5 * 60 * 1000
-let configPromise = null
-
-function getCacheKey(url) {
-  return `${SIGNATURE_CACHE_KEY}:${url}`
-}
-
-function getCachedSignature(url) {
-  try {
-    const raw = sessionStorage.getItem(getCacheKey(url))
-    if (!raw) {
-      return null
-    }
-    const cached = JSON.parse(raw)
-    if (!cached || !cached.data || !cached.expireAt || Date.now() > cached.expireAt) {
-      sessionStorage.removeItem(getCacheKey(url))
-      return null
-    }
-    return cached.data
-  } catch (e) {
-    sessionStorage.removeItem(getCacheKey(url))
-    return null
-  }
-}
-
-function setCachedSignature(url, data) {
-  try {
-    sessionStorage.setItem(getCacheKey(url), JSON.stringify({
-      expireAt: Date.now() + SIGNATURE_CACHE_TTL,
-      data,
-    }))
-  } catch (e) {
-    // ignore storage failures
-  }
-}
-
-
-/**
- * 判断ios系统版本号是否大于14
- * @returns {boolean}
- */
 const isIos14AndMore = () => {
   try {
     const str = navigator.userAgent.toLowerCase()
@@ -58,41 +16,33 @@ const isIos14AndMore = () => {
   }
 }
 
-function getSczyJsConfig() {
-  let url = window.location.href.split('#')[0]
+async function getSczyJsConfig() {
+  let url = window.location.href.split('#')[0].toString()
   if (isIos14AndMore()) {
-    const storedUrl = sessionStorage.getItem('ios14ConfigUrl')
-    if (storedUrl) {
-      url = storedUrl
-    }
+    console.log('[jssdk-sczy] iOS 14+，使用当前页面 URL 参与签名', url)
   }
 
-  const cached = getCachedSignature(url)
-  if (cached) {
-    return Promise.resolve(cached)
-  }
-
-  return axios.get(config.platformServerContext + '/api/weixin/js/signature', {
+  const resp = await axios.get(config.platformServerContext + '/api/weixin/js/signature', {
     params: { url }
-  }).then((resp) => {
-    const data = resp && resp.data ? resp.data : {}
-    if (!data || data.data.errcode !== 0 || !data.data) {
-      throw new Error((data && data.errmsg) ? data.errmsg : '获取签名失败')
-    }
-    setCachedSignature(url, data.data)
-    return data.data
   })
-}
 
-function configWx() {
-  if (configPromise) {
-    return configPromise
+  const signatureData = resp.data
+  const errcode = resp.errcode
+  const errmsg = resp.errmsg || resp.message
+
+  if (errcode !== 0) {
+    throw new Error(errmsg)
   }
 
-  configPromise = getSczyJsConfig().then((resp) => {
-    return new Promise((resolve, reject) => {
+  return signatureData
+}
+
+function configWx() {
+  return new Promise((resolve, reject) => {
+    getSczyJsConfig().then((resp) => {
       wx.config({
-        debug: false,
+        beta: true,
+        debug: true,
         appId: resp.appId,
         timestamp: resp.timestamp,
         nonceStr: resp.nonceStr,
@@ -105,37 +55,35 @@ function configWx() {
       })
 
       wx.error((res) => {
-        configPromise = null
         reject('企业微信初始化js-sdk失败' + (res && res.errMsg ? res.errMsg : ''))
       })
+    }).catch((error) => {
+      reject('请求服务端jssdk签名失败：'+error)
     })
-  }).catch((error) => {
-    configPromise = null
-    throw new Error('请求服务端jssdk签名失败：' + error)
   })
-
-  return configPromise
-}
-
-function extractScanText(res) {
-  if (!res) {
-    return ''
-  }
-  if (typeof res === 'string') {
-    return res
-  }
-  return res.resultStr || res.result || res.text || res.code || ''
 }
 
 function scanQRCode() {
   return new Promise((resolve, reject) => {
     configWx().then(() => {
+      if (!wx.scanQRCode) {
+        reject('当前客户端不支持扫码能力')
+        return
+      }
+
       wx.scanQRCode({
         desc: 'scanQRCode desc',
         needResult: 1,
         scanType: ['qrCode', 'barCode'],
         success: function (res) {
-          resolve(extractScanText(res))
+          resolve(res)
+        },
+        fail: function (res) {
+          if (res && res.errMsg && res.errMsg.indexOf('function_not_exist') > -1) {
+            reject('版本过低请升级')
+          } else {
+            reject('企业微信扫码失败,请联系系统管理员!')
+          }
         },
         error: function (res) {
           if (res && res.errMsg && res.errMsg.indexOf('function_not_exist') > -1) {