Merge branch 'master' of http://git.cc-lotus.info/pointToNetwork/point-app

components/mobile-frame/index.vue

@@ -31,31 +31,36 @@
 						name: '首页',
 						route: 'pages/home/index',
 						normal: require('@/static/shouye.png'),
-						active: require('@/static/shouye_1.png')
+						active: require('@/static/shouye_1.png'),
+						type: '0'
 					},
 					{
 						name: '微店',
 						route: 'pages/store/index',
 						normal: require('@/static/store.png'),
-						active: require('@/static/store_1.png')
+						active: require('@/static/store_1.png'),
+						type: '0'
 					},
 					{
-						name: '周边',
-						route: 'pages/week/index',
-						normal: require('@/static/week.png'),
-						active: require('@/static/week_1.png')
+						name: '分类',
+						route: 'pagesHome/market/type',
+						normal: require('@/static/type.png'),
+						active: require('@/static/type_1.png'),
+						type: '1'
 					},
 					{
 						name: '购物车',
 						route: 'pages/market/index',
 						normal: require('@/static/market.png'),
-						active: require('@/static/market_1.png')
+						active: require('@/static/market_1.png'),
+						type: '0'
 					},
 					{
 						name: '我的',
 						route: 'pages/my/index',
 						normal: require('@/static/my.png'),
-						active: require('@/static/my_1.png')
+						active: require('@/static/my_1.png'),
+						type: '0'
 					},
 				]
 			};

config.js

@@ -1,8 +1,7 @@
 export default {
   serverUrl: 'https://broadcast.waityou24.cn',
   // serverUrl: 'http://192.168.223.1:12111',
-
-  logoUrl: 'https://broadcast.waityou24.cn/files/court/elimg/20220913094838.jpg',
+  logoUrl: 'https://broadcast.waityou24.cn/files/point/indexModule/20221010124133.png',
   china: [
     //全国地址
     {

node_modules/decimal.js/LICENCE.md

@@ -1,23 +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.
-
+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

@@ -1,246 +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)
+![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

@@ -1,300 +1,300 @@
-// 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;
-  private readonly toStringTag: string;
-
-  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): Decimal;
-  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;
-}
+// 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;
+  private readonly toStringTag: string;
+
+  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): Decimal;
+  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

@@ -1,55 +1,55 @@
-{
-  "name": "decimal.js",
-  "description": "An arbitrary-precision Decimal type for JavaScript.",
-  "version": "10.4.1",
-  "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"
-  ]
-}
+{
+  "name": "decimal.js",
+  "description": "An arbitrary-precision Decimal type for JavaScript.",
+  "version": "10.4.1",
+  "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"
+  ]
+}

pages/home/index.vue

@@ -22,11 +22,11 @@
 				</view>
 				<view class="zero four">
 					<view class="recomList" v-for="(item,index) in recomList" :key="index">
-						<view class="list" v-for="(tag,indexs) in item.list" :key="indexs">
+						<view class="list" v-for="(tag,indexs) in item.list" :key="indexs" @tap="toBuy(tag)">
 							<view class="title">
 								<text>{{tag.title||'&nbsp;'}}</text>
 							</view>
-							<image class="image" :src="tag.url" mode=""></image>
+							<image class="image" :src="tag.url&&tag.url.length>0?tag.url[0].url:''" mode=""></image>
 							<view class="textOver name">
 								{{tag.name}}
 							</view>
@@ -73,62 +73,6 @@
 				btnList: [ //功能按钮
 				],
 				recomList: [ //推荐好物
-					{
-						list: [ //商品
-							{
-								title: '新品上架',
-								url: require('@/static/test.png'),
-								name: '商品名称'
-							},
-							{
-								title: '',
-								url: require('@/static/test.png'),
-								name: '商品名称'
-							},
-						]
-					},
-					{
-						list: [ //商品
-							{
-								title: '发现好货',
-								url: require('@/static/test.png'),
-								name: '商品名称'
-							},
-							{
-								title: '热销爆款',
-								url: require('@/static/test.png'),
-								name: '商品名称'
-							},
-						]
-					},
-					{
-						list: [ //商品
-							{
-								title: '天恩精选',
-								url: require('@/static/test.png'),
-								name: '商品名称'
-							},
-							{
-								title: '居家常备',
-								url: require('@/static/test.png'),
-								name: '商品名称'
-							},
-						]
-					},
-					{
-						list: [ //商品
-							{
-								title: '人气单品',
-								url: require('@/static/test.png'),
-								name: '商品名称'
-							},
-							{
-								title: '夏季畅销',
-								url: require('@/static/test.png'),
-								name: '商品名称'
-							},
-						]
-					}
 				],
 				marketList: [ //商品列表
 				],
