修改

main.js

@@ -15,7 +15,7 @@ Vue.prototype.$api = requestBase;
 Vue.prototype.$apifile = requestFile;
 // 配置文件
 import config from '@/config.js';
-// import '@/common/computed.js';
+import '@/common/computed.js';
 Vue.prototype.$config = config;
 
 Vue.config.productionTip = false;

node_modules/.package-lock.json

@@ -0,0 +1,12 @@
+{
+  "name": "material_applet",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "node_modules/decimal.js": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
+      "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA=="
+    }
+  }
+}

node_modules/decimal.js/LICENCE.md

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

node_modules/decimal.js/README.md

@@ -0,0 +1,246 @@
+![decimal.js](https://raw.githubusercontent.com/MikeMcl/decimal.js/gh-pages/decimaljs.png)
+
+An arbitrary-precision Decimal type for JavaScript.
+
+[![npm version](https://img.shields.io/npm/v/decimal.js.svg)](https://www.npmjs.com/package/decimal.js)
+[![npm downloads](https://img.shields.io/npm/dw/decimal.js)](https://www.npmjs.com/package/decimal.js)
+[![Build Status](https://travis-ci.org/MikeMcl/decimal.js.svg)](https://travis-ci.org/MikeMcl/decimal.js)
+[![CDNJS](https://img.shields.io/cdnjs/v/decimal.js.svg)](https://cdnjs.com/libraries/decimal.js)
+
+<br>
+
+## Features
+
+  - Integers and floats
+  - Simple but full-featured API
+  - Replicates many of the methods of JavaScript's `Number.prototype` and `Math` objects
+  - Also handles hexadecimal, binary and octal values
+  - Faster, smaller, and perhaps easier to use than JavaScript versions of Java's BigDecimal
+  - No dependencies
+  - Wide platform compatibility: uses JavaScript 1.5 (ECMAScript 3) features only
+  - Comprehensive [documentation](https://mikemcl.github.io/decimal.js/) and test set
+  - Used under the hood by [math.js](https://github.com/josdejong/mathjs)
+  - Includes a TypeScript declaration file: *decimal.d.ts*
+
+![API](https://raw.githubusercontent.com/MikeMcl/decimal.js/gh-pages/API.png)
+
+The library is similar to [bignumber.js](https://github.com/MikeMcl/bignumber.js/), but here
+precision is specified in terms of significant digits rather than decimal places, and all
+calculations are rounded to the precision (similar to Python's decimal module) rather than just
+those involving division.
+
+This library also adds the trigonometric functions, among others, and supports non-integer powers,
+which makes it a significantly larger library than *bignumber.js* and the even smaller
+[big.js](https://github.com/MikeMcl/big.js/).
+
+For a lighter version of this library without the trigonometric functions see
+[decimal.js-light](https://github.com/MikeMcl/decimal.js-light/).
+
+## Load
+
+The library is the single JavaScript file *decimal.js* or ES module *decimal.mjs*.
+
+Browser:
+
+```html
+<script src='path/to/decimal.js'></script>
+
+<script type="module">
+  import Decimal from './path/to/decimal.mjs';
+  ...
+</script>
+```
+
+[Node.js](https://nodejs.org):
+
+```bash
+npm install decimal.js
+```
+```js
+const Decimal = require('decimal.js');
+
+import Decimal from 'decimal.js';
+
+import {Decimal} from 'decimal.js';
+```
+
+## Use
+
+*In all examples below, semicolons and `toString` calls are not shown.
+If a commented-out value is in quotes it means `toString` has been called on the preceding expression.*
+
+The library exports a single constructor function, `Decimal`, which expects a single argument that is a number, string or Decimal instance.
+
+```js
+x = new Decimal(123.4567)
+y = new Decimal('123456.7e-3')
+z = new Decimal(x)
+x.equals(y) && y.equals(z) && x.equals(z)        // true
+```
+
+If using values with more than a few digits, it is recommended to pass strings rather than numbers to avoid a potential loss of precision.
+
+```js
+// Precision loss from using numeric literals with more than 15 significant digits.
+new Decimal(1.0000000000000001)         // '1'
+new Decimal(88259496234518.57)          // '88259496234518.56'
+new Decimal(99999999999999999999)       // '100000000000000000000'
+
+// Precision loss from using numeric literals outside the range of Number values.
+new Decimal(2e+308)                     // 'Infinity'
+new Decimal(1e-324)                     // '0'
+
+// Precision loss from the unexpected result of arithmetic with Number values.
+new Decimal(0.7 + 0.1)                  // '0.7999999999999999'
+```
+
+As with JavaScript numbers, strings can contain underscores as separators to improve readability.
+
+```js
+x = new Decimal('2_147_483_647')
+```
+
+String values in binary, hexadecimal or octal notation are also accepted if the appropriate prefix is included.
+
+```js
+x = new Decimal('0xff.f')            // '255.9375'
+y = new Decimal('0b10101100')        // '172'
+z = x.plus(y)                        // '427.9375'
+
+z.toBinary()                         // '0b110101011.1111'
+z.toBinary(13)                       // '0b1.101010111111p+8'
+
+// Using binary exponential notation to create a Decimal with the value of `Number.MAX_VALUE`.
+x = new Decimal('0b1.1111111111111111111111111111111111111111111111111111p+1023')
+// '1.7976931348623157081e+308'
+```
+
+Decimal instances are immutable in the sense that they are not changed by their methods.
+
+```js
+0.3 - 0.1                     // 0.19999999999999998
+x = new Decimal(0.3)
+x.minus(0.1)                  // '0.2'
+x                             // '0.3'
+```
+
+The methods that return a Decimal can be chained.
+
+```js
+x.dividedBy(y).plus(z).times(9).floor()
+x.times('1.23456780123456789e+9').plus(9876.5432321).dividedBy('4444562598.111772').ceil()
+```
+
+Many method names have a shorter alias.
+
+```js
+x.squareRoot().dividedBy(y).toPower(3).equals(x.sqrt().div(y).pow(3))     // true
+x.comparedTo(y.modulo(z).negated() === x.cmp(y.mod(z).neg())              // true
+```
+
+Most of the methods of JavaScript's `Number.prototype` and `Math` objects are replicated.
+
+```js
+x = new Decimal(255.5)
+x.toExponential(5)                       // '2.55500e+2'
+x.toFixed(5)                             // '255.50000'
+x.toPrecision(5)                         // '255.50'
+
+Decimal.sqrt('6.98372465832e+9823')      // '8.3568682281821340204e+4911'
+Decimal.pow(2, 0.0979843)                // '1.0702770511687781839'
+
+// Using `toFixed()` to avoid exponential notation:
+x = new Decimal('0.0000001')
+x.toString()                             // '1e-7'
+x.toFixed()                              // '0.0000001'
+```
+
+And there are `isNaN` and `isFinite` methods, as `NaN` and `Infinity` are valid `Decimal` values.
+
+```js
+x = new Decimal(NaN)                                           // 'NaN'
+y = new Decimal(Infinity)                                      // 'Infinity'
+x.isNaN() && !y.isNaN() && !x.isFinite() && !y.isFinite()      // true
+```
+
+There is also a `toFraction` method with an optional *maximum denominator* argument.
+
+```js
+z = new Decimal(355)
+pi = z.dividedBy(113)        // '3.1415929204'
+pi.toFraction()              // [ '7853982301', '2500000000' ]
+pi.toFraction(1000)          // [ '355', '113' ]
+```
+
+All calculations are rounded according to the number of significant digits and rounding mode specified
+by the `precision` and `rounding` properties of the Decimal constructor.
+
+For advanced usage, multiple Decimal constructors can be created, each with their own independent
+configuration which applies to all Decimal numbers created from it.
+
+```js
+// Set the precision and rounding of the default Decimal constructor
+Decimal.set({ precision: 5, rounding: 4 })
+
+// Create another Decimal constructor, optionally passing in a configuration object
+Dec = Decimal.clone({ precision: 9, rounding: 1 })
+
+x = new Decimal(5)
+y = new Dec(5)
+
+x.div(3)                           // '1.6667'
+y.div(3)                           // '1.66666666'
+```
+
+The value of a Decimal is stored in a floating point format in terms of its digits, exponent and sign, but these properties should be considered read-only.
+
+```js
+x = new Decimal(-12345.67);
+x.d                            // [ 12345, 6700000 ]    digits (base 10000000)
+x.e                            // 4                     exponent (base 10)
+x.s                            // -1                    sign
+```
+
+For further information see the [API](http://mikemcl.github.io/decimal.js/) reference in the *doc* directory.
+
+## Test
+
+To run the tests using Node.js from the root directory:
+
+```bash
+npm test
+```
+
+Each separate test module can also be executed individually, for example:
+
+```bash
+node test/modules/toFraction
+```
+
+To run the tests in a browser, open *test/test.html*.
+
+## Minify
+
+Two minification examples:
+
+Using [uglify-js](https://github.com/mishoo/UglifyJS) to minify the *decimal.js* file:
+
+```bash
+npm install uglify-js -g
+uglifyjs decimal.js --source-map url=decimal.min.js.map -c -m -o decimal.min.js
+```
+
+Using [terser](https://github.com/terser/terser) to minify the ES module version, *decimal.mjs*:
+
+```bash
+npm install terser -g
+terser decimal.mjs --source-map url=decimal.min.mjs.map -c -m --toplevel -o decimal.min.mjs
+```
+
+```js
+import Decimal from './decimal.min.mjs';
+```
+
+## Licence
+
+[The MIT Licence (Expat).](LICENCE.md)

node_modules/decimal.js/decimal.d.ts

@@ -0,0 +1,299 @@
+// Type definitions for decimal.js >=7.0.0
+// Project: https://github.com/MikeMcl/decimal.js
+// Definitions by: Michael Mclaughlin <https://github.com/MikeMcl>
+// Definitions: https://github.com/MikeMcl/decimal.js
+//
+// Documentation: http://mikemcl.github.io/decimal.js/
+//
+// Exports:
+//
+//   class     Decimal (default export)
+//   type      Decimal.Constructor
+//   type      Decimal.Instance
+//   type      Decimal.Modulo
+//   type      Decimal.Rounding
+//   type      Decimal.Value
+//   interface Decimal.Config
+//
+// Example (alternative syntax commented-out):
+//
+//   import {Decimal} from "decimal.js"
+//   //import Decimal from "decimal.js"
+//
+//   let r: Decimal.Rounding = Decimal.ROUND_UP;
+//   let c: Decimal.Configuration = {precision: 4, rounding: r};
+//   Decimal.set(c);
+//   let v: Decimal.Value = '12345.6789';
+//   let d: Decimal = new Decimal(v);
+//   //let d: Decimal.Instance = new Decimal(v);
+//
+// The use of compiler option `--strictNullChecks` is recommended.
+
+export default Decimal;
+
+export namespace Decimal {
+  export type Constructor = typeof Decimal;
+  export type Instance = Decimal;
+  export type Rounding = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8;
+  export type Modulo = Rounding | 9;
+  export type Value = string | number | Decimal;
+
+  // http://mikemcl.github.io/decimal.js/#constructor-properties
+  export interface Config {
+    precision?: number;
+    rounding?: Rounding;
+    toExpNeg?: number;
+    toExpPos?: number;
+    minE?: number;
+    maxE?: number;
+    crypto?: boolean;
+    modulo?: Modulo;
+    defaults?: boolean;
+  }
+}
+
+export declare class Decimal {
+  readonly d: number[];
+  readonly e: number;
+  readonly s: number;
+
+  constructor(n: Decimal.Value);
+
+  absoluteValue(): Decimal;
+  abs(): Decimal;
+
+  ceil(): Decimal;
+  
+  clampedTo(min: Decimal.Value, max: Decimal.Value): Decimal;
+  clamp(min: Decimal.Value, max: Decimal.Value): Decimal;
+
+  comparedTo(n: Decimal.Value): number;
+  cmp(n: Decimal.Value): number;
+
+  cosine(): Decimal;
+  cos(): Decimal;
+
+  cubeRoot(): Decimal;
+  cbrt(): Decimal;
+
+  decimalPlaces(): number;
+  dp(): number;
+
+  dividedBy(n: Decimal.Value): Decimal;
+  div(n: Decimal.Value): Decimal;
+
+  dividedToIntegerBy(n: Decimal.Value): Decimal;
+  divToInt(n: Decimal.Value): Decimal;
+
+  equals(n: Decimal.Value): boolean;
+  eq(n: Decimal.Value): boolean;
+
+  floor(): Decimal;
+
+  greaterThan(n: Decimal.Value): boolean;
+  gt(n: Decimal.Value): boolean;
+
+  greaterThanOrEqualTo(n: Decimal.Value): boolean;
+  gte(n: Decimal.Value): boolean;
+
+  hyperbolicCosine(): Decimal;
+  cosh(): Decimal;
+
+  hyperbolicSine(): Decimal;
+  sinh(): Decimal;
+
+  hyperbolicTangent(): Decimal;
+  tanh(): Decimal;
+
+  inverseCosine(): Decimal;
+  acos(): Decimal;
+
+  inverseHyperbolicCosine(): Decimal;
+  acosh(): Decimal;
+
+  inverseHyperbolicSine(): Decimal;
+  asinh(): Decimal;
+
+  inverseHyperbolicTangent(): Decimal;
+  atanh(): Decimal;
+
+  inverseSine(): Decimal;
+  asin(): Decimal;
+
+  inverseTangent(): Decimal;
+  atan(): Decimal;
+
+  isFinite(): boolean;
+
+  isInteger(): boolean;
+  isInt(): boolean;
+
+  isNaN(): boolean;
+
+  isNegative(): boolean;
+  isNeg(): boolean;
+
+  isPositive(): boolean;
+  isPos(): boolean;
+
+  isZero(): boolean;
+
+  lessThan(n: Decimal.Value): boolean;
+  lt(n: Decimal.Value): boolean;
+
+  lessThanOrEqualTo(n: Decimal.Value): boolean;
+  lte(n: Decimal.Value): boolean;
+
+  logarithm(n?: Decimal.Value): Decimal;
+  log(n?: Decimal.Value): Decimal;
+
+  minus(n: Decimal.Value): Decimal;
+  sub(n: Decimal.Value): Decimal;
+
+  modulo(n: Decimal.Value): Decimal;
+  mod(n: Decimal.Value): Decimal;
+
+  naturalExponential(): Decimal;
+  exp(): Decimal;
+
+  naturalLogarithm(): Decimal;
+  ln(): Decimal;
+
+  negated(): Decimal;
+  neg(): Decimal;
+
+  plus(n: Decimal.Value): Decimal;
+  add(n: Decimal.Value): Decimal;
+
+  precision(includeZeros?: boolean): number;
+  sd(includeZeros?: boolean): number;
+
+  round(): Decimal;
+
+  sine() : Decimal;
+  sin() : Decimal;
+
+  squareRoot(): Decimal;
+  sqrt(): Decimal;
+
+  tangent() : Decimal;
+  tan() : Decimal;
+
+  times(n: Decimal.Value): Decimal;
+  mul(n: Decimal.Value) : Decimal;
+
+  toBinary(significantDigits?: number): string;
+  toBinary(significantDigits: number, rounding: Decimal.Rounding): string;
+
+  toDecimalPlaces(decimalPlaces?: number): Decimal;
+  toDecimalPlaces(decimalPlaces: number, rounding: Decimal.Rounding): Decimal;
+  toDP(decimalPlaces?: number): Decimal;
+  toDP(decimalPlaces: number, rounding: Decimal.Rounding): Decimal;
+
+  toExponential(decimalPlaces?: number): string;
+  toExponential(decimalPlaces: number, rounding: Decimal.Rounding): string;
+
+  toFixed(decimalPlaces?: number): string;
+  toFixed(decimalPlaces: number, rounding: Decimal.Rounding): string;
+
+  toFraction(max_denominator?: Decimal.Value): Decimal[];
+
+  toHexadecimal(significantDigits?: number): string;
+  toHexadecimal(significantDigits: number, rounding: Decimal.Rounding): string;
+  toHex(significantDigits?: number): string;
+  toHex(significantDigits: number, rounding?: Decimal.Rounding): string;
+
+  toJSON(): string;
+
+  toNearest(n: Decimal.Value, rounding?: Decimal.Rounding): Decimal;
+
+  toNumber(): number;
+
+  toOctal(significantDigits?: number): string;
+  toOctal(significantDigits: number, rounding: Decimal.Rounding): string;
+
+  toPower(n: Decimal.Value): Decimal;
+  pow(n: Decimal.Value): Decimal;
+
+  toPrecision(significantDigits?: number): string;
+  toPrecision(significantDigits: number, rounding: Decimal.Rounding): string;
+
+  toSignificantDigits(significantDigits?: number): Decimal;
+  toSignificantDigits(significantDigits: number, rounding: Decimal.Rounding): Decimal;
+  toSD(significantDigits?: number): Decimal;
+  toSD(significantDigits: number, rounding: Decimal.Rounding): Decimal;
+
+  toString(): string;
+
+  truncated(): Decimal;
+  trunc(): Decimal;
+
+  valueOf(): string;
+
+  static abs(n: Decimal.Value): Decimal;
+  static acos(n: Decimal.Value): Decimal;
+  static acosh(n: Decimal.Value): Decimal;
+  static add(x: Decimal.Value, y: Decimal.Value): Decimal;
+  static asin(n: Decimal.Value): Decimal;
+  static asinh(n: Decimal.Value): Decimal;
+  static atan(n: Decimal.Value): Decimal;
+  static atanh(n: Decimal.Value): Decimal;
+  static atan2(y: Decimal.Value, x: Decimal.Value): Decimal;
+  static cbrt(n: Decimal.Value): Decimal;
+  static ceil(n: Decimal.Value): Decimal;
+  static clamp(n: Decimal.Value, min: Decimal.Value, max: Decimal.Value): Decimal;
+  static clone(object?: Decimal.Config): Decimal.Constructor;
+  static config(object: Decimal.Config): Decimal.Constructor;
+  static cos(n: Decimal.Value): Decimal;
+  static cosh(n: Decimal.Value): Decimal;
+  static div(x: Decimal.Value, y: Decimal.Value): Decimal;
+  static exp(n: Decimal.Value): Decimal;
+  static floor(n: Decimal.Value): Decimal;
+  static hypot(...n: Decimal.Value[]): Decimal;
+  static isDecimal(object: any): object is Decimal;
+  static ln(n: Decimal.Value): Decimal;
+  static log(n: Decimal.Value, base?: Decimal.Value): Decimal;
+  static log2(n: Decimal.Value): Decimal;
+  static log10(n: Decimal.Value): Decimal;
+  static max(...n: Decimal.Value[]): Decimal;
+  static min(...n: Decimal.Value[]): Decimal;
+  static mod(x: Decimal.Value, y: Decimal.Value): Decimal;
+  static mul(x: Decimal.Value, y: Decimal.Value): Decimal;
+  static noConflict(): Decimal.Constructor;   // Browser only
+  static pow(base: Decimal.Value, exponent: Decimal.Value): Decimal;
+  static random(significantDigits?: number): Decimal;
+  static round(n: Decimal.Value): Decimal;
+  static set(object: Decimal.Config): Decimal.Constructor;
+  static sign(n: Decimal.Value): number;
+  static sin(n: Decimal.Value): Decimal;
+  static sinh(n: Decimal.Value): Decimal;
+  static sqrt(n: Decimal.Value): Decimal;
+  static sub(x: Decimal.Value, y: Decimal.Value): Decimal;
+  static sum(...n: Decimal.Value[]): Decimal;
+  static tan(n: Decimal.Value): Decimal;
+  static tanh(n: Decimal.Value): Decimal;
+  static trunc(n: Decimal.Value): Decimal;
+
+  static readonly default?: Decimal.Constructor;
+  static readonly Decimal?: Decimal.Constructor;
+
+  static readonly precision: number;
+  static readonly rounding: Decimal.Rounding;
+  static readonly toExpNeg: number;
+  static readonly toExpPos: number;
+  static readonly minE: number;
+  static readonly maxE: number;
+  static readonly crypto: boolean;
+  static readonly modulo: Decimal.Modulo;
+
+  static readonly ROUND_UP: 0;
+  static readonly ROUND_DOWN: 1;
+  static readonly ROUND_CEIL: 2;
+  static readonly ROUND_FLOOR: 3;
+  static readonly ROUND_HALF_UP: 4;
+  static readonly ROUND_HALF_DOWN: 5;
+  static readonly ROUND_HALF_EVEN: 6;
+  static readonly ROUND_HALF_CEIL: 7;
+  static readonly ROUND_HALF_FLOOR: 8;
+  static readonly EUCLID: 9;
+}

node_modules/decimal.js/package.json

@@ -0,0 +1,55 @@
+{
+  "name": "decimal.js",
+  "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",
+      "import": "./decimal.mjs",
+      "require": "./decimal.js"
+    },
+    "./decimal.mjs": "./decimal.mjs",
+    "./decimal.js": "./decimal.js",
+    "./package.json": "./package.json",
+    "./decimal": {
+      "types": "./decimal.d.ts",
+      "import": "./decimal.mjs",
+      "require": "./decimal.js"
+    }
+  },
+  "author": {
+    "name": "Michael Mclaughlin",
+    "email": "M8ch88l@gmail.com"
+  },
+  "license": "MIT",
+  "scripts": {
+    "test": "node ./test/test.js"
+  },
+  "types": "decimal.d.ts",
+  "files": [
+    "decimal.js",
+    "decimal.mjs",
+    "decimal.d.ts"
+  ]
+}

package-lock.json

@@ -0,0 +1,24 @@
+{
+  "name": "material_applet",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "dependencies": {
+        "decimal.js": "^10.4.3"
+      }
+    },
+    "node_modules/decimal.js": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
+      "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA=="
+    }
+  },
+  "dependencies": {
+    "decimal.js": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
+      "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA=="
+    }
+  }
+}

package.json

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "decimal.js": "^10.4.3"
+  }
+}

pages/market/index.vue

@@ -1,12 +1,5 @@
 <template>
-	<view class="content">
-		<view class="top" v-if="list.length !=0">
-			<view class="text_1">
-				<checkbox class="checkbox" @click="selectAll(false)" :checked="isAll">全选</checkbox>
-			</view>
-			<view class="text_2" v-if="num==0" @click="edit(1)">编辑</view>
-			<view class="text_2" v-if="num==1" @click="edit(0)">完成</view>
-		</view>
+	<view class="main">
 		<view class="one" v-if="list.length==0&&user._id">
 			<view class="logo"><text class="iconfont icon-gouwuche"></text></view>
 			<view class="one_1">购物车空空如也~</view>
@@ -14,42 +7,49 @@
 				<button type="primary" size="mini" @click="toCommon('/pages/home/index')">去逛逛</button>
 			</view>
 		</view>
-		<view class="two" v-if="list.length !=0">
+		<view class="two" v-else>
+			<view class="text_1">
+				<checkbox class="checkbox" @click="selectAll(false)" :checked="isAll">全选</checkbox>
+			</view>
+			<view class="text_2" v-if="num==0" @click="edit(1)">编辑</view>
+			<view class="text_2" v-if="num==1" @click="edit(0)">完成</view>
+		</view>
+		<view class="thr" v-if="list.length!=0&&user._id">
 			<scroll-view scroll-y="true" class="scroll-view">
 				<view class="list-scroll-view">
 					<checkbox-group name="checkbox" @change="marketChange">
 						<view class="list" v-for="(item, index) in list" :key="index">
-							<view class="list_2">
+							<view class="list_1">
 								<view class="title">
-									<checkbox :value="item.shop" :checked="item.check">
+									<checkbox :value="item.supplier._id" :checked="item.check">
 										<text class="iconfont icon-shangdian"></text>
-										{{item.shop_name}}
+										{{item.supplier.name}}
 									</checkbox>
 								</view>
 								<checkbox-group name="checkbox" @change="goodsChange">
-									<view class="content" v-for="gs in item.goods" :key="gs.goodsSpec_id">
+									<view class="content" v-for="gs in item.list" :key="gs.specs._id">
 										<view class="box">
-											<checkbox :value="gs.goodsSpec_id" :checked="gs.check" />
+											<checkbox :value="gs.specs._id" :checked="gs.check" />
 										</view>
 										<view class="img">
 											<image :src="getFile(gs)"></image>
 										</view>
 										<view class="one_1" v-if="num==0"
-											@click="toCommon('/pagesHome/order/detail',gs)">
-											<view class="name">{{gs.goods_name}}</view>
+											@click="toCommon('/pagesGoods/index/index',gs)">
+											<view class="name textOver">{{gs.goods.name}}</view>
 											<view class="info">
-												<view class="title_1" v-if="gs.goodsSpec_name">
-													<text>规格:{{gs.goodsSpec_name}}</text>
+												<view class="title_1 textOver" v-if="gs.specs.name">
+													<text>规格:{{gs.specs.name}}</text>
 												</view>
 											</view>
 										</view>
 										<view class="money" v-if="num==0">
-											<view>¥{{gs.price}}</view>
+											<view>¥{{gs.money}}</view>
 											<view>x{{gs.num}}</view>
 										</view>
 										<view class="num" v-if="num==1">
 											<uni-number-box @change="changeValue(gs)" name="num" value="gs" :min="1"
-												v-model="gs.num" />
+												:max="gs.specs.num" v-model="gs.num" />
 										</view>
 										<view class="del" v-if="num==1">
 											<text class="iconfont icon-del-copy" @click="toDel(gs)"></text>
@@ -62,8 +62,8 @@
 				</view>
 			</scroll-view>
 		</view>
-		<view class="foot" v-if="list.length !=0">
-			<view class="total">总价：<text>￥{{totalMoney}}(不含运费)</text></view>
+		<view class="foot" v-if="list.length!=0&&user._id">
+			<view class="total">总价：<text>￥{{totalMoney}}</text></view>
 			<view class="btn" v-if="hasCheck()">
 				<button type="primary" size="mini" @click="toSettle()" v-if="num==0">提交订单</button>
 				<button type="primary" size="mini" @click="toDel()" v-if="num==1">删除</button>
@@ -131,7 +131,7 @@
 				for (const val of list) {
 					let a = isAll ? false : true;
 					val.check = a;
-					for (let s of val.goods) {
+					for (let s of val.list) {
 						s.check = a
 					}
 					data.push(val);
@@ -145,18 +145,15 @@
 			// 选择店铺
 			marketChange(e) {
 				const that = this;
-				const list = this.list;
+				const list = that.list;
 				const {
 					value
 				} = e.detail;
 				for (const p1 of list) {
-					let p2;
-					// 判断是套装还是正常商品
-					if (p1.is_set == '0') p2 = value.find((i) => i == p1._id);
-					else p2 = value.find((i) => i == p1.shop);
+					let p2 = value.find((i) => i == p1.supplier._id);
 					let a = p2 ? true : false;
 					p1.check = a;
-					for (let s of p1.goods) {
+					for (let s of p1.list) {
 						s.check = a
 					}
 				}
@@ -169,13 +166,9 @@
 			marketAllChange() {
 				const that = this;
 				let list = that.list;
-				for (let val of list) {
-					if (val.check == true) {
-						that.$set(that, `isAll`, true)
-					} else {
-						that.$set(that, `isAll`, false)
-					}
-				}
+				let check = list.find((i) => i.check == false);
+				if (check) that.$set(that, `isAll`, false)
+				else that.$set(that, `isAll`, true)
 				that.$set(that, `list`, list)
 				// 计算总额
 				that.countMoney();
@@ -187,19 +180,28 @@
 				const {
 					value
 				} = e.detail;
-				let shop = list.find(f => f.goods.find(i => value.find(s => s == i.goodsSpec_id)))
+				let shop = list.find(f => f.list.find(i => value.find(s => s == i.specs._id)))
 				if (shop) {
-					for (let val of shop.goods) {
-						let p2 = value.find((i) => i == val.goodsSpec_id);
+					for (let val of shop.list) {
+						let p2 = value.find((i) => i == val.specs._id);
 						if (p2) val.check = true;
 						else val.check = false;
 					}
 				} else {
 					list = list.map(i => {
-						i.goods = i.goods.map(g => ({
-							...g,
-							check: false
-						}))
+						if (i.check == false) {
+							i.list = i.list.map(g => ({
+								...g,
+								check: false
+							}))
+						} else {
+							if (i.list.length == 1) {
+								i.list = i.list.map(g => ({
+									...g,
+									check: false
+								}))
+							}
+						}
 						return i;
 					})
 				}
@@ -214,21 +216,21 @@
 				const that = this;
 				let list = that.list;
 				list = list.map(i => {
-					const isAllSelect = i.goods.every(f => f.check);
+					const isAllSelect = i.list.every(f => f.check);
 					if (isAllSelect) i.check = true;
 					else i.check = false;
 					return i;
 				})
 				const allSelect = list.every(e => e.check)
-				if (allSelect) this.$set(this, `isAll`, true)
-				else this.$set(this, `isAll`, false)
+				if (allSelect) that.$set(that, `isAll`, true)
+				else that.$set(that, `isAll`, false)
 				// 计算总额
 				that.countMoney();
 			},
 			// 加减商品数量
 			async changeValue(value) {
 				const that = this;
-				this.$nextTick(async () => {
+				that.$nextTick(async () => {
 					let res;
 					const {
 						goodsSpec_id: goodsSpecId,
@@ -260,7 +262,8 @@
 			},
 			// 删除, 接口,购物车删除,然后将该数据移除
 			async toDel(e) {
-				let list = this.list;
+				const that = this;
+				let list = that.list;
 				let set_list = [];
 				let goods_list = [];
 				uni.showModal({
@@ -269,7 +272,7 @@
 					success: async (res) => {
 						if (!res.confirm) return
 						if (e?.cart_id) {
-							const result = await this.$api(`/cart/${e.cart_id}`, 'Delete');
+							const result = await that.$api(`/cart/${e.cart_id}`, 'Delete');
 							if (result.errcode === 0) {
 								// 判断是套装还是正常商品
 								set_list = list.filter(i => i.is_set == '0')
@@ -279,11 +282,11 @@
 									...i,
 									goods: i.goods.filter(f => f.cart_id !== e.cart_id)
 								}))
-								this.$set(this, `list`, [...set_list, ...goods_list]);
+								that.$set(that, `list`, [...set_list, ...goods_list]);
 								// 检查店铺内是否还有商品
-								this.checkShopGoodsExist();
+								that.checkShopGoodsExist();
 								// 计算总额
-								this.countMoney();
+								that.countMoney();
 							}
 						} else {
 							let goodsList = [];
@@ -327,9 +330,10 @@
 			},
 			//检查店铺内是否还有商品
 			checkShopGoodsExist() {
-				let list = this.list;
-				list = list.filter(f => f.goods && f.goods.length > 0)
-				this.$set(this, `list`, list);
+				const that = this;
+				let list = that.list;
+				list = list.filter(f => f.list && f.list.length > 0)
+				that.$set(that `list`, list);
 			},
 			// 计算总额
 			countMoney() {
@@ -339,26 +343,21 @@
 				// 渲染结束执行下面方法
 				that.$nextTick(() => {
 					for (const val of list) {
-						// 判断是套装还是正常商品
-						if (val.is_set == '0') {
-							if (val.check == true) {
-								let total = that.$multiply(val.sell_money, val.num);
+						for (let as of val.list) {
+							if (as.check == true) {
+								let total = that.$multiply(as.money, as.num);
 								totalMoney += Number(total);
 							}
-						} else {
-							for (let s of val.goods) {
-								if (s.check == true) {
-									let total = that.$multiply(s.price, s.num);
-									totalMoney += Number(total);
-							}
-								}
 						}
 					}
 					that.$set(that, `totalMoney`, totalMoney.toFixed(2))
 				})
 			},
+			// 显示图片处理
 			getFile(data) {
-				const file = data.file;
+				let file
+				if (data.specs.file) file = data.specs.file
+				else file = data.goods.file;
 				if (!file) return '';
 				if (file.length && file.length > 0) return file[0].url
 			},
@@ -368,19 +367,10 @@
 				let goodsList = [];
 				let cartIds = [];
 				for (let val of this.list) {
-					// 判断是套装还是正常商品
-					if (val.is_set == '0') goodsList.push(val)
-					else goodsList.push(val.goods)
+					goodsList.push(val)
 				}
 				for (let val of goodsList) {
-					// 判断是套装还是正常商品
-					if (val.is_set == '0') {
-						if (val.check) cartIds.push(val.cart_id)
-					} else {
-						for (let set of val) {
-							if (set.check) cartIds.push(set.cart_id)
-						}
-					}
+					if (val.check) cartIds.push(val.cart_id)
 				}
 				const res = await this.$api(`/util/checkCartBuy`, 'POST', {
 					cartIds
@@ -399,12 +389,12 @@
 			},
 			// 是否选中商品,控制提交订单按钮
 			hasCheck() {
-				return this.list.some(e => e.goods.some(eg => eg.check))
+				return this.list.some(e => e.list.some(eg => eg.check))
 			},
 			// 公共跳转
 			toCommon(route, e) {
 				uni.navigateTo({
-					url: `${route}?id=${e && e.goods_id}`
+					url: `${route}?id=${e && e.goods._id}`
 				})
 			},
 		}
@@ -412,31 +402,13 @@
 </script>
 
 <style lang="scss">
-	.content {
+	.main {
 		display: flex;
 		flex-direction: column;
 		width: 100vw;
-		height: 92vh;
+		height: 100vh;
 		background-color: var(--footColor);
 
-		.top {
-			display: flex;
-			flex-direction: row;
-			background-color: var(--mainColor);
-			height: 35px;
-			margin: 0 0 4px 0;
-			padding: 5px 4vw;
-
-			.text_1 {
-				flex-grow: 1;
-				line-height: 30px;
-			}
-
-			.text_2 {
-				line-height: 35px;
-			}
-		}
-
 		.one {
 			text-align: center;
 			margin: 2vw 0;
@@ -459,107 +431,31 @@
 		}
 
 		.two {
+			display: flex;
+			background-color: var(--mainColor);
+			height: 35px;
+			margin: 0 0 4px 0;
+			padding: 5px 4vw;
+
+			.text_1 {
+				flex-grow: 1;
+				line-height: 30px;
+			}
+
+			.text_2 {
+				line-height: 35px;
+			}
+		}
+
+		.thr {
 			position: relative;
 			flex-grow: 1;
 			margin: 0 2vw;
 
 			.list_1 {
 				background-color: var(--mainColor);
-				margin: 2vw 0 2vw 0;
-				padding: 2vw 3vw;
-				border-radius: 4px;
-
-				.title {
-					border-bottom: 1px solid var(--fcColor);
-					padding: 0 0 2vw 0;
-					font-size: var(--font18Size);
-
-					text {
-						margin: 0 1vw;
-					}
-				}
-
-				.content {
-					display: flex;
-					flex-direction: row;
-					padding: 2vw 0;
-					font-size: var(--font16Size);
-					border-bottom: 1px dashed var(--fcColor);
-
-					.img {
-						width: 20vw;
-						height: 20vw;
-						border-radius: 2vw;
-						border: 1px solid var(--fcColor);
-
-						image {
-							width: 20vw;
-							height: 20vw;
-						}
-					}
-
-					.one_1 {
-						margin: 0 2.5vw;
-						flex-grow: 1;
-
-
-						.info {
-							width: 100%;
-							display: flex;
-							flex-direction: row;
-
-							.title_1 {
-								font-size: 12px;
-								color: #666;
-								margin-top: 10px;
-
-								text {
-									background-color: #eee;
-									padding: 5px;
-								}
-							}
-						}
-					}
-
-					.money {
-						font-size: 14px;
-						margin-top: 2vw;
-						text-align: right;
-						flex-grow: 1;
-					}
-				}
-
-				.total {
-					display: flex;
-					justify-content: space-between;
-					padding: 1vw;
-
-					.total_1 {
-						font-size: 20px;
-						color: var(--fFB1Color);
-
-						text {
-							font-size: 12px;
-
-						}
-					}
-
-					.total_2 {
-						display: flex;
-						justify-content: space-between;
-						align-items: center;
-
-						.del {
-							margin: 0 0 0 3vw;
-						}
-					}
-				}
-			}
-
-			.list_2 {
-				background-color: var(--mainColor);
-				margin: 2vw 0 2vw 0;
-				padding: 2vw 3vw;
+				margin: 2vw 0;
+				padding: 2vw 2.5vw;
 				border-radius: 4px;
 
 				.title {
@@ -574,7 +470,6 @@
 
 				.content {
 					display: flex;
-					flex-direction: row;
 					padding: 2vw 0;
 					font-size: var(--font16Size);
 					border-bottom: 1px dashed var(--fcColor);
@@ -596,16 +491,16 @@
 					}
 
 					.one_1 {
-						margin: 0 2.5vw;
+						width: 49vw;
+						margin: 0 2vw;
 						flex-grow: 1;
 
 						.info {
 							width: 100%;
 							display: flex;
-							flex-direction: row;
 
 							.title_1 {
-								font-size: 12px;
+								font-size: var(--font12Size);
 								color: #666;
 								margin-top: 10px;
 
@@ -614,36 +509,17 @@
 									padding: 5px;
 								}
 							}
-
-							.gift {
-								margin: 2vw 1vw 0 0;
-								font-size: 12px;
-								color: #FFA500;
-								border: 1px solid #FFA500;
-								border-radius: 5px;
-								padding: 0 1vw;
-							}
-
-							.act {
-								margin: 2vw 0 0 0;
-								font-size: 12px;
-								border-radius: 5px;
-								padding: 0 1vw;
-								border: 1px solid var(--fFB1Color);
-								color: var(--fFB1Color);
-							}
 						}
 					}
 
 					.money {
-						margin-top: 2vw;
 						text-align: right;
 						flex-grow: 1;
 					}
 
 					.num {
 						margin: 6vw 4vw;
-						font-size: 20px;
+						font-size: var(--font20Size);
 					}
 
 					.del {
@@ -658,9 +534,8 @@
 		.foot {
 			background-color: var(--fffColor);
 			display: flex;
-			flex-direction: row;
 			justify-content: space-between;
-			height: 44px;
+			height: 45px;
 			padding: 0 0 0 6vw;
 			border-right: 1px solid var(--f99Color);
 
@@ -671,21 +546,18 @@
 				line-height: 40px;
 
 				text {
-					color: var(--fFB1Color);
+					color: var(--f3CColor);
 				}
 			}
 
 			.btn {
 				button {
 					width: 30vw;
-					height: 44px;
-					line-height: 44px;
+					height: 45px;
+					line-height: 45px;
 					border-radius: 0px;
-					background-color: var(--fFB1Color);
-					text-align: center;
+					background-color: var(--f3CColor);
 					font-weight: normal;
-					font-size: var(--font15Size);
-					color: var(--fffColor);
 				}
 			}
 		}
@@ -715,8 +587,8 @@
 
 	// 复选框选中样式
 	checkbox .wx-checkbox-input.wx-checkbox-input-checked {
-		border-color: var(--fFB1Color);
-		background-color: var(--fFB1Color);
+		border-color: var(--f3CColor);
+		background-color: var(--f3CColor);
 	}
 
 	// 复选框选中之后对号的样式

pagesGoods/index/index.vue

@@ -228,6 +228,7 @@
 						spec: specsInfo._id,
 						goods: info._id,
 						num: that.buy_num,
+						money: parseFloat(specsInfo.money) * that.buy_num
 					}
 					res = await that.$api(`/Cart`, 'POST', obj)
 					if (res.errcode == '0') {

unpackage/dist/dev/mp-weixin/.gitignore

@@ -0,0 +1,14 @@
+# Windows
+[Dd]esktop.ini
+Thumbs.db
+$RECYCLE.BIN/
+
+# macOS
+.DS_Store
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+
+# Node.js
+node_modules/

unpackage/dist/dev/mp-weixin/pages/market/index.wxss

@@ -1,234 +1,136 @@
 @charset "UTF-8";
 /* 水平间距 */
 /* 水平间距 */
-.content {
+.main {
   display: flex;
   flex-direction: column;
   width: 100vw;
-  height: 92vh;
+  height: 100vh;
   background-color: var(--footColor);
 }
-.content .top {
-  display: flex;
-  flex-direction: row;
-  background-color: var(--mainColor);
-  height: 35px;
-  margin: 0 0 4px 0;
-  padding: 5px 4vw;
-}
-.content .top .text_1 {
-  flex-grow: 1;
-  line-height: 30px;
-}
-.content .top .text_2 {
-  line-height: 35px;
-}
-.content .one {
+.main .one {
   text-align: center;
   margin: 2vw 0;
 }
-.content .one .logo {
+.main .one .logo {
   margin: 10vw 0 2vw 0;
 }
-.content .one .logo .iconfont {
+.main .one .logo .iconfont {
   font-size: 35vw;
 }
-.content .one .one_1 {
+.main .one .one_1 {
   margin: 3vw 0;
 }
-.content .one button {
+.main .one button {
   background-color: var(--f3CColor);
 }
-.content .two {
-  position: relative;
-  flex-grow: 1;
-  margin: 0 2vw;
-}
-.content .two .list_1 {
-  background-color: var(--mainColor);
-  margin: 2vw 0 2vw 0;
-  padding: 2vw 3vw;
-  border-radius: 4px;
-}
-.content .two .list_1 .title {
-  border-bottom: 1px solid var(--fcColor);
-  padding: 0 0 2vw 0;
-  font-size: var(--font18Size);
-}
-.content .two .list_1 .title text {
-  margin: 0 1vw;
-}
-.content .two .list_1 .content {
+.main .two {
   display: flex;
-  flex-direction: row;
-  padding: 2vw 0;
-  font-size: var(--font16Size);
-  border-bottom: 1px dashed var(--fcColor);
-}
-.content .two .list_1 .content .img {
-  width: 20vw;
-  height: 20vw;
-  border-radius: 2vw;
-  border: 1px solid var(--fcColor);
-}
-.content .two .list_1 .content .img image {
-  width: 20vw;
-  height: 20vw;
+  background-color: var(--mainColor);
+  height: 35px;
+  margin: 0 0 4px 0;
+  padding: 5px 4vw;
 }
-.content .two .list_1 .content .one_1 {
-  margin: 0 2.5vw;
+.main .two .text_1 {
   flex-grow: 1;
+  line-height: 30px;
 }
-.content .two .list_1 .content .one_1 .info {
-  width: 100%;
-  display: flex;
-  flex-direction: row;
-}
-.content .two .list_1 .content .one_1 .info .title_1 {
-  font-size: 12px;
-  color: #666;
-  margin-top: 10px;
-}
-.content .two .list_1 .content .one_1 .info .title_1 text {
-  background-color: #eee;
-  padding: 5px;
+.main .two .text_2 {
+  line-height: 35px;
 }
-.content .two .list_1 .content .money {
-  font-size: 14px;
-  margin-top: 2vw;
-  text-align: right;
+.main .thr {
+  position: relative;
   flex-grow: 1;
+  margin: 0 2vw;
 }
-.content .two .list_1 .total {
-  display: flex;
-  justify-content: space-between;
-  padding: 1vw;
-}
-.content .two .list_1 .total .total_1 {
-  font-size: 20px;
-  color: var(--fFB1Color);
-}
-.content .two .list_1 .total .total_1 text {
-  font-size: 12px;
-}
-.content .two .list_1 .total .total_2 {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-.content .two .list_1 .total .total_2 .del {
-  margin: 0 0 0 3vw;
-}
-.content .two .list_2 {
+.main .thr .list_1 {
   background-color: var(--mainColor);
-  margin: 2vw 0 2vw 0;
-  padding: 2vw 3vw;
+  margin: 2vw 0;
+  padding: 2vw 2.5vw;
   border-radius: 4px;
 }
-.content .two .list_2 .title {
+.main .thr .list_1 .title {
   border-bottom: 1px solid var(--fcColor);
   padding: 0 0 2vw 0;
   font-size: var(--font18Size);
 }
-.content .two .list_2 .title text {
+.main .thr .list_1 .title text {
   margin: 0 1vw;
 }
-.content .two .list_2 .content {
+.main .thr .list_1 .content {
   display: flex;
-  flex-direction: row;
   padding: 2vw 0;
   font-size: var(--font16Size);
   border-bottom: 1px dashed var(--fcColor);
 }
-.content .two .list_2 .content .box {
+.main .thr .list_1 .content .box {
   line-height: 20vw;
 }
-.content .two .list_2 .content .img {
+.main .thr .list_1 .content .img {
   width: 20vw;
   height: 20vw;
   border-radius: 2vw;
   border: 1px solid var(--fcColor);
 }
-.content .two .list_2 .content .img image {
+.main .thr .list_1 .content .img image {
   width: 20vw;
   height: 20vw;
 }
-.content .two .list_2 .content .one_1 {
-  margin: 0 2.5vw;
+.main .thr .list_1 .content .one_1 {
+  width: 49vw;
+  margin: 0 2vw;
   flex-grow: 1;
 }
-.content .two .list_2 .content .one_1 .info {
+.main .thr .list_1 .content .one_1 .info {
   width: 100%;
   display: flex;
-  flex-direction: row;
 }
-.content .two .list_2 .content .one_1 .info .title_1 {
-  font-size: 12px;
+.main .thr .list_1 .content .one_1 .info .title_1 {
+  font-size: var(--font12Size);
   color: #666;
   margin-top: 10px;
 }
-.content .two .list_2 .content .one_1 .info .title_1 text {
+.main .thr .list_1 .content .one_1 .info .title_1 text {
   background-color: #eee;
   padding: 5px;
 }
-.content .two .list_2 .content .one_1 .info .gift {
-  margin: 2vw 1vw 0 0;
-  font-size: 12px;
-  color: #FFA500;
-  border: 1px solid #FFA500;
-  border-radius: 5px;
-  padding: 0 1vw;
-}
-.content .two .list_2 .content .one_1 .info .act {
-  margin: 2vw 0 0 0;
-  font-size: 12px;
-  border-radius: 5px;
-  padding: 0 1vw;
-  border: 1px solid var(--fFB1Color);
-  color: var(--fFB1Color);
-}
-.content .two .list_2 .content .money {
-  margin-top: 2vw;
+.main .thr .list_1 .content .money {
   text-align: right;
   flex-grow: 1;
 }
-.content .two .list_2 .content .num {
+.main .thr .list_1 .content .num {
   margin: 6vw 4vw;
-  font-size: 20px;
+  font-size: var(--font20Size);
 }
-.content .two .list_2 .content .del {
+.main .thr .list_1 .content .del {
   margin: 6vw 0;
   text-align: right;
   flex-grow: 1;
 }
-.content .foot {
+.main .foot {
   background-color: var(--fffColor);
   display: flex;
-  flex-direction: row;
   justify-content: space-between;
-  height: 44px;
+  height: 45px;
   padding: 0 0 0 6vw;
   border-right: 1px solid var(--f99Color);
 }
-.content .foot .total {
+.main .foot .total {
   flex-grow: 1;
   display: flex;
   align-content: flex-end;
   line-height: 40px;
 }
-.content .foot .total text {
-  color: var(--fFB1Color);
+.main .foot .total text {
+  color: var(--f3CColor);
 }
-.content .foot .btn button {
+.main .foot .btn button {
   width: 30vw;
-  height: 44px;
-  line-height: 44px;
+  height: 45px;
+  line-height: 45px;
   border-radius: 0px;
-  background-color: var(--fFB1Color);
-  text-align: center;
+  background-color: var(--f3CColor);
   font-weight: normal;
-  font-size: var(--font15Size);
-  color: var(--fffColor);
 }
 .scroll-view {
   position: absolute;
@@ -249,8 +151,8 @@ checkbox .wx-checkbox-input {
   background-color: var(--mainColor);
 }
 checkbox .wx-checkbox-input.wx-checkbox-input-checked {
-  border-color: var(--fFB1Color);
-  background-color: var(--fFB1Color);
+  border-color: var(--f3CColor);
+  background-color: var(--f3CColor);
 }
 checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
   color: var(--fffColor);