From 454cea0c0546b40b46a9a4d73171bbf443710456 Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 12 Jun 2013 17:20:12 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EC=87=BC=ED=95=91=EB=AA=B0:=20#220=20?= =?UTF-8?q?=EC=A3=BC=EB=AC=B8=20=EC=BF=A0=ED=8F=B0=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EB=A7=88=ED=81=AC=EC=97=85=202=EC=B0=A8=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/coupontarget.php | 2 +- css/admin.css | 12 ++++++------ css/default_shop.css | 4 ++++ shop/ordercoupon.php | 4 ++-- shop/orderform.php | 4 ++-- shop/ordersendcostcoupon.php | 8 ++++---- 6 files changed, 19 insertions(+), 15 deletions(-) diff --git a/adm/shop_admin/coupontarget.php b/adm/shop_admin/coupontarget.php index 1b9a10033..60e8b238d 100644 --- a/adm/shop_admin/coupontarget.php +++ b/adm/shop_admin/coupontarget.php @@ -85,7 +85,7 @@ $qstr1 = 'sch_target='.$_GET['sch_target'].'&sch_word='.$_GET['sch_word']; - + "> - - + + 결제할인쿠폰 - + @@ -692,7 +692,7 @@ setTimeout("init_pay_button();",300); 배송비할인쿠폰 - + diff --git a/shop/ordersendcostcoupon.php b/shop/ordersendcostcoupon.php index 0e61a62be..f80b4db2a 100644 --- a/shop/ordersendcostcoupon.php +++ b/shop/ordersendcostcoupon.php @@ -27,8 +27,8 @@ $count = mysql_num_rows($result); 쿠폰명 - 할인금액 - 적용 + 할인금액 + 적용 @@ -54,8 +54,8 @@ $count = mysql_num_rows($result); - - + + Date: Wed, 12 Jun 2013 17:31:47 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EC=87=BC=ED=95=91=EB=AA=B0:=20#220=20?= =?UTF-8?q?=EC=A3=BC=EB=AC=B8=20=EC=BF=A0=ED=8F=B0=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EB=A7=88=ED=81=AC=EC=97=85=20=EB=B0=8F=20=EC=8A=A4=ED=83=80?= =?UTF-8?q?=EC=9D=BC=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default_shop.css | 3 ++- css/mobile_shop.css | 10 ++++++++++ mobile/shop/orderform.php | 10 +++++----- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/css/default_shop.css b/css/default_shop.css index 8b3af0214..ac48ae389 100644 --- a/css/default_shop.css +++ b/css/default_shop.css @@ -662,7 +662,8 @@ input.required:focus {border:1px solid #b8c9c2;background:#21272e !important;col #sod_frm #od_memo {height:50px} #sod_frm_pay {position:relative} -#sod_frm_pay th {font-weight:bold;text-align:center !important} +#sod_frm_pay .basic_tbl th {width:auto !important;font-weight:bold;text-align:center !important} +#sod_frm_pay .basic_tbl td {padding:8px 5px 6px !important;border-top:1px solid #e9e9e9 !important;border-bottom:1px solid #e9e9e9 !important;line-height:1.5em !important;word-break:break-all !important} #sod_frm_pay .frm_input {background:#fff !important} #sod_frm_pay .frm_input:focus {color:#000} diff --git a/css/mobile_shop.css b/css/mobile_shop.css index e98c6a75a..7ea1f3c49 100644 --- a/css/mobile_shop.css +++ b/css/mobile_shop.css @@ -331,12 +331,22 @@ html.no-overflowscrolling #mod_option_frm {height:auto;max-height:10000px !impor #sod_frm {} #sod_frm h2 {margin:0 0 1em} +#sod_list {position:relative} +#sod_list #it_coupon_frm {z-index:10000;position:absolute;top:0;left:0;padding:20px;width:320px;height:auto !important;height:480px;max-height:480px;border:1px solid #000;background:#f5f6fa;overflow-y:scroll} +html.no-overflowscrolling #it_coupon_frm {height:auto;max-height:10000px !important} + #sod_frm_orderer {margin:1.8em 0 3.6em} #sod_frm_same {margin:0 0 1em} #sod_frm #od_memo {height:7em} +#sod_frm_pay {position:relative} +#sod_frm_pay .basic_tbl caption {font-size:0;line-height:0;overflow:hidden} +#sod_frm_pay .basic_tbl th {width:auto !important;font-weight:bold;text-align:center !important} +#sod_frm_pay .basic_tbl td {border-top:1px solid #e9e9e9 !important;border-bottom:1px solid #e9e9e9 !important;line-height:1.5em !important;word-break:break-all !important} +#sod_frm_pay #sc_coupon_frm, #sod_frm_pay #od_coupon_frm {z-index:10000;position:absolute;top:0;left:0;padding:20px;width:320px;height:auto !important;height:480px;max-height:480px;border:1px solid #000;background:#f5f6fa;overflow-y:scroll} +html.no-overflowscrolling #sc_coupon_frm, html.no-overflowscrolling #od_coupon_frm {height:auto;max-height:10000px !important} #sod_frm_pay .frm_input {background:#fff !important} #sod_frm_pay .frm_input:focus {color:#000} diff --git a/mobile/shop/orderform.php b/mobile/shop/orderform.php index 3daf4fcfd..fcaed20cc 100644 --- a/mobile/shop/orderform.php +++ b/mobile/shop/orderform.php @@ -37,7 +37,7 @@ $tablet_size = "1.0"; // 화면 사이즈 조정 - 기기화면에 맞게 수정 ob_start(); ?>

주문하실 상품을 확인하세요.

- +
@@ -142,7 +142,7 @@ ob_start(); $cp = sql_fetch($sql); if($cp['cnt']) - $cp_button = ''; + $cp_button = ''; } ?> @@ -158,7 +158,7 @@ ob_start(); - + @@ -462,7 +462,7 @@ ob_end_clean(); @@ -471,7 +471,7 @@ ob_end_clean();
상품이미지
결제할인쿠폰 - +
배송비할인쿠폰 - +