@10yun/cv-mobile-ui 0.5.60 → 0.5.62

package/{plugins/uni-richText.js → uview-plus/libs/ctocode/richText.js}

@@ -46,36 +46,33 @@ var GRT = [
   ['th', 'border-right:1px solid #F2F3F4; border-bottom:1px solid #F2F3F4;'],
   ['td', 'border-right:1px solid #F2F3F4; border-bottom:1px solid #F2F3F4; padding-left:5px;']
 ];
-
-export default {
-  format: function (html) {
-    html = html || '';
-    if (html == '') {
-      return '';
-    }
-    html = html.replace(/<pre.*pre>?/gis, function (word) {
-      word = word.replace(/[\n]/gi, '<br />');
-      word = word.replace(/    /gi, '<span style="padding-left:2em;"></span>');
-      return word.replace(/[\t]/gi, '<span style="padding-left:2em;"></span>');
+export function cc_richtext_format(html) {
+  html = html || '';
+  if (html == '') {
+    return '';
+  }
+  html = html.replace(/<pre.*pre>?/gis, function (word) {
+    word = word.replace(/[\n]/gi, '<br />');
+    word = word.replace(/    /gi, '<span style="padding-left:2em;"></span>');
+    return word.replace(/[\t]/gi, '<span style="padding-left:2em;"></span>');
+  });
+  html = html.replace(
+    /<pre/gi,
+    '<p style="font-size:1em; margin:12px 0; line-height:1.2em; background:#F6F7F8; border-radius:5px; padding:8px 4%; width:92%;"'
+  );
+  html = html.replace(/<\/pre/gi, '</p');
+  for (let i = 0; i < GRT.length; i++) {
+    graceRichTextReg = new RegExp('<' + GRT[i][0] + '>|<' + GRT[i][0] + ' (.*?)>', 'gi');
+    html = html.replace(graceRichTextReg, function (word) {
+      // 分析 dom 上是否带有 style=""
+      if (word.indexOf('style=') != -1) {
+        var regIn = new RegExp('<' + GRT[i][0] + '(.*?)style="(.*?)"(.*?)(/?)>', 'gi');
+        return word.replace(regIn, '<' + GRT[i][0] + '$1style="$2 ' + GRT[i][1] + '"$3$4>');
+      } else {
+        var regIn = new RegExp('<' + GRT[i][0] + '(.*?)(/?)>', 'gi');
+        return word.replace(regIn, '<' + GRT[i][0] + '$1 style="' + GRT[i][1] + '$2">');
+      }
     });
-    html = html.replace(
-      /<pre/gi,
-      '<p style="font-size:1em; margin:12px 0; line-height:1.2em; background:#F6F7F8; border-radius:5px; padding:8px 4%; width:92%;"'
-    );
-    html = html.replace(/<\/pre/gi, '</p');
-    for (let i = 0; i < GRT.length; i++) {
-      graceRichTextReg = new RegExp('<' + GRT[i][0] + '>|<' + GRT[i][0] + ' (.*?)>', 'gi');
-      html = html.replace(graceRichTextReg, function (word) {
-        // 分析 dom 上是否带有 style=""
-        if (word.indexOf('style=') != -1) {
-          var regIn = new RegExp('<' + GRT[i][0] + '(.*?)style="(.*?)"(.*?)(/?)>', 'gi');
-          return word.replace(regIn, '<' + GRT[i][0] + '$1style="$2 ' + GRT[i][1] + '"$3$4>');
-        } else {
-          var regIn = new RegExp('<' + GRT[i][0] + '(.*?)(/?)>', 'gi');
-          return word.replace(regIn, '<' + GRT[i][0] + '$1 style="' + GRT[i][1] + '$2">');
-        }
-      });
-    }
-    return html;
   }
-};
+  return html;
+}

package/uview-plus/package-wu.json

@@ -1,15 +1,9 @@
 {
   "id": "u--ui",
-  "displayName": "u-ui如虎添翼 之兼容vue3+2、app、h5、小程序等多端，无论平台，一致体验。",
+  "displayName": "u-ui如虎添翼 之兼容vue3+2、app、h5、小程序等多端，无论平台，一致体验。工具库  全面兼容小程序、nvue、vue3",
   "version": "1.1.5",
-  "description": "u-ui 是 全面兼容多端的uni-app生态框架，基于vue2、vue3和nvue开发。丰富UI组件库，便捷工具库，简单高效。无论平台，一致体验。选择我们，开发更轻松！",
-  "keywords": [
-    "u-ui,",
-    "wuui,",
-    "ui框架,",
-    "uni-app,",
-    "nvue"
-  ],
+  "description": "u-ui 是 全面兼容多端的uni-app生态框架，基于vue3和nvue开发。丰富UI组件库，集成工具库，简单高效。无论平台，一致体验。选择我们，开发更轻松！",
+  "keywords": ["u-ui,", "wuui,", "ui框架,", "uni-app,", "nvue", "工具库", "多端全兼容"],
   "repository": "",
   "engines": {
     "HBuilderX": "^3.5.4"
@@ -35,33 +29,7 @@
     "npmurl": ""
   },
   "uni_modules": {
-    "dependencies": [
-      "u-calendar",
-      "u-sku",
-      "u-image",
-      "u-button",
-      "u-icon",
-      "u-loading-icon",
-      "u-row",
-      "u-link",
-      "u-text",
-      "u-number-box",
-      "u-transition",
-      "u-input",
-      "u-code",
-      "u-navbar",
-      "u-status-bar",
-      "u-safe-bottom",
-      "u-radio",
-      "u-checkbox",
-      "u-textarea",
-      "u-gap",
-      "u-cell",
-      "u-app-update",
-      "u-popup",
-      "u-overlay",
-      "u-action-sheet"
-    ],
+    "dependencies": [],
     "encrypt": [],
     "platforms": {
       "cloud": {
@@ -109,4 +77,4 @@
       }
     }
   }
-}
+}

package/uview-plus/package.json

@@ -1,19 +1,24 @@
 {
-  "id": "uview-plus",
   "name": "uview-plus",
   "displayName": "零云®uview-plus3.0重磅发布，全面的Vue3鸿蒙跨端移动组件库，组件丰富维护更新稳定。",
   "version": "3.6.17",
   "description": "零云®uview-plus已兼容vue3支持多语言，120+全面的组件和便捷的工具会让您信手拈来。近期新增拖动排序、条码、图片裁剪、下拉刷新、虚拟列表、签名、Markdown等。",
   "keywords": [
-    "uview",
-    "uview-plus",
-    "ui",
     "echarts",
     "ui",
+    "uview",
+    "uview-plus",
     "可视化设计"
-],
-  "main": "index.js",
+  ],
   "repository": "https://github.com/ijry/uview-plus",
+  "main": "index.js",
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/"
+  },
+  "dependencies": {
+    "clipboard": "^2.0.11",
+    "dayjs": "^1.11.3"
+  },
   "engines": {
     "HBuilderX": "^3.1.0",
     "uni-app": "^4.66",
@@ -42,6 +47,7 @@
     "i18n": "√",
     "widescreen": "x"
   },
+  "id": "uview-plus",
   "uni_modules": {
     "dependencies": [],
     "encrypt": [],
@@ -100,12 +106,5 @@
         }
       }
     }
