优化

.env.dev

@@ -4,13 +4,15 @@ APP_ENV=local
 APP_KEY=base64:bdomFa+r6S774rRyFNeb4pCBxVe4WbuzAzk+LyP86+k=
 #上线时需要改成false
 APP_DEBUG=true
-#网站根域名
+#后台网站根域名
 APP_URL=http://localhost
 
-#网站主域名，不含http://www.
+#后台网站主域名，不含http://www.
 TOP_DOMAIN=mietubl.com
 #分销商前端站点IP,用于提醒分销商绑定域名IP
 DIST_SITE_IP = 127.0.0.1
+#分销商前端站点端口，用于访问站点
+DIST_SITE_PORT = 8888
 
 LOG_CHANNEL=stack
 LOG_DEPRECATIONS_CHANNEL=null

app/Admin/Controllers/DistAppearanceTemplateController.php

@@ -47,13 +47,16 @@ class DistAppearanceTemplateController extends AdminController
                 //发报
                 $appearanceId = $request->get('appearance_id');
                 $distId = $request->get('dist_id');
-                return DistAppearanceTemplate::publish($appearanceId,$distId);
+                $distDomain = DistAdminDistributor::getDomain($distId);
+                DistAppearanceTemplate::publish($appearanceId,$distId);
+                return ['status'=>1,'domain'=>$distDomain];
             } else if ($request->get('act') == 'get_appearance_id') {
                 $distId = $request->get('dist_id');
                 $row = DistAdminDistributor::getOneById($distId);
                 return $row ? $row->appearance_id : '';
             }
         }
+
         $leftForm = new AceLeft();
         return $content
             ->header('Template Editor')

app/Admin/Repositories/DistAdminDistributor.php

@@ -20,6 +20,11 @@ class DistAdminDistributor extends EloquentRepository
      */
     protected $eloquentClass = Model::class;
 
+    public static function getDomain($distId)
+    {
+        $model = new Model();
+        return $model->getDomain($distId);
+    }
     /*
      * 获取一个标签
      */

app/Admin/Repositories/DistAppearanceTemplate.php

@@ -28,7 +28,7 @@ class DistAppearanceTemplate extends EloquentRepository
     }
     public static function getTemplateTree($appearance_id,$dist_id)
     {
-        $data = Model::where('appearance_id', $appearance_id)->where('dist_id', $dist_id)->orderBy('file_path', 'asc')->get(['id', 'file_name', 'file_path','template_code']);
+        $data = Model::where('appearance_id', $appearance_id)->where('dist_id', $dist_id)->orderBy('file_name', 'asc')->get(['id', 'file_name', 'file_path','template_code']);
         return self::buildTree($data->toArray());
     }
 

app/Models/DistAdminDistributor.php

@@ -26,4 +26,24 @@ class DistAdminDistributor extends Model
     {
         return $this->hasOne(DistAppearance::class, 'id', 'appearance_id');
     }
+
+    /*
+     * 得到分销商域名
+     */
+    public function getDomain($distId)
+    {
+        $domain = '';
+        $row = $this->where('id', $distId)->first();
+        if ($row) {
+            if ($row->domain_type == 0) {
+                $domain = 'http://'.$row->secondary_domain;
+            } else {
+                $domain = 'http://'.$row->custom_domain;
+            }
+        }
+        if (env('DIST_SITE_PORT') != 80) {
+            $domain .= ':' . env('DIST_SITE_PORT');
+        }
+        return $domain;
+    }
 }

resources/appearance/TechVista/__product_list_1.liquid

@@ -5,10 +5,17 @@
 
     <div class="col-lg-4">
         <div class="block product no-border z-depth-2-top z-depth-2--hover">
-            <div class="block-image">
+            <div class="block-image ">
                 <a  href="/products/{{ item.id }}" target="_blank" >
-                    {% comment %}<img src="static/picture/img-1.png" class="img-center">{% endcomment %}
-                    <img src="{{ site.image_base_url }}{{ item.images[0].image_url }}?x-oss-process=image/resize,m_lfit,h_200" class="img-center">
+
+                    {% if item.images and item.images[0].image_url %}
+                        <img src="{{ site.image_base_url }}{{ item.images[0].image_url | append: '?x-oss-process=image/resize,m_lfit,h_200' }}"
+                             class="img-center default-image-thumbnail">
+                    {% else %}
+                        <div class="img-center default-image-thumbnail no-image-placeholder-thumbnail">
+                            <span>No Image</span>
+                        </div>
+                    {% endif %}
                 </a>
                 <span class="product-ribbon product-ribbon-right product-ribbon--style-1 bg-blue text-uppercase">New</span>
             </div>
@@ -16,11 +23,11 @@
             <div class="block-body text-center">
                 <h3 class="heading heading-5 strong-600 text-capitalize">
                     <a  href="/products/{{ item.id }}" target="_blank" >
-                        {{ item.title }}
+                        {{ item.title | strip_html }}
                     </a>
                 </h3>
                 <p class="product-description">
