diff --git a/.gitignore b/.gitignore
index 104c9a4..b40b2ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 /images/
 /temp/*
 data/config.php
-
+.vscode/
diff --git a/back/templates/room_list.htm b/back/templates/room_list.htm
index fa37773..5fbe083 100755
--- a/back/templates/room_list.htm
+++ b/back/templates/room_list.htm
@@ -18,7 +18,7 @@
     </th>
     <th><a href="javascript:listTable.sort('cname'); ">名稱</a>{$sort_cname}</th>
     <th><a href="javascript:listTable.sort('is_on_sale'); ">是否上架</a>{$sort_is_on_sale}</th>
-<!--    <th><a href="javascript:listTable.sort('sort_order'); ">{$lang.sort_order}</a>{$sort_sort_order}</th>-->
+    <th><a href="javascript:listTable.sort('sort_order'); ">{$lang.sort_order}</a>{$sort_sort_order}</th>
     <th>{$lang.handler}</th>
   <tr>
   {foreach from=$room_list item=room}
@@ -26,7 +26,7 @@
     <td>&nbsp;{$room.id}</td>
     <td class="first-cell">{$room.name|escape:html}</td>
     <td align="center"><img src="images/{if $room.enable}yes{else}no{/if}.gif" onclick="listTable.toggle(this, 'toggle_enable', {$room.id})" /></td>
-<!--    <td align="center"><span onclick="listTable.edit(this, 'edit_sort_order', {$room.id})">{$room.sort_order}</span></td>-->
+    <td align="center"><span onclick="listTable.edit(this, 'edit_sort_order', {$room.id})">{$room.sort_order}</span></td>
     <td align="center">
       <a href="room.php?act=edit&id={$room.id}" title="{$lang.edit}"><img src="images/icon_edit.gif" width="21" height="21" border="0" /></a>
       <a href="javascript:;" onclick="listTable.remove({$room.id}, '確認刪除')" title="刪除"><img src="images/icon_trash.gif" width="21" height="21" border="0" /></a>
diff --git a/index.php b/index.php
index ca90db3..6f123de 100755
--- a/index.php
+++ b/index.php
@@ -35,6 +35,7 @@ if($site_type=='web'){
 
 	$smarty->display('web.html');
 }else{
+<<<<<<< HEAD
  	$keyword = empty($_REQUEST['keyword']) ? '' : trim($_REQUEST['keyword']);
 
 //	$smarty->assign('description',     htmlspecialchars($_CFG['shop_desc']));
@@ -50,6 +51,22 @@ if($site_type=='web'){
 	$smarty->assign('ad3_list',        get_rand5_ad3($site_id));
 	$smarty->assign('ad4_list',        get_all_ad4($site_id));
 	$smarty->assign('footer_text',     $_CFG['footer_text']);
+=======
+	$smarty->assign('keywords',        htmlspecialchars($_CFG['shop_keywords']));
+	    $smarty->assign('description',     htmlspecialchars($_CFG['shop_desc']));
+	    $smarty->assign('main_domain',         MAIN_DOMAIN);  // 当前位置
+	    $smarty->assign('data_dir',        DATA_DIR);       // 数据目录
+		$smarty->assign('http',         $GLOBALS['ecs']->http());
+	    $smarty->assign('ad1_list',        		get_rand5_ad1($site_id));
+	    $smarty->assign('rnd5_portals_1',         get_rand5_portals(1));
+	    $smarty->assign('rnd5_portals_2',         get_rand5_portals(2));
+	    $smarty->assign('rnd5_portals_3',         get_rand5_portals(3));
+	    $smarty->assign('ad2_list',        		get_rand5_ad2($site_id));
+	    $smarty->assign('ad3_list',        		get_rand5_ad3($site_id));
+	    $smarty->assign('ad4_list',        		get_all_ad4($site_id));
+	    $smarty->assign('footer_text',        	$_CFG['footer_text']);
+	    $smarty->assign('category',        	    $category);
+>>>>>>> bnb
 	
 	if($site_id>0){ 
 	    $sql = 'SELECT * FROM ' . $GLOBALS['ecs']->table('portal') .
diff --git a/room.php b/room.php
index f32a92f..eaa0404 100755
--- a/room.php
+++ b/room.php
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <?php
 define('IN_ECS', true);
 
@@ -55,4 +56,63 @@ elseif ($_REQUEST['act'] == 'view')
 		$smarty->assign('title',$site_name."-服務項目-".$room['name']);
 
 		$smarty->display('in_room.html');
+=======
+<?php
+define('IN_ECS', true);
+
+require(dirname(__FILE__) . '/includes/init.php');
+
+/* 載入語言文件 */
+//require_once(ROOT_PATH . 'languages/' .$_CFG['lang']. '/news.php');
+
+/*------------------------------------------------------ */
+//-- act 操作项的初始化
+/*------------------------------------------------------ */
+if (empty($_REQUEST['act']))
+{
+    $_REQUEST['act'] = 'view';
+}
+
+/*------------------------------------------------------ */
+//-- PROCESSOR
+/*------------------------------------------------------ */
+if ($_REQUEST['act'] == 'list')
+{
+		assign_template();
+//		assign_dynamic('room');
+        $sql = 'SELECT * ' .
+               ' FROM ' . $GLOBALS['ecs']->table('hs_room') .
+               ' WHERE enable=1 and hs_id= '.$site_id.' order by sort_order asc';
+
+        $rooms = $GLOBALS['db']->getAll($sql);
+		$site_name=$GLOBALS['db']->getOne("SELECT cname FROM ".$GLOBALS['ecs']->table('hs_web')." WHERE hs_id=".$site_id);
+		$smarty->assign('title',$site_name."-客房列表");
+		$smarty->assign('rooms',$rooms);
+
+		$smarty->display('room.html');
+}
+/*------------------------------------------------------ */
+//-- 拍卖商品 --> 出价
+/*------------------------------------------------------ */
+elseif ($_REQUEST['act'] == 'view')
+{
+		assign_template();
+//		assign_dynamic('room');
+        $sql = 'SELECT * ' .
+               ' FROM ' . $GLOBALS['ecs']->table('hs_room') .
+               ' WHERE id= '.$_REQUEST['id'].
+               ' LIMIT 1';
+        $room = $GLOBALS['db']->getRow($sql);
+		$smarty->assign('room',$room);
+        $sql = 'SELECT * ' .
+               ' FROM ' . $GLOBALS['ecs']->table('rm_gallery') .
+               ' WHERE rm_id= '.$_REQUEST['id'].
+               ' Order by img_desc ';
+        $rm_gallery = $GLOBALS['db']->getAll($sql);
+		$smarty->assign('rm_gallery_list',$rm_gallery);
+		$site_name=$GLOBALS['db']->getOne("SELECT cname FROM ".$GLOBALS['ecs']->table('hs_web')." WHERE hs_id=".$site_id);
+		$smarty->assign('title',$site_name."-客房介紹-".$room['name']);
+
+		$smarty->display('in_room.html');
+>>>>>>> bnb
 }
