merge

dev-dist/sw.js

@@ -13,29 +13,31 @@
 
 // If the loader is already loaded, just stop.
 if (!self.define) {
-  const registry = {};
+  let registry = {};
 
   // Used for `eval` and `importScripts` where we can't get script URL by other means.
   // In both cases, it's safe to use a global var because those functions are synchronous.
   let nextDefineUri;
 
   const singleRequire = (uri, parentUri) => {
-    uri = new URL(uri + '.js', parentUri).href;
-    return (
-      registry[uri] ||
-      new Promise(resolve => {
-        if ('document' in self) {
-          const script = document.createElement('script');
-          script.src = uri;
-          script.onload = resolve;
-          document.head.appendChild(script);
-        } else {
-          nextDefineUri = uri;
-          importScripts(uri);
-          resolve();
-        }
-      }).then(() => {
-        const promise = registry[uri];
+    uri = new URL(uri + ".js", parentUri).href;
+    return registry[uri] || (
+      
+        new Promise(resolve => {
+          if ("document" in self) {
+            const script = document.createElement("script");
+            script.src = uri;
+            script.onload = resolve;
+            document.head.appendChild(script);
+          } else {
+            nextDefineUri = uri;
+            importScripts(uri);
+            resolve();
+          }
+        })
+      
+      .then(() => {
+        let promise = registry[uri];
         if (!promise) {
           throw new Error(`Module ${uri} didn’t register its module`);
         }
@@ -45,31 +47,27 @@ if (!self.define) {
   };
 
   self.define = (depsNames, factory) => {
-    const uri =
-      nextDefineUri ||
-      ('document' in self ? document.currentScript.src : '') ||
-      location.href;
+    const uri = nextDefineUri || ("document" in self ? document.currentScript.src : "") || location.href;
     if (registry[uri]) {
       // Module is already loading or loaded.
       return;
     }
-    const exports = {};
+    let exports = {};
     const require = depUri => singleRequire(depUri, uri);
     const specialDeps = {
       module: { uri },
       exports,
       require
     };
-    registry[uri] = Promise.all(
-      depsNames.map(depName => specialDeps[depName] || require(depName))
-    ).then(deps => {
+    registry[uri] = Promise.all(depsNames.map(
+      depName => specialDeps[depName] || require(depName)
+    )).then(deps => {
       factory(...deps);
       return exports;
     });
   };
 }
-define(['./workbox-5357ef54'], function (workbox) {
-  ('use strict');
+define(['./workbox-5357ef54'], (function (workbox) { 'use strict';
 
   self.skipWaiting();
   workbox.clientsClaim();
@@ -79,25 +77,15 @@ define(['./workbox-5357ef54'], function (workbox) {
    * requests for URLs in the manifest.
    * See https://goo.gl/S9QRab
    */
-  workbox.precacheAndRoute(
-    [
-      {
-        url: 'registerSW.js',
-        revision: '3ca0b8505b4bec776b69afdba2768812'
-      },
-      {
-        url: 'index.html',
-        revision: '0.3vo3lspd3m'
-      }
-    ],
-    {}
-  );
-
-  /**
-   * https://juejin.cn/post/6844903881189621767
-   * 缓存策略 有5种
-   */
+  workbox.precacheAndRoute([{
+    "url": "registerSW.js",
+    "revision": "3ca0b8505b4bec776b69afdba2768812"
+  }, {
+    "url": "index.html",
+    "revision": "0.k9m6fls6u18"
+  }], {});
   workbox.cleanupOutdatedCaches();
+<<<<<<< HEAD
   workbox.registerRoute(
     new workbox.NavigationRoute(workbox.createHandlerBoundToURL('index.html'), {
       allowlist: [/^\/$/]
@@ -113,3 +101,10 @@ define(['./workbox-5357ef54'], function (workbox) {
     workbox.strategies.networkOnly()
   );
 });
+=======
+  workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {
+    allowlist: [/^\/$/]
+  }));
+
+}));
+>>>>>>> feature-3.20

package-lock.json

@@ -1,7 +1,11 @@
 {
   "name": "vue-vite-h5",
   "version": "0.2.0",
+<<<<<<< HEAD
   "lockfileVersion": 2,
+=======
+  "lockfileVersion": 3,
+>>>>>>> feature-3.20
   "requires": true,
   "packages": {
     "": {
@@ -1656,6 +1660,7 @@
       "dev": true,
       "license": "MIT"
     },
+<<<<<<< HEAD
     "node_modules/@esbuild/win32-x64": {
       "version": "0.18.20",
       "cpu": [
@@ -1671,6 +1676,8 @@
         "node": ">=12"
       }
     },
+=======
+>>>>>>> feature-3.20
     "node_modules/@eslint-community/eslint-utils": {
       "version": "4.4.0",
       "dev": true,
@@ -1715,6 +1722,25 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+<<<<<<< HEAD
+=======
+    "node_modules/@eslint/eslintrc/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+>>>>>>> feature-3.20
     "node_modules/@eslint/eslintrc/node_modules/globals": {
       "version": "13.21.0",
       "dev": true,
@@ -1729,6 +1755,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+<<<<<<< HEAD
+=======
+    "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+>>>>>>> feature-3.20
     "node_modules/@eslint/eslintrc/node_modules/type-fest": {
       "version": "0.20.2",
       "dev": true,
@@ -2992,8 +3027,12 @@
     },
     "node_modules/@xmldom/xmldom": {
       "version": "0.8.10",
+<<<<<<< HEAD
       "resolved": "https://registry.npmmirror.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz",
       "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==",
+=======
+      "license": "MIT",
+>>>>>>> feature-3.20
       "engines": {
         "node": ">=10.0.0"
       }
@@ -3029,6 +3068,7 @@
       }
     },
     "node_modules/ajv": {
+<<<<<<< HEAD
       "version": "6.12.6",
       "dev": true,
       "license": "MIT",
@@ -3036,6 +3076,15 @@
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
         "json-schema-traverse": "^0.4.1",
+=======
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+>>>>>>> feature-3.20
         "uri-js": "^4.2.2"
       },
       "funding": {
@@ -3735,7 +3784,11 @@
     },
     "node_modules/copy-anything": {
       "version": "2.0.6",
+<<<<<<< HEAD
       "dev": true,
+=======
+      "devOptional": true,
+>>>>>>> feature-3.20
       "license": "MIT",
       "dependencies": {
         "is-what": "^3.14.1"
@@ -3766,6 +3819,7 @@
     },
     "node_modules/core-util-is": {
       "version": "1.0.3",
+<<<<<<< HEAD
       "resolved": "https://registry.npmmirror.com/core-util-is/-/core-util-is-1.0.3.tgz",
       "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
     },
@@ -3773,6 +3827,13 @@
       "version": "1.4.20",
       "resolved": "https://registry.npmmirror.com/cos-js-sdk-v5/-/cos-js-sdk-v5-1.4.20.tgz",
       "integrity": "sha512-cGpmVoKN3iYBtWo8Lwp059fOrT4yyb/+I6fVS++Zyop/ZFJswDRkjnrASViwYd8N+hi3qWVAa6ruvvBsLutEwg==",
+=======
+      "license": "MIT"
+    },
+    "node_modules/cos-js-sdk-v5": {
+      "version": "1.4.20",
+      "license": "ISC",
+>>>>>>> feature-3.20
       "dependencies": {
         "@xmldom/xmldom": "^0.8.6"
       }
@@ -4142,7 +4203,10 @@
     },
     "node_modules/errno": {
       "version": "0.1.8",
+<<<<<<< HEAD
       "dev": true,
+=======
+>>>>>>> feature-3.20
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -4239,7 +4303,10 @@
     },
     "node_modules/esbuild": {
       "version": "0.18.20",
+<<<<<<< HEAD
       "dev": true,
+=======
+>>>>>>> feature-3.20
       "hasInstallScript": true,
       "license": "MIT",
       "bin": {
@@ -4444,6 +4511,25 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+<<<<<<< HEAD
+=======
+    "node_modules/eslint/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+>>>>>>> feature-3.20
     "node_modules/eslint/node_modules/ansi-styles": {
       "version": "4.3.0",
       "dev": true,
@@ -4545,6 +4631,15 @@
         "node": ">=8"
       }
     },
+<<<<<<< HEAD
+=======
+    "node_modules/eslint/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+>>>>>>> feature-3.20
     "node_modules/eslint/node_modules/supports-color": {
       "version": "7.2.0",
       "dev": true,
@@ -4786,8 +4881,12 @@
     },
     "node_modules/file-saver": {
       "version": "2.0.5",
+<<<<<<< HEAD
       "resolved": "https://registry.npmmirror.com/file-saver/-/file-saver-2.0.5.tgz",
       "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="
+=======
+      "license": "MIT"
+>>>>>>> feature-3.20
     },
     "node_modules/filelist": {
       "version": "1.0.4",
@@ -5006,6 +5105,22 @@
       "version": "1.0.0",
       "license": "ISC"
     },
+<<<<<<< HEAD
+=======
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+>>>>>>> feature-3.20
     "node_modules/function-bind": {
       "version": "1.1.1",
       "license": "MIT"
@@ -5451,7 +5566,10 @@
     },
     "node_modules/image-size": {
       "version": "0.5.5",
+<<<<<<< HEAD
       "dev": true,
+=======
+>>>>>>> feature-3.20
       "license": "MIT",
       "optional": true,
       "bin": {
@@ -5463,8 +5581,12 @@
     },
     "node_modules/immediate": {
       "version": "3.0.6",
+<<<<<<< HEAD
       "resolved": "https://registry.npmmirror.com/immediate/-/immediate-3.0.6.tgz",
       "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ=="
+=======
+      "license": "MIT"
+>>>>>>> feature-3.20
     },
     "node_modules/import-fresh": {
       "version": "3.3.0",
@@ -6165,7 +6287,11 @@
     },
     "node_modules/is-what": {
       "version": "3.14.1",
+<<<<<<< HEAD
       "dev": true,
+=======
+      "devOptional": true,
+>>>>>>> feature-3.20
       "license": "MIT"
     },
     "node_modules/is-windows": {
@@ -6357,9 +6483,15 @@
       "license": "(AFL-2.1 OR BSD-3-Clause)"
     },
     "node_modules/json-schema-traverse": {
+<<<<<<< HEAD
       "version": "0.4.1",
       "dev": true,
       "license": "MIT"
+=======
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+>>>>>>> feature-3.20
     },
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
@@ -6392,8 +6524,12 @@
     },
     "node_modules/jszip": {
       "version": "3.10.1",
+<<<<<<< HEAD
       "resolved": "https://registry.npmmirror.com/jszip/-/jszip-3.10.1.tgz",
       "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==",
+=======
+      "license": "(MIT OR GPL-3.0-or-later)",
+>>>>>>> feature-3.20
       "dependencies": {
         "lie": "~3.3.0",
         "pako": "~1.0.2",
@@ -6403,6 +6539,7 @@
     },
     "node_modules/jszip/node_modules/isarray": {
       "version": "1.0.0",
+<<<<<<< HEAD
       "resolved": "https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz",
       "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
     },
@@ -6410,6 +6547,13 @@
       "version": "2.3.8",
       "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.8.tgz",
       "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+=======
+      "license": "MIT"
+    },
+    "node_modules/jszip/node_modules/readable-stream": {
+      "version": "2.3.8",
+      "license": "MIT",
+>>>>>>> feature-3.20
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -6422,6 +6566,7 @@
     },
     "node_modules/jszip/node_modules/safe-buffer": {
       "version": "5.1.2",
+<<<<<<< HEAD
       "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
@@ -6429,6 +6574,13 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+=======
+      "license": "MIT"
+    },
+    "node_modules/jszip/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "license": "MIT",
+>>>>>>> feature-3.20
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
@@ -6457,7 +6609,11 @@
     },
     "node_modules/less": {
       "version": "4.2.0",
+<<<<<<< HEAD
       "dev": true,
+=======
+      "devOptional": true,
+>>>>>>> feature-3.20
       "license": "Apache-2.0",
       "dependencies": {
         "copy-anything": "^2.0.1",
@@ -6505,8 +6661,12 @@
     },
     "node_modules/lie": {
       "version": "3.3.0",
+<<<<<<< HEAD
       "resolved": "https://registry.npmmirror.com/lie/-/lie-3.3.0.tgz",
       "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
+=======
+      "license": "MIT",
+>>>>>>> feature-3.20
       "dependencies": {
         "immediate": "~3.0.5"
       }
@@ -6787,7 +6947,10 @@
     },
     "node_modules/make-dir": {
       "version": "2.1.0",
+<<<<<<< HEAD
       "dev": true,
+=======
+>>>>>>> feature-3.20
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -6800,7 +6963,10 @@
     },
     "node_modules/make-dir/node_modules/semver": {
       "version": "5.7.2",
+<<<<<<< HEAD
       "dev": true,
+=======
+>>>>>>> feature-3.20
       "license": "ISC",
       "optional": true,
       "bin": {
@@ -6859,7 +7025,10 @@
     },
     "node_modules/mime": {
       "version": "1.6.0",
+<<<<<<< HEAD
       "dev": true,
+=======
+>>>>>>> feature-3.20
       "license": "MIT",
       "optional": true,
       "bin": {
@@ -7026,7 +7195,10 @@
     },
     "node_modules/needle": {
       "version": "3.2.0",
+<<<<<<< HEAD
       "dev": true,
+=======
+>>>>>>> feature-3.20
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -7043,7 +7215,10 @@
     },
     "node_modules/needle/node_modules/debug": {
       "version": "3.2.7",
+<<<<<<< HEAD
       "dev": true,
+=======
+>>>>>>> feature-3.20
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -7430,8 +7605,12 @@
     },
     "node_modules/pako": {
       "version": "1.0.11",
+<<<<<<< HEAD
       "resolved": "https://registry.npmmirror.com/pako/-/pako-1.0.11.tgz",
       "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
+=======
+      "license": "(MIT AND Zlib)"
+>>>>>>> feature-3.20
     },
     "node_modules/param-case": {
       "version": "3.0.4",
@@ -7476,7 +7655,11 @@
     },
     "node_modules/parse-node-version": {
       "version": "1.0.1",
+<<<<<<< HEAD
       "dev": true,
+=======
+      "devOptional": true,
+>>>>>>> feature-3.20
       "license": "MIT",
       "engines": {
         "node": ">= 0.10"
@@ -7589,7 +7772,10 @@
     },
     "node_modules/pify": {
       "version": "4.0.1",
+<<<<<<< HEAD
       "dev": true,
+=======
+>>>>>>> feature-3.20
       "license": "MIT",
       "optional": true,
       "engines": {
@@ -7856,8 +8042,12 @@
     },
     "node_modules/process-nextick-args": {
       "version": "2.0.1",
+<<<<<<< HEAD
       "resolved": "https://registry.npmmirror.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
       "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+=======
+      "license": "MIT"
+>>>>>>> feature-3.20
     },
     "node_modules/proxy-from-env": {
       "version": "1.1.0",
@@ -7865,7 +8055,10 @@
     },
     "node_modules/prr": {
       "version": "1.0.1",
+<<<<<<< HEAD
       "dev": true,
+=======
+>>>>>>> feature-3.20
       "license": "MIT",
       "optional": true
     },
@@ -8283,15 +8476,25 @@
       }
     },
     "node_modules/rollup": {
+<<<<<<< HEAD
       "version": "3.28.0",
       "dev": true,
       "license": "MIT",
+=======
+      "version": "2.79.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz",
+      "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==",
+>>>>>>> feature-3.20
       "bin": {
         "rollup": "dist/bin/rollup"
       },
       "engines": {
+<<<<<<< HEAD
         "node": ">=14.18.0",
         "npm": ">=8.0.0"
+=======
+        "node": ">=10.0.0"
+>>>>>>> feature-3.20
       },
       "optionalDependencies": {
         "fsevents": "~2.3.2"
@@ -8412,7 +8615,10 @@
     },
     "node_modules/sax": {
       "version": "1.2.4",
+<<<<<<< HEAD
       "dev": true,
+=======
+>>>>>>> feature-3.20
       "license": "ISC",
       "optional": true
     },
@@ -8463,8 +8669,12 @@
     },
     "node_modules/setimmediate": {
       "version": "1.0.5",
+<<<<<<< HEAD
       "resolved": "https://registry.npmmirror.com/setimmediate/-/setimmediate-1.0.5.tgz",
       "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="
+=======
+      "license": "MIT"
+>>>>>>> feature-3.20
     },
     "node_modules/shebang-command": {
       "version": "2.0.0",
@@ -9170,7 +9380,11 @@
     },
     "node_modules/typescript": {
       "version": "5.1.6",
+<<<<<<< HEAD
       "dev": true,
+=======
+      "devOptional": true,
+>>>>>>> feature-3.20
       "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
@@ -9461,7 +9675,10 @@
     },
     "node_modules/vite": {
       "version": "4.4.9",
+<<<<<<< HEAD
       "dev": true,
+=======
+>>>>>>> feature-3.20
       "license": "MIT",
       "dependencies": {
         "esbuild": "^0.18.10",
@@ -9539,6 +9756,7 @@
         "node": ">= 8.0.0"
       }
     },
+<<<<<<< HEAD
     "node_modules/vite-plugin-eslint/node_modules/rollup": {
       "version": "2.79.1",
       "dev": true,
@@ -9553,6 +9771,8 @@
         "fsevents": "~2.3.2"
       }
     },
+=======
+>>>>>>> feature-3.20
     "node_modules/vite-plugin-mkcert": {
       "version": "1.16.0",
       "dev": true,
@@ -9592,6 +9812,24 @@
         "workbox-window": "^7.0.0"
       }
     },
+<<<<<<< HEAD
+=======
+    "node_modules/vite/node_modules/rollup": {
+      "version": "3.29.4",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz",
+      "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==",
+      "bin": {
+        "rollup": "dist/bin/rollup"
+      },
+      "engines": {
+        "node": ">=14.18.0",
+        "npm": ">=8.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+>>>>>>> feature-3.20
     "node_modules/vooks": {
       "version": "0.2.12",
       "dev": true,
@@ -10051,6 +10289,7 @@
         "node": ">=16.0.0"
       }
     },
+<<<<<<< HEAD
     "node_modules/workbox-build/node_modules/ajv": {
       "version": "8.12.0",
       "license": "MIT",
@@ -10065,6 +10304,8 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
+=======
+>>>>>>> feature-3.20
     "node_modules/workbox-build/node_modules/fs-extra": {
       "version": "9.1.0",
       "license": "MIT",
@@ -10078,10 +10319,13 @@
         "node": ">=10"
       }
     },
+<<<<<<< HEAD
     "node_modules/workbox-build/node_modules/json-schema-traverse": {
       "version": "1.0.0",
       "license": "MIT"
     },
+=======
+>>>>>>> feature-3.20
     "node_modules/workbox-build/node_modules/jsonfile": {
       "version": "6.1.0",
       "license": "MIT",
@@ -10102,6 +10346,7 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+<<<<<<< HEAD
     "node_modules/workbox-build/node_modules/rollup": {
       "version": "2.79.1",
       "license": "MIT",
@@ -10115,6 +10360,8 @@
         "fsevents": "~2.3.2"
       }
     },
+=======
+>>>>>>> feature-3.20
     "node_modules/workbox-build/node_modules/source-map": {
       "version": "0.8.0-beta.0",
       "license": "BSD-3-Clause",
@@ -10483,6 +10730,7 @@
         "tslib": "2.3.0"
       }
     }
+<<<<<<< HEAD
   },
   "dependencies": {
     "@aashutoshrathi/word-wrap": {
@@ -16803,5 +17051,7 @@
         "tslib": "2.3.0"
       }
     }
+=======
+>>>>>>> feature-3.20
   }
 }

public/version.json

@@ -1 +1,5 @@
-{"version":1711034527177}
+<<<<<<< HEAD
+{"version":1711034527177}
+=======
+{"version":1711007760129}
+>>>>>>> feature-3.20

src/components/layout/index.module.less

@@ -582,4 +582,8 @@
   width: 500px !important;
   border-radius: 19px !important;
   // border-radius: ;
+}
+
+.popBox {
+  z-index: 9;
 }

src/components/layout/layoutTop.tsx

@@ -1,4 +1,4 @@
-import { defineComponent, ref, onMounted, nextTick, onUnmounted } from 'vue';
+import { defineComponent, ref, onMounted, nextTick, onUnmounted, reactive } from 'vue';
 import styles from './index.module.less';
 import { NImage, NBadge, NPopover, NIcon, NModal, NTooltip } from 'naive-ui';
 import styles2 from './modals/suggestion-option.module.less';
@@ -19,6 +19,7 @@ import boxBg from './images/boxBg.png';
 import { useRouter } from 'vue-router';
 import { storeToRefs } from 'pinia';
 import opinionIcon from './images/opinionIcon.png';
+import inviteIcon from './images/invite_student_icon.png';
 import classHistoryIcon from './images/classHistoryIcon.png';
 import 'animate.css';
 import ForgotPassword from '/src/views/setting/modal/forgotPassword';
@@ -29,6 +30,9 @@ import ClassModal from '/src/views/home/modals/class-modal';
 import { suggestMessageUnread } from '/src/api/user';
 import { eventGlobal } from '/src/utils';
 import { usePrepareStore } from '/src/store/modules/prepareLessons';
+import { schoolDetail } from '/src/views/studentList/api'
+import AddStudentModel from '/src/views/studentList/modals/addStudentModel';
+
 export default defineComponent({
   name: 'layoutTop',
   setup() {
@@ -44,6 +48,10 @@ export default defineComponent({
     const userInfoStatus = ref(false);
     const classRecordStatus = ref(false);
     const prepareStore = usePrepareStore();
+    const state = reactive({
+      addStudentVisible: false,
+      activeRow: {} as any,
+    });
 
     const oncheckEditStatus = (callBack: any) => {
       if (prepareStore.getIsEditResource) {
@@ -80,6 +88,23 @@ export default defineComponent({
       console.log(suggestionOptionRef.value, 'suggestionOptionRef');
     };
 
+    // 邀请学生二维码
+    const showInviteQrcode = async () => {
+      try {
+        const { schoolInfos } = users.getUserInfo;
+        const schoolId =
+          schoolInfos.length > 0 ? schoolInfos[0].id : null;
+        if (schoolId) {
+          const { data } = await schoolDetail({ id: schoolId });
+          state.activeRow = data;
+
+          state.addStudentVisible = true;
+        }
+      } catch {
+        //
+      }
+    }
+
     const suggestionStatus = ref(false);
     const getSuggestMessageUnread = async () => {
       try {
@@ -170,6 +195,18 @@ export default defineComponent({
             </p>
           </div>
           <div class={styles.layoutRight}>
+            <NTooltip showArrow={false}>
+              {{
+                trigger: () => (
+                  <div class={styles.optons} onClick={showInviteQrcode}>
+                    <NBadge dot={suggestionStatus.value} color={'#FF1036'}>
+                      <NImage src={inviteIcon} previewDisabled></NImage>
+                    </NBadge>
+                  </div>
+                ),
+                default: '邀请学生'
+              }}
+            </NTooltip>            
             <NPopover
               width={380}
               class={styles.popoverClassModel}
@@ -386,6 +423,16 @@ export default defineComponent({
                 (showSuggestionViseble.value = false)
               }></SuggestionOption>
           </NModal>
+
+          {state.addStudentVisible ? (
+            <div v-model:show={state.addStudentVisible} class={['n-modal-mask', styles.popBox]}>
+              <AddStudentModel
+                activeRow={state.activeRow}
+                onClose={() => {
+                  state.addStudentVisible = false;
+                }}></AddStudentModel>
+            </div>
+          ) : null}
         </div>
       </>
     );

src/views/studentList/index.module.less

@@ -220,7 +220,7 @@
 }
 
 .tableWrap {
-  margin-top: 40px;
+  // margin-top: 40px;
 
   :global {
     .n-data-table {
@@ -404,7 +404,7 @@
           font-size: 14px;
           font-weight: 400;
           color: #000000;
-
+          line-height: 22px;
           span {
             color: #198cfe;
             font-weight: 600;

src/views/studentList/index.tsx

@@ -440,7 +440,7 @@ export default defineComponent({
             </NFormItem>
           </NForm>
         </div>
-        <NButton
+        {/* <NButton
           {...{ id: 'student-0' }}
           onClick={async () => {
             // state.addStudentVisible = true;
@@ -471,7 +471,7 @@ export default defineComponent({
             )
           }}>
           邀请学生
-        </NButton>
+        </NButton> */}
         <div class={styles.tableWrap}>
           <NDataTable
             v-slots={{

src/views/studentList/modals/addStudentModel.tsx

@@ -49,15 +49,14 @@ export default defineComponent({
     //   vaildUrl() +
     //     `/classroom-app/#/student-register?sId=${userStore.getUserInfo.schoolInfos[0].id}`
     // );
-
     const url = ref(
-      vaildUrl() + `/classroom-app/#/student-register?sId=${props.activeRow.id}`
+      vaildUrl() + `/classroom-app/#/register-new?sId=${props.activeRow.id}`
     );
-    if (props.activeRow.registerType != 'BUG_GOODS') {
-      url.value =
-        vaildUrl() +
-        `/classroom-app/#/register-member?sId=${props.activeRow.id}`;
-    }
+    // if (props.activeRow.registerType != 'BUG_GOODS') {
+    //   url.value =
+    //     vaildUrl() +
+    //     `/classroom-app/#/register-new?sId=${props.activeRow.id}`;
+    // }
     const imgs = reactive({
       saveLoading: false,
       image: null as any,
@@ -151,11 +150,12 @@ export default defineComponent({
               }></img>
             <div class={styles.studentCoreInfo}>
               <h2>{userStore.getUserInfo.schoolInfos[0].name}</h2>
-              <p class={styles.studentCoreInfoSubtitle}>
-                {/* 邀请您的孩子加入
-                <span>音乐数字课堂</span> */}
+              {/* <p class={styles.studentCoreInfoSubtitle}>
                 乐器Ai学练工具<span>购买通道</span>
-              </p>
+              </p> */}
+              <p class={styles.studentCoreInfoSubtitle}>
+                <span>报名注册</span>
+              </p>              
               <div class={styles.codewrap}>
                 <TheQrCode margin={0} text={url.value} size={119} />
                 {/* <img src={codewrap} class={styles.codewrapBg} alt="" /> */}