修改目录以及加强banner自适应高度js，修改顶部包邮图片css以及添加手机模式下图片

563a44a0 · wd · b73b29ac · 563a44a0 · 563a44a0 · 563a44a0
Commit 563a44a0 authored Feb 10, 2023 by wd
52 changed files
--- a/app/code/Test/Banner/Block/Adminhtml/Edit/BackButton.php
+++ b/app/code/Test/Banner/Block/Adminhtml/Edit/BackButton.php
 <?php
-namespace Test\Banner\Block\Adminhtml\Edit;
+namespace Joshine\Banner\Block\Adminhtml\Edit;
 use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;

--- a/app/code/Test/Banner/Block/Adminhtml/Edit/DeleteButton.php
+++ b/app/code/Test/Banner/Block/Adminhtml/Edit/DeleteButton.php
 <?php
-namespace Test\Banner\Block\Adminhtml\Edit;
+namespace Joshine\Banner\Block\Adminhtml\Edit;
 use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;

--- a/app/code/Test/Banner/Block/Adminhtml/Edit/GenericButton.php
+++ b/app/code/Test/Banner/Block/Adminhtml/Edit/GenericButton.php
 <?php
-namespace Test\Banner\Block\Adminhtml\Edit;
+namespace Joshine\Banner\Block\Adminhtml\Edit;
 use Magento\Backend\Block\Widget\Context;
 use Magento\Framework\Exception\NoSuchEntityException;

--- a/app/code/Test/Banner/Block/Adminhtml/Edit/SaveButton.php
+++ b/app/code/Test/Banner/Block/Adminhtml/Edit/SaveButton.php
 <?php
-namespace Test\Banner\Block\Adminhtml\Edit;
+namespace Joshine\Banner\Block\Adminhtml\Edit;
 use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;

--- a/app/code/Test/Banner/Block/Index.php
+++ b/app/code/Test/Banner/Block/Index.php
 <?php