@@ -161,6 +105,9 @@
 					});
 					that.$set(that, `btnList`, data);
 				}
+				// 推荐好货
+				res = await that.$api(`/viewGoods/iatg`, 'GET', {});
+				if (res.errcode == '0') that.$set(that, `recomList`, res.data);
 				// 首页产品列表
 				res = await that.$api(`/viewGoods/indexGoodsList`, `GET`, {
 					limit: 20
@@ -207,9 +154,15 @@
 				that.topItem = 'top'
 			},
 			toPath(e) {
-				if (e && e.route) uni.redirectTo({
-					url: `/${e.route}`
-				})
+				if (e && e.route && e.type == '0') {
+					uni.redirectTo({
+						url: `/${e.route}`
+					})
+				} else {
+					uni.navigateTo({
+						url: `/${e.route}`
+					})
+				}
 			},
 		}
 	}
@@ -227,6 +180,10 @@
 			margin: 0 0 2vw 0;
 		}
 
+		.zero:last-child {
+			margin: 0
+		}
+
 		.one {
 			background-color: var(--fFB1Color);
 			border-radius: 20px;

pages/index/index.vue

@@ -1,7 +1,9 @@
 <template>
 	<mobile-frame>
 		<view class="main">
-			系统首页
+			<view class="one">
+				<image class="logo" :src="logoUrl" mode=""></image>
+			</view>
 		</view>
 	</mobile-frame>
 </template>
@@ -10,7 +12,9 @@
 	export default {
 		components: {},
 		data() {
-			return {};
+			return {
+				logoUrl: ''
+			};
 		},
 		onLoad: function() {},
 		onShow: function() {
@@ -19,6 +23,8 @@
 		},
 		methods: {
 			search() {
+				const that = this;
+				that.$set(that, `logoUrl`, that.$config.logoUrl);
 				// 查询当前所在平台
 				uni.getSystemInfo({
 					success: async function(res) {
@@ -39,4 +45,22 @@
 </script>
 
 <style lang="scss">
+	.main {
+		display: flex;
+		flex-direction: column;
+		width: 100vw;
+		height: 100vh;
+
+		.one {
+			text-align: center;
+			margin: 40vw 0 0 0;
+
+			.logo {
+				width: 50vw;
+				height: 50vw;
+				border-radius: 90px;
+				box-shadow: 0 0 5px #f1f1f1;
+			}
+		}
+	}
 </style>

pages/login/index.vue

@@ -157,24 +157,21 @@
 					uni.getUserProfile({
 						desc: '用于展示',
 						success: async function(res) {
-							console.log('1');
 							let parmas = {
 								openid: that.openid,
 								icon: [{
 									url: res.userInfo.avatarUrl
 								}],
-								name: res.userInfo.nickName
+								name: res.userInfo.nickName,
 							}
 							const arr = await that.$api(`/user`, 'POST', parmas);
-							if (res.errcode == '0') {
-								console.log('2');
+							if (arr.errcode == '0') {
 								const agg = await that.$api(`/user/wxLogin`, 'POST', {
 									openid: that.openid
 								})
 								if (agg.errcode == '0') {
-									console.log('3');
 									uni.setStorage({
-										data: res.data,
+										data: agg.data,
 										key: 'token',
 										success: function() {
 											uni.navigateBack({
@@ -190,7 +187,8 @@
 								}
 							} else {
 								uni.showToast({
-									title: res.errmsg,
+									title: arr.errmsg,
+									icon: 'none'
 								});
 							}
 						},

pages/market/index.vue

@@ -107,9 +107,15 @@
 		},
 		methods: {
 			toPath(e) {
-				if (e && e.route) uni.redirectTo({
-					url: `/${e.route}`
-				})
+				if (e && e.route && e.type == '0') {
+					uni.redirectTo({
+						url: `/${e.route}`
+					})
+				} else {
+					uni.navigateTo({
+						url: `/${e.route}`
+					})
+				}
 			},
 			// 公共跳转
 			toCommon(route, e) {

pages/my/index.vue

@@ -28,7 +28,7 @@
 			<view class="two">
 				<view class="two_1">
 					<view class="title">我的订单</view>
-				<!-- 	<view class="title">
+					<!-- 	<view class="title">
 						<text @click="toOrder({route:'pagesMy/order/index',type:'order',status:'-0'})">全部订单</text>
 						<text class="iconfont icon-jiantouyou"></text>
 					</view> -->
@@ -45,7 +45,7 @@
 					<view class="title">{{item.title}}</view>
 					<view class="title">
 						<text v-if="user.id&&item.title=='我的积分'">{{user.integral||0}}分</text>
-						<text v-if="item.title=='客服电话'">{{serviceContaceInfo.phone||''}}</text>
+						<text v-if="item.title=='客服电话'" @tap="makePhone(serviceContaceInfo.phone)">{{serviceContaceInfo.phone||''}}</text>
 						<text class="iconfont icon-jiantouyou"></text>
 					</view>
 				</view>
@@ -167,9 +167,15 @@
 			},
 			// 底部菜单跳转
 			toPath(e) {
-				if (e && e.route) uni.redirectTo({
-					url: `/${e.route}`
-				})
+				if (e && e.route && e.type == '0') {
+					uni.redirectTo({
+						url: `/${e.route}`
+					})
+				} else {
+					uni.navigateTo({
+						url: `/${e.route}`
+					})
+				}
 			},
 			// 公共跳转
 			toCommon(e) {
@@ -212,6 +218,12 @@
 				});
 
 			},
+			// 拨打电话
+			makePhone(e) {
+				uni.makePhoneCall({
+					phoneNumber: e
+				});
+			}
 		}
 	}
 </script>

pages/store/index.vue

@@ -4,11 +4,10 @@
 			<view class="one">
 				<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage">
 					<view class="list-scroll-view">
-						微店
-				<!-- 		<view class="list" v-for="(item,index) in list" :key="index">
+						<view class="list" v-for="(item,index) in list" :key="index" @tap="toShop(item)">
 							<view class="list_1">
 								<view class="l">
-									<image class="image" :src="item.url" mode=""></image>
+									<image class="image" :src="item.logo&&item.logo.length>0?item.logo[0].url:''" mode=""></image>
 								</view>
 								<view class="c">
 									<view class="name">
@@ -25,14 +24,14 @@
 								</view>
 							</view>
 							<view class="list_2">
-								<view class="market" v-for="(tag,indexs) in item.market" :key="indexs">
-									<image class="image" :src="tag.url" mode=""></image>
+								<view class="market" v-for="(tag,indexs) in item.market" :key="indexs" @tap="toBuy(tag)">
+									<image class="image" :src="tag.file&&tag.file.length>0?tag.file[0].url:''" mode=""></image>
 									<view class="money">
-										¥{{tag.money}}
+										¥{{tag.sell_money}}
 									</view>
 								</view>
 							</view>
-						</view> -->
+						</view>
 					</view>
 				</scroll-view>
 			</view>
@@ -47,61 +46,96 @@
 				frameStyle: {
 					useBar: true
 				},
-				list: [ //
-					{
-						url: require('@/static/test.png'),
-						name: '官方自营店',
-						market_num: 12,
-						follow_num: 12,
-						is_follow: true,
-						market: [ //
-							{
-								url: require('@/static/test.png'),
-								money: 10
-							},
-							{
-								url: require('@/static/test.png'),
-								money: 10
-							},
-							{
-								url: require('@/static/test.png'),
-								money: 10
-							}
-
-						]
-					},
-					{
-						url: require('@/static/test.png'),
-						name: '官方自营店',
-						market_num: 12,
-						follow_num: 12,
-						is_follow: false,
-						market: [ //
-							{
-								url: require('@/static/test.png'),
-								money: 10
-							}
-
-						]
-					}
-				]
+				list: [],
+				total: 0,
+				page: 0,
+				skip: 0,
+				limit: 5,
 			};
 		},
-		onShow: function() {},
+		onShow: function() {
+			const that = this;
+			that.search()
+		},
 		methods: {
+			async search() {
+				const that = this;
+				let info = {
+					skip: that.skip,
+					limit: that.limit
+				}
+				const res = await that.$api(`/viewShop/microIndex`, `GET`, {
+					...info,
+				})
+				if (res.errcode == '0') {
+					let list = [...that.list, ...res.data];
+					that.$set(that, `list`, list)
+					that.$set(that, `total`, res.total)
+				} else {
+					uni.showToast({
+						title: res.errmsg,
+					});
+				}
+			},
 			// 分页
 			toPage() {
-
+				const that = this;
+				let list = that.list;
+				let limit = that.limit;
+				if (that.total > list.length) {
+					uni.showLoading({
+						title: '加载中',
+						mask: true
+					})
+					let page = that.page + 1;
+					that.$set(that, `page`, page)
+					let skip = page * limit;
+					that.$set(that, `skip`, skip)
+					that.search();
+					uni.hideLoading();
+				} else uni.showToast({
+					title: '没有更多数据了'
+				});
+			},
+			// 商铺
+			toShop(e) {
+				const that = this;
+				that.clearPage();
+				uni.navigateTo({
+					url: `/pagesHome/shop/index?id=${e._id}`
+				})
+			},
+			// 购买
+			toBuy(e) {
+				const that = this;
+				that.clearPage();
+				uni.navigateTo({
+					url: `/pagesHome/order/detail?id=${e._id}`
+				})
 			},
 			// 关注
 			toFolllow(e) {
 				console.log(e);
 			},
 			toPath(e) {
-				if (e && e.route) uni.redirectTo({
-					url: `/${e.route}`
-				})
+				if (e && e.route && e.type == '0') {
+					uni.redirectTo({
+						url: `/${e.route}`
+					})
+				} else {
+					uni.navigateTo({
+						url: `/${e.route}`
+					})
+				}
 			},
+			// 清空列表
+			clearPage() {
+				const that = this;
+				that.$set(that, `list`, [])
+				that.$set(that, `skip`, 0)
+				that.$set(that, `limit`, 5)
+				that.$set(that, `page`, 0)
+			}
 		}
 	}
 </script>

pages/week/index.vue

@@ -16,9 +16,15 @@
 		onShow: function() {},
 		methods: {
 			toPath(e) {
-				if (e && e.route) uni.redirectTo({
-					url: `/${e.route}`
-				})
+				if (e && e.route && e.type == '0') {
+					uni.redirectTo({
+						url: `/${e.route}`
+					})
+				} else {
+					uni.navigateTo({
+						url: `/${e.route}`
+					})
+				}
 			}
 		}
 	}

pagesHome/market/search.vue

@@ -2,7 +2,7 @@
 	<mobile-frame>
 		<view class="main">
 			<view class="one">
-				<input type="text" v-model="searchInfo.name" @input="toInput" placeholder="搜索商品">
+				<input type="text" v-model="searchInfo.name" @blur="toInput" placeholder="搜索商品">
 			</view>
 			<view class="two">
 				<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage">
@@ -108,7 +108,7 @@
 					...that.searchInfo
 				})
 				if (res.errcode == '0') {
-					let list = [...that.list, ...res.data];
+					let list = [...that.list, ...res.data]
 					that.$set(that, `list`, list)
 					that.$set(that, `total`, res.total)
 				} else {
@@ -142,6 +142,7 @@
 			toInput(e) {
 				const that = this;
 				if (e.detail.value) that.$set(that.searchInfo, `name`, e.detail.value);
+				that.clearPage();
 				that.search();
 			},
 			// 筛选
@@ -176,12 +177,21 @@
 				}
 				that.$set(that.searchInfo, `key`, key);
 				that.$set(that.searchInfo, `value`, value);
+				that.clearPage();
 				that.search();
 			},
 			toBuy(e) {
 				uni.navigateTo({
 					url: `/pagesHome/order/detail?id=${e.id||e._id}`
 				})
+			},
+			// 清空列表
+			clearPage() {
+				const that = this;
+				that.$set(that, `list`, [])
+				that.$set(that, `skip`, 0)
+				that.$set(that, `limit`, 5)
+				that.$set(that, `page`, 0)
 			}
 		}
 	}

pagesHome/shop/index.vue

@@ -30,7 +30,7 @@
 				</view>
 				<view class="one_3" v-else-if="barActive=='1'">
 					<view class="first">
-						<input type="text" v-model="searchInfo.name" @input="toInput" placeholder="搜索商品">
+						<input type="text" v-model="searchInfo.name" @blur="toInput" placeholder="搜索商品">
 					</view>
 					<view class="second">
 						<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage">
@@ -276,6 +276,7 @@
 			toInput(e) {
 				const that = this;
 				that.$set(that.searchInfo, `name`, e.detail.value);
+				that.clearPage();
 				that.searchAll();
 			},
 			// 筛选
@@ -310,6 +311,7 @@
 				}
 				that.$set(that.searchInfo, `key`, key);
 				that.$set(that.searchInfo, `value`, value);
+				that.clearPage();
 				that.searchAll();
 			},
 			// 收藏
