From b8dffbd9b87f02b163e5e1ebe10ce6d765c8b522 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Fri, 8 Nov 2013 11:59:22 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EA=B4=80=EB=A0=A8=EC=83=81=ED=92=88=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20=ED=95=84=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extend/shop.extend2.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/extend/shop.extend2.php b/extend/shop.extend2.php index 90a62eff5..e76513d21 100644 --- a/extend/shop.extend2.php +++ b/extend/shop.extend2.php @@ -654,4 +654,18 @@ if(!sql_query(" select it_explan2 from {$g5['g5_shop_item_table']} limit 1 ", fa sql_query(" ALTER TABLE `{$g5['g5_shop_item_table']}` ADD `it_explan2` MEDIUMTEXT NOT NULL AFTER `it_explan` ", true); } + + +// 관련상품 출력과 상품검색을 위한 설정 필드 추가 +if(!sql_query(" select de_rel_list_use from {$g5['g5_shop_default_table']} limit 1 ", false)) { + sql_query(" ALTER TABLE `{$g5['g5_shop_item_table']}` + ADD `de_rel_list_use` TINYINT NOT NULL AFTER `de_mobile_type5_img_height`, + ADD `de_rel_list_skin` VARCHAR(255) NOT NULL AFTER `de_rel_list_use`, + ADD `de_search_list_skin` VARCHAR(255) NOT NULL AFTER `de_rel_img_height`, + ADD `de_search_list_mod` INT NOT NULL AFTER `de_search_list_skin`, + ADD `de_search_list_row` INT NOT NULL AFTER `de_search_list_mod`, + ADD `de_search_img_width` INT NOT NULL AFTER `de_search_list_row`, + ADD `de_search_img_height` INT NOT NULL AFTER `de_search_img_width` + ", true); +} ?> From 93bc1b3a5e3943f07492456ccd8d0c153fae07f6 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Fri, 8 Nov 2013 11:59:52 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EC=83=81=ED=92=88=EA=B2=80=EC=83=89?= =?UTF-8?q?=EC=88=9C=20=ED=95=98=EC=9D=B4=ED=8D=BC=EB=A7=81=ED=81=AC=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/search.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/shop/search.php b/shop/search.php index c36504002..58db51713 100644 --- a/shop/search.php +++ b/shop/search.php @@ -88,7 +88,12 @@ $total_count = $row['cnt'];
-
검색어 | 검색 결과
+ + 판매량 많은순 + 선호도 높은순 + 사용후기 많은순 + 최근 등록순 + 검색 결과
Date: Fri, 8 Nov 2013 16:16:06 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EC=B6=A9=EB=8F=8C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extend/shop.extend2.php | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/extend/shop.extend2.php b/extend/shop.extend2.php index 6dba03374..d8b5093e2 100644 --- a/extend/shop.extend2.php +++ b/extend/shop.extend2.php @@ -655,20 +655,6 @@ if(!sql_query(" select it_explan2 from {$g5['g5_shop_item_table']} limit 1 ", fa ADD `it_explan2` MEDIUMTEXT NOT NULL AFTER `it_explan` ", true); } -<<<<<<< HEAD - -// 관련상품 출력과 상품검색을 위한 설정 필드 추가 -if(!sql_query(" select de_rel_list_use from {$g5['g5_shop_default_table']} limit 1 ", false)) { - sql_query(" ALTER TABLE `{$g5['g5_shop_item_table']}` - ADD `de_rel_list_use` TINYINT NOT NULL AFTER `de_mobile_type5_img_height`, - ADD `de_rel_list_skin` VARCHAR(255) NOT NULL AFTER `de_rel_list_use`, - ADD `de_search_list_skin` VARCHAR(255) NOT NULL AFTER `de_rel_img_height`, - ADD `de_search_list_mod` INT NOT NULL AFTER `de_search_list_skin`, - ADD `de_search_list_row` INT NOT NULL AFTER `de_search_list_mod`, - ADD `de_search_img_width` INT NOT NULL AFTER `de_search_list_row`, - ADD `de_search_img_height` INT NOT NULL AFTER `de_search_img_width` - ", true); -======= // de_rel_list_use 추가 if(!sql_query(" select de_rel_list_use from {$g5['g5_shop_default_table']} ", false)) { sql_query(" ALTER TABLE `{$g5['g5_shop_default_table']}` @@ -685,6 +671,5 @@ if(!sql_query(" select de_rel_list_use from {$g5['g5_shop_default_table']} ", fa if(!sql_query(" select de_item_use_write from {$g5['g5_shop_default_table']} ", false)) { sql_query(" ALTER TABLE `{$g5['g5_shop_default_table']}` ADD `de_item_use_write` tinyint(4) NOT NULL DEFAULT '0' AFTER `de_item_use_use` ", true); ->>>>>>> 23fe590917161cae409fb47b3b92131921dd5c97 } ?> From 5ea8bb6966bfa58a4a2bf5a1479906c1599247ba Mon Sep 17 00:00:00 2001 From: whitedot Date: Fri, 8 Nov 2013 16:30:15 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=EC=87=BC?= =?UTF-8?q?=ED=95=91=EB=AA=B0:=20#320=20=EC=82=AC=EC=9A=A9=ED=9B=84?= =?UTF-8?q?=EA=B8=B0=20=EC=83=81=ED=92=88=EB=AC=B8=EC=9D=98=20=EA=B0=80?= =?UTF-8?q?=EB=A1=9C=ED=8F=AD=20=EC=9E=91=EC=9D=84=20=EB=95=8C=20=EB=A0=88?= =?UTF-8?q?=EC=9D=B4=EC=95=84=EC=9B=83=20=ED=8B=80=EC=96=B4=EC=A7=80?= =?UTF-8?q?=EB=8A=94=20=ED=98=84=EC=83=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default_shop.css | 2 +- css/mobile_shop.css | 30 ++++++++++----------- mobile/skin/shop/basic/itemuselist.skin.php | 3 +-- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/css/default_shop.css b/css/default_shop.css index 4cc58778b..9f12601b6 100644 --- a/css/default_shop.css +++ b/css/default_shop.css @@ -573,7 +573,7 @@ fieldset .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7 #sps li:after {display:block;visibility:hidden;clear:both;content:""} .sps_img {float:left;margin:0 10px 0 0;width:80px} -.sps_img span {position:absolute;font-size:0;line-height:0} +.sps_img span {position:absolute;font-size:0;line-height:0;overflow:hidden} #sps dl {margin:5px 0 10px;zoom:1} #sps dl:after {display:block;visibility:hidden;clear:both;content:""} diff --git a/css/mobile_shop.css b/css/mobile_shop.css index f09fcb0bd..27da79b38 100644 --- a/css/mobile_shop.css +++ b/css/mobile_shop.css @@ -274,24 +274,24 @@ a.sanchor_on {background:#626870;color:#fff !important;text-decoration:none} /* 사용후기 모음 */ #sps_sch {margin:0 0 10px} -#sps_sch a {display:inline-block;padding:0 8px;height:1.8em;background:#333;color:#fff;text-decoration:none;vertical-align:middle;line-height:1.8em} -#sps_sch .btn_submit {height:1.8em;vertical-align:middle;line-height:1.8em} +#sps_sch a {display:inline-block;padding:0 8px;height:23px;background:#333;color:#fff;text-decoration:none;vertical-align:middle;line-height:23px} +#sps_sch .btn_submit {height:23px;vertical-align:middle} #sps {zoom:1} #sps ol {margin:0;padding:0;border-top:1px solid #e9e9e9;list-style:none} -#sps li {position:relative;padding:10px;border-bottom:1px solid #e9e9e9} +#sps li {position:relative;padding:10px 0;border-bottom:1px solid #e9e9e9} #sps li:after {display:block;visibility:hidden;clear:both;content:""} -.sps_img {float:left;width:15%} -.sps_img span {position:absolute;font-size:0;line-height:0} +.sps_img {float:left;width:25%} +.sps_img span {position:absolute;font-size:0;line-height:0;overflow:hidden} #sps dl {margin:5px 0 10px;zoom:1} #sps dl:after {display:block;visibility:hidden;clear:both;content:""} -#sps dt {float:left} -#sps dd {float:left;margin:0 15px 0 5px} +#sps dt {float:left;margin:0 0 5px} +#sps dd {float:left;margin:0 15px 5px 5px} #sps dd img {position:relative;top:-2px} -.sps_section {float:right;width:80%} +.sps_section {float:right;width:75%} .sps_section p {padding:0;width:100%;height:1.8em;overflow:hidden} .sps_con_full {padding:0;height:auto !important} .sps_con_btn {margin:5px 0 0;text-align:right} @@ -299,24 +299,24 @@ a.sanchor_on {background:#626870;color:#fff !important;text-decoration:none} /* 상품문의 모음 */ #sqa_sch {margin:0 0 10px} -#sqa_sch a {display:inline-block;padding:0 8px;height:1.8em;background:#333;color:#fff;text-decoration:none;vertical-align:middle;line-height:1.8em} -#sqa_sch .btn_submit {height:1.8em;vertical-align:middle;line-height:1.8em} +#sqa_sch a {display:inline-block;padding:0 8px;height:2em;background:#333;color:#fff;text-decoration:none;vertical-align:middle;line-height:1.9em} +#sqa_sch .btn_submit {height:2em;vertical-align:middle} #sqa {zoom:1} #sqa ol {margin:0;padding:0;border-top:1px solid #e9e9e9;list-style:none} -#sqa li {position:relative;padding:10px;border-bottom:1px solid #e9e9e9} +#sqa li {position:relative;padding:10px 0;border-bottom:1px solid #e9e9e9} #sqa li:after {display:block;visibility:hidden;clear:both;content:""} -.sqa_img {float:left;width:15%} +.sqa_img {float:left;width:25%} .sqa_img span {position:absolute;font-size:0;line-height:0} #sqa dl {margin:5px 0 10px;zoom:1} #sqa dl:after {display:block;visibility:hidden;clear:both;content:""} -#sqa dt {float:left} -#sqa dd {float:left;margin:0 15px 0 5px} +#sqa dt {float:left;margin:0 0 5px} +#sqa dd {float:left;margin:0 15px 5px 5px} #sqa dd img {position:relative;top:-2px} -.sqa_section {float:right;width:80%} +.sqa_section {float:right;width:75%} .sqa_section .sqa_con {padding:10px;background:#f2f5f9;line-height:1.7em} .sqa_section p {padding:0;width:100%;height:1.8em;overflow:hidden} .sqa_con_full {padding:0;height:auto !important} diff --git a/mobile/skin/shop/basic/itemuselist.skin.php b/mobile/skin/shop/basic/itemuselist.skin.php index c5f521e62..d88f85c2e 100644 --- a/mobile/skin/shop/basic/itemuselist.skin.php +++ b/mobile/skin/shop/basic/itemuselist.skin.php @@ -19,9 +19,8 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 - - +