12

2024-09-23 22:34:12 +08:00 · 2024-09-23 22:34:12 +08:00 · 95086fae1a
commit 95086fae1a
parent 7f1410eba2
34 changed files with 4023 additions and 30 deletions
--- a/components/tabBar/tabBar.vue
+++ b/components/tabBar/tabBar.vue
@ -65,7 +65,7 @@
 			this.identity = uni.getStorageSync('identity');
 			// #endif
 			this.aindex = this.msg
-			this.getbottom()
+			
 		},
 		methods: {
 			async getbottom() {
--- a/config.js
+++ b/config.js
@ -1,7 +1,7 @@
 // 应用全局配置
 module.exports = {
 	//baseUrl: 'https://www.nuoyunr.com/admin-api',
-	baseUrl: 'http://192.168.1.4:48080/admin-api',
+	baseUrl: 'http://192.168.1.31:48080/userClient',
 	imagesUrl: 'http://shequ.0315e.com/static/images/pages/',
 	baseImageUrl: 'https://www.nuoyunr.com/minio',
 	//wsUrl: 'wss://www.nuoyunr.com/admin-api',
--- a/node_modules/extend/.editorconfig
+++ b/node_modules/extend/.editorconfig
@ -0,0 +1,20 @@
+root = true
+
+[*]
+indent_style = tab
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+max_line_length = 150
+
+[CHANGELOG.md]
+indent_style = space
+indent_size = 2
+
+[*.json]
+max_line_length = off
+
+[Makefile]
+max_line_length = off
--- a/node_modules/extend/.eslintrc
+++ b/node_modules/extend/.eslintrc
@ -0,0 +1,17 @@
+{
+	"root": true,
+
+	"extends": "@ljharb",
+
+	"rules": {
+		"complexity": [2, 20],
+		"eqeqeq": [2, "allow-null"],
+		"func-name-matching": [1],
+		"max-depth": [1, 4],
+		"max-statements": [2, 26],
+		"no-extra-parens": [1],
+		"no-magic-numbers": [0],
+		"no-restricted-syntax": [2, "BreakStatement", "ContinueStatement", "DebuggerStatement", "LabeledStatement", "WithStatement"],
+		"sort-keys": [0],
+	}
+}
--- a/node_modules/extend/.jscs.json
+++ b/node_modules/extend/.jscs.json
@ -0,0 +1,175 @@
+{
+	"es3": true,
+
+	"additionalRules": [],
+
+	"requireSemicolons": true,
+
+	"disallowMultipleSpaces": true,
+
+	"disallowIdentifierNames": [],
+
+	"requireCurlyBraces": {
+		"allExcept": [],
+		"keywords": ["if", "else", "for", "while", "do", "try", "catch"]
+	},
+
+	"requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch", "function"],
+
+	"disallowSpaceAfterKeywords": [],
+
+	"disallowSpaceBeforeComma": true,
+	"disallowSpaceAfterComma": false,
+	"disallowSpaceBeforeSemicolon": true,
+
+	"disallowNodeTypes": [
+		"DebuggerStatement",
+		"LabeledStatement",
+		"SwitchCase",
+		"SwitchStatement",
+		"WithStatement"
+	],
+
+	"requireObjectKeysOnNewLine": { "allExcept": ["sameLine"] },
+
+	"requireSpacesInAnonymousFunctionExpression": { "beforeOpeningRoundBrace": true, "beforeOpeningCurlyBrace": true },
+	"requireSpacesInNamedFunctionExpression": { "beforeOpeningCurlyBrace": true },
+	"disallowSpacesInNamedFunctionExpression": { "beforeOpeningRoundBrace": true },
+	"requireSpacesInFunctionDeclaration": { "beforeOpeningCurlyBrace": true },
+	"disallowSpacesInFunctionDeclaration": { "beforeOpeningRoundBrace": true },
+
+	"requireSpaceBetweenArguments": true,
+
+	"disallowSpacesInsideParentheses": true,
+
+	"disallowSpacesInsideArrayBrackets": true,
+
+	"disallowQuotedKeysInObjects": { "allExcept": ["reserved"] },
+
+	"disallowSpaceAfterObjectKeys": true,
+
+	"requireCommaBeforeLineBreak": true,
+
+	"disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"],
+	"requireSpaceAfterPrefixUnaryOperators": [],
+
+	"disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
+	"requireSpaceBeforePostfixUnaryOperators": [],
+
+	"disallowSpaceBeforeBinaryOperators": [],
+	"requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="],
+
+	"requireSpaceAfterBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="],
+	"disallowSpaceAfterBinaryOperators": [],
+
+	"disallowImplicitTypeConversion": ["binary", "string"],
+
+	"disallowKeywords": ["with", "eval"],
+
+	"requireKeywordsOnNewLine": [],
+	"disallowKeywordsOnNewLine": ["else"],
+
+	"requireLineFeedAtFileEnd": true,
+
+	"disallowTrailingWhitespace": true,
+
+	"disallowTrailingComma": true,
+
+	"excludeFiles": ["node_modules/**", "vendor/**"],
+
+	"disallowMultipleLineStrings": true,
+
+	"requireDotNotation": { "allExcept": ["keywords"] },
+
+	"requireParenthesesAroundIIFE": true,
+
+	"validateLineBreaks": "LF",
+
+	"validateQuoteMarks": {
+		"escape": true,
+		"mark": "'"
+	},
+
+	"disallowOperatorBeforeLineBreak": [],
+
+	"requireSpaceBeforeKeywords": [
+		"do",
+		"for",
+		"if",
+		"else",
+		"switch",
+		"case",
+		"try",
+		"catch",
+		"finally",
+		"while",
+		"with",
+		"return"
+	],
+
+	"validateAlignedFunctionParameters": {
+		"lineBreakAfterOpeningBraces": true,
+		"lineBreakBeforeClosingBraces": true
+	},
+
+	"requirePaddingNewLinesBeforeExport": true,
+
+	"validateNewlineAfterArrayElements": {
+		"maximum": 6
+	},
+
+	"requirePaddingNewLinesAfterUseStrict": true,
+
+	"disallowArrowFunctions": true,
+
+	"disallowMultiLineTernary": true,
+
+	"validateOrderInObjectKeys": false,
+
+	"disallowIdenticalDestructuringNames": true,
+
+	"disallowNestedTernaries": { "maxLevel": 1 },
+
+	"requireSpaceAfterComma": { "allExcept": ["trailing"] },
+	"requireAlignedMultilineParams": false,
+
+	"requireSpacesInGenerator": {
+		"afterStar": true
+	},
+
+	"disallowSpacesInGenerator": {
+		"beforeStar": true
+	},
+
+	"disallowVar": false,
+
+	"requireArrayDestructuring": false,
+
+	"requireEnhancedObjectLiterals": false,
+
+	"requireObjectDestructuring": false,
+
+	"requireEarlyReturn": false,
+
+	"requireCapitalizedConstructorsNew": {
+		"allExcept": ["Function", "String", "Object", "Symbol", "Number", "Date", "RegExp", "Error", "Boolean", "Array"]
+	},
+
+	"requireImportAlphabetized": false,
+
+	"requireSpaceBeforeObjectValues": true,
+	"requireSpaceBeforeDestructuredValues": true,
+
+	"disallowSpacesInsideTemplateStringPlaceholders": true,
+
+	"disallowArrayDestructuringReturn": false,
+
+	"requireNewlineBeforeSingleStatementsInIf": false,
+
+	"disallowUnusedVariables": true,
+
+	"requireSpacesInsideImportedObjectBraces": true,
+
+	"requireUseStrict": true
+}
+
--- a/node_modules/extend/.travis.yml
+++ b/node_modules/extend/.travis.yml
@ -0,0 +1,230 @@
+language: node_js
+os:
+ - linux
+node_js:
+  - "10.7"
+  - "9.11"
+  - "8.11"
+  - "7.10"
+  - "6.14"
+  - "5.12"
+  - "4.9"
+  - "iojs-v3.3"
+  - "iojs-v2.5"
+  - "iojs-v1.8"
+  - "0.12"
+  - "0.10"
+  - "0.8"
+before_install:
+  - 'case "${TRAVIS_NODE_VERSION}" in 0.*) export NPM_CONFIG_STRICT_SSL=false ;; esac'
+  - 'nvm install-latest-npm'
+install:
+  - 'if [ "${TRAVIS_NODE_VERSION}" = "0.6" ] || [ "${TRAVIS_NODE_VERSION}" = "0.9" ]; then nvm install --latest-npm 0.8 && npm install && nvm use "${TRAVIS_NODE_VERSION}"; else npm install; fi;'
+script:
+  - 'if [ -n "${PRETEST-}" ]; then npm run pretest ; fi'
+  - 'if [ -n "${POSTTEST-}" ]; then npm run posttest ; fi'
+  - 'if [ -n "${COVERAGE-}" ]; then npm run coverage ; fi'
+  - 'if [ -n "${TEST-}" ]; then npm run tests-only ; fi'
+sudo: false
+env:
+  - TEST=true
+matrix:
+  fast_finish: true
+  include:
+    - node_js: "lts/*"
+      env: PRETEST=true
+    - node_js: "lts/*"
+      env: POSTTEST=true
+    - node_js: "4"
+      env: COVERAGE=true
+    - node_js: "10.6"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "10.5"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "10.4"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "10.3"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "10.2"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "10.1"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "10.0"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "9.10"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "9.9"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "9.8"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "9.7"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "9.6"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "9.5"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "9.4"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "9.3"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "9.2"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "9.1"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "9.0"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "8.10"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "8.9"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "8.8"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "8.7"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "8.6"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "8.5"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "8.4"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "8.3"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "8.2"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "8.1"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "8.0"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "7.9"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "7.8"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "7.7"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "7.6"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "7.5"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "7.4"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "7.3"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "7.2"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "7.1"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "7.0"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "6.13"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "6.12"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "6.11"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "6.10"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "6.9"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "6.8"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "6.7"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "6.6"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "6.5"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "6.4"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "6.3"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "6.2"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "6.1"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "6.0"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "5.11"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "5.10"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "5.9"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "5.8"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "5.7"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "5.6"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "5.5"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "5.4"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "5.3"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "5.2"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "5.1"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "5.0"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "4.8"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "4.7"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "4.6"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "4.5"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "4.4"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "4.3"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "4.2"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "4.1"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "4.0"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "iojs-v3.2"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "iojs-v3.1"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "iojs-v3.0"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "iojs-v2.4"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "iojs-v2.3"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "iojs-v2.2"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "iojs-v2.1"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "iojs-v2.0"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "iojs-v1.7"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "iojs-v1.6"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "iojs-v1.5"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "iojs-v1.4"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "iojs-v1.3"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "iojs-v1.2"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "iojs-v1.1"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "iojs-v1.0"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "0.11"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "0.9"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "0.6"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "0.4"
+      env: TEST=true ALLOW_FAILURE=true
+  allow_failures:
+    - os: osx
+    - env: TEST=true ALLOW_FAILURE=true
--- a/node_modules/extend/CHANGELOG.md
+++ b/node_modules/extend/CHANGELOG.md
@ -0,0 +1,83 @@
+3.0.2 / 2018-07-19
+==================
+  * [Fix] Prevent merging `__proto__` property (#48)
+  * [Dev Deps] update `eslint`, `@ljharb/eslint-config`, `tape`
+  * [Tests] up to `node` `v10.7`, `v9.11`, `v8.11`, `v7.10`, `v6.14`, `v4.9`; use `nvm install-latest-npm`
+
+3.0.1 / 2017-04-27
+==================
+  * [Fix] deep extending should work with a non-object (#46)
+  * [Dev Deps] update `tape`, `eslint`, `@ljharb/eslint-config`
+  * [Tests] up to `node` `v7.9`, `v6.10`, `v4.8`; improve matrix
+  * [Docs] Switch from vb.teelaun.ch to versionbadg.es for the npm version badge SVG.
+  * [Docs] Add example to readme (#34)
+
+3.0.0 / 2015-07-01
+==================
+  * [Possible breaking change] Use global "strict" directive (#32)
+  * [Tests] `int` is an ES3 reserved word
+  * [Tests] Test up to `io.js` `v2.3`
+  * [Tests] Add `npm run eslint`
+  * [Dev Deps] Update `covert`, `jscs`
+
+2.0.1 / 2015-04-25
+==================
+  * Use an inline `isArray` check, for ES3 browsers. (#27)
+  * Some old browsers fail when an identifier is `toString`
+  * Test latest `node` and `io.js` versions on `travis-ci`; speed up builds
+  * Add license info to package.json (#25)
+  * Update `tape`, `jscs`
+  * Adding a CHANGELOG
+
+2.0.0 / 2014-10-01
+==================
+  * Increase code coverage to 100%; run code coverage as part of tests
+  * Add `npm run lint`; Run linter as part of tests
+  * Remove nodeType and setInterval checks in isPlainObject
+  * Updating `tape`, `jscs`, `covert`
+  * General style and README cleanup
+
+1.3.0 / 2014-06-20
+==================
+  * Add component.json for browser support (#18)
+  * Use SVG for badges in README (#16)
+  * Updating `tape`, `covert`
+  * Updating travis-ci to work with multiple node versions
+  * Fix `deep === false` bug (returning target as {}) (#14)
+  * Fixing constructor checks in isPlainObject
+  * Adding additional test coverage
+  * Adding `npm run coverage`
+  * Add LICENSE (#13)
+  * Adding a warning about `false`, per #11
+  * General style and whitespace cleanup
+
+1.2.1 / 2013-09-14
+==================
+  * Fixing hasOwnProperty bugs that would only have shown up in specific browsers. Fixes #8
+  * Updating `tape`
+
+1.2.0 / 2013-09-02
+==================
+  * Updating the README: add badges
+  * Adding a missing variable reference.
+  * Using `tape` instead of `buster` for tests; add more tests (#7)
+  * Adding node 0.10 to Travis CI (#6)
+  * Enabling "npm test" and cleaning up package.json (#5)
+  * Add Travis CI.
+
+1.1.3 / 2012-12-06
+==================
+  * Added unit tests.
+  * Ensure extend function is named. (Looks nicer in a stack trace.)
+  * README cleanup.
+
+1.1.1 / 2012-11-07
+==================
+  * README cleanup.
+  * Added installation instructions.
+  * Added a missing semicolon
+
+1.0.0 / 2012-04-08
+==================
+  * Initial commit
+
--- a/node_modules/extend/LICENSE
+++ b/node_modules/extend/LICENSE
@ -0,0 +1,23 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Stefan Thomas
+
+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.
+
--- a/node_modules/extend/README.md
+++ b/node_modules/extend/README.md
@ -0,0 +1,81 @@
+[![Build Status][travis-svg]][travis-url]
+[![dependency status][deps-svg]][deps-url]
+[![dev dependency status][dev-deps-svg]][dev-deps-url]
+
+# extend() for Node.js <sup>[![Version Badge][npm-version-png]][npm-url]</sup>
+
+`node-extend` is a port of the classic extend() method from jQuery. It behaves as you expect. It is simple, tried and true.
+
+Notes:
+
+* Since Node.js >= 4,
+  [`Object.assign`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/assign)
+  now offers the same functionality natively (but without the "deep copy" option).
+  See [ECMAScript 2015 (ES6) in Node.js](https://nodejs.org/en/docs/es6).
+* Some native implementations of `Object.assign` in both Node.js and many
+  browsers (since NPM modules are for the browser too) may not be fully
+  spec-compliant.
+  Check [`object.assign`](https://www.npmjs.com/package/object.assign) module for
+  a compliant candidate.
+
+## Installation
+
+This package is available on [npm][npm-url] as: `extend`
+
+``` sh
+npm install extend
+```
+
+## Usage
+
+**Syntax:** extend **(** [`deep`], `target`, `object1`, [`objectN`] **)**
+
+*Extend one object with one or more others, returning the modified object.*
+
+**Example:**
+
+``` js
+var extend = require('extend');
+extend(targetObject, object1, object2);
+```
+
+Keep in mind that the target object will be modified, and will be returned from extend().
+
+If a boolean true is specified as the first argument, extend performs a deep copy, recursively copying any objects it finds. Otherwise, the copy will share structure with the original object(s).
+Undefined properties are not copied. However, properties inherited from the object's prototype will be copied over.
+Warning: passing `false` as the first argument is not supported.
+
+### Arguments
+
+* `deep` *Boolean* (optional)
+If set, the merge becomes recursive (i.e. deep copy).
+* `target`	*Object*
+The object to extend.
+* `object1`	*Object*
+The object that will be merged into the first.
+* `objectN` *Object* (Optional)
+More objects to merge into the first.
+
+## License
+
+`node-extend` is licensed under the [MIT License][mit-license-url].
+
+## Acknowledgements
+
+All credit to the jQuery authors for perfecting this amazing utility.
+
+Ported to Node.js by [Stefan Thomas][github-justmoon] with contributions by [Jonathan Buchanan][github-insin] and [Jordan Harband][github-ljharb].
+
+[travis-svg]: https://travis-ci.org/justmoon/node-extend.svg
+[travis-url]: https://travis-ci.org/justmoon/node-extend
+[npm-url]: https://npmjs.org/package/extend
+[mit-license-url]: http://opensource.org/licenses/MIT
+[github-justmoon]: https://github.com/justmoon
+[github-insin]: https://github.com/insin
+[github-ljharb]: https://github.com/ljharb
+[npm-version-png]: http://versionbadg.es/justmoon/node-extend.svg
+[deps-svg]: https://david-dm.org/justmoon/node-extend.svg
+[deps-url]: https://david-dm.org/justmoon/node-extend
+[dev-deps-svg]: https://david-dm.org/justmoon/node-extend/dev-status.svg
+[dev-deps-url]: https://david-dm.org/justmoon/node-extend#info=devDependencies
+
--- a/node_modules/extend/component.json
+++ b/node_modules/extend/component.json
@ -0,0 +1,32 @@
+{
+	"name": "extend",
+	"author": "Stefan Thomas <justmoon@members.fsf.org> (http://www.justmoon.net)",
+	"version": "3.0.0",
+	"description": "Port of jQuery.extend for node.js and the browser.",
+	"scripts": [
+		"index.js"
+	],
+	"contributors": [
+		{
+			"name": "Jordan Harband",
+			"url": "https://github.com/ljharb"
+		}
+	],
+	"keywords": [
+		"extend",
+		"clone",
+		"merge"
+	],
+	"repository" : {
+		"type": "git",
+		"url": "https://github.com/justmoon/node-extend.git"
+	},
+	"dependencies": {
+	},
+	"devDependencies": {
+		"tape" : "~3.0.0",
+		"covert": "~0.4.0",
+		"jscs": "~1.6.2"
+	}
+}
+
--- a/node_modules/extend/index.js
+++ b/node_modules/extend/index.js
@ -0,0 +1,117 @@
+'use strict';
+
+var hasOwn = Object.prototype.hasOwnProperty;
+var toStr = Object.prototype.toString;
+var defineProperty = Object.defineProperty;
+var gOPD = Object.getOwnPropertyDescriptor;
+
+var isArray = function isArray(arr) {
+	if (typeof Array.isArray === 'function') {
+		return Array.isArray(arr);
+	}
+
+	return toStr.call(arr) === '[object Array]';
+};
+
+var isPlainObject = function isPlainObject(obj) {
+	if (!obj || toStr.call(obj) !== '[object Object]') {
+		return false;
+	}
+
+	var hasOwnConstructor = hasOwn.call(obj, 'constructor');
+	var hasIsPrototypeOf = obj.constructor && obj.constructor.prototype && hasOwn.call(obj.constructor.prototype, 'isPrototypeOf');
+	// Not own constructor property must be Object
+	if (obj.constructor && !hasOwnConstructor && !hasIsPrototypeOf) {
+		return false;
+	}
+
+	// Own properties are enumerated firstly, so to speed up,
+	// if last one is own, then all properties are own.
+	var key;
+	for (key in obj) { /**/ }
+
+	return typeof key === 'undefined' || hasOwn.call(obj, key);
+};
+
+// If name is '__proto__', and Object.defineProperty is available, define __proto__ as an own property on target
+var setProperty = function setProperty(target, options) {
+	if (defineProperty && options.name === '__proto__') {
+		defineProperty(target, options.name, {
+			enumerable: true,
+			configurable: true,
+			value: options.newValue,
+			writable: true
+		});
+	} else {
+		target[options.name] = options.newValue;
+	}
+};
+
+// Return undefined instead of __proto__ if '__proto__' is not an own property
+var getProperty = function getProperty(obj, name) {
+	if (name === '__proto__') {
+		if (!hasOwn.call(obj, name)) {
+			return void 0;
+		} else if (gOPD) {
+			// In early versions of node, obj['__proto__'] is buggy when obj has
+			// __proto__ as an own property. Object.getOwnPropertyDescriptor() works.
+			return gOPD(obj, name).value;
+		}
+	}
+
+	return obj[name];
+};
+
+module.exports = function extend() {
+	var options, name, src, copy, copyIsArray, clone;
+	var target = arguments[0];
+	var i = 1;
+	var length = arguments.length;
+	var deep = false;
+
+	// Handle a deep copy situation
+	if (typeof target === 'boolean') {
+		deep = target;
+		target = arguments[1] || {};
+		// skip the boolean and the target
+		i = 2;
+	}
+	if (target == null || (typeof target !== 'object' && typeof target !== 'function')) {
+		target = {};
+	}
+
+	for (; i < length; ++i) {
+		options = arguments[i];
+		// Only deal with non-null/undefined values
+		if (options != null) {
+			// Extend the base object
+			for (name in options) {
+				src = getProperty(target, name);
+				copy = getProperty(options, name);
+
+				// Prevent never-ending loop
+				if (target !== copy) {
+					// Recurse if we're merging plain objects or arrays
+					if (deep && copy && (isPlainObject(copy) || (copyIsArray = isArray(copy)))) {
+						if (copyIsArray) {
+							copyIsArray = false;
+							clone = src && isArray(src) ? src : [];
+						} else {
+							clone = src && isPlainObject(src) ? src : {};
+						}
+
+						// Never move original objects, clone them
+						setProperty(target, { name: name, newValue: extend(deep, clone, copy) });
+
+					// Don't bring in undefined values
+					} else if (typeof copy !== 'undefined') {
+						setProperty(target, { name: name, newValue: copy });
+					}
+				}
+			}
+		}
+	}
+
+	// Return the modified object
+	return target;
+};
--- a/node_modules/extend/package.json
+++ b/node_modules/extend/package.json
@ -0,0 +1,75 @@
+{
+  "_from": "extend@^3.0.2",
+  "_id": "extend@3.0.2",
+  "_inBundle": false,
+  "_integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+  "_location": "/extend",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "range",
+    "registry": true,
+    "raw": "extend@^3.0.2",
+    "name": "extend",
+    "escapedName": "extend",
+    "rawSpec": "^3.0.2",
+    "saveSpec": null,
+    "fetchSpec": "^3.0.2"
+  },
+  "_requiredBy": [
+    "/weapp-qrcode"
+  ],
+  "_resolved": "https://registry.npmmirror.com/extend/-/extend-3.0.2.tgz",
+  "_shasum": "f8b1136b4071fbd8eb140aff858b1019ec2915fa",
+  "_spec": "extend@^3.0.2",
+  "_where": "D:\\lananWork\\lanan-repair\\node_modules\\weapp-qrcode",
+  "author": {
+    "name": "Stefan Thomas",
+    "email": "justmoon@members.fsf.org",
+    "url": "http://www.justmoon.net"
+  },
+  "bugs": {
+    "url": "https://github.com/justmoon/node-extend/issues"
+  },
+  "bundleDependencies": false,
+  "contributors": [
+    {
+      "name": "Jordan Harband",
+      "url": "https://github.com/ljharb"
+    }
+  ],
+  "dependencies": {},
+  "deprecated": false,
+  "description": "Port of jQuery.extend for node.js and the browser",
+  "devDependencies": {
+    "@ljharb/eslint-config": "^12.2.1",
+    "covert": "^1.1.0",
+    "eslint": "^4.19.1",
+    "jscs": "^3.0.7",
+    "tape": "^4.9.1"
+  },
+  "homepage": "https://github.com/justmoon/node-extend#readme",
+  "keywords": [
+    "extend",
+    "clone",
+    "merge"
+  ],
+  "license": "MIT",
+  "main": "index",
+  "name": "extend",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/justmoon/node-extend.git"
+  },
+  "scripts": {
+    "coverage": "covert test/index.js",
+    "coverage-quiet": "covert test/index.js --quiet",
+    "eslint": "eslint *.js */*.js",
+    "jscs": "jscs *.js */*.js",
+    "lint": "npm run jscs && npm run eslint",
+    "posttest": "npm run coverage-quiet",
+    "pretest": "npm run lint",
+    "test": "npm run tests-only",
+    "tests-only": "node test"
+  },
+  "version": "3.0.2"
+}
--- a/node_modules/weapp-qrcode/.editorconfig
+++ b/node_modules/weapp-qrcode/.editorconfig
@ -0,0 +1,9 @@
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
--- a/node_modules/weapp-qrcode/.eslintignore
+++ b/node_modules/weapp-qrcode/.eslintignore
@ -0,0 +1,2 @@
+build/*.js
+src/qrcode.js
--- a/node_modules/weapp-qrcode/.eslintrc.js
+++ b/node_modules/weapp-qrcode/.eslintrc.js
@ -0,0 +1,26 @@
+module.exports = {
+  root: true,
+  parser: 'babel-eslint',
+  parserOptions: {
+    sourceType: 'module'
+  },
+  env: {
+    browser: true,
+  },
+  // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
+  extends: 'standard',
+  "globals": {
+    __VERSION__: false,
+    ENV: false,
+    wx: false
+  },
+  // add your custom rules here
+  'rules': {
+    // allow paren-less arrow functions
+    'arrow-parens': 0,
+    // allow async-await
+    'generator-star-spacing': 0,
+    // allow debugger during development
+    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
+  }
+}
--- a/node_modules/weapp-qrcode/.github/ISSUE_TEMPLATE.md
+++ b/node_modules/weapp-qrcode/.github/ISSUE_TEMPLATE.md
@ -0,0 +1,37 @@
+# Description
+
+[问题简单描述]
+
+# Environment
+
+* Platform: [开发者工具/iOS/Andriod/Web]
+* Platform version: [对应工具或者iOS或者Andriod的版本号]
+* Wechat version: [微信版本号]
+* weapp-qrcode version: [在package.json里]
+* other version: [如果在某一设备下出现该问题，请填写设备号]
+
+# Reproduce
+
+**问题复现步骤:**
+
+1. [第一步]
+2. [第二步]
+3. [其他步骤...]
+
+**期望的表现:**
+
+[在这里描述期望的表现]
+
+**观察到的表现:**
+
+[在这里描述观察到的表现]
+
+**屏幕截图和动态 GIF 图**
+
+![复现步骤的屏幕截图和动态 GIF 图](图片的 url)
+
+# Relevant Code / Logs
+
+```
+// TODO(you): code or logs here to reproduce the problem
+```
--- a/node_modules/weapp-qrcode/.travis.yml
+++ b/node_modules/weapp-qrcode/.travis.yml
@ -0,0 +1,23 @@
+language: node_js
+sudo: required
+node_js:
+  - 10.0.0
+cache:
+  directories:
+    - node_modules
+before_install:
+  - export TZ='Asia/Shanghai'
+install:
+  - npm install
+script:
+  - npm run publish
+
+after_script:
+  - git init
+  - git config user.name "${USER_NAME}"
+  - git config user.email "${USER_EMAIL}"
+  - git add .
+  - git commit -m "publish"
+  - git push -f https://${access_token}@github.com/yingye/weapp-qrcode HEAD:master
+
+branch: master
--- a/node_modules/weapp-qrcode/CHANGELOG.md
+++ b/node_modules/weapp-qrcode/CHANGELOG.md
@ -0,0 +1,40 @@
+# Change Log
+
+Change log for weapp-qrcode. [Details at Github](https://github.com/yingye/weapp-qrcode)
+
+## [1.0.0] - 2018-12-25
+
+- 支持传入绘图上下文(CanvasContext).
+
+## [1.0.0-beta] - 2018-12-13
+
+- 支持二维码在 canvas 上绘制的起始位置.
+- 支持在二维码上绘制图片及绘制位置.
+
+## [0.9.0] - 2018-05-31
+
+- 支持绘制带中文的二维码.
+
+## [0.8.0] - 2018-05-15
+
+- 绘制二维码后添加回调函数.
+
+## [0.7.0] - 2018-05-11
+
+- 支持在小程序组件中绘制二维码.
+
+## [0.6.0] - 2018-04-16
+
+- Add multi-output.
+
+## [0.5.0] - 2018-03-11
+
+- Add version in weapp.qrcode.js.
+
+## [0.4.0] - 2018-03-10
+
+- Fix options.
+
+## [0.3.0] - 2018-02-03
+
+- Initial release.
--- a/node_modules/weapp-qrcode/LICENSE
+++ b/node_modules/weapp-qrcode/LICENSE
@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 yingye
+
+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.
--- a/node_modules/weapp-qrcode/README.md
+++ b/node_modules/weapp-qrcode/README.md
@ -0,0 +1,96 @@
+# weapp-qrcode
+
+[![npm version](https://badge.fury.io/js/weapp-qrcode.svg)](https://badge.fury.io/js/weapp-qrcode)
+[![change-log](https://img.shields.io/badge/changelog-md-blue.svg)](https://github.com/yingye/weapp-qrcode/blob/master/CHANGELOG.md)
+
+weapp.qrcode.js 在 微信小程序 中，快速生成二维码
+
+## Usage
+
+先在 wxml 文件中，创建绘制的 `canvas`，并定义好 `width`, `height`, `canvasId` 。
+
+```html
+<canvas style="width: 200px; height: 200px;" canvas-id="myQrcode"></canvas>
+```
+
+直接引入 js 文件，使用 `drawQrcode()` 绘制二维码。!!!在 调用 `drawQrcode()` 方法之前，一定要确保可以获取到 `canvas context` 。
+
+在 v0.6.0 版本构建出多个文件，详情移步[Build Files说明](https://github.com/yingye/weapp-qrcode/blob/master/dist/README.md)。
+
+```js
+// 将 dist 目录下，weapp.qrcode.esm.js 复制到项目目录中
+import drawQrcode from '../../utils/weapp.qrcode.esm.js'
+
+drawQrcode({
+  width: 200,
+  height: 200,
+  canvasId: 'myQrcode',
+  // ctx: wx.createCanvasContext('myQrcode'),
+  text: 'https://github.com/yingye',
+  // v1.0.0+版本支持在二维码上绘制图片
+  image: {
+    imageResource: '../../images/icon.png',
+    dx: 70,
+    dy: 70,
+    dWidth: 60,
+    dHeight: 60
+  }
+})
+```
+
+如果项目使用了 wepy 框架，可直接安装 `weapp-qrcode` npm包。
+
+```
+npm install weapp-qrcode --save
+```
+
+```js
+import drawQrcode from 'weapp-qrcode'
+
+drawQrcode({
+  width: 200,
+  height: 200,
+  canvasId: 'myQrcode',
+  text: 'https://github.com/yingye'
+})
+```
+
+## DEMO
+
+<img src="./examples/demo.jpg" width=300 >
+
+更多 demo 可以参考 [examples目录](https://github.com/yingye/weapp-qrcode/tree/master/examples)，示例包含原生语法及WePY、mpvue、Taro框架。
+
+## API
+
+### drawQrcode([options])
+
+#### options
+
+Type: Object
+
+| 参数 | 说明 | 示例|
+| ------ | ------ | ------ |
+| width | 必须，二维码宽度，与`canvas`的`width`保持一致 | 200 |
+| height | 必须，二维码高度，与`canvas`的`height`保持一致 | 200 |
+| canvasId | 非必须，绘制的`canvasId` | `'myQrcode'` |
+| ctx | 非必须，绘图上下文，可通过 `wx.createCanvasContext('canvasId')` 获取，v1.0.0+版本支持 | `'wx.createCanvasContext('canvasId')'` |
+| text | 必须，二维码内容 | 'https://github.com/yingye' |
+| typeNumber | 非必须，二维码的计算模式，默认值-1 | 8 |
+| correctLevel | 非必须，二维码纠错级别，默认值为高级，取值：`{ L: 1, M: 0, Q: 3, H: 2 }` | 1 |
+| background | 非必须，二维码背景颜色，默认值白色 | `'#ffffff'` |
+| foreground | 非必须，二维码前景色，默认值黑色 | `'#000000'` |
+| _this | 非必须，若在组件中使用，需要传入，v0.7.0+版本支持 | this |
+| callback | 非必须，绘制完成后的回调函数，v0.8.0+版本支持。安卓手机兼容性问题，可通过自行设置计时器来解决，更多可以参考 [issue #18](https://github.com/yingye/weapp-qrcode/issues/18) | `function (e) { console.log('e', e) }` |
+| x | 非必须，二维码绘制的 x 轴起始位置，默认值0，v1.0.0+版本支持 | 100 |
+| y | 非必须，二维码绘制的 y 轴起始位置，默认值0，v1.0.0+版本支持 | 100 |
+| image | 非必须，在 canvas 上绘制图片，**层级高于二维码**，v1.0.0+版本支持，更多可参考[drawImage](https://developers.weixin.qq.com/miniprogram/dev/api/CanvasContext.drawImage.html) | `{ imageResource: '', dx: 0, dy: 0, dWidth: 100, dHeight: 100 }` |
+
+
+**位置信息可以参见下图：**
+
+<image src="./examples/api.png" width=500 height=500>
+
+## TIPS
+
+weapp.qrcode.js 二维码生成部分借鉴了 jquery-qrcode 源码，可以参考 [jquery-qrcode](https://github.com/jeromeetienne/jquery-qrcode)。
--- a/node_modules/weapp-qrcode/build/rollup.dev.config.js
+++ b/node_modules/weapp-qrcode/build/rollup.dev.config.js
@ -0,0 +1,39 @@
+var babel = require('rollup-plugin-babel')
+var resolve = require('rollup-plugin-node-resolve')
+var commonjs = require('rollup-plugin-commonjs')
+var eslint = require('rollup-plugin-eslint')
+var license = require('rollup-plugin-license')
+
+var path = require('path')
+
+var pkg = require('../package.json')
+
+module.exports = {
+  input: path.resolve(__dirname, '../src/index.js'),
+  output: [
+    {
+      file: path.resolve(__dirname, '../dist/weapp.qrcode.js'),
+      format: 'umd'
+    },
+    {
+      file: path.resolve(__dirname, '../examples/wechat-app/utils/weapp.qrcode.js'),
+      format: 'umd'
+    }
+  ],
+  moduleName: 'drawQrcode',
+  plugins: [
+    eslint(),
+    resolve({
+      jsnext: true,
+      main: true,
+      browser: true
+    }),
+    commonjs(),
+    babel({
+      exclude: 'node_modules/**'
+    }),
+    license({
+      banner: 'weapp.qrcode.js v' + pkg.version + ' (' + pkg.homepage + ')'
+    })
+  ]
+}
--- a/node_modules/weapp-qrcode/build/rollup.prod.config.js
+++ b/node_modules/weapp-qrcode/build/rollup.prod.config.js
@ -0,0 +1,49 @@
+var babel = require('rollup-plugin-babel')
+var babel = require('rollup-plugin-babel')
+var resolve = require('rollup-plugin-node-resolve')
+var commonjs = require('rollup-plugin-commonjs')
+var eslint = require('rollup-plugin-eslint')
+var license = require('rollup-plugin-license')
+var uglify = require('rollup-plugin-uglify')
+
+var path = require('path')
+var pkg = require('../package.json')
+
+module.exports = {
+  input: path.resolve(__dirname, '../src/index.js'),
+  output: [
+    {
+      file: path.resolve(__dirname, '../dist/weapp.qrcode.min.js'),
+      format: 'umd'
+    },
+    {
+      file: path.resolve(__dirname, '../dist/weapp.qrcode.common.js'),
+      format: 'cjs'
+    },
+    {
+      file: path.resolve(__dirname, '../dist/weapp.qrcode.esm.js'),
+      format: 'es'
+    }
+  ],
+  moduleName: 'drawQrcode',
+  plugins: [
+    eslint(),
+    resolve({
+      jsnext: true,
+      main: true,
+      browser: true
+    }),
+    commonjs(),
+    babel({
+      exclude: 'node_modules/**'
+    }),
+    uglify({
+      compress: {
+        // 'drop_console': true
+      }  
+    }),
+    license({
+      banner: 'weapp.qrcode.js v' + pkg.version + ' (' + pkg.homepage + ')'
+    })
+  ]
+}
--- a/node_modules/weapp-qrcode/dist/README.md
+++ b/node_modules/weapp-qrcode/dist/README.md
@ -0,0 +1,6 @@
+## Explanation of Build Files
+
+| | UMD | CommonJS | ES Module |
+| --- | --- | --- | --- |
+| **Develpment** | weapp.qrcode.js | weapp.qrcode.common.js | weapp.qrcode.esm.js |
+| **Production** | weapp.qrcode.min.js | | |
--- a/node_modules/weapp-qrcode/dist/weapp.qrcode.common.js
+++ b/node_modules/weapp-qrcode/dist/weapp.qrcode.common.js
--- a/node_modules/weapp-qrcode/dist/weapp.qrcode.esm.js
+++ b/node_modules/weapp-qrcode/dist/weapp.qrcode.esm.js
--- a/node_modules/weapp-qrcode/dist/weapp.qrcode.js
+++ b/node_modules/weapp-qrcode/dist/weapp.qrcode.js
--- a/node_modules/weapp-qrcode/dist/weapp.qrcode.min.js
+++ b/node_modules/weapp-qrcode/dist/weapp.qrcode.min.js
--- a/node_modules/weapp-qrcode/package.json
+++ b/node_modules/weapp-qrcode/package.json
@ -0,0 +1,78 @@
+{
+  "_from": "weapp-qrcode",
+  "_id": "weapp-qrcode@1.0.0",
+  "_inBundle": false,
+  "_integrity": "sha512-4sa3W0rGDVJ9QaeZpAKlAuUxVyjhDwiUqHyGK/jJMsRMXnhb4yO8qWU/pZruMo+iT5J6CraS67lDMFb1VY+RaA==",
+  "_location": "/weapp-qrcode",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "tag",
+    "registry": true,
+    "raw": "weapp-qrcode",
+    "name": "weapp-qrcode",
+    "escapedName": "weapp-qrcode",
+    "rawSpec": "",
+    "saveSpec": null,
+    "fetchSpec": "latest"
+  },
+  "_requiredBy": [
+    "#USER",
+    "/"
+  ],
+  "_resolved": "https://registry.npmmirror.com/weapp-qrcode/-/weapp-qrcode-1.0.0.tgz",
+  "_shasum": "4f3b4b4e7d37710c513439166734587859aebbfc",
+  "_spec": "weapp-qrcode",
+  "_where": "D:\\lananWork\\lanan-repair",
+  "author": {
+    "name": "yingye"
+  },
+  "bugs": {
+    "url": "https://github.com/yingye/weapp-qrcode/issues"
+  },
+  "bundleDependencies": false,
+  "dependencies": {
+    "extend": "^3.0.2"
+  },
+  "deprecated": false,
+  "description": "generate qrcode in weapp",
+  "devDependencies": {
+    "babel-core": "^6.26.0",
+    "babel-eslint": "^8.2.1",
+    "eslint": "^4.16.0",
+    "eslint-config-standard": "^11.0.0-beta.0",
+    "eslint-plugin-import": "^2.8.0",
+    "eslint-plugin-node": "^5.2.1",
+    "eslint-plugin-promise": "^3.6.0",
+    "eslint-plugin-standard": "^3.0.1",
+    "rollup": "^0.55.1",
+    "rollup-plugin-babel": "^3.0.3",
+    "rollup-plugin-commonjs": "^8.3.0",
+    "rollup-plugin-eslint": "^4.0.0",
+    "rollup-plugin-license": "^0.6.0",
+    "rollup-plugin-node-resolve": "^3.0.2",
+    "rollup-plugin-replace": "^2.0.0",
+    "rollup-plugin-uglify": "^3.0.0"
+  },
+  "homepage": "https://github.com/yingye/weapp-qrcode#readme",
+  "keywords": [
+    "wechat",
+    "weapp",
+    "qrcode",
+    "canvas"
+  ],
+  "license": "MIT",
+  "main": "dist/weapp.qrcode.common.js",
+  "module": "dist/weapp.qrcode.esm.js",
+  "name": "weapp-qrcode",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/yingye/weapp-qrcode.git"
+  },
+  "scripts": {
+    "build": "rollup --config build/rollup.prod.config.js",
+    "dev": "rollup --config build/rollup.dev.config.js -w",
+    "publish": "rollup --config build/rollup.dev.config.js & npm run build",
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "version": "1.0.0"
+}
--- a/node_modules/weapp-qrcode/src/index.js
+++ b/node_modules/weapp-qrcode/src/index.js
@ -0,0 +1,94 @@
+import extend from 'extend'
+import {
+  QRCode,
+  QRErrorCorrectLevel
+} from './qrcode'
+
+// support Chinese
+function utf16to8 (str) {
+  var out, i, len, c
+  out = ''
+  len = str.length
+  for (i = 0; i < len; i++) {
+    c = str.charCodeAt(i)
+    if ((c >= 0x0001) && (c <= 0x007F)) {
+      out += str.charAt(i)
+    } else if (c > 0x07FF) {
+      out += String.fromCharCode(0xE0 | ((c >> 12) & 0x0F))
+      out += String.fromCharCode(0x80 | ((c >> 6) & 0x3F))
+      out += String.fromCharCode(0x80 | ((c >> 0) & 0x3F))
+    } else {
+      out += String.fromCharCode(0xC0 | ((c >> 6) & 0x1F))
+      out += String.fromCharCode(0x80 | ((c >> 0) & 0x3F))
+    }
+  }
+  return out
+}
+
+function drawQrcode (options) {
+  options = options || {}
+  options = extend(true, {
+    width: 256,
+    height: 256,
+    x: 0,
+    y: 0,
+    typeNumber: -1,
+    correctLevel: QRErrorCorrectLevel.H,
+    background: '#ffffff',
+    foreground: '#000000',
+    image: {
+      imageResource: '',
+      dx: 0,
+      dy: 0,
+      dWidth: 100,
+      dHeight: 100
+    }
+  }, options)
+
+  if (!options.canvasId && !options.ctx) {
+    console.warn('please set canvasId or ctx!')
+    return
+  }
+
+  createCanvas()
+
+  function createCanvas () {
+    // create the qrcode itself
+    var qrcode = new QRCode(options.typeNumber, options.correctLevel)
+    qrcode.addData(utf16to8(options.text))
+    qrcode.make()
+
+    // get canvas context
+    var ctx
+    if (options.ctx) {
+      ctx = options.ctx
+    } else {
+      ctx = options._this ? wx.createCanvasContext && wx.createCanvasContext(options.canvasId, options._this) : wx.createCanvasContext && wx.createCanvasContext(options.canvasId)
+    }
+
+    // compute tileW/tileH based on options.width/options.height
+    var tileW = options.width / qrcode.getModuleCount()
+    var tileH = options.height / qrcode.getModuleCount()
+
+    // draw in the canvas
+    for (var row = 0; row < qrcode.getModuleCount(); row++) {
+      for (var col = 0; col < qrcode.getModuleCount(); col++) {
+        var style = qrcode.isDark(row, col) ? options.foreground : options.background
+        ctx.setFillStyle(style)
+        var w = (Math.ceil((col + 1) * tileW) - Math.floor(col * tileW))
+        var h = (Math.ceil((row + 1) * tileW) - Math.floor(row * tileW))
+        ctx.fillRect(Math.round(col * tileW) + options.x, Math.round(row * tileH) + options.y, w, h)
+      }
+    }
+
+    if (options.image.imageResource) {
+      ctx.drawImage(options.image.imageResource, options.image.dx, options.image.dy, options.image.dWidth, options.image.dHeight)
+    }
+
+    ctx.draw(false, function (e) {
+      options.callback && options.callback(e)
+    })
+  }
+}
+
+export default drawQrcode
--- a/node_modules/weapp-qrcode/src/qrcode.js
+++ b/node_modules/weapp-qrcode/src/qrcode.js
--- a/package-lock.json
+++ b/package-lock.json
@ -0,0 +1,19 @@
+{
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmmirror.com/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+    },
+    "weapp-qrcode": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/weapp-qrcode/-/weapp-qrcode-1.0.0.tgz",
+      "integrity": "sha512-4sa3W0rGDVJ9QaeZpAKlAuUxVyjhDwiUqHyGK/jJMsRMXnhb4yO8qWU/pZruMo+iT5J6CraS67lDMFb1VY+RaA==",
+      "requires": {
+        "extend": "^3.0.2"
+      }
+    }
+  }
+}
--- a/package.json
+++ b/package.json
@ -1,6 +1,7 @@
 {
  "dependencies": {
-    "uview-ui": "^2.0.36"
+    "uview-ui": "^2.0.36",
+    "weapp-qrcode": "^1.0.0"
  },
  "devDependencies": {
    "sass": "^1.69.5",
--- a/pages/orderList/orderList.vue
+++ b/pages/orderList/orderList.vue
@ -17,39 +17,50 @@
 							订单编号：{{item.orderNo}}
 						</view>
 						<text class="orderStatus" :class="['status_' + item.status]">
-							{{ getStatus(item.status) }}
+							{{ getStatus(item.orderStatus) }}
 						</text>
 					</view>
 					<view class="orderInfo">
 						<image class="orderInfoIcon" src="" mode="aspectFit"></image>
-						<text class="orderInfoText">{{ item.busiTypeStr }}</text>
+						<text class="orderInfoText">{{ item.goodsTitle }}</text>
 					</view>
 					<view class="orderInfo">
 						<image class="orderInfoIcon" src="" mode="aspectFit"></image>
-						<text class="orderInfoText">{{ item.address }}</text>
+						<text class="orderInfoText">{{ item.tenantName | 蓝安-中鑫之宝 }}</text>
 					</view>
 					<view class="line2">
 						<view>
 							共计
 							<text class="orderAmountUnit">￥</text>
-							<text class="orderAmount">781</text>
+							<text class="orderAmount">{{item.payMoney}}</text>
 						</view>
-						<text>{{ item.date }}</text>
+						<text>{{formatTimestamp(item.createTime)}}</text>
 					</view>
 					<view class="line3">
-						<view @click="gotoDetail(item)" class="showOrder" v-if="item.status === '1'">查看订单</view>
-						<view @click="gotoEvaluate(item)" class="evaluate" v-if="item.status === '2'">评价订单</view>
+						<view @click="goPay(item)" class="showOrder" >支付</view>
+						<view @click="gotoDetail(item)" class="showOrder" >查看订单</view>
+						<view @click="gotoEvaluate(item)" class="evaluate" >评价订单</view>
 					</view>
 				</view>
 			</view>
+			<u-popup :show="payShow" mode="center"  @close="close" @open="open">
+			        <view>
+			          <canvas style="width:200px; height: 200px; z-index: 9999999;margin: 40px auto;"
+			          	canvas-id="myQrcode"></canvas>
+			          <view class="popup-title">收款码</view>
+			        </view>
+			</u-popup>
 		</view>
+
 		<tabBarVue msg="2"></tabBarVue>
 	</view>
 </template>

 <script>
+	import request from '../../utils/request';
 	import VNavigationBar from '@/components/VNavigationBar.vue'
 	import tabBarVue from '@/components/tabBar/tabBar.vue'
+	import drawQrcode from 'weapp-qrcode';
 	
 	export default {
 		components: {
@ -58,7 +69,10 @@
 		},
 		data() {
 			return {
+				payShow:false,
 				activeKey: 0,
+				pageNum:1,
+				totalPages:0,
 				tabList: [{
 						id: 0,
 						title: '全部订单'
@ -72,39 +86,85 @@
 						title: '待评价'
 					},
 				],
-				orderList: [{
-						orderNo: '20198104817050157810',
-						status: '1',
-						busiTypeStr: '维修轮胎',
-						address: '顺捷汽车维修搭电救援补胎中心',
-						amount: '781',
-						date: '2024-07-02  12:00'
-					},
-					{
-						orderNo: '20198104817050157810',
-						status: '2',
-						busiTypeStr: '维修轮胎',
-						address: '顺捷汽车维修搭电救援补胎中心',
-						amount: '781',
-						date: '2024-07-02  12:00'
-					}
+				orderList: [
 				]
 			}
 		},
+		onShow() {
+			this.orderList = []
+			this.getList()
+		},
+		onReachBottom() {
+			if (this.pageNum >= this.totalPages) {
+				uni.showToast({
+					title: '没有下一页数据',
+					icon: 'none'
+				})
+			} else {
+				this.pageNum++
+				this.getList()
+			}
+		},
 		methods: {
+			formatTimestamp(timestamp) {
+			    // 将时间戳转换为Date对象
+			    const date = new Date(timestamp);
+			    // 获取年月日时分秒
+			    const year = date.getFullYear();
+			    const month = (date.getMonth() + 1).toString().padStart(2, '0');
+			    const day = date.getDate().toString().padStart(2, '0');
+			    const hours = date.getHours().toString().padStart(2, '0');
+			    const minutes = date.getMinutes().toString().padStart(2, '0');
+			    const seconds = date.getSeconds().toString().padStart(2, '0');
+			    // 组合成日期时间字符串
+			    return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+		  },
+		  async	getList(){
+				let data = {
+					pageSize: 20,
+					pageNo: this.pageNum
+				}
+				await request({
+					url: '/order/page',
+					method: 'get',
+					params: data
+				}).then((res) => {
+					if (res.code == 200) {
+						this.orderList = this.orderList.concat(res.rows)
+						let total = res.total
+						this.totalPages = Math.ceil(total / this.pageSize);
+					}
+				})
+			},
 			changeTabFun(id) {
 				this.activeKey = id
 			},
 			getStatus(status) {
 				switch (status) {
+					case '0':
+						return '待支付'
 					case '1':
-						return '维修中'
-					case '2':
-						return '待评价'
+						return '已支付'
 					default:
 						break;
 				}
 			},
+			async goPay(data){
+				let that = this
+				await request({
+					url: '/pay/toPay',
+					method: 'get',
+					params: {orderId:data.id}
+				}).then((res) => {
+					that.payShow = true
+					drawQrcode({
+						width: 200,
+						height: 200,
+						canvasId: 'myQrcode',
+						text: res.data.code_url
+					})
+				})
+			},
 			gotoDetail() {
 				uni.navigateTo({
 					url: '/pages/orderDetail/orderDetail'
--- a/utils/request.js
+++ b/utils/request.js
@ -13,6 +13,8 @@ const request = config => {
  config.header = config.header || {}
  if (getToken() && !isToken) {
    config.header['Authorization'] = 'Bearer ' + getToken()
+  }else{
+	  config.header['Authorization'] = 'Bearer ' +'1c734ee940d94a9fbbedf7422c866bb8'
  }
  // get请求映射params参数
  if (config.params) {