From ec9fc0495096bb7a779d4780c0fc5aa3597fd28a Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 23 Oct 2013 11:50:49 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20=EC=87=BC?= =?UTF-8?q?=ED=95=91=EB=AA=B0=20=EB=A9=94=EC=9D=B8=20=ED=83=AD=20=EA=B0=80?= =?UTF-8?q?=EB=B3=80=20=EC=82=AC=EC=9D=B4=EC=A6=88=EC=97=90=20=EB=8C=80?= =?UTF-8?q?=EC=9D=91=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/shop.mobile.main.js | 77 ++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 40 deletions(-) diff --git a/js/shop.mobile.main.js b/js/shop.mobile.main.js index 79bb100a5..c5d139628 100644 --- a/js/shop.mobile.main.js +++ b/js/shop.mobile.main.js @@ -76,33 +76,22 @@ width = $wrap.width(); tabw_width = $tab.width(); - tab_width = $tabs.eq(0).width(); height = $slides.eq(idx).height(); $wrap.height(height); $slides.not("."+cfg.active_class).css("left", "-"+width+"px"); - if(count < 3) { - pos_left = 0; - li_left = parseInt((tabw_width - (tab_width * count)) / (count + 1)); - - $tabs.each(function(index) { - pos_left += (li_left + (tab_width * index)); - $(this).css("left", pos_left); - }); - - $tabs.removeClass(cfg.tab_actie); + if(count == 1) { + tab_width = $tabs.eq(0).outerWidth(); + pos_left = parseInt((tabw_width - tab_width) / 2); + $tabs.eq(0).css("left", pos_left).addClass(cfg.tab_active); + } else if(count == 2) { + $tabs.eq(0).css("left", 0).addClass("tab_left"); + $tabs.eq(1).css("right", 0); + $tabs.removeClass(cfg.tab_active); $tabs.eq(idx).addClass(cfg.tab_active); - } else { - li_left = parseInt((tabw_width - (tab_width * 3)) / 2); - pos_left = tab_width + li_left; - pos_right = tabw_width - tab_width; - - $tabs.removeClass(cfg.tab_actie+" tab_listed").css("left", "-"+tab_width+"px"); - - $tabs.eq(idx - 1).addClass("tab_listed").css("left", "0px"); - $tabs.eq(idx).addClass(cfg.tab_active+" tab_listed").css("left", pos_left+"px"); - $tabs.eq((idx + 1) % count).addClass("tab_listed").css("left", pos_right+"px"); + } else if(count >= 3) { + tab_position(idx); $slides.eq((idx - 1)).css("left", "-"+width+"px"); $slides.eq((idx + 1) % count).css("left", width+"px"); @@ -132,13 +121,10 @@ $tabs.removeClass(cfg.tab_active); if(count >= 3) { - $tabs.removeClass("tab_listed").css("left", "-"+tab_width+"px"); - - $tabs.eq(next - 1).addClass("tab_listed").css("left", "0px"); - $tabs.eq(next).addClass("tab_listed").css("left", pos_left+"px"); - $tabs.eq((next + 1) % count).addClass("tab_listed").css("left", pos_right+"px"); + tab_position(next); + } else { + $tabs.eq(next).addClass(cfg.tab_active); } - $tabs.eq(next).addClass(cfg.tab_active); $slides.eq(idx).clearQueue().animate( { left: "-="+width }, cfg.duration, @@ -183,13 +169,10 @@ $tabs.removeClass(cfg.tab_active); if(count >= 3) { - $tabs.removeClass("tab_listed").css("left", "-"+tab_width+"px"); - - $tabs.eq(next - 1).addClass("tab_listed").css("left", "0px"); - $tabs.eq(next).addClass("tab_listed").css("left", pos_left+"px"); - $tabs.eq((next + 1) % count).addClass("tab_listed").css("left", pos_right+"px"); + tab_position(next); + } else { + $tabs.eq(next).addClass(cfg.tab_active); } - $tabs.eq(next).addClass(cfg.tab_active); $slides.eq(idx).clearQueue().animate( { left: "+="+width }, cfg.duration, @@ -209,6 +192,25 @@ $slides.eq(next).addClass(cfg.active_class); } + function tab_position(idx) + { + $tabs.removeClass(cfg.tab_actie+" tab_listed tab_left").css("left", "-"+tabw_width+"px"); + + var $tab_l = $tabs.eq(idx - 1); + var $tab_c = $tabs.eq(idx); + var $tab_r = $tabs.eq((idx + 1) % count); + var w_c = $tab_c.outerWidth(); + var w_r = $tab_r.outerWidth(); + + var pl = 0; + var pc = parseInt((tabw_width - w_c) / 2); + var pr = tabw_width - w_r; + + $tab_l.addClass("tab_listed tab_left").css("left", pl); + $tab_c.addClass(cfg.tab_active+" tab_listed").css("left", pc); + $tab_r.addClass("tab_listed").css("left", pr); + } + function check_animated() { if($slides.filter(":animated").size()) @@ -225,14 +227,9 @@ if($el.parent().hasClass(cfg.tab_active)) return; - idx = $slides.index($slides.filter("."+cfg.active_class)); - - var idx_pos = parseInt($tabs.eq(idx).css("left")); - var btn_pos = parseInt($el.parent().css("left")); - - if(idx_pos > btn_pos) + if($el.parent().hasClass("tab_left")) swipe_right(); - else(idx_pos < btn_pos) + else swipe_left(); } From c35abd05bea8aa0d2dc85bd724c6a789ac2608a6 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Wed, 23 Oct 2013 11:58:06 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EC=A3=BC=EB=AC=B8=EB=A6=AC=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=EC=97=90=EC=84=9C=20=EC=B6=9C=EB=A0=A5=ED=95=AD?= =?UTF-8?q?=EB=AA=A9=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/orderlist.php | 96 ++++++++++++++++++++++-------------- css/admin.css | 4 +- 2 files changed, 61 insertions(+), 39 deletions(-) diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php index e959f8ccd..b708c1111 100644 --- a/adm/shop_admin/orderlist.php +++ b/adm/shop_admin/orderlist.php @@ -209,27 +209,33 @@ $listall = '전체목록주문 전체 - ">주문번호 - ">주문자 - 주문상태 - 결제수단 - ">주문합계 - ">입금합계 - ">주문취소 + + ">주문번호 + 주문자 + 주문자전화 + 받는분 + 주문합계 + 입금합계 + 주문취소 쿠폰 - ">미수금 + 미수금 관리 - 주문일시 - ">회원ID - ">주문건 - ">누적건 + + + + 회원ID + 주문상품수 + 누적주문수 - 배송일시 + + 주문상태 + 결제수단 + 운송장번호 배송회사 - 운송장번호 + 배송일시 @@ -280,19 +286,16 @@ $listall = '전체목록" class="sound_only">주문번호 - + + + + - - - - - - - - + + @@ -304,24 +307,46 @@ $listall = '전체목록 - 주문일시 - + + + + + + + + 비회원 + + 건 건 - + + + + + + + + + + + + - + - + - - + - + @@ -332,14 +357,11 @@ $listall = '전체목록 --> - - - - + - + - + - diff --git a/css/admin.css b/css/admin.css index fa3622620..220cd3567 100644 --- a/css/admin.css +++ b/css/admin.css @@ -429,8 +429,8 @@ td.td_grpset {width:160px;border-left:1px solid #e9ecee;text-align:center} .scf_sms_cnt {display:block} /* 주문내역 */ -#sodr_list .td_odrnum2 {text-align:left} -#sodr_list .td_odrnum2 a {text-decoration:underline} +#sodr_list .td_odrnum2 {text-align:center} +#sodr_list .td_odrnum2 a {text-decoration:none;} #sodr_list .list_delino {text-align:center} /* 주문내역 수정 */