Merge branch 'master' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-xiaochengxu

# Conflicts:
#	node_modules/@babel/runtime/package.json
#	node_modules/complex.js/package.json
#	node_modules/decimal.js/package.json
#	node_modules/escape-latex/package.json
#	node_modules/fraction.js/package.json
#	node_modules/javascript-natural-sort/package.json
#	node_modules/mathjs/package.json
#	node_modules/regenerator-runtime/package.json
#	node_modules/seedrandom/package.json
#	node_modules/tiny-emitter/package.json
#	node_modules/typed-function/package.json

node_modules/.bin/mathjs

@@ -0,0 +1,16 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*|*MINGW*|*MSYS*)
+        if command -v cygpath > /dev/null 2>&1; then
+            basedir=`cygpath -w "$basedir"`
+        fi
+    ;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  exec "$basedir/node"  "$basedir/../mathjs/bin/cli.js" "$@"
+else 
+  exec node  "$basedir/../mathjs/bin/cli.js" "$@"
+fi

node_modules/.bin/mathjs.cmd

@@ -0,0 +1,17 @@
+@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 "_prog=node"
+  SET PATHEXT=%PATHEXT:;.JS;=;%
+)
+
+endLocal & goto #_undefined_# 2>NUL || title %COMSPEC% & "%_prog%"  "%dp0%\..\mathjs\bin\cli.js" %*

node_modules/.bin/mathjs.ps1

@@ -0,0 +1,28 @@
+#!/usr/bin/env pwsh
+$basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent
+
+$exe=""
+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"
+}
+$ret=0
+if (Test-Path "$basedir/node$exe") {
+  # Support pipeline input
+  if ($MyInvocation.ExpectingInput) {
+    $input | & "$basedir/node$exe"  "$basedir/../mathjs/bin/cli.js" $args
+  } else {
+    & "$basedir/node$exe"  "$basedir/../mathjs/bin/cli.js" $args
+  }
+  $ret=$LASTEXITCODE
+} else {
+  # Support pipeline input
+  if ($MyInvocation.ExpectingInput) {
+    $input | & "node$exe"  "$basedir/../mathjs/bin/cli.js" $args
+  } else {
+    & "node$exe"  "$basedir/../mathjs/bin/cli.js" $args
+  }
+  $ret=$LASTEXITCODE
+}
+exit $ret

node_modules/.package-lock.json

@@ -3,10 +3,104 @@
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
+    "node_modules/@babel/runtime": {
+      "version": "7.26.0",
+      "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.26.0.tgz",
+      "integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==",
+      "dependencies": {
+        "regenerator-runtime": "^0.14.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/complex.js": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmmirror.com/complex.js/-/complex.js-2.4.2.tgz",
+      "integrity": "sha512-qtx7HRhPGSCBtGiST4/WGHuW+zeaND/6Ld+db6PbrulIB1i2Ev/2UPiqcmpQNPSyfBKraC0EOvOKCB5dGZKt3g==",
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/rawify"
+      }
+    },
+    "node_modules/decimal.js": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmmirror.com/decimal.js/-/decimal.js-10.4.3.tgz",
+      "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA=="
+    },
+    "node_modules/escape-latex": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/escape-latex/-/escape-latex-1.2.0.tgz",
+      "integrity": "sha512-nV5aVWW1K0wEiUIEdZ4erkGGH8mDxGyxSeqPzRNtWP7ataw+/olFObw7hujFWlVjNsaDFw5VZ5NzVSIqRgfTiw=="
+    },
+    "node_modules/fraction.js": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmmirror.com/fraction.js/-/fraction.js-5.2.1.tgz",
+      "integrity": "sha512-Ah6t/7YCYjrPUFUFsOsRLMXAdnYM+aQwmojD2Ayb/Ezr82SwES0vuyQ8qZ3QO8n9j7W14VJuVZZet8U3bhSdQQ==",
+      "engines": {
+        "node": ">= 12"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/rawify"
+      }
+    },
+    "node_modules/javascript-natural-sort": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmmirror.com/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz",
+      "integrity": "sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw=="
+    },
+    "node_modules/mathjs": {
+      "version": "14.0.1",
+      "resolved": "https://registry.npmmirror.com/mathjs/-/mathjs-14.0.1.tgz",
+      "integrity": "sha512-yyJgLwC6UXuve724np8tHRMYaTtb5UqiOGQkjwbSXgH8y1C/LcJ0pvdNDZLI2LT7r+iExh2Y5HwfAY+oZFtGIQ==",
+      "dependencies": {
+        "@babel/runtime": "^7.25.7",
+        "complex.js": "^2.2.5",
+        "decimal.js": "^10.4.3",
+        "escape-latex": "^1.2.0",
+        "fraction.js": "^5.2.1",
+        "javascript-natural-sort": "^0.7.1",
+        "seedrandom": "^3.0.5",
+        "tiny-emitter": "^2.1.0",
+        "typed-function": "^4.2.1"
+      },
+      "bin": {
+        "mathjs": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
     "node_modules/mitt": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
       "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw=="
+    },
+    "node_modules/regenerator-runtime": {
+      "version": "0.14.1",
+      "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
+    },
+    "node_modules/seedrandom": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmmirror.com/seedrandom/-/seedrandom-3.0.5.tgz",
+      "integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg=="
+    },
+    "node_modules/tiny-emitter": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
+      "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
+    },
+    "node_modules/typed-function": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmmirror.com/typed-function/-/typed-function-4.2.1.tgz",
+      "integrity": "sha512-EGjWssW7Tsk4DGfE+5yluuljS1OGYWiI1J6e8puZz9nTMM51Oug8CD5Zo4gWMsOhq5BI+1bF+rWTm4Vbj3ivRA==",
+      "engines": {
+        "node": ">= 18"
+      }
     }
   }
 }

node_modules/@babel/runtime/package.json

