From 6a2454c3575484113e68e8e794bb90c799a8eed4 Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Mon, 13 Jan 2020 17:31:57 +0900
Subject: [PATCH] =?UTF-8?q?=EC=98=81=EC=B9=B4=ED=8A=B85=205.4=20=EB=B2=84?=
 =?UTF-8?q?=EC=A0=84=EC=97=90=EC=84=9C=20=EC=9E=98=EB=AA=BB=EB=90=98?=
 =?UTF-8?q?=EA=B1=B0=EB=82=98=20=EB=88=84=EB=9D=BD=EB=90=9C=20=EC=BD=94?=
 =?UTF-8?q?=EB=93=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/configform.php                 |  8 ++++++
 lib/shop.uri.lib.php                          | 27 ++++++++++---------
 mobile/shop/orderinquiry.php                  |  2 +-
 mobile/skin/shop/basic/itemqalist.skin.php    |  3 +--
 shop/itemqaformupdate.php                     |  2 +-
 shop/itemuseformupdate.php                    |  2 +-
 skin/shop/basic/itemqalist.skin.php           |  3 +--
 .../skin/shop/basic/itemqalist.skin.php       |  3 +--
 .../basic/skin/shop/basic/itemqalist.skin.php |  3 +--
 9 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/adm/shop_admin/configform.php b/adm/shop_admin/configform.php
