321

.eslintrc.js

 module.exports = {
-  root: true,
-  "env": {
-    "browser": true,
-    "es6": true
-  },
-  "parser":"vue-eslint-parser",
-  // "extends": [
-  //     "eslint:recommended",
-  //     "plugin:vue/essential",
-  //     "plugin:@typescript-eslint/eslint-recommended"
-  // ]
+  "ecmaFeatures": {
+    "modules": true,
+    "spread" : true,
+    "restParams" : true
+},
+"env" : {
+    "browser" : true,
+    "node" : true,
+    "es6" : true
+},
+// "rules" : {
+//     "no-unused-vars" : 2,
+//     "no-undef" : 2
+// },
+"parserOptions": {
+    "sourceType": "module"
+}
 }

package-lock.json

@@ -21904,7 +21904,6 @@
     },
     "@fortawesome/fontawesome-common-types": {
       "version": "0.2.36",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.36.tgz",
       "integrity": "sha512-a/7BiSgobHAgBWeN7N0w+lAhInrGxksn13uK7231n2m8EDPE3BMCl9NZLTGrj9ZXfCmC6LM0QLqXidIizVQ6yg=="
     },
@@ -21912,15 +21911,6 @@
       "version": "5.15.4",
       "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.4.tgz",
       "integrity": "sha512-JLmQfz6tdtwxoihXLg6lT78BorrFyCf59SAwBM6qV/0zXyVeDygJVb3fk+j5Qat+Yvcxp1buLTY5iDh1ZSAQ8w==",
-=======
-      "resolved": "https://registry.nlark.com/@fortawesome/fontawesome-common-types/download/@fortawesome/fontawesome-common-types-0.2.36.tgz",
-      "integrity": "sha1-tE5S2ztrIFI+DFfvjELTFVMsuQM="
-    },
-    "@fortawesome/free-solid-svg-icons": {
-      "version": "5.15.4",
-      "resolved": "https://registry.nlark.com/@fortawesome/free-solid-svg-icons/download/@fortawesome/free-solid-svg-icons-5.15.4.tgz",
-      "integrity": "sha1-Kmjz/D3doS5SZFZUFCueTo+7bMU=",
->>>>>>> 161633bb5417ffbd3b53803a03dc782d47a3bc5c
       "requires": {
         "@fortawesome/fontawesome-common-types": "^0.2.36"
       }
@@ -25775,13 +25765,8 @@
     },
     "cookie-storage": {
       "version": "6.1.0",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/cookie-storage/-/cookie-storage-6.1.0.tgz",
       "integrity": "sha512-HeVqbVy8BjXhAAuFtL6MTG+witHoLbxfky2jgVh9FmxmyL6IKa9gSSyPNjevXCCCxPu6Tzd9J8+eXTRQzYU/cg=="
-=======
-      "resolved": "https://registry.npm.taobao.org/cookie-storage/download/cookie-storage-6.1.0.tgz",
-      "integrity": "sha1-KRsvZi2WG+RPmZYmWTQhy/zyN5A="
->>>>>>> 161633bb5417ffbd3b53803a03dc782d47a3bc5c
     },
     "copy-anything": {
       "version": "2.0.3",
@@ -25814,13 +25799,8 @@
     },
     "copy-text-to-clipboard": {
       "version": "3.0.1",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/copy-text-to-clipboard/-/copy-text-to-clipboard-3.0.1.tgz",
       "integrity": "sha512-rvVsHrpFcL4F2P8ihsoLdFHmd404+CMg71S756oRSeQgqk51U3kicGdnvfkrxva0xXH92SjGS62B0XIJsbh+9Q=="
-=======
-      "resolved": "https://registry.nlark.com/copy-text-to-clipboard/download/copy-text-to-clipboard-3.0.1.tgz",
-      "integrity": "sha1-jL+PkOCkfxLkokdDc2Jl0Ve85pw="
->>>>>>> 161633bb5417ffbd3b53803a03dc782d47a3bc5c
     },
     "copy-webpack-plugin": {
       "version": "4.6.0",
@@ -30979,13 +30959,8 @@
     },
     "mutation-observer": {
       "version": "1.0.3",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/mutation-observer/-/mutation-observer-1.0.3.tgz",
       "integrity": "sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA=="
-=======
-      "resolved": "https://registry.npm.taobao.org/mutation-observer/download/mutation-observer-1.0.3.tgz",
-      "integrity": "sha1-QukiKxAbyoLlup1aes9KFMDyY9A="
->>>>>>> 161633bb5417ffbd3b53803a03dc782d47a3bc5c
     },
     "mutationobserver-shim": {
       "version": "0.3.7",
@@ -34643,13 +34618,8 @@
     },
     "svelte-fa": {
       "version": "2.3.3",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/svelte-fa/-/svelte-fa-2.3.3.tgz",
       "integrity": "sha512-Izq+L4H9FEsoClSsYe35KuMP+2CUltJq8eP6qrQp9q52zYxRNMQTO3dYylr6K1fFmhKiWcw9q1hUzIiyrJx8dQ=="
-=======
-      "resolved": "https://registry.nlark.com/svelte-fa/download/svelte-fa-2.3.3.tgz",
-      "integrity": "sha1-sTazLzl+xk+3CLim/1V4vdZfW+c="
->>>>>>> 161633bb5417ffbd3b53803a03dc782d47a3bc5c
     },
     "svg-tags": {
       "version": "1.0.0",
@@ -35816,13 +35786,8 @@
     },
     "vconsole": {
       "version": "3.9.1",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/vconsole/-/vconsole-3.9.1.tgz",
       "integrity": "sha512-pAqWMsRtxxmXRzTGAG9AT/qfzmQ9Df0UPuQ0ut1aSUiwvK5Hki3IrxurE9iFkFsJX8cGmSjYEAQf7fRc86VBhA==",
-=======
-      "resolved": "https://registry.nlark.com/vconsole/download/vconsole-3.9.1.tgz",
-      "integrity": "sha1-QcnTEeFKGmhWahvlJDqGZ/TDRdM=",
->>>>>>> 161633bb5417ffbd3b53803a03dc782d47a3bc5c
       "requires": {
         "@fortawesome/free-solid-svg-icons": "^5.15.3",
         "cookie-storage": "^6.1.0",

src/util/Bridge/index.ts

@@ -16,6 +16,16 @@ enum BridgeMethods{
     SIGN='sign'
 }
 
+export function isAppEnv(){
+    const env = window.navigator.userAgent || navigator.userAgent
+    if(env.includes(';FZM-3SYXIN;')){
+        return true;
+    }else{
+        return false;
+    }
+}
+
+
 /**
  * 获取用户的资料
  * @returns