-  },
-  "dependencies": {
-    "clipboard": "^2.0.11",
-    "dayjs": "^1.11.3"
-  },
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/"
   }
-}
+}

package/libs/storage2.js

@@ -1,165 +0,0 @@
-import CryptoJS from 'crypto-js';
-// 十六位十六进制数作为密钥
-const SECRET_KEY = CryptoJS.enc.Utf8.parse('3333e6e143439161');
-// 十六位十六进制数作为密钥偏移量
-const SECRET_IV = CryptoJS.enc.Utf8.parse('e3bbe7e3ba84431a');
-
-const config = {
-  type: 'localStorage', // 本地存储类型localStorage、 sessionStorage
-  prefix: 'SDF_0.0.1', // 名称前缀 建议：项目名 + 项目版本
-  expire: 1, //过期时间 单位：秒
-  isEncrypt: true // 默认加密 为了调试方便, 开发过程中可以不加密
-};
-
-// 判断是否支持 Storage
-export const isSupportStorage = () => {
-  return typeof Storage !== 'undefined' ? true : false;
-};
-
-// 设置 setStorage
-export const setStorage = (key, value, expire = 0) => {
-  if (value === '' || value === null || value === undefined) {
-    value = null;
-  }
-  if (isNaN(expire) || expire < 0) throw new Error('Expire must be a number');
-  expire = (expire ? expire : config.expire) * 1000;
-  let data = {
-    value: value, // 存储值
-    time: Date.now(), //存值时间戳
-    expire: expire // 过期时间
-  };
-  const encryptString = config.isEncrypt ? encrypt(JSON.stringify(data)) : JSON.stringify(data);
-  window[config.type].setItem(autoAddPrefix(key), encryptString);
-};
-
-// 获取 getStorage
-export const getStorage = (key) => {
-  key = autoAddPrefix(key);
-  // key 不存在判断
-  if (!window[config.type].getItem(key) || JSON.stringify(window[config.type].getItem(key)) === 'null') {
-    return null;
-  }
-  // 优化 持续使用中续期
-  const storage = config.isEncrypt
-    ? JSON.parse(decrypt(window[config.type].getItem(key)))
-    : JSON.parse(window[config.type].getItem(key));
-
-  let nowTime = Date.now();
-
-  // 过期删除
-  if (storage.expire && config.expire * 6000 < nowTime - storage.time) {
-    removeStorage(key);
-    return null;
-  } else {
-    // 未过期期间被调用 则自动续期 进行保活
-    setStorage(autoRemovePrefix(key), storage.value);
-    return storage.value;
-  }
-};
-
-// 是否存在 hasStorage
-export const hasStorage = (key) => {
-  key = autoAddPrefix(key);
-  let arr = getStorageAll().filter((item) => {
-    return item.key === key;
-  });
-  return arr.length ? true : false;
-};
-
-// 获取所有key
-export const getStorageKeys = () => {
-  let items = getStorageAll();
-  let keys = [];
-  for (let index = 0; index < items.length; index++) {
-    keys.push(items[index].key);
-  }
-  return keys;
-};
-
-// 根据索引获取key
-export const getStorageForIndex = (index) => {
-  return window[config.type].key(index);
-};
-
-// 获取localStorage长度
-export const getStorageLength = () => {
-  return window[config.type].length;
-};
-
-// 获取全部 getAllStorage
-export const getStorageAll = () => {
-  let len = window[config.type].length; // 获取长度
-  let arr = new Array(); // 定义数据集
-  for (let i = 0; i < len; i++) {
-    // 获取key 索引从0开始
-    let getKey = window[config.type].key(i);
-    // 获取key对应的值
-    let getVal = window[config.type].getItem(getKey);
-    // 放进数组
-    arr[i] = { key: getKey, val: getVal };
-  }
-  return arr;
-};
-
-// 删除 removeStorage
-export const removeStorage = (key) => {
-  window[config.type].removeItem(autoAddPrefix(key));
-};
-
-// 清空 clearStorage
-export const clearStorage = () => {
-  window[config.type].clear();
-};
-
-// 名称前自动添加前缀
-const autoAddPrefix = (key) => {
-  const prefix = config.prefix ? config.prefix + '_' : '';
-  return prefix + key;
-};
-
-// 移除已添加的前缀
-const autoRemovePrefix = (key) => {
-  const len = config.prefix ? config.prefix.length + 1 : '';
-  return key.substr(len);
-  // const prefix = config.prefix ? config.prefix + '_' : '';
-  // return  prefix + key;
-};
-
-/**
- * 加密方法
- * @param data
- * @returns {string}
- */
-const encrypt = (data) => {
-  if (typeof data === 'object') {
-    try {
-      data = JSON.stringify(data);
-    } catch (error) {
-      console.log('encrypt error:', error);
-    }
-  }
-  const dataHex = CryptoJS.enc.Utf8.parse(data);
-  const encrypted = CryptoJS.AES.encrypt(dataHex, SECRET_KEY, {
-    iv: SECRET_IV,
-    mode: CryptoJS.mode.CBC,
-    padding: CryptoJS.pad.Pkcs7
-  });
-  return encrypted.ciphertext.toString();
-};
-
-/**
- * 解密方法
- * @param data
- * @returns {string}
- */
-const decrypt = (data) => {
-  const encryptedHexStr = CryptoJS.enc.Hex.parse(data);
-  const str = CryptoJS.enc.Base64.stringify(encryptedHexStr);
-  const decrypt = CryptoJS.AES.decrypt(str, SECRET_KEY, {
-    iv: SECRET_IV,
-    mode: CryptoJS.mode.CBC,
-    padding: CryptoJS.pad.Pkcs7
-  });
-  const decryptedStr = decrypt.toString(CryptoJS.enc.Utf8);
-  return decryptedStr.toString();
-};

