From 4c991c628cfcc0d85025af81e9bfed9f7fa4d924 Mon Sep 17 00:00:00 2001 From: gongfuxiang Date: Sun, 27 Nov 2022 21:49:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E5=95=86=E5=93=81?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A6=E5=9B=BE=E5=8F=B3=E6=96=87=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/Design.php | 33 +- app/layout/service/BaseLayout.php | 123 +- app/layout/view/base.html | 7 +- app/layout/view/form_back.html | 6 + .../view/public/common/module_admin.html | 358 +++++- .../view/public/common/module_view.html | 352 ++++++ .../content/images_magic_cube_show_style.html | 9 + .../content/images_text_show_style.html | 17 +- .../content/many_images_show_style.html | 17 +- .../offcanvas_module_config_goods.html | 6 +- ...anvas_module_config_images_magic_cube.html | 41 + .../offcanvas_module_config_images_text.html | 18 +- .../offcanvas_module_config_many_images.html | 19 +- public/static/common/css/layout.admin.css | 11 +- public/static/common/css/layout.css | 12 +- public/static/common/images/layout/g1.png | Bin 0 -> 1455 bytes public/static/common/images/layout/g4.png | Bin 0 -> 1457 bytes public/static/common/images/layout/h2.png | Bin 0 -> 2128 bytes public/static/common/images/layout/h3.png | Bin 0 -> 2902 bytes public/static/common/images/layout/h4.png | Bin 0 -> 2261 bytes public/static/common/images/layout/lr12.png | Bin 0 -> 1460 bytes public/static/common/images/layout/lr13.png | Bin 0 -> 1894 bytes public/static/common/images/layout/lr21.png | Bin 0 -> 1896 bytes public/static/common/images/layout/lr31.png | Bin 0 -> 1896 bytes public/static/common/images/layout/lrh2v2.png | Bin 0 -> 1898 bytes public/static/common/images/layout/lrv2h2.png | Bin 0 -> 1896 bytes public/static/common/images/layout/tb12.png | Bin 0 -> 1848 bytes public/static/common/images/layout/tb13.png | Bin 0 -> 2055 bytes public/static/common/images/layout/tb21.png | Bin 0 -> 2059 bytes public/static/common/images/layout/tb31.png | Bin 0 -> 2057 bytes public/static/common/images/layout/v2.png | Bin 0 -> 1457 bytes public/static/common/images/layout/v3.png | Bin 0 -> 1450 bytes public/static/common/images/layout/v4.png | Bin 0 -> 1457 bytes public/static/common/js/layout.admin.js | 1029 ++++++++++++++--- 34 files changed, 1795 insertions(+), 263 deletions(-) create mode 100644 app/layout/view/public/content/images_magic_cube_show_style.html create mode 100644 app/layout/view/public/offcanvas/offcanvas_module_config_images_magic_cube.html create mode 100644 public/static/common/images/layout/g1.png create mode 100644 public/static/common/images/layout/g4.png create mode 100644 public/static/common/images/layout/h2.png create mode 100644 public/static/common/images/layout/h3.png create mode 100644 public/static/common/images/layout/h4.png create mode 100644 public/static/common/images/layout/lr12.png create mode 100644 public/static/common/images/layout/lr13.png create mode 100644 public/static/common/images/layout/lr21.png create mode 100644 public/static/common/images/layout/lr31.png create mode 100644 public/static/common/images/layout/lrh2v2.png create mode 100644 public/static/common/images/layout/lrv2h2.png create mode 100644 public/static/common/images/layout/tb12.png create mode 100644 public/static/common/images/layout/tb13.png create mode 100644 public/static/common/images/layout/tb21.png create mode 100644 public/static/common/images/layout/tb31.png create mode 100644 public/static/common/images/layout/v2.png create mode 100644 public/static/common/images/layout/v3.png create mode 100644 public/static/common/images/layout/v4.png diff --git a/app/admin/controller/Design.php b/app/admin/controller/Design.php index 891683fa3..b7acb5ece 100644 --- a/app/admin/controller/Design.php +++ b/app/admin/controller/Design.php @@ -77,38 +77,39 @@ class Design extends Base // 模板数据 $assign = [ // 当前数据 - 'layout_data' => $layout_data, - 'data' => $data, + 'layout_data' => $layout_data, + 'data' => $data, // 页面列表 - 'pages_list' => BaseLayout::PagesList(), + 'pages_list' => BaseLayout::PagesList(), // 商品分类 - 'goods_category_list' => $goods_category, + 'goods_category_list' => $goods_category, // 商品搜索分类（分类） - 'layout_goods_category' => $goods_category, - 'layout_goods_category_field' => 'gci.category_id', + 'layout_goods_category' => $goods_category, + 'layout_goods_category_field' => 'gci.category_id', // 品牌 - 'brand_list' => BrandService::CategoryBrand(), + 'brand_list' => BrandService::CategoryBrand(), // 静态数据 - 'border_style_type_list' => BaseLayout::$border_style_type_list, - 'goods_view_list_show_style' => BaseLayout::$goods_view_list_show_style, - 'many_images_view_list_show_style' => BaseLayout::$many_images_view_list_show_style, - 'images_text_view_list_show_style' => BaseLayout::$images_text_view_list_show_style, + 'border_style_type_list' => BaseLayout::$border_style_type_list, + 'goods_view_list_show_style' => BaseLayout::$goods_view_list_show_style, + 'many_images_view_list_show_style' => BaseLayout::$many_images_view_list_show_style, + 'images_text_view_list_show_style' => BaseLayout::$images_text_view_list_show_style, + 'images_magic_cube_view_list_show_style' => BaseLayout::$images_magic_cube_view_list_show_style, // 首页商品排序规则 - 'goods_order_by_type_list' => MyConst('goods_order_by_type_list'), - 'goods_order_by_rule_list' => MyConst('goods_order_by_rule_list'), + 'goods_order_by_type_list' => MyConst('goods_order_by_type_list'), + 'goods_order_by_rule_list' => MyConst('goods_order_by_rule_list'), // 加载布局样式+管理 - 'is_load_layout' => 1, - 'is_load_layout_admin' => 1, + 'is_load_layout' => 1, + 'is_load_layout_admin' => 1, // 编辑器文件存放地址定义 - 'editor_path_type' => DesignService::AttachmentPathTypeValue($data['id']), + 'editor_path_type' => DesignService::AttachmentPathTypeValue($data['id']), ]; MyViewAssign($assign); return MyView(); diff --git a/app/layout/service/BaseLayout.php b/app/layout/service/BaseLayout.php index f4a5dd7a6..0d9c6b6f7 100644 --- a/app/layout/service/BaseLayout.php +++ b/app/layout/service/BaseLayout.php @@ -35,6 +35,7 @@ class BaseLayout // 商品样式类型 public static $goods_view_list_show_style = [ 'routine' => '常规模式', + 'leftright' => '左图右文', 'rolling' => '滚动模式', ]; @@ -52,6 +53,28 @@ class BaseLayout 'rolling' => '滚动模式', ]; + // 图片魔方样式类型 + public static $images_magic_cube_view_list_show_style = [ + 'g1' => '1图', + 'v2' => '2竖图', + 'v3' => '3竖图', + 'v4' => '4竖图', + 'h2' => '2横图', + 'h3' => '3横图', + 'h4' => '4横图', + 'lr12' => '1左右2', + 'lr13' => '1左右3', + 'lr21' => '2左右1', + 'lr31' => '3左右1', + 'tb12' => '1上下2', + 'tb13' => '1上下3', + 'tb21' => '2上下1', + 'tb31' => '3上下1', + 'lrv2h2'=> '2竖左右横2', + 'lrh2v2'=> '2横左右竖2', + 'g4' => '4图', + ]; + /** * 配置处理-保存 * @author Devil @@ -127,9 +150,25 @@ class BaseLayout } break; - // 自定义html custom - case 'custom' : - $vss['config']['custom'] = empty($vss['config']['custom']) ? '' : base64_decode($vss['config']['custom']); + // 图片魔方 images-magic-cube + case 'images-magic-cube' : + foreach($vss['config']['data_list'] as &$imc) + { + $imc['images'] = ResourcesService::AttachmentPathHandle($imc['images']); + } + $key = 'content_images_'; + foreach($vss['config'] as $mik=>$miv) + { + if(substr($mik, 0, strlen($key)) == $key) + { + $vss['config'][$mik] = ResourcesService::AttachmentPathHandle($miv); + } + } + break; + + // 商品 goods + case 'goods' : + unset($vss['config']['data_list']); break; } } @@ -165,12 +204,6 @@ class BaseLayout { foreach($config as &$v) { - // 配置信息处理 - if(!empty($v['config'])) - { - $v['config']['frontend_config'] = empty($v['config']['frontend_config']) ? '' : self::FrontendConfigHandle($v['config']['frontend_config']); - } - // 布局类型 $v['value_arr'] = explode(':', $v['value']); @@ -179,12 +212,6 @@ class BaseLayout { foreach($v['children'] as &$vs) { - // 配置信息处理 - if(!empty($vs['config'])) - { - $vs['config']['frontend_config'] = empty($vs['config']['frontend_config']) ? '' : self::FrontendConfigHandle($vs['config']['frontend_config']); - } - // 容器 if(!empty($vs['children']) && is_array($vs['children'])) { @@ -193,9 +220,6 @@ class BaseLayout { if(!empty($vss['value']) && !empty($vss['config'])) { - // 前端配置信息处理 - $vss['config']['frontend_config'] = empty($vss['config']['frontend_config']) ? '' : self::FrontendConfigHandle($vss['config']['frontend_config']); - // 滚动配置 if(array_key_exists('view_list_show_style_value', $vss['config'])) { @@ -247,6 +271,22 @@ class BaseLayout } break; + // 图片魔方 images-magic-cube + case 'images-magic-cube' : + foreach($vss['config']['data_list'] as &$imc) + { + $imc['images'] = ResourcesService::AttachmentPathViewHandle($imc['images']); + } + $key = 'content_images_'; + foreach($vss['config'] as $mik=>$miv) + { + if(substr($mik, 0, strlen($key)) == $key) + { + $vss['config'][$mik] = ResourcesService::AttachmentPathViewHandle($miv); + } + } + break; + // 商品 case 'goods' : $p = [ @@ -271,12 +311,6 @@ class BaseLayout $res = self::GoodsDataList($p); $vss['config']['data_list'] = $res['data']; break; - - // 自定义html - case 'custom' : - $vss['config']['custom'] = empty($vss['config']['custom']) ? '' : base64_encode(htmlspecialchars_decode($vss['config']['custom'])); - break; - } } } @@ -384,6 +418,15 @@ class BaseLayout } break; + // 图片魔方 images-magic-cube + case 'images-magic-cube' : + foreach($vss['config']['data_list'] as &$imc) + { + $imc['images'] = ResourcesService::AttachmentPathViewHandle($imc['images']); + $imc['url'] = self::LayoutUrlValueHandle($imc['type'], $imc['value']); + } + break; + // 商品 case 'goods' : $p = [ @@ -494,9 +537,6 @@ class BaseLayout } } - // 前端配置处理 - $config['frontend_config'] = empty($config['frontend_config']) ? '' : self::FrontendConfigHandle($config['frontend_config']); - // 滚动配置 if(array_key_exists('view_list_show_style_value', $config)) { @@ -717,35 +757,6 @@ class BaseLayout return $url; } - /** - * 前端配置处理 - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @date 2021-06-18 - * @desc description - * @param [array] $data [配偶者数据] - */ - public static function FrontendConfigHandle($data) - { - if(!empty($data) && is_array($data)) - { - foreach($data as &$v) - { - if(is_array($v)) - { - foreach($v as &$vs) - { - $vs = is_array($vs) ? $vs : (empty($vs) ? '' : urldecode($vs)); - } - } else { - $v = is_array($v) ? $v : (empty($v) ? '' : urldecode($v)); - } - } - } - return $data; - } - /** * 商品搜索 * @author Devil diff --git a/app/layout/view/base.html b/app/layout/view/base.html index 676c08492..39ee00799 100644 --- a/app/layout/view/base.html +++ b/app/layout/view/base.html @@ -36,6 +36,7 @@ + @@ -100,6 +101,7 @@ data-custom-url-name="自定义链接" data-custom-url-tips="请至少填写一个地址" data-data-show-modal-tips="请选择数据展示模式" + data-data-show-modal-error-tips="展示模式有误" > {{if !empty($layout_data) and is_array($layout_data)}} {{foreach $layout_data as $k=>$v}} @@ -111,7 +113,7 @@ -
+
{{foreach $v.children as $ks=>$vs}} {{if count($v['value_arr']) eq 1}} {{include file="../../../layout/view/public/common/module_admin" /}} @@ -141,6 +143,9 @@ {{include file="../../../layout/view/public/offcanvas/offcanvas_module_config_images_text" /}} + +{{include file="../../../layout/view/public/offcanvas/offcanvas_module_config_images_magic_cube" /}} + {{include file="../../../layout/view/public/offcanvas/offcanvas_module_config_video" /}} diff --git a/app/layout/view/form_back.html b/app/layout/view/form_back.html index f8d70ba09..36d038900 100644 --- a/app/layout/view/form_back.html +++ b/app/layout/view/form_back.html @@ -23,6 +23,12 @@ function FormBackModuleConfigImagesText(e) FormBackModuleConfigImagesTextHandle(e); } +// 图片魔方选择回调处理 +function FormBackModuleConfigImagesMagicCube(e) +{ + FormBackModuleConfigImagesMagicCubeHandle(e); +} + // 视频选择回调处理 function FormBackModuleConfigVideo(e) { diff --git a/app/layout/view/public/common/module_admin.html b/app/layout/view/public/common/module_admin.html index 128c15bff..e252e240a 100644 --- a/app/layout/view/public/common/module_admin.html +++ b/app/layout/view/public/common/module_admin.html @@ -1,4 +1,4 @@ -
+
@@ -11,7 +11,7 @@
-
+
{{if !empty($vss['config'])}}
{{switch vss.value}} @@ -132,6 +132,339 @@ {{/switch}} {{/case}} + {{case images-magic-cube}} +
+ {{switch vss.config.view_list_show_style}} + {{case g1}} +
+ + + +
+ {{/case}} + {{case v2}} +
+ + + +
+
+ + + +
+ {{/case}} + {{case v3}} +
+ + + +
+
+ + + +
+
+ + + +
+ {{/case}} + {{case v3}} +
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+ {{/case}} + {{case h2}} +
+ + + +
+
+ + + +
+ {{/case}} + {{case h3}} +
+ + + +
+
+ + + +
+
+ + + +
+ {{/case}} + {{case h4}} +
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+ {{/case}} + {{case lr12}} +
+ + + +
+
+ + + + + + +
+ {{/case}} + {{case lr13}} +
+ + + +
+
+ + + + + + + + + +
+ {{/case}} + {{case lr21}} +
+ + + + + + +
+
+ + + +
+ {{/case}} + {{case lr31}} +
+ + + + + + + + + +
+
+ + + +
+ {{/case}} + {{case tb12}} +
+ + + +
+
+
+ + + +
+
+ + + +
+
+ {{/case}} + {{case tb13}} +
+ + + +
+
+
+ + + +
+
+ + + +
+
+ + + +
+
+ {{/case}} + {{case tb21}} +
+
+ + + +
+
+ + + +
+
+
+ + + +
+ {{/case}} + {{case tb31}} +
+
+ + + +
+
+ + + +
+
+ + + +
+
+
+ + + +
+ {{/case}} + {{case lrv2h2}} +
+ + + +
+
+ + + +
+
+ + + + + + +
+ {{/case}} + {{case lrh2v2}} +
+ + + + + + +
+
+ + + +
+
+ + + +
+ {{/case}} + {{case g4}} +
+
+ + + +
+
+ + + +
+
+
+
+ + + +
+
+ + + +
+
+ {{/case}} + {{/switch}} +
+ {{/case}} {{case video}}
@@ -162,6 +495,25 @@
{{/case}} + {{case leftright}} +
    + {{foreach $vss.config.data_list as $ik=>$i}} +
  • +
    + + + +
    +
    + {{$i.title}} +
    +

    {{$currency_symbol}}{{$g.price}}

    +
    +
    +
    • + {{/foreach}} +