@@ -1,44 +1,21 @@
 {
-  "_from": "@babel/runtime@^7.25.7",
+  "name": "@babel/runtime",
-  "_id": "@babel/runtime@7.26.0",
+  "version": "7.26.0",
-  "_inBundle": false,
+  "description": "babel's modular runtime helpers",
-  "_integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==",
+  "license": "MIT",
-  "_location": "/@babel/runtime",
+  "publishConfig": {
-  "_phantomChildren": {},
+    "access": "public"
-  "_requested": {
-    "type": "range",
-    "registry": true,
-    "raw": "@babel/runtime@^7.25.7",
-    "name": "@babel/runtime",
-    "escapedName": "@babel%2fruntime",
-    "scope": "@babel",
-    "rawSpec": "^7.25.7",
-    "saveSpec": null,
-    "fetchSpec": "^7.25.7"
   },
-  "_requiredBy": [
+  "repository": {
-    "/mathjs"
+    "type": "git",
-  ],
+    "url": "https://github.com/babel/babel.git",
-  "_resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.26.0.tgz",
+    "directory": "packages/babel-runtime"
-  "_shasum": "8600c2f595f277c60815256418b85356a65173c1",
-  "_spec": "@babel/runtime@^7.25.7",
-  "_where": "D:\\jiangchengfeiyi-xiaochengxu\\node_modules\\mathjs",
-  "author": {
-    "name": "The Babel Team",
-    "url": "https://babel.dev/team"
   },
-  "bugs": {
+  "homepage": "https://babel.dev/docs/en/next/babel-runtime",
-    "url": "https://github.com/babel/babel/issues"
+  "author": "The Babel Team (https://babel.dev/team)",
-  },
-  "bundleDependencies": false,
   "dependencies": {
     "regenerator-runtime": "^0.14.0"
   },
-  "deprecated": false,
-  "description": "babel's modular runtime helpers",
-  "engines": {
-    "node": ">=6.9.0"
-  },
   "exports": {
     "./helpers/OverloadYield": [
       {
@@ -1072,17 +1049,8 @@
     "./regenerator/*.js": "./regenerator/*.js",
     "./regenerator/": "./regenerator/"
   },
-  "homepage": "https://babel.dev/docs/en/next/babel-runtime",
+  "engines": {
-  "license": "MIT",
+    "node": ">=6.9.0"
-  "name": "@babel/runtime",
-  "publishConfig": {
-    "access": "public"
   },
-  "repository": {
+  "type": "commonjs"
-    "type": "git",
-    "url": "git+https://github.com/babel/babel.git",
-    "directory": "packages/babel-runtime"
-  },
-  "type": "commonjs",
-  "version": "7.26.0"
 }

node_modules/complex.js/dist/complex.min.js

@@ -0,0 +1,26 @@
+/*
+Complex.js v2.4.2 11/5/2024
+https://raw.org/article/complex-numbers-in-javascript/
+
+Copyright (c) 2024, Robert Eisele (https://raw.org/)
+Licensed under the MIT license.
+*/
+'use strict';(function(r){function l(a,b){if(void 0===a||null===a)f.re=f.im=0;else if(void 0!==b)f.re=a,f.im=b;else switch(typeof a){case "object":if("im"in a&&"re"in a)f.re=a.re,f.im=a.im;else if("abs"in a&&"arg"in a){if(!isFinite(a.abs)&&isFinite(a.arg))return c.INFINITY;f.re=a.abs*Math.cos(a.arg);f.im=a.abs*Math.sin(a.arg)}else if("r"in a&&"phi"in a){if(!isFinite(a.r)&&isFinite(a.phi))return c.INFINITY;f.re=a.r*Math.cos(a.phi);f.im=a.r*Math.sin(a.phi)}else 2===a.length?(f.re=a[0],f.im=a[1]):m();
+break;case "string":f.im=f.re=0;a=a.replace(/_/g,"").match(/\d+\.?\d*e[+-]?\d+|\d+\.?\d*|\.\d+|./g);b=1;let d=0;null===a&&m();for(let e=0;e<a.length;e++){const g=a[e];" "!==g&&"\t"!==g&&"\n"!==g&&("+"===g?b++:"-"===g?d++:("i"===g||"I"===g?(0===b+d&&m()," "===a[e+1]||isNaN(a[e+1])?f.im+=parseFloat((d%2?"-":"")+"1"):(f.im+=parseFloat((d%2?"-":"")+a[e+1]),e++)):((0===b+d||isNaN(g))&&m(),"i"===a[e+1]||"I"===a[e+1]?(f.im+=parseFloat((d%2?"-":"")+g),e++):f.re+=parseFloat((d%2?"-":"")+g)),b=d=0))}0<b+d&&
+m();break;case "number":f.im=0;f.re=a;break;default:m()}return f}function m(){throw SyntaxError("Invalid Param");}function n(a,b){a=Math.abs(a);b=Math.abs(b);a<b&&([a,b]=[b,a]);if(1E8>a)return Math.sqrt(a*a+b*b);b/=a;return a*Math.sqrt(1+b*b)}function p(a,b){const d=Math.abs(a),e=Math.abs(b);if(0===a)return Math.log(e);if(0===b)return Math.log(d);if(3E3>d&&3E3>e)return.5*Math.log(a*a+b*b);a*=.5;b*=.5;return.5*Math.log(a*a+b*b)+Math.LN2}function c(a,b){if(!(this instanceof c))return new c(a,b);a=l(a,
+b);this.re=a.re;this.im=a.im}const h=Math.cosh||function(a){return 1E-9>Math.abs(a)?1-a:.5*(Math.exp(a)+Math.exp(-a))},k=Math.sinh||function(a){return 1E-9>Math.abs(a)?a:.5*(Math.exp(a)-Math.exp(-a))},f={re:0,im:0};c.prototype={re:0,im:0,sign:function(){const a=n(this.re,this.im);return new c(this.re/a,this.im/a)},add:function(a,b){a=l(a,b);b=this.isInfinite();const d=!(isFinite(a.re)&&isFinite(a.im));return b||d?b&&d?c.NAN:c.INFINITY:new c(this.re+a.re,this.im+a.im)},sub:function(a,b){a=l(a,b);b=
+this.isInfinite();const d=!(isFinite(a.re)&&isFinite(a.im));return b||d?b&&d?c.NAN:c.INFINITY:new c(this.re-a.re,this.im-a.im)},mul:function(a,b){a=l(a,b);b=this.isInfinite();const d=!(isFinite(a.re)&&isFinite(a.im)),e=0===this.re&&0===this.im,g=0===a.re&&0===a.im;return b&&g||d&&e?c.NAN:b||d?c.INFINITY:0===a.im&&0===this.im?new c(this.re*a.re,0):new c(this.re*a.re-this.im*a.im,this.re*a.im+this.im*a.re)},div:function(a,b){a=l(a,b);b=this.isInfinite();const d=!(isFinite(a.re)&&isFinite(a.im)),e=0===
+this.re&&0===this.im,g=0===a.re&&0===a.im;if(e&&g||b&&d)return c.NAN;if(g||b)return c.INFINITY;if(e||d)return c.ZERO;if(0===a.im)return new c(this.re/a.re,this.im/a.re);if(Math.abs(a.re)<Math.abs(a.im))return b=a.re/a.im,a=a.re*b+a.im,new c((this.re*b+this.im)/a,(this.im*b-this.re)/a);b=a.im/a.re;a=a.im*b+a.re;return new c((this.re+this.im*b)/a,(this.im-this.re*b)/a)},pow:function(a,b){a=l(a,b);b=0===this.re&&0===this.im;if(0===a.re&&0===a.im)return c.ONE;if(0===a.im){if(0===this.im&&0<this.re)return new c(Math.pow(this.re,
+a.re),0);if(0===this.re)switch((a.re%4+4)%4){case 0:return new c(Math.pow(this.im,a.re),0);case 1:return new c(0,Math.pow(this.im,a.re));case 2:return new c(-Math.pow(this.im,a.re),0);case 3:return new c(0,-Math.pow(this.im,a.re))}}if(b&&0<a.re)return c.ZERO;const d=Math.atan2(this.im,this.re),e=p(this.re,this.im);b=Math.exp(a.re*e-a.im*d);a=a.im*e+a.re*d;return new c(b*Math.cos(a),b*Math.sin(a))},sqrt:function(){const a=this.re,b=this.im;if(0===b)return 0<=a?new c(Math.sqrt(a),0):new c(0,Math.sqrt(-a));
+var d=n(a,b);d=Math.sqrt(.5*(d+Math.abs(a)));let e=Math.abs(b)/(2*d);return 0<=a?new c(d,0>b?-e:e):new c(e,0>b?-d:d)},exp:function(){const a=Math.exp(this.re);return 0===this.im?new c(a,0):new c(a*Math.cos(this.im),a*Math.sin(this.im))},expm1:function(){const a=this.re,b=this.im;var d=Math.expm1(a)*Math.cos(b);var e=Math.PI/4;-e>b||b>e?e=Math.cos(b)-1:(e=b*b,e*=e*(e*(e*(e*(e*(e*(e/20922789888E3-1/87178291200)+1/479001600)-1/3628800)+1/40320)-1/720)+1/24)-.5);return new c(d+e,Math.exp(a)*Math.sin(b))},
+log:function(){const a=this.re,b=this.im;return 0===b&&0<a?new c(Math.log(a),0):new c(p(a,b),Math.atan2(b,a))},abs:function(){return n(this.re,this.im)},arg:function(){return Math.atan2(this.im,this.re)},sin:function(){const a=this.re,b=this.im;return new c(Math.sin(a)*h(b),Math.cos(a)*k(b))},cos:function(){const a=this.re,b=this.im;return new c(Math.cos(a)*h(b),-Math.sin(a)*k(b))},tan:function(){const a=2*this.re,b=2*this.im,d=Math.cos(a)+h(b);return new c(Math.sin(a)/d,k(b)/d)},cot:function(){const a=
+2*this.re,b=2*this.im,d=Math.cos(a)-h(b);return new c(-Math.sin(a)/d,k(b)/d)},sec:function(){const a=this.re,b=this.im,d=.5*h(2*b)+.5*Math.cos(2*a);return new c(Math.cos(a)*h(b)/d,Math.sin(a)*k(b)/d)},csc:function(){const a=this.re,b=this.im,d=.5*h(2*b)-.5*Math.cos(2*a);return new c(Math.sin(a)*h(b)/d,-Math.cos(a)*k(b)/d)},asin:function(){var a=this.re;const b=this.im,d=(new c(b*b-a*a+1,-2*a*b)).sqrt();a=(new c(d.re-b,d.im+a)).log();return new c(a.im,-a.re)},acos:function(){var a=this.re;const b=
+this.im,d=(new c(b*b-a*a+1,-2*a*b)).sqrt();a=(new c(d.re-b,d.im+a)).log();return new c(Math.PI/2-a.im,a.re)},atan:function(){var a=this.re;const b=this.im;if(0===a){if(1===b)return new c(0,Infinity);if(-1===b)return new c(0,-Infinity)}const d=a*a+(1-b)*(1-b);a=(new c((1-b*b-a*a)/d,-2*a/d)).log();return new c(-.5*a.im,.5*a.re)},acot:function(){const a=this.re,b=this.im;if(0===b)return new c(Math.atan2(1,a),0);const d=a*a+b*b;return 0!==d?(new c(a/d,-b/d)).atan():(new c(0!==a?a/0:0,0!==b?-b/0:0)).atan()},
+asec:function(){const a=this.re,b=this.im;if(0===a&&0===b)return new c(0,Infinity);const d=a*a+b*b;return 0!==d?(new c(a/d,-b/d)).acos():(new c(0!==a?a/0:0,0!==b?-b/0:0)).acos()},acsc:function(){const a=this.re,b=this.im;if(0===a&&0===b)return new c(Math.PI/2,Infinity);const d=a*a+b*b;return 0!==d?(new c(a/d,-b/d)).asin():(new c(0!==a?a/0:0,0!==b?-b/0:0)).asin()},sinh:function(){const a=this.re,b=this.im;return new c(k(a)*Math.cos(b),h(a)*Math.sin(b))},cosh:function(){const a=this.re,b=this.im;return new c(h(a)*
+Math.cos(b),k(a)*Math.sin(b))},tanh:function(){const a=2*this.re,b=2*this.im,d=h(a)+Math.cos(b);return new c(k(a)/d,Math.sin(b)/d)},coth:function(){const a=2*this.re,b=2*this.im,d=h(a)-Math.cos(b);return new c(k(a)/d,-Math.sin(b)/d)},csch:function(){const a=this.re,b=this.im,d=Math.cos(2*b)-h(2*a);return new c(-2*k(a)*Math.cos(b)/d,2*h(a)*Math.sin(b)/d)},sech:function(){const a=this.re,b=this.im,d=Math.cos(2*b)+h(2*a);return new c(2*h(a)*Math.cos(b)/d,-2*k(a)*Math.sin(b)/d)},asinh:function(){let a=
+this.im;this.im=-this.re;this.re=a;const b=this.asin();this.re=-this.im;this.im=a;a=b.re;b.re=-b.im;b.im=a;return b},acosh:function(){const a=this.acos();if(0>=a.im){var b=a.re;a.re=-a.im;a.im=b}else b=a.im,a.im=-a.re,a.re=b;return a},atanh:function(){var a=this.re,b=this.im;const d=1<a&&0===b,e=1-a,g=1+a,q=e*e+b*b;a=0!==q?new c((g*e-b*b)/q,(b*e+g*b)/q):new c(-1!==a?a/0:0,0!==b?b/0:0);b=a.re;a.re=p(a.re,a.im)/2;a.im=Math.atan2(a.im,b)/2;d&&(a.im=-a.im);return a},acoth:function(){const a=this.re,b=
+this.im;if(0===a&&0===b)return new c(0,Math.PI/2);const d=a*a+b*b;return 0!==d?(new c(a/d,-b/d)).atanh():(new c(0!==a?a/0:0,0!==b?-b/0:0)).atanh()},acsch:function(){const a=this.re,b=this.im;if(0===b)return new c(0!==a?Math.log(a+Math.sqrt(a*a+1)):Infinity,0);const d=a*a+b*b;return 0!==d?(new c(a/d,-b/d)).asinh():(new c(0!==a?a/0:0,0!==b?-b/0:0)).asinh()},asech:function(){const a=this.re,b=this.im;if(this.isZero())return c.INFINITY;const d=a*a+b*b;return 0!==d?(new c(a/d,-b/d)).acosh():(new c(0!==
+a?a/0:0,0!==b?-b/0:0)).acosh()},inverse:function(){if(this.isZero())return c.INFINITY;if(this.isInfinite())return c.ZERO;const a=this.re,b=this.im,d=a*a+b*b;return new c(a/d,-b/d)},conjugate:function(){return new c(this.re,-this.im)},neg:function(){return new c(-this.re,-this.im)},ceil:function(a){a=Math.pow(10,a||0);return new c(Math.ceil(this.re*a)/a,Math.ceil(this.im*a)/a)},floor:function(a){a=Math.pow(10,a||0);return new c(Math.floor(this.re*a)/a,Math.floor(this.im*a)/a)},round:function(a){a=
+Math.pow(10,a||0);return new c(Math.round(this.re*a)/a,Math.round(this.im*a)/a)},equals:function(a,b){a=l(a,b);return Math.abs(a.re-this.re)<=c.EPSILON&&Math.abs(a.im-this.im)<=c.EPSILON},clone:function(){return new c(this.re,this.im)},toString:function(){let a=this.re,b=this.im,d="";if(this.isNaN())return"NaN";if(this.isInfinite())return"Infinity";Math.abs(a)<c.EPSILON&&(a=0);Math.abs(b)<c.EPSILON&&(b=0);if(0===b)return d+a;0!==a?(d=d+a+" ",0>b?(b=-b,d+="-"):d+="+",d+=" "):0>b&&(b=-b,d+="-");1!==
+b&&(d+=b);return d+"i"},toVector:function(){return[this.re,this.im]},valueOf:function(){return 0===this.im?this.re:null},isNaN:function(){return isNaN(this.re)||isNaN(this.im)},isZero:function(){return 0===this.im&&0===this.re},isFinite:function(){return isFinite(this.re)&&isFinite(this.im)},isInfinite:function(){return!this.isFinite()}};c.ZERO=new c(0,0);c.ONE=new c(1,0);c.I=new c(0,1);c.PI=new c(Math.PI,0);c.E=new c(Math.E,0);c.INFINITY=new c(Infinity,Infinity);c.NAN=new c(NaN,NaN);c.EPSILON=1E-15;
+"function"===typeof define&&define.amd?define([],function(){return c}):"object"===typeof exports?(Object.defineProperty(c,"__esModule",{value:!0}),c["default"]=c,c.Complex=c,module.exports=c):r.Complex=c})(this);

node_modules/complex.js/examples/gamma.js

@@ -0,0 +1,33 @@
+/*
+ * A gamma function implementation based on Lanczos Approximation
+ * https://en.wikipedia.org/wiki/Lanczos_approximation
+ */
+
+var Complex = require('complex.js');
+
+var P = [
+  Complex(0.99999999999980993),
+  Complex(676.5203681218851), Complex(-1259.1392167224028), Complex(771.32342877765313),
+  Complex(-176.61502916214059), Complex(12.507343278686905), Complex(-0.13857109526572012),
+  Complex(9.9843695780195716e-6), Complex(1.5056327351493116e-7)
+];
+
+var SQRT2PI = Complex(Math.sqrt(2 * Math.PI));
+
+function gamma(z) {
+
+  z = z.sub(1);
+
+  var x = P[0];
+  var t = z.add(7.5);
+  for (var i = 1; i < P.length; i++) {
+    x = x.add(P[i].div(z.add(i)));
+  }
+  return SQRT2PI.mul(t.pow(z.add(0.5))).mul(t.neg().exp()).mul(x);
+}
+
+var fac = 1;
+for (var i = 1; i <= 10; i++) {
+  console.log(fac, gamma(Complex(i)));
+  fac *= i;
+}

node_modules/complex.js/package.json

@@ -1,86 +1,60 @@
 {
-  "_from": "complex.js@^2.2.5",
-  "_id": "complex.js@2.4.2",
-  "_inBundle": false,
-  "_integrity": "sha512-qtx7HRhPGSCBtGiST4/WGHuW+zeaND/6Ld+db6PbrulIB1i2Ev/2UPiqcmpQNPSyfBKraC0EOvOKCB5dGZKt3g==",
-  "_location": "/complex.js",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "range",
-    "registry": true,
-    "raw": "complex.js@^2.2.5",
     "name": "complex.js",
-    "escapedName": "complex.js",
+    "title": "Complex.js",
-    "rawSpec": "^2.2.5",
+    "version": "2.4.2",
-    "saveSpec": null,
+    "homepage": "https://raw.org/article/complex-numbers-in-javascript/",
-    "fetchSpec": "^2.2.5"
+    "bugs": "https://github.com/rawify/Complex.js/issues",
-  },
+    "description": "A complex numbers library",
-  "_requiredBy": [
+    "keywords": [
-    "/mathjs"
+        "complex numbers",
-  ],
+        "math",
-  "_resolved": "https://registry.npmmirror.com/complex.js/-/complex.js-2.4.2.tgz",
+        "complex",
-  "_shasum": "76f260a9e7e232d8ad26348484a9b128c13fcc9a",
+        "number",
-  "_spec": "complex.js@^2.2.5",
+        "calculus",
-  "_where": "D:\\jiangchengfeiyi-xiaochengxu\\node_modules\\mathjs",
+        "parser",
-  "author": {
+        "arithmetic"
-    "name": "Robert Eisele",
+    ],
-    "email": "robert@raw.org",
+    "private": false,
-    "url": "https://raw.org/"
+    "main": "./dist/complex.js",
-  },
+    "module": "./dist/complex.mjs",
-  "browser": "./dist/complex.min.js",
+    "types": "./complex.d.ts",
-  "bugs": {
+    "browser": "./dist/complex.min.js",
-    "url": "https://github.com/rawify/Complex.js/issues"
+    "unpkg": "./dist/complex.min.js",
-  },
+    "readmeFilename": "README.md",
-  "bundleDependencies": false,
+    "exports": {
-  "deprecated": false,
+        ".": {
-  "description": "A complex numbers library",
+            "types": "./complex.d.ts",
-  "devDependencies": {
+            "require": "./dist/complex.js",
-    "crude-build": "^0.1.2",
+            "import": "./dist/complex.mjs"
-    "mocha": "*"
+        }
-  },
+    },
-  "directories": {
+    "repository": {
-    "example": "examples",
+        "type": "git",
-    "test": "tests"
+        "url": "git@github.com:rawify/Complex.js.git"
-  },
+    },
-  "engines": {
+    "funding": {
-    "node": "*"
+        "type": "github",
-  },
+        "url": "https://github.com/sponsors/rawify"
-  "exports": {
+    },
-    ".": {
+    "author": {
-      "types": "./complex.d.ts",
+        "name": "Robert Eisele",
-      "require": "./dist/complex.js",
+        "email": "robert@raw.org",
-      "import": "./dist/complex.mjs"
+        "url": "https://raw.org/"
+    },
+    "license": "MIT",
+    "engines": {
+        "node": "*"
+    },
+    "directories": {
+        "example": "examples",
+        "test": "tests"
+    },
+    "scripts": {
+        "build": "crude-build Complex",
+        "test": "mocha tests/*.js"
+    },
+    "devDependencies": {
+        "crude-build": "^0.1.2",
+        "mocha": "*"
     }
-  },
-  "funding": {
-    "type": "github",
-    "url": "https://github.com/sponsors/rawify"
-  },
-  "homepage": "https://raw.org/article/complex-numbers-in-javascript/",
-  "keywords": [
-    "complex numbers",
-    "math",
-    "complex",
-    "number",
-    "calculus",
-    "parser",
-    "arithmetic"
-  ],
-  "license": "MIT",
-  "main": "./dist/complex.js",
-  "module": "./dist/complex.mjs",
-  "name": "complex.js",
-  "private": false,
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@github.com/rawify/Complex.js.git"
-  },
-  "scripts": {
-    "build": "crude-build Complex",
-    "test": "mocha tests/*.js"
-  },
-  "title": "Complex.js",
-  "types": "./complex.d.ts",
-  "unpkg": "./dist/complex.min.js",
-  "version": "2.4.2"
 }

node_modules/decimal.js/package.json

@@ -1,38 +1,28 @@
 {
-  "_from": "decimal.js@^10.4.3",
+  "name": "decimal.js",
-  "_id": "decimal.js@10.4.3",
-  "_inBundle": false,
-  "_integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
-  "_location": "/decimal.js",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "range",
-    "registry": true,
-    "raw": "decimal.js@^10.4.3",
-    "name": "decimal.js",
-    "escapedName": "decimal.js",
-    "rawSpec": "^10.4.3",
-    "saveSpec": null,
-    "fetchSpec": "^10.4.3"
-  },
-  "_requiredBy": [
-    "/mathjs"
-  ],
-  "_resolved": "https://registry.npmmirror.com/decimal.js/-/decimal.js-10.4.3.tgz",
-  "_shasum": "1044092884d245d1b7f65725fa4ad4c6f781cc23",
-  "_spec": "decimal.js@^10.4.3",
-  "_where": "D:\\jiangchengfeiyi-xiaochengxu\\node_modules\\mathjs",
-  "author": {
-    "name": "Michael Mclaughlin",
-    "email": "M8ch88l@gmail.com"
-  },
-  "browser": "decimal.js",
-  "bugs": {
-    "url": "https://github.com/MikeMcl/decimal.js/issues"
-  },
-  "bundleDependencies": false,
-  "deprecated": false,
   "description": "An arbitrary-precision Decimal type for JavaScript.",
+  "version": "10.4.3",
+  "keywords": [
+    "arbitrary",
+    "precision",
+    "arithmetic",
+    "big",
+    "number",
+    "decimal",
+    "float",
+    "biginteger",
+    "bigdecimal",
+    "bignumber",
+    "bigint",
+    "bignum"
+  ],
+  "repository" : {
+    "type": "git",
+    "url": "https://github.com/MikeMcl/decimal.js.git"
+  },
+  "main": "decimal",
+  "module": "decimal.mjs",
+  "browser": "decimal.js",
   "exports": {
     ".": {
       "types": "./decimal.d.ts",
@@ -48,37 +38,18 @@
       "require": "./decimal.js"
     }
   },
-  "files": [
+  "author": {
-    "decimal.js",
+    "name": "Michael Mclaughlin",
-    "decimal.mjs",
+    "email": "M8ch88l@gmail.com"
-    "decimal.d.ts"
-  ],
-  "homepage": "https://github.com/MikeMcl/decimal.js#readme",
-  "keywords": [
-    "arbitrary",
-    "precision",
-    "arithmetic",
-    "big",
-    "number",
-    "decimal",
-    "float",
-    "biginteger",
-    "bigdecimal",
-    "bignumber",
-    "bigint",
-    "bignum"
-  ],
-  "license": "MIT",
-  "main": "decimal",
-  "module": "decimal.mjs",
-  "name": "decimal.js",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/MikeMcl/decimal.js.git"
   },
+  "license": "MIT",
   "scripts": {
     "test": "node ./test/test.js"
   },
   "types": "decimal.d.ts",
-  "version": "10.4.3"
+  "files": [
+    "decimal.js",
+    "decimal.mjs",
+    "decimal.d.ts"
+  ]
 }

node_modules/escape-latex/package.json

@@ -1,36 +1,41 @@
 {
-  "_from": "escape-latex@^1.2.0",
+  "name": "escape-latex",
-  "_id": "escape-latex@1.2.0",
+  "version": "1.2.0",
-  "_inBundle": false,
-  "_integrity": "sha512-nV5aVWW1K0wEiUIEdZ4erkGGH8mDxGyxSeqPzRNtWP7ataw+/olFObw7hujFWlVjNsaDFw5VZ5NzVSIqRgfTiw==",
-  "_location": "/escape-latex",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "range",
-    "registry": true,
-    "raw": "escape-latex@^1.2.0",
-    "name": "escape-latex",
-    "escapedName": "escape-latex",
-    "rawSpec": "^1.2.0",
-    "saveSpec": null,
-    "fetchSpec": "^1.2.0"
-  },
-  "_requiredBy": [
-    "/mathjs"
-  ],
-  "_resolved": "https://registry.npmmirror.com/escape-latex/-/escape-latex-1.2.0.tgz",
-  "_shasum": "07c03818cf7dac250cce517f4fda1b001ef2bca1",
-  "_spec": "escape-latex@^1.2.0",
-  "_where": "D:\\jiangchengfeiyi-xiaochengxu\\node_modules\\mathjs",
-  "author": {
-    "name": "Dang Mai"
-  },
-  "bugs": {
-    "url": "https://github.com/dangmai/escape-latex/issues"
-  },
-  "bundleDependencies": false,
-  "deprecated": false,
   "description": "Escape LaTeX special characters with Javascript",
+  "main": "./dist/index.js",
+  "files": ["dist"],
+  "scripts": {
+    "test": "mocha --require babel-core/register -u tdd ./src/**/*.test.js",
+    "preversion": "npm test && npm run build",
+    "postversion": "git push && git push --tags",
+    "precommit": "npm run lint && lint-staged",
+    "prettier": "prettier --write ./src/**/*.js",
+    "lint": "eslint ./src",
+    "init": "mkdir dist",
+    "clean": "rm -rf dist",
+    "prebuild": "npm run clean && npm run init",
+    "build": "babel ./src -d ./dist --ignore index.test.js"
+  },
+  "lint-staged": {
+    "*.{js,json,css,md}": ["npm run prettier", "git add"]
+  },
+  "eslintConfig": {
+    "parserOptions": {
+      "ecmaVersion": 8
+    },
+    "extends": ["eslint:recommended", "google", "prettier"],
+    "env": {
+      "node": "true"
+    }
+  },
+  "prettier": {
+    "trailingComma": "all"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dangmai/escape-latex"
+  },
+  "keywords": ["latex", "escape"],
   "devDependencies": {
     "babel-cli": "^6.26.0",
     "babel-core": "^6.26.0",
@@ -45,54 +50,6 @@
     "mocha": "^5.0.0",
     "prettier": "^1.9.2"
   },
-  "eslintConfig": {
+  "author": "Dang Mai",
-    "parserOptions": {
+  "license": "MIT"
-      "ecmaVersion": 8
-    },
-    "extends": [
-      "eslint:recommended",
-      "google",
-      "prettier"
-    ],
-    "env": {
-      "node": "true"
-    }
-  },
-  "files": [
-    "dist"
-  ],
-  "homepage": "https://github.com/dangmai/escape-latex#readme",
-  "keywords": [
-    "latex",
-    "escape"
-  ],
-  "license": "MIT",
-  "lint-staged": {
-    "*.{js,json,css,md}": [
-      "npm run prettier",
-      "git add"
-    ]
-  },
-  "main": "./dist/index.js",
-  "name": "escape-latex",
-  "prettier": {
-    "trailingComma": "all"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/dangmai/escape-latex.git"
-  },
-  "scripts": {
-    "build": "babel ./src -d ./dist --ignore index.test.js",
-    "clean": "rm -rf dist",
-    "init": "mkdir dist",
-    "lint": "eslint ./src",
-    "postversion": "git push && git push --tags",
-    "prebuild": "npm run clean && npm run init",
-    "precommit": "npm run lint && lint-staged",
-    "prettier": "prettier --write ./src/**/*.js",
-    "preversion": "npm test && npm run build",
-    "test": "mocha --require babel-core/register -u tdd ./src/**/*.test.js"
-  },
-  "version": "1.2.0"
 }

node_modules/fraction.js/package.json

@@ -1,62 +1,10 @@
 {
-  "_from": "fraction.js@^5.2.1",
+  "name": "fraction.js",
-  "_id": "fraction.js@5.2.1",
+  "title": "Fraction.js",
-  "_inBundle": false,
+  "version": "5.2.1",
-  "_integrity": "sha512-Ah6t/7YCYjrPUFUFsOsRLMXAdnYM+aQwmojD2Ayb/Ezr82SwES0vuyQ8qZ3QO8n9j7W14VJuVZZet8U3bhSdQQ==",
-  "_location": "/fraction.js",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "range",
-    "registry": true,
-    "raw": "fraction.js@^5.2.1",
-    "name": "fraction.js",
-    "escapedName": "fraction.js",
-    "rawSpec": "^5.2.1",
-    "saveSpec": null,
-    "fetchSpec": "^5.2.1"
-  },
-  "_requiredBy": [
-    "/mathjs"
-  ],
-  "_resolved": "https://registry.npmmirror.com/fraction.js/-/fraction.js-5.2.1.tgz",
-  "_shasum": "93ffc9507b1a68a1271883aa28e98f58a1c0c6b3",
-  "_spec": "fraction.js@^5.2.1",
-  "_where": "D:\\jiangchengfeiyi-xiaochengxu\\node_modules\\mathjs",
-  "author": {
-    "name": "Robert Eisele",
-    "email": "robert@raw.org",
-    "url": "https://raw.org/"
-  },
-  "browser": "./dist/fraction.min.js",
-  "bugs": {
-    "url": "https://github.com/rawify/Fraction.js/issues"
-  },
-  "bundleDependencies": false,
-  "deprecated": false,
-  "description": "A rational numbers library",
-  "devDependencies": {
-    "crude-build": "^0.1.2",
-    "mocha": "*"
-  },
-  "directories": {
-    "example": "examples",
-    "test": "tests"
-  },
-  "engines": {
-    "node": ">= 12"
-  },
-  "exports": {
-    ".": {
-      "types": "./fraction.d.ts",
-      "require": "./dist/fraction.js",
-      "import": "./dist/fraction.mjs"
-    }
-  },
-  "funding": {
-    "type": "github",
-    "url": "https://github.com/sponsors/rawify"
-  },
   "homepage": "https://raw.org/article/rational-numbers-in-javascript/",
+  "bugs": "https://github.com/rawify/Fraction.js/issues",
+  "description": "A rational numbers library",
   "keywords": [
     "math",
     "numbers",
@@ -75,21 +23,47 @@
     "denominator",
     "simplification"
   ],
-  "license": "MIT",
+  "private": false,
   "main": "./dist/fraction.js",
   "module": "./dist/fraction.mjs",
-  "name": "fraction.js",
+  "types": "./fraction.d.ts",
-  "private": false,
+  "browser": "./dist/fraction.min.js",
+  "unpkg": "./dist/fraction.min.js",
+  "readmeFilename": "README.md",
+  "exports": {
+    ".": {
+      "types": "./fraction.d.ts",
+      "require": "./dist/fraction.js",
+      "import": "./dist/fraction.mjs"
+    }
+  },
   "repository": {
     "type": "git",
-    "url": "git+ssh://git@github.com/rawify/Fraction.js.git"
+    "url": "git@github.com:rawify/Fraction.js.git"
+  },
+  "funding": {
+    "type": "github",
+    "url": "https://github.com/sponsors/rawify"
+  },
+  "author": {
+    "name": "Robert Eisele",
+    "email": "robert@raw.org",
+    "url": "https://raw.org/"
+  },
+  "license": "MIT",
+  "engines": {
+    "node": ">= 12"
+  },
+  "directories": {
+    "example": "examples",
+    "test": "tests"
   },
   "scripts": {
     "build": "crude-build Fraction",
     "test": "mocha tests/*.js"
   },
-  "title": "Fraction.js",
+  "devDependencies": {
-  "types": "./fraction.d.ts",
+    "crude-build": "^0.1.2",
-  "unpkg": "./dist/fraction.min.js",
+    "mocha": "*"
-  "version": "5.2.1"
+  }
 }

node_modules/javascript-natural-sort/package.json

@@ -1,38 +1,15 @@
 {
-  "_from": "javascript-natural-sort@^0.7.1",
+  "name": "javascript-natural-sort",
-  "_id": "javascript-natural-sort@0.7.1",
+  "version": "0.7.1",
-  "_inBundle": false,
-  "_integrity": "sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==",
-  "_location": "/javascript-natural-sort",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "range",
-    "registry": true,
-    "raw": "javascript-natural-sort@^0.7.1",
-    "name": "javascript-natural-sort",
-    "escapedName": "javascript-natural-sort",
-    "rawSpec": "^0.7.1",
-    "saveSpec": null,
-    "fetchSpec": "^0.7.1"
-  },
-  "_requiredBy": [
-    "/mathjs"
-  ],
-  "_resolved": "https://registry.npmmirror.com/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz",
-  "_shasum": "f9e2303d4507f6d74355a73664d1440fb5a0ef59",
-  "_spec": "javascript-natural-sort@^0.7.1",
-  "_where": "D:\\jiangchengfeiyi-xiaochengxu\\node_modules\\mathjs",
-  "author": {
-    "name": "Jim Palmer",
-    "url": "based on chunking idea from Dave Koelle, packaged by @khous of Bill4Time"
-  },
-  "bugs": {
-    "url": "https://github.com/Bill4Time/javascript-natural-sort/issues"
-  },
-  "bundleDependencies": false,
-  "deprecated": false,
   "description": "Natural Sort algorithm for Javascript - Version 0.7 - Released under MIT license",
-  "homepage": "https://github.com/Bill4Time/javascript-natural-sort",
+  "main": "naturalSort.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/Bill4Time/javascript-natural-sort.git"
+  },
   "keywords": [
     "natural",
     "sort",
@@ -41,15 +18,10 @@
     "sort",
     "sorting"
   ],
