diff --git a/css/default_shop.css b/css/default_shop.css
index 0712649ed..1ad0cde64 100644
--- a/css/default_shop.css
+++ b/css/default_shop.css
@@ -9,7 +9,7 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav,
header ul, nav ul, footer ul {margin:0;padding:0;list-style:none}
label, input, select, img {vertical-align:middle}
input {margin:0;padding:0;border-radius:0;font-family:"dotum"}
-button {border-radius:0;font-size:1em}
+button {border-radius:0;font-size:1em;font-family:"dotum"}
p {margin:0;padding:10px 0;line-height:1.7em;word-break:break-all}
hr {display:none}
pre {overflow-x:scroll;font-size:1.1em}
@@ -447,11 +447,7 @@ input.required:focus {padding:3px 3px 4px;border:0;background:#21272e !important
/* 상품 상세보기 */
#sit {margin:10px 0;border:1px solid #e9e9e9}
.sit_admin {text-align:right}
-
-/* 상품 상세보기 - 공통 */
-.sit_anchor {margin:0;padding:0;list-style:none;zoom:1}
-.sit_anchor:after {display:block;visibility:hidden;clear:both;content:""}
-.sit_anchor li {float:left;position:relative;margin:0 0 0 -1px;border:1px solid #ddd}
+.sit_empty {padding:20px 0;text-align:center}
/* 상품 상세보기 - 개요 */
#sit_ov_wrap {margin:0 0 20px;border-bottom:1px solid #e9e9e9;zoom:1}
@@ -511,7 +507,7 @@ input.required:focus {padding:3px 3px 4px;border:0;background:#21272e !important
#sit_siblings h2 {position:absolute;font-size:0;line-height:0;content:""}
/* 상품 상세보기 - 상품정보 */
-#sit_inf {margin:0 0 20px;padding:10px}
+#sit_inf {margin:0 0 10px;padding:10px 10px 20px;border-bottom:1px solid #e9e9e9}
#sit_inf h2,
#sit_inf h3 {position:absolute;font-size:0;line-height:0;content:""}
@@ -523,23 +519,45 @@ input.required:focus {padding:3px 3px 4px;border:0;background:#21272e !important
#sit_inf_open td {padding:7px 10px;border:1px solid #fff;background:#f5f6fa}
/* 상품 상세보기 - 사용후기 */
-#sit_ps {margin:0 0 20px;padding:10px}
+#sit_ps {margin:0 0 10px;padding:10px 10px 20px;border-bottom:1px solid #e9e9e9}
#sit_ps h2 {position:absolute;font-size:0;line-height:0;content:""}
/* 상품 상세보기 - 상품문의 */
-#sit_qna {margin:0 0 20px;padding:10px}
+#sit_qna {margin:0 0 10px;padding:10px 10px 20px;border-bottom:1px solid #e9e9e9}
#sit_qna h2 {position:absolute;font-size:0;line-height:0;content:""}
+#sit_qna h3 {margin:0 0 10px}
+
+#sit_qna_ol {margin:0 0 5px;padding:0;border-top:1px solid #e9e9e9;list-style:none}
+.sit_qna_li {position:relative;padding:0 0 10px;border-bottom:1px solid #e9e9e9;background:#f5f6fa}
+.sit_qna_li_title {display:block;margin:0;padding:10px;width:100%;border:0;background:transparent;text-align:left;cursor:pointer}
+
+.sit_qna_dl {margin:0;padding:0 10px;zoom:1}
+.sit_qna_dl:after {display:block;visibility:hidden;clear:both;content:""}
+.sit_qna_dl dt {float:left}
+.sit_qna_dl dd {float:left;margin:0 20px 0 5px}
+
+.sit_qna_con {display:none;padding:10px 10px 0}
+.sit_qna_con p {padding:0}
+.sit_qna_qaq {margin:0 0 5px}
+.sit_qna_con textarea {display:none}
+.sit_qna_cmd {text-align:right}
+
+.sit_qna_pw {display:none}
+
+#sit_qna_wbtn {margin:0 0 5px;text-align:right}
+
+#sit_qna_w {display:none}
/* 상품 상세보기 - 배송정보 */
-#sit_dvr {margin:0 0 20px;padding:10px}
+#sit_dvr {margin:0 0 10px;padding:10px 10px 20px;border-bottom:1px solid #e9e9e9}
#sit_dvr h2 {position:absolute;font-size:0;line-height:0;content:""}
/* 상품 상세보기 - 교환정보 */
-#sit_ex {margin:0 0 20px;padding:10px}
+#sit_ex {margin:0 0 10px;padding:10px 10px 20px;border-bottom:1px solid #e9e9e9}
#sit_ex h2 {position:absolute;font-size:0;line-height:0;content:""}
/* 상품 상세보기 - 관련상품 */
-#sit_rel {margin:0 0 20px;padding:10px}
+#sit_rel {margin:0 0 10px;padding:10px 10px 20px}
#sit_rel h2 {position:absolute;font-size:0;line-height:0;content:""}
/* 공지사항 및 커뮤니티 새글 */
diff --git a/shop/item.php b/shop/item.php
index 8c51af44f..34a100420 100644
--- a/shop/item.php
+++ b/shop/item.php
@@ -132,7 +132,6 @@ $row = sql_fetch($sql);
$item_relation_count = $row['cnt'];
?>
-<<<<<<< HEAD
-=======
->>>>>>> e996e707806fc6f359cb4e91fb92d84e4386e022
-
-
-
-
- | |
-
-
-
-  |
-
-
-
- | 번호 |
- 제목 |
- 작성자 |
- 작성일 |
- 답변 |
-
- |
-  |
-
-
+ 등록된 상품문의
- // 테이블의 전체 레코드수만 얻음
- $sql = " select COUNT(*) as cnt " . $sql_common;
- $row = sql_fetch($sql);
- $qa_total_count = $row['cnt'];
+ ";
+ //if ($row[iq_answer]) $qa .= " ";
+ //$qa = "$qa";
+
+ $iq_stats = '';
+ $iq_answer = '';
+ $iq_flag = 0;
+ if ($row['iq_answer'])
{
- if ($i > 0)
- echo " | ";
-
- $num = $qa_total_count - ($qa_page - 1) * $qa_page_rows - $i;
-
- $iq_name = get_text($row['iq_name']);
- $iq_subject = conv_subject($row['iq_subject'],50,"…");
- $iq_question = conv_content($row['iq_question'],0);
- $iq_answer = conv_content($row['iq_answer'],0);
-
- $iq_time = substr($row['iq_time'], 2, 14);
-
- //$qa = " ";
- //if ($row[iq_answer]) $qa .= " ";
- //$qa = "$qa";
-
- $icon_answer = "";
- $iq_answer = "";
- if ($row['iq_answer'])
- {
- $iq_answer = "
: ".conv_content($row['iq_answer'],0) . "";
- $icon_answer = " ";
- }
-
- echo "
-
- |
-
-
-
- | $num |
-
- $iq_subject
- | $iq_name |
- $iq_time |
- $icon_answer |
-
-
-
-
-
-
- | {$iq_question} |
- ";
-
- if ($iq_answer)
- echo "
-
- | $iq_answer |
- ";
-
- echo "
-
- |
-
-
-
- ";
-
- if ($row['mb_id'] == $member['mb_id'] && !$iq_answer)
- {
- echo "수정 ";
- echo "삭제 ";
- }
-
- echo "
- |
-
-
-
- |
-
- |
- ";
-
- echo "
-
- |
-
- |
-
- ";
+ $iq_answer = conv_content($row['iq_answer'],0);
+ $iq_stats = '답변완료';
+ } else {
+ $iq_stats = '답변전';
+ $iq_answer = '답변이 등록되지 않았습니다.';
+ $iq_flag = 1;
}
+ if ($i == 0) echo '';
+ ?>
- if (!$i)
- {
- echo "
-
- |
-
- 이 상품에 대한 질문이 아직 없습니다.
- 궁금하신 사항은 이곳에 질문하여 주십시오. |
- |
- ";
- }
+ -
+
+
+ - 작성자
+
+ - 작성일
+
+ - 상태
+
+
+
+
+ 문의내용
+
+
+
+ 답변
+
+
- $qa_pages = get_paging(10, $qa_page, $qa_total_page, "./item.php?it_id=$it_id&$qstr&qa_page=", "#qa");
- if ($qa_pages)
- {
- echo " | ";
- echo " ";
- echo " | ";
- echo "$qa_pages | ";
- echo " | ";
- echo "";
- }
- ?>
-
-  |
- |
-  |
-
-
+
+
+
+
-
-
-
-
-
- |
-
- |
-
+
+
+
+
+
+
+ = 0) echo '';
+
+ if (!$i) echo '
상품문의가 없습니다.
';
+ ?>
+
+
+
+
+
+
+
+
+
-