-                    {{ item.content }}
+                    {{ item.content | strip_html | truncate: 20 | default: "No description " }}
                 </p>
                 {% comment %}<div class="product-colors mt-2">{% endcomment %}
                     {% comment %}<div class="color-switch float-wrapper">{% endcomment %}

resources/appearance/TechVista/_header.liquid

@@ -6,155 +6,13 @@
         <div class="container">
             <div class="row">
                 <div class="col-md-6">
-            	{% comment %}<span class="aux-text d-none d-md-inline-block">{% endcomment %}
-                    {% comment %}<ul class="inline-links inline-links--style-1">{% endcomment %}
-                        {% comment %}<li class="d-none d-lg-inline-block">{% endcomment %}
-						{% comment %}Mobile Phone Accessories Wholesale supplier - Mietubl      </li>{% endcomment %}
-                        {% comment %}<li>{% endcomment %}
-                            {% comment %}<i class="fa fa-envelope"></i>{% endcomment %}
-                            {% comment %}<a href="#">support@Mietubl.com</a>{% endcomment %}
-                        {% comment %}</li>{% endcomment %}
-                    {% comment %}</ul>{% endcomment %}
-                {% comment %}</span>{% endcomment %}
+
                 </div>
 
                 <div class="col-md-6">
                     <nav class="top-navbar-menu">
                         <ul class="top-menu">