@@ -336,6 +338,14 @@
 					title: item.name
 				});
 			},
+			// 清空列表
+			clearPage() {
+				const that = this;
+				that.$set(that, `list`, [])
+				that.$set(that, `skip`, 0)
+				that.$set(that, `limit`, 5)
+				that.$set(that, `page`, 0)
+			}
 		}
 	}
 </script>

pagesMy/address/index.vue

@@ -331,6 +331,7 @@
 					width: 100%;
 					color: var(--fffColor);
 					background-color: var(--f08Color);
+					border-radius: 0;
 				}
 
 

pagesMy/assets/index.vue

@@ -1,6 +1,23 @@
 <template>
 	<mobile-frame>
-		我的资产
+		<view class="main">
+			<view class="one">
+				<view class="one_1">
+					<text>¥</text><text>{{money}}</text>
+				</view>
+				<view class="one_2">
+					当前可用
+				</view>
+			</view>
+			<view class="two">
+				<view class="two_1" v-if="list&&list.length>0">
+					数据列表
+				</view>
+				<view class="two_2" v-else>
+					已加载完全部
+				</view>
+			</view>
+		</view>
 	</mobile-frame>
 </template>
 
@@ -8,10 +25,13 @@
 	export default {
 		data() {
 			return {
-
+				money: 0,
+				list: []
 			};
 		},
-		onShow: function() {},
+		onLoad: function(e) {
+
+		},
 		methods: {
 
 		}
@@ -19,5 +39,43 @@
 </script>
 
 <style lang="scss">
+	.main {
+		display: flex;
+		flex-direction: column;
+		width: 100vw;
+		height: 100vh;
+
+		.one {
+			background-color: var(--fFB1Color);
+			text-align: center;
+			padding: 5vw 0;
+
+			.one_1 {
+				font-size: 25px;
+				font-weight: bold;
+				color: #fff;
+				margin: 0 0 2vw 0;
+
+				text:nth-child(1) {
+					font-size: 15px;
+					padding: 0 1vw 0 0;
+				}
+			}
 
+			.one_2 {
+				font-size: 16px;
+				color: #fff;
+			}
+		}
+
+		.two {
+			.two_2 {
+				text-align: center;
+				color: #858585;
+				font-size: 14px;
+				margin: 5vw 0;
+			}
+
+		}
+	}
 </style>

pagesMy/integral/index.vue

@@ -1,6 +1,23 @@
 <template>
 	<mobile-frame>
-		我的积分
+		<view class="main">
+			<view class="one">
+				<view class="one_1">
+					<text>{{user.integral||0}}</text><text>分</text>
+				</view>
+				<view class="one_2">
+					<button type="default" size="mini">礼品兑换记录</button>
+				</view>
+			</view>
+			<view class="two">
+				<view class="two_1" v-if="list&&list.length>0">
+					数据列表
+				</view>
+				<view class="two_2" v-else>
+					已加载完全部
+				</view>
+			</view>
+		</view>
 	</mobile-frame>
 </template>
 
@@ -8,16 +25,75 @@
 	export default {
 		data() {
 			return {
-
+				user: {},
+				list: []
 			};
 		},
-		onShow: function() {},
-		methods: {
+		onLoad: function(e) {
 
+		},
+		onShow: function() {
+			const that = this;
+			that.watchLogin()
+		},
+		methods: {
+			watchLogin() {
+				const that = this;
+				uni.getStorage({
+					key: 'token',
+					success: function(res) {
+						let user = that.$jwt(res.data);
+						that.$set(that, `user`, user)
+					}
+				})
+			}
 		}
 	}
 </script>
 
 <style lang="scss">
+	.main {
+		display: flex;
+		flex-direction: column;
+		width: 100vw;
+		height: 100vh;
+
+		.one {
+			background-color: var(--fFB1Color);
+			padding: 5vw 2vw;
+			display: flex;
+			justify-content: space-between;
+
+			.one_1 {
+				color: #fff;
+				font-size: 25px;
+				font-weight: bold;
 
+				text:last-child {
+					padding: 0 0 0 2vw;
+					font-size: 15px;
+				}
+			}
+
+			.one_2 {
+				button {
+					background: #fff;
+					color: #ff0000;
+					border-radius: 25px;
+					font-size: 14px;
+				}
+			}
+
+		}
+
+		.two {
+			.two_2 {
+				text-align: center;
+				color: #858585;
+				font-size: 14px;
+				margin: 5vw 0;
+			}
+
+		}
+	}
 </style>