Skip to content

J
joshine
Commit e481e833 by wd
Options

修改顶部包邮信息，文字显示高度居中，文字大小改成PX，a标签添加大小，顶部货币定位位置复原，去除第三部分选项，默认显示在头部。轮播图默认高度去除，列表页列宽修改。

parent 62f0331a
Showing with 32 additions and 15 deletions
app/code/Joshine/Banner/view/adminhtml/layout/joshine_banner_index_index.xml
<?xml version="1.0" ?> <?xml version="1.0" ?>
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd"> <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<body> <head>
<css src="Joshine_Banner::css/style.css"/>
</head>
<body>
<referenceContainer name="content"> <referenceContainer name="content">
<uiComponent name="joshine_banner_index_listing"/> <uiComponent name="joshine_banner_index_listing"/>
</referenceContainer> </referenceContainer>
</body> </body>
</page> </page>
\ No newline at end of file
app/code/Joshine/Banner/view/adminhtml/ui_component/joshine_banner_index_listing.xml
...@@ -75,12 +75,12 @@ ...@@ -75,12 +75,12 @@
<item name="js_config" xsi:type="array"> <item name="js_config" xsi:type="array">
<item name="component" xsi:type="string">Magento_Ui/js/grid/columns/column</item> <item name="component" xsi:type="string">Magento_Ui/js/grid/columns/column</item>
</item> </item>
<item name="config" xsi:type="array"> <item name="config" xsi:type="array">
<item name="indexField" xsi:type="string">id</item> <item name="indexField" xsi:type="string">id</item>
<item name="filter" xsi:type="string">text</item> <item name="filter" xsi:type="string">text</item>
<item name="sorting" xsi:type="string">desc</item> <item name="sorting" xsi:type="string">desc</item>
<item name="label" xsi:type="string" translate="true">ID</item> <item name="label" xsi:type="string" translate="true">ID</item>
<item name="fieldClass" xsi:type="string">col2</item>
</item> </item>
</argument> </argument>
</column> </column>
...@@ -90,6 +90,7 @@ ...@@ -90,6 +90,7 @@
<item name="config" xsi:type="array"> <item name="config" xsi:type="array">
<item name="filter" xsi:type="string">text</item> <item name="filter" xsi:type="string">text</item>
<item name="label" xsi:type="string" translate="true">Title</item> <item name="label" xsi:type="string" translate="true">Title</item>
<item name="fieldClass" xsi:type="string">col2</item>
</item> </item>
</argument> </argument>
</column> </column>
...@@ -102,6 +103,7 @@ ...@@ -102,6 +103,7 @@
<item name="label" xsi:type="string" translate="true">Description</item> <item name="label" xsi:type="string" translate="true">Description</item>
<item name="resizeEnabled" xsi:type="boolean">true</item> <item name="resizeEnabled" xsi:type="boolean">true</item>
<item name="resizeDefaultWidth" xsi:type="string">60</item> <item name="resizeDefaultWidth" xsi:type="string">60</item>
<item name="fieldClass" xsi:type="string">col3</item>
</item> </item>
</argument> </argument>
</column> </column>
...@@ -113,6 +115,7 @@ ...@@ -113,6 +115,7 @@
<item name="label" xsi:type="string" translate="true">Url</item> <item name="label" xsi:type="string" translate="true">Url</item>
<item name="resizeEnabled" xsi:type="boolean">true</item> <item name="resizeEnabled" xsi:type="boolean">true</item>
<item name="resizeDefaultWidth" xsi:type="string">60</item> <item name="resizeDefaultWidth" xsi:type="string">60</item>
<item name="fieldClass" xsi:type="string">col3</item>
</item> </item>
</argument> </argument>
</column> </column>
...@@ -122,6 +125,7 @@ ...@@ -122,6 +125,7 @@
<item name="config" xsi:type="array"> <item name="config" xsi:type="array">
<item name="filter" xsi:type="string">text</item> <item name="filter" xsi:type="string">text</item>
<item name="label" xsi:type="string" translate="true">Sort</item> <item name="label" xsi:type="string" translate="true">Sort</item>
<item name="fieldClass" xsi:type="string">col1</item>
</item> </item>
</argument> </argument>
</column> </column>
...@@ -131,6 +135,7 @@ ...@@ -131,6 +135,7 @@
<item name="config" xsi:type="array"> <item name="config" xsi:type="array">
<item name="filter" xsi:type="string">text</item> <item name="filter" xsi:type="string">text</item>
<item name="label" xsi:type="string" translate="true">Status</item> <item name="label" xsi:type="string" translate="true">Status</item>
<item name="fieldClass" xsi:type="string">col1</item>
</item> </item>
</argument> </argument>
</column> </column>
...@@ -141,6 +146,7 @@ ...@@ -141,6 +146,7 @@
<item name="component" xsi:type="string">Magento_Ui/js/grid/columns/thumbnail</item> <item name="component" xsi:type="string">Magento_Ui/js/grid/columns/thumbnail</item>
<item name="filter" xsi:type="string">text</item> <item name="filter" xsi:type="string">text</item>
<item name="label" xsi:type="string" translate="true">Pc Image patch</item> <item name="label" xsi:type="string" translate="true">Pc Image patch</item>
<item name="fieldClass" xsi:type="string">col3</item>
</item> </item>
</argument> </argument>
</column> </column>
...@@ -151,6 +157,7 @@ ...@@ -151,6 +157,7 @@
<item name="component" xsi:type="string">Magento_Ui/js/grid/columns/thumbnail</item> <item name="component" xsi:type="string">Magento_Ui/js/grid/columns/thumbnail</item>
<item name="filter" xsi:type="string">text</item> <item name="filter" xsi:type="string">text</item>
<item name="label" xsi:type="string" translate="true">Phone Image patch</item> <item name="label" xsi:type="string" translate="true">Phone Image patch</item>
<item name="fieldClass" xsi:type="string">col3</item>
</item> </item>
</argument> </argument>
</column> </column>
...@@ -162,6 +169,7 @@ ...@@ -162,6 +169,7 @@
<item name="resizeEnabled" xsi:type="boolean">false</item> <item name="resizeEnabled" xsi:type="boolean">false</item>
<item name="resizeDefaultWidth" xsi:type="string">10</item> <item name="resizeDefaultWidth" xsi:type="string">10</item>
<item name="indexField" xsi:type="string">id</item> <item name="indexField" xsi:type="string">id</item>
<item name="fieldClass" xsi:type="string">col2</item>
</item> </item>
</argument> </argument>
</actionsColumn> </actionsColumn>
......
app/code/Joshine/Banner/view/adminhtml/web/css/style.css 0 → 100644
.col1{
width: 5%;
}
.col2{
width: 10%;
}
.col3{
width: 15%;
}
app/code/Joshine/Banner/view/frontend/templates/index.phtml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
$collection = $block->getCollection(); $collection = $block->getCollection();
?> ?>
<div class="banner1" style="background-color: #f0f0f0;height: 10px;"></div> <div class="banner1" style="background-color: #f0f0f0;"></div>
<?php foreach ($collection->getItems() as $item):?> <?php foreach ($collection->getItems() as $item):?>
<?php echo $item->getData('name');?> <?php echo $item->getData('name');?>
......
app/code/Sparsh/FreeShippingBar/Block/Adminhtml/Entity/Edit/Tabs.php
...@@ -44,14 +44,7 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs ...@@ -44,14 +44,7 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs
'content' => $this->getChildHtml('what_to_display') 'content' => $this->getChildHtml('what_to_display')
] ]
); );
$this->addTab(
'where_to_display',
[
'label' => __('Where to Display'),
'title' => __('Where to Display'),
'content' => $this->getChildHtml('where_to_display')
]
);
return parent::_beforeToHtml(); return parent::_beforeToHtml();
} }
......
app/code/Sparsh/FreeShippingBar/Controller/Adminhtml/Entity/Save.php
...@@ -109,6 +109,7 @@ class Save extends \Sparsh\FreeShippingBar\Controller\Adminhtml\Entity implement ...@@ -109,6 +109,7 @@ class Save extends \Sparsh\FreeShippingBar\Controller\Adminhtml\Entity implement
//no delete and no upload new img //no delete and no upload new img
unset($data['background_img_phone']); unset($data['background_img_phone']);
} }
$data['bar_layout_position'] = 'page_top';
$model->setData($data); $model->setData($data);
$model->save(); $model->save();
......
app/code/Sparsh/FreeShippingBar/view/frontend/templates/free_shipping_bar.phtml
...@@ -29,6 +29,7 @@ endif; ...@@ -29,6 +29,7 @@ endif;
width: 100%; width: 100%;
height: 60px; height: 60px;
background-image: url("<?= $block->getImgUrl($barData['background_img']) ?>"); background-image: url("<?= $block->getImgUrl($barData['background_img']) ?>");
line-height: 60px;
} }
@media (max-width: 768px) { @media (max-width: 768px) {
...@@ -36,15 +37,16 @@ endif; ...@@ -36,15 +37,16 @@ endif;
background-image: url("<?= $block->getImgUrl($barData['background_img_phone']) ?>"); background-image: url("<?= $block->getImgUrl($barData['background_img_phone']) ?>");
width: 100%; width: 100%;
height: 40px; height: 40px;
line-height: 40px;
} }
} }
</style> </style>
<div class="sparsh-free-shipping-bar-goal-message" <div class="sparsh-free-shipping-bar-goal-message"
style=" background-size: 100%; line-height: initial; text-align: center; background-color: <?= /* @noEscape */ $barData['bar_background_color']?>; font-size: <?= /* @noEscape */ $barData['bar_font_size'].'em'?>"> style=" background-size: 100%; text-align: center; background-color: <?= /* @noEscape */ $barData['bar_background_color']?>; font-size: <?= /* @noEscape */ $barData['bar_font_size'].'px'?>">
<a <?= /* @noEscape */ $barData['is_clickable'] ? 'href='.$barData['bar_link_url'] : null ?> <a <?= /* @noEscape */ $barData['is_clickable'] ? 'href='.$barData['bar_link_url'] : null ?>
<?= /* @noEscape */ $barData['is_clickable'] ? ($barData['is_link_open_in_new_page'] ? 'target=_blank' : 'target=_self') : null ?> <?= /* @noEscape */ $barData['is_clickable'] ? ($barData['is_link_open_in_new_page'] ? 'target=_blank' : 'target=_self') : null ?>
style="color: <?= /* @noEscape */ $barData['bar_text_color']?>"> style="width: 100%;height: 100%; display: block; color: <?= /* @noEscape */ $barData['bar_text_color']?>">
<div data-bind="scope: 'free-shipping-scope'"> <div data-bind="scope: 'free-shipping-scope'">
<p data-bind="html: goalMessage"></p> <p data-bind="html: goalMessage"></p>
</div> </div>
......
app/design/frontend/Joshine/breeze/web/css/_custom.less
...@@ -992,7 +992,7 @@ footer{ ...@@ -992,7 +992,7 @@ footer{
@media(min-width: 640px){ @media(min-width: 640px){
.switcher.currency{ .switcher.currency{
position: absolute; position: absolute;
top: 50px; top: 30px;
right: 145px; right: 145px;
z-index: 1; z-index: 1;
font-size: 13px; font-size: 13px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment