Merge branch 'master' of igamebox/mtb_store_frontend into stable

app/Models/DistProduct.php

@@ -27,7 +27,7 @@ class DistProduct extends Model
     // 定义与图片的一对多关系
     public function images()
     {
-        return $this->hasMany(DistProductImage::class, 'product_id');
+        return $this->hasMany(DistProductImage::class, 'product_id')->orderBy('order', 'asc')->orderBy('id', 'asc');;
     }
 
 

config/liquid.php

@@ -25,7 +25,7 @@ return [
     //是否开始页面编译缓存
     'cache_enabled' => env('CACHE_ENABLED', false),
 
-    // 模板目录路径
+    //模板预览目录路径
     'preview_template_path' => resource_path('views/liquid_tmp'),
 ];
 

resources/views/liquid_src/1/tech_vista/products_detail.liquid

@@ -70,8 +70,8 @@
                                                         {% endfor %}
                                                     {% else %}
                                                         <div class="swiper-slide">
-                                                            <a href="/static/images/product_default.jpg" data-desoslide-index="0">
-                                                                <img src="/static/images/product_default.jpg" alt="Default Product">
+                                                            <a href="{{ site.image_base_url }}static/common/images/product_default.jpg" data-desoslide-index="0">
+                                                                <img src="{{ site.image_base_url }}static/common/images/product_default.jpg" alt="Default Product">
                                                             </a>
                                                         </div>
                                                     {% endif %}
@@ -240,7 +240,7 @@
 
 
 <!-- Deso Slide -->
-<script src="/static/js/jquery.desoslide.min.js"></script>
+<script src="{{ site.image_base_url }}static/tpl/tech_vista/js/jquery.desoslide.min.js"></script>
 <script>
     $('#slideshow').desoSlide({
         thumbs: $('#slideshow_thumbs .swiper-slide > a'),