-namespace Test\Banner\Block;
+namespace Joshine\Banner\Block;
-use Test\Banner\Model\BassFactory;
+use Joshine\Banner\Model\BassFactory;
 class Index extends \Magento\Framework\View\Element\Template{
@@ -9,8 +9,8 @@ class Index extends \Magento\Framework\View\Element\Template{
    protected $helper;
    public function __construct(\Magento\Framework\View\Element\Template\Context $context,
-                                \Test\Banner\Model\ResourceModel\Bass\CollectionFactory $collectionFactory,
+                                \Joshine\Banner\Model\ResourceModel\Bass\CollectionFactory $collectionFactory,
-                                \Test\Banner\Helper\Data $helper,
+                                \Joshine\Banner\Helper\Data $helper,
                                array $data = []
    )
    {

--- a/app/code/Test/Banner/Controller/Index/Index.php
+++ b/app/code/Test/Banner/Controller/Index/Index.php
 <?php
-namespace Test\Banner\Controller\Index;
+namespace Joshine\Banner\Controller\Index;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\View\Result\PageFactory;
-use Test\Banner\Model\BassFactory;
+use Joshine\Banner\Model\BassFactory;
 class Index extends \Magento\Framework\App\Action\Action{
    protected $_pageFactory;
@@ -20,15 +20,6 @@ class Index extends \Magento\Framework\App\Action\Action{
    public function execute()
    {
        // TODO: Implement execute() method.
-        /*$bass = $this->_bassFactory->create();
-        $collection = $bass->getCollection();
-        foreach ($collection as $item){
-            echo "<pre>";
-            print_r($item->getData());
-            echo "</pre>";
-        }
-        exit();*/
       return $this->_pageFactory->create();
    }

--- a/app/code/Test/Banner/Controller/adminhtml/Index/Add.php
+++ b/app/code/Test/Banner/Controller/adminhtml/Index/Add.php
 <?php
-namespace Test\Banner\Controller\Adminhtml\Index;
+namespace Joshine\Banner\Controller\Adminhtml\Index;
 use \Magento\Backend\App\Action;

--- a/app/code/Test/Banner/Controller/adminhtml/Index/Delete.php
+++ b/app/code/Test/Banner/Controller/adminhtml/Index/Delete.php
 <?php
-namespace Test\Banner\Controller\Adminhtml\Index;
+namespace Joshine\Banner\Controller\Adminhtml\Index;
 use \Magento\Backend\App\Action;
 class Delete extends Action
 {
-    const ADMIN_RESOURCE = 'Test_Banner::index';
+    const ADMIN_RESOURCE = 'Joshine_Banner::index';
    public function execute()
    {
        // TODO: Implement execute() method.
        $id = $this->getRequest()->getParam('id');
        if ($id > 0){
-            $model = $this->_objectManager->create('Test\Banner\Model\Bass');
+            $model = $this->_objectManager->create('Joshine\Banner\Model\Bass');
            $model->load($id);
            try {
                $model->delete();
@@ -21,6 +21,6 @@ class Delete extends Action
                $this->messageManager->addSuccess(__('Deleted error.'));
            }
        }
-        $this->_redirect('test_banner/index');
+        $this->_redirect('joshine_banner/index');
    }
 }
\ No newline at end of file
--- a/app/code/Test/Banner/Controller/adminhtml/Index/Edit.php
+++ b/app/code/Test/Banner/Controller/adminhtml/Index/Edit.php
 <?php
-namespace Test\Banner\Controller\Adminhtml\Index;
+namespace Joshine\Banner\Controller\Adminhtml\Index;
 use \Magento\Backend\App\Action;
 use \Magento\Backend\App\Action\Context;
 use \Magento\Framework\View\Result\PageFactory;
 use \Magento\Framework\Registry;
 use Magento\Shipping\Model\Rate\ResultFactory;
-use Test\Banner\Model\BassFactory;
+use Joshine\Banner\Model\BassFactory;
 class Edit extends Action
 {
-    const ADMIN_RESOURCE = "Test_Banner::index";
+    const ADMIN_RESOURCE = "Joshine_Banner::index";
    protected $_coreRegistry;
    protected $resultPageFactory;
@@ -33,7 +33,7 @@ class Edit extends Action
    {
        // TODO: Implement execute() method.
        $id = $this->getRequest()->getParam('id');
-        $model = $this->_objectManager->create(\Test\Banner\Model\Bass::class);
+        $model = $this->_objectManager->create(\Joshine\Banner\Model\Bass::class);
        if ($id){
            $model->load($id);

--- a/app/code/Test/Banner/Controller/adminhtml/Index/FileUploader/Save.php
+++ b/app/code/Test/Banner/Controller/adminhtml/Index/FileUploader/Save.php
 <?php
-namespace Test\Banner\Controller\Adminhtml\Index\FileUploader;
+namespace Joshine\Banner\Controller\Adminhtml\Index\FileUploader;
 use Magento\Backend\App\Action;
 use Magento\Framework\App\Filesystem\DirectoryList;
@@ -7,8 +7,8 @@ use Magento\Framework\UrlInterface;
 use \Magento\Framework\Controller\ResultFactory;
 class Save extends Action
 {
-    const ADMIN_RESOURCE = "Test_Banner::index";
+    const ADMIN_RESOURCE = "Joshine_Banner::index";
-    const FILE_DIR = 'test/banner';
+    const FILE_DIR = 'joshine/banner';
    protected $_fileUploaderFactory;

--- a/app/code/Test/Banner/Controller/adminhtml/Index/Index.php
+++ b/app/code/Test/Banner/Controller/adminhtml/Index/Index.php
 <?php
-namespace Test\Banner\Controller\Adminhtml\Index;
+namespace Joshine\Banner\Controller\Adminhtml\Index;
 use \Magento\Backend\App\Action;
 use \Magento\Backend\App\Action\Context;
@@ -7,7 +7,7 @@ use \Magento\Framework\View\Result\PageFactory;
 class Index extends Action
 {
-    const ADMIN_RESOURCE = "Test_Banner::index";
+    const ADMIN_RESOURCE = "Joshine_Banner::index";
    protected $_resultPageFactory;
@@ -21,7 +21,7 @@ class Index extends Action
    {
        // TODO: Implement execute() method.
        $resultPage = $this->_resultPageFactory->create();
-        $resultPage->setActiveMenu('Test_Banner::index');
+        $resultPage->setActiveMenu('Joshine_Banner::index');
        $resultPage->getConfig()->getTitle()->prepend((__('Banners')));
        return $resultPage;
    }

--- a/app/code/Test/Banner/Controller/adminhtml/Index/Save.php
+++ b/app/code/Test/Banner/Controller/adminhtml/Index/Save.php
 <?php
-namespace Test\Banner\Controller\Adminhtml\Index;
+namespace Joshine\Banner\Controller\Adminhtml\Index;
 use Magento\Backend\App\Action\Context;
-use Test\Banner\Model\BassFactory;
+use Joshine\Banner\Model\BassFactory;
 class Save extends \Magento\Backend\App\Action
 {
-    const ADMIN_RESOURCE = "Test_Banner::index";
+    const ADMIN_RESOURCE = "Joshine_Banner::index";
    protected $factory;
    public function __construct(Context $context,BassFactory $factory)
@@ -20,7 +20,7 @@ class Save extends \Magento\Backend\App\Action
        // TODO: Implement execute() method.
        $data = $this->getRequest()->getPostValue();
        if (!$data){
-            $this->_redirect('test_banner/index/add');
+            $this->_redirect('joshine_banner/index/add');
            return;
        }

--- a/app/code/Test/Banner/Helper/Data.php
+++ b/app/code/Test/Banner/Helper/Data.php
 <?php
-namespace Test\Banner\Helper;
+namespace Joshine\Banner\Helper;
 use \Magento\Framework\App\Helper\AbstractHelper;
 class Data extends AbstractHelper

--- a/app/code/Test/Banner/Model/Bass.php
+++ b/app/code/Test/Banner/Model/Bass.php
 <?php
-namespace Test\Banner\Model;
+namespace Joshine\Banner\Model;
 use Magento\Framework\Model\AbstractModel;
 use Magento\Framework\DataObject\IdentityInterface;
 class Bass extends AbstractModel implements IdentityInterface
 {
-    const CACHE_TAG = 'test_banner_bass';
+    const CACHE_TAG = 'joshine_banner_bass';
-    protected $_cacheTat = 'test_banner_bass';
+    protected $_cacheTat = 'joshine_banner_bass';
-    protected $_eventPrefix = 'test_banner_bass';
+    protected $_eventPrefix = 'joshine_banner_bass';
@@ -17,7 +17,7 @@ class Bass extends AbstractModel implements IdentityInterface
    protected function _construct()
    {
-        $this->_init('Test\Banner\Model\ResourceModel\Bass');
+        $this->_init('Joshine\Banner\Model\ResourceModel\Bass');
    }
    public function getIdentities()

--- a/app/code/Test/Banner/Model/ResourceModel/Bass.php
+++ b/app/code/Test/Banner/Model/ResourceModel/Bass.php
 <?php
-namespace Test\Banner\Model\ResourceModel;
+namespace Joshine\Banner\Model\ResourceModel;
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 use Magento\Framework\Model\ResourceModel\Db\Context;
@@ -13,7 +13,7 @@ class Bass extends AbstractDb
    protected function _construct()
    {
-        $this->_init('test_banner_bass','id');
+        $this->_init('joshine_banner_bass','id');
    }

--- a/app/code/Test/Banner/Model/ResourceModel/Bass/Collection.php
+++ b/app/code/Test/Banner/Model/ResourceModel/Bass/Collection.php
 <?php
-namespace  Test\Banner\Model\ResourceModel\Bass;
+namespace  Joshine\Banner\Model\ResourceModel\Bass;
 use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
 class Collection extends AbstractCollection
 {
    protected $_idFieldName = 'id';
-    protected $_eventPrefix = 'test_banner_bass_collection';
+    protected $_eventPrefix = 'joshine_banner_bass_collection';
    protected $_eventObject = 'bass_collection';
    protected function _construct(){
-        $this->_init('Test\Banner\Model\Bass','Test\Banner\Model\ResourceModel\Bass');
+        $this->_init('Joshine\Banner\Model\Bass','Joshine\Banner\Model\ResourceModel\Bass');
-        //$this->_init( \Test\Banner\Model\Bass::class, \Test\Banner\Model\ResourceModel\Bass::class );
    }
 }
\ No newline at end of file
--- a/app/code/Test/Banner/Ui/Component/Listing/Column/ImgPatch.php
+++ b/app/code/Test/Banner/Ui/Component/Listing/Column/ImgPatch.php
 <?php
-namespace Test\Banner\Ui\Component\Listing\Column;
+namespace Joshine\Banner\Ui\Component\Listing\Column;
 use Magento\Catalog\Helper\Image;
 use Magento\Framework\UrlInterface;

--- a/app/code/Test/Banner/Ui/Component/Listing/Column/PhoneImagePatch.php
+++ b/app/code/Test/Banner/Ui/Component/Listing/Column/PhoneImagePatch.php
 <?php
-namespace Test\Banner\Ui\Component\Listing\Column;
+namespace Joshine\Banner\Ui\Component\Listing\Column;
 use Magento\Catalog\Helper\Image;
 use Magento\Framework\UrlInterface;

--- a/app/code/Test/Banner/Ui/Component/Listing/Column/PostActions.php
+++ b/app/code/Test/Banner/Ui/Component/Listing/Column/PostActions.php
 <?php
-namespace Test\Banner\Ui\Component\Listing\Column;
+namespace Joshine\Banner\Ui\Component\Listing\Column;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
@@ -8,8 +8,8 @@ use Magento\Framework\UrlInterface;
 class PostActions extends Column
 {
-    const URL_EDIT='test_banner/index/edit';
+    const URL_EDIT='joshine_banner/index/edit';
-    const URL_DELETE = 'test_banner/index/delete';
+    const URL_DELETE = 'joshine_banner/index/delete';
    protected $urlBuilder;

--- a/app/code/Test/Banner/Ui/Component/Listing/Column/Status.php
+++ b/app/code/Test/Banner/Ui/Component/Listing/Column/Status.php
 <?php
-namespace Test\Banner\Ui\Component\Listing\Column;
+namespace Joshine\Banner\Ui\Component\Listing\Column;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;

--- a/app/code/Test/Banner/UiForm/Model/DataProvider.php
+++ b/app/code/Test/Banner/UiForm/Model/DataProvider.php
 <?php
-namespace  Test\Banner\UiForm\Model;
+namespace  Joshine\Banner\UiForm\Model;
 use Magento\Ui\DataProvider\AbstractDataProvider;
 use Magento\Framework\App\RequestInterface;
-use Test\Banner\Model\ResourceModel\Bass\CollectionFactory;
+use Joshine\Banner\Model\ResourceModel\Bass\CollectionFactory;
 use Magento\Store\Model\StoreManagerInterface;
 class DataProvider extends AbstractDataProvider

--- a/app/code/Test/Banner/etc/acl.xml
+++ b/app/code/Test/Banner/etc/acl.xml
@@ -3,9 +3,9 @@
 <acl>
    <resources>
        <resource id="Magento_Backend::admin">
-            <resource id="Magento_Backend::test" title="Test" sortOrder="40">
+            <resource id="Magento_Backend::joshine" title="Jpshone" sortOrder="40">
-                <resource id="Magento_Backend::test_banner" title="Banner" sortOrder="10">
+                <resource id="Magento_Backend::Joshine_banner" title="Banner" sortOrder="10">
-                    <resource id="Test_Banner::index" title="Index" sortOrder="10"></resource>
+                    <resource id="Joshine_Banner::index" title="Index" sortOrder="10"></resource>
                </resource>
            </resource>
        </resource>

--- a/app/code/Test/Banner/etc/adminhtml/menu.xml
+++ b/app/code/Test/Banner/etc/adminhtml/menu.xml
@@ -2,31 +2,31 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
    <menu>
        <add
-            id="Magento_Backend::test"
+            id="Magento_Backend::joshine"
            title="Joshine"
            module="Magento_Backend"
            sortOrder="99"
-            resource="Magento_Backend::test"
+            resource="Magento_Backend::joshine"
        />
        <add
-            id="Magento_Backend::test_banner"
+            id="Magento_Backend::joshine_banner"
-            title="Test"
+            title="Joshine"
            translate="title"
            module="Magento_Backend"
            sortOrder="10"
-            parent="Magento_Backend::test"
+            parent="Magento_Backend::joshine"
-            resource="Magento_Backend::test_banner"
+            resource="Magento_Backend::joshine_banner"
        />
        <add
-            id="Test_Banner::index"
+            id="Joshine_Banner::joshine"
            title="Banner"
-            module="Test_Banner"
+            module="Joshine_Banner"
            sortOrder="10"
-            parent="Magento_Backend::test_banner"
+            parent="Magento_Backend::joshine_banner"
-            action="test_banner/index/index"
+            action="joshine_banner/index/index"
-            resource="Test_Banner::index"
+            resource="Joshine_Banner::index"
        />
        <add id="Sparsh_FreeShippingBar::free_shipping_bar_management"
@@ -34,7 +34,7 @@
             translate="title"
             action="sparsh_free_shipping_bar/entity"
             module="Sparsh_FreeShippingBar"
-             parent="Magento_Backend::test_banner"
+             parent="Magento_Backend::joshine_banner"
             sortOrder="20"
             resource="Sparsh_FreeShippingBar::free_shipping_bar_management"
             dependsOnConfig="sparsh_free_shipping_bar/general/enable"/>

--- a/app/code/Test/Banner/etc/adminhtml/routes.xml
+++ b/app/code/Test/Banner/etc/adminhtml/routes.xml
 <?xml version="1.0" ?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:App/etc/routes.xsd">
    <router id="admin">
-        <route id="test_banner" frontName="test_banner">
+        <route id="joshine_banner" frontName="joshine_banner">
-            <module  name="Test_Banner"/>
+            <module  name="Joshine_Banner"/>
        </route>
    </router>
 </config>
\ No newline at end of file
--- a/app/code/Test/Banner/etc/adminhtml/system.xml
+++ b/app/code/Test/Banner/etc/adminhtml/system.xml
 <?xml version="1.0" ?>
 <config  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
    <system>
-        <tab id="test" translate="label" sortOrder="100">
+        <tab id="joshine" translate="label" sortOrder="100">
-            <label>Test</label>
+            <label>Joshine</label>
        </tab>
-        <section id="test_banner" translate="label" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
+        <section id="joshine_banner" translate="label" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
            <class>separator-top</class>
            <label>Banner</label>
-            <tab>test</tab>
+            <tab>joshine</tab>
-            <resource>Test_Banner::configuration</resource>
+            <resource>Joshine_Banner::configuration</resource>
            <group id="options" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
                <label>Options</label>
                <field id="autoplay" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">

--- a/app/code/Test/Banner/etc/config.xml
+++ b/app/code/Test/Banner/etc/config.xml
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
    <default>
-        <test_banner>
+        <joshine_banner>
            <options>
                <autoplay>1</autoplay>
                <loop>1</loop>
            </options>
-        </test_banner>
+        </joshine_banner>
    </default>
 </config>
\ No newline at end of file
--- a/app/code/Test/Banner/etc/db_schema.xml
+++ b/app/code/Test/Banner/etc/db_schema.xml
 <?xml version="1.0" ?>
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd" >
-    <table name="test_banner_bass">
+    <table name="joshine_banner_bass">
        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" comment="ID" identity="true"  />
        <column xsi:type="varchar" name="title" default="" nullable="false" length="255" comment="TITLE"  />
        <column xsi:type="smallint" name="status" default="1" nullable="false" padding="2" comment="STATUS 1=ENABLE 0=DISABLE"/>

--- a/app/code/Test/Banner/etc/di.xml
+++ b/app/code/Test/Banner/etc/di.xml
@@ -4,15 +4,15 @@
    <type name="Magento\Framework\View\Element\UiComponent\DataProvider\CollectionFactory">
        <arguments>
            <argument name="collections" xsi:type="array">
-                <item name="test_banner_index_listing_data_source" xsi:type="string">Test\Banner\Model\ResourceModel\Bass\Grid\Collection</item>
+                <item name="joshine_banner_index_listing_data_source" xsi:type="string">Joshine\Banner\Model\ResourceModel\Bass\Grid\Collection</item>
            </argument>
        </arguments>
    </type>
-    <virtualType name="Test\Banner\Model\ResourceModel\Bass\Grid\Collection" type="Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult">
+    <virtualType name="Joshine\Banner\Model\ResourceModel\Bass\Grid\Collection" type="Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult">
        <arguments>
-            <argument name="mainTable" xsi:type="string">test_banner_bass</argument>
+            <argument name="mainTable" xsi:type="string">joshine_banner_bass</argument>
-            <argument name="resourceModel" xsi:type="string">Test\Banner\Model\ResourceModel\Bass</argument>
+            <argument name="resourceModel" xsi:type="string">Joshine\Banner\Model\ResourceModel\Bass</argument>
        </arguments>
    </virtualType>

--- a/app/code/Test/Banner/etc/frontend/routes.xml
+++ b/app/code/Test/Banner/etc/frontend/routes.xml
@@ -2,7 +2,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:App/etc/routes.xsd" >
    <router  id="standard">
        <route  frontName="banner" id="banner">
-            <module name="Test_Banner"/>
+            <module name="Joshine_Banner"/>
        </route>
    </router>
 </config>
\ No newline at end of file
--- a/app/code/Test/Banner/etc/module.xml
+++ b/app/code/Test/Banner/etc/module.xml
 <?xml version="1.0"  ?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Test_Banner" setup_version="1.0.0" />
+    <module name="Joshine_Banner" setup_version="1.0.0" />
 </config>
\ No newline at end of file
--- a/app/code/Test/Banner/registration.php
+++ b/app/code/Test/Banner/registration.php
 <?php
 \Magento\Framework\Component\ComponentRegistrar::register(
    \Magento\Framework\Component\ComponentRegistrar::MODULE,
-    'Test_Banner',
+    'Joshine_Banner',
    __DIR__
 );
\ No newline at end of file
--- a/app/code/Test/Banner/view/adminhtml/layout/test_banner_index_edit.xml
+++ b/app/code/Test/Banner/view/adminhtml/layout/test_banner_index_edit.xml
@@ -2,7 +2,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
 <body>
    <referenceContainer name="content">
-        <uiComponent name="test_banner_index_form"/>
+        <uiComponent name="joshine_banner_index_form"/>
    </referenceContainer>
 </body>
 </page>
\ No newline at end of file
--- a/app/code/Test/Banner/view/adminhtml/layout/test_banner_index_index.xml
+++ b/app/code/Test/Banner/view/adminhtml/layout/test_banner_index_index.xml
@@ -2,7 +2,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
 <body>
    <referenceContainer name="content">
-        <uiComponent name="test_banner_index_listing"/>
+        <uiComponent name="joshine_banner_index_listing"/>
    </referenceContainer>
 </body>
 </page>
\ No newline at end of file
--- a/app/code/Test/Banner/view/adminhtml/ui_component/test_banner_index_form.xml
+++ b/app/code/Test/Banner/view/adminhtml/ui_component/test_banner_index_form.xml
@@ -4,7 +4,7 @@
    <argument name="data" xsi:type="array">
        <item name="js_config" xsi:type="array">
-            <item name="provider" xsi:type="string">test_banner_index_form.test_banner_index_form_data_source</item>
+            <item name="provider" xsi:type="string">joshine_banner_index_form.joshine_banner_index_form_data_source</item>
        </item>
        <item name="label" xsi:type="string" translate="true">Banner</item>
@@ -15,22 +15,22 @@
    <settings>
        <buttons>
-            <button name="save" class="Test\Banner\Block\Adminhtml\Edit\SaveButton"></button>
+            <button name="save" class="Joshine\Banner\Block\Adminhtml\Edit\SaveButton"></button>
-            <button name="delete" class="Test\Banner\Block\Adminhtml\Edit\DeleteButton"></button>
+            <button name="delete" class="Joshine\Banner\Block\Adminhtml\Edit\DeleteButton"></button>
-            <button name="back" class="Test\Banner\Block\Adminhtml\Edit\BackButton"></button>
+            <button name="back" class="Joshine\Banner\Block\Adminhtml\Edit\BackButton"></button>
        </buttons>
-        <namespace>test_banner_index_form</namespace>
+        <namespace>joshine_banner_index_form</namespace>
        <dataScope>data</dataScope>
        <deps>
-            <dep>test_banner_index_form.test_banner_index_form_data_source</dep>
+            <dep>joshine_banner_index_form.joshine_banner_index_form_data_source</dep>
        </deps>
    </settings>
-    <dataSource name="test_banner_index_from_data_source">
+    <dataSource name="joshine_banner_index_from_data_source">
        <argument name="data" xsi:type="array">
            <item name="js_config" xsi:type="array">
@@ -39,10 +39,10 @@
        </argument>
        <settings>
-            <submitUrl path="test_banner/index/save"/>
+            <submitUrl path="joshine_banner/index/save"/>
        </settings>
-        <dataProvider class="Test\Banner\UiForm\Model\DataProvider" name="test_banner_index_form_data_source">
+        <dataProvider class="Joshine\Banner\UiForm\Model\DataProvider" name="joshine_banner_index_form_data_source">
            <settings>
                <requestFieldName>id</requestFieldName>
                <primaryFieldName>id</primaryFieldName>
@@ -143,7 +143,7 @@
                    <settings>
                        <required>false</required>
                        <uploaderConfig>
-                            <param xsi:type="url" name="url" path="test_banner/index_fileUploader/save"/>
+                            <param xsi:type="url" name="url" path="joshine_banner/index_fileUploader/save"/>
                        </uploaderConfig>
                        <allowedExtensions>jpg jpeg gif png</allowedExtensions>
                        <maxFileSize>4194304</maxFileSize>
@@ -166,7 +166,7 @@
                    <settings>
                        <required>false</required>
                        <uploaderConfig>
-                            <param xsi:type="url" name="url" path="test_banner/index_fileUploader/save"/>
+                            <param xsi:type="url" name="url" path="joshine_banner/index_fileUploader/save"/>
                        </uploaderConfig>
                        <allowedExtensions>jpg jpeg gif png</allowedExtensions>
                        <maxFileSize>4194304</maxFileSize>

--- a/app/code/Test/Banner/view/adminhtml/ui_component/test_banner_index_listing.xml
+++ b/app/code/Test/Banner/view/adminhtml/ui_component/test_banner_index_listing.xml
@@ -7,12 +7,12 @@
        包含该项添加和声明了组件
        -->
        <item name="js_config" xsi:type="array">
-            <item name="provider" xsi:type="string">test_banner_index_listing.test_banner_index_listing_data_source</item>
+            <item name="provider" xsi:type="string">joshine_banner_index_listing.joshine_banner_index_listing_data_source</item>
-            <item name="deps" xsi:type="string">test_banner_index_listing.test_banner_index_listing_data_source</item>
+            <item name="deps" xsi:type="string">joshine_banner_index_listing.joshine_banner_index_listing_data_source</item>
        </item>
        <!--组件的名称  [ComponentName].[ComponentName]_data_source -->
-        <item name="spinner" xsi:type="string">test_banner_items_columns</item>
+        <item name="spinner" xsi:type="string">joshine_banner_items_columns</item>
        <item name="buttons" xsi:type="array">
            <item name="add" xsi:type="array">
@@ -26,13 +26,13 @@
    </argument>
    <!--数据源  component属性注册的magento组件名称-->
-    <dataSource name="test_banner_index_listing_data_source" component="Magento_Ui/js/grid/provider">
+    <dataSource name="joshine_banner_index_listing_data_source" component="Magento_Ui/js/grid/provider">
        <!--声明新的结构-->
        <settings>
            <updateUrl path="mui/index/render" />
        </settings>
-        <!--<aclResource>Test::Banner<aclResource/> 数据提供者 名称-->
+        <!--<aclResource>Joshine::Banner<aclResource/> 数据提供者 名称-->
-        <dataProvider class="Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider" name="test_banner_index_listing_data_source">
+        <dataProvider class="Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider" name="joshine_banner_index_listing_data_source">
            <settings>
                <!--请求字段名一般为主键-->
                <requestFieldName>id</requestFieldName>
@@ -67,7 +67,7 @@
    </container>
    <!-- 显示字段 columns name一定要改不然会出现load图片和遮罩层一直存在的bug -->
-    <columns name="test_banner_items_columns">
+    <columns name="joshine_banner_items_columns">
        <column name="id">
            <argument name="data" xsi:type="array">
@@ -126,7 +126,7 @@
            </argument>
        </column>
-        <column name="status" class="Test\Banner\Ui\Component\Listing\Column\Status">
+        <column name="status" class="Joshine\Banner\Ui\Component\Listing\Column\Status">
            <argument name="data" xsi:type="array">
                <item name="config" xsi:type="array">
                    <item name="filter" xsi:type="string">text</item>
@@ -135,7 +135,7 @@
            </argument>
        </column>
-        <column name="img_patch" class="Test\Banner\Ui\Component\Listing\Column\ImgPatch">
+        <column name="img_patch" class="Joshine\Banner\Ui\Component\Listing\Column\ImgPatch">
            <argument name="data" xsi:type="array">
                <item name="config" xsi:type="array">
                    <item name="component" xsi:type="string">Magento_Ui/js/grid/columns/thumbnail</item>
@@ -145,7 +145,7 @@
            </argument>
        </column>
-        <column name="phone_img_patch" class="Test\Banner\Ui\Component\Listing\Column\PhoneImagePatch">
+        <column name="phone_img_patch" class="Joshine\Banner\Ui\Component\Listing\Column\PhoneImagePatch">
            <argument name="data" xsi:type="array">
                <item name="config" xsi:type="array">
                    <item name="component" xsi:type="string">Magento_Ui/js/grid/columns/thumbnail</item>
@@ -156,7 +156,7 @@
        </column>
-        <actionsColumn name="actions" class="Test\Banner\Ui\Component\Listing\Column\PostActions">
+        <actionsColumn name="actions" class="Joshine\Banner\Ui\Component\Listing\Column\PostActions">
            <argument name="data" xsi:type="array">
                <item name="config" xsi:type="array">
                    <item name="resizeEnabled" xsi:type="boolean">false</item>

--- a/app/code/Test/Banner/view/frontend/layout/banner_index_index.xml
+++ b/app/code/Test/Banner/view/frontend/layout/banner_index_index.xml
 <?xml version="1.0" ?>
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"     layout="1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
    <referenceContainer name="content">
-        <block class="Test\Banner\Block\Index" name="banner_index_index" template="Test_Banner::index.phtml" />
+        <block class="Joshine\Banner\Block\Index" name="banner_index_index" template="Joshine_Banner::index.phtml" />
    </referenceContainer>
 </page>
\ No newline at end of file
--- a/app/code/Test/Banner/view/frontend/requirejs-config.js
+++ b/app/code/Test/Banner/view/frontend/requirejs-config.js
 var config = {
    paths: {
-        'banner': 'Test_Banner/js/banner',
+        'banner': 'Joshine_Banner/js/banner',
-        'owlcarousel': "Test_Banner/js/owl.carousel"
+        'owlcarousel': "Joshine_Banner/js/owl.carousel"
    },
    shim: {
        'banner': ['jquery'],

--- a/app/code/Test/Banner/view/frontend/templates/index.phtml
+++ b/app/code/Test/Banner/view/frontend/templates/index.phtml
 <?php
-/** @var $block \Test\Banner\Block\Index */
+/** @var $block \Joshine\Banner\Block\Index */
 $collection = $block->getCollection();
 ?>
-<div class="banner1" style="background-color: #f0f0f0;"></div>
+<div class="banner1" style="background-color: #f0f0f0;height: 10px;"></div>
 <?php foreach ($collection->getItems() as $item):?>
 <?php echo $item->getData('name');?>
 <?php endforeach;?>
-<link rel="stylesheet" type="text/css" href="<?php echo $block->getViewFileUrl('Test_Banner::css/banner.css'); ?>">
+<link rel="stylesheet" type="text/css" href="<?php echo $block->getViewFileUrl('Joshine_Banner::css/banner.css'); ?>">
 <script type="text/javascript">
 require(['jquery','banner'],function ($){
    var img_arr =
@@ -39,6 +39,7 @@ require(['jquery','banner'],function ($){
            index: 0
        });
+    window.onload = function (){
        var h_max = 0;
        $('.top_banner').each(function (i,v){
@@ -46,13 +47,12 @@ require(['jquery','banner'],function ($){
            h_max = h > h_max ? h : h_max;
        });
        $('.banner1').height(h_max);
        $('.banner1').css('line-height',h_max+'px');
        var buttonTop = h_max/2;
        $('#left').css({'top':buttonTop,'line-height': 0});
        $('#right').css({'top':buttonTop,'line-height': 0});
-    console.log(h_max);
+    }
 });
 </script>
\ No newline at end of file
--- a/app/code/Test/Banner/view/frontend/web/css/banner.css
+++ b/app/code/Test/Banner/view/frontend/web/css/banner.css
+.banner1,.banner1 >.imgbox, .banner1 >.imgbox > a, .banner1 >.imgbox > a >img{
+    height: 634px;
+}
 .top_banner{
    width: 100%;
 }
 input#left,input#right {
+    top:300px;
    padding-top: 2px;
 }
 @media (max-width: 768px) {
+    .banner1, .banner1 > .imgbox, .banner1 > .imgbox > a, .banner1 > .imgbox > a > img,.top_banner {
+        height: 577px;
+    }
    input#left, input#right {
+        top:280px;
        padding: 1px;
    }
 }

--- a/app/code/Test/Banner/view/frontend/web/css/banner1.css
+++ b/app/code/Test/Banner/view/frontend/web/css/banner1.css
--- a/app/code/Test/Banner/view/frontend/web/js/banner.js
+++ b/app/code/Test/Banner/view/frontend/web/js/banner.js
@@ -40,7 +40,6 @@ define(['jquery'],function ($){
                left:0
            }).end().children("img").css({
                "width":"100%",
            });
        }
        this._obj.init();

--- a/app/code/Test/Banner/Setup/InstallData.php
+++ b/app/code/Test/Banner/Setup/InstallData.php
 <?php
-namespace Test\Banner\Setup;
+namespace Joshine\Table\Setup;
 use Magento\Framework\Setup\InstallDataInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
@@ -11,8 +11,6 @@ class InstallData implements InstallDataInterface
        $adapter = $setup->getConnection();
        $setup->startSetup();
-        $adapter->insertMultiple('test_banner_bass',['name'=>'test3']);
-        $adapter->insertMultiple('test_banner_bass',[['name'=>'test4'],['name'=>'test5']]);
        $setup->endSetup();
    }

--- a/app/code/Test/Banner/Setup/InstallSchema.php
+++ b/app/code/Test/Banner/Setup/InstallSchema.php
 <?php
-namespace Test\Banner\Setup;
+namespace Joshine\Table\Setup;
 use Magento\Framework\DB\Ddl\Table;
 use Magento\Framework\Setup\InstallSchemaInterface;
@@ -10,8 +10,8 @@ class InstallSchema implements InstallSchemaInterface{
    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context){
        $installer = $setup;
        $installer->startSetup();
-        if (!$installer->tableExists('test_banner_bass')) {
+        if (!$installer->tableExists('joshine_table_bass')) {
-            $table = $installer->getConnection()->newTable($installer->getTable('test_banner_bass'))
+            $table = $installer->getConnection()->newTable($installer->getTable('joshine_table_bass'))
                ->addColumn(
                    'id',
                    Table::TYPE_INTEGER,

--- a/app/code/Test/Banner/Setup/UpgradeSchema.php
+++ b/app/code/Test/Banner/Setup/UpgradeSchema.php
 <?php
-namespace Test\Banner\Setup;
+namespace Joshine\Table\Setup;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DB\Ddl\Table;
@@ -15,12 +15,12 @@ class UpgradeSchema  implements UpgradeSchemaInterface
    {
        $setup->startSetup();
-        if (version_compare($context->getVersion(),'1.0.1','<') && $setup->tableExists('test_banner_bass')){
+        if (version_compare($context->getVersion(),'1.0.1','<') && $setup->tableExists('joshine_table_bass')){
            $this->getLogger()->info(111);
            $connection = $setup->getConnection();
            $connection->addColumn(
-                $setup->getTable('test_banner_bass'),
+                $setup->getTable('joshine_table_bass'),
                'status',
                [
                    'type' => Table::TYPE_SMALLINT,
@@ -32,7 +32,7 @@ class UpgradeSchema  implements UpgradeSchemaInterface
            );
            $connection->addColumn(
-                $setup->getTable('test_banner_bass'),
+                $setup->getTable('joshine_table_bass'),
                'created_at',
                [
                    'type' => Table::TYPE_TIMESTAMP,
@@ -44,7 +44,7 @@ class UpgradeSchema  implements UpgradeSchemaInterface
            );
            $connection->addColumn(
-                $setup->getTable('test_banner_bass'),
+                $setup->getTable('joshine_table_bass'),
                'updated_at',
                [
                    'type' => Table::TYPE_TIMESTAMP,

--- a/app/code/Joshine/Table/etc/module.xml
+++ b/app/code/Joshine/Table/etc/module.xml
+<?xml version="1.0"  ?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Joshine_Table" setup_version="1.0.2" />
+</config>
\ No newline at end of file
--- a/app/code/Joshine/Table/registration.php
+++ b/app/code/Joshine/Table/registration.php
+<?php
+\Magento\Framework\Component\ComponentRegistrar::register(
+    \Magento\Framework\Component\ComponentRegistrar::MODULE,
+    'Joshine_Table',
+    __DIR__
+);
\ No newline at end of file
--- a/app/code/Sparsh/FreeShippingBar/Block/Adminhtml/Entity/Edit/Tab/WhatToDisplay.php
+++ b/app/code/Sparsh/FreeShippingBar/Block/Adminhtml/Entity/Edit/Tab/WhatToDisplay.php
@@ -87,12 +87,13 @@ class WhatToDisplay extends \Magento\Backend\Block\Widget\Form\Generic
            ]
        );
        $fieldset->addField(
            'background_img',
            'image',
            [
-                'label' => __('Background image'),
+                'label' => __('Background Image'),
-                'title' => __('Background image'),
+                'title' => __('Background Image'),
                'name' => 'background_img',
                'required' => false,
                'disabled' => $isElementDisabled,
@@ -101,6 +102,19 @@ class WhatToDisplay extends \Magento\Backend\Block\Widget\Form\Generic
        );
        $fieldset->addField(
+            'background_img_phone',
+            'image',
+            [
+                'label' => __('Background Image Phone'),
+                'title' => __('Background Image Phone'),
+                'name' => 'background_img_phone',
+                'required' => false,
+                'disabled' => $isElementDisabled,
+                'none' => __('Pictures displayed in the current position')
+            ]
+        );
+        $fieldset->addField(
            'is_clickable',
            'select',
            [

--- a/app/code/Sparsh/FreeShippingBar/Controller/Adminhtml/Entity/Save.php
+++ b/app/code/Sparsh/FreeShippingBar/Controller/Adminhtml/Entity/Save.php
@@ -60,7 +60,7 @@ class Save extends \Sparsh\FreeShippingBar\Controller\Adminhtml\Entity implement
        $data = $this->getRequest()->getPostValue();
        if ($data) {
-            //try {
+            try {
                if (empty($data['entity_id'])) {
                    unset($data['entity_id']);
                }
@@ -76,22 +76,39 @@ class Save extends \Sparsh\FreeShippingBar\Controller\Adminhtml\Entity implement
                    $data['to_date'] = null;
                }
+                //pc img delete
                if (isset($data['background_img']['delete']) && $data['background_img']['delete']==1){
                    $this->deleteImg($data['background_img']['value']);
                    $data['background_img'] = '';
                }
+                //phone img deletc
+                if (isset($data['background_img_phone']['delete']) && $data['background_img_phone']['delete']==1){
+                    $this->deleteImg($data['background_img_phone']['value']);
+                    $data['background_img_phone'] = '';
+                }
+                //pc img upload
                if ($_FILES['background_img']['name']){
                    $this->saveImg('background_img');
                    $data['background_img'] = '/'.self::FILE_DIR.'/'.$_FILES['background_img']['name'];
                }
+                //phone img upload
+                if ($_FILES['background_img_phone']['name']){
+                    $this->saveImg('background_img_phone');
+                    $data['background_img_phone'] = '/'.self::FILE_DIR.'/'.$_FILES['background_img_phone']['name'];
+                }
+                //not request img info
                if (is_array($data['background_img'])){
                    //no delete and no upload new img
                    unset($data['background_img']);
                }
+                if (is_array($data['background_img_phone'])){
+                    //no delete and no upload new img
+                    unset($data['background_img_phone']);
+                }
                $model->setData($data);
                $model->save();
@@ -107,13 +124,13 @@ class Save extends \Sparsh\FreeShippingBar\Controller\Adminhtml\Entity implement
                }
                $this->_redirect('*/*/');
                return;
-            //} catch (\Exception $e) {
+            } catch (\Exception $e) {
-              //  $this->messageManager->addErrorMessage(
+                $this->messageManager->addErrorMessage(
-                //    __('Something went wrong while saving the shipping bar data. Please review the error log.')
+                    __('Something went wrong while saving the shipping bar data. Please review the error log.')
-                //);
+                );
-                //$this->_redirect('*/*/edit', ['entity_id' => (int)$this->getRequest()->getParam('entity_id')]);
+                $this->_redirect('*/*/edit', ['entity_id' => (int)$this->getRequest()->getParam('entity_id')]);
-                //return;
+                return;
-            //}
+            }
            $this->_redirect('*/*/');
            return;
        }

--- a/app/code/Sparsh/FreeShippingBar/etc/db_schema.xml
+++ b/app/code/Sparsh/FreeShippingBar/etc/db_schema.xml
@@ -19,6 +19,7 @@
        <column xsi:type="tinyint" name="is_active" padding="2" unsigned="false" nullable="false" identity="false" default="1" comment="Is Active"/>
        <column xsi:type="int" name="sort_order" padding="3" unsigned="true" nullable="false" identity="false" default="1" comment="Sort Order"/>
        <column xsi:type="varchar" name="background_img" nullable="false" length="255" default="" comment="Bar Background Image"  />
+        <column xsi:type="varchar" name="background_img_phone" nullable="false" length="255" default="" comment="Bar Background Phone Image"  />
        <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP" comment="Creation Time"/>
        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP" comment="Update Time"/>
        <constraint xsi:type="primary" referenceId="PRIMARY">

--- a/app/code/Sparsh/FreeShippingBar/view/frontend/templates/free_shipping_bar.phtml
+++ b/app/code/Sparsh/FreeShippingBar/view/frontend/templates/free_shipping_bar.phtml
@@ -23,8 +23,25 @@ if ($isModuleEnable):
 endif;
 ?>
 <?php if ($isFreeShippingBarAvailable): ?>
+    <style>
+        .sparsh-free-shipping-bar-goal-message{
+            width: 100%;
+            height: 60px;
+            background-image: url("<?= $block->getImgUrl($barData['background_img']) ?>");
+        }
+        @media (max-width: 768px) {
+            .sparsh-free-shipping-bar-goal-message{
+                background-image: url("<?= $block->getImgUrl($barData['background_img_phone']) ?>");
+                width: 100%;
+                height: 40px;
+            }
+        }
+    </style>
    <div class="sparsh-free-shipping-bar-goal-message"
-         style="background-image: url(<?= $block->getImgUrl($barData['background_img']) ?>);   background-repeat: no-repeat;background-position: center center;  height: 60px; line-height: initial; text-align: center; background-color: <?= /* @noEscape */ $barData['bar_background_color']?>; font-size: <?= /* @noEscape */ $barData['bar_font_size'].'px'?>">
+         style=" background-size: 100%;   line-height: initial; 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 ?>
            <?= /* @noEscape */ $barData['is_clickable'] ? ($barData['is_link_open_in_new_page'] ?  'target=_blank' : 'target=_self') : null ?>
            style="color: <?= /* @noEscape */ $barData['bar_text_color']?>">

--- a/app/design/frontend/Joshine/breeze/Magento_Cms/templates/default/home.phtml
+++ b/app/design/frontend/Joshine/breeze/Magento_Cms/templates/default/home.phtml
@@ -5,7 +5,7 @@
 */
 ?>
-<?php echo $block->getLayout()->createBlock('Test\Banner\Block\Index')->setTemplate('Test_Banner::index.phtml')->toHtml(); ?>
+<?php echo $block->getLayout()->createBlock('Joshine\Banner\Block\Index')->setTemplate('Joshine_Banner::index.phtml')->toHtml(); ?>
 <?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('home_top_category_thumnail')->toHtml();?>
 <?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('home_new_arrivals')->toHtml();?>
 <?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('flashsaleproduct')->toHtml();?>

--- a/app/design/frontend/Joshine/breeze/web/css/_custom.less
+++ b/app/design/frontend/Joshine/breeze/web/css/_custom.less
@@ -334,7 +334,7 @@ footer .footer_link{
    color: #666666;
  }
-  .header_bar{
+  .sparsh-free-shipping-bar-goal-message{
    width: 100%;
    padding-top: 0px;
    margin-top: 0px;
@@ -342,7 +342,7 @@ footer .footer_link{
    z-index: 11;
  }
-  .page-wrapper .page-header,header_bar{
+  .page-wrapper .page-header,sparsh-free-shipping-bar-goal-message{
    background: #f2f2f2;
    width: 100%;
    padding-top: 0px;
@@ -382,11 +382,11 @@ footer .footer_link{
 }
 @media screen and (max-width:637.98px) {
-  .header_bar{
+  .sparsh-free-shipping-bar-goal-message{
    position: fixed;
  }
-  .page-wrapper .page-header,header_bar{
+  .page-wrapper .page-header,sparsh-free-shipping-bar-goal-message{
    position: fixed;
  }
 }
@@ -525,10 +525,10 @@ ul {
 @media (max-width: 767px){
  .page-main > .columns{
-    margin-top: 100px !important;
+    margin-top: 100px;
  }
  .cms-page-view .page-main > .columns{
-    margin-top: 100px !important;
+    margin-top: 100px;
  }
  #product-review-container #customer-reviews .block .block-content {