Merge branch 'master' of http://47.99.244.21:9999/root/joshine

app/design/frontend/Joshine/breeze/Magento_Theme/layout/breeze_default.xml

@@ -243,7 +243,7 @@
                         <item name="sort_order" xsi:type="number">25</item>
                         <item name="items" xsi:type="array">
                             <item name="configurable" xsi:type="string">Swissup_Breeze/js/components/configurable</item>
-                            <item name="Magento_Swatches/js/swatch-renderer" xsi:type="string">Swissup_Breeze/js/components/swatch-renderer</item>
+                            <item name="Magento_Swatches/js/swatch-renderer" xsi:type="string">js/breeze/components/swatch-renderer</item>
                             <item name="configurable-configure" xsi:type="string">Swissup_Breeze/js/components/configurable-configure</item>
                         </item>
                     </item>

app/design/frontend/Joshine/breeze/etc/view.xml

@@ -97,7 +97,7 @@
 
             <image id="swatch_image" type="swatch_image">
                 <width>40</width>
-                <height>50</height>
+                <height>40</height>
             </image>
 
             <!-- These lists use category_page_grid fallback. Not need to declare srcset for them -->

app/design/frontend/Joshine/breeze/web/css/_custom.less

@@ -1657,6 +1657,20 @@ button.action.submit.primary {
   }
 
 }
+.swatch-option.color, .swatch-option.text, .swatch-option.image{
+  width: 40px !important;
+  height: 40px !important;
+}
+
+.block-minicart .block-content>.actions .action.checkout{
+  background: #000;
+}
+.cart-container .action.primary,.cart-container .action-primary,.cart-container [type='submit'],.cart-container .pagebuilder-button-primary{
+  background: #000;
+}
+.products.products-grid .product.product-item-details .image{
+  margin: 0 !important;
+}
 
 //色块强制大小
 #product-options-wrapper .swatch-option.image{
@@ -1666,7 +1680,7 @@ button.action.submit.primary {
 }
 
 //颜色提示强制关闭
-.breeze .field-tooltip-content, .breeze .tooltip.wrapper .tooltip.content, .breeze .minicart-wrapper .mage-dropdown-dialog, .breeze .minisearch .search-autocomplete, .breeze .map-popup, .breeze .swatch-option-tooltip {
+.breeze .field-tooltip-content, .breeze .tooltip.wrapper .tooltip.content, .breeze .minisearch .search-autocomplete, .breeze .map-popup, .breeze .swatch-option-tooltip {
   display: none !important;
 }
 

lib/web/mage/menu.js

@@ -29,6 +29,28 @@ define([
          * @private
          */
         _create: function () {
+
+            $('li.nav-1', this.element)
+                .children('a')
+                .filter(function () {
+                    return $(this).children('.ui-icon-1').length === 0;
+                })
+                .prepend('<span class="ui-menu-icon-1 ui-icon-1">NEW</span>');
+
+            $('li.parent.nav-3', this.element)
+                .children('a')
+                .filter(function () {
+                    return $(this).children('.ui-icon-2').length === 0;
+                })
+                .prepend('<span class="ui-menu-icon-2 ui-icon-2">SALE</span>');
+
+            $('li.parent.nav-5', this.element)
+                .children('a')
+                .filter(function () {
+                    return $(this).children('.ui-icon-3').length === 0;
+                })
+                .prepend('<span class="ui-menu-icon-3 ui-icon-3">HOT!</span>');
+
             var self = this;
 
             this.delay = this.options.delay;
@@ -544,33 +566,27 @@ define([
                         targetPageX,
                         rightBound;
 
-                    if (target.has(submenu)) {
-                        ulElement = target.find(submenu);
-                        ulElementWidth = ulElement.outerWidth(true);
-                        width = target.outerWidth() * 2;
-                        targetPageX = target.offset().left;
-                        rightBound = $(window).width();
+                    if (target.has("div.submenu")) {
+                        var dropdown = target.find("div.submenu");
 
-                        if (ulElementWidth + width + targetPageX > rightBound) {
-                            ulElement.addClass('submenu-reverse');
+                        if (this.breezeTimeout) {
+                            clearTimeout(this.breezeTimeout);
+                            delete this.breezeTimeout;
                         }
 
-                        if (targetPageX - ulElementWidth < 0) {
-                            ulElement.removeClass('submenu-reverse');
-                        }
+                        this.open(dropdown);
                     }
-
-                    // Remove ui-state-active class from siblings of the newly focused menu item
-                    // to avoid a jump caused by adjacent elements both having a class with a border
-                    target.siblings().children('.ui-state-active').removeClass('ui-state-active');
-                    this.focus(event, target);
                 },
 
                 /**
                  * @param {jQuery.Event} event
                  */
-                'mouseleave': function (event) {
-                    this.collapseAll(event, true);
+                'mouseleave .ui-menu-item': function (event) {
+                    var target = $(event.currentTarget)
+                    var dropdown = target.find("div.submenu");
+                    setTimeout(function () {
+                        this.close(dropdown);
+                    }.bind(this), 80);
                 },
 
                 /**
@@ -591,7 +607,51 @@ define([
                 }, this.options.hideDelay);
             }
         },
+        close: function (dropdown) {
+            var eventData = {
+                dropdown: dropdown,
+                preventDefault: false
+            };
+
+            this._trigger('beforeClose', eventData);
+
+            if (eventData.preventDefault === true) {
+                return;
+            }
 
+            dropdown.removeClass('shown')
+                .parent('li')
+                .removeClass('opened');
+
+            if (true) {
+                // dropdown.find("ul.subchildmenu").hide()
+                dropdown.hide();
+            }
+
+            this._trigger('afterClose', {
+                dropdown: dropdown
+            });
+        },
+        open: function (dropdown) {
+            this._trigger('beforeOpen', {
+                dropdown: dropdown
+            });
+
+            dropdown.addClass('shown')
+                .parent('li')
+                .addClass('opened');
+
+
+
+            if (true) {
+                dropdown.find("ul.subchildmenu").show()
+                console.log(dropdown.find("ul.subchildmenu"))
+                if (dropdown.hasClass('subchildmenu')) {
+                    dropdown.find(".subchildmenu").show();
+                }
+                dropdown.show();
+            }
+        },
         /**
          * @param {*} handler
          * @param {Number} delay