-                            {% comment %}<li><a href="#">Sign in</a></li>{% endcomment %}
-                            {% comment %}<li><a href="#">Create account</a></li>{% endcomment %}
-                            {% comment %}<li><a href="#" data-toggle="global-search"><i class="fa fa-search"></i></a></li>{% endcomment %}
-                            {% comment %}<li class="dropdown">{% endcomment %}
-                            {% comment %}<a href="#">{% endcomment %}
-                            {% comment %}<i class="fa fa-shopping-cart"></i>{% endcomment %}
-                            {% comment %}</a>{% endcomment %}
-                            {% comment %}<ul class="sub-menu">{% endcomment %}
-                            {% comment %}<li>{% endcomment %}
-                            {% comment %}<div class="dropdown-cart px-0">{% endcomment %}
-                            {% comment %}<div class="dc-header">{% endcomment %}
-                            {% comment %}<h3 class="heading heading-6 strong-600">Cart</h3>{% endcomment %}
-                            {% comment %}</div>{% endcomment %}
-                            {% comment %}<div class="dc-item">{% endcomment %}
-                            {% comment %}<div class="d-flex align-items-center">{% endcomment %}
-                            {% comment %}<div class="dc-image">{% endcomment %}
-                            {% comment %}<a href="#">{% endcomment %}
-                            {% comment %}<img src="/static/picture/img-1a.png" class="img-fluid" alt="">{% endcomment %}
-                            {% comment %}</a>{% endcomment %}
-                            {% comment %}</div>{% endcomment %}
-                            {% comment %}<div class="dc-content">{% endcomment %}
-                            {% comment %}<span class="d-block dc-product-name text-capitalize strong-600 mb-1">{% endcomment %}
-                            {% comment %}<a href="#">{% endcomment %}
-                            {% comment %}Wood phone case{% endcomment %}
-                            {% comment %}</a>{% endcomment %}
-                            {% comment %}</span>{% endcomment %}
-                            {% comment %}{% endcomment %}
-                            {% comment %}<span class="dc-quantity">x2</span>{% endcomment %}
-                            {% comment %}<span class="dc-price">$50.00</span>{% endcomment %}
-                            {% comment %}</div>{% endcomment %}
-                            {% comment %}<div class="dc-actions">{% endcomment %}
-                            {% comment %}<button>{% endcomment %}
-                            {% comment %}<i class="ion-close"></i>{% endcomment %}
-                            {% comment %}</button>{% endcomment %}
-                            {% comment %}</div>{% endcomment %}
-                            {% comment %}</div>{% endcomment %}
-                            {% comment %}</div>{% endcomment %}
-                            {% comment %}{% endcomment %}
-                            {% comment %}<div class="dc-item">{% endcomment %}
-                            {% comment %}<div class="d-flex align-items-center">{% endcomment %}
-                            {% comment %}<div class="dc-image">{% endcomment %}
-                            {% comment %}<a href="#">{% endcomment %}
-                            {% comment %}<img src="/static/picture/img-2a.png" class="img-fluid" alt="">{% endcomment %}
-                            {% comment %}</a>{% endcomment %}
-                            {% comment %}</div>{% endcomment %}
-                            {% comment %}<div class="dc-content">{% endcomment %}
-                            {% comment %}<span class="d-block dc-product-name text-capitalize strong-600 mb-1">{% endcomment %}
-                            {% comment %}<a href="#">{% endcomment %}
-                            {% comment %}Leather bag{% endcomment %}
-                            {% comment %}</a>{% endcomment %}
-                            {% comment %}</span>{% endcomment %}
-                            {% comment %}{% endcomment %}
-                            {% comment %}<span class="dc-quantity">x1</span>{% endcomment %}
-                            {% comment %}<span class="dc-price">$250.00</span>{% endcomment %}
-                            {% comment %}</div>{% endcomment %}
-                            {% comment %}<div class="dc-actions">{% endcomment %}
-                            {% comment %}<button>{% endcomment %}
-                            {% comment %}<i class="ion-close"></i>{% endcomment %}
-                            {% comment %}</button>{% endcomment %}
-                            {% comment %}</div>{% endcomment %}
-                            {% comment %}</div>{% endcomment %}
-                            {% comment %}</div>{% endcomment %}
-                            {% comment %}{% endcomment %}
-                            {% comment %}<div class="dc-item">{% endcomment %}
-                            {% comment %}<div class="d-flex align-items-center">{% endcomment %}
-                            {% comment %}<div class="dc-image">{% endcomment %}
-                            {% comment %}<a href="#">{% endcomment %}
-                            {% comment %}<img src="/static/picture/img-3a.png" class="img-fluid" alt="">{% endcomment %}
-                            {% comment %}</a>{% endcomment %}
-                            {% comment %}</div>{% endcomment %}
-                            {% comment %}<div class="dc-content">{% endcomment %}
-                            {% comment %}<span class="d-block dc-product-name text-capitalize strong-600 mb-1">{% endcomment %}
-                            {% comment %}<a href="#">{% endcomment %}
-                            {% comment %}Brown leather wallet{% endcomment %}
-                            {% comment %}</a>{% endcomment %}
-                            {% comment %}</span>{% endcomment %}
-                            {% comment %}{% endcomment %}
-                            {% comment %}<span class="dc-quantity">x1</span>{% endcomment %}
-                            {% comment %}<span class="dc-price">$99.00</span>{% endcomment %}
-                            {% comment %}</div>{% endcomment %}
-                            {% comment %}<div class="dc-actions">{% endcomment %}
-                            {% comment %}<button>{% endcomment %}
-                            {% comment %}<i class="ion-close"></i>{% endcomment %}
-                            {% comment %}</button>{% endcomment %}
-                            {% comment %}</div>{% endcomment %}
-                            {% comment %}</div>{% endcomment %}
-                            {% comment %}</div>{% endcomment %}
-                            {% comment %}<div class="dc-item py-4">{% endcomment %}
-                            {% comment %}<span class="subtotal-text">Subtotal</span>{% endcomment %}
-                            {% comment %}<span class="subtotal-amount">$450.00</span>{% endcomment %}
-                            {% comment %}</div>{% endcomment %}
-                            {% comment %}<div class="py-4 text-center">{% endcomment %}
-                            {% comment %}<ul class="inline-links inline-links--style-3">{% endcomment %}
-                            {% comment %}<li class="pr-3">{% endcomment %}
-                            {% comment %}<a href="#" class="link link--style-2 text-capitalize">{% endcomment %}
-                            {% comment %}<i class="ion-person"></i> My account{% endcomment %}
-                            {% comment %}</a>{% endcomment %}
-                            {% comment %}</li>{% endcomment %}
-                            {% comment %}<li class="pr-3">{% endcomment %}
-                            {% comment %}<a href="#" class="link link--style-1 text-capitalize">{% endcomment %}
-                            {% comment %}<i class="ion-bag"></i> View cart{% endcomment %}
-                            {% comment %}</a>{% endcomment %}
-                            {% comment %}</li>{% endcomment %}
-                            {% comment %}<li>{% endcomment %}
-                            {% comment %}<a href="#" class="link link--style-1 text-capitalize">{% endcomment %}
-                            {% comment %}<i class="ion-forward"></i> Checkout{% endcomment %}
-                            {% comment %}</a>{% endcomment %}
-                            {% comment %}</li>{% endcomment %}
-                            {% comment %}</ul>{% endcomment %}
-                            {% comment %}</div>{% endcomment %}
-                            {% comment %}</div>{% endcomment %}
-                            {% comment %}</li>{% endcomment %}
-                            {% comment %}</ul>{% endcomment %}
-                            {% comment %}</li>{% endcomment %}
-                            {% comment %}<li class="aux-languages dropdown">{% endcomment %}
-                            {% comment %}<a href="#">{% endcomment %}
-                            {% comment %}<img src="/static/picture/ro.png">{% endcomment %}
-                            {% comment %}</a>{% endcomment %}
-                            {% comment %}<ul id="auxLanguages" class="sub-menu">{% endcomment %}
-                            {% comment %}<li>{% endcomment %}
-                            {% comment %}<a href="#"><span class="language">German</span></a>{% endcomment %}
-                            {% comment %}</li>{% endcomment %}
-                            {% comment %}<li>{% endcomment %}
-                            {% comment %}<span class="language language-active">English</span>{% endcomment %}
-                            {% comment %}</li>{% endcomment %}
-                            {% comment %}<li>{% endcomment %}
-                            {% comment %}<a href="#"><span class="language">Greek</span></a>{% endcomment %}
-                            {% comment %}</li>{% endcomment %}
-                            {% comment %}<li>{% endcomment %}
-                            {% comment %}<a href="#"><span class="language">Spanish</span></a>{% endcomment %}
-                            {% comment %}</li>{% endcomment %}
-                            {% comment %}</ul>{% endcomment %}
-                            {% comment %}</li>{% endcomment %}
-                            {% comment %}<li><a href="#" class="btn-st-trigger" data-effect="st-effect-1"><i class="fa fa-ellipsis-h"></i></a></li>{% endcomment %}
+
                         </ul>
                     </nav>
                 </div>
@@ -189,9 +47,11 @@
 
 
                 {% if site.dist.logo %}
-                    <img src="{{ site.image_base_url }}{{ site.dist.logo }}" alt="Cover Image">
+                    <img src="{{ site.image_base_url }}{{ site.dist.logo }}" alt="logo" class="" alt="mtb" style="height: 50px;">
                 {% else %}
-                    <img src="/static/images/logo.svg" class="" alt="mtb" style="height: 50px;">
+                    <div class="logo-placeholder no-image-logo-thumbnail">
+                        No Logo
+                    </div>
                 {% endif %}
 
             </a>
@@ -219,276 +79,35 @@
                 </div>
 
                 <!-- Navbar links -->
-                <ul class="navbar-nav">
-                    <li class="nav-item dropdown megamenu">
-                        <a class="nav-link" href="/">
-                            Home
-                        </a>
-                    </li>
-                    <li class="nav-item dropdown">
-                        <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                            Products
-                        </a>
 
-                        <div class="dropdown-menu dropdown-menu-xl py-0 px-0 overflow--hidden" aria-labelledby="navbar_1_dropdown_1">
-                            <div class="list-group rounded">
-                                <a href="/products/categories/1" class="list-group-item list-group-item-action d-flex align-items-center">
-                                    <div class="list-group-content">
-                                        <div class="list-group-heading heading heading-6 mb-1">Category 1</div>
-                                        <p class="text-sm mb-0">Category 1</p>
-                                    </div>
-                                </a>
-
-                                <a href="/products/categories/2" class="list-group-item list-group-item-action d-flex align-items-center">
-                                    <div class="list-group-content">
-                                        <div class="list-group-heading heading heading-6 mb-1">Category 2</div>
-                                        <p class="text-sm mb-0">Category 2</p>
+    <!-------------menus--------------->
+                <ul class="navbar-nav">
+                    {% for menu in site.menus %}
+                        <li class="nav-item dropdown {% if menu.children and menu.children.size == 0 %}megamenu{% endif %}">
+                            <a class="nav-link {% if menu.children and menu.children.size > 0 %}dropdown-toggle{% endif %}"
+                               href="{% if menu.children and menu.children.size > 0 %}#{% else %}{{ menu.uri }}{% endif %}"
+                               {% if menu.children and menu.children.size > 0 %}data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"{% endif %}>
+                                {{ menu.title }}
+                            </a>
+                            {% if menu.children and menu.children.size > 0 %}
+                                <div class="dropdown-menu dropdown-menu-xl py-0 px-0 overflow--hidden" aria-labelledby="navbar_{{ menu.id }}_dropdown">
+                                    <div class="list-group rounded">
+                                        {% for child in menu.children %}
+                                            <a href="{% if child.children and child.children.size > 0 %}#{% else %}{{ child.uri }}{% endif %}"
+                                               class="list-group-item list-group-item-action d-flex align-items-center">
+                                                <div class="list-group-content">
+                                                    <div class="list-group-heading heading heading-6 mb-1">{{ child.title }}</div>
+                                                    <p class="text-sm mb-0">{{ child.title }}</p>
+                                                </div>
+                                            </a>
+                                        {% endfor %}
                                     </div>
-                                </a>
-                            </div>
-                        </div>
-                    </li>
-                    <li class="nav-item dropdown megamenu">
-                        <a class="nav-link" href="/collections/news">
-                           News
-                        </a>
-                    </li>
-                    <li class="nav-item dropdown megamenu">
-                        <a class="nav-link" href="/pages/about-us">
-                            About Us
-                        </a>
-                    </li>
-
-                    {% comment %}<li class="nav-item dropdown megamenu">{% endcomment %}
-                        {% comment %}<a class="nav-link" href="../../demos.html">{% endcomment %}
-                            {% comment %}Posts{% endcomment %}
-                        {% comment %}</a>{% endcomment %}
-                    {% comment %}</li>{% endcomment %}
-                    <li class="nav-item dropdown megamenu">
-                        <a class="nav-link" href="/contact">
-                            Contact
-                        </a>
-                    </li>
-                    {% comment %}<li class="nav-item dropdown megamenu">{% endcomment %}
-                        {% comment %}<a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{% endcomment %}
-                            {% comment %}Components{% endcomment %}
-                        {% comment %}</a>{% endcomment %}
-{% comment %}{% endcomment %}
-                        {% comment %}<div class="dropdown-menu">{% endcomment %}
-                            {% comment %}<div class="mega-dropdown-menu row row-no-padding">{% endcomment %}
-                                {% comment %}<div class="mega-dropdown-col mega-dropdown-col-cover mega-dropdown-col-cover--left col-lg-5 d-none d-lg-block d-xl-block" style="background-image: url(static/images/img-14-1000x900.jpg); background-position: center center;">{% endcomment %}
-                                    {% comment %}<span class="mask mask-base-1--style-1 alpha-8"></span>{% endcomment %}
-                                    {% comment %}<div class="mega-dropdown-col-inner d-flex align-items-center no-padding">{% endcomment %}
-                                        {% comment %}<div class="col">{% endcomment %}
-                                            {% comment %}<div class="row align-items-center">{% endcomment %}
-                                                {% comment %}<div class="col-12">{% endcomment %}
-                                                    {% comment %}<div class="px-4">{% endcomment %}
-                                                        {% comment %}<h2 class="heading heading-2 strong-600 c-white">{% endcomment %}
-                                                            {% comment %}Documentation and Shortcodes{% endcomment %}
-                                                        {% comment %}</h2>{% endcomment %}
-                                                        {% comment %}<p class="strong-300 c-white mt-4">{% endcomment %}
-                                                            {% comment %}Get started fast and easy with mtb using the documentation and shortcode examples. No matter{% endcomment %}
-                                                            {% comment %}you are a developer or new to web design, you will{% endcomment %}
-                                                            {% comment %}find our theme very easy to customize with{% endcomment %}
-                                                            {% comment %}an intuitive HTML markup.{% endcomment %}
-                                                        {% comment %}</p>{% endcomment %}
-                                                        {% comment %}<div class="btn-container mt-5">{% endcomment %}
-                                                            {% comment %}<a href="../../documentation/getting-started/introduction.html" target="_blank" class="btn btn-styled btn-white btn-outline btn-circle">Read the Docs</a>{% endcomment %}
-                                                        {% comment %}</div>{% endcomment %}
-                                                    {% comment %}</div>{% endcomment %}
-                                                {% comment %}</div>{% endcomment %}
-                                            {% comment %}</div>{% endcomment %}
-                                        {% comment %}</div>{% endcomment %}
-                                    {% comment %}</div>{% endcomment %}
-                                {% comment %}</div>{% endcomment %}
-{% comment %}{% endcomment %}
-                                {% comment %}<div class="col-md-4 col-lg-2 ml-lg-auto">{% endcomment %}
-                                    {% comment %}<ul class="megadropdown-links">{% endcomment %}
-                                        {% comment %}<li>{% endcomment %}
-                                            {% comment %}<a class="dropdown-item" href="../../documentation/components/alerts.html">{% endcomment %}
-                                                {% comment %}Alerts{% endcomment %}
-                                            {% comment %}</a>{% endcomment %}
-                                        {% comment %}</li>{% endcomment %}
-                                        {% comment %}<li>{% endcomment %}
-                                            {% comment %}<a class="dropdown-item" href="../../documentation/components/badges.html">{% endcomment %}
-                                                {% comment %}Badges{% endcomment %}
-                                            {% comment %}</a>{% endcomment %}
-                                        {% comment %}</li>{% endcomment %}
-                                        {% comment %}<li>{% endcomment %}
-                                            {% comment %}<a class="dropdown-item" href="../../documentation/components/buttons.html">{% endcomment %}
-                                                {% comment %}Buttons{% endcomment %}
-                                            {% comment %}</a>{% endcomment %}
-                                        {% comment %}</li>{% endcomment %}
-                                        {% comment %}<li>{% endcomment %}
-                                            {% comment %}<a class="dropdown-item" href="../../documentation/components/cards.html">{% endcomment %}
-                                                {% comment %}Cards{% endcomment %}
-                                            {% comment %}</a>{% endcomment %}
-                                        {% comment %}</li>{% endcomment %}
-                                        {% comment %}<li>{% endcomment %}
-                                            {% comment %}<a class="dropdown-item" href="../../documentation/components/collapse.html">{% endcomment %}
-                                                {% comment %}Collapse{% endcomment %}
-                                            {% comment %}</a>{% endcomment %}
-                                        {% comment %}</li>{% endcomment %}
-                                        {% comment %}<li>{% endcomment %}
-                                            {% comment %}<a class="dropdown-item" href="../../documentation/components/countdown.html">{% endcomment %}
-                                                {% comment %}Countdown{% endcomment %}
-                                            {% comment %}</a>{% endcomment %}
-                                        {% comment %}</li>{% endcomment %}
-                                        {% comment %}<li>{% endcomment %}
-                                            {% comment %}<a class="dropdown-item" href="../../documentation/components/dropdown.html">{% endcomment %}
-                                                {% comment %}Dropdowns{% endcomment %}
-                                            {% comment %}</a>{% endcomment %}
-                                        {% comment %}</li>{% endcomment %}
-{% comment %}{% endcomment %}
-                                        {% comment %}<li>{% endcomment %}
-                                            {% comment %}<a class="dropdown-item" href="../../documentation/components/forms.html">{% endcomment %}
-                                                {% comment %}Forms{% endcomment %}
-                                            {% comment %}</a>{% endcomment %}
-                                        {% comment %}</li>{% endcomment %}
-                                        {% comment %}<li>{% endcomment %}
-                                            {% comment %}<a class="dropdown-item" href="../../documentation/components/instagram.html">{% endcomment %}
-                                                {% comment %}Instagram{% endcomment %}
-                                            {% comment %}</a>{% endcomment %}
-                                        {% comment %}</li>{% endcomment %}
-                                        {% comment %}<li>{% endcomment %}
-                                            {% comment %}<a class="dropdown-item" href="../../documentation/components/lightbox.html">{% endcomment %}
-                                                {% comment %}Lightbox{% endcomment %}
-                                            {% comment %}</a>{% endcomment %}
-                                        {% comment %}</li>{% endcomment %}
-                                        {% comment %}<li>{% endcomment %}
-                                            {% comment %}<a class="dropdown-item" href="../../documentation/components/maps.html">{% endcomment %}
-                                                {% comment %}Maps{% endcomment %}
-                                            {% comment %}</a>{% endcomment %}
-                                        {% comment %}</li>{% endcomment %}
-                                        {% comment %}<li>{% endcomment %}
-                                            {% comment %}<a class="dropdown-item" href="../../documentation/components/masonry.html">{% endcomment %}
-                                                {% comment %}Masonry{% endcomment %}
-                                            {% comment %}</a>{% endcomment %}
-                                        {% comment %}</li>{% endcomment %}
-                                    {% comment %}</ul>{% endcomment %}
-                                {% comment %}</div>{% endcomment %}
-{% comment %}{% endcomment %}
-                                {% comment %}<div class="col-md-4 col-lg-2">{% endcomment %}
-                                    {% comment %}<ul class="megadropdown-links">{% endcomment %}
-                                        {% comment %}<li>{% endcomment %}
-                                            {% comment %}<a class="dropdown-item" href="../../documentation/components/pagination.html">{% endcomment %}
-                                                {% comment %}Pagination{% endcomment %}
-                                            {% comment %}</a>{% endcomment %}
-                                        {% comment %}</li>{% endcomment %}
-                                        {% comment %}<li>{% endcomment %}
-                                            {% comment %}<a class="dropdown-item" href="../../documentation/components/progress.html">{% endcomment %}
-                                                {% comment %}Progress bars{% endcomment %}
-                                            {% comment %}</a>{% endcomment %}
-                                        {% comment %}</li>{% endcomment %}
-                                        {% comment %}<li>{% endcomment %}
-                                            {% comment %}<a class="dropdown-item" href="../../documentation/components/recaptcha.html">{% endcomment %}
-                                                {% comment %}Recaptcha{% endcomment %}
-                                            {% comment %}</a>{% endcomment %}
-                                        {% comment %}</li>{% endcomment %}
-                                        {% comment %}<li>{% endcomment %}
-                                            {% comment %}<a class="dropdown-item" href="../../documentation/content/titles.html">{% endcomment %}
-                                                {% comment %}Section titles{% endcomment %}
-                                            {% comment %}</a>{% endcomment %}
-                                        {% comment %}</li>{% endcomment %}
-                                        {% comment %}<li>{% endcomment %}
-                                            {% comment %}<a class="dropdown-item" href="../../documentation/components/forms.html#ex_component_sliders">{% endcomment %}
-                                                {% comment %}Sliders{% endcomment %}
-                                            {% comment %}</a>{% endcomment %}
-                                        {% comment %}</li>{% endcomment %}
-                                        {% comment %}<li>{% endcomment %}
-                                            {% comment %}<a class="dropdown-item" href="../../documentation/components/tabs.html">{% endcomment %}
-                                                {% comment %}Tabs{% endcomment %}
-                                            {% comment %}</a>{% endcomment %}
-                                        {% comment %}</li>{% endcomment %}
-                                        {% comment %}<li>{% endcomment %}
-                                            {% comment %}<a class="dropdown-item" href="../../documentation/components/typed-animations.html">{% endcomment %}
-                                                {% comment %}Typed animations{% endcomment %}
-                                            {% comment %}</a>{% endcomment %}
-                                        {% comment %}</li>{% endcomment %}
-                                        {% comment %}<li>{% endcomment %}
-                                            {% comment %}<a class="dropdown-item" href="../../documentation/blocks/headers.html">{% endcomment %}
-                                                {% comment %}Headers{% endcomment %}
-                                            {% comment %}</a>{% endcomment %}
-                                        {% comment %}</li>{% endcomment %}
-                                        {% comment %}<li>{% endcomment %}
-                                            {% comment %}<a class="dropdown-item" href="../../html/default/sliders/mtb-slider/index.html">{% endcomment %}
-                                                {% comment %}Boomerang slider{% endcomment %}
-                                            {% comment %}</a>{% endcomment %}
-                                        {% comment %}</li>{% endcomment %}
-                                        {% comment %}<li>{% endcomment %}
-                                            {% comment %}<a class="dropdown-item" href="../../html/default/sliders/revolution-slider/index.html">{% endcomment %}
-                                                {% comment %}Revolution slider{% endcomment %}
-                                            {% comment %}</a>{% endcomment %}
-                                        {% comment %}</li>{% endcomment %}
-                                        {% comment %}<li>{% endcomment %}
-                                            {% comment %}<a class="dropdown-item" href="../../documentation/blocks/footers.html">{% endcomment %}
-                                                {% comment %}Footers{% endcomment %}
-                                            {% comment %}</a>{% endcomment %}
-                                        {% comment %}</li>{% endcomment %}
-                                        {% comment %}<li>{% endcomment %}
-                                            {% comment %}<a class="dropdown-item" href="../../documentation/blocks/hero.html">{% endcomment %}
-                                                {% comment %}Hero blocks{% endcomment %}
-                                            {% comment %}</a>{% endcomment %}
-                                        {% comment %}</li>{% endcomment %}
-                                    {% comment %}</ul>{% endcomment %}
-                                {% comment %}</div>{% endcomment %}
-{% comment %}{% endcomment %}
-                                {% comment %}<div class="col-md-4 col-lg-2">{% endcomment %}
-                                    {% comment %}<ul class="megadropdown-links">{% endcomment %}
-{% comment %}{% endcomment %}
-                                        {% comment %}<li>{% endcomment %}
-                                            {% comment %}<a class="dropdown-item" href="../../documentation/blocks/icon.html">{% endcomment %}
-                                                {% comment %}Icon blocks{% endcomment %}
-                                            {% comment %}</a>{% endcomment %}
-                                        {% comment %}</li>{% endcomment %}
-                                        {% comment %}<li>{% endcomment %}
-                                            {% comment %}<a class="dropdown-item" href="../../documentation/blocks/jobs.html">{% endcomment %}
-                                                {% comment %}Job blocks{% endcomment %}
-                                            {% comment %}</a>{% endcomment %}
-                                        {% comment %}</li>{% endcomment %}
-                                        {% comment %}<li>{% endcomment %}
-                                            {% comment %}<a class="dropdown-item" href="../../documentation/blocks/pricing.html">{% endcomment %}
-                                                {% comment %}Pricing blocks{% endcomment %}
-                                            {% comment %}</a>{% endcomment %}
-                                        {% comment %}</li>{% endcomment %}
-                                        {% comment %}<li>{% endcomment %}
-                                            {% comment %}<a class="dropdown-item" href="../../documentation/blocks/product.html">{% endcomment %}
-                                                {% comment %}Product blocks{% endcomment %}
-                                            {% comment %}</a>{% endcomment %}
-                                        {% comment %}</li>{% endcomment %}
-                                        {% comment %}<li>{% endcomment %}
-                                            {% comment %}<a class="dropdown-item" href="../../documentation/blocks/real-estate.html">{% endcomment %}
-                                                {% comment %}Real-Estate blocks{% endcomment %}
-                                            {% comment %}</a>{% endcomment %}
-                                        {% comment %}</li>{% endcomment %}
-                                        {% comment %}<li>{% endcomment %}
-                                            {% comment %}<a class="dropdown-item" href="../../documentation/blocks/team.html">{% endcomment %}
-                                                {% comment %}Team blocks{% endcomment %}
-                                            {% comment %}</a>{% endcomment %}
-                                        {% comment %}</li>{% endcomment %}
-                                        {% comment %}<li>{% endcomment %}
-                                            {% comment %}<a class="dropdown-item" href="../../documentation/blocks/testimonials.html">{% endcomment %}
-                                                {% comment %}Testimonial blocks{% endcomment %}
-                                            {% comment %}</a>{% endcomment %}
-                                        {% comment %}</li>{% endcomment %}
-{% comment %}{% endcomment %}
-                                        {% comment %}<li>{% endcomment %}
-                                            {% comment %}<a class="dropdown-item" href="../../documentation/blocks/comments.html">{% endcomment %}
-                                                {% comment %}Comment blocks{% endcomment %}
-                                            {% comment %}</a>{% endcomment %}
-                                        {% comment %}</li>{% endcomment %}
-                                    {% comment %}</ul>{% endcomment %}
-                                {% comment %}</div>{% endcomment %}
-                            {% comment %}</div>{% endcomment %}
-                        {% comment %}</div>{% endcomment %}
-                    {% comment %}</li>{% endcomment %}
+                                </div>
+                            {% endif %}
+                        </li>
+                    {% endfor %}
                 </ul>
-
-
             </div>
-
-
-
         </div>
     </nav>
 </div>

resources/appearance/TechVista/collection_list.liquid

@@ -42,9 +42,12 @@
                                                     <a href="/pages/{% if item.slug %}{{ item.slug }}{% else %}{{ item.id }}{% endif %}">
 
                                                         {% if item.cover_image %}
-                                                            <img src="{{ site.image_base_url }}{{ item.cover_image }}" alt="Cover Image">
+                                                            <img src="{{ site.image_base_url }}{{ item.cover_image }}" alt="Cover Image " class="default-image-thumbnail" >
                                                         {% else %}
-                                                            <img src="/static/picture/img-tech-1.jpg" alt="Default Image">
+                                                            <div class="img-center default-image-thumbnail"
+                                                                 style="width: 100%; height: 200px; background-color: #e0e0e0; display: flex; justify-content: center; align-items: center; color: #555;">
+                                                                <span>No Image</span>
+                                                            </div>
                                                         {% endif %}
 
                                                     </a>
@@ -53,7 +56,7 @@
 
                                             <div class="card-body">
                                                 <h3 class="heading heading-5 strong-500 mb-0">
-                                                    <a href="/pages/{% if item.slug %}{{ item.slug }}{% else %}{{ item.id }}{% endif %}">{{ item.title }}</a>
+                                                    <a href="/pages/{% if item.slug %}{{ item.slug }}{% else %}{{ item.id }}{% endif %}">{{ item.title | strip_html }}</a>
                                                 </h3>
                                             </div>
 

