diff --git a/app/layout/view/public/common/module_admin.html b/app/layout/view/public/common/module_admin.html
index 58da1729d..4489c481d 100644
--- a/app/layout/view/public/common/module_admin.html
+++ b/app/layout/view/public/common/module_admin.html
@@ -144,193 +144,193 @@
{{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}}
@@ -338,23 +338,23 @@
{{case tb13}}
@@ -363,18 +363,18 @@
{{/case}}
@@ -382,63 +382,63 @@
{{/case}}
{{case lrv2h2}}
{{/case}}
{{case lrh2v2}}
{{/case}}
@@ -446,24 +446,24 @@
diff --git a/app/layout/view/public/common/module_view.html b/app/layout/view/public/common/module_view.html
index ac6dd01b9..5ceecf012 100644
--- a/app/layout/view/public/common/module_view.html
+++ b/app/layout/view/public/common/module_view.html
@@ -136,193 +136,193 @@
{{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}}
@@ -330,23 +330,23 @@
{{case tb13}}
@@ -355,18 +355,18 @@
{{/case}}
@@ -374,63 +374,63 @@
{{/case}}
{{case lrv2h2}}
{{/case}}
{{case lrh2v2}}
{{/case}}
@@ -438,24 +438,24 @@
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 730a647e2..861ceb4c7 100644
--- a/app/layout/view/public/offcanvas/offcanvas_module_config_goods.html
+++ b/app/layout/view/public/offcanvas/offcanvas_module_config_goods.html
@@ -110,11 +110,15 @@
-
+
-
图片固定
+
图片样式
+
{{include file="../../../layout/view/public/content/media_fixed" key="_media_fixed" required="" /}}
+
+
+ {{include file="../../../layout/view/public/style/mouse_hover" /}}
diff --git a/app/layout/view/public/offcanvas/offcanvas_module_config_images.html b/app/layout/view/public/offcanvas/offcanvas_module_config_images.html
index cbaf01afc..9262cc7ec 100644
--- a/app/layout/view/public/offcanvas/offcanvas_module_config_images.html
+++ b/app/layout/view/public/offcanvas/offcanvas_module_config_images.html
@@ -54,11 +54,15 @@
-
+
-
图片固定
+
图片样式
+
{{include file="../../../layout/view/public/content/media_fixed" key="_media_fixed" required="" /}}
+
+
+ {{include file="../../../layout/view/public/style/mouse_hover" /}}
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
index 35469d423..351a2fcc1 100644
--- 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
@@ -29,6 +29,9 @@
{{include file="../../../layout/view/public/style/margin" key="" /}}
+
+
+ {{include file="../../../layout/view/public/style/mouse_hover" /}}
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 c121d931a..106335336 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
@@ -44,11 +44,15 @@
-
+
-
图片固定
+
图片样式
+
{{include file="../../../layout/view/public/content/media_fixed" key="_media_fixed" required="" /}}
+
+
+ {{include file="../../../layout/view/public/style/mouse_hover" /}}
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 0fe45b8ae..7566aaa60 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
@@ -45,11 +45,15 @@
-
+
-
图片固定
+
图片样式
+
{{include file="../../../layout/view/public/content/media_fixed" key="_media_fixed" required="" /}}
+
+
+ {{include file="../../../layout/view/public/style/mouse_hover" /}}
diff --git a/app/layout/view/public/style/mouse_hover.html b/app/layout/view/public/style/mouse_hover.html
new file mode 100644
index 000000000..24b986fcc
--- /dev/null
+++ b/app/layout/view/public/style/mouse_hover.html
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/public/static/admin/default/js/orderaftersale.js b/public/static/admin/default/js/orderaftersale.js
index 0483430c2..e75b23789 100644
--- a/public/static/admin/default/js/orderaftersale.js
+++ b/public/static/admin/default/js/orderaftersale.js
@@ -22,7 +22,8 @@ $(function()
$popup.find('.apply-info .type span').html(data.type_text || '');
$popup.find('.apply-info .reason span').html(data.reason || '');
$popup.find('.apply-info .number span').html(data.number || '');
- $popup.find('.apply-info .price span').html(data.order_data.currency_data.currency_symbol+data.price || '');
+ var currency_symbol = (data.order_data.currency_data || null) != null ? (data.order_data.currency_data.currency_symbol || '') : '';
+ $popup.find('.apply-info .price span').html(currency_symbol+(data.price || ''));
$popup.find('.apply-info .msg span').html(data.msg || '');
$popup.modal();
diff --git a/public/static/common/css/layout.css b/public/static/common/css/layout.css
index 864e8bb57..b65bf53ec 100644
--- a/public/static/common/css/layout.css
+++ b/public/static/common/css/layout.css
@@ -3,8 +3,8 @@
*/
.layout-container [class*="am-u-"] {padding-left:0;padding-right:0;}
.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);}
+.layout-container img.module-mouse-hover-images-amplify {-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.module-mouse-hover-images-amplify: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);}
/**
* 布局基础
diff --git a/public/static/common/js/layout.admin.js b/public/static/common/js/layout.admin.js
index dec08b235..330bd29f9 100644
--- a/public/static/common/js/layout.admin.js
+++ b/public/static/common/js/layout.admin.js
@@ -439,6 +439,12 @@ function MediaFixedHandle(data)
}
}
+ // 鼠标悬停在图片上方放大
+ if(parseInt(data.style_mouse_hover_images_amplify_value || 0) == 1)
+ {
+ media_ent += 'module-mouse-hover-images-amplify ';
+ }
+
return {
"media_container_ent": media_container_ent,
"media_container_style": media_container_style,
@@ -560,8 +566,8 @@ function FormBackLayoutConfigHandle(data)
// 数据加入配置
data['frontend_config'] = {
- "style": style,
- "ent": ent
+ style: style,
+ ent: ent
}
$layout_content_obj.attr('data-json', encodeURIComponent(CryptoJS.enc.Base64.stringify(CryptoJS.enc.Utf8.parse(JSON.stringify(data)))));
$offcanvas_layout_config.offCanvas('close');
@@ -596,7 +602,7 @@ function FormBackModuleConfigImagesHandle(data)
// 样式处理
var style = StyleBaseHandle(data, 'style_');
- // 图片固定
+ // 图片样式
var media_fixed = MediaFixedHandle(data);
// html拼接
@@ -610,8 +616,8 @@ function FormBackModuleConfigImagesHandle(data)
// 数据加入配置
data['frontend_config'] = {
- "style": style,
- "media_fixed": media_fixed
+ style: style,
+ media_fixed: media_fixed
}
$doc.attr('data-json', encodeURIComponent(CryptoJS.enc.Base64.stringify(CryptoJS.enc.Utf8.parse(JSON.stringify(data)))));
$offcanvas_config_images.offCanvas('close');
@@ -666,7 +672,7 @@ function FormBackModuleConfigManyImagesHandle(data)
// 展示模式
var show_style = data.view_list_show_style || 'routine';
- // 图片固定
+ // 图片样式
var media_fixed = MediaFixedHandle(data);
// 数据项html
@@ -772,11 +778,11 @@ function FormBackModuleConfigManyImagesHandle(data)
// 数据加入配置
data['frontend_config'] = {
- "style": style,
- "item_style": item_style,
- "nav_dot_ent": nav_dot_ent,
- "list_ent": list_ent,
- "media_fixed": media_fixed
+ style: style,
+ item_style: item_style,
+ nav_dot_ent: nav_dot_ent,
+ list_ent: list_ent,
+ media_fixed: media_fixed
}
data['data_list'] = data_list;
$doc.attr('data-json', encodeURIComponent(CryptoJS.enc.Base64.stringify(CryptoJS.enc.Utf8.parse(JSON.stringify(data)))));
@@ -858,7 +864,7 @@ function FormBackModuleConfigImagesTextHandle(data)
// 样式处理
var style = StyleBaseHandle(data, 'style_');
- // 图片固定
+ // 图片样式
var media_fixed = MediaFixedHandle(data);
// html拼接
@@ -990,13 +996,13 @@ function FormBackModuleConfigImagesTextHandle(data)
// 数据加入配置
data['frontend_config'] = {
- "style": style,
- "item_style": item_style,
- "item_right_style": item_right_style,
- "item_field_style": item_field_style,
- "nav_dot_ent": nav_dot_ent,
- "list_ent": list_ent,
- "media_fixed": media_fixed
+ style: style,
+ item_style: item_style,
+ item_right_style: item_right_style,
+ item_field_style: item_field_style,
+ nav_dot_ent: nav_dot_ent,
+ list_ent: list_ent,
+ media_fixed: media_fixed
}
data['data_list'] = data_list;
$doc.attr('data-json', encodeURIComponent(CryptoJS.enc.Base64.stringify(CryptoJS.enc.Utf8.parse(JSON.stringify(data)))));
@@ -1065,6 +1071,9 @@ function FormBackModuleConfigImagesMagicCubeHandle(data)
// 设置了外边距,则计算平均移动值
var list_ent = (margin > 0) ? 'module-list-content-avg-'+margin : '';
+ // 图片样式
+ var media_fixed = MediaFixedHandle(data);
+
// 数据处理
var html = '';
var item_style = [];
@@ -1076,7 +1085,7 @@ function FormBackModuleConfigImagesMagicCubeHandle(data)
html += ``;
@@ -1089,12 +1098,12 @@ function FormBackModuleConfigImagesMagicCubeHandle(data)
html += ``;
@@ -1108,17 +1117,17 @@ function FormBackModuleConfigImagesMagicCubeHandle(data)
html += ``;
@@ -1133,22 +1142,22 @@ function FormBackModuleConfigImagesMagicCubeHandle(data)
html += ``;
@@ -1161,12 +1170,12 @@ function FormBackModuleConfigImagesMagicCubeHandle(data)
html += ``;
@@ -1180,17 +1189,17 @@ function FormBackModuleConfigImagesMagicCubeHandle(data)
html += ``;
@@ -1205,22 +1214,22 @@ function FormBackModuleConfigImagesMagicCubeHandle(data)
html += ``;
@@ -1239,15 +1248,15 @@ function FormBackModuleConfigImagesMagicCubeHandle(data)
html += ``;
@@ -1266,18 +1275,18 @@ function FormBackModuleConfigImagesMagicCubeHandle(data)
html += ``;
@@ -1296,15 +1305,15 @@ function FormBackModuleConfigImagesMagicCubeHandle(data)
html += ``;
@@ -1323,18 +1332,18 @@ function FormBackModuleConfigImagesMagicCubeHandle(data)
html += ``;
@@ -1348,18 +1357,18 @@ function FormBackModuleConfigImagesMagicCubeHandle(data)
html += `
@@ -1375,23 +1384,23 @@ function FormBackModuleConfigImagesMagicCubeHandle(data)
html += `
@@ -1407,18 +1416,18 @@ function FormBackModuleConfigImagesMagicCubeHandle(data)
`;
@@ -1434,23 +1443,23 @@ function FormBackModuleConfigImagesMagicCubeHandle(data)
`;
@@ -1471,20 +1480,20 @@ function FormBackModuleConfigImagesMagicCubeHandle(data)
html += ``;
@@ -1505,20 +1514,20 @@ function FormBackModuleConfigImagesMagicCubeHandle(data)
html += ``;
@@ -1534,24 +1543,24 @@ function FormBackModuleConfigImagesMagicCubeHandle(data)
@@ -1567,7 +1576,8 @@ function FormBackModuleConfigImagesMagicCubeHandle(data)
data['frontend_config'] = {
list_ent: list_ent,
item_style: item_style,
- images_style: images_style
+ images_style: images_style,
+ media_fixed: media_fixed
}
data['data_list'] = data_list;
$doc.attr('data-json', encodeURIComponent(CryptoJS.enc.Base64.stringify(CryptoJS.enc.Utf8.parse(JSON.stringify(data)))));
@@ -1617,8 +1627,8 @@ function FormBackModuleConfigVideoHandle(data)
// 数据加入配置
data['frontend_config'] = {
- "style": style,
- "media_fixed": media_fixed
+ style: style,
+ media_fixed: media_fixed
}
$doc.attr('data-json', encodeURIComponent(CryptoJS.enc.Base64.stringify(CryptoJS.enc.Utf8.parse(JSON.stringify(data)))));
$offcanvas_config_video.offCanvas('close');
@@ -1720,7 +1730,7 @@ function FormBackModuleConfigGoodsHandle(data)
};
var item_style = StyleBaseHandle(data, 'style_', rules);
- // 图片固定
+ // 图片样式
var media_fixed = MediaFixedHandle(data);
// 模块容器设置
@@ -1836,12 +1846,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
+ 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(CryptoJS.enc.Base64.stringify(CryptoJS.enc.Utf8.parse(JSON.stringify(data)))));
@@ -1963,10 +1973,10 @@ function FormBackModuleConfigTitleHandle(data)
// 数据加入配置
data['frontend_config'] = {
- "style": style,
- "style_title_main": style_title_main,
- "style_title_vice": style_title_vice,
- "style_title_more": style_title_more
+ style: style,
+ style_title_main: style_title_main,
+ style_title_vice: style_title_vice,
+ style_title_more: style_title_more
}
$doc.attr('data-json', encodeURIComponent(CryptoJS.enc.Base64.stringify(CryptoJS.enc.Utf8.parse(JSON.stringify(data)))));
$offcanvas_config_title.offCanvas('close');
@@ -2043,7 +2053,7 @@ function FormBackModuleConfigBorderHandle(data)
// 数据加入配置
data['frontend_config'] = {
- "style": style
+ style: style
}
$doc.attr('data-json', encodeURIComponent(CryptoJS.enc.Base64.stringify(CryptoJS.enc.Utf8.parse(JSON.stringify(data)))));
$offcanvas_config_border.offCanvas('close');
@@ -2087,7 +2097,7 @@ function FormBackModuleConfigHeightHandle(data)
// 数据加入配置
data['frontend_config'] = {
- "style": style
+ style: style
}
$doc.attr('data-json', encodeURIComponent(CryptoJS.enc.Base64.stringify(CryptoJS.enc.Utf8.parse(JSON.stringify(data)))));
$offcanvas_config_height.offCanvas('close');