修BUG

app/Admin/Renderable/DistDistributorTable.php

@@ -10,13 +10,14 @@ class DistDistributorTable extends LazyRenderable
 {
     public function grid(): Grid
     {
-
         return Grid::make(DistAdminDistributor::with(['appearance']), function (Grid $grid) {
-            $grid->column('id');
-            $grid->column('company_name', 'Company Name')->width('35%');
-            $grid->column('appearance.title' ,admin_trans_field('appearance'));
-            $grid->column('country', 'Country');
-            $grid->column('site_name', 'Site Name');
+            $grid->view('admin.grid.table');
+
+            $grid->column('id')->width('5%');
+            $grid->column('company_name', 'Company Name')->width('25%');
+            $grid->column('appearance.title' ,admin_trans_field('appearance'))->width('15%');
+           // $grid->column('country', 'Country');
+            $grid->column('site_name');
             $grid->column('domain_type',admin_trans_label('domain'))->display(function ($domainType) {
                 $title = "";
                 if ($domainType == 0) {
@@ -26,20 +27,19 @@ class DistDistributorTable extends LazyRenderable
                 }
                 return "<span style='color:#586cb1'>$title</span>";
             });
-            //$grid->column('created_at');
-            //$grid->column('updated_at');
+            $grid->actions(function (Grid\Displayers\Actions $actions) {
+                $actions->disableDelete();
+                $actions->disableEdit();
+                $actions->disableQuickEdit();
+                $actions->disableView();
+                $url = $actions->row->domain_type == 0 ? $actions->row->secondary_domain : $actions->row->custom_domain;
+                $url = 'http://'.$url.':'.env('DIST_SITE_PORT');
+                $actions->prepend('<a href="'.$url.'" target="_blank"><i class="fa fa-paper-plane"></i> 浏览</a>');
+            });
 
-            // 指定行选择器选中时显示的值的字段名称
-            // 指定行选择器选中时显示的值的字段名称
-            // 指定行选择器选中时显示的值的字段名称
-            // 如果表格数据中带有 “name”、“title”或“username”字段，则可以不用设置
             $grid->rowSelector()->titleColumn('company_name');
-
             $grid->quickSearch(['company_name']);
-
             $grid->paginate(10);
-            $grid->disableActions();
-
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->like('company_name')->width(4);
                 $filter->like('site_name')->width(4);

resources/appearance/TechVista/pages_detail.liquid

@@ -16,21 +16,14 @@
 <!-- MAIN WRAPPER -->
 <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">
                     <!-- HEADER -->
                     {% include '_header.liquid' %}
                     <!-- END: HEADER -->
-
                     <section class="slice sct-color-1">
                         <div class="container">
-
-
-
                             <section class="slice-sm sct-color-1">
                                 <div class="container container-xs">
                                     <div class="block block-post">
@@ -41,23 +34,11 @@
 
                                             {{page.content | raw }}
 
-                                            {% comment %}<div class="tagcloud tagcloud--style-1 clearfix">{% endcomment %}
-                                                {% comment %}<a href="#"><span>Rooms</span></a>{% endcomment %}
-                                                {% comment %}<a href="#"><span>Simple</span></a>{% endcomment %}
-                                                {% comment %}<a href="#"><span>Decorated</span></a>{% endcomment %}
-                                                {% comment %}<a href="#"><span>Wood</span></a>{% endcomment %}
-                                            {% comment %}</div>{% endcomment %}
                                         </div>
-
-
-
                                     <!-- Comment form -->
-
                                 </div>
-                        </div>
+                             </div>
                     </section>
-
-
                         </div>
                     </section>
 

resources/appearance/TechVista/products_categories.liquid

@@ -56,8 +56,6 @@
                                                             <div class="swiper-wrapper">
                                                                 <div class="swiper-slide">
                                                                     <a  href="/products/{{ item.id }}" target="_blank" >
-
-
                                                                     {% 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">

resources/appearance/TechVista/products_detail.liquid

@@ -8,19 +8,13 @@
 <meta name="description" content="{{ product.seo_description }}">
 <meta name="keywords" content="{{product.seo_keywords}}">
 <title>{{product.seo_title}}</title>
-
-
 {% include '_header_css.liquid' %}
 </head>
 <body>
 
-
 <!-- MAIN WRAPPER -->
 <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">
@@ -42,7 +36,7 @@
                                                     {% for item in product.images %}
                                                         <div class="swiper-slide">
                                                             <a href="{{ site.image_base_url }}{{ item.image_url }}?x-oss-process=image/resize,w_500,m_lfit" data-desoslide-index="{{ forloop.index0 }}">
-                                                                <img src="{{ site.image_base_url }}{{ item.image_url }}?x-oss-process=image/resize,h_100,m_lfit" alt="{{ product.title }}">
+                                                                <img src="{{ site.image_base_url }}{{ item.image_url }}?x-oss-process=image/resize,m_pad,w_160,h_100" alt="{{ product.title }}">
                                                             </a>
                                                         </div>
                                                     {% endfor %}
@@ -59,14 +53,11 @@
                                         <div class="product-description-wrapper px-1">
                                             <!-- Product title -->
                                             <h2 class="product-title">
-                                                {{product.title }}
+                                                {{product.title | strip_html }}
                                             </h2>
-
                                             <hr>
-
                                             <div class="row align-items-center">
 
-
                                             </div>
 
                                             <!-- Product description -->
@@ -75,13 +66,10 @@
                                                     Description:
                                                 </h3>
                                                 <p>
-                                                    {{product.content }}
+                                                    {{product.content | raw }}
                                                 </p>
                                             </div>
-
                                             <hr>
-
-
                                             <table class="table table-specs">
 
                                                 {% for item in product.parameters %}
@@ -109,24 +97,9 @@
                                                         <div class="d-table product-quantity width-100 mt-3">
 
                                                             <div class="d-table-cell">
-                                                                <!-- Add to cart button -->
-                                                                {% comment %}<button type="button" class="btn btn-styled btn-block btn-base-1 btn-icon-left">{% endcomment %}
-                                                                    {% comment %}<i class="icon ion-android-cart"></i> Get a quote{% endcomment %}
-                                                                {% comment %}</button>{% endcomment %}
-{% comment %}{% endcomment %}
-                                                                {% comment %}<a data-fancybox data-type="iframe" data-src="/contact" href="javascript:;">{% endcomment %}
-                                                                    {% comment %}Webpage{% endcomment %}
-                                                                {% comment %}</a>{% endcomment %}
-
-
-
-                                                                <!-- The button that will retrieve the content from the hidden div -->
                                                                 <a data-fancybox data-src="#fancybox_hidden_content" class="btn btn-base-1 btn-icon-left" href="javascript:;">
                                                                     <i class="icon ion-android-add"></i>     Get a quote
                                                                 </a>
-
-
-
                                                             </div>
                                                         </div>
                                                     </form>