+ {{/case}} {{default /}}
    {{foreach $vss.config.data_list as $g}} @@ -207,7 +559,7 @@ {{/case}} {{case custom}} {{if !empty($vss['config']['custom'])}} - {{:base64_decode($vss.config.custom)}} + {{$vss.config.custom|raw}} {{/if}} {{/case}} {{/switch}} diff --git a/app/layout/view/public/common/module_view.html b/app/layout/view/public/common/module_view.html index 538477561..53f45f273 100644 --- a/app/layout/view/public/common/module_view.html +++ b/app/layout/view/public/common/module_view.html @@ -124,6 +124,339 @@
{{/switch}} {{/case}} + {{case images-magic-cube}} +
+ {{switch vss.config.view_list_show_style}} + {{case g1}} +
+ + + +
+ {{/case}} + {{case v2}} +
+ + + +
+
+ + + +
+ {{/case}} + {{case v3}} +
+ + + +
+
+ + + +
+
+ + + +
+ {{/case}} + {{case v3}} +
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+ {{/case}} + {{case h2}} +
+ + + +
+
+ + + +
+ {{/case}} + {{case h3}} +
+ + + +
+
+ + + +
+
+ + + +
+ {{/case}} + {{case h4}} +
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+ {{/case}} + {{case lr12}} +
+ + + +
+
+ + + + + + +
+ {{/case}} + {{case lr13}} +
+ + + +
+
+ + + + + + + + + +
+ {{/case}} + {{case lr21}} +
+ + + + + + +
+
+ + + +
+ {{/case}} + {{case lr31}} +
+ + + + + + + + + +
+
+ + + +
+ {{/case}} + {{case tb12}} +
+ + + +
+
+
+ + + +
+
+ + + +
+
+ {{/case}} + {{case tb13}} +
+ + + +
+
+
+ + + +
+
+ + + +
+
+ + + +
+
+ {{/case}} + {{case tb21}} +
+
+ + + +
+
+ + + +
+
+
+ + + +
+ {{/case}} + {{case tb31}} +
+
+ + + +
+
+ + + +
+
+ + + +
+
+
+ + + +
+ {{/case}} + {{case lrv2h2}} +
+ + + +
+
+ + + +
+
+ + + + + + +
+ {{/case}} + {{case lrh2v2}} +
+ + + + + + +
+
+ + + +
+
+ + + +
+ {{/case}} + {{case g4}} +
+
+ + + +
+
+ + + +
+
+
+
+ + + +
+
+ + + +
+
+ {{/case}} + {{/switch}} +
+ {{/case}} {{case video}}
@@ -154,6 +487,25 @@
{{/case}} + {{case leftright}} +
    + {{foreach $vss.config.data_list as $ik=>$i}} +
  • +
    + + + +
    +
    + {{$i.title}} +
    +

    {{$currency_symbol}}{{$g.price}}

    +
    +
    +
    • + {{/foreach}} +