resources/appearance/TechVista/contact_create.liquid

@@ -16,8 +16,6 @@
 <div class="body-wrap shop-default shop-cards shop-tech">
     <div id="st-container" class="st-container">
 
-
-
         <div class="st-pusher">
             <div class="st-content">
                 <div class="st-content-inner">
@@ -35,7 +33,11 @@
                                     Please call us or complete the form below and we'll get to you shortly.
                                 </p>
                                 <a href="" class="btn btn-styled btn-xl btn-base-1 btn-icon-left mt-4">
-                                    <i class="fa fa-mobile"></i>+86 - 138 - 8888 - 8888
+                                    <i class="fa fa-mobile"></i>Contact : {{ site.dist.contact_number }}
+                                </a>
+                                <span class="clearfix"></span>
+                                <a href="" class="btn btn-styled btn-xl btn-base-1 btn-icon-left mt-4">
+                                    <i class="fa fa-mobile"></i>Hotline: {{ site.dist.service_hotline }}
                                 </a>
                                 <span class="clearfix"></span>
                                 <small>Get support by calling the 24h helpline.</small>

resources/appearance/TechVista/home.liquid

@@ -380,4 +380,4 @@
 <a href="#" class="back-to-top btn-back-to-top"></a>
 {% include '_footer_js.liquid' %}
 </body>
