diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css index dceec01d0..00847a1df 100755 --- a/public/static/common/css/common.css +++ b/public/static/common/css/common.css @@ -165,6 +165,12 @@ form.am-form .am-form-group-refreshing, .plug-file-upload-view { border-bottom: .am-modal-dialog .am-modal-bd span { vertical-align: middle; } +@media only screen and (min-width:1200px) { + .popup-full-max { + max-width: 1200px; + left: calc(50% - 600px); + } +} /** * iframe diff --git a/public/static/common/js/common.js b/public/static/common/js/common.js index 134a793ae..8f10ee180 100755 --- a/public/static/common/js/common.js +++ b/public/static/common/js/common.js @@ -1019,14 +1019,37 @@ function CheckVideo() * @param {[string]} url [加载url] * @param {[string]} title [标题] * @param {[string]} class_tag [指定class] + * @param {[int]} full [是否满屏(0否, 1是)] + * @param {[int]} full_max [满屏最大限制(max-width:1200px)(0否, 1是)] */ -function ModalLoad(url, title, class_tag) +function ModalLoad(url, title, class_tag, full, full_max) { - class_tag = class_tag || ''; + // class 定义 + var ent = 'popup-iframe'; + + // 自定义 class + if((class_tag || null) != null) + { + ent += ' '+class_tag; + } + + // 是否满屏 + if((full || 0) == 1) + { + ent += ' popup-full'; + } + + // 满屏最大限制 + if((full_max || 0) == 1) + { + ent += ' popup-full-max'; + } + + // 调用弹窗组件 AMUI.dialog.popup({ title: title || '', content: '', - class: ' popup-iframe '+class_tag + class: ent }); } @@ -2904,9 +2927,11 @@ $(function() // 基础参数 var title = $(this).data('title') || ''; var class_tag = $(this).data('class') || ''; + var full = parseInt($(this).data('full')) || 0; + var full_max = parseInt($(this).data('full-max')) || 0; // 调用弹窗方法 - ModalLoad(url, title, class_tag); + ModalLoad(url, title, class_tag, full, full_max); }); // 地图弹窗 diff --git a/public/static/index/default/css/order.css b/public/static/index/default/css/order.css index 5950b6e9b..93fa5c79c 100755 --- a/public/static/index/default/css/order.css +++ b/public/static/index/default/css/order.css @@ -122,7 +122,7 @@ ul.progress li.current .title { box-shadow: none; } .order-base .am-panel-bd, .order-base .base-right { - padding: 5px 10px; + padding: 10px; } .order-base, .order-base .status { overflow: hidden;