+
{{ skuItem.goodsSku.goodsName }}
@@ -80,8 +70,8 @@
-
-## Wut? Poppers?
-A popper is an element on the screen which "pops out" from the natural flow of your application.
-Common examples of poppers are tooltips and popovers.
-
-## So, yet another tooltip library?
-Well, basically, **no**.
-Popper.js is built from the ground up to being modular and fully ~~hackable~~ **customizable**.
-It supports a **plugin system** you can use to add particular behaviors to your poppers.
-It's **AMD** and **CommonJS** compatible and it's well documented thanks to our [JSDoc page](https://fezvrasta.github.io/popper.js/documentation.html).
-
-
-## The Library
-Popper.js is mostly a library with the job of making sure your popper stays near the defined reference element (if you want so).
-Additionally, it provides an easy way to generate your popper element if you don't want to use one already in your DOM.
-
-### Installation
-Popper.js is available on NPM and Bower:
-
-| Source | |
-|:---------|:---------------------------------------------|
-| NPM | `npm install popper.js@0 --save` |
-| Bower | `bower install popper.js#~0 --save` |
-| jsDelivr | `http://www.jsdelivr.com/projects/popper.js` |
-
-> **Heads up!** We are working on the v1.0.0 release of Popper.js, make sure to install the latest v0.* if you want to stay on the stable version!
-
-### Basic usage
-Create a popper near a button:
-
-```js
-var reference = document.querySelector('.my-button');
-var thePopper = new Popper(
- reference,
- {
- content: 'My awesome popper!'
- },
- {
- // popper options here
- }
-);
-```
-
-### "Advanced" usage
-Given an existing popper, ask Popper.js to position it near its button
-
-```js
-var reference = document.querySelector('.my-button');
-var popper = document.querySelector('.my-popper');
-var anotherPopper = new Popper(
- reference,
- popper,
- {
- // popper options here
- }
-);
-```
-
-### Callbacks
-```js
-var reference = document.querySelector('.my-button');
-var popper = document.querySelector('.my-popper');
-var anotherPopper = new Popper(reference, popper).onCreate(instance) {
- // instance is Popper.js instance
-}).onUpdate(function(data) {
- // data is an object containing all the informations computed by Popper.js and used to style the popper and its arrow
-});
-```
-
-### React.js and Ember.js integration
-If you prefer to let your framework apply the styles to your DOM objects, you can follow an approach like the one below:
-```js
-var reference = document.querySelector('.my-button');
-var popper = document.querySelector('.my-popper');
-var anotherPopper = new Popper(reference, popper, {
- modifiersIgnored: ['applyStyle'] // prevent Popper.js from applying styles to your DOM
-}).onUpdate(function(data) {
- // export data in your framework and use its content to apply the style to your popper
-});
-```
-You can find a fully working React.js component visiting this gist:
-https://gist.github.com/FezVrasta/6533adf4358a6927b48f7478706a5f23
-
-
-If you are wondering about the available options of the third argument, check out [our documentation](http://fezvrasta.github.io/popper.js/documentation.html#new_Popper_new)
-
-Visit our [GitHub Page](https://fezvrasta.github.io/popper.js) to see a lot of examples of what you can do right now!
-
-### Writing your own modifiers
-Popper.js is based on a "plugin-like" architecture, most of the features of it are fully encapsulated "modifiers".
-A modifier is a function that is called each time Popper.js needs to compute the position of the popper. For this reason, modifiers should be very performant to avoid bottlenecks.
-
-```
-// this little modifier forces the popper `top` value to be `0`
-function fixToTop(data) {
- data.popper.offsets.top = 0
- return data;
-}
-```
-
-Then, you can add your modifier to your Popper.js instance, adding it to the `modifiers` list in the options:
-
-```
-// note that the built-in modifiers are referenced using strings
-// instead, your custom modifiers are passed directly as functions
-new Popper(a, b, {
- modifiers: [ 'shift', 'offset', 'preventOverflow', 'keepTogether', 'arrow', 'flip', 'applyStyle', fixToTop]
-})
-```
-
-Here is the `data` object content:
-
-```
-let data = {
- // popper and reference elements positions
- offsets: {
- popper: {
- top: Number,
- left: Number,
- width: Number,
- height: Number
- },
- reference: {
- top: Number,
- left: Number,
- width: Number,
- height: Number
- },
- // here, only one of the two values will be different from `0`, depending by the placement
- arrow: {
- left: Number,
- top: Number
- }
- },
- // the result of the _getBoundaries method, these are the limits between the popper can be placed
- boundaries: {
- top: Number,
- right: Number,
- bottom: Number,
- left: Number
- },
- // `top`, `left`, `bottom`, `right` + optional `end` or `start` variations
- placement: String,
- // the placement defined at the beginning, before any edit made by modifiers
- _originalPlacement: String,
- // allows you to know if the `flip` modifier have flipped the placement of the popper
- flipped: Boolean,
- // the node of the arrow (if any)
- arrowElement: HTMLElement,
- // any property defined in this object will be applied to the popper element
- // here you can even override the default styles applied by Popper.js
- styles: {}
-}
-```
-
-
-## Libraries using Popper.js
-
-Popper.js will never winthe prize for "easiest to use tooltip library", well, probably because it's not a tooltip lib. 😅
-With it you can create awesome libraries without worring about the positioning problems! Some great ones using Popper.js are listed here:
-
-- [intro-guide-js](https://github.com/johanlahti/intro-guide-js): Create guided tours of your web pages;
-- [picker.js](https://github.com/GeekAb/picker.js): Modern date picker;
-
-_Want to see your library here? Open an issue and report it._
-
-
-## Notes
-
-### Credits
-I want to thank some friends and projects for the work they did:
-
-- [@AndreaScn](https://github.com/AndreaScn) for its work on the GitHub Page and the manual testing he did during the development;
-- [@vampolo](https://github.com/vampolo) for the original idea and for the name of the library;
-- [Sysdig](https://github.com/Draios) for all the awesome things I learned during these years that made possible for me to write this library;
-- [Tether.js](http://github.hubspot.com/tether/) for having inspired me in writing a positioning library ready for the real world;
-- **you** for the star you'll give to this project and for being so awesome to give this project a try :)
-
-### Copyright and license
-Code and documentation copyright 2016 **Federico Zivolo**. Code released under the [MIT license](LICENSE.md). Docs released under Creative Commons.
diff --git a/node_modules/popper.js/bower.json b/node_modules/popper.js/bower.json
deleted file mode 100644
index ee81041..0000000
--- a/node_modules/popper.js/bower.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "name": "popper.js",
- "description": "A kickass library to manage your poppers",
- "main": "src/popper.js",
- "authors": [
- "Federico Zivolo & Andrea Scianò"
- ],
- "license": "MIT",
- "moduleType": [
- "amd",
- "es6",
- "globals"
- ],
- "homepage": "https://fezvrasta.github.io/popper.js",
- "ignore": [
- "**/.*",
- "node_modules",
- "bower_components",
- "test",
- "tests"
- ]
-}
diff --git a/node_modules/popper.js/build/.gitkeep b/node_modules/popper.js/build/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/node_modules/popper.js/build/popper.js b/node_modules/popper.js/build/popper.js
deleted file mode 100644
index 71090ed..0000000
--- a/node_modules/popper.js/build/popper.js
+++ /dev/null
@@ -1,1327 +0,0 @@
-/**
- * @fileOverview Kickass library to create and place poppers near their reference elements.
- * @version 0.6.4
- * @license
- * Copyright (c) 2016 Federico Zivolo and contributors
- *
- * 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.
- */
-
-//
-// Cross module loader
-// Supported: Node, AMD, Browser globals
-//
-;(function (root, factory) {
- if (typeof define === 'function' && define.amd) {
- // AMD. Register as an anonymous module.
- define(factory);
- } else if (typeof module === 'object' && module.exports) {
- // Node. Does not work with strict CommonJS, but
- // only CommonJS-like environments that support module.exports,
- // like Node.
- module.exports = factory();
- } else {
- // Browser globals (root is window)
- root.Popper = factory();
- }
-}(this, function () {
-
- 'use strict';
-
- var root = window;
-
- // default options
- var DEFAULTS = {
- // placement of the popper
- placement: 'bottom',
-
- gpuAcceleration: true,
-
- // shift popper from its origin by the given amount of pixels (can be negative)
- offset: 0,
-
- // the element which will act as boundary of the popper
- boundariesElement: 'viewport',
-
- // amount of pixel used to define a minimum distance between the boundaries and the popper
- boundariesPadding: 5,
-
- // popper will try to prevent overflow following this order,
- // by default, then, it could overflow on the left and on top of the boundariesElement
- preventOverflowOrder: ['left', 'right', 'top', 'bottom'],
-
- // the behavior used by flip to change the placement of the popper
- flipBehavior: 'flip',
-
- arrowElement: '[x-arrow]',
-
- // list of functions used to modify the offsets before they are applied to the popper
- modifiers: [ 'shift', 'offset', 'preventOverflow', 'keepTogether', 'arrow', 'flip', 'applyStyle'],
-
- modifiersIgnored: [],
- };
-
- /**
- * Create a new Popper.js instance
- * @constructor Popper
- * @param {HTMLElement} reference - The reference element used to position the popper
- * @param {HTMLElement|Object} popper
- * The HTML element used as popper, or a configuration used to generate the popper.
- * @param {String} [popper.tagName='div'] The tag name of the generated popper.
- * @param {Array} [popper.classNames=['popper']] Array of classes to apply to the generated popper.
- * @param {Array} [popper.attributes] Array of attributes to apply, specify `attr:value` to assign a value to it.
- * @param {HTMLElement|String} [popper.parent=window.document.body] The parent element, given as HTMLElement or as query string.
- * @param {String} [popper.content=''] The content of the popper, it can be text, html, or node; if it is not text, set `contentType` to `html` or `node`.
- * @param {String} [popper.contentType='text'] If `html`, the `content` will be parsed as HTML. If `node`, it will be appended as-is.
- * @param {String} [popper.arrowTagName='div'] Same as `popper.tagName` but for the arrow element.
- * @param {Array} [popper.arrowClassNames='popper__arrow'] Same as `popper.classNames` but for the arrow element.
- * @param {String} [popper.arrowAttributes=['x-arrow']] Same as `popper.attributes` but for the arrow element.
- * @param {Object} options
- * @param {String} [options.placement=bottom]
- * Placement of the popper accepted values: `top(-start, -end), right(-start, -end), bottom(-start, -right),
- * left(-start, -end)`
- *
- * @param {HTMLElement|String} [options.arrowElement='[x-arrow]']
- * The DOM Node used as arrow for the popper, or a CSS selector used to get the DOM node. It must be child of
- * its parent Popper. Popper.js will apply to the given element the style required to align the arrow with its
- * reference element.
- * By default, it will look for a child node of the popper with the `x-arrow` attribute.
- *
- * @param {Boolean} [options.gpuAcceleration=true]
- * When this property is set to true, the popper position will be applied using CSS3 translate3d, allowing the
- * browser to use the GPU to accelerate the rendering.
- * If set to false, the popper will be placed using `top` and `left` properties, not using the GPU.
- *
- * @param {Number} [options.offset=0]
- * Amount of pixels the popper will be shifted (can be negative).
- *
- * @param {String|Element} [options.boundariesElement='viewport']
- * The element which will define the boundaries of the popper position, the popper will never be placed outside
- * of the defined boundaries (except if `keepTogether` is enabled)
- *
- * @param {Number} [options.boundariesPadding=5]
- * Additional padding for the boundaries
- *
- * @param {Array} [options.preventOverflowOrder=['left', 'right', 'top', 'bottom']]
- * Order used when Popper.js tries to avoid overflows from the boundaries, they will be checked in order,
- * this means that the last ones will never overflow
- *
- * @param {String|Array} [options.flipBehavior='flip']
- * The behavior used by the `flip` modifier to change the placement of the popper when the latter is trying to
- * overlap its reference element. Defining `flip` as value, the placement will be flipped on
- * its axis (`right - left`, `top - bottom`).
- * You can even pass an array of placements (eg: `['right', 'left', 'top']` ) to manually specify
- * how alter the placement when a flip is needed. (eg. in the above example, it would first flip from right to left,
- * then, if even in its new placement, the popper is overlapping its reference element, it will be moved to top)
- *
- * @param {Array} [options.modifiers=[ 'shift', 'offset', 'preventOverflow', 'keepTogether', 'arrow', 'flip', 'applyStyle']]
- * List of functions used to modify the data before they are applied to the popper, add your custom functions
- * to this array to edit the offsets and placement.
- * The function should reflect the @params and @returns of preventOverflow
- *
- * @param {Array} [options.modifiersIgnored=[]]
- * Put here any built-in modifier name you want to exclude from the modifiers list
- * The function should reflect the @params and @returns of preventOverflow
- *
- * @param {Boolean} [options.removeOnDestroy=false]
- * Set to true if you want to automatically remove the popper when you call the `destroy` method.
- */
- function Popper(reference, popper, options) {
- this._reference = reference.jquery ? reference[0] : reference;
- this.state = { onCreateCalled: false };
-
- // if the popper variable is a configuration object, parse it to generate an HTMLElement
- // generate a default popper if is not defined
- var isNotDefined = typeof popper === 'undefined' || popper === null;
- var isConfig = popper && Object.prototype.toString.call(popper) === '[object Object]';
- if (isNotDefined || isConfig) {
- this._popper = this.parse(isConfig ? popper : {});
- }
- // otherwise, use the given HTMLElement as popper
- else {
- this._popper = popper.jquery ? popper[0] : popper;
- }
-
- // with {} we create a new object with the options inside it
- this._options = Object.assign({}, DEFAULTS, options);
-
- // refactoring modifiers' list
- this._options.modifiers = this._options.modifiers.map(function(modifier){
- // remove ignored modifiers
- if (this._options.modifiersIgnored.indexOf(modifier) !== -1) return;
-
- // set the x-placement attribute before everything else because it could be used to add margins to the popper
- // margins needs to be calculated to get the correct popper offsets
- if (modifier === 'applyStyle') {
- this._popper.setAttribute('x-placement', this._options.placement);
- }
-
- // return predefined modifier identified by string or keep the custom one
- return this.modifiers[modifier] || modifier;
- }.bind(this));
-
- // make sure to apply the popper position before any computation
- this.state.position = this._getPosition(this._popper, this._reference);
- setStyle(this._popper, { position: this.state.position});
-
- // determine how we should set the origin of offsets
- this.state.isParentTransformed = this._getIsParentTransformed(this._popper);
-
- // fire the first update to position the popper in the right place
- this.update();
-
- // setup event listeners, they will take care of update the position in specific situations
- this._setupEventListeners();
- return this;
- }
-
-
- //
- // Methods
- //
- /**
- * Destroy the popper
- * @method
- * @memberof Popper
- */
- Popper.prototype.destroy = function() {
- this._popper.removeAttribute('x-placement');
- this._popper.style.left = '';
- this._popper.style.position = '';
- this._popper.style.top = '';
- this._popper.style[getSupportedPropertyName('transform')] = '';
- this._removeEventListeners();
-
- // remove the popper if user explicity asked for the deletion on destroy
- if (this._options.removeOnDestroy) {
- this._popper.parentNode.removeChild(this._popper);
- }
- return this;
- };
-
- /**
- * Updates the position of the popper, computing the new offsets and applying the new style
- * @method
- * @memberof Popper
- */
- Popper.prototype.update = function() {
- var data = { instance: this, styles: {} };
-
- // make sure to apply the popper position before any computation
- this.state.position = this._getPosition(this._popper, this._reference);
- setStyle(this._popper, { position: this.state.position});
-
- // to avoid useless computations we throttle the popper position refresh to 60fps
- root.requestAnimationFrame(function() {
- var now = root.performance.now();
- if(now - this.state.lastFrame <= 16) {
- // this update fired to early! drop it
- return;
- }
- this.state.lastFrame = now;
-
- // store placement inside the data object, modifiers will be able to edit `placement` if needed
- // and refer to _originalPlacement to know the original value
- data.placement = this._options.placement;
- data._originalPlacement = this._options.placement;
-
- // compute the popper and trigger offsets and put them inside data.offsets
- data.offsets = this._getOffsets(this._popper, this._reference, data.placement);
-
- // get boundaries
- data.boundaries = this._getBoundaries(data, this._options.boundariesPadding, this._options.boundariesElement);
-
- data = this.runModifiers(data, this._options.modifiers);
-
- if (!isFunction(this.state.createCalback)) {
- this.state.onCreateCalled = true;
- }
- if (!this.state.onCreateCalled) {
- this.state.onCreateCalled = true;
- if (isFunction(this.state.createCalback)) {
- this.state.createCalback(this);
- }
- } else if (isFunction(this.state.updateCallback)) {
- this.state.updateCallback(data);
- }
- }.bind(this));
- };
-
- /**
- * If a function is passed, it will be executed after the initialization of popper with as first argument the Popper instance.
- * @method
- * @memberof Popper
- * @param {Function} callback
- */
- Popper.prototype.onCreate = function(callback) {
- // the createCallbacks return as first argument the popper instance
- this.state.createCalback = callback;
- return this;
- };
-
- /**
- * If a function is passed, it will be executed after each update of popper with as first argument the set of coordinates and informations
- * used to style popper and its arrow.
- * NOTE: it doesn't get fired on the first call of the `Popper.update()` method inside the `Popper` constructor!
- * @method
- * @memberof Popper
- * @param {Function} callback
- */
- Popper.prototype.onUpdate = function(callback) {
- this.state.updateCallback = callback;
- return this;
- };
-
- /**
- * Helper used to generate poppers from a configuration file
- * @method
- * @memberof Popper
- * @param config {Object} configuration
- * @returns {HTMLElement} popper
- */
- Popper.prototype.parse = function(config) {
- var defaultConfig = {
- tagName: 'div',
- classNames: [ 'popper' ],
- attributes: [],
- parent: root.document.body,
- content: '',
- contentType: 'text',
- arrowTagName: 'div',
- arrowClassNames: [ 'popper__arrow' ],
- arrowAttributes: [ 'x-arrow']
- };
- config = Object.assign({}, defaultConfig, config);
-
- var d = root.document;
-
- var popper = d.createElement(config.tagName);
- addClassNames(popper, config.classNames);
- addAttributes(popper, config.attributes);
- if (config.contentType === 'node') {
- popper.appendChild(config.content.jquery ? config.content[0] : config.content);
- }else if (config.contentType === 'html') {
- popper.innerHTML = config.content;
- } else {
- popper.textContent = config.content;
- }
-
- if (config.arrowTagName) {
- var arrow = d.createElement(config.arrowTagName);
- addClassNames(arrow, config.arrowClassNames);
- addAttributes(arrow, config.arrowAttributes);
- popper.appendChild(arrow);
- }
-
- var parent = config.parent.jquery ? config.parent[0] : config.parent;
-
- // if the given parent is a string, use it to match an element
- // if more than one element is matched, the first one will be used as parent
- // if no elements are matched, the script will throw an error
- if (typeof parent === 'string') {
- parent = d.querySelectorAll(config.parent);
- if (parent.length > 1) {
- console.warn('WARNING: the given `parent` query(' + config.parent + ') matched more than one element, the first one will be used');
- }
- if (parent.length === 0) {
- throw 'ERROR: the given `parent` doesn\'t exists!';
- }
- parent = parent[0];
- }
- // if the given parent is a DOM nodes list or an array of nodes with more than one element,
- // the first one will be used as parent
- if (parent.length > 1 && parent instanceof Element === false) {
- console.warn('WARNING: you have passed as parent a list of elements, the first one will be used');
- parent = parent[0];
- }
-
- // append the generated popper to its parent
- parent.appendChild(popper);
-
- return popper;
-
- /**
- * Adds class names to the given element
- * @function
- * @ignore
- * @param {HTMLElement} target
- * @param {Array} classes
- */
- function addClassNames(element, classNames) {
- classNames.forEach(function(className) {
- element.classList.add(className);
- });
- }
-
- /**
- * Adds attributes to the given element
- * @function
- * @ignore
- * @param {HTMLElement} target
- * @param {Array} attributes
- * @example
- * addAttributes(element, [ 'data-info:foobar' ]);
- */
- function addAttributes(element, attributes) {
- attributes.forEach(function(attribute) {
- element.setAttribute(attribute.split(':')[0], attribute.split(':')[1] || '');
- });
- }
-
- };
-
- /**
- * Helper used to get the position which will be applied to the popper
- * @method
- * @memberof Popper
- * @param config {HTMLElement} popper element
- * @returns {HTMLElement} reference element
- */
- Popper.prototype._getPosition = function(popper, reference) {
- var container = getOffsetParent(reference);
-
- // Decide if the popper will be fixed
- // If the reference element is inside a fixed context, the popper will be fixed as well to allow them to scroll together
- var isParentFixed = isFixed(container);
- return isParentFixed ? 'fixed' : 'absolute';
- };
-
- /**
- * Helper used to determine if the popper's parent is transformed.
- * @param {[type]} popper [description]
- * @return {[type]} [description]
- */
- Popper.prototype._getIsParentTransformed = function(popper) {
- return isTransformed(popper.parentNode);
- };
-
- /**
- * Get offsets to the popper
- * @method
- * @memberof Popper
- * @access private
- * @param {Element} popper - the popper element
- * @param {Element} reference - the reference element (the popper will be relative to this)
- * @returns {Object} An object containing the offsets which will be applied to the popper
- */
- Popper.prototype._getOffsets = function(popper, reference, placement) {
- placement = placement.split('-')[0];
- var popperOffsets = {};
-
- popperOffsets.position = this.state.position;
- var isParentFixed = popperOffsets.position === 'fixed';
-
- var isParentTransformed = this.state.isParentTransformed;
-
- //
- // Get reference element position
- //
- var offsetParent = (isParentFixed && isParentTransformed) ? getOffsetParent(reference) : getOffsetParent(popper);
- var referenceOffsets = getOffsetRectRelativeToCustomParent(reference, offsetParent, isParentFixed, isParentTransformed);
-
- //
- // Get popper sizes
- //
- var popperRect = getOuterSizes(popper);
-
- //
- // Compute offsets of popper
- //
-
- // depending by the popper placement we have to compute its offsets slightly differently
- if (['right', 'left'].indexOf(placement) !== -1) {
- popperOffsets.top = referenceOffsets.top + referenceOffsets.height / 2 - popperRect.height / 2;
- if (placement === 'left') {
- popperOffsets.left = referenceOffsets.left - popperRect.width;
- } else {
- popperOffsets.left = referenceOffsets.right;
- }
- } else {
- popperOffsets.left = referenceOffsets.left + referenceOffsets.width / 2 - popperRect.width / 2;
- if (placement === 'top') {
- popperOffsets.top = referenceOffsets.top - popperRect.height;
- } else {
- popperOffsets.top = referenceOffsets.bottom;
- }
- }
-
- // Add width and height to our offsets object
- popperOffsets.width = popperRect.width;
- popperOffsets.height = popperRect.height;
-
-
- return {
- popper: popperOffsets,
- reference: referenceOffsets
- };
- };
-
-
- /**
- * Setup needed event listeners used to update the popper position
- * @method
- * @memberof Popper
- * @access private
- */
- Popper.prototype._setupEventListeners = function() {
- // NOTE: 1 DOM access here
- this.state.updateBound = this.update.bind(this);
- root.addEventListener('resize', this.state.updateBound);
- // if the boundariesElement is window we don't need to listen for the scroll event
- if (this._options.boundariesElement !== 'window') {
- var target = getScrollParent(this._reference);
- // here it could be both `body` or `documentElement` thanks to Firefox, we then check both
- if (target === root.document.body || target === root.document.documentElement) {
- target = root;
- }
- target.addEventListener('scroll', this.state.updateBound);
- }
- };
-
- /**
- * Remove event listeners used to update the popper position
- * @method
- * @memberof Popper
- * @access private
- */
- Popper.prototype._removeEventListeners = function() {
- // NOTE: 1 DOM access here
- root.removeEventListener('resize', this.state.updateBound);
- if (this._options.boundariesElement !== 'window') {
- var target = getScrollParent(this._reference);
- // here it could be both `body` or `documentElement` thanks to Firefox, we then check both
- if (target === root.document.body || target === root.document.documentElement) {
- target = root;
- }
- target.removeEventListener('scroll', this.state.updateBound);
- }
- this.state.updateBound = null;
- };
-
- /**
- * Computed the boundaries limits and return them
- * @method
- * @memberof Popper
- * @access private
- * @param {Object} data - Object containing the property "offsets" generated by `_getOffsets`
- * @param {Number} padding - Boundaries padding
- * @param {Element} boundariesElement - Element used to define the boundaries
- * @returns {Object} Coordinates of the boundaries
- */
- Popper.prototype._getBoundaries = function(data, padding, boundariesElement) {
- // NOTE: 1 DOM access here
- var boundaries = {};
- var width, height;
- if (boundariesElement === 'window') {
- var body = root.document.body,
- html = root.document.documentElement;
-
- height = Math.max( body.scrollHeight, body.offsetHeight, html.clientHeight, html.scrollHeight, html.offsetHeight );
- width = Math.max( body.scrollWidth, body.offsetWidth, html.clientWidth, html.scrollWidth, html.offsetWidth );
-
- boundaries = {
- top: 0,
- right: width,
- bottom: height,
- left: 0
- };
- } else if (boundariesElement === 'viewport') {
- var offsetParent = getOffsetParent(this._popper);
- var scrollParent = getScrollParent(this._popper);
- var offsetParentRect = getOffsetRect(offsetParent);
-
- // if the popper is fixed we don't have to substract scrolling from the boundaries
- var scrollTop = data.offsets.popper.position === 'fixed' ? 0 : scrollParent.scrollTop;
- var scrollLeft = data.offsets.popper.position === 'fixed' ? 0 : scrollParent.scrollLeft;
-
- boundaries = {
- top: 0 - (offsetParentRect.top - scrollTop),
- right: root.document.documentElement.clientWidth - (offsetParentRect.left - scrollLeft),
- bottom: root.document.documentElement.clientHeight - (offsetParentRect.top - scrollTop),
- left: 0 - (offsetParentRect.left - scrollLeft)
- };
- } else {
- if (getOffsetParent(this._popper) === boundariesElement) {
- boundaries = {
- top: 0,
- left: 0,
- right: boundariesElement.clientWidth,
- bottom: boundariesElement.clientHeight
- };
- } else {
- boundaries = getOffsetRect(boundariesElement);
- }
- }
- boundaries.left += padding;
- boundaries.right -= padding;
- boundaries.top = boundaries.top + padding;
- boundaries.bottom = boundaries.bottom - padding;
- return boundaries;
- };
-
-
- /**
- * Loop trough the list of modifiers and run them in order, each of them will then edit the data object
- * @method
- * @memberof Popper
- * @access public
- * @param {Object} data
- * @param {Array} modifiers
- * @param {Function} ends
- */
- Popper.prototype.runModifiers = function(data, modifiers, ends) {
- var modifiersToRun = modifiers.slice();
- if (ends !== undefined) {
- modifiersToRun = this._options.modifiers.slice(0, getArrayKeyIndex(this._options.modifiers, ends));
- }
-
- modifiersToRun.forEach(function(modifier) {
- if (isFunction(modifier)) {
- data = modifier.call(this, data);
- }
- }.bind(this));
-
- return data;
- };
-
- /**
- * Helper used to know if the given modifier depends from another one.
- * @method
- * @memberof Popper
- * @returns {Boolean}
- */
-
- Popper.prototype.isModifierRequired = function(requesting, requested) {
- var index = getArrayKeyIndex(this._options.modifiers, requesting);
- return !!this._options.modifiers.slice(0, index).filter(function(modifier) {
- return modifier === requested;
- }).length;
- };
-
- //
- // Modifiers
- //
-
- /**
- * Modifiers list
- * @namespace Popper.modifiers
- * @memberof Popper
- * @type {Object}
- */
- Popper.prototype.modifiers = {};
-
- /**
- * Apply the computed styles to the popper element
- * @method
- * @memberof Popper.modifiers
- * @argument {Object} data - The data object generated by `update` method
- * @returns {Object} The same data object
- */
- Popper.prototype.modifiers.applyStyle = function(data) {
- // apply the final offsets to the popper
- // NOTE: 1 DOM access here
- var styles = {
- position: data.offsets.popper.position
- };
-
- // round top and left to avoid blurry text
- var left = Math.round(data.offsets.popper.left);
- var top = Math.round(data.offsets.popper.top);
-
- // if gpuAcceleration is set to true and transform is supported, we use `translate3d` to apply the position to the popper
- // we automatically use the supported prefixed version if needed
- var prefixedProperty;
- if (this._options.gpuAcceleration && (prefixedProperty = getSupportedPropertyName('transform'))) {
- styles[prefixedProperty] = 'translate3d(' + left + 'px, ' + top + 'px, 0)';
- styles.top = 0;
- styles.left = 0;
- }
- // othwerise, we use the standard `left` and `top` properties
- else {
- styles.left =left;
- styles.top = top;
- }
-
- // any property present in `data.styles` will be applied to the popper,
- // in this way we can make the 3rd party modifiers add custom styles to it
- // Be aware, modifiers could override the properties defined in the previous
- // lines of this modifier!
- Object.assign(styles, data.styles);
-
- setStyle(this._popper, styles);
-
- // set an attribute which will be useful to style the tooltip (use it to properly position its arrow)
- // NOTE: 1 DOM access here
- this._popper.setAttribute('x-placement', data.placement);
-
- // if the arrow style has been computed, apply the arrow style
- if (data.offsets.arrow) {
- setStyle(data.arrowElement, data.offsets.arrow);
- }
-
- // return the data object to allow chaining of other modifiers
- return data;
- };
-
- /**
- * Modifier used to shift the popper on the start or end of its reference element side
- * @method
- * @memberof Popper.modifiers
- * @argument {Object} data - The data object generated by `update` method
- * @returns {Object} The data object, properly modified
- */
- Popper.prototype.modifiers.shift = function(data) {
- var placement = data.placement;
- var basePlacement = placement.split('-')[0];
- var shiftVariation = placement.split('-')[1];
-
- // if shift shiftVariation is specified, run the modifier
- if (shiftVariation) {
- var reference = data.offsets.reference;
- var popper = getPopperClientRect(data.offsets.popper);
-
- var shiftOffsets = {
- y: {
- start: { top: reference.top },
- end: { top: reference.top + reference.height - popper.height }
- },
- x: {
- start: { left: reference.left },
- end: { left: reference.left + reference.width - popper.width }
- }
- };
-
- var axis = ['bottom', 'top'].indexOf(basePlacement) !== -1 ? 'x' : 'y';
-
- data.offsets.popper = Object.assign(popper, shiftOffsets[axis][shiftVariation]);
- }
-
- return data;
- };
-
-
- /**
- * Modifier used to make sure the popper does not overflows from it's boundaries
- * @method
- * @memberof Popper.modifiers
- * @argument {Object} data - The data object generated by `update` method
- * @returns {Object} The data object, properly modified
- */
- Popper.prototype.modifiers.preventOverflow = function(data) {
- var order = this._options.preventOverflowOrder;
- var popper = getPopperClientRect(data.offsets.popper);
-
- var check = {
- left: function() {
- var left = popper.left;
- if (popper.left < data.boundaries.left) {
- left = Math.max(popper.left, data.boundaries.left);
- }
- return { left: left };
- },
- right: function() {
- var left = popper.left;
- if (popper.right > data.boundaries.right) {
- left = Math.min(popper.left, data.boundaries.right - popper.width);
- }
- return { left: left };
- },
- top: function() {
- var top = popper.top;
- if (popper.top < data.boundaries.top) {
- top = Math.max(popper.top, data.boundaries.top);
- }
- return { top: top };
- },
- bottom: function() {
- var top = popper.top;
- if (popper.bottom > data.boundaries.bottom) {
- top = Math.min(popper.top, data.boundaries.bottom - popper.height);
- }
- return { top: top };
- }
- };
-
- order.forEach(function(direction) {
- data.offsets.popper = Object.assign(popper, check[direction]());
- });
-
- return data;
- };
-
- /**
- * Modifier used to make sure the popper is always near its reference
- * @method
- * @memberof Popper.modifiers
- * @argument {Object} data - The data object generated by _update method
- * @returns {Object} The data object, properly modified
- */
- Popper.prototype.modifiers.keepTogether = function(data) {
- var popper = getPopperClientRect(data.offsets.popper);
- var reference = data.offsets.reference;
- var f = Math.floor;
-
- if (popper.right < f(reference.left)) {
- data.offsets.popper.left = f(reference.left) - popper.width;
- }
- if (popper.left > f(reference.right)) {
- data.offsets.popper.left = f(reference.right);
- }
- if (popper.bottom < f(reference.top)) {
- data.offsets.popper.top = f(reference.top) - popper.height;
- }
- if (popper.top > f(reference.bottom)) {
- data.offsets.popper.top = f(reference.bottom);
- }
-
- return data;
- };
-
- /**
- * Modifier used to flip the placement of the popper when the latter is starting overlapping its reference element.
- * Requires the `preventOverflow` modifier before it in order to work.
- * **NOTE:** This modifier will run all its previous modifiers everytime it tries to flip the popper!
- * @method
- * @memberof Popper.modifiers
- * @argument {Object} data - The data object generated by _update method
- * @returns {Object} The data object, properly modified
- */
- Popper.prototype.modifiers.flip = function(data) {
- // check if preventOverflow is in the list of modifiers before the flip modifier.
- // otherwise flip would not work as expected.
- if (!this.isModifierRequired(this.modifiers.flip, this.modifiers.preventOverflow)) {
- console.warn('WARNING: preventOverflow modifier is required by flip modifier in order to work, be sure to include it before flip!');
- return data;
- }
-
- if (data.flipped && data.placement === data._originalPlacement) {
- // seems like flip is trying to loop, probably there's not enough space on any of the flippable sides
- return data;
- }
-
- var placement = data.placement.split('-')[0];
- var placementOpposite = getOppositePlacement(placement);
- var variation = data.placement.split('-')[1] || '';
-
- var flipOrder = [];
- if(this._options.flipBehavior === 'flip') {
- flipOrder = [
- placement,
- placementOpposite
- ];
- } else {
- flipOrder = this._options.flipBehavior;
- }
-
- flipOrder.forEach(function(step, index) {
- if (placement !== step || flipOrder.length === index + 1) {
- return;
- }
-
- placement = data.placement.split('-')[0];
- placementOpposite = getOppositePlacement(placement);
-
- var popperOffsets = getPopperClientRect(data.offsets.popper);
-
- // this boolean is used to distinguish right and bottom from top and left
- // they need different computations to get flipped
- var a = ['right', 'bottom'].indexOf(placement) !== -1;
-
- // using Math.floor because the reference offsets may contain decimals we are not going to consider here
- if (
- a && Math.floor(data.offsets.reference[placement]) > Math.floor(popperOffsets[placementOpposite]) ||
- !a && Math.floor(data.offsets.reference[placement]) < Math.floor(popperOffsets[placementOpposite])
- ) {
- // we'll use this boolean to detect any flip loop
- data.flipped = true;
- data.placement = flipOrder[index + 1];
- if (variation) {
- data.placement += '-' + variation;
- }
- data.offsets.popper = this._getOffsets(this._popper, this._reference, data.placement).popper;
-
- data = this.runModifiers(data, this._options.modifiers, this._flip);
- }
- }.bind(this));
- return data;
- };
-
- /**
- * Modifier used to add an offset to the popper, useful if you more granularity positioning your popper.
- * The offsets will shift the popper on the side of its reference element.
- * @method
- * @memberof Popper.modifiers
- * @argument {Object} data - The data object generated by _update method
- * @returns {Object} The data object, properly modified
- */
- Popper.prototype.modifiers.offset = function(data) {
- var offset = this._options.offset;
- var popper = data.offsets.popper;
-
- if (data.placement.indexOf('left') !== -1) {
- popper.top -= offset;
- }
- else if (data.placement.indexOf('right') !== -1) {
- popper.top += offset;
- }
- else if (data.placement.indexOf('top') !== -1) {
- popper.left -= offset;
- }
- else if (data.placement.indexOf('bottom') !== -1) {
- popper.left += offset;
- }
- return data;
- };
-
- /**
- * Modifier used to move the arrows on the edge of the popper to make sure them are always between the popper and the reference element
- * It will use the CSS outer size of the arrow element to know how many pixels of conjuction are needed
- * @method
- * @memberof Popper.modifiers
- * @argument {Object} data - The data object generated by _update method
- * @returns {Object} The data object, properly modified
- */
- Popper.prototype.modifiers.arrow = function(data) {
- var arrow = this._options.arrowElement;
-
- // if the arrowElement is a string, suppose it's a CSS selector
- if (typeof arrow === 'string') {
- arrow = this._popper.querySelector(arrow);
- }
-
- // if arrow element is not found, don't run the modifier
- if (!arrow) {
- return data;
- }
-
- // the arrow element must be child of its popper
- if (!this._popper.contains(arrow)) {
- console.warn('WARNING: `arrowElement` must be child of its popper element!');
- return data;
- }
-
- // arrow depends on keepTogether in order to work
- if (!this.isModifierRequired(this.modifiers.arrow, this.modifiers.keepTogether)) {
- console.warn('WARNING: keepTogether modifier is required by arrow modifier in order to work, be sure to include it before arrow!');
- return data;
- }
-
- var arrowStyle = {};
- var placement = data.placement.split('-')[0];
- var popper = getPopperClientRect(data.offsets.popper);
- var reference = data.offsets.reference;
- var isVertical = ['left', 'right'].indexOf(placement) !== -1;
-
- var len = isVertical ? 'height' : 'width';
- var side = isVertical ? 'top' : 'left';
- var altSide = isVertical ? 'left' : 'top';
- var opSide = isVertical ? 'bottom' : 'right';
- var arrowSize = getOuterSizes(arrow)[len];
-
- //
- // extends keepTogether behavior making sure the popper and its reference have enough pixels in conjuction
- //
-
- // top/left side
- if (reference[opSide] - arrowSize < popper[side]) {
- data.offsets.popper[side] -= popper[side] - (reference[opSide] - arrowSize);
- }
- // bottom/right side
- if (reference[side] + arrowSize > popper[opSide]) {
- data.offsets.popper[side] += (reference[side] + arrowSize) - popper[opSide];
- }
-
- // compute center of the popper
- var center = reference[side] + (reference[len] / 2) - (arrowSize / 2);
-
- // Compute the sideValue using the updated popper offsets
- var sideValue = center - getPopperClientRect(data.offsets.popper)[side];
-
- // prevent arrow from being placed not contiguously to its popper
- sideValue = Math.max(Math.min(popper[len] - arrowSize, sideValue), 0);
- arrowStyle[side] = sideValue;
- arrowStyle[altSide] = ''; // make sure to remove any old style from the arrow
-
- data.offsets.arrow = arrowStyle;
- data.arrowElement = arrow;
-
- return data;
- };
-
-
- //
- // Helpers
- //
-
- /**
- * Get the outer sizes of the given element (offset size + margins)
- * @function
- * @ignore
- * @argument {Element} element
- * @returns {Object} object containing width and height properties
- */
- function getOuterSizes(element) {
- // NOTE: 1 DOM access here
- var _display = element.style.display, _visibility = element.style.visibility;
- element.style.display = 'block'; element.style.visibility = 'hidden';
- var calcWidthToForceRepaint = element.offsetWidth;
-
- // original method
- var styles = root.getComputedStyle(element);
- var x = parseFloat(styles.marginTop) + parseFloat(styles.marginBottom);
- var y = parseFloat(styles.marginLeft) + parseFloat(styles.marginRight);
- var result = { width: element.offsetWidth + y, height: element.offsetHeight + x };
-
- // reset element styles
- element.style.display = _display; element.style.visibility = _visibility;
- return result;
- }
-
- /**
- * Get the opposite placement of the given one/
- * @function
- * @ignore
- * @argument {String} placement
- * @returns {String} flipped placement
- */
- function getOppositePlacement(placement) {
- var hash = {left: 'right', right: 'left', bottom: 'top', top: 'bottom' };
- return placement.replace(/left|right|bottom|top/g, function(matched){
- return hash[matched];
- });
- }
-
- /**
- * Given the popper offsets, generate an output similar to getBoundingClientRect
- * @function
- * @ignore
- * @argument {Object} popperOffsets
- * @returns {Object} ClientRect like output
- */
- function getPopperClientRect(popperOffsets) {
- var offsets = Object.assign({}, popperOffsets);
- offsets.right = offsets.left + offsets.width;
- offsets.bottom = offsets.top + offsets.height;
- return offsets;
- }
-
- /**
- * Given an array and the key to find, returns its index
- * @function
- * @ignore
- * @argument {Array} arr
- * @argument keyToFind
- * @returns index or null
- */
- function getArrayKeyIndex(arr, keyToFind) {
- var i = 0, key;
- for (key in arr) {
- if (arr[key] === keyToFind) {
- return i;
- }
- i++;
- }
- return null;
- }
-
- /**
- * Get CSS computed property of the given element
- * @function
- * @ignore
- * @argument {Eement} element
- * @argument {String} property
- */
- function getStyleComputedProperty(element, property) {
- // NOTE: 1 DOM access here
- var css = root.getComputedStyle(element, null);
- return css[property];
- }
-
- /**
- * Returns the offset parent of the given element
- * @function
- * @ignore
- * @argument {Element} element
- * @returns {Element} offset parent
- */
- function getOffsetParent(element) {
- // NOTE: 1 DOM access here
- var offsetParent = element.offsetParent;
- return offsetParent === root.document.body || !offsetParent ? root.document.documentElement : offsetParent;
- }
-
- /**
- * Returns the scrolling parent of the given element
- * @function
- * @ignore
- * @argument {Element} element
- * @returns {Element} offset parent
- */
- function getScrollParent(element) {
- if (element === root.document) {
- // Firefox puts the scrollTOp value on `documentElement` instead of `body`, we then check which of them is
- // greater than 0 and return the proper element
- if (root.document.body.scrollTop) {
- return root.document.body;
- } else {
- return root.document.documentElement;
- }
- }
-
- // Firefox want us to check `-x` and `-y` variations as well
- if (
- ['scroll', 'auto'].indexOf(getStyleComputedProperty(element, 'overflow')) !== -1 ||
- ['scroll', 'auto'].indexOf(getStyleComputedProperty(element, 'overflow-x')) !== -1 ||
- ['scroll', 'auto'].indexOf(getStyleComputedProperty(element, 'overflow-y')) !== -1
- ) {
- // If the detected scrollParent is body, we perform an additional check on its parentNode
- // in this way we'll get body if the browser is Chrome-ish, or documentElement otherwise
- // fixes issue #65
- return element === root.document.body ? getScrollParent(element.parentNode) : element;
- }
- return element.parentNode ? getScrollParent(element.parentNode) : element;
- }
-
- /**
- * Check if the given element is fixed or is inside a fixed parent
- * @function
- * @ignore
- * @argument {Element} element
- * @argument {Element} customContainer
- * @returns {Boolean} answer to "isFixed?"
- */
- function isFixed(element) {
- if (element === root.document.body || element.nodeName === 'HTML') {
- return false;
- }
- if (getStyleComputedProperty(element, 'position') === 'fixed') {
- return true;
- }
- return element.parentNode ? isFixed(element.parentNode) : element;
- }
-
- /**
- * Check if the given element has transforms applied to itself or a parent
- * @param {Element} element
- * @return {Boolean} answer to "isTransformed?"
- */
- function isTransformed(element) {
- if (element === root.document.body) {
- return false;
- }
- if (getStyleComputedProperty(element, 'transform') !== 'none') {
- return true;
- }
- return element.parentNode ? isTransformed(element.parentNode) : element;
- }
-
- /**
- * Set the style to the given popper
- * @function
- * @ignore
- * @argument {Element} element - Element to apply the style to
- * @argument {Object} styles - Object with a list of properties and values which will be applied to the element
- */
- function setStyle(element, styles) {
- function is_numeric(n) {
- return (n !== '' && !isNaN(parseFloat(n)) && isFinite(n));
- }
- Object.keys(styles).forEach(function(prop) {
- var unit = '';
- // add unit if the value is numeric and is one of the following
- if (['width', 'height', 'top', 'right', 'bottom', 'left'].indexOf(prop) !== -1 && is_numeric(styles[prop])) {
- unit = 'px';
- }
- element.style[prop] = styles[prop] + unit;
- });
- }
-
- /**
- * Check if the given variable is a function
- * @function
- * @ignore
- * @argument {Element} element - Element to check
- * @returns {Boolean} answer to: is a function?
- */
- function isFunction(functionToCheck) {
- var getType = {};
- return functionToCheck && getType.toString.call(functionToCheck) === '[object Function]';
- }
-
- /**
- * Get the position of the given element, relative to its offset parent
- * @function
- * @ignore
- * @param {Element} element
- * @return {Object} position - Coordinates of the element and its `scrollTop`
- */
- function getOffsetRect(element) {
- var elementRect = {
- width: element.offsetWidth,
- height: element.offsetHeight,
- left: element.offsetLeft,
- top: element.offsetTop
- };
-
- elementRect.right = elementRect.left + elementRect.width;
- elementRect.bottom = elementRect.top + elementRect.height;
-
- // position
- return elementRect;
- }
-
- /**
- * Get bounding client rect of given element
- * @function
- * @ignore
- * @param {HTMLElement} element
- * @return {Object} client rect
- */
- function getBoundingClientRect(element) {
- var rect = element.getBoundingClientRect();
- return {
- left: rect.left,
- top: rect.top,
- right: rect.right,
- bottom: rect.bottom,
- width: rect.right - rect.left,
- height: rect.bottom - rect.top
- };
- }
-
- /**
- * Given an element and one of its parents, return the offset
- * @function
- * @ignore
- * @param {HTMLElement} element
- * @param {HTMLElement} parent
- * @return {Object} rect
- */
- function getOffsetRectRelativeToCustomParent(element, parent, fixed, transformed) {
- var elementRect = getBoundingClientRect(element);
- var parentRect = getBoundingClientRect(parent);
-
- if (fixed && !transformed) {
- var scrollParent = getScrollParent(parent);
- parentRect.top += scrollParent.scrollTop;
- parentRect.bottom += scrollParent.scrollTop;
- parentRect.left += scrollParent.scrollLeft;
- parentRect.right += scrollParent.scrollLeft;
- }
-
- var rect = {
- top: elementRect.top - parentRect.top ,
- left: elementRect.left - parentRect.left ,
- bottom: (elementRect.top - parentRect.top) + elementRect.height,
- right: (elementRect.left - parentRect.left) + elementRect.width,
- width: elementRect.width,
- height: elementRect.height
- };
- return rect;
- }
-
- /**
- * Get the prefixed supported property name
- * @function
- * @ignore
- * @argument {String} property (camelCase)
- * @returns {String} prefixed property (camelCase)
- */
- function getSupportedPropertyName(property) {
- var prefixes = ['', 'ms', 'webkit', 'moz', 'o'];
-
- for (var i = 0; i < prefixes.length; i++) {
- var toCheck = prefixes[i] ? prefixes[i] + property.charAt(0).toUpperCase() + property.slice(1) : property;
- if (typeof root.document.body.style[toCheck] !== 'undefined') {
- return toCheck;
- }
- }
- return null;
- }
-
- /**
- * The Object.assign() method is used to copy the values of all enumerable own properties from one or more source
- * objects to a target object. It will return the target object.
- * This polyfill doesn't support symbol properties, since ES5 doesn't have symbols anyway
- * Source: https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Global_Objects/Object/assign
- * @function
- * @ignore
- */
- if (!Object.assign) {
- Object.defineProperty(Object, 'assign', {
- enumerable: false,
- configurable: true,
- writable: true,
- value: function(target) {
- if (target === undefined || target === null) {
- throw new TypeError('Cannot convert first argument to object');
- }
-
- var to = Object(target);
- for (var i = 1; i < arguments.length; i++) {
- var nextSource = arguments[i];
- if (nextSource === undefined || nextSource === null) {
- continue;
- }
- nextSource = Object(nextSource);
-
- var keysArray = Object.keys(nextSource);
- for (var nextIndex = 0, len = keysArray.length; nextIndex < len; nextIndex++) {
- var nextKey = keysArray[nextIndex];
- var desc = Object.getOwnPropertyDescriptor(nextSource, nextKey);
- if (desc !== undefined && desc.enumerable) {
- to[nextKey] = nextSource[nextKey];
- }
- }
- }
- return to;
- }
- });
- }
-
- if (!root.requestAnimationFrame) {
- /* jshint ignore:start */
- var lastTime = 0;
- var vendors = ['ms', 'moz', 'webkit', 'o'];
- for(var x = 0; x < vendors.length && !root.requestAnimationFrame; ++x) {
- root.requestAnimationFrame = root[vendors[x]+'RequestAnimationFrame'];
- root.cancelAnimationFrame = root[vendors[x]+'CancelAnimationFrame'] || root[vendors[x]+'CancelRequestAnimationFrame'];
- }
-
- if (!root.requestAnimationFrame) {
- root.requestAnimationFrame = function(callback, element) {
- var currTime = new Date().getTime();
- var timeToCall = Math.max(0, 16 - (currTime - lastTime));
- var id = root.setTimeout(function() { callback(currTime + timeToCall); },
- timeToCall);
- lastTime = currTime + timeToCall;
- return id;
- };
- }
-
- if (!root.cancelAnimationFrame) {
- root.cancelAnimationFrame = function(id) {
- clearTimeout(id);
- };
- }
- /* jshint ignore:end */
- }
-
- return Popper;
-}));
diff --git a/node_modules/popper.js/build/popper.min.js b/node_modules/popper.js/build/popper.min.js
deleted file mode 100644
index a8c4d7a..0000000
--- a/node_modules/popper.js/build/popper.min.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @fileOverview Kickass library to create and place poppers near their reference elements.
- * @version 0.6.4
- * @license
- * Copyright (c) 2016 Federico Zivolo and contributors
- *
- * 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.
- */
-!function(a,b){"function"==typeof define&&define.amd?define(b):"object"==typeof module&&module.exports?module.exports=b():a.Popper=b()}(this,function(){"use strict";function a(a,b,c){this._reference=a.jquery?a[0]:a,this.state={onCreateCalled:!1};var d="undefined"==typeof b||null===b,e=b&&"[object Object]"===Object.prototype.toString.call(b);return d||e?this._popper=this.parse(e?b:{}):this._popper=b.jquery?b[0]:b,this._options=Object.assign({},r,c),this._options.modifiers=this._options.modifiers.map(function(a){if(this._options.modifiersIgnored.indexOf(a)===-1)return"applyStyle"===a&&this._popper.setAttribute("x-placement",this._options.placement),this.modifiers[a]||a}.bind(this)),this.state.position=this._getPosition(this._popper,this._reference),k(this._popper,{position:this.state.position}),this.state.isParentTransformed=this._getIsParentTransformed(this._popper),this.update(),this._setupEventListeners(),this}function b(a){var b=a.style.display,c=a.style.visibility;a.style.display="block",a.style.visibility="hidden";var d=(a.offsetWidth,q.getComputedStyle(a)),e=parseFloat(d.marginTop)+parseFloat(d.marginBottom),f=parseFloat(d.marginLeft)+parseFloat(d.marginRight),g={width:a.offsetWidth+f,height:a.offsetHeight+e};return a.style.display=b,a.style.visibility=c,g}function c(a){var b={left:"right",right:"left",bottom:"top",top:"bottom"};return a.replace(/left|right|bottom|top/g,function(a){return b[a]})}function d(a){var b=Object.assign({},a);return b.right=b.left+b.width,b.bottom=b.top+b.height,b}function e(a,b){var c,d=0;for(c in a){if(a[c]===b)return d;d++}return null}function f(a,b){var c=q.getComputedStyle(a,null);return c[b]}function g(a){var b=a.offsetParent;return b!==q.document.body&&b?b:q.document.documentElement}function h(a){return a===q.document?q.document.body.scrollTop?q.document.body:q.document.documentElement:["scroll","auto"].indexOf(f(a,"overflow"))!==-1||["scroll","auto"].indexOf(f(a,"overflow-x"))!==-1||["scroll","auto"].indexOf(f(a,"overflow-y"))!==-1?a===q.document.body?h(a.parentNode):a:a.parentNode?h(a.parentNode):a}function i(a){return a!==q.document.body&&"HTML"!==a.nodeName&&("fixed"===f(a,"position")||(a.parentNode?i(a.parentNode):a))}function j(a){return a!==q.document.body&&("none"!==f(a,"transform")||(a.parentNode?j(a.parentNode):a))}function k(a,b){function c(a){return""!==a&&!isNaN(parseFloat(a))&&isFinite(a)}Object.keys(b).forEach(function(d){var e="";["width","height","top","right","bottom","left"].indexOf(d)!==-1&&c(b[d])&&(e="px"),a.style[d]=b[d]+e})}function l(a){var b={};return a&&"[object Function]"===b.toString.call(a)}function m(a){var b={width:a.offsetWidth,height:a.offsetHeight,left:a.offsetLeft,top:a.offsetTop};return b.right=b.left+b.width,b.bottom=b.top+b.height,b}function n(a){var b=a.getBoundingClientRect();return{left:b.left,top:b.top,right:b.right,bottom:b.bottom,width:b.right-b.left,height:b.bottom-b.top}}function o(a,b,c,d){var e=n(a),f=n(b);if(c&&!d){var g=h(b);f.top+=g.scrollTop,f.bottom+=g.scrollTop,f.left+=g.scrollLeft,f.right+=g.scrollLeft}var i={top:e.top-f.top,left:e.left-f.left,bottom:e.top-f.top+e.height,right:e.left-f.left+e.width,width:e.width,height:e.height};return i}function p(a){for(var b=["","ms","webkit","moz","o"],c=0;c
-
-
-
-
-
-
diff --git a/node_modules/xmldom/CHANGELOG.md b/node_modules/xmldom/CHANGELOG.md
deleted file mode 100644
index 9bb29ec..0000000
--- a/node_modules/xmldom/CHANGELOG.md
+++ /dev/null
@@ -1,92 +0,0 @@
-## 0.3.0
-
-- Node >=10.x now required.
-- Added getElementsByClassName method.
-- Added Node to the list of exports
-- Added lowercase of åäö in entityMap.
-- Moved existing sources into `lib` subdirectory.
-- Removed `.npmignore` in favor of `files` entry in package.json.
-- More `package.json` refactoring.
-- Replaced CHANGELOG with more rigorous file.
-- Replaced LICENSE with more rigorous file.
-- Removed component.json (deprecated package manager https://github.com/componentjs/guide)
-- `proof` devDep updated to latest.
-- Fixed CI.
-- README updates.
-
-## 0.2.1
-
-- More package.json refactoring.
-
-## 0.2.0
-
-- Now publishing under xmldom npm package again; retiring xmldom-alpha.
-- Remove coveralls.
-- Disable cache in travis.
-- Other refactoring.
-
-## 0.1.28 (via xmldom-alpha npm package)
-
-- Removed __proto__ accessor.
-- Appended HTML entities defaults.
-
-## 0.1.27 (via xmldom-alpha npm package)
-
-- Various bug fixes.
-- Don't ask why 0.1.26 and 0.1.25 were skipped. `¯\_(ツ)_/¯`
-
-## 0.1.24 (via xmldom-alpha package)
-
-- Added node filter.
-
-## 0.1.23 (via xmldom-alpha npm package)
-
-- Added namespace support for nest node serialize.
-- Various other bug fixes.
-
-## 0.1.22
-
-- Merge XMLNS serialization.
-- Removed \r from source string.
-- Print namespaces for child elements.
-- Switch references to nodeType to use named constants.
-- Add nodelist toString support.
-
-## 0.1.21
-
-- Fixed serialize bug.
-
-## 0.1.20
-
-- Optimized invalid XML support.
-- Added toString sorter for attributes output.
-- Added html self closed node button.
-- Added `*` NS support for getElementsByTagNameNS.
-- Converted attribute's value to string in setAttributeNS.
-- Added support for HTML entities for HTML docs only.
-- Fixed TypeError when Document is created with DocumentType.
-
-## 0.1.19
-
-- Fixed issue #68, infinite loop on unclosed comment.
-- Added error report for unclosed tag.
-- Various other fixes.
-
-## 0.1.18
-
-- Added default `ns` support.
-- parseFromString now renders entirely plain text documents as textNode.
-- Enabled option to ignore white space on parsing.
-
-## 0.1.16
-
-- Correctly handle multibyte Unicode greater than two byts. #57. #56.
-- Initial unit testing and test coverage. #53. #46. #19.
-- Create Bower `component.json` #52.
-
-## 0.1.8
-
-- Add: some test case from node-o3-xml(excludes xpath support)
-- Fix: remove existed attribute before setting (bug introduced in v0.1.5)
-- Fix: index direct access for childNodes and any NodeList collection(not w3c standard)
-- Fix: remove last child bug
diff --git a/node_modules/xmldom/LICENSE.md b/node_modules/xmldom/LICENSE.md
deleted file mode 100644
index dc140c7..0000000
--- a/node_modules/xmldom/LICENSE.md
+++ /dev/null
@@ -1,4 +0,0 @@
-You can choose any one of these licenses:
-
-- MIT: https://opensource.org/licenses/MIT
-- LGPL: http://www.gnu.org/licenses/lgpl.html
diff --git a/node_modules/xmldom/README.md b/node_modules/xmldom/README.md
deleted file mode 100644
index 14a516b..0000000
--- a/node_modules/xmldom/README.md
+++ /dev/null
@@ -1,221 +0,0 @@
-# XMLDOM [](http://travis-ci.org/xmldom/xmldom) [](http://badge.fury.io/js/xmldom)
-
-A JavaScript implementation of W3C DOM for Node.js, Rhino and the browser. Fully
-compatible with `W3C DOM level2`; and some compatible with `level3`. Supports
-`DOMParser` and `XMLSerializer` interface such as in browser.
-
-**Original project location:** some content before
-
- test popper
- some content after
-
-
-
-
{{ item.name }}
{{ item.mobile }}
默认
@@ -40,7 +27,7 @@
编辑
删除
+ 删除
@@ -52,22 +39,19 @@
添加新收货人
-
-
- {{item.storeName}}
+
+
+ {{item.storeName}}
-
+
-
+
{{ item.goodsName }}
@@ -19,9 +19,6 @@
￥{{ item.price | unitPrice }}
-
@@ -54,23 +51,22 @@ import { myTrackList, deleteHistoryListId } from "@/api/members.js";
export default {
data() {
return {
- editFlag: false,
- allChecked: false,
- loadStatus: "more",
- nomsg: false,
+ editFlag: false, //是否编辑
+ allChecked: false, //是否全选
+ loadStatus: "more", //底部下拉加载状态
+ whetherEmpty: false, //是否数据为空
params: {
pageNumber: 1,
pageSize: 10,
},
- refresh: true,
- list: [],
+
+ trackList: [], //足迹列表
};
},
- onPullDownRefresh() {
- this.params.pageNumber = 1;
- this.list = [];
- this.getList();
- },
+
+ /**
+ * 滑到底部加载下一页数据
+ */
onReachBottom() {
if (this.loadStatus != "noMore") {
this.params.pageNumber++;
@@ -81,11 +77,18 @@ export default {
this.getList();
},
methods: {
- gostore(val) {
+ /**
+ * 导航到店铺
+ */
+ navgaiteToStore(val) {
uni.navigateTo({
url: "/pages/product/shopPage?id=" + val.storeId,
});
},
+
+ /**
+ * 设置右侧导航栏文本
+ */
setStyle(text) {
//导航按钮文本设置
let pages = getCurrentPages();
@@ -95,7 +98,7 @@ export default {
let titleNView = currentWebview.getStyle().titleNView;
titleNView.buttons[0].text = text;
if (text == "完成") {
- this.list.forEach((key) => {
+ this.trackList.forEach((key) => {
key.history.forEach((item) => {
this.$set(item, "___isDel", false);
});
@@ -110,20 +113,19 @@ export default {
document.getElementsByClassName("uni-btn-icon")[1].innerText = text;
// #endif
},
- goDetail(item) {
- //跳转详情
+
+ /**
+ * 跳转详情
+ */
+ navgaiteToDetail(item) {
uni.navigateTo({
url: "/pages/product/goods?id=" + item.id + "&goodsId=" + item.goodsId,
});
},
- goSimilar(item) {
- //找相似
- uni.navigateTo({
- url:
- "/pages/user/similaritem?item=" +
- encodeURIComponent(JSON.stringify(item)),
- });
- },
+
+ /**
+ * 获取我的足迹列表
+ */
getList() {
uni.showLoading({
title: "加载中",
@@ -139,35 +141,44 @@ export default {
let data = res.data.result;
if (data.total == 0) {
- this.nomsg = true;
+ this.whetherEmpty = true;
} else if (data.total < 10) {
this.loadStatus = "noMore";
- this.list.push(...data);
+ this.trackList.push(...data);
} else {
- this.list.push(...data);
+ this.trackList.push(...data);
if (data.length < 10) this.loadStatus = "noMore";
}
}
});
},
+
+ /**
+ * 点击后判断是不是全选
+ */
changeChecked(val) {
- //点击后判断是不是全选
- console.log(val);
- const isCheckedAll = this.list.every((key) => {
- console.log(key);
+ const isCheckedAll = this.trackList.every((key) => {
return key.___isDel == val.___isDel;
});
this.allChecked = isCheckedAll;
},
+
+ /**
+ * 点击全选按钮
+ */
checkedAllitem() {
//全选按钮
- this.list.forEach((key) => {
+ this.trackList.forEach((key) => {
this.$set(key, "___isDel", this.allChecked);
});
},
+
+ /**
+ * 删除足迹
+ */
delAllTracks() {
let way = [];
- this.list.forEach((key) => {
+ this.trackList.forEach((key) => {
if (key.___isDel) {
way.push(key.goodsId);
}
@@ -175,10 +186,8 @@ export default {
if (way.length == 0) return false;
deleteHistoryListId(way).then((res) => {
if (res.data.code == 200) {
- this.list = [];
-
+ this.trackList = [];
this.allChecked = false;
-
this.getList();
} else {
uni.showToast({
@@ -190,6 +199,10 @@ export default {
});
},
},
+
+ /**
+ * 右侧标签栏切换
+ */
onNavigationBarButtonTap(e) {
if (!this.editFlag) {
this.setStyle("完成");
@@ -255,9 +268,6 @@ export default {
}
}
-.myTracks-item-content {
-}
-
.myTracks-item-title {
font-size: 28rpx;
color: #333;
@@ -274,36 +284,6 @@ export default {
padding: 10rpx 0 0 0;
}
-.myTracks-item-price-now {
- font-size: 28rpx;
- color: $light-color;
- margin: 0 10rpx;
-}
-
-.myTracks-item-price-origin {
- font-size: 28rpx;
- color: #999;
- -webkit-text-decoration-line: line-through;
- text-decoration-line: line-through;
- text-decoration: line-through;
-}
-
-.myTracks-item-btn {
- position: absolute;
- right: 20rpx;
- bottom: 20rpx;
- width: 120rpx;
- height: 42rpx;
- background-color: #fff;
- border: 1px solid $aider-light-color;
- border-radius: 10rpx;
- font-size: 24rpx;
- color: $aider-light-color;
- display: flex;
- justify-content: center;
- align-items: center;
-}
-
.myTracks-action-btn {
width: 130rpx;
height: 60rpx;
@@ -319,21 +299,6 @@ export default {
height: 110rpx;
}
-.myTracks-action {
- position: fixed;
- bottom: 0;
- width: 100%;
- height: 100rpx;
- padding: 0 20rpx;
- box-sizing: border-box;
- background-color: #fff;
- align-items: center;
- display: -webkit-box;
- display: -webkit-flex;
- display: flex;
- justify-content: space-between;
-}
-
.myTracks-action-check {
align-items: center;
display: -webkit-box;
diff --git a/pages/mine/point/myPoint.vue b/pages/mine/point/myPoint.vue
index 18575c9..8fa9355 100644
--- a/pages/mine/point/myPoint.vue
+++ b/pages/mine/point/myPoint.vue
@@ -18,104 +18,56 @@
{{ pointData.variablePoint || 0 }}
-
-
- 近30天记录
- 更多
-
-
-
- 近30天记录
- 更多
+
diff --git a/pages/mine/set/editionIntro.vue b/pages/mine/set/editionIntro.vue
index eef232e..ebc7579 100644
--- a/pages/mine/set/editionIntro.vue
+++ b/pages/mine/set/editionIntro.vue
@@ -1,125 +1,122 @@
+// TODO 第一版本暂无此功能 后续优化以及更新
-
-
-
-
- 版本不息 优化不止
-
-
-
- {{item.version}}
- {{$u.timeFormat(item.update_time, 'yyyy-mm-dd')}}
-
-
-
+
+
+
+
+ 版本不息 优化不止
+
+
+
+ {{item.version}}
+ {{$u.timeFormat(item.update_time, 'yyyy-mm-dd')}}
+
+
+
-
diff --git a/pages/mine/set/feedBack.vue b/pages/mine/set/feedBack.vue
index af2e19d..c2f3400 100644
--- a/pages/mine/set/feedBack.vue
+++ b/pages/mine/set/feedBack.vue
@@ -45,9 +45,9 @@ export default {
storage,
config,
feedBack: {
- type:"FUNCTION"
+ type: "FUNCTION", //默认反馈问题为 '功能相关'
},
- action: upload,
+ action: upload, //图片上传地址
list: [
{ text: "功能相关", value: "FUNCTION" },
{ text: "优化反馈", value: "OPTIMIZE" },
@@ -55,8 +55,8 @@ export default {
],
};
},
- onReady() {},
methods: {
+ // 点击反馈内容
handleClick(index) {
this.$set(this.feedBack, "type", this.list[index].value);
},
@@ -64,14 +64,15 @@ export default {
//图片上传
onUploaded(lists) {
let images = [];
-
lists.forEach((item) => {
images.push(item.response.result);
});
- console.log(images);
this.feedBack.images = images.join(",");
},
+ /**
+ * 提交意见反馈
+ */
submit() {
if (!this.feedBack.type) {
uni.showToast({
@@ -97,7 +98,7 @@ export default {
});
return false;
}
-
+ /** 提交 */
feedBack(this.feedBack).then((res) => {
if (res.data.success) {
uni.showToast({
diff --git a/pages/mine/set/personMsg.vue b/pages/mine/set/personMsg.vue
index c2dec67..ba24c28 100644
--- a/pages/mine/set/personMsg.vue
+++ b/pages/mine/set/personMsg.vue
@@ -5,14 +5,10 @@
点击修改头像
-
-
男
女
@@ -20,8 +16,8 @@
-
-
-
-
-
- 开启常用设备保护后，在不常用的手机上登录时，需要进行账号及密码验证，通过后继续登录。
- 常用设备
-
-
-
-
-
-
-
-
-
-
diff --git a/pages/mine/set/securityCenter/editPassword.vue b/pages/mine/set/securityCenter/editPassword.vue
index e9e1723..f938830 100644
--- a/pages/mine/set/securityCenter/editPassword.vue
+++ b/pages/mine/set/securityCenter/editPassword.vue
@@ -40,10 +40,9 @@
diff --git a/pages/mine/set/securityCenter/fingerLogin.vue b/pages/mine/set/securityCenter/fingerLogin.vue
index c0ac97d..f37fc70 100644
--- a/pages/mine/set/securityCenter/fingerLogin.vue
+++ b/pages/mine/set/securityCenter/fingerLogin.vue
@@ -1,70 +1,70 @@
+// TODO 第一版本暂无此功能 后续优化以及更新
-
-
-
-
-
- 开启后可使用指纹认证完成快捷登录，设置仅对本机生效。如需修改指纹，请在系统设置中操作。
-
+
+
+
+
+
+ 开启后可使用指纹认证完成快捷登录，设置仅对本机生效。如需修改指纹，请在系统设置中操作。
+
-
diff --git a/pages/mine/set/setUp.vue b/pages/mine/set/setUp.vue
index 796531f..7deeb18 100644
--- a/pages/mine/set/setUp.vue
+++ b/pages/mine/set/setUp.vue
@@ -137,7 +137,7 @@ export default {
that.getCacheSize(); // 重新计算缓存
},
function (e) {
- console.log(e.message);
+
}
);
} else {
diff --git a/pages/mine/signIn.vue b/pages/mine/signIn.vue
index bc92ca5..8f2a366 100644
--- a/pages/mine/signIn.vue
+++ b/pages/mine/signIn.vue
@@ -58,7 +58,7 @@
获得积分
- {{ continuity_point }}
+ {{ continuityPoint }}
连续签到可获得额外奖励哦！
@@ -71,19 +71,16 @@ import { sign, signTime } from "@/api/point.js";
export default {
data() {
return {
- continuity: 1,
- continuity_point: 2,
- header: {
- top: 0,
- height: 50,
- },
+ continuity: 1, //本月连续签到天数
+ continuityPoint: 2, //获得的积分
signFlag: false,
animationData: {},
- maskFlag: false,
- transFlag: false,
- weekArr: ["日", "一", "二", "三", "四", "五", "六"],
+ maskFlag: false, //
+ transFlag: false, //动画
+ weekArr: ["日", "一", "二", "三", "四", "五", "六"], //周数组
dateArr: [], //每个月的天数
monthArr: [
+ //实例化每个月
"1月",
"2月",
"3月",
@@ -118,6 +115,10 @@ export default {
this.getDate();
},
methods: {
+
+ /**
+ * 补0
+ */
makeUp(val) {
if (val >= 10) {
return val;
@@ -125,18 +126,18 @@ export default {
return "0" + val;
}
},
- // 返回
- back() {
- uni.navigateBack();
- },
- // 签到
+
+ /**
+ * 点击签到
+ */
async signIn() {
await sign().then((response) => {
if (this.ifSign) return;
if (this.signFlag) return;
if (response.data.code != 200) {
- uni.$showToast({
- title: response.message,
+ uni.showToast({
+ title: response.data.message,
+ duration: 2000,
icon: "none",
});
@@ -164,41 +165,24 @@ export default {
);
});
},
- // 关闭弹窗
+
+ /**
+ * 签到成功后关闭弹窗
+ */
close() {
var that = this;
this.maskFlag = false;
this.transFlag = true;
- setTimeout(function () {
+ setTimeout(() => {
that.transFlag = false;
}, 500);
},
- change(id) {
- var i = this.monthArr.indexOf(this.currentMonth),
- curDay = null;
- if (id === "1") {
- i++;
- if (i > 11) {
- this.currentYear++;
- i = 0;
- }
- this.currentMonth = this.monthArr[i];
- this.currentMonthIndex = i + 1;
- } else {
- i--;
- if (i < 0) {
- this.currentYear--;
- i = 11;
- }
- this.currentMonth = this.monthArr[i];
- this.currentMonthIndex = i + 1;
- }
- curDay = this.getWeekByDay(this.currentYear + "-" + (i + 1) + "-1");
- this.getMonthDays(i, curDay);
- this.curentSignData();
- },
+
+ /**
+ * 获取今天时间
+ *
+ */
getDate() {
- //获取日子
var date = new Date(),
index = date.getMonth(),
curDay = null;
@@ -206,16 +190,17 @@ export default {
this.currentMonth = this.monthArr[index];
this.currentMonthIndex = index + 1;
this.currentDay = date.getDate();
- console.log(this.currentDay);
- console.log(this.signArr[this.signArr.length - 1]);
if (this.currentDay == this.signArr[this.signArr.length - 1]) {
- console.log("12");
this.ifSign = true;
}
curDay = this.getWeekByDay(this.currentYear + "-" + (index + 1) + "-1");
this.getMonthDays(index, curDay);
this.curentSignData();
},
+
+ /**
+ * 获取当前已经签到的时间
+ */
curentSignData() {
var date = new Date(),
index = date.getMonth(),
@@ -224,15 +209,13 @@ export default {
for (var i = 0; i < this.signAll.length; i++) {
var item = this.signAll[i];
item.createTime = item.createTime.split(" ")[0];
-
var itemVal = item.createTime.split("-");
- console.log(itemVal);
if (
Number(itemVal[0]) === Number(this.currentYear) &&
Number(itemVal[1]) === Number(this.currentMonthIndex)
) {
this.signArr.push(Number(itemVal[2]));
- console.log(JSON.stringify(this.signArr));
+
}
if (
Number(itemVal[0]) === Number(date.getFullYear()) &&
@@ -243,6 +226,14 @@ export default {
}
}
},
+
+ /**
+ * 循环出当前月份的时间
+ * 例子：
+ * "","","","","","",1,
+ * 2 ,3 ,4 ,5 ,6 ,7 ,8,
+ * ...依次向下排
+ */
getMonthDays(index, day) {
//day 当月1号是周几
this.dateArr = [];
@@ -293,8 +284,11 @@ export default {
}
this.dataObj.push(this.dateArr);
},
+
+ /**
+ * 获取当前月份有几周
+ */
getWeekByDay(dayValue) {
- //dayValue=“2014-01-01”
var day = new Date(Date.parse(dayValue.replace(/-/g, "/"))).getDay(); //将日期值格式化
return day;
},
diff --git a/pages/navigation/point/user.vue b/pages/navigation/point/user.vue
index 48abb1b..f8c0321 100644
--- a/pages/navigation/point/user.vue
+++ b/pages/navigation/point/user.vue
@@ -21,7 +21,7 @@ export default {
},
methods: {
init() {
- console.log(this.$options.filters.isLogin());
+
},
},
};
diff --git a/pages/navigation/search/searchPage.vue b/pages/navigation/search/searchPage.vue
index 62dd68d..5b52d9d 100644
--- a/pages/navigation/search/searchPage.vue
+++ b/pages/navigation/search/searchPage.vue
@@ -91,8 +91,8 @@
@@ -158,8 +158,8 @@
@@ -421,7 +421,7 @@ export default {
},
// 格式化金钱 1999 --> [1999,00]
- Fixed(val) {
+ formatPrice(val) {
if (typeof val == "undefined") {
return val;
}
@@ -611,7 +611,7 @@ export default {
}
//没有更多直接返回
let goodsList = await getGoodsList(this.params);
- console.log(goodsList);
+
if (goodsList.data.result.content.length < 10) {
this.loadingType = "noMore";
}
@@ -662,7 +662,7 @@ export default {
content: "确定清除历史搜索记录？",
success: (res) => {
if (res.confirm) {
- console.log("用户点击确定");
+
this.oldKeywordList = [];
uni.removeStorage({
key: "OldKeys",
@@ -693,7 +693,7 @@ export default {
},
//保存关键字到历史记录
saveKeyword(keyword) {
- console.log(keyword);
+
if (!keyword) return false;
uni.getStorage({
key: "OldKeys",
@@ -714,7 +714,7 @@ export default {
data: JSON.stringify(OldKeys),
});
this.oldKeywordList = OldKeys; //更新历史搜索
- console.log(this.oldKeywordList);
+
},
fail: (e) => {
var OldKeys = [keyword];
diff --git a/pages/order/afterSales/afterSales.vue b/pages/order/afterSales/afterSales.vue
index db5cfd7..5b3ba3d 100644
--- a/pages/order/afterSales/afterSales.vue
+++ b/pages/order/afterSales/afterSales.vue
@@ -10,7 +10,7 @@
{{ order.storeName }}
- 订单编号：{{ order.sn }}
+ 订单编号:{{order.sn}}
@@ -50,11 +50,11 @@
@@ -74,13 +74,9 @@
" @click="onExpress(order, sku)">
提交物流
-
售后详情
-
-
-
@@ -103,8 +99,7 @@
-
diff --git a/pages/order/afterSales/applyDetail.vue b/pages/order/afterSales/applyDetail.vue
index ae69c22..9a7e940 100644
--- a/pages/order/afterSales/applyDetail.vue
+++ b/pages/order/afterSales/applyDetail.vue
@@ -12,11 +12,9 @@
{{
- serviceStatusList[serviceDetail.serviceStatus]
+ serviceDetail.serviceStatus | serviceStatusList
}}
-
+
{{
serviceDetail.serviceStatus | statusFilter
}}
@@ -35,7 +33,7 @@
-
+
@@ -99,21 +97,21 @@
收货地址:
- {{
- change_info.salesConsigneeAddressPath
+ {{
+ storeAfterSaleAddress.salesConsigneeAddressPath
}}
联系人:
- {{ change_info.salesConsigneeName }}
+ {{ storeAfterSaleAddress.salesConsigneeName }}
联系方式:
{{
- change_info.salesConsigneeMobile || "" | secrecyMobile
+ storeAfterSaleAddress.salesConsigneeMobile || "" | secrecyMobile
}}
@@ -189,12 +187,6 @@
-
-
-
@@ -212,51 +204,21 @@ export default {
},
data() {
return {
- // 售后单状态
- serviceStatusList: {
- APPLY: "申请售后",
- PASS: "通过售后",
- REFUSE: "拒绝售后",
- BUYER_RETURN: "买家退货，待卖家收货",
- SELLER_RE_DELIVERY: "商家换货/补发",
- SELLER_CONFIRM: "卖家确认收货",
- SELLER_TERMINATION: "卖家终止售后",
- BUYER_CONFIRM: "买家确认收货",
- BUYER_CANCEL: "买家取消售后",
- WAIT_REFUND: "等待平台退款",
- COMPLETE: "完成售后",
- },
- // 售后类型
serviceTypeList: {
+ // 售后类型
CANCEL: "取消",
RETURN_GOODS: "退货",
EXCHANGE_GOODS: "换货",
RETURN_MONEY: "退款",
},
-
- orderStatusList: {
- UNDELIVERED: "待发货",
- UNPAID: "未付款",
- PAID: "已付款",
- DELIVERED: "已发货",
- CANCELLED: "已取消",
- COMPLETE: "已完成",
- TAKE: "已完成",
- },
- serviceDetail: {},
- logs: [],
- allowable: {},
- goodsList: [],
- change_info: {},
- serviceDetail: {},
- express_info: {},
- imagesList: [],
- refundShow: false,
- accountShow: false,
- bankShow: false,
- returnAdressShow: true,
- shipInfoShow: false,
- sn: "",
+ serviceDetail: {}, // 售后详情
+ logs: [], //日志
+ goodsList: [], //商品列表
+ storeAfterSaleAddress: {}, //售后地址
+ refundShow: false, //退款开关
+ accountShow: false, //账户显示
+ bankShow: false, //银行显示
+ sn: "", //订单sn
};
},
onLoad(options) {
@@ -269,6 +231,9 @@ export default {
this.getLog(options.sn);
},
filters: {
+ /**
+ * 售后状态信息
+ */
statusFilter(val) {
switch (val) {
case "APPLY":
@@ -297,6 +262,10 @@ export default {
return "";
}
},
+
+ /**
+ * 退款信息
+ */
refundWayFilter(val) {
switch (val) {
case "OFFLINE":
@@ -309,6 +278,9 @@ export default {
return "";
}
},
+ /**
+ * 账户信息
+ */
accountTypeFilter(val) {
switch (val) {
case "WEIXINPAY":
@@ -323,6 +295,9 @@ export default {
},
},
methods: {
+ /**
+ * 点击图片放大或保存
+ */
preview(urls, index) {
uni.previewImage({
current: index,
@@ -335,18 +310,29 @@ export default {
});
},
+ /**
+ * 获取地址信息
+ */
getAddress() {
getstoreAfterSaleAddress(this.sn).then((res) => {
if (res.data.success) {
- this.change_info = res.data.result;
+ this.storeAfterSaleAddress = res.data.result;
}
});
},
+
+ /**
+ * 获取日志
+ */
getLog(sn) {
getAfterSaleLog(sn).then((res) => {
this.logs = res.data.result;
});
},
+
+ /**
+ * 初始化详情
+ */
loadDetail() {
uni.showLoading({
title: "加载中",
@@ -354,9 +340,6 @@ export default {
getServiceDetail(this.sn).then((res) => {
uni.hideLoading();
this.serviceDetail = res.data.result;
- this.allowable = this.serviceDetail.allowable;
-
- this.express_info = this.serviceDetail.express_info;
if (this.serviceDetail.serviceType == "RETURN_GOODS") {
this.refundShow = true;
}
@@ -372,11 +355,19 @@ export default {
this.serviceDetail.accountType === "BANK_TRANSFER";
});
},
- gotoGoodsDetail(item) {
+
+ /**
+ * 访问商品详情
+ */
+ navgiateToGoodsDetail(item) {
uni.navigateTo({
url: `/pages/product/goods?id=${item.id}&goodsId=${item.goodsId}`,
});
},
+
+ /**
+ * 进度
+ */
onProgress() {
uni.navigateTo({
url: `./applyProgress?sn=${
@@ -391,7 +382,7 @@ export default {
};
-
diff --git a/pages/order/afterSales/applySuccess.vue b/pages/order/afterSales/applySuccess.vue
index a1e53b3..190d887 100644
--- a/pages/order/afterSales/applySuccess.vue
+++ b/pages/order/afterSales/applySuccess.vue
@@ -5,10 +5,10 @@
售后申请提交成功
- 查看记录
+ 查看记录
- 回到主页
+ 回到主页
@@ -27,12 +27,19 @@ export default {
return {};
},
methods: {
- toMenu() {
+ /**
+ * 跳转到售后服务
+ */
+ navigateToAfterSales() {
uni.redirectTo({
url: "/pages/order/afterSales/afterSales",
});
},
- toHome() {
+
+ /**
+ * 跳转到首页
+ */
+ navigateToHome() {
uni.switchTab({
url: "/pages/tabbar/home/index",
});
@@ -41,7 +48,7 @@ export default {
};
-
diff --git a/pages/order/evaluate/againEvaluate.vue b/pages/order/evaluate/againEvaluate.vue
deleted file mode 100644
index 0a1f453..0000000
--- a/pages/order/evaluate/againEvaluate.vue
+++ /dev/null
@@ -1,241 +0,0 @@
-
-
-
-
-
-
- {{ order.goodsName }}
- /
-
-
-
-
-
-
- 初评日期：{{ $u.timeFormat(order.create_time, 'yyyy-mm-dd') }}
-
-
- 初评评价：{{ order.grade_str }}
-
-
- 初评内容：{{ order.content }}
-
- 初评审核状态：您的初评审核通过
-
-
-
-
- {{ form[0].content.length }}/{{ maxlength }}
-
-
-
-
- 提交
-
-
-
-
-
diff --git a/pages/order/evaluate/evaluateDetail.vue b/pages/order/evaluate/evaluateDetail.vue
index 399bb9b..9f2ec35 100644
--- a/pages/order/evaluate/evaluateDetail.vue
+++ b/pages/order/evaluate/evaluateDetail.vue
@@ -3,13 +3,7 @@
-
{{ comment.memberName }}
@@ -17,21 +11,13 @@
- 商品评价: {{ gradeList[comment.grade] }}
+ 商品评价: {{ gradeList[comment.grade] }}
{{ comment.content }}
-
-
-
-
+
+
+
@@ -39,38 +25,7 @@
{{ comment.goodsName }}
-
-
- 购买{{ calcDay(comment) }}天后追加评论
-
- {{
- comment.additional_comment.create_time | unixToDate
- }}
-
- {{
- comment.additional_comment.content
- }}
-
-
-
-
-
-
-
- 掌柜回复：
-
- {{
- comment.additional_comment.reply.content
- }}
-
-
+
@@ -80,9 +35,9 @@
export default {
data() {
return {
- src: "",
- comment: {},
- gradeList: {
+ comment: {}, //评论信息
+ gradeList: {
+ //评价grade
GOOD: "好评",
MODERATE: "中评",
WORSE: "差评",
@@ -92,11 +47,12 @@ export default {
},
onLoad(options) {
this.comment = JSON.parse(decodeURIComponent(options.comment));
-
},
methods: {
- preview(urls, index) {
-
+ /**
+ * 点击图片放大或保存
+ */
+ preview(urls, index) {
uni.previewImage({
current: index,
urls: urls,
@@ -107,47 +63,15 @@ export default {
},
});
},
- calcDay(order) {
- let date = "";
- console.log();
- if (order.additional_comment) {
- date =
- (order.additional_comment.create_time - order.create_time) /
- 60 /
- 60 /
- 24;
- }
- return Math.ceil(date);
- },
},
};
-
diff --git a/pages/order/evaluate/evaluateInfo.vue b/pages/order/evaluate/evaluateInfo.vue
deleted file mode 100644
index 335f6d5..0000000
--- a/pages/order/evaluate/evaluateInfo.vue
+++ /dev/null
@@ -1,81 +0,0 @@
-
-
-
-
- 1.对商品金额大于20元商品(虚拟商品除外)进行评价并通过审核后，根据商品价格和您的评价内容为您发放积分。
-
-
- 2.只能对90天内购买的订单进行商品评价。
-
-
- 3.同一订单和相隔15日内不同订单中的相同商品，只能评价一次。
-
-
- 4.退换货订单产生的商品评价将会被删除，且会扣除相应的优币。
-
-
- 5.鼓励发表原创、有价值的评价;杜绝剽窃、发表无意义、违反法律法规的评价内容，如果您发布的无效评价超过(包含)5条，则一年内您发表的商品评价都不会获得积分奖励。
-
-
- 6.晒单发表成功后会对晒图进行审核，审核过程中，心得文字会先展示出来，审核通过后，晒图会一起进行展示。
-
-
- 7.对于审核不通过的评价晒单，不能获得优币奖励，且文字、晒图均不能被展示出来，有下列情形之一的，审核不予通过：
-
-
- • 评价心得文字与商品无关，且出现言辞露骨的情况;
-
-
- • 图片与所购商品不一致;
-
-
- • 晒单为截屏图片;
-
-
- • 图片不清晰，不能达到晒单目的;
-
-
- • 图片中涉及淫秽、色情等违法不良信息;
-
-
- • 未经过他人同意，涉及使用他人图片或将他人图片进行编辑后发布;
-
-
- • 盗用他人图片经举报、诉讼情况属实;
-
-
- • 图片中涉及敏感词汇(如：曝光，315，假二水，翻新等);
-
-
- • 图片涉及与客服聊天记录;
-
-
- • 对于成人用品晒单，未对特殊部位进行遮掩或打马赛克。
-
-
-
-
-
-
-
-
diff --git a/pages/order/evaluate/myEvaluate.vue b/pages/order/evaluate/myEvaluate.vue
index bb73bd9..74666fe 100644
--- a/pages/order/evaluate/myEvaluate.vue
+++ b/pages/order/evaluate/myEvaluate.vue
@@ -2,9 +2,9 @@
-
-
+
-
+
-
+
@@ -69,14 +69,7 @@ import { getComments } from "@/api/members.js";
export default {
data() {
return {
- customStyle: {
- backgroundColor: this.$lightColor,
- color: "#FFF",
- height: "60rpx",
- width: "150rpx",
- margin: "20rpx 0",
- },
- list: [
+ list: [ //顶部tab
{
name: "待评价",
},
@@ -84,28 +77,32 @@ export default {
name: "已评价",
},
],
- gradeList: {
+ gradeList: { //评论表
GOOD: "好评",
MODERATE: "中评",
WORSE: "差评",
haveImage: "有图",
},
- current: 0,
- orderList: [],
+ current: 0, //当前tabIndex
+ orderList: [], //商品集合
params: {
pageNumber: 1,
pageSize: 10,
- orderStatus: "",
loadStatus: "more",
},
};
},
+
onShow() {
this.orderList = [];
this.params.pageNumber = 1;
this.current == 0 ? this.loadData() : this.loadComments();
},
watch: {
+ /**
+ * 切换current
+ * 更改页面并重新加载数据
+ */
current(val) {
this.params.pageNumber = 1;
this.params.loadStatus = "more";
@@ -120,16 +117,16 @@ export default {
}
},
},
- mounted() {
- },
+
methods: {
- // 判断当前店铺是否有可评价的商品
+ /**
+ * 判断当前店铺是否有可评价的商品
+ */
commentStatus(val) {
if (this.current == 1) {
return true;
} else {
let show;
-
val.orderItems &&
val.orderItems.forEach((item) => {
if (item.commentStatus == "UNFINISHED") {
@@ -143,6 +140,9 @@ export default {
}
},
+ /**
+ * 点击图片放大或保存
+ */
preview(urls, index) {
uni.previewImage({
current: index,
@@ -155,14 +155,27 @@ export default {
});
},
- change(index) {
+ /**
+ * 点击tab触发
+ */
+ changeTab(index) {
this.current = index;
},
- changeTab(e) {
+
+ /**
+ * 点击swiper
+ */
+ changeSwiper(e) {
this.current = e.target.current;
},
+
+ /**
+ * 获取订单数据
+ */
loadData() {
- uni.showLoading({});
+ uni.showLoading({
+ title: "加载中",
+ });
getOrderList(this.params).then((res) => {
uni.hideLoading();
const orderList = res.data.result.records;
@@ -175,15 +188,25 @@ export default {
}
});
},
- onCommont(order) {
+
+ /**
+ * 发表评价
+ */
+ talkCommont(order) {
uni.navigateTo({
url: `./releaseEvaluate?sn=${order.sn}&order=${encodeURIComponent(
JSON.stringify(order)
)}`,
});
},
+
+ /**
+ * 加载已评价数据
+ */
loadComments() {
- uni.showLoading({});
+ uni.showLoading({
+ title: "加载中",
+ });
getComments(this.params).then((res) => {
uni.hideLoading();
let orderList = res.data.result.records;
@@ -200,19 +223,14 @@ export default {
},
];
});
-
this.orderList = this.orderList.concat(orderList);
-
this.params.pageNumber += 1;
});
},
- onAgain(order) {
- uni.navigateTo({
- url: `./againEvaluate?order=${encodeURIComponent(
- JSON.stringify(order)
- )}`,
- });
- },
+
+ /**
+ * 滑到底部加载数据
+ */
renderData(index) {
if (this.params.loadStatus == "noMore") return;
if (index == 0) {
@@ -224,13 +242,11 @@ export default {
this.params.comment_status = "WAIT_CHASE";
this.loadComments();
}
- if (index == 2) {
- this.params.audit_status = "";
- this.params.comments_type = "";
- this.params.comment_status = "FINISHED";
- this.loadComments();
- }
},
+
+ /**
+ * 评价详情
+ */
onDetail(comment) {
uni.navigateTo({
url:
diff --git a/pages/order/evaluate/releaseEvaluate.vue b/pages/order/evaluate/releaseEvaluate.vue
index 18ec8fc..b3398d4 100644
--- a/pages/order/evaluate/releaseEvaluate.vue
+++ b/pages/order/evaluate/releaseEvaluate.vue
@@ -1,5 +1,6 @@
+
@@ -45,7 +46,7 @@
-
+
@@ -88,47 +89,45 @@ export default {
data() {
return {
storage,
- value: "",
- type: "textarea",
- border: false,
- maxlength: 500,
+ type: "textarea", //输入框状态为 textarea
+ border: false, //没有border
+ maxlength: 500, //评价最大字数为500字
placeholder:
"宝贝满足您的期待吗？说说它的优点和美中不足的地方吧。您的评价会帮助更多的人",
- order: {},
+ order: {}, //订单信息
form: {
- content: "",
- goodsId: "",
- grade: "GOOD",
- orderItemSn: "",
- skuId: "",
- descriptionScore: 5,
- serviceScore: 5,
- deliveryScore: 5,
- // // 是否为初评价 true 默认为初评
- // first_comment: true,
- //content,grade: 'GOOD',skuId,images:[]
+ content: "", //评价详情
+ goodsId: "", //商品id
+ grade: "GOOD", //默认为好评
+ orderItemSn: "", //商品的sn
+ skuId: "", //商品skuId
+ descriptionScore: 5, //默认描述得分为5分
+ serviceScore: 5, //默认服务得分为5分
+ deliveryScore: 5, //默认物流得分为5分
},
- currentIndex: 0,
- action: upload,
+ action: upload, //图片上传地址
};
},
onLoad(options) {
+ // 获取上一级传过来的数据进行解析
this.form.orderItemSn = options.sn;
this.order = JSON.parse(decodeURIComponent(options.order));
- //现在只能一个商品一个评价
- },
- mounted() {
this.form.goodsId = this.order.orderItems[0].goodsId;
this.form.orderItemSn = this.order.orderItems[0].sn;
this.form.skuId = this.order.orderItems[0].skuId;
},
methods: {
- beforeUpload(index) {
- this.currentIndex = index;
- },
- onGrade(grade, index) {
+
+ /**
+ * 点击评价
+ */
+ onGrade(grade) {
this.form.grade = grade;
},
+
+ /**
+ * 提交评价
+ */
onSubmit() {
uni.showLoading({
title: "加载中",
@@ -148,9 +147,12 @@ export default {
});
});
},
+
+ /**
+ * 图片成功后回调
+ */
onUploaded(lists) {
let images = [];
- console.log(lists);
lists.forEach((item) => {
images.push(item.response.result);
});
diff --git a/pages/order/fillorder.vue b/pages/order/fillorder.vue
index 9b11a84..cea9e04 100644
--- a/pages/order/fillorder.vue
+++ b/pages/order/fillorder.vue
@@ -71,7 +71,7 @@
-
@@ -37,7 +37,7 @@
- 暂无优惠券
+
-
+
-
diff --git a/pages/mine/address/addressManage.vue b/pages/mine/address/addressManage.vue
index 00089d7..6bfd8ad 100644
--- a/pages/mine/address/addressManage.vue
+++ b/pages/mine/address/addressManage.vue
@@ -1,32 +1,19 @@
+
-
- 暂无优惠券
-
-
- {{
- item.consigneeAddressPath[0]
- }}
- {{
- item.consigneeAddressPath[1]
- }}
- {{
- item.consigneeAddressPath[2]
- }}
-
- {{
- item.consigneeAddressPath[3]
- }}
-
- {{ item.detail }}
-
+ {{item.consigneeAddressPath[0]}}
+ {{item.consigneeAddressPath[1]}}
+ {{item.consigneeAddressPath[2]}}
+ {{item.consigneeAddressPath[3]}}
+ {{ item.detail }}
+
+
+ {{ item.content }}
+ {{ item.createTime}}
+
+ {{item.pointType == "1" ? '+' : '-'}}{{ item.variablePoint }}
-
-
-
-
-
- {{ item.content }}
- {{ item.createTime}}
-
- {{item.pointType == "1" ? '+' : '-'}}{{ item.variablePoint }}
-
-
- 申请积分
-
-
-
-
-
-
-
-
+
{{ item.goodsName }}
- ¥{{ Fixed(item.price )[0] }} .{{
- Fixed(item.price )[1]
+ ¥{{ formatPrice(item.price )[0] }} .{{
+ formatPrice(item.price )[1]
}}
- ¥{{ Fixed(item.price )[0] }} .{{
- Fixed(item.price )[1]
+ ¥{{ formatPrice(item.price )[0] }} .{{
+ formatPrice(item.price )[1]
}}
- 退货处理-{{ serviceStatusList[order.serviceStatus] }}
- 补发商品-{{ serviceStatusList[order.serviceStatus] }}
- 退款-{{ serviceStatusList[order.serviceStatus] }}
- 换货-{{ serviceStatusList[order.serviceStatus] }}
- 取消订单-{{ serviceStatusList[order.serviceStatus] }}
+ 退货处理-{{ order.serviceStatus | serviceStatusList }}
+ 补发商品-{{ order.serviceStatus | serviceStatusList }}
+ 退款-{{ order.serviceStatus | serviceStatusList }}
+ 换货-{{ order.serviceStatus | serviceStatusList }}
+ 取消订单-{{ order.serviceStatus | serviceStatusList }}
-
+
{{ item.storeName }}
@@ -224,14 +224,6 @@ export default {
shippingText: "LOGISTICS",
shippingFlag: false,
shippingMethod: [
- // {
- // value: "SELF_PICK_UP",
- // label: "自提",
- // },
- // {
- // value: "LOCAL_TOWN_DELIVERY",
- // label: "同城配送",
- // },
{
value: "LOGISTICS",
label: "物流",
@@ -260,6 +252,10 @@ export default {
};
},
filters: {
+
+ /**
+ * 发票收据类型
+ */
receiptType(type) {
switch (type) {
case "VATORDINARY":
@@ -281,8 +277,6 @@ export default {
if (e.from == "backbutton") {
let routes = getCurrentPages();
let curRoute = routes[routes.length - 1].options;
- console.log(routes);
-
routes.forEach((item) => {
if (
item.route == "pages/tabbar/cart/cartList" ||
@@ -309,8 +303,6 @@ export default {
uni.showLoading({
mask: true,
});
- // this.checkedshipMethod([this.shippingMethod[2]]);
-
this.getOrderList();
uni.hideLoading();
if (this.routerVal.way == "PINTUAN") {
@@ -327,9 +319,7 @@ export default {
//发票回调 选择发票之后刷新购物车
async callbackInvoice(val) {
this.invoiceFlag = false;
-
this.receiptList = val;
-
if (val) {
let submit = {
way: this.routerVal.way,
@@ -344,29 +334,11 @@ export default {
},
// 跳转到店铺
- tostore(val) {
+ navigateToStore(val) {
uni.navigateTo({
url: "/pages/product/shopPage?id=" + val.storeId,
});
},
- // 点击配送方式选择
- // checkedshipMethod(val) {
- // API_Order.selectedShipMethod({
- // shippingMethod: val[0].value,
- // way: this.routerVal.way,
- // }).then((res) => {
- // if (res.data.code == 200) {
- // this.shippingText = val[0].value;
- // } else {
- // uni.showToast({
- // title: res.data.message,
- // duration: 2000,
- // icon: "none",
- // });
- // }
- // });
- // },
-
// 点击跳转地址
clickToAddress() {
this.navigateTo(
@@ -419,12 +391,18 @@ export default {
);
},
+ /**
+ * 跳转
+ */
navigateTo(url) {
uni.navigateTo({
url,
});
},
+ /**
+ * 提交订单准备支付
+ */
submit() {
if (!this.address.id) {
uni.showToast({
@@ -457,6 +435,9 @@ export default {
? (submit.parentOrderSn = this.routerVal.parentOrder.orderSn)
: delete submit.parentOrderSn;
+ /**
+ * 创建订单
+ */
API_Trade.createTrade(submit).then((res) => {
if (res.data.success) {
uni.showToast({
@@ -491,6 +472,9 @@ export default {
this.$u.debounce(this.submit(), 3000);
},
+ /**
+ * 微信小程序中直接支付
+ */
async pay(sn) {
new LiLiWXPay({
sn: sn,
@@ -499,7 +483,7 @@ export default {
},
/**
- * @param id
+ * 获取用户地址
*/
getUserAddress() {
// 如果没有商品选择地址的话 则选择 默认地址
@@ -509,8 +493,6 @@ export default {
","
);
this.address = res.data.result;
-
- console.log(this.address);
}
});
},
diff --git a/pages/order/invoice/invoiceDetail.vue b/pages/order/invoice/invoiceDetail.vue
index 21aea58..d941785 100644
--- a/pages/order/invoice/invoiceDetail.vue
+++ b/pages/order/invoice/invoiceDetail.vue
@@ -63,6 +63,9 @@ export default {
this.order = order;
});
},
+ /**
+ * 点击图片放大或保存
+ */
preview() {
//预览发票
if (this.order.elec_file_list.length) {
diff --git a/pages/order/invoice/setInvoice.vue b/pages/order/invoice/setInvoice.vue
index e8841b8..648b6c6 100644
--- a/pages/order/invoice/setInvoice.vue
+++ b/pages/order/invoice/setInvoice.vue
@@ -142,7 +142,7 @@ export default {
this.invoiceHeader[0].active = true;
this.goodsType[0].active = true;
}
- console.log(this.res);
+
},
methods: {
handleClickHeader(val, index, arr) {
diff --git a/pages/order/myOrder.vue b/pages/order/myOrder.vue
index a42007c..805a550 100644
--- a/pages/order/myOrder.vue
+++ b/pages/order/myOrder.vue
@@ -3,27 +3,25 @@
{{ item.text }}
-
-
+
{{ order.storeName }}
{{
- orderStatusList[order.orderStatus]
+ order.orderStatus | orderStatusList
}}
-
+
@@ -31,7 +29,6 @@
{{ order.groupName }}
￥{{ order.flowPrice | unitPrice }}
-
@@ -41,53 +38,31 @@
-
已付金额：
应付金额：
￥{{ order.flowPrice | unitPrice }}
-
-
-
- 立即付款
+ 立即付款
取消订单
-
+
查看物流
-
+
确认收货
-
-
再次购买
-
-
-
-
-
@@ -136,17 +111,9 @@ export default {
},
data() {
return {
- tabCurrentIndex: 0,
- orderStatusList: {
- UNDELIVERED: "待发货",
- UNPAID: "未付款",
- PAID: "已付款",
- DELIVERED: "已发货",
- CANCELLED: "已取消",
- COMPLETED: "已完成",
- TAKE: "已完成",
- },
+ tabCurrentIndex: 0, //导航栏索引
navList: [
+ //导航栏list
{
state: 0,
text: "全部",
@@ -190,13 +157,14 @@ export default {
pageNumber: 1,
},
],
- status: "",
+ status: "", //接收导航栏状态
params: {
pageNumber: 1,
pageSize: 10,
tag: "ALL",
},
orderStatus: [
+ //订单状态
{
orderStatus: "ALL", //全部
},
@@ -216,14 +184,17 @@ export default {
orderStatus: "CANCELLED", //已取消
},
],
- cancelShow: false,
- orderSn: "",
+ cancelShow: false, //是否显示取消
+ orderSn: "", //ordersn
reason: "", //取消原因
- cancelList: "",
-
- rogShow: false,
+ cancelList: "", //取消列表
+ rogShow: false, //显示是否收货
};
},
+
+ /**
+ * 跳转到个人中心
+ */
onBackPress(e) {
if (e.from == "backbutton") {
uni.reLaunch({
@@ -232,9 +203,8 @@ export default {
return true; //阻止默认返回行为
}
},
- onPullDownRefresh(){
- this.loadData(this.status)
- // uni.stopPullDownRefresh();
+ onPullDownRefresh() {
+ this.loadData(this.status);
},
onLoad(options) {
@@ -251,6 +221,7 @@ export default {
},
watch: {
+ /**监听更改请求数据 */
tabCurrentIndex(val) {
this.params.tag = this.orderStatus[val].orderStatus;
//切换标签页将所有的页数都重置为1
@@ -264,13 +235,15 @@ export default {
},
methods: {
// 店铺详情
- tostore(val) {
+ navigateToStore(val) {
uni.navigateTo({
url: "/pages/product/shopPage?id=" + val.storeId,
});
},
- //取消订单
+ /**
+ * 取消订单
+ */
onCancel(sn) {
this.orderSn = sn;
this.cancelShow = true;
@@ -284,34 +257,51 @@ export default {
uni.hideLoading();
});
},
+
+ /**
+ * 初始化数据
+ */
initData(index) {
this.navList[index].pageNumber = 1;
this.navList[index].loadStatus = "more";
this.navList[index].orderList = [];
this.loadData(index);
},
+
+ /**
+ * 等待支付
+ */
waitPay(val) {
- this.$u.debounce(this.pay(val), 3000)
+ this.$u.debounce(this.pay(val), 3000);
},
- pay(val){
- if(val.sn){
+
+ /**
+ * 支付
+ */
+ pay(val) {
+ if (val.sn) {
// #ifdef MP-WEIXIN
- new LiLiWXPay({sn:val.sn,price:val.flowPrice,orderType:'ORDER'}).pay()
+ new LiLiWXPay({
+ sn: val.sn,
+ price: val.flowPrice,
+ orderType: "ORDER",
+ }).pay();
// #endif
// #ifndef MP-WEIXIN
uni.navigateTo({
- url: "/pages/cart/payment/payOrder?order_sn=" + val.sn,
- })
+ url: "/pages/cart/payment/payOrder?order_sn=" + val.sn,
+ });
// #endif
}
},
-
- //获取订单列表
+ /**
+ * 获取订单列表
+ */
loadData(index) {
this.params.pageNumber = this.navList[index].pageNumber;
getOrderList(this.params).then((res) => {
- uni.stopPullDownRefresh()
+ uni.stopPullDownRefresh();
if (!res.data.success) {
this.navList[index].loadStatus = "noMore";
return false;
@@ -392,17 +382,26 @@ export default {
stateTipColor,
};
},
- onDetail(sn) {
+
+ /**
+ * 跳转到订单详情
+ */
+ navigateToOrderDetail(sn) {
uni.navigateTo({
url: "./orderDetail?sn=" + sn,
});
},
- //选择取消原因
+ /**
+ * 选择取消原因
+ */
reasonChange(reason) {
this.reason = reason;
},
- //提交取消订单（未付款）
+
+ /**
+ * 提交取消订单（未付款）
+ */
submitCancel() {
cancelOrder(this.orderSn, { reason: this.reason }).then((res) => {
if (res.statusCode == 200) {
@@ -414,24 +413,28 @@ export default {
this.initData(0);
this.cancelShow = false;
- }
- else{
+ } else {
uni.showToast({
title: res.data.message,
duration: 2000,
icon: "none",
});
- this.cancelShow = false
+ this.cancelShow = false;
}
});
},
- //确认收货
+
+ /**
+ * 确认收货显示
+ */
onRog(sn) {
this.orderSn = sn;
this.rogShow = true;
-
- //
},
+
+ /**
+ * 点击确认收货
+ */
confirmRog() {
confirmReceipt(this.orderSn).then((res) => {
if (res.data.code == 200) {
@@ -445,28 +448,43 @@ export default {
}
});
},
- //评价商品
+
+ /**
+ * 评价商品
+ */
onComment(sn) {
uni.navigateTo({
url: "./evaluate/myEvaluate",
});
},
+
+ /**
+ * 重新购买
+ */
reBuy(order) {
uni.navigateTo({
- url: "/pages/product/goods?id=" + order.groupSkuId + "&goodsId="+ order.goodsId,
+ url:
+ "/pages/product/goods?id=" +
+ order.groupSkuId +
+ "&goodsId=" +
+ order.goodsId,
});
},
- //查看物流
- onLogistics(order) {
+
+ /**
+ * 查看物流
+ */
+ navigateToLogistics(order) {
uni.navigateTo({
- url: "/pages/mine/msgTips/packageMsg/logisticsDetail?order_sn=" + order.sn,
+ url:
+ "/pages/mine/msgTips/packageMsg/logisticsDetail?order_sn=" + order.sn,
});
},
},
};
-
diff --git a/pages/product/goods.vue b/pages/product/goods.vue
index 8d77b16..5075a71 100644
--- a/pages/product/goods.vue
+++ b/pages/product/goods.vue
@@ -75,12 +75,12 @@
- {{pointDetail.points}}
+ {{pointDetail.points}}
积分
- ¥{{ Fixed(goodsDetail.price)[0] }}.{{
- Fixed(goodsDetail.price)[1]
+ ¥{{ formatPrice(goodsDetail.price)[0] }}.{{
+ formatPrice(goodsDetail.price)[1]
}}
¥0 .00
@@ -158,7 +158,7 @@
-
+
店铺
@@ -214,8 +214,8 @@
@@ -245,7 +245,6 @@ import GoodsSwiper from "./product/goods/-goods-swiper"; //轮播图组件
import popupGoods from "./product/popup/goods"; //购物车商品的模块
import popupAddress from "./product/popup/address"; //地址选择模块
import shares from "@/components/m-share/index"; //分享
-
export default {
components: {
shares,
@@ -351,7 +350,7 @@ export default {
if (val) {
let timer = setInterval(() => {
this.$refs.popupGoods.buyType = "PINTUAN";
- console.log(this.$refs.popupGoods.buyType);
+
clearInterval(timer);
}, 100);
@@ -394,8 +393,7 @@ export default {
},
async onLoad(options) {
this.routerVal = options;
- },
- onShow() {
+
this.goodsDetail = {};
//如果有参数ids说明事分销短连接，需要获取参数
if (this.routerVal.scene) {
@@ -409,15 +407,11 @@ export default {
this.init(
this.routerVal.id,
this.routerVal.goodsId,
- this.routerVal.distributionId,
- this.routerVal.whetherPoint
+ this.routerVal.distributionId
);
}
},
- onReachBottom() {
- this.storeParams.pageNumber++;
- this.getOtherLikeGoods();
- },
+ onShow() {},
methods: {
// 循环出当前促销是否为空
emptyPromotion() {
@@ -430,7 +424,7 @@ export default {
}
},
/**初始化信息 */
- async init(id, goodsId, distributionId, whetherPoint) {
+ async init(id, goodsId, distributionId) {
this.isGroup = false; //初始化拼团
this.productId = id; // skuId
// 这里请求获取到页面数据 解析数据
@@ -456,7 +450,6 @@ export default {
// 积分
if (item.indexOf("POINTS_GOODS") == 0) {
this.pointDetail = this.PromotionList[item];
- console.log(this.pointDetail);
}
});
// 轮播图
@@ -466,7 +459,7 @@ export default {
this.getstoreBaseInfoFun(this.goodsDetail.storeId);
// 获取购物车
- this.cartNum();
+ this.cartCount();
// 获取店铺推荐商品
this.getstoreRecommend();
@@ -481,13 +474,14 @@ export default {
},
// 格式化金钱 1999 --> [1999,00]
- Fixed(val) {
+ formatPrice(val) {
if (typeof val == "undefined") {
return val;
}
return val.toFixed(2).split(".");
},
+ /**选择商品 */
changedGoods(val) {
this.selectedGoods = val;
},
@@ -516,7 +510,9 @@ export default {
this.shutMask(4, "PINTUAN", order);
},
- // 查看购物车
+ /**
+ * 查看购物车
+ */
reluchToCart() {
let obj = {
from: "product",
@@ -528,8 +524,10 @@ export default {
});
},
- // 查询购物车总数量
- cartNum() {
+ /**
+ * 查询购物车总数量
+ */
+ cartCount() {
if (storage.getHasLogin()) {
API_trade.getCartNum().then((res) => {
this.nums = res.data.result;
@@ -537,11 +535,25 @@ export default {
}
},
+ /**
+ * 返回
+ */
back() {
- uni.navigateBack();
+
+ if(getCurrentPages().length ==1){
+ uni.switchTab({
+ url: '/pages/tabbar/home/index'
+ });
+ }
+ else{
+ uni.navigateBack();
+ }
+
},
- // 获取店铺信息
+ /**
+ * 获取店铺信息
+ */
getstoreBaseInfoFun(id) {
API_store.getstoreBaseInfo(id).then((res) => {
if (res.data.success) {
@@ -550,9 +562,10 @@ export default {
});
},
- // 删除收藏店铺
+ /**
+ * 删除收藏店铺
+ */
deleteGoodsCollectionFun(id) {
- // deleteStoreCollection
API_Members.deleteGoodsCollection(id).then((res) => {
if (res.statusCode == 200) {
uni.showToast({
@@ -564,7 +577,9 @@ export default {
});
},
- // 获取商品是否已被收藏
+ /**
+ * 获取商品是否已被收藏
+ */
getGoodsCollectionFun(goodsId) {
if (storage.getHasLogin()) {
API_Members.getGoodsIsCollect(goodsId, "GOODS").then((res) => {
@@ -573,7 +588,9 @@ export default {
}
},
- // 获取店铺推荐商品列表
+ /**
+ * 获取店铺推荐商品列表
+ */
getstoreRecommend() {
getGoodsList({
pageNumber: 1,
@@ -585,7 +602,9 @@ export default {
});
},
- // 获取相似商品列表
+ /**
+ * 获取相似商品列表
+ */
getOtherLikeGoods() {
getGoodsList({
pageNumber: 1,
@@ -597,7 +616,9 @@ export default {
});
},
- // 领取优惠券
+ /**
+ * 领取优惠券
+ */
receiveCouponsFun(id) {
API_Members.receiveCoupons(id).then((res) => {
uni.showToast({
@@ -607,18 +628,25 @@ export default {
});
},
- linkstorePage(store_id) {
+ /**
+ * 跳转到店铺页面
+ */
+ navigateToStore(store_id) {
uni.navigateTo({
url: `/pages/product/shopPage?id=` + store_id,
});
},
- //获取优惠券按钮
+ /**
+ * 获取优惠券按钮
+ */
getCoupon(item) {
this.receiveCouponsFun(item.id);
},
- //规格弹窗开关
+ /**
+ * 规格弹窗开关
+ */
shutMask(flag, buyFlag, type) {
// type是指是否点击底部按钮
if (flag) {
@@ -656,14 +684,15 @@ export default {
}
},
- //收藏
+ /**
+ * 收藏
+ */
clickFavorite(id) {
if (this.favorite) {
// 取消收藏
this.deleteGoodsCollectionFun(id);
return false;
}
-
API_Members.collectionGoods(id, "GOODS").then((res) => {
if (res.data.success) {
uni.showToast({
@@ -672,16 +701,16 @@ export default {
});
}
});
-
this.favorite = !this.favorite;
},
- // 顶部header显示或隐藏
+ /**
+ * 顶部header显示或隐藏
+ */
pageScroll(e) {
if (this.scrollFlag) {
this.calcSize();
}
-
if (e.detail.scrollTop > 200) {
//当距离大于200时显示回到顶部按钮
this.headerFlag = true;
@@ -702,7 +731,10 @@ export default {
this.scrollId = "4";
}
},
- //计算每个要跳转到的模块高度信息
+
+ /**
+ * 计算每个要跳转到的模块高度信息
+ */
calcSize() {
let h = 0;
let that = this;
@@ -744,7 +776,10 @@ export default {
});
this.scrollFlag = false;
},
- // 点击顶部跳转到对应位置
+
+ /**
+ * 点击顶部跳转到对应位置
+ */
headerTab(id) {
if (this.scrollFlag) {
this.calcSize();
@@ -756,7 +791,9 @@ export default {
});
},
- // 点击分享
+ /**
+ * 点击分享
+ */
async shareChange() {
this.shareFlage = true;
},
diff --git a/pages/product/product/evaluation/-evaluation.vue b/pages/product/product/evaluation/-evaluation.vue
index d036649..eaa6e69 100644
--- a/pages/product/product/evaluation/-evaluation.vue
+++ b/pages/product/product/evaluation/-evaluation.vue
@@ -17,7 +17,7 @@
￥
- {{ Fixed(item.price)[0] }}
- .{{Fixed(item.price)[1]}}
+ {{ formatPrice(item.price)[0] }}
+ .{{formatPrice(item.price)[1]}}
￥
{{
- Fixed(goodsDetail.price)[0]
+ formatPrice(goodsDetail.price)[0]
}}
- .{{ Fixed(goodsDetail.price)[1] }}
+ .{{ formatPrice(goodsDetail.price)[1] }}
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
- 新品
- 预告
-
-
-
-
-
-
-
-
-
- 综合排序
- 新品排序
-
-
-
- 销量
-
-
-
-
-
-
-
-
- 价格
-
-
-
-
-
-
-
-
-
- {{ item }}
- 取消
-
-
-
-
-
-
-
- 新品
-
- {{ item.goodsName }}
-
-
- ¥{{ item.price | unitPrice }}
- ¥{{ item.mktprice }}
-
-
- 已售 {{ item.buy_count }}
- 好评率 {{ item.grade }}%
-
-
-
-
-
-
-
-
-
-
-
-
-
- 综合排序
- 新品排序
-
-
-
- 销量
-
-
-
-
-
-
-
-
- 价格
-
-
-
-
-
-
-
-
-
- {{ item }}
- 取消
-
-
-
-
-
-
-
- 即将上架
-
- {{ item.goodsName }}
-
-
- ¥{{ item.price | unitPrice }}
- ¥{{ item.mktprice }}
-
-
- 已售 {{ item.buy_count }}
- 好评率 {{ item.grade }}%
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/pages/tabbar/home/template/tpl.js b/pages/tabbar/home/template/tpl.js
index 93821f6..b3c31b6 100644
--- a/pages/tabbar/home/template/tpl.js
+++ b/pages/tabbar/home/template/tpl.js
@@ -1,5 +1,6 @@
/** 配置楼层模块的跳转 */
-export function modelnavigateTo(item) {
+export function modelNavigateTo(item) {
+
let val = item.url;
switch (val.___type) {
case "goods":
diff --git a/pages/tabbar/home/template/tpl_banner.vue b/pages/tabbar/home/template/tpl_banner.vue
index 442b065..d1bd2f8 100644
--- a/pages/tabbar/home/template/tpl_banner.vue
+++ b/pages/tabbar/home/template/tpl_banner.vue
@@ -9,7 +9,7 @@
diff --git a/pages/tabbar/home/template/tpl_flex_four.vue b/pages/tabbar/home/template/tpl_flex_four.vue
index 9168108..ff07781 100644
--- a/pages/tabbar/home/template/tpl_flex_four.vue
+++ b/pages/tabbar/home/template/tpl_flex_four.vue
@@ -1,7 +1,7 @@
-
-
- {{
+ {{
item.storeName
}}
-
+
领劵
-
-
+ :key="skuItem.goodsSku.id" @click="changeActionTab(skuItem)" @longpress="changeActionTab(skuItem)">
-
-
- 全选
+ 全选
-
-
-
+
+
-
+
@@ -59,20 +49,20 @@
-
失效
-
-
- ￥{{ Fixed(skuItem.goodsSku.price)[0] }}
- .{{ Fixed(skuItem.goodsSku.price)[1] }}
+ ￥{{ formatPrice(skuItem.goodsSku.price)[0] }}
+ .{{ formatPrice(skuItem.goodsSku.price)[1] }}
- 预估到手价 ￥{{ Fixed(skuItem.priceDetailDTO.flowPrice)[0]}}
- .{{ Fixed(skuItem.priceDetailDTO.flowPrice)[1] }}
+ 预估到手价 ￥{{ formatPrice(skuItem.priceDetailDTO.flowPrice)[0]}}
+ .{{ formatPrice(skuItem.priceDetailDTO.flowPrice)[1] }}
- 总计: ¥{{ Fixed(cartDetail.priceDetailDTO.flowPrice)[0] }}.{{ Fixed(cartDetail.priceDetailDTO.flowPrice)[1] }}
+ 总计: ¥{{ formatPrice(cartDetail.priceDetailDTO.flowPrice)[0] }}.{{ formatPrice(cartDetail.priceDetailDTO.flowPrice)[1] }}
总计:0.00
@@ -137,7 +126,6 @@
@@ -151,29 +139,24 @@
优惠券
-￥{{cartDetail.priceDetailDTO.couponPrice | unitPrice}}
-
-
其他优惠
-￥{{cartDetail.priceDetailDTO.discountPrice | unitPrice}}
-
删除
去结算
-
+
@@ -10,17 +10,17 @@
diff --git a/pages/tabbar/home/template/tpl_flex_one.vue b/pages/tabbar/home/template/tpl_flex_one.vue
index 1fb3b78..d2d94fc 100644
--- a/pages/tabbar/home/template/tpl_flex_one.vue
+++ b/pages/tabbar/home/template/tpl_flex_one.vue
@@ -1,17 +1,17 @@
-
+
diff --git a/pages/tabbar/home/template/tpl_top_one_bottom_two.vue b/pages/tabbar/home/template/tpl_top_one_bottom_two.vue
index 162f580..22aaacc 100644
--- a/pages/tabbar/home/template/tpl_top_one_bottom_two.vue
+++ b/pages/tabbar/home/template/tpl_top_one_bottom_two.vue
@@ -1,18 +1,18 @@
-
+
-
+
-
+
@@ -22,13 +22,13 @@
-
\ No newline at end of file
diff --git a/pages/tabbar/home/views.vue b/pages/tabbar/home/views.vue
index 5365717..c9e57da 100644
--- a/pages/tabbar/home/views.vue
+++ b/pages/tabbar/home/views.vue
@@ -1,10 +1,15 @@
-
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/tabbar/user/similarGoods.vue b/pages/tabbar/user/similarGoods.vue
index 523c73b..fe15f8b 100644
--- a/pages/tabbar/user/similarGoods.vue
+++ b/pages/tabbar/user/similarGoods.vue
@@ -86,7 +86,7 @@
},
onLoad(option) {
this.goods = JSON.parse(decodeURIComponent(option.goods))
- console.log(this.goods)
+
this.getList()
},
onReachBottom() { //触底事件，页面整个滚动使用
diff --git a/plugins/APPUpdate/index.js b/plugins/APPUpdate/index.js
index 8893be2..d77f841 100644
--- a/plugins/APPUpdate/index.js
+++ b/plugins/APPUpdate/index.js
@@ -10,7 +10,7 @@ import {
const platform = uni.getSystemInfoSync().platform;
// 主颜色
-const $mainColor = "1ABC9C";
+const $mainColor = "#ff6b35";
// 弹窗图标url
const $iconUrl = "https://lilistore-oss.oss-cn-beijing.aliyuncs.com/app/upgrade.png";
diff --git a/store/index.js b/store/index.js
index c85fe2d..50e0158 100644
--- a/store/index.js
+++ b/store/index.js
@@ -3,7 +3,7 @@ import Vuex from "vuex";
import storage from "@/utils/storage";
Vue.use(Vuex);
-//console.log("Vuex:",Vuex)
+
const store = new Vuex.Store({
state: {
verificationKey: "", //获取key表示验证通过
@@ -48,7 +48,6 @@ const store = new Vuex.Store({
// 登录信息
SET_USER_INFO(state, val) {
state.userInfo = val;
- // console.log("SET_USER_INFO",val)
},
login(state, userInfo) {
@@ -56,7 +55,6 @@ const store = new Vuex.Store({
state.userName =
userInfo.Name || userInfo.Nickname || userInfo.Username || "匿名用户";
state.hasLogin = true;
- console.log("state:", state);
},
logout(state) {
state.userName = "";
diff --git a/utils/Foundation.js b/utils/Foundation.js
index be0b7fb..f9a23b2 100644
--- a/utils/Foundation.js
+++ b/utils/Foundation.js
@@ -1,5 +1,6 @@
/**
* 一些常用的基础方法
+ * whetherNavigate 登录后跳转判断
* unixToDate 将unix时间戳转换为指定格式
* dateToUnix 将时间转unix时间戳
* deepClone 对一个对象进行深拷贝
@@ -8,6 +9,39 @@
* randomString 随机生成指定长度的字符串
*/
+/**
+ * 登录后跳转判断
+ * 计算出当前router路径
+ * 1.如果跳转的链接为登录页面或跳转的链接为空页面。则会重新跳转到首页
+ * 2.都不满足返回跳转页面
+ */
+export function whetherNavigate() {
+ if (getCurrentPages().length > 1) {
+ if ((getCurrentPages().length - 2).route == "pages/passport/login") {
+ uni.switchTab({
+ url: "/pages/tabbar/home/index",
+ });
+ } else {
+ if (
+ !(getCurrentPages().length - 2).route ||
+ (getCurrentPages().length - 2).route == "undefined"
+ ) {
+ uni.switchTab({
+ url: "/pages/tabbar/home/index",
+ });
+ } else {
+ uni.navigateBack({
+ delta: getCurrentPages().length - 2,
+ });
+ }
+ }
+ } else {
+ uni.switchTab({
+ url: "/pages/tabbar/home/index",
+ });
+ }
+}
+
/**
* 将unix时间戳转换为指定格式
* @param unix 时间戳【秒】
@@ -15,23 +49,30 @@
* @returns {*|string}
*/
export function unixToDate(unix, format) {
- if (!unix) return unix
- let _format = format || 'yyyy-MM-dd hh:mm:ss'
- const d = new Date(unix)
- const o = {
- 'M+': d.getMonth() + 1,
- 'd+': d.getDate(),
- 'h+': d.getHours(),
- 'm+': d.getMinutes(),
- 's+': d.getSeconds(),
- 'q+': Math.floor((d.getMonth() + 3) / 3),
- S: d.getMilliseconds()
- }
- if (/(y+)/.test(_format)) _format = _format.replace(RegExp.$1, (d.getFullYear() + '').substr(4 - RegExp.$1.length))
- for (const k in o)
- if (new RegExp('(' + k + ')').test(_format)) _format = _format.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) :
- (('00' + o[k]).substr(('' + o[k]).length)))
- return _format
+ if (!unix) return unix;
+ let _format = format || "yyyy-MM-dd hh:mm:ss";
+ const d = new Date(unix);
+ const o = {
+ "M+": d.getMonth() + 1,
+ "d+": d.getDate(),
+ "h+": d.getHours(),
+ "m+": d.getMinutes(),
+ "s+": d.getSeconds(),
+ "q+": Math.floor((d.getMonth() + 3) / 3),
+ S: d.getMilliseconds(),
+ };
+ if (/(y+)/.test(_format))
+ _format = _format.replace(
+ RegExp.$1,
+ (d.getFullYear() + "").substr(4 - RegExp.$1.length)
+ );
+ for (const k in o)
+ if (new RegExp("(" + k + ")").test(_format))
+ _format = _format.replace(
+ RegExp.$1,
+ RegExp.$1.length === 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length)
+ );
+ return _format;
}
/**
@@ -40,18 +81,20 @@ export function unixToDate(unix, format) {
* @returns {number} 【秒】
*/
export function dateToUnix(date) {
- let newStr = date.replace(/:/g, '-')
- newStr = newStr.replace(/ /g, '-')
- const arr = newStr.split('-')
- const datum = new Date(Date.UTC(
- arr[0],
- arr[1] - 1,
- arr[2],
- arr[3] - 8 || -8,
- arr[4] || 0,
- arr[5] || 0
- ))
- return parseInt(datum.getTime() / 1000)
+ let newStr = date.replace(/:/g, "-");
+ newStr = newStr.replace(/ /g, "-");
+ const arr = newStr.split("-");
+ const datum = new Date(
+ Date.UTC(
+ arr[0],
+ arr[1] - 1,
+ arr[2],
+ arr[3] - 8 || -8,
+ arr[4] || 0,
+ arr[5] || 0
+ )
+ );
+ return parseInt(datum.getTime() / 1000);
}
/**
@@ -60,8 +103,8 @@ export function dateToUnix(date) {
* @returns {string}
*/
export function formatPrice(price) {
- if (typeof price !== 'number') return price
- return String(Number(price).toFixed(2)).replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+ if (typeof price !== "number") return price;
+ return String(Number(price).toFixed(2)).replace(/\B(?=(\d{3})+(?!\d))/g, ",");
}
/**
@@ -71,11 +114,11 @@ export function formatPrice(price) {
* @returns {*}
*/
export function secrecyMobile(mobile) {
- mobile = String(mobile)
- if (!/\d{11}/.test(mobile)) {
- return mobile
- }
- return mobile.replace(/(\d{3})(\d{4})(\d{4})/, '$1****$3')
+ mobile = String(mobile);
+ if (!/\d{11}/.test(mobile)) {
+ return mobile;
+ }
+ return mobile.replace(/(\d{3})(\d{4})(\d{4})/, "$1****$3");
}
/**
@@ -84,13 +127,14 @@ export function secrecyMobile(mobile) {
* @returns {string}
*/
export function randomString(length = 32) {
- const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
- const maxPos = chars.length
- let _string = ''
- for (let i = 0; i < length; i++) {
- _string += chars.charAt(Math.floor(Math.random() * maxPos))
- }
- return _string
+ const chars =
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+ const maxPos = chars.length;
+ let _string = "";
+ for (let i = 0; i < length; i++) {
+ _string += chars.charAt(Math.floor(Math.random() * maxPos));
+ }
+ return _string;
}
/**
@@ -100,16 +144,16 @@ export function randomString(length = 32) {
*/
export function countTimeDown(seconds) {
- const leftTime = (time) => {
- if (time < 10) time = '0' + time
- return time + ''
- }
- return {
- day: leftTime(parseInt(seconds / 60 / 60 / 24, 10)),
- hours: leftTime(parseInt(seconds / 60 / 60 % 24, 10)),
- minutes: leftTime(parseInt(seconds / 60 % 60, 10)),
- seconds: leftTime(parseInt(seconds % 60, 10))
- }
+ const leftTime = (time) => {
+ if (time < 10) time = "0" + time;
+ return time + "";
+ };
+ return {
+ day: leftTime(parseInt(seconds / 60 / 60 / 24, 10)),
+ hours: leftTime(parseInt((seconds / 60 / 60) % 24, 10)),
+ minutes: leftTime(parseInt((seconds / 60) % 60, 10)),
+ seconds: leftTime(parseInt(seconds % 60, 10)),
+ };
}
/**
@@ -117,16 +161,25 @@ export function countTimeDown(seconds) {
* @returns {number}
*/
export function theNextDayTime() {
- const nowDate = new Date()
- const time = new Date(nowDate.getFullYear(), nowDate.getMonth(), nowDate.getDate() + 1, 0, 0, 0).getTime() - nowDate.getTime()
- return parseInt(time / 1000)
+ const nowDate = new Date();
+ const time =
+ new Date(
+ nowDate.getFullYear(),
+ nowDate.getMonth(),
+ nowDate.getDate() + 1,
+ 0,
+ 0,
+ 0
+ ).getTime() - nowDate.getTime();
+ return parseInt(time / 1000);
}
module.exports = {
- unixToDate,
- dateToUnix,
- formatPrice,
- secrecyMobile,
- randomString,
- countTimeDown,
- theNextDayTime
-}
+ unixToDate,
+ dateToUnix,
+ formatPrice,
+ secrecyMobile,
+ randomString,
+ countTimeDown,
+ theNextDayTime,
+ whetherNavigate
+};
diff --git a/utils/filters.js b/utils/filters.js
index 93e4fde..5e87135 100644
--- a/utils/filters.js
+++ b/utils/filters.js
@@ -116,3 +116,39 @@ export function getPages(val) {
return val ? currentPage : url;
}
+
+/**
+ * 服务状态列表
+ */
+export function serviceStatusList(val) {
+ let statusList = {
+ APPLY: "申请售后",
+ PASS: "通过售后",
+ REFUSE: "拒绝售后",
+ BUYER_RETURN: "买家退货，待卖家收货",
+ SELLER_RE_DELIVERY: "商家换货/补发",
+ SELLER_CONFIRM: "卖家确认收货",
+ SELLER_TERMINATION: "卖家终止售后",
+ BUYER_CONFIRM: "买家确认收货",
+ BUYER_CANCEL: "买家取消售后",
+ WAIT_REFUND: "等待平台退款",
+ COMPLETE: "完成售后",
+ };
+ return statusList[val];
+}
+
+/**
+ * 订单状态列表
+ */
+export function orderStatusList(val) {
+ let orderStatusList = {
+ UNDELIVERED: "待发货",
+ UNPAID: "未付款",
+ PAID: "已付款",
+ DELIVERED: "已发货",
+ CANCELLED: "已取消",
+ COMPLETE: "已完成",
+ TAKE: "已完成",
+ };
+ return orderStatusList[val];
+}
diff --git a/utils/request.js b/utils/request.js
index 9923939..1dec38b 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -23,10 +23,8 @@ function getTokenDebounce() {
return async function () {
if (!lock) {
lock = true;
- console.log('dd')
- await refreshTokenFn(storage.getRefreshToken())
+ await refreshTokenFn(storage.getRefreshToken())
.then((res) => {
-
if (res.data.success) {
let { accessToken, refreshToken } = res.data.result;
storage.setAccessToken(accessToken);
@@ -34,29 +32,25 @@ function getTokenDebounce() {
success = true;
lock = false;
} else {
-
cleanStorage();
success = false;
lock = false;
}
})
.catch((error) => {
- console.log(error)
+ console.log(error);
cleanStorage();
success = false;
lock = false;
});
-
-
}
return new Promise((resolve) => {
// XXX 我只能想到通过轮询来看获取新的token是否结束，有好的方案可以说。一直看lock,直到请求失败或者成功
const timer = setInterval(() => {
if (!lock) {
clearInterval(timer);
-
+
if (success) {
-
resolve("success");
} else {
cleanStorage();
@@ -74,7 +68,9 @@ function cleanStorage() {
icon: "none",
duration: 1500,
});
- if(uni.showLoading()){ uni.hideLoading();}
+ if (uni.showLoading()) {
+ uni.hideLoading();
+ }
storage.setHasLogin(false);
storage.setAccessToken("");
@@ -144,30 +140,23 @@ http.interceptors.response.use(
/* 请求之后拦截器。可以使用async await 做异步操作 */
// token存在并且token过期
let token = storage.getAccessToken();
-
+
if (token && response.statusCode === 403) {
- expireToken.includes(token) ?cleanStorage() :""
+ expireToken.includes(token) ? cleanStorage() : "";
// jwt token 过期了
expireToken.push(token); // 把过期token 储存
-
const currentToken = storage.getAccessToken();
-
if (expireToken.includes(currentToken)) {
-
// 本地储存的是过期token了，重新获取
const getTokenResult = await refreshToken();
-
if (getTokenResult === "success") {
// 获取新的token成功
-
try {
const repeatRes = await reReqest.request(
configHandle(response.config)
);
response = repeatRes;
- } catch (err) {
-
- }
+ } catch (err) {}
} else {
cleanStorage();
}
@@ -176,26 +165,25 @@ http.interceptors.response.use(
const repeatRes = await reReqest.request(
configHandle(response.config)
);
-
response = repeatRes;
} catch (err) {
cleanStorage();
}
}
+ // 如果当前返回没登录
} else if (response.statusCode === 403 || response.data.code === 403) {
cleanStorage();
- } else if (response.statusCode == 200 && !response.data.success) {
+ // 如果当前状态码为正常但是success为不正常时
+ } else if (response.statusCode == 200 && !response.data.success || response.statusCode == 400) {
uni.showToast({
- title: response.data.message,
+ title: response.data.message ,
icon: "none",
duration: 1500,
});
-
}
return response;
},
(error) => {
- // 请求错误做点什么。可以使用async await 做异步操作
return response;
}
);
diff --git a/uview-ui/components/u-number-box/u-number-box.vue b/uview-ui/components/u-number-box/u-number-box.vue
index ee99f61..b8d43f1 100644
--- a/uview-ui/components/u-number-box/u-number-box.vue
+++ b/uview-ui/components/u-number-box/u-number-box.vue
@@ -152,7 +152,7 @@
this.inputVal = v1
// 只有value的改变是来自外部的时候，才去同步inputVal的值，否则会造成循环错误
// if(!this.changeFromInner) {
- // console.log('change')
+
// this.inputVal = v1;
// // 因为inputVal变化后，会触发this.handleChange()，在其中changeFromInner会再次被设置为true，
// // 造成外面修改值，也导致被认为是内部修改的混乱，这里进行this.$nextTick延时，保证在运行周期的最后处
@@ -165,7 +165,7 @@
immediate: true
},
inputVal(v1, v2) {
- // console.log(v1)
+
// 为了让用户能够删除所有输入值，重新输入内容，删除所有值后，内容为空字符串
if (v1 == '') return;
let value = 0;