index 3cdabccf1..c0f7921ac 100644
--- a/adm/shop_admin/configform.php
+++ b/adm/shop_admin/configform.php
@@ -273,6 +273,10 @@ if(!isset($default['de_taxsave_types'])) {
     <div class="tbl_frm01 tbl_wrap">
         <table>
         <caption>스킨설정</caption>
+        <colgroup>
+            <col class="grid_4">
+            <col>
+        </colgroup>
         <tbody>
         <tr>
             <th scope="row"><label for="de_shop_skin">PC용 스킨</label></th>
@@ -306,6 +310,10 @@ if(!isset($default['de_taxsave_types'])) {
     <div class="tbl_frm01 tbl_wrap">
         <table>
         <caption>쇼핑몰 초기화면 설정</caption>
+        <colgroup>
+            <col class="grid_4">
+            <col>
+        </colgroup>
         <tbody>
         <tr>
             <th scope="row">히트상품출력</th>
diff --git a/lib/shop.uri.lib.php b/lib/shop.uri.lib.php
index 10de27974..7d7cc1bfa 100644
--- a/lib/shop.uri.lib.php
+++ b/lib/shop.uri.lib.php
@@ -1,34 +1,37 @@
 <?php
 if (!defined('_GNUBOARD_')) exit;
 
-function shop_type_url($type){
+function shop_type_url($type, $add_param=''){
     global $config;
 
     if( $config['cf_bbs_rewrite'] ){
-        return get_pretty_url('shop', 'type-'.$type);
+        return get_pretty_url('shop', 'type-'.$type, $add_param);
     }
-
-    return G5_SHOP_URL.'/listtype.php?type='.urlencode($type);
+	
+	$add_params = $add_param ? '&'.$add_param : '';
+    return G5_SHOP_URL.'/listtype.php?type='.urlencode($type).$add_params;
 }
 
-function shop_item_url($it_id){
+function shop_item_url($it_id, $add_param=''){
     global $config;
 
     if( $config['cf_bbs_rewrite'] ){
-        return get_pretty_url('shop', $it_id);
+        return get_pretty_url('shop', $it_id, $add_param);
     }
-
-    return G5_SHOP_URL.'/item.php?it_id='.urlencode($it_id);
+	
+	$add_params = $add_param ? '&'.$add_param : '';
+    return G5_SHOP_URL.'/item.php?it_id='.urlencode($it_id).$add_params;
 }
 
-function shop_category_url($ca_id){
+function shop_category_url($ca_id, $add_param=''){
     global $config;
 
     if( $config['cf_bbs_rewrite'] ){
-        return get_pretty_url('shop', 'list-'.$ca_id);
+        return get_pretty_url('shop', 'list-'.$ca_id, $add_param);
     }
-
-    return G5_SHOP_URL.'/list.php?ca_id='.urlencode($ca_id);
+	
+	$add_params = $add_param ? '&'.$add_param : '';
+    return G5_SHOP_URL.'/list.php?ca_id='.urlencode($ca_id).$add_params;
 }
 
 function add_pretty_shop_url($url, $folder, $no='', $query_string='', $action=''){
diff --git a/mobile/shop/orderinquiry.php b/mobile/shop/orderinquiry.php
index 8fc72a191..68b8e8676 100644
--- a/mobile/shop/orderinquiry.php
+++ b/mobile/shop/orderinquiry.php
@@ -85,7 +85,7 @@ include_once(G5_MSHOP_PATH.'/_head.php');
     include G5_MSHOP_PATH.'/orderinquiry.sub.php';
     ?>
 
-    <?php echo get_paging($config['cf_write_pages'], $page, $total_page, "{$_SERVER['SCRIPT_NAME']}?$qstr&amp;page="); ?>
+    <?php echo get_paging($config['cf_mobile_pages'], $page, $total_page, "{$_SERVER['SCRIPT_NAME']}?$qstr&amp;page="); ?>
 </div>
 
 <?php
diff --git a/mobile/skin/shop/basic/itemqalist.skin.php b/mobile/skin/shop/basic/itemqalist.skin.php
index 879665ba7..dbc384332 100644
--- a/mobile/skin/shop/basic/itemqalist.skin.php
+++ b/mobile/skin/shop/basic/itemqalist.skin.php
@@ -129,8 +129,7 @@ $(function(){
             $con.slideUp();
             $(this).html("<span class=\"sound_only\">내용보기</span> <i class=\"fa fa-chevron-down\" aria-hidden=\"true\"></i>");
         } else {
-            $(".sps_con_btn button").html("<span class=\"sound_only\">내용보기</span><i class=\"fa fa-chevron-down\"></i>");
-            $("div[id^=sps_con]:visible").hide();
+            $("div[id^=sqa_con]:visible").hide();
             $con.slideDown(
                 function() {
                     // 이미지 리사이즈
diff --git a/shop/itemqaformupdate.php b/shop/itemqaformupdate.php
index dde991aa8..508381da9 100644
--- a/shop/itemqaformupdate.php
+++ b/shop/itemqaformupdate.php
@@ -24,7 +24,7 @@ if ($w == "" || $w == "u") {
 if($is_mobile_shop)
     $url = './iteminfo.php?it_id='.$it_id.'&info=qa';
 else
-    $url = shop_item_url($it_id)."?_=".get_token()."#sit_qa";
+    $url = shop_item_url($it_id, "_=".get_token()."#sit_qa");
 
 if ($w == "")
 {
diff --git a/shop/itemuseformupdate.php b/shop/itemuseformupdate.php
index fe9c23f33..01f58d00a 100644
--- a/shop/itemuseformupdate.php
+++ b/shop/itemuseformupdate.php
@@ -29,7 +29,7 @@ if ($w == "" || $w == "u") {
 if($is_mobile_shop)
     $url = './iteminfo.php?it_id='.$it_id.'&info=use';
 else
-    $url = shop_item_url($it_id)."?_=".get_token()."#sit_use";
+    $url = shop_item_url($it_id, "_=".get_token()."#sit_use");
 
 if ($w == "")
 {
diff --git a/skin/shop/basic/itemqalist.skin.php b/skin/shop/basic/itemqalist.skin.php
index d4766471b..d70285924 100644
--- a/skin/shop/basic/itemqalist.skin.php
+++ b/skin/shop/basic/itemqalist.skin.php
@@ -129,8 +129,7 @@ $(function(){
             $con.slideUp();
             $(this).html("내용보기 <i class=\"fa fa-caret-down\" aria-hidden=\"true\"></i>");
         } else {
-            $(".sps_con_btn button").html("내용보기 <i class=\"fa fa-caret-down\" aria-hidden=\"true\"></i>");
-            $("div[id^=sps_con]:visible").hide();
+            $("div[id^=sqa_con]:visible").hide();
             $con.slideDown(
                 function() {
                     // 이미지 리사이즈
diff --git a/theme/basic/mobile/skin/shop/basic/itemqalist.skin.php b/theme/basic/mobile/skin/shop/basic/itemqalist.skin.php
index 879665ba7..dbc384332 100644
--- a/theme/basic/mobile/skin/shop/basic/itemqalist.skin.php
+++ b/theme/basic/mobile/skin/shop/basic/itemqalist.skin.php
@@ -129,8 +129,7 @@ $(function(){
             $con.slideUp();
             $(this).html("<span class=\"sound_only\">내용보기</span> <i class=\"fa fa-chevron-down\" aria-hidden=\"true\"></i>");
         } else {
-            $(".sps_con_btn button").html("<span class=\"sound_only\">내용보기</span><i class=\"fa fa-chevron-down\"></i>");
-            $("div[id^=sps_con]:visible").hide();
+            $("div[id^=sqa_con]:visible").hide();
             $con.slideDown(
                 function() {
                     // 이미지 리사이즈
diff --git a/theme/basic/skin/shop/basic/itemqalist.skin.php b/theme/basic/skin/shop/basic/itemqalist.skin.php
index d4766471b..d70285924 100644
--- a/theme/basic/skin/shop/basic/itemqalist.skin.php
+++ b/theme/basic/skin/shop/basic/itemqalist.skin.php
@@ -129,8 +129,7 @@ $(function(){
             $con.slideUp();
             $(this).html("내용보기 <i class=\"fa fa-caret-down\" aria-hidden=\"true\"></i>");
         } else {
-            $(".sps_con_btn button").html("내용보기 <i class=\"fa fa-caret-down\" aria-hidden=\"true\"></i>");
-            $("div[id^=sps_con]:visible").hide();
+            $("div[id^=sqa_con]:visible").hide();
             $con.slideDown(
                 function() {
                     // 이미지 리사이즈