-</html>
+</html>

resources/appearance/TechVista/pages_detail.liquid

@@ -36,10 +36,10 @@
                                     <div class="block block-post">
                                         <div class="block-body block-post-body">
                                             <h1>
-                                                {{ page.title }}
+                                                {{ page.title | raw }}
                                             </h1>
 
-                                            {{page.content }}
+                                            {{page.content | raw }}
 
                                             {% comment %}<div class="tagcloud tagcloud--style-1 clearfix">{% endcomment %}
                                                 {% comment %}<a href="#"><span>Rooms</span></a>{% endcomment %}

resources/appearance/TechVista/products_categories.liquid

@@ -46,7 +46,7 @@
                                             <div class="card-body">
                                                 <h2 class="heading heading-6 strong-600 mt-2 mb-3">
                                                     <a  href="/products/{{ item.id }}" target="_blank" >
-                                                        {{ item.title }}
+                                                        {{ item.title | strip_html }}
                                                     </a>
                                                 </h2>
 
@@ -56,7 +56,16 @@
                                                             <div class="swiper-wrapper">
                                                                 <div class="swiper-slide">
                                                                     <a  href="/products/{{ item.id }}" target="_blank" >
-                                                                    <img src="/static/picture/img-1.png" class="img-fluid img-center img-primary">
+
+
+                                                                    {% if item.images and item.images[0].image_url %}
+                                                                        <img src="{{ site.image_base_url }}{{ item.images[0].image_url | append: '?x-oss-process=image/resize,m_lfit,h_200' }}"
+                                                                             class="img-fluid img-center img-primary default-image-thumbnail-small">
+                                                                    {% else %}
+                                                                        <div class="img-fluid img-center img-primary default-image-thumbnail-small no-image-placeholder-thumbnail-small">
+                                                                            <span>No Image</span>
+                                                                        </div>
+                                                                    {% endif %}
                                                                     </a>
                                                                 </div>
                                                             </div>
@@ -67,7 +76,7 @@
                                                 <div class="mt-3">
 
                                                     <p class="product-description mt-3 mb-0" style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
-                                                        {{ item.content | strip_newlines | strip_html }}
+                                                        {{ item.content | strip_html| strip_newlines | truncate: 20 | default: "No description " }}
                                                     </p>
                                                 </div>
                                             </div>

resources/views/admin/pages-custom/ace.blade.php

@@ -285,6 +285,7 @@
             });
         })
 
+
         // 模版发布
         $("#publish-btn").click(function() {
             var appearance_id = $('select[name="appearance_id"]').val();
@@ -307,11 +308,18 @@
                 },
                 success: function(response) {
                     layer.close(loadingIndex);
-                    if (response == '1') {
-                        Dcat.success('保存成功');
-                    }else{
-                        Dcat.error('保存失败');
-                    }
+                    Dcat.success('保存成功');
+
+                    setTimeout(() => {
+                        url = response.domain+"/?__clear_cache=1";
+                        var img = new Image();
+                        img.src = url;
+                    }, 2000);
+                    // if (response == '1') {
+                    //     Dcat.success('保存成功');
+                    // }else{
+                    //     Dcat.error('保存失败');
+                    // }
                 }
             });
         })