0517

package-lock.json

@@ -10,6 +10,7 @@
 			"license": "ISC",
 			"dependencies": {
 				"animate.css": "^4.1.1",
+				"e-peanut": "file:",
 				"epubjs": "^0.3.93",
 				"jquery": "^2.2.4",
 				"qs": "^6.11.0",
@@ -131,6 +132,10 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/e-peanut": {
+			"resolved": "",
+			"link": true
+		},
 		"node_modules/epubjs": {
 			"version": "0.3.93",
 			"resolved": "https://registry.npmjs.org/epubjs/-/epubjs-0.3.93.tgz",
@@ -714,6 +719,511 @@
 				"object-keys": "^1.1.1"
 			}
 		},
+		"e-peanut": {
+			"version": "file:",
+			"requires": {
+				"animate.css": "^4.1.1",
+				"e-peanut": "file:",
+				"epubjs": "^0.3.93",
+				"jquery": "^2.2.4",
+				"qs": "^6.11.0",
+				"quill-image-resize-module": "^3.0.0",
+				"uview-ui": "^2.0.35"
+			},
+			"dependencies": {
+				"@types/localforage": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/localforage/-/localforage-0.0.34.tgz",
+					"integrity": "sha512-tJxahnjm9dEI1X+hQSC5f2BSd/coZaqbIl1m3TCl0q9SVuC52XcXfV0XmoCU1+PmjyucuVITwoTnN8OlTbEXXA==",
+					"requires": {
+						"localforage": "*"
+					}
+				},
+				"@xmldom/xmldom": {
+					"version": "0.7.5",
+					"resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.5.tgz",
+					"integrity": "sha512-V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A=="
+				},
+				"animate.css": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmmirror.com/animate.css/-/animate.css-4.1.1.tgz",
+					"integrity": "sha512-+mRmCTv6SbCmtYJCN4faJMNFVNN5EuCTTprDTAo7YzIGji2KADmakjVA3+8mVDkZ2Bf09vayB35lSQIex2+QaQ=="
+				},
+				"call-bind": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+					"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+					"requires": {
+						"function-bind": "^1.1.1",
+						"get-intrinsic": "^1.0.2"
+					}
+				},
+				"clone": {
+					"version": "2.1.2",
+					"resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+					"integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w=="
+				},
+				"core-js": {
+					"version": "3.24.1",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.24.1.tgz",
+					"integrity": "sha512-0QTBSYSUZ6Gq21utGzkfITDylE8jWC9Ne1D2MrhvlsZBI1x39OdDIVbzSqtgMndIy6BlHxBXpMGqzZmnztg2rg=="
+				},
+				"core-util-is": {
+					"version": "1.0.3",
+					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+					"integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
+				},
+				"d": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
+					"integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+					"requires": {
+						"es5-ext": "^0.10.50",
+						"type": "^1.0.1"
+					}
+				},
+				"deep-equal": {
+					"version": "1.1.2",
+					"resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.2.tgz",
+					"integrity": "sha512-5tdhKF6DbU7iIzrIOa1AOUt39ZRm13cmL1cGEh//aqR8x9+tNfbywRf0n5FD/18OKMdo7DNEtrX2t22ZAkI+eg==",
+					"requires": {
+						"is-arguments": "^1.1.1",
+						"is-date-object": "^1.0.5",
+						"is-regex": "^1.1.4",
+						"object-is": "^1.1.5",
+						"object-keys": "^1.1.1",
+						"regexp.prototype.flags": "^1.5.1"
+					}
+				},
+				"define-data-property": {
+					"version": "1.1.1",
+					"resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
+					"integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
+					"requires": {
+						"get-intrinsic": "^1.2.1",
+						"gopd": "^1.0.1",
+						"has-property-descriptors": "^1.0.0"
+					}
+				},
+				"define-properties": {
+					"version": "1.2.1",
+					"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+					"integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+					"requires": {
+						"define-data-property": "^1.0.1",
+						"has-property-descriptors": "^1.0.0",
+						"object-keys": "^1.1.1"
+					}
+				},
+				"epubjs": {
+					"version": "0.3.93",
+					"resolved": "https://registry.npmjs.org/epubjs/-/epubjs-0.3.93.tgz",
+					"integrity": "sha512-c06pNSdBxcXv3dZSbXAVLE1/pmleRhOT6mXNZo6INKmvuKpYB65MwU/lO7830czCtjIiK9i+KR+3S+p0wtljrw==",
+					"requires": {
+						"@types/localforage": "0.0.34",
+						"@xmldom/xmldom": "^0.7.5",
+						"core-js": "^3.18.3",
+						"event-emitter": "^0.3.5",
+						"jszip": "^3.7.1",
+						"localforage": "^1.10.0",
+						"lodash": "^4.17.21",
+						"marks-pane": "^1.0.9",
+						"path-webpack": "0.0.3"
+					}
+				},
+				"es5-ext": {
+					"version": "0.10.62",
+					"resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz",
+					"integrity": "sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==",
+					"requires": {
+						"es6-iterator": "^2.0.3",
+						"es6-symbol": "^3.1.3",
+						"next-tick": "^1.1.0"
+					}
+				},
+				"es6-iterator": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+					"integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==",
+					"requires": {
+						"d": "1",
+						"es5-ext": "^0.10.35",
+						"es6-symbol": "^3.1.1"
+					}
+				},
+				"es6-symbol": {
+					"version": "3.1.3",
+					"resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
+					"integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
+					"requires": {
+						"d": "^1.0.1",
+						"ext": "^1.1.2"
+					}
+				},
+				"event-emitter": {
+					"version": "0.3.5",
+					"resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+					"integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==",
+					"requires": {
+						"d": "1",
+						"es5-ext": "~0.10.14"
+					}
+				},
+				"eventemitter3": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz",
+					"integrity": "sha512-jLN68Dx5kyFHaePoXWPsCGW5qdyZQtLYHkxkg02/Mz6g0kYpDx4FyP6XfArhQdlOC4b8Mv+EMxPo/8La7Tzghg=="
+				},
+				"ext": {
+					"version": "1.6.0",
+					"resolved": "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz",
+					"integrity": "sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==",
+					"requires": {
+						"type": "^2.5.0"
+					},
+					"dependencies": {
+						"type": {
+							"version": "2.7.2",
+							"resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz",
+							"integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw=="
+						}
+					}
+				},
+				"extend": {
+					"version": "3.0.2",
+					"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+					"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+				},
+				"fast-diff": {
+					"version": "1.1.2",
+					"resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz",
+					"integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig=="
+				},
+				"function-bind": {
+					"version": "1.1.2",
+					"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+					"integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
+				},
+				"functions-have-names": {
+					"version": "1.2.3",
+					"resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+					"integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="
+				},
+				"get-intrinsic": {
+					"version": "1.2.2",
+					"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
+					"integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
+					"requires": {
+						"function-bind": "^1.1.2",
+						"has-proto": "^1.0.1",
+						"has-symbols": "^1.0.3",
+						"hasown": "^2.0.0"
+					}
+				},
+				"gopd": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+					"integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+					"requires": {
+						"get-intrinsic": "^1.1.3"
+					}
+				},
+				"has-property-descriptors": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz",
+					"integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==",
+					"requires": {
+						"get-intrinsic": "^1.2.2"
+					}
+				},
+				"has-proto": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
+					"integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="
+				},
+				"has-symbols": {
+					"version": "1.0.3",
+					"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+					"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
+				},
+				"has-tostringtag": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+					"integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+					"requires": {
+						"has-symbols": "^1.0.2"
+					}
+				},
+				"hasown": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
+					"integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
+					"requires": {
+						"function-bind": "^1.1.2"
+					}
+				},
+				"immediate": {
+					"version": "3.0.6",
+					"resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+					"integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ=="
+				},
+				"inherits": {
+					"version": "2.0.4",
+					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+					"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+				},
+				"is-arguments": {
+					"version": "1.1.1",
+					"resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
+					"integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
+					"requires": {
+						"call-bind": "^1.0.2",
+						"has-tostringtag": "^1.0.0"
+					}
+				},
+				"is-date-object": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+					"integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+					"requires": {
+						"has-tostringtag": "^1.0.0"
+					}
+				},
+				"is-regex": {
+					"version": "1.1.4",
+					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+					"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+					"requires": {
+						"call-bind": "^1.0.2",
+						"has-tostringtag": "^1.0.0"
+					}
+				},
+				"isarray": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+					"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+				},
+				"jquery": {
+					"version": "2.2.4",
+					"resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz",
+					"integrity": "sha512-lBHj60ezci2u1v2FqnZIraShGgEXq35qCzMv4lITyHGppTnA13rwR0MgwyNJh9TnDs3aXUvd1xjAotfraMHX/Q=="
+				},
+				"jszip": {
+					"version": "3.10.1",
+					"resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz",
+					"integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==",
+					"requires": {
+						"lie": "~3.3.0",
+						"pako": "~1.0.2",
+						"readable-stream": "~2.3.6",
+						"setimmediate": "^1.0.5"
+					}
+				},
+				"lie": {
+					"version": "3.3.0",
+					"resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
+					"integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
+					"requires": {
+						"immediate": "~3.0.5"
+					}
+				},
+				"localforage": {
+					"version": "1.10.0",
+					"resolved": "https://registry.npmjs.org/localforage/-/localforage-1.10.0.tgz",
+					"integrity": "sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==",
+					"requires": {
+						"lie": "3.1.1"
+					},
+					"dependencies": {
+						"lie": {
+							"version": "3.1.1",
+							"resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz",
+							"integrity": "sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==",
+							"requires": {
+								"immediate": "~3.0.5"
+							}
+						}
+					}
+				},
+				"lodash": {
+					"version": "4.17.21",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+					"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+				},
+				"marks-pane": {
+					"version": "1.0.9",
+					"resolved": "https://registry.npmjs.org/marks-pane/-/marks-pane-1.0.9.tgz",
+					"integrity": "sha512-Ahs4oeG90tbdPWwAJkAAoHg2lRR8lAs9mZXETNPO9hYg3AkjUJBKi1NQ4aaIQZVGrig7c/3NUV1jANl8rFTeMg=="
+				},
+				"next-tick": {
+					"version": "1.1.0",
+					"resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
+					"integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="
+				},
+				"object-inspect": {
+					"version": "1.12.2",
+					"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
+					"integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="
+				},
+				"object-is": {
+					"version": "1.1.5",
+					"resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
+					"integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
+					"requires": {
+						"call-bind": "^1.0.2",
+						"define-properties": "^1.1.3"
+					}
+				},
+				"object-keys": {
+					"version": "1.1.1",
+					"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+					"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
+				},
+				"pako": {
+					"version": "1.0.11",
+					"resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+					"integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
+				},
+				"parchment": {
+					"version": "1.1.4",
+					"resolved": "https://registry.npmjs.org/parchment/-/parchment-1.1.4.tgz",
+					"integrity": "sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg=="
+				},
+				"path-webpack": {
+					"version": "0.0.3",
+					"resolved": "https://registry.npmjs.org/path-webpack/-/path-webpack-0.0.3.tgz",
+					"integrity": "sha512-AmeDxedoo5svf7aB3FYqSAKqMxys014lVKBzy1o/5vv9CtU7U4wgGWL1dA2o6MOzcD53ScN4Jmiq6VbtLz1vIQ=="
+				},
+				"process-nextick-args": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+					"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+				},
+				"qs": {
+					"version": "6.11.0",
+					"resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+					"integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+					"requires": {
+						"side-channel": "^1.0.4"
+					}
+				},
+				"quill": {
+					"version": "1.3.7",
+					"resolved": "https://registry.npmjs.org/quill/-/quill-1.3.7.tgz",
+					"integrity": "sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==",
+					"requires": {
+						"clone": "^2.1.1",
+						"deep-equal": "^1.0.1",
+						"eventemitter3": "^2.0.3",
+						"extend": "^3.0.2",
+						"parchment": "^1.1.4",
+						"quill-delta": "^3.6.2"
+					}
+				},
+				"quill-delta": {
+					"version": "3.6.3",
+					"resolved": "https://registry.npmjs.org/quill-delta/-/quill-delta-3.6.3.tgz",
+					"integrity": "sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg==",
+					"requires": {
+						"deep-equal": "^1.0.1",
+						"extend": "^3.0.2",
+						"fast-diff": "1.1.2"
+					}
+				},
+				"quill-image-resize-module": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/quill-image-resize-module/-/quill-image-resize-module-3.0.0.tgz",
+					"integrity": "sha512-1TZBnUxU/WIx5dPyVjQ9yN7C6mLZSp04HyWBEMqT320DIq4MW4JgzlOPDZX5ZpBM3bU6sacU4kTLUc8VgYQZYw==",
+					"requires": {
+						"lodash": "^4.17.4",
+						"quill": "^1.2.2",
+						"raw-loader": "^0.5.1"
+					}
+				},
+				"raw-loader": {
+					"version": "0.5.1",
+					"resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz",
+					"integrity": "sha512-sf7oGoLuaYAScB4VGr0tzetsYlS8EJH6qnTCfQ/WVEa89hALQ4RQfCKt5xCyPQKPDUbVUAIP1QsxAwfAjlDp7Q=="
+				},
+				"readable-stream": {
+					"version": "2.3.7",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+					"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+					"requires": {
+						"core-util-is": "~1.0.0",
+						"inherits": "~2.0.3",
+						"isarray": "~1.0.0",
+						"process-nextick-args": "~2.0.0",
+						"safe-buffer": "~5.1.1",
+						"string_decoder": "~1.1.1",
+						"util-deprecate": "~1.0.1"
+					}
+				},
+				"regexp.prototype.flags": {
+					"version": "1.5.1",
+					"resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz",
+					"integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==",
+					"requires": {
+						"call-bind": "^1.0.2",
+						"define-properties": "^1.2.0",
+						"set-function-name": "^2.0.0"
+					}
+				},
+				"safe-buffer": {
+					"version": "5.1.2",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+				},
+				"set-function-name": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz",
+					"integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==",
+					"requires": {
+						"define-data-property": "^1.0.1",
+						"functions-have-names": "^1.2.3",
+						"has-property-descriptors": "^1.0.0"
+					}
+				},
+				"setimmediate": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+					"integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="
+				},
+				"side-channel": {
+					"version": "1.0.4",
+					"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+					"integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+					"requires": {
+						"call-bind": "^1.0.0",
+						"get-intrinsic": "^1.0.2",
+						"object-inspect": "^1.9.0"
+					}
+				},
+				"string_decoder": {
+					"version": "1.1.1",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+					"requires": {
+						"safe-buffer": "~5.1.0"
+					}
+				},
+				"type": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
+					"integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="
+				},
+				"util-deprecate": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+					"integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+				},
+				"uview-ui": {
+					"version": "2.0.35",
+					"resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-2.0.35.tgz",
+					"integrity": "sha512-OfMttN3XkHvQosXfd8bjz8ASTvypPoGzBWmQZBJ871bYMCA7t2bDFPlzjbxUj/5ykAjKnZ8zMUapSwSisVt99g=="
+				}
+			}
+		},
 		"epubjs": {
 			"version": "0.3.93",
 			"resolved": "https://registry.npmjs.org/epubjs/-/epubjs-0.3.93.tgz",

package.json

@@ -6,6 +6,7 @@
 	"keywords": [],
 	"dependencies": {
 		"animate.css": "^4.1.1",
+		"e-peanut": "file:",
 		"epubjs": "^0.3.93",
 		"jquery": "^2.2.4",
 		"qs": "^6.11.0",

pages/peanut/home.vue

@@ -129,20 +129,27 @@
 			</view>
 		</view> -->
 
-		<view class="head_line" style="background-color: #fff;">
+		<!-- <view class="head_line" style="background-color: #fff;">
 			<b></b>
-			<text>新书上市</text>
+			<text>新书上市</text>			
-			<!-- <i @click="onBookMore('New')">查看更多 ></i> -->
+		</view> -->
-		</view>
+		
-
+		<!-- 营销标签 -->
+		<scroll-view class="scroll-view_H " scroll-x="true" scroll-left="0">
+			<view class="ProTabs">
+				<text v-for="(item,index) in yingxiaoTags" :key="item.id" :class="[yxCurIndex == index ? 'cur' :'']"
+					@click="yxTabsChange(item,index)">{{item.title}}</text>
+			</view>
+		</scroll-view>
+		
 		<view class="newBook">
 			<scroll-view class="scroll-view_H " scroll-x="true" scroll-left="10" style="margin-top: 0 !important;">
-				<view :class="['item']" v-for="(item,index) in newBookList" :key="index">
+				<view :class="['item']" v-for="(item,index) in YXBookList" :key="index">
-					<view class="videoBox" @click="goDetail(item.productId)">
+					<view class="videoBox" @click="goDetail(item.product_id)">
-						<image v-if="item.productImages != ''" :src="item.productImages" mode="scaleToFill"></image>
+						<image v-if="item.product_images != ''" :src="item.product_images" mode="scaleToFill"></image>
 						<image v-else src="../../static/icon/wufeng.jpg" mode="scaleToFill"></image>
 					</view>
-					<text class="bookName">{{item.productName}}</text>
+					<text class="bookName">{{item.product_name}}</text>
 				</view>
 			</scroll-view>
 		</view>
@@ -232,22 +239,16 @@
 
 		<scroll-view class="scroll-view_H " scroll-x="true" scroll-left="0">
 			<view class="ProTabs">
-				<text v-for="item in tagList" :key="item.splId" :class="[tabsid == item.splId ? 'cur' :'']"
+				<text v-for="(item,index) in catTagList" :key="item.splId" :class="[tabsid == item.id ? 'cur' :'']"
-					@click="tabsChange(item)">{{item.labelName}}</text>
+					@click="tabsChange(item,index)">{{item.title}}</text>
-			</view>
-		</scroll-view>
-		<scroll-view class="scroll-view_H " scroll-x="true" scroll-left="0" v-if="tabsid == 15">
-			<view class="ProTabs">
-				<text v-for="item in yxtaglist" :key="item.splId" :class="[wztabsid == item.splId ? 'cur' :'']"
-					@click="wztabsChange(item)">{{item.labelName}}</text>
-			</view>
-		</scroll-view>
-		<scroll-view class="scroll-view_H " scroll-x="true" scroll-left="0" v-if="tabsid == 16">
-			<view class="wzProTabs">
-				<text v-for="item in wztaglist" :key="item.splId" :class="[wztabsid == item.splId ? 'cur' :'']"
-					@click="wztabsChange(item)">{{item.labelName}}</text>
 			</view>
 		</scroll-view>
+				<view class="children_cate flexbox" v-if="childrenCatList && childrenCatList.length > 0">
+				
+					<view @click="childrenChange(item,index)" :class="['item',curChildrenId == item.id ? 'cur':'']" v-for="(item, index) in childrenCatList" :key="item.id">
+						<text>{{item.title}}</text>
+					</view>
+				</view>
 		<!-- 商品展示 -->
 		<view class="goods">
 			<!-- 精选 -->
@@ -255,17 +256,17 @@
 				<view v-if="tjProList.length > 0">
 					<view class="flexbox" style="flex-wrap: wrap;">
 						<view class="goodsItem" v-for="(item,index) in tjProList" :key="index"
-							@click="goDetail(item.productId)">
+							@click="goDetail(item.product_id)">
-							<image :src="item.productImages" mode="" class="goodsImg"></image>
+							<image :src="item.product_images" mode="" class="goodsImg"></image>
 							<view class="goodsContent">
 								<view class="goodsName">
-									{{item.productName}}
+									{{item.product_name}}
 								</view>
 								<view class="goodsPrice">
 									<span class="price"
-										v-if="item.activityPrice && item.activityPrice > 0">￥{{item.activityPrice}}</span>
+										v-if="item.activity_price && item.activity_price > 0">￥{{item.activityPrice}}</span>
 									<span class="price" v-else>￥{{item.price}}</span>
-									<span class="Salesnum">已售：{{item.sumSales}} 件</span>
+									<span class="Salesnum">已售：{{item.sum_sales}} 件</span>
 								</view>
 							</view>
 						</view>
@@ -328,6 +329,8 @@
 					'../../static/icon/home_ban_2.jpg',
 					'../../static/icon/home_ban_3.jpg',
 				],
+				yingxiaoTags:[ // 营销标签列表					
+				],
 				xinsList: [],
 				loadingNow: false,
 				limiTist: [],
@@ -338,13 +341,17 @@
 				bgiStyle: {
 					background: '#fff'
 				},
-				newBookList: [],
+				YXBookList: [], 
+				catTagList:[ // 分类标签
+				],
+				curChildrenId:0,
 				iconStyle: {
 					fontSize: '40rpx',
 					fontWeight: 'bold',
 					color: '#54a966',
 				},
 				tagList: [], // 推荐标签列表
+				childrenCatList:[], // 二级分类
 				wztaglist: [{
 						splId: "-1",
 						labelName: "全部"
@@ -387,6 +394,7 @@
 				tjProList: [],
 				status: 3,
 				userMsg: {}, // 用户信息
+				yxCurIndex:0, // 当前营销标签序号
 			};
 		},
 		onPageScroll(e) {
@@ -414,6 +422,7 @@
 			this.getData();
 			this.getTags()
 			this.getUserInfo()
+			this.getYXTgs()
 		},
 		// 页面加载完毕
 		onReady() {
@@ -426,22 +435,23 @@
 			this.getData()
 			this.getTags()
 			this.getUserInfo()
+			this.getYXTgs()
 			// this.requestIapOrder()	
 			uni.stopPullDownRefresh()
 
 		},
-		onReachBottom() {
+		// onReachBottom() {
-			this.loadingNow = true
+		// 	this.loadingNow = true
-			console.log('到底了')
+		// 	console.log('到底了')
-			if (this.page + 1 <= this.totalPage) {
+		// 	if (this.page + 1 <= this.totalPage) {
-				this.status = 0
+		// 		this.status = 0
-				this.page++
+		// 		this.page++
-				this.getJtData()
+		// 		this.getJtData()
-			} else {
+		// 	} else {
-				this.status = 1
+		// 		this.status = 1
-			}
+		// 	}
 
-		},
+		// },
 
 		filters: {
 			// 控制字数
@@ -465,7 +475,39 @@
 		//方法
 		methods: {
 			...mapMutations(['setUserInfo']),
+			// 获取营销标签列表
+			getYXTgs(){
+				this.$http
+					.post('book/labelAndMarket/marketTree')
+					.then(res => {
+						console.log(res, '营销标签列表')
+						if(res.result.length > 0){
+							this.yingxiaoTags = res.result
+							this.getYXproducts()
+						}			
+						
+						// console.log(res)
+					});
+			},
 			// ...mapMutations(['setLoadingShow']),
+			// 获取对应营销商品列表
+			getYXproducts(item){
+				var tag_id = null
+				if(!item){
+					console.log('没有传参')
+					tag_id = this.yingxiaoTags[0].id
+				}else{
+					tag_id = item.id
+				}
+				this.$http
+					.post('book/labelAndMarket/getShopProductListByMarketId',{
+						'marketId':tag_id
+					})
+					.then(res => {
+						console.log(res.result, '营销商品列表')
+						this.YXBookList = res.result
+					});
+			},
 			// 获取用户详情
 			getUserInfo() {
 				// 用户详情
@@ -478,34 +520,62 @@
 				// }
 			},
 			// 获取商品标签
-			getTags() {
+			getTags() {				
 				this.loadingNow = false
 				this.$http
-					.post('book/label/getLabels')
+					.post('book/labelAndMarket/labelTree')
 					.then(res => {
-						console.log(res, '标签列表')
+						// console.log(res, '标签列表')
-						if (res.code == 0 && res.result.labels.length > 0) {
+						if (res.code == 0 && res.result.length > 0) {
-							this.tagList = res.result.labels
+							this.catTagList = res.result
-							this.tabsid = this.tagList[0].splId
+							this.tabsid = this.catTagList[0].id
-							this.getJtData()
+							if(this.catTagList[0].isLast == 1){
+								this.getJtData(this.catTagList[0].id)
+							}else{
+								this.childrenCatList = this.catTagList[0].children
+								this.curChildrenId = this.childrenCatList[0].id
+								this.getJtData(this.childrenCatList[0].id)
+							}
+							
 						}
 					}).catch(e => {
 						console.log(e, 'e')
 					});
 			},
-			tabsChange(item) {
+			// 二级分类点击
+			childrenChange(item,index){
+				// console.log(item,this.curChildrenId,'点击')	
+				this.curChildrenId = this.childrenCatList[index].id
+				this.getJtData(this.childrenCatList[index].id)
+			},
+			tabsChange(item,cindex) {
 				this.tjProList = []
-				this.tabsid = item.splId
+				this.tabsid = item.id
-				if (this.tabsid == 15) {
+				this.childrenCatList = []	
-					this.wztabsid = '0'
+				if(this.catTagList[cindex].isLast == 1){					
-				} else if (this.tabsid == 16) {
+					this.getJtData(this.catTagList[cindex].id)
-					this.wztabsid = '-1'
+				}else{
-				} else {
+					this.childrenCatList = this.catTagList[cindex].children
-					this.wztabsid = ''
+					this.curChildrenId = this.childrenCatList[0].id
+					this.getJtData(this.childrenCatList[0].id)
+					
 				}
-				this.page = 1
+				// this.getJtData()
-				// 获取推荐数据
+				// if (this.tabsid == 15) {
-				this.getJtData()
+				// 	this.wztabsid = '0'
+				// } else if (this.tabsid == 16) {
+				// 	this.wztabsid = '-1'
+				// } else {
+				// 	this.wztabsid = ''
+				// }
+				// this.page = 1
+				// // 获取推荐数据
+				
+			},
+			yxTabsChange(item,index) {
+				// this.yxtaglist = []
+				this.yxCurIndex = index
+				this.getYXproducts(item)
 			},
 			wztabsChange(item) {
 				this.tjProList = []
@@ -514,28 +584,22 @@
 				// 获取推荐数据
 				this.getJtData()
 			},
-			getJtData() {
+			getJtData(cid) {	
+				this.tjProList = []
 				this.$http
 					// .post('book/label/list',{
-					.post('book/label/getProductsByLabel', {
+					.post('book/labelAndMarket/getShopProductListByLabelId', {
-						'splId': this.tabsid,
+						'labelId': cid						
-						'limit': this.pageSize,
-						'page': this.page,
-						'type': this.wztabsid
 					})
 					.then(res => {
-
+						if (res.code == 0 && res.result.length > 0) {
-						if (res.code == 0 && res.page.records.length > 0) {
+							this.tjProList = res.result
-							this.tjProList = this.tjProList.concat(res.page.records)
+						} 
-							this.totalPage = res.page.pages
+						else {
 							this.status = 3
-							console.log(this.tjProList, '按标签检索结果')
-						} else {
-							this.tjProList = []
-							this.totalPage = 0
 						}
 					}).catch(e => {
-						console.log(e, '标签检索报错')
+						console.log(e, '商品分类列表报错')
 					});
 			},
 			// 获取折扣图书
@@ -554,19 +618,19 @@
 					});
 			},
 			// 新书上市
-			getNewBook() {
+			// getNewBook() {
-				this.$http
+			// 	this.$http
-					.post('book/shopproduct/getNewBook', {
+			// 		.post('book/shopproduct/getNewBook', {
-						'limit': 4,
+			// 			'limit': 4,
-						'page': 1
+			// 			'page': 1
-					})
+			// 		})
-					.then(res => {
+			// 		.then(res => {
-						console.log(res, 'xinshu')
+			// 			console.log(res, 'xinshu')
-						this.newBookList = res.page.list
+			// 			this.YXBookList.page.list
-					}).catch(e => {
+			// 		}).catch(e => {
-						console.log(e, '新书上市报错')
+			// 			console.log(e, '新书上市报错')
-					});
+			// 		});
-			},
+			// },
 			// 检测未完成订单
 			requestIapOrder() {
 				console.log('检测支付环境...')
@@ -724,13 +788,7 @@
 			},
 			// 获取列表数据
 			getData() {
-				// this.$http
+				
-				// 	.post('book/book/bookIndex')
-				// 	.then(res => {
-				// 		// this.xinsList = res.bookIndex.newBookList
-				// 		// this.limiTist = res.bookIndex.saleList
-				// 		// this.jingList = res.bookIndex.topBookList
-				// 	});
 
 				// 获取限时秒杀
 				// this.$http
@@ -748,7 +806,7 @@
 				// 		this.goodsList = res.page.list
 				// 	})
 				//this.getOffSale()	
-				this.getNewBook()
+				// this.getNewBook()
 			},
 
 			// 跳转
@@ -824,7 +882,13 @@
 </script>
 <style lang="scss" scoped>
 	@import '@/style/mixin.scss';
-
+	.children_cate{ 
+		background-color: #fff; justify-items: normal;
+		margin-bottom: 12rpx;
+		padding: 0 10rpx;
+		.item{padding: 10rpx; background-color: #eee;}
+		.cur{ color:#55aa7f ;}
+	}
 	.fiveIcon {
 		justify-content: space-between;
 		text-align: center;