From 75a19e76387c4baee08c5e447727c06c87843e5a Mon Sep 17 00:00:00 2001
From: Wayne Hsu <wwayne.hsu@gmail.com>
Date: Wed, 17 May 2023 00:39:00 +0800
Subject: [PATCH] =?UTF-8?q?0000372=20=E6=88=BF=E9=96=93=E5=8A=A0=E4=B8=8A?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                   |  2 +-
 back/room.php                | 21 ++++++++++-----------
 back/templates/room_list.htm |  4 ++--
 room.php                     |  2 +-
 4 files changed, 14 insertions(+), 15 deletions(-)

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/room.php b/back/room.php
index 8004b9c..7ef08a6 100755
--- a/back/room.php
+++ b/back/room.php
@@ -266,12 +266,12 @@ elseif ($_REQUEST['act'] == 'insert' || $_REQUEST['act'] == 'update')
                 @unlink('../' . $row['image1']);
             }
         }
-        $original_img   = $image->upload_image($_FILES['image1']); // 原始图片
-        if ($original_img === false)
-        {
-            sys_msg($image->error_msg(), 1, array(), false);
-        }
-        $image1      = $original_img;   // 商品图片
+        $original_img   = $image->upload_image($_FILES['image1']); // 原始图片
+        if ($original_img === false)
+        {
+            sys_msg($image->error_msg(), 1, array(), false);
+        }
+        $image1      = $original_img;   // 商品图片
 		
 	}
 
@@ -664,12 +664,11 @@ elseif ($_REQUEST['act'] == 'toggle_enable')
 /*------------------------------------------------------ */
 elseif ($_REQUEST['act'] == 'edit_sort_order')
 {
-    check_authz_json('room_manage');
-
+    // check_authz_json('room_manage');
     $room_id       = intval($_POST['id']);
     $sort_order     = intval($_POST['val']);
 
-    if ($exc->edit("sort_order = '$sort_order', last_update=" .gmtime(), $room_id))
+    if ($exc->edit("sort_order = '$sort_order', ustamp=" .time(), $room_id))
     {
         clear_cache_files();
         make_json_result($sort_order);
@@ -1594,8 +1593,8 @@ function room_list($id)
         {
             $filter['keyword'] = json_str_iconv($filter['keyword']);
         }
-        $filter['sort_by']          = empty($_REQUEST['sort_by']) ? 'id' : trim($_REQUEST['sort_by']);
-        $filter['sort_order']       = empty($_REQUEST['sort_order']) ? 'DESC' : trim($_REQUEST['sort_order']);
+        $filter['sort_by']          = empty($_REQUEST['sort_by']) ? 'sort_order' : trim($_REQUEST['sort_by']);
+        $filter['sort_order']       = empty($_REQUEST['sort_order']) ? 'ASC' : trim($_REQUEST['sort_order']);
 
         /* 关键字 */
         if (!empty($filter['keyword']))
diff --git a/back/templates/room_list.htm b/back/templates/room_list.htm
index bf639aa..1b53adb 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/room.php b/room.php
index b6c7530..4e2e711 100755
--- a/room.php
+++ b/room.php
@@ -23,7 +23,7 @@ if ($_REQUEST['act'] == 'list')
 //		assign_dynamic('room');
         $sql = 'SELECT * ' .
                ' FROM ' . $GLOBALS['ecs']->table('hs_room') .
-               ' WHERE enable=1 and hs_id= '.$site_id;
+               ' 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);