+  "author": "Jim Palmer (based on chunking idea from Dave Koelle, packaged by @khous of Bill4Time)",
   "license": "MIT",
-  "main": "naturalSort.js",
+  "bugs": {
-  "name": "javascript-natural-sort",
+    "url": "https://github.com/Bill4Time/javascript-natural-sort/issues"
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Bill4Time/javascript-natural-sort.git"
   },
-  "scripts": {
+  "homepage": "https://github.com/Bill4Time/javascript-natural-sort"
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "version": "0.7.1"
 }

node_modules/mathjs/package.json

@@ -1,40 +1,29 @@
 {
-  "_from": "mathjs",
+  "name": "mathjs",
-  "_id": "mathjs@14.0.1",
+  "version": "14.0.1",
-  "_inBundle": false,
+  "description": "Math.js is an extensive math library for JavaScript and Node.js. It features a flexible expression parser with support for symbolic computation, comes with a large set of built-in functions and constants, and offers an integrated solution to work with different data types like numbers, big numbers, complex numbers, fractions, units, and matrices.",
-  "_integrity": "sha512-yyJgLwC6UXuve724np8tHRMYaTtb5UqiOGQkjwbSXgH8y1C/LcJ0pvdNDZLI2LT7r+iExh2Y5HwfAY+oZFtGIQ==",
+  "author": "Jos de Jong <wjosdejong@gmail.com> (https://github.com/josdejong)",
-  "_location": "/mathjs",
+  "homepage": "https://mathjs.org",
-  "_phantomChildren": {},
+  "repository": {
-  "_requested": {
+    "type": "git",
-    "type": "tag",
+    "url": "https://github.com/josdejong/mathjs.git"
-    "registry": true,
-    "raw": "mathjs",
-    "name": "mathjs",
-    "escapedName": "mathjs",
-    "rawSpec": "",
-    "saveSpec": null,
-    "fetchSpec": "latest"
   },
-  "_requiredBy": [
+  "license": "Apache-2.0",
-    "#USER",
+  "keywords": [
-    "/"
+    "math",
+    "mathematics",
+    "functions",
+    "numeric",
+    "algebra",
+    "parser",
+    "expression",
+    "number",
+    "bignumber",
+    "complex",
+    "fraction",
+    "matrix",
+    "unit"
   ],
-  "_resolved": "https://registry.npmmirror.com/mathjs/-/mathjs-14.0.1.tgz",
-  "_shasum": "b47233a3e0913ae3d2669d67f4edf7a5b6fe1fb1",
-  "_spec": "mathjs",
-  "_where": "D:\\jiangchengfeiyi-xiaochengxu",
-  "author": {
-    "name": "Jos de Jong",
-    "email": "wjosdejong@gmail.com",
-    "url": "https://github.com/josdejong"
-  },
-  "bin": {
-    "mathjs": "bin/cli.js"
-  },
-  "bugs": {
-    "url": "https://github.com/josdejong/mathjs/issues"
-  },
-  "bundleDependencies": false,
   "dependencies": {
     "@babel/runtime": "^7.25.7",
     "complex.js": "^2.2.5",
@@ -46,8 +35,6 @@
     "tiny-emitter": "^2.1.0",
     "typed-function": "^4.2.1"
   },
-  "deprecated": false,
-  "description": "Math.js is an extensive math library for JavaScript and Node.js. It features a flexible expression parser with support for symbolic computation, comes with a large set of built-in functions and constants, and offers an integrated solution to work with different data types like numbers, big numbers, complex numbers, fractions, units, and matrices.",
   "devDependencies": {
     "@babel/core": "7.26.0",
     "@babel/plugin-transform-object-assign": "7.25.9",
@@ -108,13 +95,12 @@
     "webpack": "5.97.1",
     "zeros": "1.0.0"
   },
-  "directories": {
+  "type": "module",
-    "bin": "./bin",
+  "main": "./lib/cjs",
-    "lib": "./lib"
+  "types": "./types/index.d.ts",
-  },
+  "module": "./lib/esm",
-  "engines": {
+  "unpkg": "./lib/browser/math.js",
-    "node": ">= 18"
+  "jsdelivr": "./lib/browser/math.js",
-  },
   "exports": {
     ".": {
       "types": "./types/index.d.ts",
@@ -145,30 +131,9 @@
     "HISTORY.md",
     "CONTRIBUTING.md"
   ],
-  "homepage": "https://mathjs.org",
+  "directories": {
-  "jsdelivr": "./lib/browser/math.js",
+    "bin": "./bin",
-  "keywords": [
+    "lib": "./lib"
-    "math",
-    "mathematics",
-    "functions",
-    "numeric",
-    "algebra",
-    "parser",
-    "expression",
-    "number",
-    "bignumber",
-    "complex",
-    "fraction",
-    "matrix",
-    "unit"
-  ],
-  "license": "Apache-2.0",
-  "main": "./lib/cjs",
-  "module": "./lib/esm",
-  "name": "mathjs",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/josdejong/mathjs.git"
   },
   "scripts": {
     "build": "gulp && npm run update-authors",
@@ -176,25 +141,30 @@
     "build:clean": "gulp clean",
     "build:docs": "gulp docs",
     "compile": "gulp compile",
-    "coverage": "c8 --reporter=lcov --reporter=text-summary mocha test/unit-tests && echo \"\nDetailed coverage report is available at ./coverage/lcov-report/index.html\"",
+    "watch": "gulp watch",
-    "format": "npm run lint -- --fix",
     "lint": "eslint --cache --max-warnings 0 src/ test/ types/",
-    "prepublishOnly": "npm run test:all && npm run lint",
+    "format": "npm run lint -- --fix",
+    "validate:ascii": "gulp validate:ascii",
     "test": "npm run test:src && npm run lint",
+    "test:src": "mocha test/unit-tests",
+    "test:generated": "mocha test/generated-code-tests",
+    "test:node": "mocha test/node-tests/*.test.js test/node-tests/**/*.test.js",
     "test:all": "npm run test:src && npm run test:generated && npm run test:node && npm run test:types",
     "test:browser": "karma start test/browser-test-config/local-karma.js",
     "test:browserstack": "karma start test/browser-test-config/browserstack-karma.js",
-    "test:generated": "mocha test/generated-code-tests",
-    "test:node": "mocha test/node-tests/*.test.js test/node-tests/**/*.test.js",
-    "test:src": "mocha test/unit-tests",
     "test:types": " tsc -p ./tsconfig.json && node --loader ts-node/esm ./test/typescript-tests/testTypes.ts",
-    "update-authors": "node ./tools/update-authors.js",
+    "coverage": "c8 --reporter=lcov --reporter=text-summary mocha test/unit-tests && echo \"\nDetailed coverage report is available at ./coverage/lcov-report/index.html\"",
-    "validate:ascii": "gulp validate:ascii",
+    "prepublishOnly": "npm run test:all && npm run lint",
-    "watch": "gulp watch"
+    "update-authors": "node ./tools/update-authors.js"
   },
-  "sideEffects": false,
+  "bin": {
-  "type": "module",
+    "mathjs": "./bin/cli.js"
-  "types": "./types/index.d.ts",
+  },
-  "unpkg": "./lib/browser/math.js",
+  "engines": {
-  "version": "14.0.1"
+    "node": ">= 18"
+  },
+  "bugs": {
+    "url": "https://github.com/josdejong/mathjs/issues"
+  },
+  "sideEffects": false
 }

node_modules/regenerator-runtime/package.json

@@ -1,47 +1,19 @@
 {
-  "_from": "regenerator-runtime@^0.14.0",
+  "name": "regenerator-runtime",
-  "_id": "regenerator-runtime@0.14.1",
+  "author": "Ben Newman <bn@cs.stanford.edu>",
-  "_inBundle": false,
-  "_integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
-  "_location": "/regenerator-runtime",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "range",
-    "registry": true,
-    "raw": "regenerator-runtime@^0.14.0",
-    "name": "regenerator-runtime",
-    "escapedName": "regenerator-runtime",
-    "rawSpec": "^0.14.0",
-    "saveSpec": null,
-    "fetchSpec": "^0.14.0"
-  },
-  "_requiredBy": [
-    "/@babel/runtime"
-  ],
-  "_resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
-  "_shasum": "356ade10263f685dda125100cd862c1db895327f",
-  "_spec": "regenerator-runtime@^0.14.0",
-  "_where": "D:\\jiangchengfeiyi-xiaochengxu\\node_modules\\@babel\\runtime",
-  "author": {
-    "name": "Ben Newman",
-    "email": "bn@cs.stanford.edu"
-  },
-  "bundleDependencies": false,
-  "deprecated": false,
   "description": "Runtime for Regenerator-compiled generator and async functions.",
+  "version": "0.14.1",
+  "main": "runtime.js",
   "keywords": [
     "regenerator",
     "runtime",
     "generator",
     "async"
   ],
-  "license": "MIT",
+  "sideEffects": true,
-  "main": "runtime.js",
-  "name": "regenerator-runtime",
   "repository": {
     "type": "git",
     "url": "https://github.com/facebook/regenerator/tree/main/packages/runtime"
   },
-  "sideEffects": true,
+  "license": "MIT"
-  "version": "0.14.1"
 }

node_modules/seedrandom/package.json

@@ -1,37 +1,28 @@
 {
-  "_from": "seedrandom@^3.0.5",
+  "name": "seedrandom",
-  "_id": "seedrandom@3.0.5",
+  "version": "3.0.5",
-  "_inBundle": false,
+  "description": "Seeded random number generator for Javascript.",
-  "_integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==",
+  "main": "index.js",
-  "_location": "/seedrandom",
+  "jsdelivr": "seedrandom.min.js",
-  "_phantomChildren": {},
+  "unpkg": "seedrandom.min.js",
-  "_requested": {
+  "keywords": [
-    "type": "range",
+    "seed",
-    "registry": true,
+    "random",
-    "raw": "seedrandom@^3.0.5",
+    "crypto"
-    "name": "seedrandom",
-    "escapedName": "seedrandom",
-    "rawSpec": "^3.0.5",
-    "saveSpec": null,
-    "fetchSpec": "^3.0.5"
-  },
-  "_requiredBy": [
-    "/mathjs"
   ],
-  "_resolved": "https://registry.npmmirror.com/seedrandom/-/seedrandom-3.0.5.tgz",
+  "scripts": {
-  "_shasum": "54edc85c95222525b0c7a6f6b3543d8e0b3aa0a7",
+    "test": "grunt travis"
-  "_spec": "seedrandom@^3.0.5",
-  "_where": "D:\\jiangchengfeiyi-xiaochengxu\\node_modules\\mathjs",
-  "author": {
-    "name": "David Bau"
   },
-  "browser": {
+  "repository": {
-    "crypto": false
+    "type": "git",
+    "url": "git://github.com/davidbau/seedrandom.git"
   },
+  "author": "David Bau",
+  "license": "MIT",
   "bugs": {
     "url": "https://github.com/davidbau/seedrandom/issues"
   },
-  "bundleDependencies": false,
+  "homepage": "http://davidbau.com/archives/2010/01/30/random_seeds_coded_hints_and_quintillions.html",
   "config": {
     "blanket": {
       "pattern": [
@@ -45,43 +36,25 @@
       ]
     }
   },
-  "deprecated": false,
+  "browser": {
-  "description": "Seeded random number generator for Javascript.",
+    "crypto": false
+  },
   "devDependencies": {
     "blanket": "latest",
     "coveralls": "latest",
     "grunt": "latest",
     "grunt-browserify": "latest",
+    "grunt-release": "davidbau/grunt-release",
     "grunt-cli": "latest",
     "grunt-contrib-connect": "latest",
     "grunt-contrib-copy": "latest",
     "grunt-contrib-qunit": "latest",
     "grunt-contrib-uglify": "latest",
     "grunt-mocha-nyc": "latest",
-    "grunt-release": "github:davidbau/grunt-release",
     "mocha": "latest",
     "nyc": "latest",
     "proxyquire": "latest",
     "qunit": "latest",
     "requirejs": "latest"
-  },
+  }
-  "homepage": "http://davidbau.com/archives/2010/01/30/random_seeds_coded_hints_and_quintillions.html",
-  "jsdelivr": "seedrandom.min.js",
-  "keywords": [
-    "seed",
-    "random",
-    "crypto"
-  ],
-  "license": "MIT",
-  "main": "index.js",
-  "name": "seedrandom",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/davidbau/seedrandom.git"
-  },
-  "scripts": {
-    "test": "grunt travis"
-  },
-  "unpkg": "seedrandom.min.js",
-  "version": "3.0.5"
 }

node_modules/tiny-emitter/package.json

@@ -1,44 +1,20 @@
 {
-  "_from": "tiny-emitter@^2.1.0",
+  "name": "tiny-emitter",
-  "_id": "tiny-emitter@2.1.0",
+  "version": "2.1.0",
-  "_inBundle": false,
-  "_integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==",
-  "_location": "/tiny-emitter",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "range",
-    "registry": true,
-    "raw": "tiny-emitter@^2.1.0",
-    "name": "tiny-emitter",
-    "escapedName": "tiny-emitter",
-    "rawSpec": "^2.1.0",
-    "saveSpec": null,
-    "fetchSpec": "^2.1.0"
-  },
-  "_requiredBy": [
-    "/mathjs"
-  ],
-  "_resolved": "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
-  "_shasum": "1d1a56edfc51c43e863cbb5382a72330e3555423",
-  "_spec": "tiny-emitter@^2.1.0",
-  "_where": "D:\\jiangchengfeiyi-xiaochengxu\\node_modules\\mathjs",
-  "author": {
-    "name": "Scott Corgan"
-  },
-  "bugs": {
-    "url": "https://github.com/scottcorgan/tiny-emitter/issues"
-  },
-  "bundleDependencies": false,
-  "deprecated": false,
   "description": "A tiny (less than 1k) event emitter library",
-  "devDependencies": {
+  "main": "index.js",
-    "@tap-format/spec": "0.2.0",
+  "scripts": {
-    "browserify": "11.2.0",
+    "test-node": "tape test/index.js | tap-format-spec",
-    "tape": "4.2.1",
+    "test": "testling | tap-format-spec",
-    "testling": "1.7.1",
+    "bundle": "node_modules/.bin/browserify index.js > dist/tinyemitter.js -s TinyEmitter && echo 'Bundled'",
-    "uglify-js": "2.5.0"
+    "minify": "node_modules/.bin/uglifyjs dist/tinyemitter.js -o dist/tinyemitter.min.js -m && echo 'Minified'",
+    "build": "npm test && npm run bundle && npm run minify",
+    "size": "node_modules/.bin/uglifyjs index.js -o minified.js -m && ls -l && rm minified.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/scottcorgan/tiny-emitter.git"
   },
-  "homepage": "https://github.com/scottcorgan/tiny-emitter#readme",
   "keywords": [
     "event",
     "emitter",
@@ -47,20 +23,17 @@
     "events",
     "bind"
   ],
+  "author": "Scott Corgan",
   "license": "MIT",
-  "main": "index.js",
+  "bugs": {
-  "name": "tiny-emitter",
+    "url": "https://github.com/scottcorgan/tiny-emitter/issues"
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/scottcorgan/tiny-emitter.git"
   },
-  "scripts": {
+  "devDependencies": {
-    "build": "npm test && npm run bundle && npm run minify",
+    "@tap-format/spec": "0.2.0",
-    "bundle": "browserify index.js > dist/tinyemitter.js -s TinyEmitter && echo 'Bundled'",
+    "browserify": "11.2.0",
-    "minify": "uglifyjs dist/tinyemitter.js -o dist/tinyemitter.min.js -m && echo 'Minified'",
+    "tape": "4.2.1",
-    "size": "uglifyjs index.js -o minified.js -m && ls -l && rm minified.js",
+    "testling": "1.7.1",
-    "test": "testling | tap-format-spec",
+    "uglify-js": "2.5.0"
-    "test-node": "tape test/index.js | tap-format-spec"
   },
   "testling": {
     "files": [
@@ -76,6 +49,5 @@
       "iphone/6.0..latest",
       "android-browser/4.2..latest"
     ]
-  },
+  }
-  "version": "2.1.0"
 }

node_modules/typed-function/package.json

@@ -1,49 +1,44 @@
 {
-  "_from": "typed-function@^4.2.1",
+  "name": "typed-function",
-  "_id": "typed-function@4.2.1",
+  "version": "4.2.1",
-  "_inBundle": false,
-  "_integrity": "sha512-EGjWssW7Tsk4DGfE+5yluuljS1OGYWiI1J6e8puZz9nTMM51Oug8CD5Zo4gWMsOhq5BI+1bF+rWTm4Vbj3ivRA==",
-  "_location": "/typed-function",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "range",
-    "registry": true,
-    "raw": "typed-function@^4.2.1",
-    "name": "typed-function",
-    "escapedName": "typed-function",
-    "rawSpec": "^4.2.1",
-    "saveSpec": null,
-    "fetchSpec": "^4.2.1"
-  },
-  "_requiredBy": [
-    "/mathjs"
-  ],
-  "_resolved": "https://registry.npmmirror.com/typed-function/-/typed-function-4.2.1.tgz",
-  "_shasum": "19aa51847aa2dea9ef5e7fb7641c060179a74426",
-  "_spec": "typed-function@^4.2.1",
-  "_where": "D:\\jiangchengfeiyi-xiaochengxu\\node_modules\\mathjs",
-  "author": {
-    "name": "Jos de Jong",
-    "email": "wjosdejong@gmail.com",
-    "url": "https://github.com/josdejong"
-  },
-  "browser": "lib/umd/typed-function.js",
-  "bugs": {
-    "url": "https://github.com/josdejong/typed-function/issues"
-  },
-  "bundleDependencies": false,
-  "contributors": [
-    {
-      "name": "Glen Whitney",
-      "url": "https://github.com/gwhitney"
-    },
-    {
-      "name": "Luke Gumbley",
-      "url": "https://github.com/luke-gumbley"
-    }
-  ],
-  "deprecated": false,
   "description": "Type checking for JavaScript functions",
+  "author": "Jos de Jong <wjosdejong@gmail.com> (https://github.com/josdejong)",
+  "contributors": [
+    "Glen Whitney (https://github.com/gwhitney)",
+    "Luke Gumbley (https://github.com/luke-gumbley)"
+  ],
+  "homepage": "https://github.com/josdejong/typed-function",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/josdejong/typed-function.git"
+  },
+  "keywords": [
+    "typed",
+    "function",
+    "arguments",
+    "compose",
+    "types"
+  ],
+  "type": "module",
+  "main": "lib/umd/typed-function.js",
+  "module": "lib/esm/typed-function.mjs",
+  "browser": "lib/umd/typed-function.js",
+  "scripts": {
+    "test": "mocha test --recursive",
+    "test:lib": "mocha test test-lib --recursive",
+    "build": "npm-run-all build:**",
+    "build:clean": "del-cli lib",
+    "build:esm": "babel src --out-dir lib/esm --out-file-extension .mjs --source-maps --config-file ./babel.config.json",
+    "build:umd": "rollup lib/esm/typed-function.mjs --format umd --name 'typed' --sourcemap --output.file lib/umd/typed-function.js && cpy tools/cjs/package.json lib/umd --flat",
+    "build-and-test": "npm run lint && npm run build && npm run test:lib",
+    "lint": "eslint --cache src/**/*.mjs test/**/*.mjs test-lib/**/*.mjs",
+    "format": "npm run lint -- --fix",
+    "coverage": "c8 --reporter=lcov --reporter=text-summary mocha test --recursive && echo \"\nCoverage report is available at ./coverage/lcov-report/index.html\"",
+    "prepublishOnly": "npm run build-and-test"
+  },
+  "engines": {
+    "node": ">= 18"
+  },
   "devDependencies": {
     "@babel/cli": "7.24.6",
     "@babel/preset-env": "7.24.6",
@@ -61,43 +56,10 @@
     "pad-right": "0.2.2",
     "rollup": "4.18.0"
   },
-  "engines": {
-    "node": ">= 18"
-  },
   "files": [
     "README.md",
     "LICENSE.md",
     "lib"
   ],
-  "homepage": "https://github.com/josdejong/typed-function",
+  "license": "MIT"
-  "keywords": [
-    "typed",
-    "function",
-    "arguments",
-    "compose",
-    "types"
-  ],
-  "license": "MIT",
-  "main": "lib/umd/typed-function.js",
-  "module": "lib/esm/typed-function.mjs",
-  "name": "typed-function",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/josdejong/typed-function.git"
-  },
-  "scripts": {
-    "build": "npm-run-all build:**",
-    "build-and-test": "npm run lint && npm run build && npm run test:lib",
-    "build:clean": "del-cli lib",
-    "build:esm": "babel src --out-dir lib/esm --out-file-extension .mjs --source-maps --config-file ./babel.config.json",
-    "build:umd": "rollup lib/esm/typed-function.mjs --format umd --name 'typed' --sourcemap --output.file lib/umd/typed-function.js && cpy tools/cjs/package.json lib/umd --flat",
-    "coverage": "c8 --reporter=lcov --reporter=text-summary mocha test --recursive && echo \"\nCoverage report is available at ./coverage/lcov-report/index.html\"",
-    "format": "npm run lint -- --fix",
-    "lint": "eslint --cache src/**/*.mjs test/**/*.mjs test-lib/**/*.mjs",
-    "prepublishOnly": "npm run build-and-test",
-    "test": "mocha test --recursive",
-    "test:lib": "mocha test test-lib --recursive"
-  },
-  "type": "module",
-  "version": "4.2.1"
 }