+ {{/case}} {{default /}}
    {{foreach $vss.config.data_list as $g}} diff --git a/app/layout/view/public/content/images_magic_cube_show_style.html b/app/layout/view/public/content/images_magic_cube_show_style.html new file mode 100644 index 000000000..d50dc76bb --- /dev/null +++ b/app/layout/view/public/content/images_magic_cube_show_style.html @@ -0,0 +1,9 @@ +
    + {{foreach $images_magic_cube_view_list_show_style as $k=>$v}} + + {{/foreach}} + +
    \ No newline at end of file diff --git a/app/layout/view/public/content/images_text_show_style.html b/app/layout/view/public/content/images_text_show_style.html index 078bf0383..301692d62 100644 --- a/app/layout/view/public/content/images_text_show_style.html +++ b/app/layout/view/public/content/images_text_show_style.html @@ -1,11 +1,8 @@ -
    - -
    - {{foreach $images_text_view_list_show_style as $k=>$v}} - - {{/foreach}} - -
    +
    + {{foreach $images_text_view_list_show_style as $k=>$v}} + + {{/foreach}} +
    \ No newline at end of file diff --git a/app/layout/view/public/content/many_images_show_style.html b/app/layout/view/public/content/many_images_show_style.html index 571f5f519..7772c7dac 100644 --- a/app/layout/view/public/content/many_images_show_style.html +++ b/app/layout/view/public/content/many_images_show_style.html @@ -1,11 +1,8 @@ -
    - -
    - {{foreach $many_images_view_list_show_style as $k=>$v}} - - {{/foreach}} - -
    +
    + {{foreach $many_images_view_list_show_style as $k=>$v}} + + {{/foreach}} +
    \ No newline at end of file diff --git a/app/layout/view/public/offcanvas/offcanvas_module_config_goods.html b/app/layout/view/public/offcanvas/offcanvas_module_config_goods.html index eda88cf42..4c9e2e8cc 100644 --- a/app/layout/view/public/offcanvas/offcanvas_module_config_goods.html +++ b/app/layout/view/public/offcanvas/offcanvas_module_config_goods.html @@ -63,6 +63,9 @@
    内容样式
    + + {{include file="../../../layout/view/public/content/goods_show_style" /}} + {{include file="../../../layout/view/public/content/view_list_number" /}} @@ -83,9 +86,6 @@ {{include file="../../../layout/view/public/style/padding_4" key="_module" /}} - - - {{include file="../../../layout/view/public/content/goods_show_style" /}}
    diff --git a/app/layout/view/public/offcanvas/offcanvas_module_config_images_magic_cube.html b/app/layout/view/public/offcanvas/offcanvas_module_config_images_magic_cube.html new file mode 100644 index 000000000..03777814d --- /dev/null +++ b/app/layout/view/public/offcanvas/offcanvas_module_config_images_magic_cube.html @@ -0,0 +1,41 @@ + +
    +
    +
    +
    + +
    +
    展示模式必选
    +
    + {{include file="../../../layout/view/public/content/images_magic_cube_show_style" /}} +
    +
    + + +
    +
    内容设置必传
    +
    +
    +

    请先选择展示模式

    +
    +
    + + +
    +
    样式设置
    +
    + + {{include file="../../../layout/view/public/style/border_radius" max="1000" key="_item" required="" /}} + + + {{include file="../../../layout/view/public/style/margin" key="" /}} +
    +
    + +
    + +
    +
    +
    +
    +
    \ No newline at end of file diff --git a/app/layout/view/public/offcanvas/offcanvas_module_config_images_text.html b/app/layout/view/public/offcanvas/offcanvas_module_config_images_text.html index 3c370c244..1879020d7 100644 --- a/app/layout/view/public/offcanvas/offcanvas_module_config_images_text.html +++ b/app/layout/view/public/offcanvas/offcanvas_module_config_images_text.html @@ -3,6 +3,15 @@
    + +
    +
    展示模式必选
    +
    + {{include file="../../../layout/view/public/content/images_text_show_style" /}} +
    +
    + +
    内容设置图片和标题必填一项
    @@ -11,15 +20,6 @@
    - -
    -
    内容样式
    -
    - - {{include file="../../../layout/view/public/content/images_text_show_style" /}} -
    -
    -
    样式设置
    diff --git a/app/layout/view/public/offcanvas/offcanvas_module_config_many_images.html b/app/layout/view/public/offcanvas/offcanvas_module_config_many_images.html index 2cdede17f..6010e7712 100644 --- a/app/layout/view/public/offcanvas/offcanvas_module_config_many_images.html +++ b/app/layout/view/public/offcanvas/offcanvas_module_config_many_images.html @@ -3,6 +3,16 @@
    + +
    +
    展示模式必选
    +
    + + {{include file="../../../layout/view/public/content/many_images_show_style" /}} +
    +
    + +
    内容设置必传
    @@ -11,15 +21,6 @@
    - -
    -
    内容样式
    -
    - - {{include file="../../../layout/view/public/content/many_images_show_style" /}} -
    -
    -
    样式设置
    diff --git a/public/static/common/css/layout.admin.css b/public/static/common/css/layout.admin.css index c3b6f5a1f..c545d848e 100644 --- a/public/static/common/css/layout.admin.css +++ b/public/static/common/css/layout.admin.css @@ -285,6 +285,14 @@ border-color: #ddd; } +/** + * 图片魔方展示类型 + */ +.config-view-show-style-images-magic-cube label:nth-child(7), +.config-view-show-style-images-magic-cube label:nth-child(13) { + margin-left: 0; +} + /** * 表单小组合组件 */ @@ -566,9 +574,6 @@ .layout-category-choice .goods-category-choice-content ul li:not(:nth-child(-n+7)):last-child { border-bottom: 0; } -.layout-category-choice .goods-category-choice-content ul li:first-child { - border-bottom: 1px solid #dedede; -} .layout-category-choice .goods-category-choice-content ul li a { text-decoration: none; } diff --git a/public/static/common/css/layout.css b/public/static/common/css/layout.css index e9d375590..864e8bb57 100644 --- a/public/static/common/css/layout.css +++ b/public/static/common/css/layout.css @@ -2,7 +2,7 @@ * 公共 */ .layout-container [class*="am-u-"] {padding-left:0;padding-right:0;} -.layout-container a {text-decoration: none;color: #333;} +.layout-container a {text-decoration: none;} .layout-container img {-webkit-transition: transform .3s ease-in;-moz-transition: transform .3s ease-in;-ms-transition: transform .3s ease-in;-o-transition: transform .3s ease-in;transition: transform .3s ease-in;} .layout-container img:hover {transform: scale(1.03);-moz-transform: scale(1.03);-webkit-transform: scale(1.03);-o-transform: scale(1.03);-ms-transform: scale(1.03);} @@ -1929,4 +1929,12 @@ .module-fixed-doc-ent-width{width:100%} .module-fixed-doc-ent-height{height:100%} .module-fixed-doc-ent-auto{margin:0 auto} -.module-fixed-doc-ent-cover{object-fit:cover} \ No newline at end of file +.module-fixed-doc-ent-cover{object-fit:cover} + +/** + * 图片魔方 + */ +.layout-module-images-magic-cube a img { + width: 100%; + height: 100%; +} \ No newline at end of file diff --git a/public/static/common/images/layout/g1.png b/public/static/common/images/layout/g1.png new file mode 100644 index 0000000000000000000000000000000000000000..2973620c3d7e19122e1e9dc4d87e4f03879bd15d GIT binary patch literal 1455 zcmbVMJ8u&~5WawT1yLa+M76pIDG2WAM|`UsQF3;OQ7%}HC4$mqeYdtx@!cMGo7hR2 zjs}S~LO@GHN0lNC1p*=H_z6ffbhI$*$0;D5v2@ zT!-`6Q!fc(9PlUOrUU4%3M`d)^Mx03F_xbJDSOG6s*6tG5yjXR99w8MTwogM#R0Hk%@ z%*HQ$3B$}p$}8It#z>G~qSMAsOtm^q*;eAw$~L$;C8CM3lTgB0(qODReyG~mW#l;G zVJtN55-*5E9M_KAqGiIVEt@(BZWxMLXcz|0TezTK*GpK}hftUKL2KtH=uAVrat`a} z4^YS(pK$V5u#_t43-6BZR~@I8uvXB8gS38Y0aYtb z(Xfg|#Z--fyRM6?QOZf=(Q4V2K_N8=e4Hya^`>D^MfY2ICGS&TY3deLO3fCfe#y*R zW?_84%)Bj;2jlzxf8M{71W<>hdu$$2og#toQjo&a?u_bZmEIrCx&a#G3?`na1zYw+ z5>Q_rZ3o9zU`X5RP$2z7UJPL=Yw;dQ=zJU0`nTlMAOcO4?l2hb=QsyvN6LH*hu$Hk zS<`|=*7j%wy)J>K_TedBhlY5mTApuAzxOtto!NLbxp?*T?Y*y(^yJe7`5dhtik4Ze Ltdw6YZ0vmpXA8n6 literal 0 HcmV?d00001 diff --git a/public/static/common/images/layout/g4.png b/public/static/common/images/layout/g4.png new file mode 100644 index 0000000000000000000000000000000000000000..eb2e33767d987992ebcc71ce8f409c2e167acb83 GIT binary patch literal 1457 zcmbVMy>Ht_6lZFr9|=4aMbl0PdP$J*(-dVM%o+}**a}QnkO|a57N3qMiLl6H$+IPU zED97|0(9tNWC)NcL$YPckSRdXAannWPAxjMeWwq?4w5#p0P4Pe_j~X6?!EV8dwXN? z(wCPMMOkcZHaaj~k>AG)@c-MRSHHsWVS6iT!uag@FDLifFJbn9=xpyO|J?maeG02j z^36M?qFnw|eixLJ`@nD!CDE?f4Yx4msZL_vW%@YH0j(&jYvY{IeI`(s^^?q3e}DE| zMM>e^Rmb&P=^WrCn_I?PHu_SFe5hPm7}R5XEz zeP3Od2GMTVMgcDvs_CvqEvJU+o^H9zj_2J#wrQ;x=89o0YnF>06WcbL{Zz14#68?; z+?v^fm9Gwj$gyFJMk9T+tn;F8Sf1w@rft}^1_-S@$^;o}S-CW4Xt0tNNiGteA<0O( z{6P3BcsiAk<`r#L&cXx%GsYx0EZvlnCcv0hxcs0PPK?LYU_+L&Oq77NDr`RBf|mpS z7V7Hwi~$I37*;mk=u4VbCQ8vf1R1k{yb)bSM>#V(tmFp;Wz9oyb4jYnaZoTKcoA_v zoIg~1?lKAj`7j>38WNghQpdGZw^)M+=Bu^|0kb$W3V9O~LH-vUQ{3Z4NS5VQ;4ONMYz zb~bLJRx@xd&vi9hwp07GhZ3#s*>%lvEv9vyo~hXu zVNTbn*G;=Vzu(~WK<2^xe*B*Izb+D}Loz%!kE~9aKzK7L;c1U%^|Qmioy~>`n&b>7 zRMvv8QkeuSR%hGExg#*89SsVuAENbc$!CB9LzeDTjPbh8$=Rtg zpTnVd$Z6HIU{SR_mO-y8psAfae)u;u#Lrue_2}wnbnn4Od*3faf1;nS{DEF5%IzO6 Ue9^7_<;bSlYHl~4+}!)_Uyqx-+5i9m literal 0 HcmV?d00001 diff --git a/public/static/common/images/layout/h2.png b/public/static/common/images/layout/h2.png new file mode 100644 index 0000000000000000000000000000000000000000..59e3f14343489aeeccf886dda3dc1ef8f487a314 GIT binary patch literal 2128 zcmcIl&1)n@6d#dYb(er3h^bJOsRWT|5Z62!eRr2;OzgDSKmf9Q5Ex5m?t{1Pu|6il}L%6+^ZQLm;mFusl>$%EPc?RF+r98KFD8)MDOC(z^clk3Z{L!s_~mZe&JTgZGn-gPh+!*zD4S z9U3rw<)*eg4gp}uOQMa3gR}_8b$x;x!dh(`x;8N>ck248a;R-b9jzgAuDMkYQS7){ zEvRD8c7os?%`&lXn7)B+guT!)L(9@;KOMZ~OoUs_TQgtqRM-1unT3Wi8jY$WyDIaZ zfrB70Ov|t=1Qw{+PfIdJX>ntY(BuWpldMc+swqSg%iXfB1Jh{;!)yVY7PB-#!i+J= z3|uu;NOQv|I^T3STv!)nYY)84_?`(|boVoEZ1Fq4DfH+1l0#*!ss|01SQ z6t>f%Bq` z)h?41Fcv8di6gim>Npk{xx%p!u^omeqbA3mMQA*Y642hy6KEeYIE|`UF+eo2W!g30 zLW0H^ISdQr+mr(s zLsk{*8l$0*`H+Cxk|F7FBTIWq`#=K-ZX^X1dVkhUxA{l2)gaL(5)BDeol)1Rk_2b^ zY&$t4%@+%33Onj^06j+~Q?o*fazt{z+Jll@Op3~XkHZJo&@Ug+#e{!mMgH50m#)a!5gF=ZI~APqq!u5E ze%?5%(9%k&#jLt(q_?Q^&CB=c@`S}8`9Ca5YNAG56A2H;h{X;^K8No2c$~a*lwAyZLq22%h literal 0 HcmV?d00001 diff --git a/public/static/common/images/layout/h3.png b/public/static/common/images/layout/h3.png new file mode 100644 index 0000000000000000000000000000000000000000..e1ca39f3c1224348f1dfce3381722dc453f1be47 GIT binary patch literal 2902 zcmd5;J#QmL7&by6$SD#M5<*w4_KM?cyfeGApNcO^>|A1r4N+o=oJ7Iw%&fhNcW2q% z#7^j_xDH*3=&m^$M1e$c1t3})S}Ohl?R8;xZEwt-lNh+-EZN?VXP)dMWPMx(LX-RbPh|F_HUYp=@RKS!-6^6&L@=U(1u+<3G6zSQ{o8;Mx?E$ST>hyI5i z6>*a=5%A_XP9?h0SX&>bgdXui33xwBTIyeqe^Ql*wbYMIANpyV52Bs3j31os_UPFW zb(y+;M_C(tk|5>Yyl6Pt!)DQFCN8Mb_7l z>$)1$HC+c10rJzNAY+i^w`L3-p3^K!i%29&$w&fmT(nf_=_G_Wt!a~dnkJbrZA?-P zHDMW21!T0wrN`N@GR~;Rhdky(vs(KNP&=)8BDa&4dI z;y9yx>qJ_-HFGR4_W4C>mRK&~_2P6O3Xu=QB}u4X*QrRocE(8|vYrsb*)H$RSd@0V z+*Mb3$0syOO6qq@Kc}mBhZMY}>QL?$LO?fr$n>D@8P@yI@gST)eOXD26yzze-IGOP zV$XE{0TwI@Pp^eC>V+bUiOh2plRnqdq+eO{eXpD31xYCHc3P@*wHZasLwdkN!w!Ls zI06_O3^>#zz_1|Fbpv7==(F`5L66HCDA!Ngfe9)(>g0K@!)RcK7!U^qz;JN@99u_# zkKV@6BR9cn>6&xjvyC4Y(w|qDm&PT!h7lWPGD9lfPUkYL`Wjlas6c zM<&!6A{KB=!~mv{0vFmY2pz+6T$fPH$SnR#{5R38aR0Oa(*)B2N%~x>wWeMg5f#Y^ z&*pX|B^i+-&9l6vhM9;JlBUCml5z{RlY~vRudW`Y5XwcbTxy5$ESk&Ryp`Gobz9Qxg(hjs(K{PdF5q&z?3)j5tS!W=`wi$ zz5VF+SMu-*yPb{R&MJL!e!l)PK)*hErE~B5&(H6l|M2s}x84xH4BorxZ$12WfFEoh e{Ql*SjYj^-`QtwhAH?O!x4X65`EK*mFa8Fm6qyGA literal 0 HcmV?d00001 diff --git a/public/static/common/images/layout/h4.png b/public/static/common/images/layout/h4.png new file mode 100644 index 0000000000000000000000000000000000000000..475b388a60bfd30134068343a482e36ae0ede61a GIT binary patch literal 2261 zcmcImO>5jn7~WD6(ga^xD4~=_D3^wIRx{G*6K{;Y>twf$9OEq1xpg!%+7;f_sFLhm z`nYBxTpj(2L`{{V<Lg5YU>;0jPV0mYLVGHpB@q(v}p=o8)muB%}~*CvqiprLP80k!>bS8J+VYIfa0oKRbH{W@_h z>ieH-CMKSNJ%d) zX_zJg1S*cxl8sSX+@3SEWWn9^%+B5siJ0d|_FL*<4bKF=EAXq6p@<6hEvAQO%#aRwxb}i(&?@ zZA+io3^B{aKtwU}q)C9+i-;gLi-bF8dzdG%aM<8HYo$s6qi4b_&xYBAdWc%WLXjys z5+-FV_A!Ym)ahm1rW&X`R08U1ogeQso4dJ+lL0&^_U>k2L9Fs2 z1D_>B){{n-_A1wd3`n<~6wu=1**bb8znNVP5^ZA6fbnWgG<05>K?;2~oGdBxY6(qg zM|}yTm-u4}D^y&LSS~kv(2~_mXuK|if*oD1p9&$F8<`0Ev5Tk_1X{ygUz|(BDpHpDld;!xul>r_9GwJ!ULB&m9CgjFl}r}h9l}pevWIB?X+~p zE4fYy8F8*~YtwJpbv+ zx6hya`Om|Df4uU^y$`?pNvw@M#-1hF zJt8g~__`tvaOA?RCl2)13WPW!^*^YD)LXCZn|xRcqAd`~nXljc-uu0I@7?ZhTsd*< z!hqQ-}fZ;GoqAj@Q;w>tQBXO=|e8-6Xa>hlV0f274bs zS0i}khC}M^dr-)mm`eJ;;FyttC{hZllavm*m1jd8Rk0+27>fc7EAI~OcY>f>h(R)j zgR*z!66&-A7kjR2I3}LC8-}Elm6B$RcUry<5i*k`1~J%autptp*0@n$wVOuMWqpHF zR>v;$SiLq_-fs!EtMXuZKmN@7*NOz{kdD8YM^&dvAhMp6@U(l2`q|{y7qfAKW;sJB zQ?=mhOeF!2^~HAb#Sxg(PDUI^|06Hvuu=@8(A3WTdgmQ9#FL%YT6Fpi+kX7b_N|rZuW#@F^2fa=@78`_ X(fZ<$LA_>I_03LuqxJ04_RW6)0hz$S literal 0 HcmV?d00001 diff --git a/public/static/common/images/layout/lr13.png b/public/static/common/images/layout/lr13.png new file mode 100644 index 0000000000000000000000000000000000000000..6bbf323a309c114200624737f7dcabf55ecf5c7d GIT binary patch literal 1894 zcmb_dy^q{P6nBVpKu|`L*m+FQgSnj4SDyVk8e#`fLr zT?sTaNE9>?1uYE?q9H{Z3Isw(2#JcCl0O07ct5y1UBW41CGULw=Dpv0?>94_40rBb zzjouAqA1q~{q6|bm*w}|Rrvq?tDk>_W@~tV+=KSvqaPl8I{XQG&(x!xUFGlhKhwU2 z(ep+By-HDDcu9U&lm}mcg{@!H@m{?b-Vd0_S~M0BZ!NL{(28>V&Z3~~fY)loCu!c+ z{(AUGQ`5Muy=#X!EINFe_D@Q_d$KcTCkM=rwL5RBw-*5z$aqcFMK;T;VA0kZy8-m& zw63WQq&{eC+tQ)B7Y@~qD7k949K?uatFGT7j%oS+8>)ecr(;hiCL&H?;lMD|)lUO& zWt;?~?prHgFluYlx-J4;pU>y5x!DrsL?^!Q>)6l@0|5e6$9YW`D6ej=Ep&Os%Cx9c zk*m@ojl^Ny)`00Ugsj+@&8t3@P_79^s~C`6rRbi(x_pJ?hPmqAC&L1yVLW7 zPG?w(B%Q%RHM)0K9rQX5@f`;lEz-~p!(fnCHO(0xblVzasFkKMsL_tF7lCg5#6lJ| z2=WPcQDigXng;Vs&t32D3U(-UAonkiL@XHC_?MpRnX&EQ2vHol$o4G@MW)3NiQUMv zsb?7pU0Zv*OyN}0*=ehiRSXsrgP0~ZF^VILAj`lmq8ulPxh6HK>pB=Ssr^PyK|iga z(8sIOw97wO^=7HsC@7#zo{YA}q$GH(t)|lp@^LB8tNrsS2cu6=$O~QqIgI~vM7q3emx9yJYq427bumLpn<=>MWq0$;z+m%G z@f?y>!ZY;!!1x@Vup5K!_W0H>Z2!w=_dmWmcK&!}>$i74dbK}&QHjJA^v$2%ck-nh M^me*m-`)T4AJVQyx&QzG literal 0 HcmV?d00001 diff --git a/public/static/common/images/layout/lr21.png b/public/static/common/images/layout/lr21.png new file mode 100644 index 0000000000000000000000000000000000000000..9ebc60a004647766aa4a6344b86c913387e25c58 GIT binary patch literal 1896 zcmb_dJ&fE$6!sA*kf1amB!nm|rwM{t|E%rxjIu-*?~+>-AFDk}9HQXHTPuf&_1uer_RCuZ(slN6Ex@hH{&j}x9|LT>(lft*XK&+B-G!X}~Z2;3n2zj|SThz-mLBh-#Els;&sgUNtl&x{)K{c5>PnpRlJm-b10c)?Z ztU!0gY_#BWm%!(c zKqHZ6!=rnktr)88ImGktf`V>RD(U}%Q$~iO$|*#h<#fc&vKSfqI+r9A6H$R<#qQ*M zFAV#Y7-kb#s0TN$>%DI1+t~M!)3E1sqlom1TGE2?UZ-t9h8kIxk|y>NmijJYLysZX zVGJcL*Fl~iq{B4vTS*eE_ICt3P&!ci7e^u$3~c;I&+{A$r_4evjvd5&H$m8E31S{* zE_RzXr+8)UjVgmvNhc?*Dpsjt$V)yfRiHnKrtfc$M z{Fe^cm=+@r7p`eMdPHYa=&2Fie;6NgM5elI7lJeI)#7~Z#KjCHoln7Sue$4J1_tYg ziWiWq3Z9{FU;p?Wc*0)nbvENG&#}F)p4|KBT>Q8G`44}}Kb{GH|M0sFjlQ>m_P@~H QS8rXfyWRQb`rZfs0^PGruK)l5 literal 0 HcmV?d00001 diff --git a/public/static/common/images/layout/lr31.png b/public/static/common/images/layout/lr31.png new file mode 100644 index 0000000000000000000000000000000000000000..fdf8efe3f670f40437586c2db084a73bf084ceb9 GIT binary patch literal 1896 zcmb_d&x_dKx(5b+SQf-72`RDN|TY`e^Mw>u4+wwY;gWD%xPRoxw?lZr`Z zx@Rtec=4bhcv?Jo6~UXQJuG-p6c2jw&+y>In|{?lva_?Z>#*36PNnLr_r3SktEx{2 z{aaTqzj9gAv@5;s&JMg^R?l;r@c+j*zy1ubOM~0PF1+vE|LN}MgI}QaOtsVB)&9Bj zh4DRnJ)dvCUuxP5FREulyZaR&T>3p3?p1ry?U2c|LAi`YW1i*^t!dY9%yY^PM5V`K zoMbKI&wKX`J>f0mJukANye%fl_DLajPx?c4a=-{TZoI8upN9aDii+y_t(jt(vIxasfril9_xJpvi4f}9&&4v%wT?ub$z7EE-HfaX=D zCJ)<%pp`6!Qcl+kHCR*D+ikTlM86hMmSjrD8>eQ84y{DXuq`M!#>n=D7>Aw}I`~a1 z2rX+F8cCjvj?aWPhia8c=y(r>f^Rsj=zj)t7LH_*Qc#_wbS%s~8yk9E%djn{vVg>j z-Rb^byFDo6D4D`QxpV8L-s`q~One{N4ZNTmMPV;1E1EIU>$D80P$NlrXo)~DN;qPI zd&u<}N0h_?!ZyXO9XI`e^Y#3WWQWQJYW{LdaLEAU0X-61gvBgCR!n^)0=J21Kw=bF z3_F$|c)ne;dACSlSJLTeRKCuz=dDb(rNc>IG~4kMehwbzOUH-KXZi zDiE8{Y%JiwHI1iNbTNl6sh&~v=w|$%6`AU=T^i0j>&3;`se>7obkPN;y=vCi41ClV zmB^r21zbZv{?>UNuCP~oovq=um)QQ-&+dP+IrKkxEhqf%JN+-eoos6KqYd=K#%F)2 OyRO&mcfPy1|M9=(AxpLZ literal 0 HcmV?d00001 diff --git a/public/static/common/images/layout/lrh2v2.png b/public/static/common/images/layout/lrh2v2.png new file mode 100644 index 0000000000000000000000000000000000000000..18f37bcc815d48896e2057e9a69600635667eb80 GIT binary patch literal 1898 zcmb_d&yU+g6n3dp+M?xBAyq}HEcdbqCieJ8>=`vw+a&Eqs+TAm#8zB(Jf0-h#vWsP zH`zTRE*wDO!lB~80SR&8#;J#uI3W-hF8mq%3GgP#n(cO5Ruz$)`Ss>|-+S}TywCev z57(~Wx~^&3T5q#6fcB>Pu3m=!KY#fBS7@&E9}T0|;0CNQOJrPWXs&nKoD~Bhi?rIaq7j-Fx$#@jX%Lkr*dg z%lPZ*v7sk%%lOC(tuSwkNwRrVi0z}TAwSyVBsT87uiu?h07yl}^m#hXN;+>D3tS3) zHEkOD!lc@385_!>z7zKKwk(A1HJXTH*VBE{z)i;`>#Lsu z-imlc2b~8iUodJJld8(8Y0hS|#>{ERVr*hUh-ulTZ6mNiHr zL}t1|WRcvjS_Uv(hLGkpY*wz)1PL?eEH`n(QXwr2V_w_k`^9wOJm#jDid1A(3AVVl z%_p*wXzS#=K}j8#I;wJwK;xiAN!l=}r2-2Mc*YcT6SIo_r*X{bNERuBsFRe9g_&n#L$7m5+j1%kaIDy! zp6|8W{X&kCDJ+zOhxhefx81~~*+g~&FX)CL?PX=fGA??ZmH`=RBuPve_8GxmfNbLX z$Yp+jq9AUfDDtt#xrIGa@9#*yuXLdHFRw%_Ibi%tPmsuWTsK0F?Eyvry?|RT@^RC* ziS2S9*JvLU3EWCHJ&meZ#enG8ksuc5NCYebR*{E@2wdbiQGhMRJUhlp`wKbI&7_2b zK3v_VZSl#fH%;_~f+*waX0!~hBq3sBHJzN3j|+KT?Vn8qfWAZ}OYfx|RWnwIjWOiz zVp23;6hX-jUe4bqg4-krkUJW28?|%9ZO|*S+qo z^-Gs8X_~g)*=+TpeMh~ooQLmUKmGnIG#7if2W@B{JpAR}x4qw>w^sGLTiQQ&zBlf} z->doNr=_O7_Lh3jY4?5r3l|?HgY9ZNx=ol&Yn02OsLj$G(3*Dr#w@37S5*2?jFPNj z{Qcmep(ngyeBwn`lsCmV**q-7)?s(R4tH6|jT;~8*JlI_q@tqwES+Q}nKg{LT>^bI zY#RC;QtdX34dqbZj(U1i7DD%GK4RGQ^mL;_0iH7{56bmRprDqr_*U|>eOU0GI1D&re&M9jR1klgRG)6l$BSHEVM+)iX^WR znd!6`VF1%b2x-1Do0ZEnLBh-#%}rdhR7i6mXDeL3S4`&4IWxsXq#~OQ?X}WSzR_%QVW0{as(dFPE7iM3Sa<5>by$>|6s%Uc3 zECj7&F_3a{v{Ahy%6hY@HYU`sMU*9(isQXwt3-=dqG8w;BphR8djpJ#XAuX#Zw17% z7SKrYBtAF+tq*V=5XAMLfP!u~t>|;XoRL@-DTSz$l#Ya%XCp&j<&rezL>Ay!u{%EA zX*PR>jFSmWl>J*b^-jC#Io|o&VV*y5=p^}C7QpVMk7Gh%r zxjUN_&8J0B(*0-i7q;*7I^(bdj)PnpIw^mEIP;_y=X1v{X4umC5Zv~vyDBsAvno^~gJcy@hUoo2 zUxE^LrPJCNTzi}C{P^+E-s*=zjLPc;nH#P~XgR>)(C;%^#}Pb=uw5&o_6z F_!p3EMc@Dc literal 0 HcmV?d00001 diff --git a/public/static/common/images/layout/tb12.png b/public/static/common/images/layout/tb12.png new file mode 100644 index 0000000000000000000000000000000000000000..667d8b26325ff55188c17374532a3ab4eabd4a0f GIT binary patch literal 1848 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 Z`|{l1sK+uK_=mao2g zRZ*1XPP?@O*O#l~`DfvLI&9p9%L`fiqe4-ZUaXF%l&`-5#B*8P-7R;6_k1Rk8s#z+ zwNa7*T2WTlMj2)MqEtiCi_?bo?=QbJfKCG+9x~7gH<$gn3uMDcY!M56zxlpZ|jTkX4)$wY?uA83s zwrXJF>e$su9TD3%v2Pga^rwNfoJamn>)oj>xNB(rvdny49}b7LVZA2vo=!Z^)3Ko& z1_A^sj?$8jP+DA@F|{4=ChpZZJE@ z2jlQ?ri+0{fV%)J8SBgZW-e$c^RASGS)#UQ7S(36N{pwz9#9sim5etkS<_vjMN84p z3=9D$1Q}MBSib4_*nSJUKE@Mh0L8#*Ngo0`UC49Yf&T+w$>ZqgGSDFKJ84nUl!;EO zp@FDc9CP0_C=El8BI22KWE#vv)Uq&gh|LHyBG>lnV_mSnCD}n0j%xp;cDZE0F%PM4 zI2L1}6(VeM3%Q{wkY|}L;@sq>6Gowj*^KS|Jcjn6gZo)4RU8=Y5WAMeDDoo1LMCxd z6gsv*mMbU}t!)?~MC;scQx0SvNDk2jwdc<}&E|G4qj&%>ik%x9YG<=)6VJAhQ6rkl znIFkKp-^pcLVH5b(q2{jAOqZO#|0$%XxdFT#i!HNAXdjE>Qh#AMnhv&NeHe@AIA&A zd^v|Ew8Opt(hI6&0xM)x4rwmddytaLm7@MQ4+?sCvHpmU})PgtVdylBiCCUs~E(2{*YZ0nUwr(ISUSD((v_1}zKm8*|9kW2(Vr(DEcN$(>wo3#ttd+J-M4o> T`Rn_r8rGf7t=5kldnfk*8a9VW literal 0 HcmV?d00001 diff --git a/public/static/common/images/layout/v2.png b/public/static/common/images/layout/v2.png new file mode 100644 index 0000000000000000000000000000000000000000..7cc67b393a3b4252146b6a7df1f713584ac662ad GIT binary patch literal 1457 zcmbVMy^j+|6kkAu0J79kCPK!jvaEiTEDVr%48AMY(!?ni0Cs1lnW6IQ7)Oj*e9n zN1l4S7MMZivr*hW%-Qx~H>8LA)Q!~Z*U;4|27-hMf~LthE%4M+=e!u^a@$bR93u8T zbwe6NJ3$ZmJZGq;I~ujBHB@(X%c)dd_giF}R>LqGhE>rl2UksO+i3Yy!CD>-aKCwT zX$w}KIuatohB28;^hrhM`OvUj*ELMrux$+xS}{unnQCcqWyR2B1^Fcg@ zgQCB+i8?Lcv0TT|Y~7l>8w9wM7J{Udb()?E5z^y0f=qGhc2uuug9@WswNf{=Ms2XC z*$sycs*zJQt%Y2;-{kZ_=E3TI^nv%k%VVfRGX7{DS)DS0a62yGX=ls&*=Bc_vvG{( zIfDt6wcx2#CIO4o<#znh5m?YpMhr;*CodMTf)B)m_nNb;Ltndv}{_iDBB)Oq1WZm)PA^|{0$B9a;Lcwu76Hs1XZPN0$M5~Y?XLPFiHH;L8QYwRsad*pz` z1&J%-z?BO(P8_%*5NCb@5*NfTfZ05(Qh|6xa`yG@H#6VP%;VPb&ErRBjw*_Byt!C! z!+1u1hxft%r`x{-SADw-c+AV`=XXqfcV0uMcP#EW4rw+$7IAY#K)7o~tn?Fo@# z!x#((`kl&tQ*tP};t=LKh8ER>9e#%g11tWE^;RNDl>ElabV(6X>&UN+~jX^wFLkK)eOF5GMgPwd#Z;`{`K zq=|?ie*{MqcX*x<2sutjml;{wRZ%G<_IaP@U|71gbHC~Pt(iXKlACp+VqyPW_ literal 0 HcmV?d00001 diff --git a/public/static/common/images/layout/v4.png b/public/static/common/images/layout/v4.png new file mode 100644 index 0000000000000000000000000000000000000000..f11ef5d9553fe35605ccb6f52d2c0309580dc76a GIT binary patch literal 1457 zcmbVMy^j+|6yJk{@FA)QB}x%SO9O)a^xAkvEa+GpY>B;CK1&>;xw+Y~y}I33}2#nupu|XYlMl^q>@e&xkOuh6lcEv=J^X9 z#gVUHuZMP+2YeiN_6okfw>DsV+YCqgrHkmolmJ1>B}LOT$x1Ty^%*aLx!SgLG=s=( zUtd)Q(MH%qfhahtn+=0GULBpsrqif-7@tF~?KCaBX*o5+X%NpQu8S5w9jq16kn~$u z7PesJ>tiW%Vp)^P#GKSjQH(4HV{F;3<+=tSjB+=VbZTVfsU<^;m#m0$8H)@lM!F?- zq_2aga|vl)(Prf$Ob{?@N^{FGZ6#?2j97)scZy_YJYp74c*-+b0@kUp`B+F%j>RXa ztK;_!Kxo6Tvhh)0(zG&B%JyxLu?WaV(dA$_=T@JWVy9rdeH+|7rPSmkC^(g(7zmLp zAF8)>83loQ7>rJbl*O6Sac18w-lCHGx@$wg9mjC%1IHnCo7C`GyGd+&4h=;V4|hL+ zHU_RkJWSl?dr-)mh)Vje;E0i-C{hZl^dItK4lBh_PH4ebM-Z+5mV6c{uvF>J#aJKeoSp3} z^CcX5hniMR3l>$|;~Dh20-9R?!Ji>C#BaK-)xqf#Z1dq)n_nDA{(ki8W#{+rHO(BY VtUUYq 0) ? 'module-list-content-avg-'+margin : ''; + + // 数据处理 + var html = ''; + var item_style = []; + switch(show_style) + { + // 1图 + case 'g1' : + item_style[0] = 'width:100%;'; + html += `
    +
    + + + +
    +
    `; + break; + + // 2竖图 + case 'v2' : + item_style[0] = 'width:50%;'; + item_style[1] = 'width:50%;'; + html += `
    +
    + + + +
    +
    + + + +
    +
    `; + break; + + // 3竖图 + case 'v3' : + item_style[0] = 'width:33.33%;'; + item_style[1] = 'width:33.33%;'; + item_style[2] = 'width:33.33%;'; + html += `
    +
    + + + +
    +
    + + + +
    +
    + + + +
    +
    `; + break; + + // 4竖图 + case 'v4' : + item_style[0] = 'width:25%;'; + item_style[1] = 'width:25%;'; + item_style[2] = 'width:25%;'; + item_style[3] = 'width:25%;'; + html += `
    +
    + + + +
    +
    + + + +
    +
    + + + +
    +
    + + + +
    +
    `; + break; + + // 2横图 + case 'h2' : + item_style[0] = 'width:100%;'; + item_style[1] = 'width:100%;'; + html += `
    +
    + + + +
    +
    + + + +
    +
    `; + break; + + // 3横图 + case 'h3' : + item_style[0] = 'width:100%;'; + item_style[1] = 'width:100%;'; + item_style[2] = 'width:100%;'; + html += `
    +
    + + + +
    +
    + + + +
    +
    + + + +
    +
    `; + break; + + // 4横图 + case 'h4' : + item_style[0] = 'width:100%;'; + item_style[1] = 'width:100%;'; + item_style[2] = 'width:100%;'; + item_style[3] = 'width:100%;'; + html += `
    +
    + + + +
    +
    + + + +
    +
    + + + +
    +
    + + + +
    +
    `; + break; + + // 1左右2 + case 'lr12' : + if(margin > 0) + { + item_style[0] = 'width:calc(50% + '+(margin/2)+'px);'; + item_style[1] = 'width:calc(50% - '+(margin/2)+'px);'; + } else { + item_style[0] = 'width:50%;'; + item_style[1] = 'width:50%;'; + } + html += `
    +
    + + + +
    +
    + + + + + + +
    +
    `; + break; + + // 1左右3 + case 'lr13' : + if(margin > 0) + { + item_style[0] = 'width:calc(50% + '+margin+'px);'; + item_style[1] = 'width:calc(50% - '+margin+'px);'; + } else { + item_style[0] = 'width:50%;'; + item_style[1] = 'width:50%;'; + } + html += `
    +
    + + + +
    +
    + + + + + + + + + +
    +
    `; + break; + + // 2左右1 + case 'lr21' : + if(margin > 0) + { + item_style[0] = 'width:calc(50% - '+(margin/2)+'px);'; + item_style[1] = 'width:calc(50% + '+(margin/2)+'px);'; + } else { + item_style[0] = 'width:50%;'; + item_style[1] = 'width:50%;'; + } + html += `
    +
    + + + + + + +
    +
    + + + +
    +
    `; + break; + + // 3左右1 + case 'lr31' : + if(margin > 0) + { + item_style[0] = 'width:calc(50% - '+margin+'px);'; + item_style[1] = 'width:calc(50% + '+margin+'px);'; + } else { + item_style[0] = 'width:50%;'; + item_style[1] = 'width:50%;'; + } + html += `
    +
    + + + + + + + + + +
    +
    + + + +
    +
    `; + break; + + // 1上下2 + case 'tb12' : + item_style[0] = 'width:100%;'; + item_style[1] = 'width:50%;'; + item_style[2] = 'width:50%;'; + html += `
    +
    + + + +
    +
    +
    + + + +
    +
    + + + +
    +
    +
    `; + break; + + // 1上下3 + case 'tb13' : + item_style[0] = 'width:100%;'; + item_style[1] = 'width:33.33%;'; + item_style[2] = 'width:33.33%;'; + item_style[3] = 'width:33.33%;'; + html += `
    +
    + + + +
    +
    +
    + + + +
    +
    + + + +
    +
    + + + +
    +
    +
    `; + break; + + // 2上下1 + case 'tb21' : + item_style[0] = 'width:50%;'; + item_style[1] = 'width:50%;'; + item_style[2] = 'width:100%;'; + html += `
    +
    +
    + + + +
    +
    + + + +
    +
    +
    + + + +
    +
    `; + break; + + // 3上下1 + case 'tb31' : + item_style[0] = 'width:33.33%;'; + item_style[1] = 'width:33.33%;'; + item_style[2] = 'width:33.33%;'; + item_style[3] = 'width:100%;'; + html += `
    +
    +
    + + + +
    +
    + + + +
    +
    + + + +
    +
    +
    + + + +
    +
    `; + break; + + // 2竖左右横2 + case 'lrv2h2' : + if(margin > 0) + { + item_style[0] = 'width:calc(25% + '+(margin/2)+'px);'; + item_style[1] = 'width:calc(25% + '+(margin/2)+'px);'; + item_style[2] = 'width:calc(50% - '+margin+'px);'; + } else { + item_style[0] = 'width:25%;'; + item_style[1] = 'width:25%;'; + item_style[2] = 'width:50%;'; + } + html += `
    +
    + + + +
    +
    + + + +
    +
    + + + + + + +
    +
    `; + break; + + // 2横左右竖2 + case 'lrh2v2' : + if(margin > 0) + { + item_style[0] = 'width:calc(50% - '+margin+'px);'; + item_style[1] = 'width:calc(25% + '+(margin/2)+'px);'; + item_style[2] = 'width:calc(25% + '+(margin/2)+'px);'; + } else { + item_style[0] = 'width:50%;'; + item_style[1] = 'width:25%;'; + item_style[2] = 'width:25%;'; + } + html += `
    +
    + + + + + + +
    +
    + + + +
    +
    + + + +
    +
    `; + break; + + // 4图 + case 'g4' : + item_style[0] = 'width:50%;'; + item_style[1] = 'width:50%;'; + item_style[2] = 'width:50%;'; + item_style[3] = 'width:50%;'; + html += `
    +
    +
    + + + +
    +
    + + + +
    +
    +
    +
    + + + +
    +
    + + + +
    +
    +
    `; + break; + } + + // 模块容器设置 + var $doc = $(doc); + $doc.html(html); + + // 数据加入配置 + data['frontend_config'] = { + list_ent: list_ent, + item_style: item_style, + images_style: images_style + } + data['data_list'] = data_list; + $doc.attr('data-json', encodeURIComponent(CryptoJS.enc.Base64.stringify(CryptoJS.enc.Utf8.parse(JSON.stringify(data))))); + $offcanvas_config_images_magic_cube.offCanvas('close'); +} + /** * 模块-视频处理 * @author Devil @@ -1012,7 +1587,7 @@ function FormBackModuleConfigVideoHandle(data) "style": style, "media_fixed": media_fixed } - $doc.attr('data-json', encodeURIComponent(JSON.stringify(data))); + $doc.attr('data-json', encodeURIComponent(CryptoJS.enc.Base64.stringify(CryptoJS.enc.Utf8.parse(JSON.stringify(data))))); $offcanvas_config_video.offCanvas('close'); } @@ -1122,19 +1697,19 @@ function FormBackModuleConfigGoodsHandle(data) var item_html = ''; for(var i in list) { - item_html += '
  • '; - item_html += '
    '; - item_html += ''; - item_html += ''+list[i]['title']+''; - item_html += ''; - item_html += '
    '; - item_html += '
    '; - item_html += ''+list[i]['title']+''; - item_html += '
    '; - item_html += '

    '+__currency_symbol__+list[i]['price']+'

    '; - item_html += '
    '; - item_html += '
    '; - item_html += '
    • '; + item_html += `
  • ; +
    + + `+list[i]['title']+` + +
    +
    + `+list[i]['title']+` +
    +

    `+__currency_symbol__+list[i]['price']+`

    +
    +
    +
    • `; } // 商品容器 @@ -1146,6 +1721,7 @@ function FormBackModuleConfigGoodsHandle(data) // 展示模式 var nav_dot_ent = ''; var list_ent = ''; + var item_right_style = ''; var show_style = data.view_list_show_style || 'routine'; switch(show_style) { @@ -1173,6 +1749,34 @@ function FormBackModuleConfigGoodsHandle(data) } break; + // 左图右文 + case 'leftright' : + var style_media_fixed_width = parseInt(data.style_media_fixed_width || 0); + item_right_style = 'margin-left:10px;'+((style_media_fixed_width > 0) ? 'width: calc(100% - '+(style_media_fixed_width+10)+'px);' : ''); + // 设置了外边距，则计算平均移动值 + var avg = (margin > 0) ? 'module-list-content-avg-'+margin : ''; + // 列表class + list_ent = avg+' module-list-sm-'+sm+' module-list-md-'+md+' module-list-lg-'+md+' '; + html += '
      '; + for(var i in list) + { + html += `
    • +
      + + + +
      +
      + `+list[i]['title']+` +
      +

      `+__currency_symbol__+list[i]['price']+`

      +
      +
      +
      • `; + } + html += '
    '; + break; + // 常规、默认 default : // 设置了外边距，则计算平均移动值 @@ -1201,11 +1805,12 @@ function FormBackModuleConfigGoodsHandle(data) data['frontend_config'] = { "style": style, "item_style": item_style, + "item_right_style": item_right_style, "nav_dot_ent": nav_dot_ent, "list_ent": list_ent, "media_fixed": media_fixed } - $doc.attr('data-json', encodeURIComponent(JSON.stringify(data))); + $doc.attr('data-json', encodeURIComponent(CryptoJS.enc.Base64.stringify(CryptoJS.enc.Utf8.parse(JSON.stringify(data))))); // 组件参数 if(JSON.stringify(option) !== '{}') @@ -1330,7 +1935,7 @@ function FormBackModuleConfigTitleHandle(data) "style_title_vice": style_title_vice, "style_title_more": style_title_more } - $doc.attr('data-json', encodeURIComponent(JSON.stringify(data))); + $doc.attr('data-json', encodeURIComponent(CryptoJS.enc.Base64.stringify(CryptoJS.enc.Utf8.parse(JSON.stringify(data))))); $offcanvas_config_title.offCanvas('close'); } @@ -1357,14 +1962,8 @@ function FormBackModuleConfigCustomHandle(data) var $doc = $(doc); $doc.html(data.custom || ''); - // 自定义html、转为base64 - if((data['custom'] || null) != null) - { - data['custom'] = CryptoJS.enc.Base64.stringify(CryptoJS.enc.Utf8.parse(data.custom)); - } - // 数据加入配置 - $doc.attr('data-json', encodeURIComponent(JSON.stringify(data))); + $doc.attr('data-json', encodeURIComponent(CryptoJS.enc.Base64.stringify(CryptoJS.enc.Utf8.parse(JSON.stringify(data))))); $offcanvas_config_custom.offCanvas('close'); } @@ -1413,7 +2012,7 @@ function FormBackModuleConfigBorderHandle(data) data['frontend_config'] = { "style": style } - $doc.attr('data-json', encodeURIComponent(JSON.stringify(data))); + $doc.attr('data-json', encodeURIComponent(CryptoJS.enc.Base64.stringify(CryptoJS.enc.Utf8.parse(JSON.stringify(data))))); $offcanvas_config_border.offCanvas('close'); } @@ -1457,7 +2056,7 @@ function FormBackModuleConfigHeightHandle(data) data['frontend_config'] = { "style": style } - $doc.attr('data-json', encodeURIComponent(JSON.stringify(data))); + $doc.attr('data-json', encodeURIComponent(CryptoJS.enc.Base64.stringify(CryptoJS.enc.Utf8.parse(JSON.stringify(data))))); $offcanvas_config_height.offCanvas('close'); } @@ -1697,28 +2296,28 @@ function ModuleConfigGoodsItemContentHtml(data) function ModuleConfigManyImagesItemContentHtml(images, type, name, value) { var index = parseInt(Math.random()*1000001); - var html = '
    '; - html += ''; - html += '
    '; - html += '
      '; - html += '
    • '; - html += ''; - html += ''; - html += '
      • '; - html += '
    '; - html += '
    +'+($layout.data('upload-images-name') || '上传图片')+'
    '; - html += '
    '; - html += '
    '; - html += '
    '; - html += ''; - html += ''; - html += ''; - html += '
    '; - html += ModuleConfigImagesToContentHtml(name); - html += '
    '; - html += '
    '; - html += '
    '; - html += '
    '; + var html = `
    + +
    +
      +
    • + + +
      • +
    +
    +`+($layout.data('upload-images-name') || '上传图片')+`
    +
    +
    +
    + + + +
    + `+ModuleConfigImagesToContentHtml(name)+` +
    +
    +
    +
    `; return html; } @@ -1832,6 +2431,88 @@ function ModuleConfigImagesTextItemContentHtml(data) return html; } +/** + * 模块-图片魔方信息生成 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2021-05-18 + * @desc description + * @param {[object]} data [配置数据] + */ +function ModuleConfigImagesMagicCubeItemContentHtml(data) +{ + // 基础处理 + if((data || null) == null) + { + data = {}; + } + + // 展示模式 + var value = (((data.view_list_show_style || null) == null) ? $offcanvas_config_images_magic_cube.find('input[name="view_list_show_style"]:checked').val() : data.view_list_show_style) || null; + if(value == null) + { + Prompt($layout.data('data-show-modal-tips') || '请选择数据展示模式'); + return false; + } + var modal_arr = {g1:1, v2:2, v3:3, v4:4, h2:2, h3:3, h4:4, lr12:3, lr13:4, lr21:3, lr31:4, tb12:3, tb13:4, tb21:3, tb31:4, lrv2h2:4, lrh2v2:4, g4:4}; + if(modal_arr[value] == undefined) + { + Prompt(($layout.data('data-show-modal-error-tips') || '展示模式有误')+'('+value+')'); + return false; + } + + // 编辑则重新添加 + var count = 0; + if(JSON.stringify(data) == '{}') + { + // 已有数据条数、满足数量则不增加，多余则移除 + count = $offcanvas_config_images_magic_cube.find('.config-images-magic-cube-container > .am-panel').length; + var max = modal_arr[value]-count; + if(max < 0) + { + for(var i=count;i>=modal_arr[value];i--) + { + $offcanvas_config_images_magic_cube.find('.config-images-magic-cube-container > .am-panel:eq('+i+')').remove(); + } + } + if(max <= 0) + { + return false; + } + } + + // 生成数据 + var html = ''; + var data_list = data.data_list || []; + for(var i=count;i +
    +
      +
    • + + +
      • +
    +
    +`+($layout.data('upload-images-name') || '上传图片')+`
    +
    +
    +
    + + + +
    + `+ModuleConfigImagesToContentHtml(item.name)+` +
    +
    +
    +
    `; + } + return html; +} + /** * 模块-标题关键字 * @author Devil @@ -2025,8 +2706,8 @@ function OffcanvasConfigPagesChoice(obj, event) // 获取已选择的数据 var $parent = $page_parent_obj.parents('.form-view-choice-container'); - var key = $parent.data('key') || null; - var index = (key == null) ? '' : '_'+key; + var key = $parent.data('key') ; + var index = (key == undefined) ? '' : '_'+key; var to_type = $parent.find('input[name="content_to_type'+index+'"]').val() || null; var to_name = $parent.find('input[name="content_to_name'+index+'"]').val() || null; var to_value = $parent.find('input[name="content_to_value'+index+'"]').val() || null; @@ -2097,8 +2778,8 @@ function OffcanvasConfigPagesRemove(obj, event) { var $parent = obj.parents('.form-view-choice-container'); var $content = $parent.find('.form-view-choice-container-content'); - var key = $parent.data('key') || null; - var index = (key == null) ? '' : '_'+key; + var key = $parent.data('key'); + var index = (key == undefined) ? '' : '_'+key; $content.html(ModuleConfigImagesToContentHtml()); $parent.find('input[name="content_to_type'+index+'"]').val(''); $parent.find('input[name="content_to_name'+index+'"]').val(''); @@ -2151,7 +2832,7 @@ function LayoutViewConfig() var layout_temp = { "value": $(this).data('value').toString(), "status": ($(this).find('.layout-content-submit input[type="checkbox"]:checked').val() == 'on') ? 1 : 0, - "config": (json == null) ? {} : JSON.parse(decodeURIComponent(json)), + "config": (json == null) ? {} : JSON.parse(CryptoJS.enc.Base64.parse(decodeURIComponent(json)).toString(CryptoJS.enc.Utf8)), "children": [] }; @@ -2161,7 +2842,7 @@ function LayoutViewConfig() // 容器数据 var json = $(this).attr('data-json') || null; var content_temp = { - "config": (json == null) ? {} : JSON.parse(decodeURIComponent(json)), + "config": (json == null) ? {} : JSON.parse(CryptoJS.enc.Base64.parse(decodeURIComponent(json)).toString(CryptoJS.enc.Utf8)), "children": [] }; @@ -2174,7 +2855,7 @@ function LayoutViewConfig() var module_config = { "value": value, "name": layout_module_type_arr[value], - "config": (json == null) ? {} : JSON.parse(decodeURIComponent(json)) + "config": (json == null) ? {} : JSON.parse(CryptoJS.enc.Base64.parse(decodeURIComponent(json)).toString(CryptoJS.enc.Utf8)) }; // 商品模块移除商品列表 if(value == 'goods') @@ -2327,7 +3008,7 @@ $(function() if(json != null) { // 数据解析 - json = JSON.parse(decodeURIComponent(json)) || null; + json = JSON.parse(CryptoJS.enc.Base64.parse(decodeURIComponent(json)).toString(CryptoJS.enc.Utf8)) || null; } // 获取表单字段并赋空值 if((json || null) == null) @@ -2383,7 +3064,7 @@ $(function() if(json != null) { // 数据解析 - json = JSON.parse(decodeURIComponent(json)) || null; + json = JSON.parse(CryptoJS.enc.Base64.parse(decodeURIComponent(json)).toString(CryptoJS.enc.Utf8)) || null; } // 获取表单字段并赋空值 if((json || null) == null) @@ -2528,7 +3209,7 @@ $(function() if(json != null) { // 数据解析 - json = JSON.parse(decodeURIComponent(json)) || null; + json = JSON.parse(CryptoJS.enc.Base64.parse(decodeURIComponent(json)).toString(CryptoJS.enc.Utf8)) || null; } // 配置模块 @@ -2568,7 +3249,6 @@ $(function() { // 图片模块 case 'images' : - // 图片处理 var default_images = $config.data('default-images'); var html = '
  • '; html += ''; @@ -2582,7 +3262,6 @@ $(function() // 多图 case 'many-images' : - // 多图图片 var html = ''; if((json.data_list || null) != null && json.data_list.length > 0) { @@ -2596,7 +3275,6 @@ $(function() // 图文 case 'images-text' : - // 多图图片 var html = ''; if((json.data_list || null) != null && json.data_list.length > 0) { @@ -2607,8 +3285,29 @@ $(function() } $config.find('.config-images-text-container').html(html); // 展示模式默认空，必须要选择 - var images_text_show_style_arr = ['updown', 'leftright', 'rolling']; - if(images_text_show_style_arr.indexOf(json.view_list_show_style) == -1) + if((json.view_list_show_style || null) == null) + { + json['view_list_show_style'] = ''; + } + break; + + // 图片魔方 + case 'images-magic-cube' : + var html = ''; + if((json.data_list || null) != null && json.data_list.length > 0) + { + html += ModuleConfigImagesMagicCubeItemContentHtml(json); + } + $config.find('.config-images-magic-cube-container').html(html); + var $tips_msg = $offcanvas_config_images_magic_cube.find('.tips-msg'); + if((html || null) == null) + { + $tips_msg.removeClass('am-hide'); + } else { + $tips_msg.addClass('am-hide'); + } + // 展示模式默认空，必须要选择 + if((json.view_list_show_style || null) == null) { json['view_list_show_style'] = ''; } @@ -2694,11 +3393,6 @@ $(function() $config.find('.form-view-choice-container-content').html(ModuleConfigImagesToContentHtml(json.content_to_name || '')); break; - // 自定义html - case 'custom' : - json['custom'] = ((json['custom'] || null) == null) ? '' : CryptoJS.enc.Base64.parse(json.custom).toString(CryptoJS.enc.Utf8); - break; - default : if($config.length == 0) { @@ -2947,8 +3641,8 @@ $(function() // 设置数据 var $parent = $page_parent_obj.parents('.form-view-choice-container'); - var key = $parent.data('key') || null; - var index = (key == null) ? '' : '_'+key; + var key = $parent.data('key'); + var index = (key == undefined) ? '' : '_'+key; $parent.find('input[name="content_to_type'+index+'"]').val(to_type); $parent.find('input[name="content_to_name'+index+'"]').val(to_name); $parent.find('input[name="content_to_value'+index+'"]').val(to_value); @@ -3492,6 +4186,59 @@ $(function() }); + // 配置图片魔方 - 选择页面事件 + $offcanvas_config_images_magic_cube.on('click', '.form-view-choice-container-submit', function(e) + { + OffcanvasConfigPagesChoice($(this), e); + }); + + // 左侧配置 - 配置图片魔方 - 链接地址 - 移除 + $offcanvas_config_images_magic_cube.on('click', '.form-view-choice-container-active i.am-icon-close', function(e) + { + OffcanvasConfigPagesRemove($(this), e); + }); + + // 配置图片魔方 - 展示模式切换 + $(document).on('click', '#offcanvas-module-config-images-magic-cube input[name="view_list_show_style"]', function() + { + var html = ModuleConfigImagesMagicCubeItemContentHtml(); + if(html !== false) + { + $offcanvas_config_images_magic_cube.find('.config-images-magic-cube-container').append(html); + } + }); + + // 配置商品 - 展示模式切换 + $(document).on('click', '#offcanvas-module-config-goods input[name="view_list_show_style"]', function() + { + $base_show_style_value_obj = $(this).parents('.config-view-show-style').find('input[name="view_list_show_style_value"]'); + switch($(this).val()) + { + // 滚动 + case 'rolling' : + // 数据填充 + var json = ViewRollingShowStyleValueHandle($base_show_style_value_obj.val()); + if(json['item_margin'] <= 0) + { + json['item_margin'] = ''; + } + FormDataFill(json, '#modal-module-rolling-config'); + + // 开关状态 + $modal_rolling_config.find('input[name="is_auto_play"]').bootstrapSwitch('state', json.is_auto_play); + $modal_rolling_config.find('input[name="is_nav_dot"]').bootstrapSwitch('state', json.is_nav_dot); + + // 开启弹窗 + $modal_rolling_config.modal({ + width: 260, + height: 370, + closeViaDimmer: false + }); + break; + } + }); + + // 左侧配置 - 标题 - 右侧按钮 - 选择页面事件 $offcanvas_config_title.on('click', '.form-view-choice-container-submit', function(e) {