From 1455af54b847fe301cb6737d0f8e6aced3206493 Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 12 Jun 2013 16:12:04 +0900 Subject: [PATCH] =?UTF-8?q?=EC=87=BC=ED=95=91=EB=AA=B0:=20#220=20=EC=A3=BC?= =?UTF-8?q?=EB=AC=B8=20=EC=BF=A0=ED=8F=B0=20=EA=B8=B0=EB=8A=A5=20=EB=A7=88?= =?UTF-8?q?=ED=81=AC=EC=97=85=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default_shop.css | 51 +++++++++++++------------------ shop/cart.php | 2 -- shop/orderform.php | 6 ++-- shop/orderitemcoupon.php | 65 +++++++++++++++++++++++----------------- 4 files changed, 60 insertions(+), 64 deletions(-) diff --git a/css/default_shop.css b/css/default_shop.css index a0721e682..6b83210f9 100644 --- a/css/default_shop.css +++ b/css/default_shop.css @@ -193,37 +193,30 @@ a.sanchor_on {background:#626870;color:#fff !important;text-decoration:none} .cnt_cmt {display:inline-block;margin:0 0 0 3px;font-weight:bold} /* 버튼 */ .btn01 {display:inline-block;padding:0 10px;height:23px;border:1px solid #ccc !important;background:#fafafa !important;color:#000 !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} -.btn01:focus, -.btn01:hover {text-decoration:none !important} +.btn01:focus, .btn01:hover {text-decoration:none !important} .btn02 {display:inline-block;padding:0 10px;height:23px;border:1px solid #333 !important;background:#333 !important;color:#fff !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} -.btn02:focus, -.btn02:hover {text-decoration:none !important} +.btn02:focus, .btn02:hover {text-decoration:none !important} .btn_confirm {text-align:center} /* 서식단계 진행 */ .btn_submit {padding:0 10px;height:24px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;vertical-align:top;cursor:pointer} button.btn_submit {height:22px !important;font-size:1em} fieldset .btn_submit {height:22px;font-size:1em} -.btn_cancel {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em} -button.btn_cancel {display:inline-block;padding:0 10px;height:24px;border:1px solid #ccc;background:#fafafa;line-height:2em} -.btn_cancel:focus, -.btn_cancel:hover {text-decoration:none !important} +.btn_cancel {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em;cursor:pointer} +button.btn_cancel {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:1.9em} +.btn_cancel:focus, .btn_cancel:hover {text-decoration:none !important} .btn_frmline {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#333;color:#fff !important;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */ .btn_frmline2 {display:inline-block;padding:0 7px 0 5px;height:20px;border:1px solid #e9e9e9;background:#f5f6fa;color:#ff3061 !important;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:1.7em} -button.btn_frmline {font-size:1em} +button.btn_frmline {font-size:1em;cursor:pointer} +button.btn_frmline2 {font-size:1em;cursor:pointer} .btn_win {clear:both;margin-bottom:20px;text-align:center} /* 새창용 */ -.btn_win a, -.btn_win button {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em;cursor:pointer} -.btn_win a:focus, -.btn_win a:hover {text-decoration:none} +.btn_win a, .btn_win button {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em;cursor:pointer} +.btn_win a:focus, .btn_win a:hover {text-decoration:none} /* 게시판용 버튼 */ .btn_b01 {display:inline-block;padding:0 10px;height:23px;border:1px solid #eee !important;background:#fafafa !important;color:#000 !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} -.btn_b01:focus, -.btn_b01:hover {text-decoration:none !important} +.btn_b01:focus, .btn_b01:hover {text-decoration:none !important} .btn_b02 {display:inline-block;padding:0 10px;height:23px;border:1px solid #eee !important;background:#fafafa !important;color:#000 !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} -.btn_b02:focus, -.btn_b02:hover {text-decoration:none !important} +.btn_b02:focus, .btn_b02:hover {text-decoration:none !important} .btn_admin {display:inline-block;padding:0 10px;height:23px;border:1px solid #e8180c !important;background:#e8180c !important;color:#fff !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} /* 관리자 전용 버튼 */ -.btn_admin:focus, -.btn_admin:hover {text-decoration:none !important} +.btn_admin:focus, .btn_admin:hover {text-decoration:none !important} /* 기본테이블 */ .basic_tbl {margin-bottom:10px;width:100%;border-collapse:collapse;border-spacing:0} @@ -314,25 +307,18 @@ input.required:focus {border:1px solid #b8c9c2;background:#21272e !important;col .sv_wrap {display:inline-block;position:relative;font-weight:normal} .sv_wrap .sv {z-index:1000;display:none;margin:5px 0 0;border:1px solid #283646;background:#111} .sv_wrap .sv a {display:inline-block !important;margin:0 !important;padding:3px !important;width:94px;border-bottom:1px solid #283646;color:#fff !important} -.sv_wrap a:focus, -.sv_wrap a:hover, -.sv_wrap a:active {text-decoration:none !important} +.sv_wrap a:focus, .sv_wrap a:hover, .sv_wrap a:active {text-decoration:none !important} .sv_on {display:block !important;position:absolute;top:10px;left:20px;width:auto;height:auto !important} .sv_nojs .sv {display:block} /* pagination */ .pg_wrap {clear:both;margin:0 0 20px;padding-top:20px;text-align:center} .pg {display:inline-block;border:1px solid #cfded8;letter-spacing:-4px} -.pg a:focus, -.pg a:hover, -.pg a:active {text-decoration:none} -.pg_page, -.pg_current {display:inline-block;padding:0 12px;height:30px;color:#000;letter-spacing:0;line-height:2.6em;vertical-align:middle} +.pg a:focus, .pg a:hover, .pg a:active {text-decoration:none} +.pg_page, .pg_current {display:inline-block;padding:0 12px;height:30px;color:#000;letter-spacing:0;line-height:2.6em;vertical-align:middle} .pg_page {background:#f9f9f9;text-decoration:none} -.pg_start, -.pg_prev {border-right:1px solid #cfded8} -.pg_end, -.pg_next {border-left:1px solid #cfded8} +.pg_start, .pg_prev {border-right:1px solid #cfded8} +.pg_end, .pg_next {border-left:1px solid #cfded8} .pg_current {background:#333;color:#fff;font-weight:bold} /* ########## 쇼핑몰 컨텐츠 ########## */ @@ -664,6 +650,9 @@ input.required:focus {border:1px solid #b8c9c2;background:#21272e !important;col #sod_frm {} #sod_frm h2 {margin:0 0 10px} +#sod_list {position:relative} +#sod_list #it_coupon_frm {z-index:10000;position:absolute;top:0;left:99px;padding:20px;width:500px;height:auto !important;height:500px;max-height:500px;border:1px solid #000;background:#f5f6fa;overflow-y:scroll} + #sod_frm_orderer {margin:20px 0 40px} #sod_frm_same {margin:0 0 10px} diff --git a/shop/cart.php b/shop/cart.php index 6a8e4d132..556140bd1 100644 --- a/shop/cart.php +++ b/shop/cart.php @@ -222,8 +222,6 @@ $(function() { var $this = $(this); close_btn_idx = $(".mod_options").index($(this)); - winMask(); // 모달 윈도우 배경 출력 - $.post( "./cartoption.php", { it_id: it_id }, diff --git a/shop/orderform.php b/shop/orderform.php index 06f739b04..5acbfa595 100644 --- a/shop/orderform.php +++ b/shop/orderform.php @@ -112,7 +112,7 @@ setTimeout("init_pay_button();",300);

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

- +
@@ -217,7 +217,7 @@ setTimeout("init_pay_button();",300); $cp = sql_fetch($sql); if($cp['cnt']) - $cp_button = ''; + $cp_button = ''; } ?> @@ -233,7 +233,7 @@ setTimeout("init_pay_button();",300); - + diff --git a/shop/orderitemcoupon.php b/shop/orderitemcoupon.php index a2d39d4f8..f34f0894b 100644 --- a/shop/orderitemcoupon.php +++ b/shop/orderitemcoupon.php @@ -42,45 +42,54 @@ $count = mysql_num_rows($result);
0) { ?> -
    -
  • - 쿠폰명 - 할인금액 - 적용 -
    • - +
+ + + + + + + + + + + $row['cp_maximum']) - $dc = $row['cp_maximum']; - ?> -
  • + if($row['cp_maximum'] && $dc > $row['cp_maximum']) + $dc = $row['cp_maximum']; + ?> +
    • + + + + + + +
    상품이미지
    쿠폰 선택
    쿠폰명할인금액적용
    - - - - - +
    -
    - +
    + 0) { ?> - +
    \ No newline at end of file