package-lock.json

@@ -1,45 +1,69 @@
 {
+  "name": "jiangchengfeiyi-xiaochengxu",
+  "lockfileVersion": 3,
   "requires": true,
-  "lockfileVersion": 1,
+  "packages": {
-  "dependencies": {
+    "": {
-    "@babel/runtime": {
+      "dependencies": {
+        "mathjs": "^14.0.1",
+        "mitt": "^3.0.1"
+      }
+    },
+    "node_modules/@babel/runtime": {
       "version": "7.26.0",
       "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.26.0.tgz",
       "integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==",
-      "requires": {
+      "dependencies": {
         "regenerator-runtime": "^0.14.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "complex.js": {
+    "node_modules/complex.js": {
       "version": "2.4.2",
       "resolved": "https://registry.npmmirror.com/complex.js/-/complex.js-2.4.2.tgz",
-      "integrity": "sha512-qtx7HRhPGSCBtGiST4/WGHuW+zeaND/6Ld+db6PbrulIB1i2Ev/2UPiqcmpQNPSyfBKraC0EOvOKCB5dGZKt3g=="
+      "integrity": "sha512-qtx7HRhPGSCBtGiST4/WGHuW+zeaND/6Ld+db6PbrulIB1i2Ev/2UPiqcmpQNPSyfBKraC0EOvOKCB5dGZKt3g==",
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/rawify"
+      }
     },
-    "decimal.js": {
+    "node_modules/decimal.js": {
       "version": "10.4.3",
       "resolved": "https://registry.npmmirror.com/decimal.js/-/decimal.js-10.4.3.tgz",
       "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA=="
     },
-    "escape-latex": {
+    "node_modules/escape-latex": {
       "version": "1.2.0",
       "resolved": "https://registry.npmmirror.com/escape-latex/-/escape-latex-1.2.0.tgz",
       "integrity": "sha512-nV5aVWW1K0wEiUIEdZ4erkGGH8mDxGyxSeqPzRNtWP7ataw+/olFObw7hujFWlVjNsaDFw5VZ5NzVSIqRgfTiw=="
     },
-    "fraction.js": {
+    "node_modules/fraction.js": {
       "version": "5.2.1",
       "resolved": "https://registry.npmmirror.com/fraction.js/-/fraction.js-5.2.1.tgz",
-      "integrity": "sha512-Ah6t/7YCYjrPUFUFsOsRLMXAdnYM+aQwmojD2Ayb/Ezr82SwES0vuyQ8qZ3QO8n9j7W14VJuVZZet8U3bhSdQQ=="
+      "integrity": "sha512-Ah6t/7YCYjrPUFUFsOsRLMXAdnYM+aQwmojD2Ayb/Ezr82SwES0vuyQ8qZ3QO8n9j7W14VJuVZZet8U3bhSdQQ==",
+      "engines": {
+        "node": ">= 12"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/rawify"
+      }
     },
-    "javascript-natural-sort": {
+    "node_modules/javascript-natural-sort": {
       "version": "0.7.1",
       "resolved": "https://registry.npmmirror.com/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz",
       "integrity": "sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw=="
     },
-    "mathjs": {
+    "node_modules/mathjs": {
       "version": "14.0.1",
       "resolved": "https://registry.npmmirror.com/mathjs/-/mathjs-14.0.1.tgz",
       "integrity": "sha512-yyJgLwC6UXuve724np8tHRMYaTtb5UqiOGQkjwbSXgH8y1C/LcJ0pvdNDZLI2LT7r+iExh2Y5HwfAY+oZFtGIQ==",
-      "requires": {
+      "dependencies": {
         "@babel/runtime": "^7.25.7",
         "complex.js": "^2.2.5",
         "decimal.js": "^10.4.3",
@@ -49,32 +73,48 @@
         "seedrandom": "^3.0.5",
         "tiny-emitter": "^2.1.0",
         "typed-function": "^4.2.1"
+      },
+      "bin": {
+        "mathjs": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">= 18"
       }
     },
+<<<<<<< .mine
+    "node_modules/mitt": {
+      "version": "3.0.1",
+      "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw=="
+
+=======
     "mitt": {
       "version": "3.0.1",
       "resolved": "https://registry.npmmirror.com/mitt/-/mitt-3.0.1.tgz",
       "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw=="
+>>>>>>> .theirs
     },
-    "regenerator-runtime": {
+    "node_modules/regenerator-runtime": {
       "version": "0.14.1",
       "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
       "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
     },
-    "seedrandom": {
+    "node_modules/seedrandom": {
       "version": "3.0.5",
       "resolved": "https://registry.npmmirror.com/seedrandom/-/seedrandom-3.0.5.tgz",
       "integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg=="
     },
-    "tiny-emitter": {
+    "node_modules/tiny-emitter": {
       "version": "2.1.0",
       "resolved": "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
       "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
     },
-    "typed-function": {
+    "node_modules/typed-function": {
       "version": "4.2.1",
       "resolved": "https://registry.npmmirror.com/typed-function/-/typed-function-4.2.1.tgz",
-      "integrity": "sha512-EGjWssW7Tsk4DGfE+5yluuljS1OGYWiI1J6e8puZz9nTMM51Oug8CD5Zo4gWMsOhq5BI+1bF+rWTm4Vbj3ivRA=="
+      "integrity": "sha512-EGjWssW7Tsk4DGfE+5yluuljS1OGYWiI1J6e8puZz9nTMM51Oug8CD5Zo4gWMsOhq5BI+1bF+rWTm4Vbj3ivRA==",
+      "engines": {
+        "node": ">= 18"
+      }
     }
   }
 }

unpackage/dist/dev/mp-weixin/addProduct.js

@@ -29,11 +29,8 @@ const _sfc_main = {
           cookie: common_vendor.wx$1.getStorageSync("cookie")
         },
         data: {
-          userId: userInfo.value.id,
           goodId: productBrief.value.id,
-          quantity: quantity.value,
+          quantity: quantity.value
-          subtotal: productBrief.value.price * quantity.value,
-          isGoodType: productBrief.value.isGoodType
         }
       });
       if (res.data.code === 1) {
@@ -46,13 +43,13 @@ const _sfc_main = {
         console.log("失败原因-->", res.data);
         common_vendor.index.showToast({
           icon: "error",
-          title: "请求失败"
+          title: res.data.message
         });
         return;
       }
     };
     const decrease = () => {
-      if (quantity.value > 0) {
+      if (quantity.value != 1) {
         quantity.value -= 1;
       }
     };
@@ -75,5 +72,5 @@ const _sfc_main = {
     };
   }
 };
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-ac6f555c"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-ac6f555c"], ["__file", "D:/微信小程序/课设整合/匠承非遗小程序端/jiangchengfeiyi-xiaochengxu/pages/Shopping-cart/component/addProduct.vue"]]);
 exports.MiniProgramPage = MiniProgramPage;

unpackage/dist/dev/mp-weixin/app.js

@@ -12,17 +12,14 @@ if (!Math) {
   "./pages/booking/ContactInformation.js";
   "./pages/booking/date.js";
   "./pages/store-home/ProductDetails/ProductDetails.js";
-  "./pages/Shopping-cart/Phone/Phone.js";
+  "./pages/order/product-paysuccess/product-paysuccess.js";
-  "./pages/order/product-unpay/product-unpay.js";
   "./pages/booking/BillingOfFees/BillingOfFees.js";
   "./pages/booking/ReservationInstructions/ReservationInstructions.js";
   "./pages/booking/respectable/respectable.js";
   "./pages/Shopping-cart/newaddress_Info/newaddress_Info.js";
   "./pages/order/product-waitpay/product-waitpay.js";
-  "./pages/order/paysuccess/paysuccess.js";
   "./pages/booking/Simple/Simple.js";
   "./pages/booking/bookingpay/bookingpay.js";
-  "./pages/order/productOrderDetail/productOrderDetail.js";
   "./pages/login/login.js";
   "./pages/Shopping-cart/component/addProduct.js";
   "./pages/mine/OrderDetails/OrderDetails.js";
@@ -31,12 +28,17 @@ if (!Math) {
   "./pages/booking/CostumeDisplay/CostumeDisplay.js";
   "./pages/booking/CostumeDetails/CostumeDetails.js";
   "./pages/mine/Contact/Contact.js";
+  "./pages/workshop/productmain/productmain.js";
+  "./pages/workshop/component/timePopUp.js";
+  "./pages/store-home/main/testMain.js";
+  "./pages/syy.js";
+  "./pages/order/singleGoodOrder/singleGoodOrder.js";
 }
 const _sfc_main = {};
 function _sfc_render(_ctx, _cache) {
   return {};
 }
-const App = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
+const App = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "D:/微信小程序/课设整合/匠承非遗小程序端/jiangchengfeiyi-xiaochengxu/App.vue"]]);
 function createApp() {
   const app = common_vendor.createSSRApp(App);
   app.use(store_index.pinia);

unpackage/dist/dev/mp-weixin/app.json

@@ -9,17 +9,14 @@
     "pages/booking/ContactInformation",
     "pages/booking/date",
     "pages/store-home/ProductDetails/ProductDetails",
-    "pages/Shopping-cart/Phone/Phone",
+    "pages/order/product-paysuccess/product-paysuccess",
-    "pages/order/product-unpay/product-unpay",
     "pages/booking/BillingOfFees/BillingOfFees",
     "pages/booking/ReservationInstructions/ReservationInstructions",
     "pages/booking/respectable/respectable",
     "pages/Shopping-cart/newaddress_Info/newaddress_Info",
     "pages/order/product-waitpay/product-waitpay",
-    "pages/order/paysuccess/paysuccess",
     "pages/booking/Simple/Simple",
     "pages/booking/bookingpay/bookingpay",
-    "pages/order/productOrderDetail/productOrderDetail",
     "pages/login/login",
     "pages/Shopping-cart/component/addProduct",
     "pages/mine/OrderDetails/OrderDetails",
@@ -27,7 +24,12 @@
     "pages/workshop/index/index",
     "pages/booking/CostumeDisplay/CostumeDisplay",
     "pages/booking/CostumeDetails/CostumeDetails",
-    "pages/mine/Contact/Contact"
+    "pages/mine/Contact/Contact",
+    "pages/workshop/productmain/productmain",
+    "pages/workshop/component/timePopUp",
+    "pages/store-home/main/testMain",
+    "pages/syy",
+    "pages/order/singleGoodOrder/singleGoodOrder"
   ],
   "window": {
     "navigationBarTextStyle": "black",
@@ -36,30 +38,26 @@
     "backgroundColor": "#F8F8F8"
   },
   "tabBar": {
-    "backgroundColor": "#F7E7C6",
+    "backgroundColor": "#FFFFFF",
     "list": [
       {
         "pagePath": "pages/home/home",
         "iconPath": "./static/home.png",
-        "selectedIconPath": "./static/homeselected.png",
         "text": "首页"
       },
       {
         "pagePath": "pages/store-home/main/main",
         "iconPath": "./static/store.png",
-        "selectedIconPath": "./static/storeselected.png",
         "text": "商城"
       },
       {
         "pagePath": "pages/Shopping-cart/productmain/productmain",
         "iconPath": "./static/shopcar.png",
-        "selectedIconPath": "./static/shopcarselected.png",
         "text": "购物车"
       },
       {
         "pagePath": "pages/mine/main/main",
         "iconPath": "./static/mine.png",
-        "selectedIconPath": "./static/mineselected.png",
         "text": "我的"
       }
     ]

unpackage/dist/dev/mp-weixin/common/assets.js

@@ -1,73 +0,0 @@
-"use strict";
-const product$1 = "/assets/product.7900e336.png";
-const rili = "/assets/rili.7746043b.png";
-const xuanchuan = "/assets/xuanchuan.f0fc207c.png";
-const shizi = "/assets/shizi.dd0347ec.png";
-const you$1 = "/assets/you.60391a00.png";
-const add_img = "/assets/tianjia.187834c9.png";
-const sousuokuang = "/assets/sousuokuang.6160c4c7.png";
-const address = "/assets/address.e91cc3a1.png";
-const avator = "/assets/avator.7ac17437.png";
-const daifahuo = "/assets/daifahuo.8369326b.png";
-const daishouhuo = "/assets/daishouhuo.ff694766.png";
-const dingdan = "/assets/dingdan.6b4043d6.png";
-const lianxiren_s = "/assets/lianxiren_s.17e4954c.png";
-const qianbao = "/assets/qianbao.bbfd6c3d.png";
-const setting_s = "/assets/setting_s.3e5c5149.png";
-const tuikuan = "/assets/tuikuan.d34aac5f.png";
-const you = "/assets/you.70a370f0.png";
-const denglong = "/assets/denglong.a91d13af.png";
-const kefu = "/assets/kefu.eef0848c.png";
-const show1 = "/assets/show1.6119e6ca.png";
-const show2 = "/assets/show2.6ef01c5d.png";
-const show3 = "/assets/show3.4b906849.png";
-const show4 = "/assets/show4.00c949b6.png";
-const dingwei$1 = "/assets/dingwei.69908177.png";
-const add = "/assets/add.dace8cf5.png";
-const dingwei = "/assets/dingwei.a57a6fb6.png";
-const rmb_36px = "/assets/rmb_36px.929d25f5.png";
-const rmb_huang = "/assets/rmb_huang.28b44dfc.png";
-const short = "/assets/short.be252386.png";
-const yiwen = "/assets/yiwen.9096364a.png";
-const you_cheng = "/assets/you_cheng.a0b56a7d.png";
-const success = "/assets/success.3df77989.png";
-const xian = "/assets/xian.51ee54bc.png";
-const xian2 = "/assets/xian2.316f0e4c.png";
-const rmb = "/assets/rmb.dd886a2c.png";
-const product = "/assets/product.d45a003d.png";
-exports.add = add;
-exports.add_img = add_img;
-exports.address = address;
-exports.avator = avator;
-exports.daifahuo = daifahuo;
-exports.daishouhuo = daishouhuo;
-exports.denglong = denglong;
-exports.dingdan = dingdan;
-exports.dingwei = dingwei$1;
-exports.dingwei$1 = dingwei;
-exports.kefu = kefu;
-exports.lianxiren_s = lianxiren_s;
-exports.product = product$1;
-exports.product$1 = product;
-exports.qianbao = qianbao;
-exports.rili = rili;
-exports.rmb = rmb;
-exports.rmb_36px = rmb_36px;
-exports.rmb_huang = rmb_huang;
-exports.setting_s = setting_s;
-exports.shizi = shizi;
-exports.short = short;
-exports.show1 = show1;
-exports.show2 = show2;
-exports.show3 = show3;
-exports.show4 = show4;
-exports.sousuokuang = sousuokuang;
-exports.success = success;
-exports.tuikuan = tuikuan;
-exports.xian = xian;
-exports.xian2 = xian2;
-exports.xuanchuan = xuanchuan;
-exports.yiwen = yiwen;
-exports.you = you$1;
-exports.you$1 = you;
-exports.you_cheng = you_cheng;

unpackage/dist/dev/mp-weixin/common/global.js

@@ -0,0 +1,38 @@
+"use strict";
+const stateList = [
+  {
+    state: "待支付",
+    img: "https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FFybMDtHR-dengdaifukuan.png",
+    msg: "等待买家付款"
+  },
+  {
+    state: "待发货",
+    img: "https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FEOzVqolp-fahuo.png",
+    msg: "等待卖家发货"
+  },
+  {
+    state: "已退款",
+    img: "https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FlPnvgqCp-yituikuan.png",
+    msg: "订单已经退款"
+  },
+  {
+    state: "待收货",
+    img: "https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FEOzVqolp-fahuo.png",
+    msg: "商品已发货，注意查收"
+  },
+  {
+    state: "交易成功",
+    img: "",
+    msg: "订单完成，感谢您的支持"
+  },
+  {
+    state: "交易关闭",
+    img: "https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FaHDhacaI-dengdaifukuan.png",
+    msg: "您的订单已关闭"
+  }
+];
+const stateMap = /* @__PURE__ */ new Map();
+stateList.forEach((item) => {
+  stateMap.set(item.state, item);
+});
+exports.stateMap = stateMap;

unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Phone/Phone.js

@@ -1,14 +0,0 @@
-"use strict";
-const common_vendor = require("../../../common/vendor.js");
-const _sfc_main = {};
-function _sfc_render(_ctx, _cache) {
-  return {
-    a: common_vendor.f(_ctx.items, (item, index, i0) => {
-      return {
-        a: index
-      };
-    })
-  };
-}
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-6d058dc0"]]);
-wx.createPage(MiniProgramPage);

unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Phone/Phone.wxml

@@ -1 +0,0 @@
-<view class="flex-col page data-v-6d058dc0"><view class="flex-col list data-v-6d058dc0"><view wx:for="{{a}}" wx:for-item="item" wx:key="a" class="flex-row justify-between items-center list-item mt-9 data-v-6d058dc0"><view class="flex-row items-center data-v-6d058dc0"><text class="font data-v-6d058dc0">张三</text><text class="font_2 ml-9 data-v-6d058dc0">15888610253</text><view class="flex-col justify-start items-center shrink-0 text-wrapper ml-9 data-v-6d058dc0"><text class="text data-v-6d058dc0">默认</text></view></view><view class="flex-row data-v-6d058dc0"><image class="image data-v-6d058dc0" src="https://ide.code.fun/api/image?token=6711f04f38a7c1001587de59&name=6ff8502391df0676ffa6f9a4c72cf204.png"/><image class="ml-12 image data-v-6d058dc0" src="https://ide.code.fun/api/image?token=6711f04f38a7c1001587de59&name=33bb1d0b853cc38a598105b3dab0d494.png"/></view></view></view><view class="flex-col justify-start items-center section mt-593 data-v-6d058dc0"><view class="flex-col justify-start items-center text-wrapper_2 data-v-6d058dc0"><text class="font text_2 data-v-6d058dc0">新增联系人</text></view></view></view>

unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Phone/Phone.wxss

@@ -1,478 +0,0 @@
-/* 水平间距 */
-/* 水平间距 */
-/************************************************************
-** 请将全局样式拷贝到项目的全局 CSS 文件或者当前页面的顶部 **
-** 否则页面将无法正常显示                                  **
-************************************************************/
-html.data-v-6d058dc0 {
-  font-size: 16px;
-}
-body.data-v-6d058dc0 {
-  margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans',
-    'Droid Sans', 'Helvetica Neue', 'Microsoft Yahei', sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-view.data-v-6d058dc0,
-image.data-v-6d058dc0,
-text.data-v-6d058dc0 {
-  box-sizing: border-box;
-  flex-shrink: 0;
-}
-#app.data-v-6d058dc0 {
-  width: 100vw;
-  height: 100vh;
-}
-.flex-row.data-v-6d058dc0 {
-  display: flex;
-  flex-direction: row;
-}
-.flex-col.data-v-6d058dc0 {
-  display: flex;
-  flex-direction: column;
-}
-.justify-start.data-v-6d058dc0 {
-  justify-content: flex-start;
-}
-.justify-end.data-v-6d058dc0 {
-  justify-content: flex-end;
-}
-.justify-center.data-v-6d058dc0 {
-  justify-content: center;
-}
-.justify-between.data-v-6d058dc0 {
-  justify-content: space-between;
-}
-.justify-around.data-v-6d058dc0 {
-  justify-content: space-around;
-}
-.justify-evenly.data-v-6d058dc0 {
-  justify-content: space-evenly;
-}
-.items-start.data-v-6d058dc0 {
-  align-items: flex-start;
-}
-.items-end.data-v-6d058dc0 {
-  align-items: flex-end;
-}
-.items-center.data-v-6d058dc0 {
-  align-items: center;
-}
-.items-baseline.data-v-6d058dc0 {
-  align-items: baseline;
-}
-.items-stretch.data-v-6d058dc0 {
-  align-items: stretch;
-}
-.self-start.data-v-6d058dc0 {
-  align-self: flex-start;
-}
-.self-end.data-v-6d058dc0 {
-  align-self: flex-end;
-}
-.self-center.data-v-6d058dc0 {
-  align-self: center;
-}
-.self-baseline.data-v-6d058dc0 {
-  align-self: baseline;
-}
-.self-stretch.data-v-6d058dc0 {
-  align-self: stretch;
-}
-.flex-1.data-v-6d058dc0 {
-  flex: 1 1 0%;
-}
-.flex-auto.data-v-6d058dc0 {
-  flex: 1 1 auto;
-}
-.grow.data-v-6d058dc0 {
-  flex-grow: 1;
-}
-.grow-0.data-v-6d058dc0 {
-  flex-grow: 0;
-}
-.shrink.data-v-6d058dc0 {
-  flex-shrink: 1;
-}
-.shrink-0.data-v-6d058dc0 {
-  flex-shrink: 0;
-}
-.relative.data-v-6d058dc0 {
-  position: relative;
-}
-.ml-2.data-v-6d058dc0 {
-  margin-left: 3.75rpx;
-}
-.mt-2.data-v-6d058dc0 {
-  margin-top: 3.75rpx;
-}
-.ml-4.data-v-6d058dc0 {
-  margin-left: 7.5rpx;
-}
-.mt-4.data-v-6d058dc0 {
-  margin-top: 7.5rpx;
-}
-.ml-6.data-v-6d058dc0 {
-  margin-left: 11.25rpx;
-}
-.mt-6.data-v-6d058dc0 {
-  margin-top: 11.25rpx;
-}
-.ml-8.data-v-6d058dc0 {
-  margin-left: 15rpx;
-}
-.mt-8.data-v-6d058dc0 {
-  margin-top: 15rpx;
-}
-.ml-10.data-v-6d058dc0 {
-  margin-left: 18.75rpx;
-}
-.mt-10.data-v-6d058dc0 {
-  margin-top: 18.75rpx;
-}
-.ml-12.data-v-6d058dc0 {
-  margin-left: 22.5rpx;
-}
-.mt-12.data-v-6d058dc0 {
-  margin-top: 22.5rpx;
-}
-.ml-14.data-v-6d058dc0 {
-  margin-left: 26.25rpx;
-}
-.mt-14.data-v-6d058dc0 {
-  margin-top: 26.25rpx;
-}
-.ml-16.data-v-6d058dc0 {
-  margin-left: 30rpx;
-}
-.mt-16.data-v-6d058dc0 {
-  margin-top: 30rpx;
-}
-.ml-18.data-v-6d058dc0 {
-  margin-left: 33.75rpx;
-}
-.mt-18.data-v-6d058dc0 {
-  margin-top: 33.75rpx;
-}
-.ml-20.data-v-6d058dc0 {
-  margin-left: 37.5rpx;
-}
-.mt-20.data-v-6d058dc0 {
-  margin-top: 37.5rpx;
-}
-.ml-22.data-v-6d058dc0 {
-  margin-left: 41.25rpx;
-}
-.mt-22.data-v-6d058dc0 {
-  margin-top: 41.25rpx;
-}
-.ml-24.data-v-6d058dc0 {
-  margin-left: 45rpx;
-}
-.mt-24.data-v-6d058dc0 {
-  margin-top: 45rpx;
-}
-.ml-26.data-v-6d058dc0 {
-  margin-left: 48.75rpx;
-}
-.mt-26.data-v-6d058dc0 {
-  margin-top: 48.75rpx;
-}
-.ml-28.data-v-6d058dc0 {
-  margin-left: 52.5rpx;
-}
-.mt-28.data-v-6d058dc0 {
-  margin-top: 52.5rpx;
-}
-.ml-30.data-v-6d058dc0 {
-  margin-left: 56.25rpx;
-}
-.mt-30.data-v-6d058dc0 {
-  margin-top: 56.25rpx;
-}
-.ml-32.data-v-6d058dc0 {
-  margin-left: 60rpx;
-}
-.mt-32.data-v-6d058dc0 {
-  margin-top: 60rpx;
-}
-.ml-34.data-v-6d058dc0 {
-  margin-left: 63.75rpx;
-}
-.mt-34.data-v-6d058dc0 {
-  margin-top: 63.75rpx;
-}
-.ml-36.data-v-6d058dc0 {
-  margin-left: 67.5rpx;
-}
-.mt-36.data-v-6d058dc0 {
-  margin-top: 67.5rpx;
-}
-.ml-38.data-v-6d058dc0 {
-  margin-left: 71.25rpx;
-}
-.mt-38.data-v-6d058dc0 {
-  margin-top: 71.25rpx;
-}
-.ml-40.data-v-6d058dc0 {
-  margin-left: 75rpx;
-}
-.mt-40.data-v-6d058dc0 {
-  margin-top: 75rpx;
-}
-.ml-42.data-v-6d058dc0 {
-  margin-left: 78.75rpx;
-}
-.mt-42.data-v-6d058dc0 {
-  margin-top: 78.75rpx;
-}
-.ml-44.data-v-6d058dc0 {
-  margin-left: 82.5rpx;
-}
-.mt-44.data-v-6d058dc0 {
-  margin-top: 82.5rpx;
-}
-.ml-46.data-v-6d058dc0 {
-  margin-left: 86.25rpx;
-}
-.mt-46.data-v-6d058dc0 {
-  margin-top: 86.25rpx;
-}
-.ml-48.data-v-6d058dc0 {
-  margin-left: 90rpx;
-}
-.mt-48.data-v-6d058dc0 {
-  margin-top: 90rpx;
-}
-.ml-50.data-v-6d058dc0 {
-  margin-left: 93.75rpx;
-}
-.mt-50.data-v-6d058dc0 {
-  margin-top: 93.75rpx;
-}
-.ml-52.data-v-6d058dc0 {
-  margin-left: 97.5rpx;
-}
-.mt-52.data-v-6d058dc0 {
-  margin-top: 97.5rpx;
-}
-.ml-54.data-v-6d058dc0 {
-  margin-left: 101.25rpx;
-}
-.mt-54.data-v-6d058dc0 {
-  margin-top: 101.25rpx;
-}
-.ml-56.data-v-6d058dc0 {
-  margin-left: 105rpx;
-}
-.mt-56.data-v-6d058dc0 {
-  margin-top: 105rpx;
-}
-.ml-58.data-v-6d058dc0 {
-  margin-left: 108.75rpx;
-}
-.mt-58.data-v-6d058dc0 {
-  margin-top: 108.75rpx;
-}
-.ml-60.data-v-6d058dc0 {
-  margin-left: 112.5rpx;
-}
-.mt-60.data-v-6d058dc0 {
-  margin-top: 112.5rpx;
-}
-.ml-62.data-v-6d058dc0 {
-  margin-left: 116.25rpx;
-}
-.mt-62.data-v-6d058dc0 {
-  margin-top: 116.25rpx;
-}
-.ml-64.data-v-6d058dc0 {
-  margin-left: 120rpx;
-}
-.mt-64.data-v-6d058dc0 {
-  margin-top: 120rpx;
-}
-.ml-66.data-v-6d058dc0 {
-  margin-left: 123.75rpx;
-}
-.mt-66.data-v-6d058dc0 {
-  margin-top: 123.75rpx;
-}
-.ml-68.data-v-6d058dc0 {
-  margin-left: 127.5rpx;
-}
-.mt-68.data-v-6d058dc0 {
-  margin-top: 127.5rpx;
-}
-.ml-70.data-v-6d058dc0 {
-  margin-left: 131.25rpx;
-}
-.mt-70.data-v-6d058dc0 {
-  margin-top: 131.25rpx;
-}
-.ml-72.data-v-6d058dc0 {
-  margin-left: 135rpx;
-}
-.mt-72.data-v-6d058dc0 {
-  margin-top: 135rpx;
-}
-.ml-74.data-v-6d058dc0 {
-  margin-left: 138.75rpx;
-}
-.mt-74.data-v-6d058dc0 {
-  margin-top: 138.75rpx;
-}
-.ml-76.data-v-6d058dc0 {
-  margin-left: 142.5rpx;
-}
-.mt-76.data-v-6d058dc0 {
-  margin-top: 142.5rpx;
-}
-.ml-78.data-v-6d058dc0 {
-  margin-left: 146.25rpx;
-}
-.mt-78.data-v-6d058dc0 {
-  margin-top: 146.25rpx;
-}
-.ml-80.data-v-6d058dc0 {
-  margin-left: 150rpx;
-}
-.mt-80.data-v-6d058dc0 {
-  margin-top: 150rpx;
-}
-.ml-82.data-v-6d058dc0 {
-  margin-left: 153.75rpx;
-}
-.mt-82.data-v-6d058dc0 {
-  margin-top: 153.75rpx;
-}
-.ml-84.data-v-6d058dc0 {
-  margin-left: 157.5rpx;
-}
-.mt-84.data-v-6d058dc0 {
-  margin-top: 157.5rpx;
-}
-.ml-86.data-v-6d058dc0 {
-  margin-left: 161.25rpx;
-}
-.mt-86.data-v-6d058dc0 {
-  margin-top: 161.25rpx;
-}
-.ml-88.data-v-6d058dc0 {
-  margin-left: 165rpx;
-}
-.mt-88.data-v-6d058dc0 {
-  margin-top: 165rpx;
-}
-.ml-90.data-v-6d058dc0 {
-  margin-left: 168.75rpx;
-}
-.mt-90.data-v-6d058dc0 {
-  margin-top: 168.75rpx;
-}
-.ml-92.data-v-6d058dc0 {
-  margin-left: 172.5rpx;
-}
-.mt-92.data-v-6d058dc0 {
-  margin-top: 172.5rpx;
-}
-.ml-94.data-v-6d058dc0 {
-  margin-left: 176.25rpx;
-}
-.mt-94.data-v-6d058dc0 {
-  margin-top: 176.25rpx;
-}
-.ml-96.data-v-6d058dc0 {
-  margin-left: 180rpx;
-}
-.mt-96.data-v-6d058dc0 {
-  margin-top: 180rpx;
-}
-.ml-98.data-v-6d058dc0 {
-  margin-left: 183.75rpx;
-}
-.mt-98.data-v-6d058dc0 {
-  margin-top: 183.75rpx;
-}
-.ml-100.data-v-6d058dc0 {
-  margin-left: 187.5rpx;
-}
-.mt-100.data-v-6d058dc0 {
-  margin-top: 187.5rpx;
-}
-.mt-9.data-v-6d058dc0 {
-  margin-top: 17.18rpx;
-}
-.ml-9.data-v-6d058dc0 {
-  margin-left: 17.18rpx;
-}
-.mt-593.data-v-6d058dc0 {
-  margin-top: 1131.68rpx;
-}
-.page.data-v-6d058dc0 {
-  padding-top: 20.99rpx;
-  background-color: #fffaf0;
-  width: 100%;
-  overflow-y: auto;
-  overflow-x: hidden;
-  height: 100%;
-}
-.list.data-v-6d058dc0 {
-  padding: 0 20.99rpx;
-}
-.list-item.data-v-6d058dc0 {
-  padding: 30.53rpx 15.27rpx 30.53rpx 22.9rpx;
-  background-color: #ffffff;
-  border-radius: 9.54rpx;
-  border-left: solid 1.91rpx #818181;
-  border-right: solid 1.91rpx #818181;
-  border-top: solid 1.91rpx #818181;
-  border-bottom: solid 1.91rpx #818181;
-}
-.list-item.data-v-6d058dc0:first-child {
-  margin-top: 0;
-}
-.font.data-v-6d058dc0 {
-  font-size: 30.53rpx;
-  font-family: Open Sans;
-  line-height: 27.67rpx;
-  color: #323232;
-}
-.font_2.data-v-6d058dc0 {
-  font-size: 30.53rpx;
-  font-family: Open Sans;
-  line-height: 22.44rpx;
-  color: #323232;
-}
-.text-wrapper.data-v-6d058dc0 {
-  background-color: #ffbe55;
-  border-radius: 9.54rpx;
-  width: 70.61rpx;
-  height: 32.44rpx;
-}
-.text.data-v-6d058dc0 {
-  color: #ffffff;
-  font-size: 22.9rpx;
-  font-family: Open Sans;
-  line-height: 21.07rpx;
-}
-.image.data-v-6d058dc0 {
-  border-radius: 9.54rpx;
-  width: 40.08rpx;
-  height: 40.08rpx;
-}
-.section.data-v-6d058dc0 {
-  padding: 17.18rpx 0;
-  background-color: #ffffff;
-}
-.text-wrapper_2.data-v-6d058dc0 {
-  padding: 26.72rpx 0 22.9rpx;
-  background-color: #ffa948;
-  border-radius: 47.71rpx;
-  width: 629.77rpx;
-}
-.text_2.data-v-6d058dc0 {
-  color: #ffffff;
-  line-height: 28.24rpx;
-}

unpackage/dist/dev/mp-weixin/pages/Shopping-cart/newaddress_Info/newaddress_Info.js

@@ -1,31 +1,42 @@
 "use strict";
 const common_vendor = require("../../../common/vendor.js");
 const api_request = require("../../../api/request.js");
-const common_assets = require("../../../common/assets.js");
+const utils_emitter = require("../../../utils/emitter.js");
+if (!Math) {
+  addSelected();
+}
+const addSelected = () => "../../order/component/addSelected.js";
 const _sfc_main = {
   __name: "newaddress_Info",
   setup(__props) {
-    const userInfo = common_vendor.ref({});
     const addressParam = common_vendor.ref({
-      userId: 0,
       name: "",
       phone: "",
       region: "",
       detailAddress: "",
       isDefault: 0
     });
+    const isAdd = common_vendor.ref(false);
     common_vendor.onLoad((options) => {
-      addressParam.value = JSON.parse(options.editInfo);
+      if (JSON.stringify(options) != "{}") {
+        addressParam.value = JSON.parse(options.editInfo);
+      } else {
+        isAdd.value = true;
+      }
+    });
+    common_vendor.onShow(() => {
     });
     common_vendor.onMounted(() => {
-      userInfo.value = common_vendor.index.getStorageSync("userInfo");
+      utils_emitter.emitter.on("region", (val) => {
+        addressParam.value.region = val;
+      });
+      if (!isAdd.value)
+        utils_emitter.emitter.emit("addRegion", addressParam.value.region);
     });
     const defaultAddress = (event) => {
       event.detail.value[0] ? addressParam.value.isDefault = 1 : addressParam.value.isDefault = 0;
     };
     const newAddress = async () => {
-      console.log(addressParam.value);
-      addressParam.value.userId = userInfo.value.id;
       const values = Object.values(addressParam.value);
       if (values.some((value) => value === null || value === void 0 || value === "")) {
         await common_vendor.index.showToast({
@@ -34,16 +45,33 @@ const _sfc_main = {
         });
         return;
       }
-      const res = await common_vendor.index.request({
+      console.log(addressParam.value);
-        url: api_request.baseUrl + "/address/add",
+      if (addressParam.value.id != void 0) {
-        method: "POST",
+        const res = await common_vendor.index.request({
-        header: {
+          url: api_request.baseUrl + "/address/update",
-          "cookie": common_vendor.wx$1.getStorageSync("cookie")
+          method: "POST",
-        },
+          header: {
-        data: { ...addressParam.value }
+            "cookie": common_vendor.wx$1.getStorageSync("cookie")
-      });
+          },
-      console.log("res==>", res.data);
+          data: { ...addressParam.value }
-      if (res.data.code === 1) {
+        });
+        console.log("res1==>", res.data);
+        sucRes(res.data.code);
+      } else {
+        const res = await common_vendor.index.request({
+          url: api_request.baseUrl + "/address/add",
+          method: "POST",
+          header: {
+            "cookie": common_vendor.wx$1.getStorageSync("cookie")
+          },
+          data: { ...addressParam.value }
+        });
+        console.log("res2==>", res.data);
+        sucRes(res.data.code);
+      }
+    };
+    const sucRes = (res) => {
+      if (res === 1) {
         common_vendor.index.navigateBack({
           //返回上一页
         });
@@ -61,16 +89,13 @@ const _sfc_main = {
         b: common_vendor.o(($event) => addressParam.value.name = $event.detail.value),
         c: addressParam.value.phone,
         d: common_vendor.o(($event) => addressParam.value.phone = $event.detail.value),
-        e: addressParam.value.region,
+        e: addressParam.value.detailAddress,
-        f: common_vendor.o(($event) => addressParam.value.region = $event.detail.value),
+        f: common_vendor.o(($event) => addressParam.value.detailAddress = $event.detail.value),
-        g: common_vendor.unref(common_assets.dingwei),
+        g: common_vendor.o(defaultAddress),
-        h: addressParam.value.detailAddress,
+        h: common_vendor.o(newAddress)
-        i: common_vendor.o(($event) => addressParam.value.detailAddress = $event.detail.value),
-        j: common_vendor.o(defaultAddress),
-        k: common_vendor.o(newAddress)
       };
     };
   }
 };
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-fb57d854"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-fb57d854"], ["__file", "D:/微信小程序/课设整合/匠承非遗小程序端/jiangchengfeiyi-xiaochengxu/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue"]]);
 wx.createPage(MiniProgramPage);

unpackage/dist/dev/mp-weixin/pages/Shopping-cart/newaddress_Info/newaddress_Info.json

@@ -1,4 +1,6 @@
 {
   "navigationBarTitleText": "",
-  "usingComponents": {}
+  "usingComponents": {
+    "add-selected": "../../order/component/addSelected"
+  }
 }

unpackage/dist/dev/mp-weixin/pages/Shopping-cart/newaddress_Info/newaddress_Info.wxml

@@ -1 +1 @@
-<view class="flex-col page data-v-fb57d854"><view class="flex-col group data-v-fb57d854"><text class="self-start font_2 text data-v-fb57d854">收货信息</text><view class="flex-col self-stretch section mt-15 data-v-fb57d854"><view class="flex-row items-center group_2 data-v-fb57d854"><text class="font_2 data-v-fb57d854">收货人</text><input class="text-wrapper ml-27 data-v-fb57d854" placeholder="请输入姓名" value="{{a}}" bindinput="{{b}}"/></view><view class="flex-row items-center group_3 data-v-fb57d854"><text class="font_2 text_3 data-v-fb57d854">手机号码</text><input class="text-wrapper_2 ml-12 data-v-fb57d854" placeholder="请输入手机号码" value="{{c}}" bindinput="{{d}}"/></view><view class="flex-row items-center group_4 data-v-fb57d854"><text class="font_2 text_5 data-v-fb57d854">所在地区</text><view class="flex-col justify-start flex-1 relative group_5 ml-13 data-v-fb57d854"><input class="text-wrapper_3 data-v-fb57d854" placeholder="请输入地区" value="{{e}}" bindinput="{{f}}"/><image class="image pos data-v-fb57d854" src="{{g}}"/></view></view><view class="flex-row items-center group_6 data-v-fb57d854"><text class="font_2 text_7 data-v-fb57d854">详细地址</text><block wx:if="{{r0}}"><textarea class="section_2 ml-12 data-v-fb57d854" placeholder="输入详细地址" value="{{h}}" bindinput="{{i}}"/></block></view><view class="flex-row justify-between items-center group_7 data-v-fb57d854"><checkbox-group class="data-v-fb57d854" bindchange="{{j}}"><text class="font_2 data-v-fb57d854">设为默认收货地址</text><checkbox class="data-v-fb57d854" value="1"/></checkbox-group></view></view></view><view class="flex-col justify-start items-center section_3 mt-462 data-v-fb57d854"><view class="flex-col justify-start items-center text-wrapper_4 data-v-fb57d854" bindtap="{{k}}"><text class="text_8 data-v-fb57d854">保存并使用</text></view></view></view>
+<view class="flex-col page data-v-fb57d854"><view class="flex-col group data-v-fb57d854"><text class="self-start font_2 text data-v-fb57d854">收货信息</text><view class="flex-col self-stretch section mt-15 data-v-fb57d854"><view class="flex-row items-center group_2 data-v-fb57d854"><text class="font_2 data-v-fb57d854">收货人</text><input class="text-wrapper ml-27 data-v-fb57d854" placeholder="请输入姓名" value="{{a}}" bindinput="{{b}}"/></view><view class="flex-row items-center group_3 data-v-fb57d854"><text class="font_2 text_3 data-v-fb57d854">手机号码</text><input class="text-wrapper_2 ml-12 data-v-fb57d854" placeholder="请输入手机号码" value="{{c}}" bindinput="{{d}}"/></view><view class="flex-row items-center group_4 data-v-fb57d854"><text class="font_2 text_5 data-v-fb57d854">所在地区</text><view class="flex-col justify-start flex-1 relative group_5 ml-13 data-v-fb57d854"><view class="zujian data-v-fb57d854"><add-selected class="data-v-fb57d854" u-i="fb57d854-0" bind:__l="__l"></add-selected></view><image class="image pos data-v-fb57d854" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FkYDyjpPh-dingwei.png"/></view></view><view class="flex-row items-center group_6 data-v-fb57d854"><text class="font_2 text_7 data-v-fb57d854">详细地址</text><block wx:if="{{r0}}"><textarea class="section_2 ml-12 data-v-fb57d854" placeholder="输入详细地址" value="{{e}}" bindinput="{{f}}"/></block></view><view class="flex-row justify-between items-center group_7 data-v-fb57d854"><checkbox-group class="data-v-fb57d854" bindchange="{{g}}"><text class="font_2 data-v-fb57d854">设为默认收货地址</text><checkbox class="data-v-fb57d854" value="1"/></checkbox-group></view></view></view><view class="flex-col justify-start items-center section_3 mt-462 data-v-fb57d854"><view class="flex-col justify-start items-center text-wrapper_4 data-v-fb57d854" bindtap="{{h}}"><text class="text_8 data-v-fb57d854">保存并使用</text></view></view></view>

unpackage/dist/dev/mp-weixin/pages/Shopping-cart/newaddress_Info/newaddress_Info.wxss

@@ -525,3 +525,8 @@ text.data-v-fb57d854 {
   font-family: Open Sans;
   line-height: 27.9rpx;
 }
+.zujian.data-v-fb57d854 {
+  height: 100rpx;
+  width: 450rpx;
+  margin-left: 50rpx;
+}

unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.js

@@ -9,12 +9,16 @@ const _sfc_main = {
     const allCheck = common_vendor.ref(false);
     const checkedData = common_vendor.ref([]);
     const totalPrice = common_vendor.ref(0);
-    common_vendor.wx$1.getStorageSync("userInfo");
+    const stateText = common_vendor.ref({
-    common_vendor.onMounted(() => {
+      topBtn: "编辑",
+      bottomBtn: "去结算"
     });
     common_vendor.onShow(() => {
       getProductCart();
     });
+    common_vendor.onLoad(() => {
+      getProductCart();
+    });
     const getProductCart = async () => {
       const res = await common_vendor.index.request({
         url: api_request.baseUrl + "/cart/list",
@@ -29,9 +33,25 @@ const _sfc_main = {
           item.checked = false;
         });
       }
-      console.log("res--->", res);
       console.log("products-->", products.value);
     };
+    const deleteProduct = async (idArr) => {
+      const res = await common_vendor.index.request({
+        url: api_request.baseUrl + "/cart/delete",
+        method: "POST",
+        data: idArr,
+        header: {
+          "cookie": common_vendor.wx$1.getStorageSync("cookie")
+        }
+      });
+      console.log(res.data);
+      if (res.data.code === 1) {
+        common_vendor.index.reLaunch({
+          url: "/pages/Shopping-cart/productmain/productmain"
+        });
+        totalPrice.value = 0;
+      }
+    };
     const changeType = async (num) => {
       current.value = num;
     };
@@ -39,21 +59,25 @@ const _sfc_main = {
       "border-bottom": current.value === num ? "2px solid orange" : "2px solid  #ffffff"
     });
     const checkBoxChange = (event) => {
-      console.log("方法被触发");
       console.log("length---->", event.detail.value.length);
       if (event.detail.value.length == products.value.length) {
         allCheck.value = true;
       } else {
         allCheck.value = false;
       }
-      checkedData.value = [{}];
+      checkedData.value = [];
       totalPrice.value = 0;
-      let count = 0;
       console.log("event--->", event.detail);
-      products.value[parseInt(event.detail.value)].checked = true;
+      if (event.detail.value.length) {
+        products.value[parseInt(event.detail.value)].checked = true;
+      } else {
+        products.value.forEach((item) => {
+          item.checked = false;
+        });
+      }
       for (let key in event.detail.value) {
         let temp = parseInt(event.detail.value[parseInt(key)]);
-        computed(products.value[temp].goodVO.price, products.value[temp].quantity);
+        computed(products.value[temp].cartGoodVO.price, products.value[temp].quantity);
       }
       event.detail.value.forEach((item) => {
         products.value[parseInt(item)].checked = true;
@@ -68,11 +92,7 @@ const _sfc_main = {
       event.detail.value.forEach((item) => {
         console.log("products.value[parseInt(item)].goodId", products.value[parseInt(item)].goodId);
         if (products.value[parseInt(item)] !== null) {
-          checkedData.value[count] = {
+          checkedData.value.push(products.value[parseInt(item)].id);
-            goodId: products.value[parseInt(item)].goodId,
-            quantity: products.value[parseInt(item)].quantity
-          };
-          count += 1;
         }
       });
       console.log("checkedData--->", checkedData.value);
@@ -83,12 +103,9 @@ const _sfc_main = {
       if (allCheck.value == true) {
         products.value.forEach((item) => {
           item.checked = true;
-          computed(item.goodVO.price, item.quantity);
+          computed(item.cartGoodVO.price, item.quantity);
         });
-        checkedData.value = products.value.map((item) => ({
+        checkedData.value = products.value.map((item) => item.id);
-          goodId: item.goodId,
-          quantity: item.quantity
-        }));
         console.log("checkedData--->", checkedData.value);
       } else {
         products.value.forEach((item) => {
@@ -97,54 +114,104 @@ const _sfc_main = {
       }
     };
     const decrease = (index, item) => {
+      console.log("decrease,index-->", index);
+      console.log("decrease,item-->", item);
       if (products.value[index].quantity > 1) {
         products.value[index].quantity -= 1;
         if (item && products.value[index].quantity >= 1) {
-          computed(-products.value[index].goodVO.price, 1);
+          computed(-products.value[index].cartGoodVO.price, 1);
         }
       }
     };
     const increase = (index, item) => {
-      if (products.value[index].quantity <= 99) {
+      console.log("increase,index-->", index);
+      console.log("increase,item-->", item);
+      if (products.value[index].quantity < products.value[index].cartGoodVO.inventory) {
+        if (item && products.value[index].quantity <= products.value[index].cartGoodVO.inventory) {
+          computed(products.value[index].cartGoodVO.price, 1);
+        }
         products.value[index].quantity += 1;
       }
-      if (item) {
-        computed(products.value[index].goodVO.price, 1);
-      }
     };
     const computed = (price, quantity) => {
-      totalPrice.value += price * quantity;
+      totalPrice.value = common_vendor.round(totalPrice.value + price * quantity, 2);
       return totalPrice.value;
     };
-    const jump_product = () => {
+    const jump_product = (gid) => {
       common_vendor.index.navigateTo({
-        url: "../../../pages/store-home/ProductDetails/ProductDetails"
+        url: "../../../pages/store-home/ProductDetails/ProductDetails?gid=" + JSON.stringify(gid)
       });
     };
-    const goToBuy = () => {
+    const editOrSettle = async () => {
-      console.log("要传到订单详情页面的checked--->", checkedData.value);
+      if (stateText.value.bottomBtn === "去结算") {
-      common_vendor.index.navigateTo({
+        if (checkedData.value.length === 0) {
-        url: "/pages/order/product-waitpay/product-waitpay?cartInfo=" + JSON.stringify(checkedData.value)
+          return;
-      });
+        }
+        const res = await common_vendor.index.request({
+          url: api_request.baseUrl + "/cart/submit/error",
+          method: "POST",
+          header: {
+            "cookie": common_vendor.wx$1.getStorageSync("cookie")
+          }
+        });
+        console.log(res.data);
+        if (res.data.data.length != 0) {
+          common_vendor.index.showModal({
+            title: "提示",
+            content: "购物车商品发生改变，点击移除变化商品",
+            showCancel: false,
+            success: (e) => {
+              if (e.confirm) {
+                deleteProduct(res.data.data);
+              }
+            }
+          });
+        } else {
+          common_vendor.index.navigateTo({
+            url: "/pages/order/product-waitpay/product-waitpay?cartInfo=" + JSON.stringify(checkedData.value)
+          });
+          checkedData.value.splice(0, checkedData.value.length);
+        }
+      } else {
+        common_vendor.index.showModal({
+          title: "提示",
+          content: "是否删除商品?",
+          success: (e) => {
+            if (e.confirm) {
+              deleteProduct(checkedData.value);
+            } else if (e.cancel)
+              return;
+          }
+        });
+      }
+    };
+    const changeState = () => {
+      if (stateText.value.topBtn === "编辑") {
+        stateText.value.topBtn = "完成", stateText.value.bottomBtn = "删除";
+      } else {
+        stateText.value.topBtn = "编辑", stateText.value.bottomBtn = "去结算";
+      }
     };
     return (_ctx, _cache) => {
       return {
-        a: common_vendor.s(getTextStyle(1)),
+        a: common_vendor.t(stateText.value.topBtn),
-        b: common_vendor.o(($event) => changeType(1)),
+        b: common_vendor.o(changeState),
-        c: common_vendor.s(getTextStyle(2)),
+        c: common_vendor.s(getTextStyle(1)),
-        d: common_vendor.o(($event) => changeType(2)),
+        d: common_vendor.o(($event) => changeType(1)),
-        e: common_vendor.f(products.value, (item, index, i0) => {
+        e: common_vendor.s(getTextStyle(2)),
+        f: common_vendor.o(($event) => changeType(2)),
+        g: common_vendor.f(products.value, (item, index, i0) => {
           return common_vendor.e(current.value == 1 ? {
             a: index,
             b: item.checked,
-            c: item.goodVO.goodImg,
+            c: item.cartGoodVO.goodImg.split(";")[0],
-            d: common_vendor.o(jump_product, index),
+            d: common_vendor.o(($event) => jump_product(item.goodId), index),
-            e: common_vendor.t(item.goodVO.name),
+            e: common_vendor.t(item.cartGoodVO.name),
-            f: common_vendor.o(jump_product, index),
+            f: common_vendor.o(($event) => jump_product(item.goodId), index),
-            g: common_vendor.t(item.goodVO.type),
+            g: common_vendor.t(item.cartGoodVO.type),
-            h: common_vendor.o(jump_product, index),
+            h: common_vendor.o(($event) => jump_product(item.goodId), index),
-            i: common_vendor.t(item.goodVO.price),
+            i: common_vendor.t(item.cartGoodVO.price),
-            j: common_vendor.o(jump_product, index),
+            j: common_vendor.o(($event) => jump_product(item.goodId), index),
             k: common_vendor.o(($event) => decrease(index, item.checked), index),
             l: common_vendor.t(item.quantity),
             m: common_vendor.o(($event) => increase(index, item.checked), index)
@@ -152,16 +219,17 @@ const _sfc_main = {
             n: index
           });
         }),
-        f: current.value == 1,
+        h: current.value == 1,
-        g: current.value == 2,
+        i: current.value == 2,
-        h: common_vendor.o(checkBoxChange),
+        j: common_vendor.o(checkBoxChange),
-        i: allCheck.value,
+        k: allCheck.value,
-        j: common_vendor.o(allChecked),
+        l: common_vendor.o(allChecked),
-        k: common_vendor.t(totalPrice.value),
+        m: common_vendor.t(totalPrice.value),
-        l: common_vendor.o(goToBuy)
+        n: common_vendor.t(stateText.value.bottomBtn),
+        o: common_vendor.o(editOrSettle)
       };
     };
   }
 };
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-641af6de"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-641af6de"], ["__file", "D:/微信小程序/课设整合/匠承非遗小程序端/jiangchengfeiyi-xiaochengxu/pages/Shopping-cart/productmain/productmain.vue"]]);
 wx.createPage(MiniProgramPage);

unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.wxml

@@ -1 +1 @@
-<view class="flex-col page data-v-641af6de"><view class="flex-col data-v-641af6de"><view class="flex-col justify-start items-end text-wrapper data-v-641af6de"><text class="font text data-v-641af6de">编辑</text></view><view class="flex-col section data-v-641af6de"><view class="flex-row justify-between self-stretch group data-v-641af6de"><text class="font text_2 data-v-641af6de" style="{{a}}" bindtap="{{b}}">商品类</text><text class="font data-v-641af6de" style="{{c}}" bindtap="{{d}}">服务类</text></view></view><view class="flex-col list data-v-641af6de"><checkbox-group class="data-v-641af6de" bindchange="{{h}}"><view wx:for="{{e}}" wx:for-item="item" wx:key="n" class="flex-col list-item mt-8 data-v-641af6de"><view wx:if="{{f}}" class="flex-row section_1 data-v-641af6de"><checkbox class="shrink-0 self-center image_2 data-v-641af6de" value="{{item.a}}" checked="{{item.b}}"/><view class="flex-row flex-1 self-center group_2 data-v-641af6de"><image class="shrink-0 image data-v-641af6de" src="{{item.c}}" bindtap="{{item.d}}"/><view class="flex-col flex-1 group_3 ml-12 data-v-641af6de"><view class="flex-row group_4 data-v-641af6de"><text class="font_2 data-v-641af6de" bindtap="{{item.f}}">{{item.e}}</text><text class="font_2 ml-4 data-v-641af6de" bindtap="{{item.h}}">【{{item.g}}】</text></view><view class="flex-row items-center mt-47 data-v-641af6de"><view class="flex-row items-center self-stretch group_5 data-v-641af6de"><text class="font_3 text_3 data-v-641af6de" bindtap="{{item.j}}"><text class="font_4 data-v-641af6de">￥</text>{{item.i}}.<text class="font_4 data-v-641af6de">00</text></text></view></view></view></view><image class="shrink-0 self-start image_3 image_4 data-v-641af6de" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FosWvYyNx-short1.png" bindtap="{{item.k}}"/><view class="flex-row shrink-0 self-start group_9 data-v-641af6de"><view class="flex-col justify-start items-center text-wrapper_2 data-v-641af6de"><text class="font_5 text_4 data-v-641af6de">{{item.l}}</text></view><image class="image_5 ml-2 data-v-641af6de" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FGbdSQDul-add1.png" bindtap="{{item.m}}"/></view></view><view wx:if="{{g}}" class="flex-col list-item_2 mt-8 data-v-641af6de"><view class="flex-row data-v-641af6de"><image class="shrink-0 self-start image_2 image_8 data-v-641af6de" src="https://ide.code.fun/api/image?token=672db25dc471750012de4901&name=radio.png"/><image class="shrink-0 image_7 data-v-641af6de" src="https://ide.code.fun/api/image?token=672db25dc471750012de4901&name=service.png"/><view class="flex-col flex-1 group_1 data-v-641af6de"><text class="font_6 data-v-641af6de">【非遗手工艺体验】纸笺加工技艺-流沙笺团扇制作体验</text><view class="flex-row justify-between items-center section_3 mt-7 data-v-641af6de"><view class="flex-col items-start data-v-641af6de"><text class="font_7 data-v-641af6de">仿真丝团扇;上午场(09:30-12:00)</text><text class="font_8 text_5 mt-6 data-v-641af6de">预约日期：2024-10-15</text></view><image class="image_9 data-v-641af6de" src="https://ide.code.fun/api/image?token=672db25dc471750012de4901&name=pull.png"/></view></view></view><view class="flex-row justify-end items-center group_7 mt-14 data-v-641af6de"><view class="flex-row items-center data-v-641af6de"><text class="font_3 text_6 data-v-641af6de">138.</text><image class="shrink-0 image_6 data-v-641af6de" src="https://ide.code.fun/api/image?token=672db25dc471750012de4901&name=storeRmb.png"/><text class="font_4 text_7 data-v-641af6de">00</text></view><view class="flex-row ml-82 data-v-641af6de"><image class="image_3 data-v-641af6de" src="https://ide.code.fun/api/image?token=672db25dc471750012de4901&name=short1.png"/><view class="flex-col justify-start items-center text-wrapper_2 ml-2 data-v-641af6de"><text class="font_5 text_8 data-v-641af6de">1</text></view><image class="image_5 ml-2 data-v-641af6de" src="https://ide.code.fun/api/image?token=672db25dc471750012de4901&name=add1.png"/></view></view></view></view></checkbox-group></view></view><view class="flex-row justify-between items-center section_4 mt-569 data-v-641af6de"><view class="flex-row items-center data-v-641af6de"><checkbox class="shrink-0 image_2 data-v-641af6de" checked="{{i}}" bindtap="{{j}}"/><text class="ml-10 font text_10 data-v-641af6de">全选</text></view><view class="flex-row items-center group_3 data-v-641af6de"><text class="font data-v-641af6de">合计：</text><image class="shrink-0 image_7 image_9 data-v-641af6de" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FJipaVPoQ-storeRmb.png"/><text class="font text_12 data-v-641af6de">{{k}}</text><view class="flex-col justify-start items-center shrink-0 text-wrapper_3 data-v-641af6de" bindtap="{{l}}"><text class="text_11 data-v-641af6de">去结算</text></view></view></view></view>
+<view class="flex-col page data-v-641af6de"><view class="flex-col data-v-641af6de"><view class="flex-col justify-start items-end text-wrapper data-v-641af6de"><text class="font text data-v-641af6de" bindtap="{{b}}">{{a}}</text></view><view class="flex-col section data-v-641af6de"><view class="flex-row justify-between self-stretch group data-v-641af6de"><text class="font text_2 data-v-641af6de" style="{{c}}" bindtap="{{d}}">商品类</text><text class="font data-v-641af6de" style="{{e}}" bindtap="{{f}}">服务类</text></view></view><view class="flex-col list data-v-641af6de"><checkbox-group class="data-v-641af6de" bindchange="{{j}}"><view wx:for="{{g}}" wx:for-item="item" wx:key="n" class="flex-col list-item mt-8 data-v-641af6de"><view wx:if="{{h}}" class="flex-row section_1 data-v-641af6de"><checkbox class="shrink-0 self-center image_2 data-v-641af6de" value="{{item.a}}" checked="{{item.b}}"/><view class="flex-row flex-1 self-center group_2 data-v-641af6de"><image class="shrink-0 image data-v-641af6de" src="{{item.c}}" bindtap="{{item.d}}"/><view class="flex-col flex-1 group_3 ml-12 data-v-641af6de"><view class="flex-row group_4 data-v-641af6de"><text class="font_2 data-v-641af6de" bindtap="{{item.f}}">{{item.e}}</text><text class="font_2 ml-4 data-v-641af6de" bindtap="{{item.h}}">【{{item.g}}】</text></view><view class="flex-row items-center mt-47 data-v-641af6de"><view class="flex-row items-center self-stretch group_5 data-v-641af6de"><text class="font_3 text_3 data-v-641af6de" bindtap="{{item.j}}"><text class="font_4 data-v-641af6de">￥</text>{{item.i}}</text></view></view></view></view><image class="shrink-0 self-start image_3 image_4 data-v-641af6de" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FosWvYyNx-short1.png" bindtap="{{item.k}}"/><view class="flex-row shrink-0 self-start group_9 data-v-641af6de"><view class="flex-col justify-start items-center text-wrapper_2 data-v-641af6de"><text class="font_5 text_4 data-v-641af6de">{{item.l}}</text></view><image class="image_5 ml-2 data-v-641af6de" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FGbdSQDul-add1.png" bindtap="{{item.m}}"/></view></view><view wx:if="{{i}}" class="flex-col list-item_2 mt-8 data-v-641af6de"><view class="flex-row data-v-641af6de"><image class="shrink-0 self-start image_2 image_8 data-v-641af6de" src="https://ide.code.fun/api/image?token=672db25dc471750012de4901&name=radio.png"/><image class="shrink-0 image_7 data-v-641af6de" src="https://ide.code.fun/api/image?token=672db25dc471750012de4901&name=service.png"/><view class="flex-col flex-1 group_1 data-v-641af6de"><text class="font_6 data-v-641af6de">【非遗手工艺体验】纸笺加工技艺-流沙笺团扇制作体验</text><view class="flex-row justify-between items-center section_3 mt-7 data-v-641af6de"><view class="flex-col items-start data-v-641af6de"><text class="font_7 data-v-641af6de">仿真丝团扇;上午场(09:30-12:00)</text><text class="font_8 text_5 mt-6 data-v-641af6de">预约日期：2024-10-15</text></view><image class="image_9 data-v-641af6de" src="https://ide.code.fun/api/image?token=672db25dc471750012de4901&name=pull.png"/></view></view></view><view class="flex-row justify-end items-center group_7 mt-14 data-v-641af6de"><view class="flex-row items-center data-v-641af6de"><text class="font_3 text_6 data-v-641af6de">138.</text><image class="shrink-0 image_6 data-v-641af6de" src="https://ide.code.fun/api/image?token=672db25dc471750012de4901&name=storeRmb.png"/><text class="font_4 text_7 data-v-641af6de">00</text></view><view class="flex-row ml-82 data-v-641af6de"><image class="image_3 data-v-641af6de" src="https://ide.code.fun/api/image?token=672db25dc471750012de4901&name=short1.png"/><view class="flex-col justify-start items-center text-wrapper_2 ml-2 data-v-641af6de"><text class="font_5 text_8 data-v-641af6de">1</text></view><image class="image_5 ml-2 data-v-641af6de" src="https://ide.code.fun/api/image?token=672db25dc471750012de4901&name=add1.png"/></view></view></view></view></checkbox-group></view></view><view class="flex-row justify-between items-center section_4 mt-569 data-v-641af6de"><view class="flex-row items-center data-v-641af6de"><checkbox class="shrink-0 image_2 data-v-641af6de" checked="{{k}}" bindtap="{{l}}"/><text class="ml-10 font text_10 data-v-641af6de">全选</text></view><view class="flex-row items-center group_3 data-v-641af6de"><text class="font data-v-641af6de">合计：</text><image class="shrink-0 image_7 image_9 data-v-641af6de" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FJipaVPoQ-storeRmb.png"/><text class="font text_12 data-v-641af6de">{{m}}</text><view class="flex-col justify-start items-center shrink-0 text-wrapper_3 data-v-641af6de" bindtap="{{o}}"><text class="text_11 data-v-641af6de">{{n}}</text></view></view></view></view>

unpackage/dist/dev/mp-weixin/pages/booking/AppointmentHome.js

@@ -15,5 +15,5 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
     };
   }
 });
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-60893f73"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-60893f73"], ["__file", "D:/微信小程序/课设整合/匠承非遗小程序端/jiangchengfeiyi-xiaochengxu/pages/booking/AppointmentHome.vue"]]);
 wx.createPage(MiniProgramPage);

unpackage/dist/dev/mp-weixin/pages/booking/BillingOfFees/BillingOfFees.js

@@ -15,5 +15,5 @@ const _sfc_main = {
     };
   }
 };
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-cab9a6c6"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-cab9a6c6"], ["__file", "D:/微信小程序/课设整合/匠承非遗小程序端/jiangchengfeiyi-xiaochengxu/pages/booking/BillingOfFees/BillingOfFees.vue"]]);
 wx.createPage(MiniProgramPage);

unpackage/dist/dev/mp-weixin/pages/booking/ContactInformation.js

@@ -4,5 +4,5 @@ const _sfc_main = {};
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return {};
 }
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-43413e24"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-43413e24"], ["__file", "D:/微信小程序/课设整合/匠承非遗小程序端/jiangchengfeiyi-xiaochengxu/pages/booking/ContactInformation.vue"]]);
 wx.createPage(MiniProgramPage);

unpackage/dist/dev/mp-weixin/pages/booking/CostumeDetails/CostumeDetails.js

@@ -45,4 +45,5 @@ const _sfc_main = {
     };
   }
 };