package/plugins/tui-validation.js

@@ -1,279 +0,0 @@
-/**
- * 表单验证
- * @author echo.
- * @version 1.5.0
- **/
-
-function _isNullOrEmpty(value) {
-  return value === null || value === '' || value === undefined ? true : false;
-}
-function _isMobile(value) {
-  return /^(?:13\d|14\d|15\d|16\d|17\d|18\d|19\d)\d{5}(\d{3}|\*{3})$/.test(value);
-}
-function _isEmail(value) {
-  return /^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/.test(value);
-}
-function _isCarNo(value) {
-  // 新能源车牌
-  const xreg =
-    /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}(([0-9]{5}[DF]$)|([DF][A-HJ-NP-Z0-9][0-9]{4}$))/;
-  // 旧车牌
-  const creg =
-    /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳]{1}$/;
-  if (value.length === 7) {
-    return creg.test(value);
-  } else if (value.length === 8) {
-    return xreg.test(value);
-  } else {
-    return false;
-  }
-}
-function _isIdCard(value) {
-  let idCard = value;
-  if (idCard.length == 15) {
-    return __isValidityBrithBy15IdCard;
-  } else if (idCard.length == 18) {
-    let arrIdCard = idCard.split('');
-    if (__isValidityBrithBy18IdCard(idCard) && __isTrueValidateCodeBy18IdCard(arrIdCard)) {
-      return true;
-    } else {
-      return false;
-    }
-  } else {
-    return false;
-  }
-}
-function __isTrueValidateCodeBy18IdCard(arrIdCard) {
-  let sum = 0;
-  let Wi = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2, 1];
-  let ValideCode = [1, 0, 10, 9, 8, 7, 6, 5, 4, 3, 2];
-  if (arrIdCard[17].toLowerCase() == 'x') {
-    arrIdCard[17] = 10;
-  }
-  for (let i = 0; i < 17; i++) {
-    sum += Wi[i] * arrIdCard[i];
-  }
-  let valCodePosition = sum % 11;
-  if (arrIdCard[17] == ValideCode[valCodePosition]) {
-    return true;
-  } else {
-    return false;
-  }
-}
-function __isValidityBrithBy18IdCard(idCard18) {
-  let year = idCard18.substring(6, 10);
-  let month = idCard18.substring(10, 12);
-  let day = idCard18.substring(12, 14);
-  let temp_date = new Date(year, parseFloat(month) - 1, parseFloat(day));
-  if (
-    temp_date.getFullYear() != parseFloat(year) ||
-    temp_date.getMonth() != parseFloat(month) - 1 ||
-    temp_date.getDate() != parseFloat(day)
-  ) {
-    return false;
-  } else {
-    return true;
-  }
-}
-function __isValidityBrithBy15IdCard(idCard15) {
-  let year = idCard15.substring(6, 8);
-  let month = idCard15.substring(8, 10);
-  let day = idCard15.substring(10, 12);
-  let temp_date = new Date(year, parseFloat(month) - 1, parseFloat(day));
-
-  if (
-    temp_date.getYear() != parseFloat(year) ||
-    temp_date.getMonth() != parseFloat(month) - 1 ||
-    temp_date.getDate() != parseFloat(day)
-  ) {
-    return false;
-  } else {
-    return true;
-  }
-}
-function _isAmount(value) {
-  //金额，只允许保留两位小数
-  return /^([0-9]*[.]?[0-9])[0-9]{0,1}$/.test(value);
-}
-function _isNum(value) {
-  //只能为数字
-  return /^[0-9]+$/.test(value);
-}
-function _isChinese(value) {
-  let reg = /.*[\u4e00-\u9fa5]+.*$/;
-  return value !== '' && reg.test(value) && !form._isSpecial(value) && !form._isEmoji(value);
-}
-function _isEnglish(value) {
-  return /^[a-zA-Z]*$/.test(value);
-}
-function _isEnAndNo(value) {
-  //8~20位数字和字母组合
-  return /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,20}$/.test(value);
-}
-function _isEnOrNo(value) {
-  //英文或者数字
-  let reg = /.*[\u4e00-\u9fa5]+.*$/;
-  let result = true;
-  if (reg.test(value) || form._isSpecial(value) || form._isEmoji(value)) {
-    result = false;
-  }
-  return result;
-}
-function _isSpecial(value) {
-  //是否包含特殊字符
-  let regEn = /[`~!@#$%^&*()_+<>?:"{},.\/;'[\]]/im,
-    regCn = /[·！#￥（——）：；“”‘、，|《。》？、【】[\]]/im;
-  if (regEn.test(value) || regCn.test(value)) {
-    return true;
-  }
-  return false;
-}
-function _isEmoji(value) {
-  //是否包含表情
-  return /\uD83C[\uDF00-\uDFFF]|\uD83D[\uDC00-\uDE4F]/g.test(value);
-}
-function _isDate(value) {
-  //2019-10-12
-  const reg =
-    /^(?:(?!0000)[0-9]{4}-(?:(?:0[1-9]|1[0-2])-(?:0[1-9]|1[0-9]|2[0-8])|(?:0[13-9]|1[0-2])-(?:29|30)|(?:0[13578]|1[02])-31)|(?:[0-9]{2}(?:0[48]|[2468][048]|[13579][26])|(?:0[48]|[2468][048]|[13579][26])00)-02-29)$/;
-  return reg.test(value);
-}
-function _isUrl(value) {
-  return /^((https?|ftp|file):\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?$/.test(value);
-}
-function _isSame(value1, value2) {
-  return value1 === value2;
-}
-function _isRange(value, range1, range2) {
-  if (!range1 && range1 != 0 && !range2 && range2 != 0) {
-    return true;
-  } else if (!range1 && range1 != 0) {
-    return value <= range2;
-  } else if (!range2 && range2 != 0) {
-    return value >= range1;
-  } else {
-    return value >= range1 && value <= range2;
-  }
-}
-function _minLength(value, min) {
-  return value.length >= Number(min);
-}
-function _maxLength(value, max) {
-  return value.length <= Number(max);
-}
-const form = {
-  //非必填情况下,如果值为空,则不进行校验
-  //当出现错误时返回错误消息，否则返回空即为验证通过
-  /*
-	 formData:Object 表单对象。{key:value,key:value},key==rules.name
-	 rules: Array [{name:name,rule:[],msg:[]},{name:name,rule:[],msg:[]}]
-			name:name 属性=> 元素的名称
-			rule:字符串数组 ["required","isMobile","isEmail","isCarNo","isIdCard","isAmount","isNum","isChinese","isEnglish",isEnAndNo","isSpecial","isEmoji",""isDate","isUrl","isSame:key","range:[1,9]","minLength:9","maxLength:Number"]
-			msg:数组 []。 与数组 rule 长度相同,对应的错误提示信息
-	*/
-  validation: function (formData, rules) {
-    for (let item of rules) {
-      let key = item.name;
-      let rule = item.rule;
-      let msgArr = item.msg;
-      if (!key || !rule || rule.length === 0 || !msgArr || msgArr.length === 0) {
-        continue;
-      }
-      for (let i = 0, length = rule.length; i < length; i++) {
-        let ruleItem = rule[i];
-        let msg = msgArr[i];
-        if (!ruleItem) {
-          return;
-        }
-        if (!ruleItem || !msg || (!~rule.indexOf('required') && formData[key].toString().length === 0)) {
-          continue;
-        }
-        //数据处理
-        let value = null;
-        if (~ruleItem.indexOf(':')) {
-          let temp = ruleItem.split(':');
-          ruleItem = temp[0];
-          value = temp[1];
-        }
-        let isError = false;
-        switch (ruleItem) {
-          case 'required':
-            isError = _isNullOrEmpty(formData[key]);
-            break;
-          case 'isMobile':
-            isError = !_isMobile(formData[key]);
-            break;
-          case 'isEmail':
-            isError = !_isEmail(formData[key]);
-            break;
-          case 'isCarNo':
-            isError = !_isCarNo(formData[key]);
-            break;
-          case 'isIdCard':
-            isError = !_isIdCard(formData[key]);
-            break;
-          case 'isAmount':
-            isError = !_isAmount(formData[key]);
-            break;
-          case 'isNum':
-            isError = !_isNum(formData[key]);
-            break;
-          case 'isChinese':
-            isError = !_isChinese(formData[key]);
-            break;
-          case 'isEnglish':
-            isError = !_isEnglish(formData[key]);
-            break;
-          case 'isEnAndNo':
-            isError = !_isEnAndNo(formData[key]);
-            break;
-          case 'isEnOrNo':
-            isError = !_isEnOrNo(formData[key]);
-            break;
-          case 'isSpecial':
-            isError = _isSpecial(formData[key]);
-            break;
-          case 'isEmoji':
-            isError = _isEmoji(formData[key]);
-            break;
-          case 'isDate':
-            isError = !_isDate(formData[key]);
-            break;
-          case 'isUrl':
-            isError = !_isUrl(formData[key]);
-            break;
-          case 'isSame':
-            isError = !_isSame(formData[key], formData[value]);
-            break;
-          case 'range':
-            let range = null;
-            try {
-              range = JSON.parse(value);
-              if (range.length <= 1) {
-                throw new Error('range值传入有误！');
-              }
-            } catch (e) {
-              return 'range值传入有误！';
-            }
-            isError = !_isRange(formData[key], range[0], range[1]);
-            break;
-          case 'minLength':
-            isError = !_minLength(formData[key], value);
-            break;
-          case 'maxLength':
-            isError = !_maxLength(formData[key], value);
-            break;
-          default:
-            break;
-        }
-        if (isError) {
-          return msg;
-        }
-      }
-    }
-    return '';
-  }
-};
-export default {
-  validation: form.validation
-};

package/plugins/uni-scanCode.js

@@ -1,76 +0,0 @@
-function scanCodeFunc() {
-  // #ifdef H5
-  uni.showToast({
-    title: 'h5不支持扫码'
-  });
-  // #endif
-  // #ifndef H5
-
-  // #ifdef APP-PLUS
-  var icon = plus.nativeObj.View.getViewById('icon0');
-  if (icon) {
-    setTimeout(function () {
-      icon.hide();
-    }, 5);
-    uni.setTabBarItem({
-      index: 0,
-      selectedIconPath: '/static/a2.png'
-    });
-  }
-  // #endif
-
-  return new Promise((resolve, reject) => {
-    uni.scanCode({
-      scanType: ['qrCode'],
-      success: function (res) {
-        // uni.showModal({
-        // 	title: '提示',
-        // 	showCancel: false,
-        // 	content:'条码内容：' + res.result
-        // });
-        console.log('条码类型：' + res.scanType);
-        console.log('条码内容：' + res.result);
-
-        let codeRes = res.result;
-
-        // 模拟扫码成功
-        // let codeRes="type=1&&qr_code=b9ed77aa9b17df6cc0683ea4088970ec&&time=1556091878";
-
-        codeRes = codeRes.toString();
-        let jianche = codeRes.slice(0, 5);
-
-        if (jianche == 'type=') {
-          let resArr = codeRes.split('&&');
-
-          let ustypeArr = resArr[0].split('=');
-          let ustype = ustypeArr[1]; //用户类型
-          let usQrArr = resArr[1].split('=');
-          let usQr = usQrArr[1]; //扫码结果
-          return resolve({
-            resArr: resArr,
-            ustype: ustype,
-            usQrArr: usQrArr,
-            usQr: usQr
-          });
-        } else {
-          uni.showToast({
-            title: '不是该应用的二维码',
-            icon: 'none'
-          });
-        }
-      },
-      complete: function (res) {
-        console.log('scancomplete');
-      },
-      fail: (res) => {
-        reject(res.result);
-        console.log('failfailfailfailfailfailfailfailfailfailfail');
-        uni.showToast({
-          title: res.result
-        });
-      }
-    });
-  });
-
-  // #endif
-}