\ No newline at end of file
diff --git a/sitemap.xml b/sitemap.xml
index 7d66f9c..7a69c20 100755
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -8,82 +8,32 @@
 
 <url>
   	<loc>
-  		https://www.yilanbnb.com.tw/
+  		https://www.hualienbnb.com.tw/
 	</loc>
 </url>
 <url>
   	<loc>
-  		https://www.yilanbnb.com.tw/tribe.html
+  		https://www.hualienbnb.com.tw/bohemia.html
 	</loc>
 </url>
 <url>
     <loc>
-      https://www.yilanbnb.com.tw/soshi.html
+      https://www.hualienbnb.com.tw/midouzi.html
   </loc>
 </url>
 <url>
     <loc>
-      https://www.yilanbnb.com.tw/dream.html
+      https://www.hualienbnb.com.tw/treelake.html
   </loc>
 </url>
 <url>
     <loc>
-      https://www.yilanbnb.com.tw/gitucafe.html
+      https://www.hualienbnb.com.tw/cthouse.html
   </loc>
 </url>
 <url>
     <loc>
-      https://www.yilanbnb.com.tw/riverside.html
-  </loc>
-</url>
-<url>
-    <loc>
-      https://www.yilanbnb.com.tw/yilanvilla.html
-  </loc>
-</url>
-<url>
-    <loc>
-      http://www.yilanbnb.com.tw/mood.html
-  </loc>
-</url>
-<url>
-    <loc>
-      https://www.yilanbnb.com.tw/minyu.html
-  </loc>
-</url>
-<url>
-    <loc>
-      https://www.yilanbnb.com.tw/fstreet.html
-  </loc>
-</url>
-<url>
-    <loc>
-      http://www.yilanbnb.com.tw/fish.html
-  </loc>
-</url>
-<url>
-    <loc>
-      http://www.yilanbnb.com.tw/familiarity.html
-  </loc>
-</url>
-<url>
-    <loc>
-      http://www.yilanbnb.com.tw/suiyuanju.html
-  </loc>
-</url>
-<url>
-    <loc>
-      http://www.yilanbnb.com.tw/wujiang.html
-  </loc>
-</url>
-<url>
-    <loc>
-      http://www.yilanbnb.com.tw/kahuwan.html
-  </loc>
-</url>
-<url>
-    <loc>
-      http://www.yilanbnb.com.tw/jingzidi.html
+      https://www.hualienbnb.com.tw/yuemay.html
   </loc>
 </url>
 </urlset>