-wx.createPage(_sfc_main);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__file", "D:/微信小程序/课设整合/匠承非遗小程序端/jiangchengfeiyi-xiaochengxu/pages/booking/CostumeDetails/CostumeDetails.vue"]]);
+wx.createPage(MiniProgramPage);

unpackage/dist/dev/mp-weixin/pages/booking/CostumeDisplay/CostumeDisplay.js

@@ -45,17 +45,16 @@ const _sfc_main = {
         a: common_vendor.f(label.value, (item, index, i0) => {
           return {
             a: item.image,
-            b: item.image,
+            b: common_vendor.t(item.name),
-            c: common_vendor.t(item.name),
+            c: common_vendor.t(item.intro),
-            d: common_vendor.t(item.intro),
+            d: common_vendor.t(item.price),
-            e: common_vendor.t(item.price),
+            e: index,
-            f: index,
+            f: common_vendor.o(($event) => goToText(index), index)
-            g: common_vendor.o(($event) => goToText(index), index)
           };
         })
       };
     };
   }
 };
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-d97852c0"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-d97852c0"], ["__file", "D:/微信小程序/课设整合/匠承非遗小程序端/jiangchengfeiyi-xiaochengxu/pages/booking/CostumeDisplay/CostumeDisplay.vue"]]);
 wx.createPage(MiniProgramPage);

