fix::新版本商品页面\订单页面逻辑完善\依赖完善

2024-07-31 10:12:23 +08:00
parent ece7a35afd f6ac523cd0
commit 2d3ea3ea5e
37 changed files with 21537 additions and 17772 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
+# 忽略提交文件
 /unpackage
-node_modules/
+node_modules/
+.vscode/
+.hbuilderx/
--- a/components/navseat.vue
+++ b/components/navseat.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="navbarcontent">
 		<!-- 导航栏 -->
-		<view class="navbar" :class="{active:opacity}">
+		<view class="navbar" :class="{active:opacity}" :style="{'backgroundColor':backColor}">
 			<!-- #ifndef APP-PLUS || MP-WEIXIN -->
 			<view class="status-bar"></view>
 			<view class="navbar_tow flex-between"
@@ -73,6 +73,10 @@
 			iconcolor:{//返回键颜色
 				type: String,
 				default: '#000'
+			},
+			backColor:{//背景颜色
+				type: String,
+				default: '#f9f9f9'
 			}
 		},
 		computed: {
--- a/framework/0-conf.js
+++ b/framework/0-conf.js
@@ -18,6 +18,7 @@ const baseUrlwws = 'ws://cashier.sxczgkj.cn/cashierService'
 // #ifdef APP || MP-WEIXIN
 const baseUrl = debug ? proxyApi : 'https://cashier.sxczgkj.cn/cashierService' // 线上
 const baseUrlwws = debug ? proxyApiwws : 'wss://cashier.sxczgkj.cn/netty' // 线上 
+
 // const baseUrl = 'https://cashier.sxczgkj.cn/cashierService' // 线上
 // const baseUrlwws = 'wss://cashier.sxczgkj.cn/netty' // 线上/
 // #endif
--- a/framework/11-api.js
+++ b/framework/11-api.js
@@ -104,8 +104,8 @@ async function request(options) {
 		if (res.code != 0) {
 			if (res.code == -4) {
 				uni.showToast({
-					title: '',
-					// title: res.message || res.msg,
+					// title: '',
+					title: res.message || res.msg,
 					icon: "none",
 					success: () => {
 						setTimeout(res => {
--- a/node_modules/.bin/sass
+++ b/node_modules/.bin/sass
@@ -2,16 +2,15 @@
 basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")

 case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+    *CYGWIN*|*MINGW*|*MSYS*)
+        if command -v cygpath > /dev/null 2>&1; then
+            basedir=`cygpath -w "$basedir"`
+        fi
+    ;;
 esac

-if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="$basedir/C:/Users/Administrator/Documents/HBuilderProjects/cashier_weapp/node_modules/.store/sass@1.69.5/node_modules"
-else
-  export NODE_PATH="$NODE_PATH:$basedir/C:/Users/Administrator/Documents/HBuilderProjects/cashier_weapp/node_modules/.store/sass@1.69.5/node_modules"
-fi
 if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../.store/sass@1.69.5/node_modules/sass/sass.js" "$@"
-else
-  exec node  "$basedir/../.store/sass@1.69.5/node_modules/sass/sass.js" "$@"
+  exec "$basedir/node"  "$basedir/../sass/sass.js" "$@"
+else 
+  exec node  "$basedir/../sass/sass.js" "$@"
 fi
--- a/node_modules/.bin/sass.CMD
+++ b/node_modules/.bin/sass.CMD
@@ -1,12 +1,17 @@
-@SETLOCAL
-@IF NOT DEFINED NODE_PATH (
-  @SET "NODE_PATH=%~dp0\C:\Users\Administrator\Documents\HBuilderProjects\cashier_weapp\node_modules\.store\sass@1.69.5\node_modules"
+@ECHO off
+GOTO start
+:find_dp0
+SET dp0=%~dp0
+EXIT /b
+:start
+SETLOCAL
+CALL :find_dp0
+
+IF EXIST "%dp0%\node.exe" (
+  SET "_prog=%dp0%\node.exe"
 ) ELSE (
-  @SET "NODE_PATH=%NODE_PATH%;%~dp0\C:\Users\Administrator\Documents\HBuilderProjects\cashier_weapp\node_modules\.store\sass@1.69.5\node_modules"
-)
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\.store\sass@1.69.5\node_modules\sass\sass.js" %*
-) ELSE (
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\.store\sass@1.69.5\node_modules\sass\sass.js" %*
+  SET "_prog=node"
+  SET PATHEXT=%PATHEXT:;.JS;=;%
 )
+
+endLocal & goto #_undefined_# 2>NUL || title %COMSPEC% & "%_prog%"  "%dp0%\..\sass\sass.js" %*
--- a/node_modules/.bin/sass.ps1
+++ b/node_modules/.bin/sass.ps1
@@ -2,40 +2,27 @@
 $basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent

 $exe=""
-$pathsep=":"
-$env_node_path=$env:NODE_PATH
-$new_node_path="$basedir\C:\Users\Administrator\Documents\HBuilderProjects\cashier_weapp\node_modules\.store\sass@1.69.5\node_modules"
 if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {
  # Fix case when both the Windows and Linux builds of Node
  # are installed in the same directory
  $exe=".exe"
-  $pathsep=";"
-} else {
-  $new_node_path="$basedir/C:/Users/Administrator/Documents/HBuilderProjects/cashier_weapp/node_modules/.store/sass@1.69.5/node_modules"
 }
-if ([string]::IsNullOrEmpty($env_node_path)) {
-  $env:NODE_PATH=$new_node_path
-} else {
-  $env:NODE_PATH="$env_node_path$pathsep$new_node_path"
-}
-
 $ret=0
 if (Test-Path "$basedir/node$exe") {
  # Support pipeline input
  if ($MyInvocation.ExpectingInput) {
-    $input | & "$basedir/node$exe"  "$basedir/../.store/sass@1.69.5/node_modules/sass/sass.js" $args
+    $input | & "$basedir/node$exe"  "$basedir/../sass/sass.js" $args
  } else {
-    & "$basedir/node$exe"  "$basedir/../.store/sass@1.69.5/node_modules/sass/sass.js" $args
+    & "$basedir/node$exe"  "$basedir/../sass/sass.js" $args
  }
  $ret=$LASTEXITCODE
 } else {
  # Support pipeline input
  if ($MyInvocation.ExpectingInput) {
-    $input | & "node$exe"  "$basedir/../.store/sass@1.69.5/node_modules/sass/sass.js" $args
+    $input | & "node$exe"  "$basedir/../sass/sass.js" $args
  } else {
-    & "node$exe"  "$basedir/../.store/sass@1.69.5/node_modules/sass/sass.js" $args
+    & "node$exe"  "$basedir/../sass/sass.js" $args
  }
  $ret=$LASTEXITCODE
 }
-$env:NODE_PATH=$env_node_path
 exit $ret
--- a/node_modules/lodash/package.json
+++ b/node_modules/lodash/package.json
@@ -13,10 +13,5 @@
    "John-David Dalton <john.david.dalton@gmail.com>",
    "Mathias Bynens <mathias@qiwi.be>"
  ],
-  "scripts": {
-    "test": "echo \"See https://travis-ci.org/lodash-archive/lodash-cli for testing details.\""
-  },
-  "__npminstall_done": true,
-  "_from": "lodash@4.17.21",
-  "_resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz"
+  "scripts": { "test": "echo \"See https://travis-ci.org/lodash-archive/lodash-cli for testing details.\"" }
 }
--- a/node_modules/sass-loader/README.md
+++ b/node_modules/sass-loader/README.md
@@ -418,7 +418,7 @@ module.exports = {
          {
            loader: "sass-loader",
            options: {
-              sassOptions: (loaderContext) => {
+              sassOptions: (content, loaderContext) => {
                // More information about available properties https://webpack.js.org/api/loaders/
                const { resourcePath, rootContext } = loaderContext;
                const relativePath = path.relative(rootContext, resourcePath);
@@ -677,14 +677,10 @@ Type:
 type warnRuleAsWarning = boolean;
 ```

-Default: `false`
+Default: `true`

 Treats the `@warn` rule as a webpack warning.

-> **Note**
->
-> It will be `true` by default in the next major release.
-
 **style.scss**

 ```scss
--- a/node_modules/sass-loader/dist/index.js
+++ b/node_modules/sass-loader/dist/index.js
@@ -96,5 +96,4 @@ async function loader(content) {
  }
  callback(null, result.css.toString(), map);
 }
-var _default = loader;
-exports.default = _default;
+var _default = exports.default = loader;
--- a/node_modules/sass-loader/dist/utils.js
+++ b/node_modules/sass-loader/dist/utils.js
@@ -113,7 +113,7 @@ async function getSassOptions(loaderContext, loaderOptions, content, implementat
  if (!sassOptions.logger) {
    const needEmitWarning = loaderOptions.warnRuleAsWarning !== false;
    const logger = loaderContext.getLogger("sass-loader");
-    const formatSpan = span => `${span.url || "-"}:${span.start.line}:${span.start.column}: `;
+    const formatSpan = span => `Warning on line ${span.start.line}, column ${span.start.column} of ${span.url || "-"}:${span.start.line}:${span.start.column}:\n`;
    const formatDebugSpan = span => `[debug:${span.start.line}:${span.start.column}] `;
    sassOptions.logger = {
      debug(message, loggerOptions) {
@@ -129,11 +129,14 @@ async function getSassOptions(loaderContext, loaderOptions, content, implementat
        if (loggerOptions.deprecation) {
          builtMessage += "Deprecation ";
        }
-        if (loggerOptions.span && !loggerOptions.stack) {
-          builtMessage = formatSpan(loggerOptions.span);
+        if (loggerOptions.span) {
+          builtMessage += formatSpan(loggerOptions.span);
        }
        builtMessage += message;
-        if (loggerOptions.stack) {
+        if (loggerOptions.span && loggerOptions.span.context) {
+          builtMessage += `\n\n${loggerOptions.span.start.line} | ${loggerOptions.span.context}`;
+        }
+        if (loggerOptions.stack && loggerOptions.stack !== "null") {
          builtMessage += `\n\n${loggerOptions.stack}`;
        }
        if (needEmitWarning) {
@@ -227,6 +230,11 @@ async function getSassOptions(loaderContext, loaderOptions, content, implementat

    // Allow passing custom importers to `sass`/`node-sass`. Accepts `Function` or an array of `Function`s.
    sassOptions.importer = sassOptions.importer ? proxyCustomImporters(Array.isArray(sassOptions.importer) ? sassOptions.importer.slice() : [sassOptions.importer], loaderContext) : [];
+
+    // Regression on the `sass-embedded` side
+    if (loaderOptions.webpackImporter === false && sassOptions.importer.length === 0) {
+      sassOptions.importer = undefined;
+    }
    sassOptions.includePaths = [].concat(process.cwd()).concat(
    // We use `includePaths` in context for resolver, so it should be always absolute
    (sassOptions.includePaths ? sassOptions.includePaths.slice() : []).map(includePath => _path.default.isAbsolute(includePath) ? includePath : _path.default.join(process.cwd(), includePath))).concat(process.env.SASS_PATH ? process.env.SASS_PATH.split(process.platform === "win32" ? ";" : ":") : []);
--- a/node_modules/sass-loader/node_modules/.bin/sass
+++ b/node_modules/sass-loader/node_modules/.bin/sass
@@ -1,17 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="$basedir/C:/Users/Administrator/Documents/HBuilderProjects/cashier_weapp/node_modules/.store/sass@1.69.5/node_modules"
-else
-  export NODE_PATH="$NODE_PATH:$basedir/C:/Users/Administrator/Documents/HBuilderProjects/cashier_weapp/node_modules/.store/sass@1.69.5/node_modules"
-fi
-if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../../../../../sass@1.69.5/node_modules/sass/sass.js" "$@"
-else
-  exec node  "$basedir/../../../../../sass@1.69.5/node_modules/sass/sass.js" "$@"
-fi
--- a/node_modules/sass-loader/node_modules/.bin/sass.CMD
+++ b/node_modules/sass-loader/node_modules/.bin/sass.CMD
@@ -1,12 +0,0 @@
-@SETLOCAL
-@IF NOT DEFINED NODE_PATH (
-  @SET "NODE_PATH=%~dp0\C:\Users\Administrator\Documents\HBuilderProjects\cashier_weapp\node_modules\.store\sass@1.69.5\node_modules"
-) ELSE (
-  @SET "NODE_PATH=%NODE_PATH%;%~dp0\C:\Users\Administrator\Documents\HBuilderProjects\cashier_weapp\node_modules\.store\sass@1.69.5\node_modules"
-)
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\..\..\..\..\sass@1.69.5\node_modules\sass\sass.js" %*
-) ELSE (
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\..\..\..\..\sass@1.69.5\node_modules\sass\sass.js" %*
-)
--- a/node_modules/sass-loader/node_modules/.bin/sass.ps1
+++ b/node_modules/sass-loader/node_modules/.bin/sass.ps1
@@ -1,41 +0,0 @@
-#!/usr/bin/env pwsh
-$basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent
-
-$exe=""
-$pathsep=":"
-$env_node_path=$env:NODE_PATH
-$new_node_path="$basedir\C:\Users\Administrator\Documents\HBuilderProjects\cashier_weapp\node_modules\.store\sass@1.69.5\node_modules"
-if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {
-  # Fix case when both the Windows and Linux builds of Node
-  # are installed in the same directory
-  $exe=".exe"
-  $pathsep=";"
-} else {
-  $new_node_path="$basedir/C:/Users/Administrator/Documents/HBuilderProjects/cashier_weapp/node_modules/.store/sass@1.69.5/node_modules"
-}
-if ([string]::IsNullOrEmpty($env_node_path)) {
-  $env:NODE_PATH=$new_node_path
-} else {
-  $env:NODE_PATH="$env_node_path$pathsep$new_node_path"
-}
-
-$ret=0
-if (Test-Path "$basedir/node$exe") {
-  # Support pipeline input
-  if ($MyInvocation.ExpectingInput) {
-    $input | & "$basedir/node$exe"  "$basedir/../../../../../sass@1.69.5/node_modules/sass/sass.js" $args
-  } else {
-    & "$basedir/node$exe"  "$basedir/../../../../../sass@1.69.5/node_modules/sass/sass.js" $args
-  }
-  $ret=$LASTEXITCODE
-} else {
-  # Support pipeline input
-  if ($MyInvocation.ExpectingInput) {
-    $input | & "node$exe"  "$basedir/../../../../../sass@1.69.5/node_modules/sass/sass.js" $args
-  } else {
-    & "node$exe"  "$basedir/../../../../../sass@1.69.5/node_modules/sass/sass.js" $args
-  }
-  $ret=$LASTEXITCODE
-}
-$env:NODE_PATH=$env_node_path
-exit $ret
--- a/node_modules/sass-loader/package.json
+++ b/node_modules/sass-loader/package.json
@@ -1,6 +1,6 @@
 {
  "name": "sass-loader",
-  "version": "13.3.2",
+  "version": "13.3.3",
  "description": "Sass loader for webpack",
  "license": "MIT",
  "repository": "webpack-contrib/sass-loader",
@@ -66,52 +66,48 @@
    "neo-async": "^2.6.2"
  },
  "devDependencies": {
-    "@babel/cli": "^7.21.5",
-    "@babel/core": "^7.21.5",
-    "@babel/preset-env": "^7.21.5",
-    "@commitlint/cli": "^17.6.1",
-    "@commitlint/config-conventional": "^17.6.1",
+    "@babel/cli": "^7.22.9",
+    "@babel/core": "^7.22.9",
+    "@babel/preset-env": "^7.22.9",
+    "@commitlint/cli": "^17.6.7",
+    "@commitlint/config-conventional": "^17.6.7",
    "@webpack-contrib/eslint-config-webpack": "^3.0.0",
-    "babel-jest": "^29.5.0",
+    "babel-jest": "^29.6.2",
    "bootstrap-sass": "^3.4.1",
    "bootstrap-v4": "npm:bootstrap@^4.5.3",
    "bootstrap-v5": "npm:bootstrap@^5.0.1",
    "cross-env": "^7.0.3",
-    "cspell": "^6.31.1",
-    "css-loader": "^6.7.3",
+    "cspell": "^6.31.2",
+    "css-loader": "^6.8.1",
    "del": "^6.1.1",
    "del-cli": "^4.0.1",
-    "enhanced-resolve": "^5.13.0",
-    "eslint": "^8.39.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-import": "^2.27.5",
-    "fibers": "^5.0.3",
+    "enhanced-resolve": "^5.15.0",
+    "eslint": "^8.46.0",
+    "eslint-config-prettier": "^8.9.0",
+    "eslint-plugin-import": "^2.28.0",
    "file-loader": "^6.2.0",
    "foundation-sites": "^6.7.5",
    "husky": "^8.0.3",
-    "jest": "^29.5.0",
-    "jest-environment-node-single-context": "^29.0.0",
-    "lint-staged": "^13.2.2",
+    "jest": "^29.6.2",
+    "jest-environment-node-single-context": "^29.1.0",
+    "lint-staged": "^13.2.3",
    "material-components-web": "^9.0.0",
    "memfs": "^3.5.1",
    "node-sass": "^8.0.0",
    "node-sass-glob-importer": "^5.3.2",
    "npm-run-all": "^4.1.5",
    "prettier": "^2.8.8",
-    "sass": "^1.62.1",
-    "sass-embedded": "^1.62.0",
-    "semver": "^7.5.0",
+    "sass": "^1.64.2",
+    "sass-embedded": "^1.64.2",
+    "semver": "^7.5.4",
    "standard-version": "^9.3.1",
-    "style-loader": "^3.3.2",
-    "webpack": "^5.81.0"
+    "style-loader": "^3.3.3",
+    "webpack": "^5.88.2"
  },
  "keywords": [
    "sass",
    "libsass",
    "webpack",
    "loader"
-  ],
-  "__npminstall_done": true,
-  "_from": "sass-loader@13.3.2",
-  "_resolved": "https://registry.npmmirror.com/sass-loader/-/sass-loader-13.3.2.tgz"
+  ]
 }
--- a/node_modules/sass/LICENSE
+++ b/node_modules/sass/LICENSE
@@ -87,6 +87,39 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


+--------------------------------------------------------------------------------
+
+_macros and macros license:
+
+Copyright 2024, the Dart project authors.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google LLC nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
 --------------------------------------------------------------------------------

 analyzer, protobuf and protoc_plugin license:
@@ -615,6 +648,32 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


+--------------------------------------------------------------------------------
+
+dart_mappable and type_plus license:
+
+MIT License
+
+Copyright (c) 2021 Kilian Schulte
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
 --------------------------------------------------------------------------------

 ffi and package_config license:
@@ -973,6 +1032,39 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


+--------------------------------------------------------------------------------
+
+native_stack_traces license:
+
+Copyright 2020, the Dart project authors.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google LLC nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
 --------------------------------------------------------------------------------

 native_synchronization license:
@@ -1118,32 +1210,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.


--------------------------------------------------------------------------------
-
-pointycastle license:
-
-
-Copyright (c) 2000 - 2019 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-
 --------------------------------------------------------------------------------

 pub_api_client license:
@@ -1570,6 +1636,71 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


+--------------------------------------------------------------------------------
+
+web license:
+
+Copyright 2023, the Dart project authors.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google LLC nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+--------------------------------------------------------------------------------
+
+web_socket license:
+
+Copyright 2024, the Dart project authors. 
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google LLC nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
 --------------------------------------------------------------------------------

 yaml license:
--- a/node_modules/sass/package.json
+++ b/node_modules/sass/package.json
@@ -1,51 +1 @@
-{
-  "name": "sass",
-  "description": "A pure JavaScript implementation of Sass.",
-  "license": "MIT",
-  "bugs": "https://github.com/sass/dart-sass/issues",
-  "homepage": "https://github.com/sass/dart-sass",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/sass/dart-sass"
-  },
-  "author": {
-    "name": "Natalie Weizenbaum",
-    "email": "nweiz@google.com",
-    "url": "https://github.com/nex3"
-  },
-  "engines": {
-    "node": ">=14.0.0"
-  },
-  "dependencies": {
-    "chokidar": ">=3.0.0 <4.0.0",
-    "immutable": "^4.0.0",
-    "source-map-js": ">=0.6.2 <2.0.0"
-  },
-  "keywords": [
-    "style",
-    "scss",
-    "sass",
-    "preprocessor",
-    "css"
-  ],
-  "types": "types/index.d.ts",
-  "exports": {
-    "types": "./types/index.d.ts",
-    "node": {
-      "require": "./sass.node.js",
-      "default": "./sass.node.mjs"
-    },
-    "default": {
-      "require": "./sass.default.cjs",
-      "default": "./sass.default.js"
-    }
-  },
-  "version": "1.69.5",
-  "bin": {
-    "sass": "sass.js"
-  },
-  "main": "sass.node.js",
-  "__npminstall_done": true,
-  "_from": "sass@1.69.5",
-  "_resolved": "https://registry.npmmirror.com/sass/-/sass-1.69.5.tgz"
-}
+{"name":"sass","description":"A pure JavaScript implementation of Sass.","license":"MIT","bugs":"https://github.com/sass/dart-sass/issues","homepage":"https://github.com/sass/dart-sass","repository":{"type":"git","url":"https://github.com/sass/dart-sass"},"author":{"name":"Natalie Weizenbaum","email":"nweiz@google.com","url":"https://github.com/nex3"},"engines":{"node":">=14.0.0"},"dependencies":{"chokidar":">=3.0.0 <4.0.0","immutable":"^4.0.0","source-map-js":">=0.6.2 <2.0.0"},"keywords":["style","scss","sass","preprocessor","css"],"types":"types/index.d.ts","exports":{"types":"./types/index.d.ts","node":{"require":"./sass.node.js","default":"./sass.node.mjs"},"default":{"require":"./sass.default.cjs","default":"./sass.default.js"}},"version":"1.77.8","bin":{"sass":"sass.js"},"main":"sass.node.js"}
--- a/node_modules/sass/sass.dart.js
+++ b/node_modules/sass/sass.dart.js
--- a/node_modules/sass/sass.default.js
+++ b/node_modules/sass/sass.default.js
@@ -10,6 +10,10 @@ export const compile = _cliPkgExports.compile;
 export const compileAsync = _cliPkgExports.compileAsync;
 export const compileString = _cliPkgExports.compileString;
 export const compileStringAsync = _cliPkgExports.compileStringAsync;
+export const initCompiler = _cliPkgExports.initCompiler;
+export const initAsyncCompiler = _cliPkgExports.initAsyncCompiler;
+export const Compiler = _cliPkgExports.Compiler;
+export const AsyncCompiler = _cliPkgExports.AsyncCompiler;
 export const Logger = _cliPkgExports.Logger;
 export const SassArgumentList = _cliPkgExports.SassArgumentList;
 export const SassBoolean = _cliPkgExports.SassBoolean;
@@ -38,3 +42,6 @@ export const TRUE = _cliPkgExports.TRUE;
 export const FALSE = _cliPkgExports.FALSE;
 export const NULL = _cliPkgExports.NULL;
 export const types = _cliPkgExports.types;
+export const NodePackageImporter = _cliPkgExports.NodePackageImporter;
+export const deprecations = _cliPkgExports.deprecations;
+export const Version = _cliPkgExports.Version;
--- a/node_modules/sass/sass.js
+++ b/node_modules/sass/sass.js
@@ -9,6 +9,7 @@ library.load({
  chokidar: require("chokidar"),
  util: require("util"),
  stream: require("stream"),
+  nodeModule: require("module"),
  fs: require("fs"),
  immutable: require("immutable"),
 });
--- a/node_modules/sass/sass.node.js
+++ b/node_modules/sass/sass.node.js
@@ -4,6 +4,7 @@ if (globalThis._cliPkgExports.length === 0) delete globalThis._cliPkgExports;
 library.load({
  util: require("util"),
  stream: require("stream"),
+  nodeModule: require("module"),
  fs: require("fs"),
  immutable: require("immutable"),
 });
--- a/node_modules/sass/sass.node.mjs
+++ b/node_modules/sass/sass.node.mjs
@@ -4,6 +4,10 @@ export const compile = cjs.compile;
 export const compileAsync = cjs.compileAsync;
 export const compileString = cjs.compileString;
 export const compileStringAsync = cjs.compileStringAsync;
+export const initCompiler = cjs.initCompiler;
+export const initAsyncCompiler = cjs.initAsyncCompiler;
+export const Compiler = cjs.Compiler;
+export const AsyncCompiler = cjs.AsyncCompiler;
 export const Logger = cjs.Logger;
 export const SassArgumentList = cjs.SassArgumentList;
 export const SassBoolean = cjs.SassBoolean;
@@ -32,6 +36,9 @@ export const TRUE = cjs.TRUE;
 export const FALSE = cjs.FALSE;
 export const NULL = cjs.NULL;
 export const types = cjs.types;
+export const NodePackageImporter = cjs.NodePackageImporter;
+export const deprecations = cjs.deprecations;
+export const Version = cjs.Version;

 let printedDefaultExportDeprecation = false;
 function defaultExportDeprecation() {
@@ -59,6 +66,22 @@ export default {
    defaultExportDeprecation();
    return cjs.compileStringAsync;
  },
+  get initCompiler() {
+    defaultExportDeprecation();
+    return cjs.initCompiler;
+  },
+  get initAsyncCompiler() {
+    defaultExportDeprecation();
+    return cjs.initAsyncCompiler;
+  },
+  get Compiler() {
+    defaultExportDeprecation();
+    return cjs.Compiler;
+  },
+  get AsyncCompiler() {
+    defaultExportDeprecation();
+    return cjs.AsyncCompiler;
+  },
  get Logger() {
    defaultExportDeprecation();
    return cjs.Logger;
@@ -171,4 +194,16 @@ export default {
    defaultExportDeprecation();
    return cjs.types;
  },
+  get NodePackageImporter() {
+    defaultExportDeprecation();
+    return cjs.NodePackageImporter;
+  },
+  get deprecations() {
+    defaultExportDeprecation();
+    return cjs.deprecations;
+  },
+  get Version() {
+    defaultExportDeprecation();
+    return cjs.Version;
+  },
 };
--- a/node_modules/sass/types/compile.d.ts
+++ b/node_modules/sass/types/compile.d.ts
@@ -37,6 +37,104 @@ export interface CompileResult {
  sourceMap?: RawSourceMap;
 }

+/**
+ * The result of creating a synchronous compiler. Returned by
+ * {@link initCompiler}.
+ *
+ * @category Compile
+ */
+export class Compiler {
+  /**
+   * Throws an error if constructed directly, instead of via
+   * {@link initCompiler}.
+   */
+  private constructor();
+
+  /**
+   * The {@link compile} method exposed through a Compiler instance while it is
+   * active. If this is called after {@link dispose} on the Compiler
+   * instance, an error will be thrown.
+   *
+   * During the Compiler instance's lifespan, given the same input, this will
+   * return an identical result to the {@link compile} method exposed at the
+   * module root.
+   */
+  compile(path: string, options?: Options<'sync'>): CompileResult;
+
+  /**
+   * The {@link compileString} method exposed through a Compiler instance while
+   * it is active. If this is called after {@link dispose} on the Compiler
+   * instance, an error will be thrown.
+   *
+   * During the Compiler instance's lifespan, given the same input, this will
+   * return an identical result to the {@link compileString} method exposed at
+   * the module root.
+   */
+  compileString(source: string, options?: StringOptions<'sync'>): CompileResult;
+
+  /**
+   * Ends the lifespan of this Compiler instance. After this is invoked, all
+   * calls to the Compiler instance's {@link compile} or {@link compileString}
+   * methods will result in an error.
+   */
+  dispose(): void;
+}
+
+/**
+ * The result of creating an asynchronous compiler. Returned by
+ * {@link initAsyncCompiler}.
+ *
+ * @category Compile
+ */
+export class AsyncCompiler {
+  /**
+   * Throws an error if constructed directly, instead of via
+   * {@link initAsyncCompiler}.
+   */
+  private constructor();
+
+  /**
+   * The {@link compileAsync} method exposed through an Async Compiler instance
+   * while it is active. If this is called after {@link dispose} on the Async
+   * Compiler instance, an error will be thrown.
+   *
+   * During the Async Compiler instance's lifespan, given the same input, this
+   * will return an identical result to the {@link compileAsync} method exposed
+   * at the module root.
+   */
+  compileAsync(
+    path: string,
+    options?: Options<'async'>
+  ): Promise<CompileResult>;
+
+  /**
+   * The {@link compileStringAsync} method exposed through an Async Compiler
+   * instance while it is active. If this is called after {@link dispose} on the
+   * Async Compiler instance, an error will be thrown.
+   *
+   * During the Async Compiler instance's lifespan, given the same input, this
+   * will return an identical result to the {@link compileStringAsync} method
+   * exposed at the module root.
+   */
+  compileStringAsync(
+    source: string,
+    options?: StringOptions<'async'>
+  ): Promise<CompileResult>;
+
+  /**
+   * Ends the lifespan of this Async Compiler instance. After this is invoked,
+   * all subsequent calls to the Compiler instance's `compileAsync` or
+   * `compileStringAsync` methods will result in an error.
+   *
+   * Any compilations that are submitted before `dispose` will not be cancelled,
+   * and will be allowed to settle.
+   *
+   * After all compilations have been settled and Sass completes any internal
+   * task cleanup, `dispose` will resolve its promise.
+   */
+  dispose(): Promise<void>;
+}
+
 /**
 * Synchronously compiles the Sass file at `path` to CSS. If it succeeds it
 * returns a {@link CompileResult}, and if it fails it throws an {@link
@@ -44,10 +142,16 @@ export interface CompileResult {
 *
 * This only allows synchronous {@link Importer}s and {@link CustomFunction}s.
 *
- * **Heads up!** When using the `sass-embedded` npm package,
- * **{@link compileAsync} is almost always faster than {@link compile}**, due to
- * the overhead of emulating synchronous messaging with worker threads and
- * concurrent compilations being blocked on main thread.
+ * **Heads up!** When using the [sass-embedded] npm package for single
+ * compilations, **{@link compileAsync} is almost always faster than
+ * {@link compile}**, due to the overhead of emulating synchronous messaging
+ * with worker threads and concurrent compilations being blocked on main thread.
+ *
+ * If you are running multiple compilations with the [sass-embedded] npm
+ * package, using a {@link Compiler} will provide some speed improvements over
+ * the module-level methods, and an {@link AsyncCompiler} will be much faster.
+ *
+ * [sass-embedded]: https://www.npmjs.com/package/sass-embedded
 *
 * @example
 *
@@ -99,12 +203,18 @@ export function compileAsync(
 *
 * This only allows synchronous {@link Importer}s and {@link CustomFunction}s.
 *
- * **Heads up!** When using the `sass-embedded` npm package,
- * **{@link compileStringAsync} is almost always faster than
+ * **Heads up!** When using the [sass-embedded] npm package for single
+ * compilations, **{@link compileStringAsync} is almost always faster than
 * {@link compileString}**, due to the overhead of emulating synchronous
 * messaging with worker threads and concurrent compilations being blocked on
 * main thread.
 *
+ * If you are running multiple compilations with the [sass-embedded] npm
+ * package, using a {@link Compiler} will provide some speed improvements over
+ * the module-level methods, and an {@link AsyncCompiler} will be much faster.
+ *
+ * [sass-embedded]: https://www.npmjs.com/package/sass-embedded
+ *
 * @example
 *
 * ```js
@@ -162,3 +272,71 @@ export function compileStringAsync(
  source: string,
  options?: StringOptions<'async'>
 ): Promise<CompileResult>;
+
+/**
+ * Creates a synchronous {@link Compiler}. Each compiler instance exposes the
+ * {@link compile} and {@link compileString} methods within the lifespan of the
+ * Compiler. Given identical input, these methods will return results identical
+ * to their counterparts exposed at the module root. To use asynchronous
+ * compilation, use {@link initAsyncCompiler}.
+ *
+ * When calling the compile functions multiple times, using a compiler instance
+ * with the [sass-embedded] npm package is much faster than using the top-level
+ * compilation methods or the [sass] npm package.
+ *
+ * [sass-embedded]: https://www.npmjs.com/package/sass-embedded
+ *
+ * [sass]: https://www.npmjs.com/package/sass
+ *
+ * @example
+ *
+ * ```js
+ * const sass = require('sass');
+ * function setup() {
+ *   const compiler = sass.initCompiler();
+ *   const result1 = compiler.compileString('a {b: c}').css;
+ *   const result2 = compiler.compileString('a {b: c}').css;
+ *   compiler.dispose();
+ *
+ *   // throws error
+ *   const result3 = sass.compileString('a {b: c}').css;
+ * }
+ * ```
+ * @category Compile
+ * @compatibility dart: "1.70.0", node: false
+ */
+export function initCompiler(): Compiler;
+
+/**
+ * Creates an asynchronous {@link AsyncCompiler}. Each compiler
+ * instance exposes the {@link compileAsync} and {@link compileStringAsync}
+ * methods within the lifespan of the Compiler. Given identical input, these
+ * methods will return results identical to their counterparts exposed at the
+ * module root. To use synchronous compilation, use {@link initCompiler};
+ *
+ * When calling the compile functions multiple times, using a compiler instance
+ * with the [sass-embedded] npm package is much faster than using the top-level
+ * compilation methods or the [sass] npm package.
+ *
+ * [sass-embedded]: https://www.npmjs.com/package/sass-embedded
+ *
+ * [sass]: https://www.npmjs.com/package/sass
+ *
+ * @example
+ *
+ * ```js
+ * const sass = require('sass');
+ * async function setup() {
+ *   const compiler = await sass.initAsyncCompiler();
+ *   const result1 = await compiler.compileStringAsync('a {b: c}').css;
+ *   const result2 = await compiler.compileStringAsync('a {b: c}').css;
+ *   await compiler.dispose();
+ *
+ *   // throws error
+ *   const result3 = await sass.compileStringAsync('a {b: c}').css;
+ * }
+ * ```
+ * @category Compile
+ * @compatibility dart: "1.70.0", node: false
+ */
+export function initAsyncCompiler(): Promise<AsyncCompiler>;
--- a/node_modules/sass/types/importer.d.ts
+++ b/node_modules/sass/types/importer.d.ts
@@ -42,7 +42,7 @@ export interface CanonicalizeContext {
 * Like all importers, this implements custom Sass loading logic for [`@use`
 * rules](https://sass-lang.com/documentation/at-rules/use) and [`@import`
 * rules](https://sass-lang.com/documentation/at-rules/import). It can be passed
- * to {@link Options.importers} or {@link StringOptionsWithImporter.importer}.
+ * to {@link Options.importers} or {@link StringOptions.importer}.
 *
 * @typeParam sync - A `FileImporter<'sync'>`'s {@link findFileUrl} must return
 * synchronously, but in return it can be passed to {@link compile} and {@link
@@ -122,7 +122,7 @@ export interface FileImporter<
 * An object that implements custom Sass loading logic for [`@use`
 * rules](https://sass-lang.com/documentation/at-rules/use) and [`@import`
 * rules](https://sass-lang.com/documentation/at-rules/import). It can be passed
- * to {@link Options.importers} or {@link StringOptionsWithImporter.importer}.
+ * to {@link Options.importers} or {@link StringOptions.importer}.
 *
 * Importers that simply redirect to files on disk are encouraged to use the
 * {@link FileImporter} interface instead.
@@ -308,6 +308,139 @@ export interface Importer<sync extends 'sync' | 'async' = 'sync' | 'async'> {
  nonCanonicalScheme?: string | string[];
 }

+declare const nodePackageImporterKey: unique symbol;
+
+/**
+ * The built-in Node.js package importer. This loads pkg: URLs from node_modules
+ * according to the standard Node.js resolution algorithm.
+ *
+ * A Node.js package importer is exposed as a class that can be added to the
+ * `importers` option.
+ *
+ *```js
+ * const sass = require('sass');
+ * sass.compileString('@use "pkg:vuetify', {
+ *   importers: [new sass.NodePackageImporter()]
+ * });
+ *```
+ *
+ * ## Writing Sass packages
+ *
+ * Package authors can control what is exposed to their users through their
+ * `package.json` manifest. The recommended method is to add a `sass`
+ * conditional export to `package.json`.
+ *
+ * ```json
+ * // node_modules/uicomponents/package.json
+ * {
+ *   "exports": {
+ *     ".": {
+ *       "sass": "./src/scss/index.scss",
+ *       "import": "./dist/js/index.mjs",
+ *       "default": "./dist/js/index.js"
+ *     }
+ *   }
+ * }
+ * ```
+ *
+ * This allows a package user to write `@use "pkg:uicomponents"` to load the
+ * file at `node_modules/uicomponents/src/scss/index.scss`.
+ *
+ * The Node.js package importer supports the variety of formats supported by
+ * Node.js [package entry points], allowing authors to expose multiple subpaths.
+ *
+ * [package entry points]:
+ * https://nodejs.org/api/packages.html#package-entry-points
+ *
+ * ```json
+ * // node_modules/uicomponents/package.json
+ * {
+ *   "exports": {
+ *     ".": {
+ *       "sass": "./src/scss/index.scss",
+ *     },
+ *     "./colors.scss": {
+ *       "sass": "./src/scss/_colors.scss",
+ *     },
+ *     "./theme/*.scss": {
+ *       "sass": "./src/scss/theme/*.scss",
+ *     },
+ *   }
+ * }
+ * ```
+ *
+ * This allows a package user to write:
+ *
+ * - `@use "pkg:uicomponents";` to import the root export.
+ * - `@use "pkg:uicomponents/colors";` to import the colors partial.
+ * - `@use "pkg:uicomponents/theme/purple";` to import a purple theme.
+ *
+ * Note that while library users can rely on the importer to resolve
+ * [partials](https://sass-lang.com/documentation/at-rules/use#partials), [index
+ * files](https://sass-lang.com/documentation/at-rules/use#index-files), and
+ * extensions, library authors must specify the entire file path in `exports`.
+ *
+ * In addition to the `sass` condition, the `style` condition is also
+ * acceptable. Sass will match the `default` condition if it's a relevant file
+ * type, but authors are discouraged from relying on this. Notably, the key
+ * order matters, and the importer will resolve to the first value with a key
+ * that is `sass`, `style`, or `default`, so you should always put `default`
+ * last.
+ *
+ * To help package authors who haven't transitioned to package entry points
+ * using the `exports` field, the Node.js package importer provides several
+ * fallback options. If the `pkg:` URL does not have a subpath, the Node.js
+ * package importer will look for a `sass` or `style` key at the root of
+ * `package.json`.
+ *
+ * ```json
+ * // node_modules/uicomponents/package.json
+ * {
+ *   "sass": "./src/scss/index.scss",
+ * }
+ * ```
+ *
+ * This allows a user to write `@use "pkg:uicomponents";` to import the
+ * `index.scss` file.
+ *
+ * Finally, the Node.js package importer will look for an `index` file at the
+ * package root, resolving partials and extensions. For example, if the file
+ * `_index.scss` exists in the package root of `uicomponents`, a user can import
+ * that with `@use "pkg:uicomponents";`.
+ *
+ * If a `pkg:` URL includes a subpath that doesn't have a match in package entry
+ * points, the Node.js importer will attempt to find that file relative to the
+ * package root, resolving for file extensions, partials and index files. For
+ * example, if the file `src/sass/_colors.scss` exists in the `uicomponents`
+ * package, a user can import that file using `@use
+ * "pkg:uicomponents/src/sass/colors";`.
+ *
+ * @compatibility dart: "1.71.0", node: false
+ * @category Importer
+ */
+export class NodePackageImporter {
+  /** Used to distinguish this type from any arbitrary object. */
+  private readonly [nodePackageImporterKey]: true;
+
+  /**
+   * The NodePackageImporter has an optional `entryPointDirectory` option, which
+   * is the directory where the Node Package Importer should start when
+   * resolving `pkg:` URLs in sources other than files on disk. This will be
+   * used as the `parentURL` in the [Node Module
+   * Resolution](https://nodejs.org/api/esm.html#resolution-algorithm-specification)
+   * algorithm.
+   *
+   * In order to be found by the Node Package Importer, a package will need to
+   * be inside a node_modules folder located in the `entryPointDirectory`, or
+   * one of its parent directories, up to the filesystem root.
+   *
+   * Relative paths will be resolved relative to the current working directory.
+   * If a path is not provided, this defaults to the parent directory of the
+   * Node.js entrypoint. If that's not available, this will throw an error.
+   */
+  constructor(entryPointDirectory?: string);
+}
+
 /**
 * The result of successfully loading a stylesheet with an {@link Importer}.
 *
--- a/node_modules/sass/types/index.d.ts
+++ b/node_modules/sass/types/index.d.ts
@@ -3,18 +3,31 @@
 // implementations.

 export {
+  AsyncCompiler,
  CompileResult,
+  Compiler,
  compile,
  compileAsync,
  compileString,
  compileStringAsync,
+  initCompiler,
+  initAsyncCompiler,
 } from './compile';
+export {
+  deprecations,
+  Deprecation,
+  Deprecations,
+  DeprecationOrId,
+  DeprecationStatus,
+  Version,
+} from './deprecations';
 export {Exception} from './exception';
 export {
  CanonicalizeContext,
  FileImporter,
  Importer,
  ImporterResult,
+  NodePackageImporter,
 } from './importer';
 export {Logger, SourceSpan, SourceLocation} from './logger';
 export {
--- a/node_modules/sass/types/legacy/options.d.ts
+++ b/node_modules/sass/types/legacy/options.d.ts
@@ -1,6 +1,7 @@
 import {Logger} from '../logger';
 import {LegacyImporter} from './importer';
 import {LegacyFunction} from './function';
+import {NodePackageImporter} from '../importer';

 /**
 * Options for {@link render} and {@link renderSync} that are shared between
@@ -508,6 +509,24 @@ export interface LegacySharedOptions<sync extends 'sync' | 'async'> {
   * @compatibility dart: "1.43.0", node: false
   */
  logger?: Logger;
+
+  /**
+   * If this option is set to an instance of `NodePackageImporter`, Sass will
+   * use the built-in Node.js package importer to resolve Sass files with a
+   * `pkg:` URL scheme. Details for library authors and users can be found in
+   * the {@link NodePackageImporter} documentation.
+   *
+   * @example
+   * ```js
+   * sass.renderSync({
+   *   data: '@use "pkg:vuetify";',
+   *   pkgImporter: new sass.NodePackageImporter()
+   * });
+   * ```
+   * @category Plugins
+   * @compatibility dart: "2.0", node: false
+   */
+  pkgImporter?: NodePackageImporter;
 }

 /**
--- a/node_modules/sass/types/logger/index.d.ts
+++ b/node_modules/sass/types/logger/index.d.ts
@@ -1,3 +1,4 @@
+import {Deprecation} from '../deprecations';
 import {SourceSpan} from './source_span';

 export {SourceLocation} from './source_location';
@@ -43,17 +44,21 @@ export interface Logger {
   *
   * @param message - The warning message.
   * @param options.deprecation - Whether this is a deprecation warning.
+   * @param options.deprecationType - The type of deprecation this warning is
+   * for, if any.
   * @param options.span - The location in the Sass source code that generated this
   * warning.
   * @param options.stack - The Sass stack trace at the point the warning was issued.
   */
  warn?(
    message: string,
-    options: {
-      deprecation: boolean;
-      span?: SourceSpan;
-      stack?: string;
-    }
+    options: (
+      | {
+          deprecation: true;
+          deprecationType: Deprecation;
+        }
+      | {deprecation: false}
+    ) & {span?: SourceSpan; stack?: string}
  ): void;

  /**
--- a/node_modules/sass/types/options.d.ts
+++ b/node_modules/sass/types/options.d.ts
@@ -1,4 +1,5 @@
-import {FileImporter, Importer} from './importer';
+import {DeprecationOrId, Version} from './deprecations';
+import {FileImporter, Importer, NodePackageImporter} from './importer';
 import {Logger} from './logger';
 import {Value} from './value';
 import {PromiseOr} from './util/promise_or';
@@ -122,6 +123,20 @@ export interface Options<sync extends 'sync' | 'async'> {
   */
  charset?: boolean;

+  /**
+   * A set of deprecations to treat as fatal.
+   *
+   * If a deprecation warning of any provided type is encountered during
+   * compilation, the compiler will error instead.
+   *
+   * If a `Version` is provided, then all deprecations that were active in that
+   * compiler version will be treated as fatal.
+   *
+   * @category Messages
+   * @compatiblity dart: "1.74.0", node: false
+   */
+  fatalDeprecations?: (DeprecationOrId | Version)[];
+
  /**
   * Additional built-in Sass functions that are available in all stylesheets.
   * This option takes an object whose keys are Sass function signatures like
@@ -198,6 +213,17 @@ export interface Options<sync extends 'sync' | 'async'> {
   */
  functions?: Record<string, CustomFunction<sync>>;

+  /**
+   * A set of future deprecations to opt into early.
+   *
+   * Future deprecations passed here will be treated as active by the compiler,
+   * emitting warnings as necessary.
+   *
+   * @category Messages
+   * @compatiblity dart: "1.74.0", node: false
+   */
+  futureDeprecations?: DeprecationOrId[];
+
  /**
   * Custom importers that control how Sass resolves loads from rules like
   * [`@use`](https://sass-lang.com/documentation/at-rules/use) and
@@ -208,8 +234,8 @@ export interface Options<sync extends 'sync' | 'async'> {
   * - The importer that was used to load the current stylesheet, with the
   *   loaded URL resolved relative to the current stylesheet's canonical URL.
   *
-   * - Each {@link Importer} or {@link FileImporter} in {@link importers}, in
-   *   order.
+   * - Each {@link Importer}, {@link FileImporter}, or
+   *   {@link NodePackageImporter} in {@link importers}, in order.
   *
   * - Each load path in {@link loadPaths}, in order.
   *
@@ -218,7 +244,7 @@ export interface Options<sync extends 'sync' | 'async'> {
   *
   * @category Plugins
   */
-  importers?: (Importer<sync> | FileImporter<sync>)[];
+  importers?: (Importer<sync> | FileImporter<sync> | NodePackageImporter)[];

  /**
   * Paths in which to look for stylesheets loaded by rules like
@@ -266,16 +292,30 @@ export interface Options<sync extends 'sync' | 'async'> {
   * so that they can get fixed as soon as possible!
   *
   * **Heads up!** If {@link compileString} or {@link compileStringAsync} is
-   * called without {@link StringOptionsWithoutImporter.url}, <em>all</em>
-   * stylesheets it loads will be considered dependencies. Since it doesn’t have
-   * a path of its own, everything it loads is coming from a load path rather
-   * than a relative import.
+   * called without {@link StringOptions.url}, <em>all</em> stylesheets it loads
+   * will be considered dependencies. Since it doesn’t have a path of its own,
+   * everything it loads is coming from a load path rather than a relative
+   * import.
   *
   * @defaultValue `false`
   * @category Messages
   */
  quietDeps?: boolean;

+  /**
+   * A set of active deprecations to ignore.
+   *
+   * If a deprecation warning of any provided type is encountered during
+   * compilation, the compiler will ignore it instead.
+   *
+   * **Heads up!** The deprecated functionality you're depending on will
+   * eventually break.
+   *
+   * @category Messages
+   * @compatiblity dart: "1.74.0", node: false
+   */
+  silenceDeprecations?: DeprecationOrId[];
+
  /**
   * Whether or not Sass should generate a source map. If it does, the source
   * map will be available as {@link CompileResult.sourceMap}.
@@ -348,9 +388,10 @@ export interface Options<sync extends 'sync' | 'async'> {
 * Options that can be passed to {@link compileString} or {@link
 * compileStringAsync}.
 *
- * If the {@link StringOptionsWithImporter.importer} field isn't passed, the
- * entrypoint file can load files relative to itself if a `file://` URL is
- * passed to the {@link url} field.
+ * If the {@link StringOptions.importer} field isn't passed, the entrypoint file
+ * can load files relative to itself if a `file://` URL is passed to the {@link
+ * url} field. If it is passed, the entrypoint file uses it to load files
+ * relative to itself.
 *
 * @typeParam sync - This lets the TypeScript checker verify that asynchronous
 * {@link Importer}s, {@link FileImporter}s, and {@link CustomFunction}s aren't
@@ -358,7 +399,7 @@ export interface Options<sync extends 'sync' | 'async'> {
 *
 * @category Options
 */
-export interface StringOptionsWithoutImporter<sync extends 'sync' | 'async'>
+export interface StringOptions<sync extends 'sync' | 'async'>
  extends Options<sync> {
  /**
   * The {@link Syntax} to use to parse the entrypoint stylesheet.
@@ -369,6 +410,19 @@ export interface StringOptionsWithoutImporter<sync extends 'sync' | 'async'>
   */
  syntax?: Syntax;

+  /**
+   * The importer to use to handle loads that are relative to the entrypoint
+   * stylesheet.
+   *
+   * A relative load's URL is first resolved relative to {@link url}, then
+   * passed to {@link importer}. (It's passed as-is if {@link url} isn't
+   * passed.) If the importer doesn't recognize it, it's then passed to {@link
+   * importers} and {@link loadPaths}.
+   *
+   * @category Input
+   */
+  importer?: Importer<sync> | FileImporter<sync>;
+
  /**
   * The canonical URL of the entrypoint stylesheet.
   *
@@ -378,62 +432,24 @@ export interface StringOptionsWithoutImporter<sync extends 'sync' | 'async'>
   * loadPaths}.
   *
   * @category Input
+   * @compatibility feature: "Undefined URL with importer", dart: "1.75.0", node: false
+   *
+   * Earlier versions of Dart Sass required {@link url} to be defined when
+   * passing {@link StringOptions.importer}.
   */
  url?: URL;
 }

 /**
- * Options that can be passed to {@link compileString} or {@link
- * compileStringAsync}.
- *
- * If the {@link StringOptionsWithImporter.importer} field is passed, the
- * entrypoint file uses it to load files relative to itself and the {@link url}
- * field is mandatory.
- *
- * @typeParam sync - This lets the TypeScript checker verify that asynchronous
- * {@link Importer}s, {@link FileImporter}s, and {@link CustomFunction}s aren't
- * passed to {@link compile} or {@link compileString}.
- *
 * @category Options
+ * @deprecated Use {@link StringOptions} instead.
 */
-export interface StringOptionsWithImporter<sync extends 'sync' | 'async'>
-  extends StringOptionsWithoutImporter<sync> {
-  /**
-   * The importer to use to handle loads that are relative to the entrypoint
-   * stylesheet.
-   *
-   * A relative load's URL is first resolved relative to {@link url}, then
-   * passed to {@link importer}. If the importer doesn't recognize it, it's then
-   * passed to {@link importers} and {@link loadPaths}.
-   *
-   * @category Input
-   */
-  importer: Importer<sync> | FileImporter<sync>;
-
-  /**
-   * The canonical URL of the entrypoint stylesheet. If this is passed along
-   * with {@link importer}, it's used to resolve relative loads in the
-   * entrypoint stylesheet.
-   *
-   * @category Input
-   */
-  url: URL;
-}
+type StringOptionsWithoutImporter<sync extends 'sync' | 'async'> =
+  StringOptions<sync>;

 /**
- * Options that can be passed to {@link compileString} or {@link
- * compileStringAsync}.
- *
- * This is a {@link StringOptionsWithImporter} if it has a {@link
- * StringOptionsWithImporter.importer} field, and a {@link
- * StringOptionsWithoutImporter} otherwise.
- *
- * @typeParam sync - This lets the TypeScript checker verify that asynchronous
- * {@link Importer}s, {@link FileImporter}s, and {@link CustomFunction}s aren't
- * passed to {@link compile} or {@link compileString}.
- *
 * @category Options
+ * @deprecated Use {@link StringOptions} instead.
 */
-export type StringOptions<sync extends 'sync' | 'async'> =
-  | StringOptionsWithImporter<sync>
-  | StringOptionsWithoutImporter<sync>;
+type StringOptionsWithImporter<sync extends 'sync' | 'async'> =
+  StringOptions<sync>;
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -0,0 +1,9 @@
+{
+  "devDependencies": {
+    "sass": "^1.69.5",
+    "sass-loader": "^13.3.2"
+  },
+  "dependencies": {
+    "lodash": "^4.17.21"
+  }
+}
--- a/pages.json
+++ b/pages.json
@@ -166,13 +166,6 @@
 				"navigationBarTextStyle": "white"
 			}
 		},
-		{
-			"path": "pages/order_food/order_goods",
-			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTextStyle": "white"
-			}
-		},
 		{
 			"path": "pages/order_food/goodsList_scroll",
 			"style": {
--- a/pages/chooseasong/index.vue
+++ b/pages/chooseasong/index.vue
@@ -1,8 +1,7 @@
 <template>
 	<view class="content">
 		<!-- 占位符导航栏 -->
-		<navseat :opacity='false' :title='"歌曲列表"' :titleshow='true' :heightshow='true' :namecolor='"#fff"'
-			:iconshow='false'></navseat>
+		<navseat :opacity='false' :title='"歌曲列表"' :titleshow='true' :heightshow='true' :namecolor='"#fff"' iconcolor='#fff'></navseat>
 		<view class="search flex-between">
 			<view class="searchinput flex-between">
 				<input type="text" class="searchinput_input" placeholder-style="color:#FFFFFF" @input="onInput"
@@ -140,14 +139,12 @@
 			if (e.q) {
 				this.shopId = this.getQueryString(decodeURIComponent(e.q), 'shopId')
 			}
-			uni.hideHomeButton();
-

 		},
 		computed: {},
 		mounted() {},
 		onShow() {
-			if (!uni.cache.get('miniAppOpenId')) {
+			if (!uni.cache.get('miniAppOpenId')) {//单独登录  
 				uni.login({
 					provider: 'weixin',
 					success: async (data) => {
--- a/pages/index/indexs.vue
+++ b/pages/index/indexs.vue
@@ -61,7 +61,7 @@
 							let tableCode = this.getQueryString(decodeURIComponent(res.result), 'code')
 							uni.cache.set('tableCode', tableCode)
 							if (tableCode) {
-								uni.pro.navigateTo('order_food/order_goods')
+								uni.pro.navigateTo('order_food/goodsList_scroll')
 								// uni.pro.navigateTo('order_food/order_food')
 							}

--- a/pages/order/confirm_order.vue
+++ b/pages/order/confirm_order.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<!-- 占位符导航栏 -->
-		<navseat class="navbar" :opacity='opacitys' :title='toplist.name' :titleshow='true'></navseat>
+		<navseat class="navbar" :opacity='opacitys' :backColor="'#E8AD7B'" :title='toplist.name' :titleshow='true'></navseat>
 		<!-- #ifdef MP-WEIXIN -->
 		<view :style="{'height':HeighT.customBar+HeighT.heightBar+'px;background-color: #E8AD7B;position: fixed;top: 0;width: 100%;z-index: 9'}"></view>
 		<view :style="{'height':HeighT.customBar+HeighT.heightBar+'px;background-color: #E8AD7B;'}"></view>
@@ -9,7 +9,10 @@
 		<!-- 头部内容 -->
 		<view class="head">
 			<view class="head_bg"></view>
-			<view class="tips">温馨提示：请适量点餐，避免浪费</view>
+			<view class="tips">
+				<image class="informIcon" src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/informIcon.png" mode="widthFix"/>
+				<text class="informText">温馨提示：请适量点餐，避免浪费</text>
+			</view>
 			<!-- <view class="tabBox"> -->
 			<!-- 	<view class="tab">
 					<view :class="is_type==(index+1)?'tab_item'+is_type+' tab_item  active ':'tab_item'" v-for="(item,index) in is_typeList" :key="index" @click="tabClick(index+1)">
@@ -546,13 +549,21 @@
 			line-height: 64rpx;
 			background: #FFF8E8;
 			border-radius: 8rpx 8rpx 8rpx 8rpx;
-			font-size: $uni-font-size-base;
-			color: #FF803D;
-			font-weight: 400;
 			padding: 0 16rpx;
 			box-sizing: border-box;
 			position: relative;
 			z-index: 1;
+			display: flex;
+			align-items: center;
+			.informIcon{
+				width: 26.7rpx;
+				margin-right: 8rpx;
+			}
+			.informText{
+				font-size: $uni-font-size-base;
+				color: #FF803D;
+				font-weight: 400;
+			}
 		}
 		.tabBox{
 			width: 100%;
--- a/pages/order_detail/indexs.vue
+++ b/pages/order_detail/indexs.vue
@@ -257,7 +257,7 @@
 		},
 		onHide() {
 			this.socketTicket.Close()
-			uni.$off('message')
+			uni.$off('getMessage')
 		},
 		onShow() {
 			uni.$on('message', this.getMessage)
--- a/pages/order_food/goodsList_scroll.vue
+++ b/pages/order_food/goodsList_scroll.vue
--- a/pages/order_food/order_goods.vue
+++ b/pages/order_food/order_goods.vue
@@ -30,6 +30,7 @@
 			</view>
 			
 			<div class="signatureDish dishes">
+				<view class="signatureDish_title"></view>
 				<scroll-view scroll-x class="scroll-view">
 					<view class="signatureDish_list">
 						<view  class="signatureDish_item"  v-for="(item,index) in signatureDish_list" :key="index">