wayne/bnbweb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge index

Browse Source
This commit is contained in:
Wayne Hsu 2023-05-17 16:55:39 +08:00
parent b62694245e
commit 33b1ec5808
2 changed files with 0 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
room.php
View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
<?php
define('IN_ECS', true);
@ -56,63 +55,4 @@ 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
}

19
themes/vr/portal/portal.html
View File

@ -30,15 +30,7 @@
</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}-->
@ -46,19 +38,8 @@
<!--{/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}-->