unpackage/dist/dev/mp-weixin/pages/booking/CostumeDisplay/CostumeDisplay.wxml

@@ -1 +1 @@
-<view class="flex-col page data-v-d97852c0"><view class="flex-col section data-v-d97852c0"><text class="self-start text data-v-d97852c0">服装展示</text><view class="flex-col self-stretch mt-21 data-v-d97852c0"><view wx:for="{{a}}" wx:for-item="item" wx:key="f" class="flex-row items-center mt-10 list-item data-v-d97852c0" bindtap="{{item.g}}"><image class="shrink-0 image_2 data-v-d97852c0" src="{{item.a}}"/><view class="flex-col flex-1 ml-11 data-v-d97852c0"><view class="flex-col self-stretch data-v-d97852c0"><view class="flex-row justify-end self-stretch group data-v-d97852c0"><text class="font data-v-d97852c0">详细信息</text><image class="image data-v-d97852c0" src="{{item.b}}"/></view><text class="self-start font_2 text_2 mt-3 data-v-d97852c0">{{item.c}}</text></view><view class="self-stretch group_2 mt-5 data-v-d97852c0"><text class="font_4 data-v-d97852c0">服装简介：</text><text class="font_3 data-v-d97852c0">{{item.d}}</text></view><text class="self-end font_5 mt-5 data-v-d97852c0">￥{{item.e}}</text></view></view></view></view><view class="mt-48 flex-row items-center section_2 data-v-d97852c0"><view class="flex-col items-center shrink-0 section_3 data-v-d97852c0"><image class="image_3 data-v-d97852c0" src="https://ide.code.fun/api/image?token=674eb236797f850011f0c44a&name=4b56fed14a39630ca2312edf6e34c024.png"/><text class="mt-2 text_4 data-v-d97852c0">客服</text></view><view class="ml-34 flex-col justify-start items-center flex-1 text-wrapper data-v-d97852c0"><text class="text_3 data-v-d97852c0">现在去预约</text></view></view></view>
+<view class="flex-col justify-start relative page data-v-d97852c0"><view class="shrink-0 section data-v-d97852c0"></view><view class="flex-col justify-start items-center text-wrapper pos data-v-d97852c0"><text class="text data-v-d97852c0">服装详情</text></view><view class="flex-col pos_2 data-v-d97852c0"><view wx:for="{{a}}" wx:for-item="item" wx:key="e" class="flex-row items-center list-item data-v-d97852c0" bindtap="{{item.f}}"><image class="shrink-0 image data-v-d97852c0" src="{{item.a}}"/><view class="flex-col flex-1 ml-5 data-v-d97852c0"><text class="self-start font data-v-d97852c0">{{item.b}}</text><text class="self-start font_2 text_2 data-v-d97852c0">{{item.c}}</text><text class="self-end font_3 text_3 data-v-d97852c0">￥{{item.d}}</text></view></view></view><view class="flex-row justify-between items-center section_4 pos_3 data-v-d97852c0"><view class="flex-col items-center data-v-d97852c0"><image class="image_2 data-v-d97852c0" src="https://ide.code.fun/api/image?token=67610a10797f850011f30392&name=a18599a262f28b8e3d504092795de649.png"/><text class="text_5 mt-3 data-v-d97852c0">客服</text></view><view class="flex-col justify-start items-center text-wrapper_2 data-v-d97852c0"><text class="font text_4 data-v-d97852c0">现在去预约</text></view></view></view>