\ No newline at end of file
diff --git a/themes/vr/portal/portal.html b/themes/vr/portal/portal.html
index 60d6c8c..fda33d9 100755
--- a/themes/vr/portal/portal.html
+++ b/themes/vr/portal/portal.html
@@ -30,7 +30,15 @@
 </nav>
 <div style="display:flex;">
 <div class="hotelslink">
+<<<<<<< HEAD
 <strong class="hotelslinkbut">{$keywords}</strong>
+=======
+
+<strong class="hotelslinkbut">
+	{$category.c1}
+</strong>
+
+>>>>>>> bnb
 <ul>
 <li><a href="/">不分區</a></li>
 <!--{foreach from=$keyword_list item=keyword name=keyword}-->
@@ -38,8 +46,19 @@
 <!--{/foreach}-->
 </ul>
 </div>
+<<<<<<< HEAD
 <!--<div class="bookingArea"><strong class="bookingBtn" href="javascript:;">依景點分類</strong>-->
 <!--<ul>-->
+=======
+
+<div class="bookingArea">
+	<strong class="bookingBtn" href="javascript:;">
+		{$category.c2}
+	</strong>
+
+<ul>
+
+>>>>>>> bnb
 <!--{foreach from=$rnd5_portals_3 item=pts3 name=pts3}-->
 <!--<li><a href="{$http}{$pts3.domain}">{$pts3.name}</a></li>-->
 <!--{/foreach}-->
diff --git a/themes/vr/web/library/page_footer.html b/themes/vr/web/library/page_footer.html
index 85fcaad..681ff69 100755
--- a/themes/vr/web/library/page_footer.html
+++ b/themes/vr/web/library/page_footer.html
@@ -51,6 +51,7 @@
 {if $web.line}
 <a class="fb" href="javascript: void(window.open('{$web.line}');"><i class="fa fa-comment"></i></a>
 {/if}
+
 </div>
 
 <div class="endArea">{$web.ename} © ALL RIGHTS RESERVED.</div>
diff --git a/themes/vr/web/library/page_header.html b/themes/vr/web/library/page_header.html
index 09e93ae..9ebc3e4 100755
--- a/themes/vr/web/library/page_header.html
+++ b/themes/vr/web/library/page_header.html
@@ -38,8 +38,8 @@
 </nav>
 <div class="social">
 {if $web.line}
-<a class="fb" href="{$web.line}" target="_blank"><i class="fa fa-comment"></i></a>
-{/if}    
+    <a class="fb" href="{$web.line}" target="_blank"><i class="fa fa-comment"></i></a>
+{/if}
 <a href="#" class="contactLink" data-mail="{$web.email}"><i class="fa fa-envelope"></i></a>
 <a href="tel:{$web.tel}"><i class="fa fa-phone"></i></a>
 {if $web.facebook}