登录处理

xiaohu thinkpad
.idea/workspace.xml
public/themes/admin_simpleboot3/admin/booking/listing.html
--- a/.idea/workspace.xml
查看文件 @6c2577a
+++ b/.idea/workspace.xml
查看文件 @6c2577a
@@ -3,7 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="03b59864-5835-4588-bfae-54004809f199" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/admin/controller/CommentController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/controller/CommentController.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/booking/listing.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/booking/listing.html" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -17,93 +17,20 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="SignatureHelper.php" pinned="false" current-in-tab="false">
-        <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/SignatureHelper.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-99" />
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="sendSms.php" pinned="false" current-in-tab="false">
-        <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/sendSms.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1344">
-              <caret line="76" selection-start-line="76" selection-end-line="76" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="BookingController.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/app/admin/controller/BookingController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="534">
+            <state relative-caret-position="786">
               <caret line="195" column="31" selection-start-line="195" selection-start-column="31" selection-end-line="195" selection-end-column="31" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="student.html" pinned="false" current-in-tab="false">
-        <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/student.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="468">
-              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="RegController [2].php" pinned="false" current-in-tab="false">
-        <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController [2].php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="279">
-              <caret line="573" column="12" lean-forward="true" selection-start-line="573" selection-start-column="12" selection-end-line="573" selection-end-column="12" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="IndexController.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
+      <file leaf-file-name="listing.html" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/booking/listing.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="188">
-              <caret line="131" column="6" lean-forward="true" selection-start-line="131" selection-start-column="6" selection-end-line="131" selection-end-column="6" />
-              <folding>
-                <element signature="e#628#666#0#PHP" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="LoginController.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="321">
-              <caret line="30" column="78" selection-start-line="30" selection-start-column="78" selection-end-line="30" selection-end-column="78" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="CommentController.php" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/app/admin/controller/CommentController.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="357">
-              <caret line="177" column="24" selection-start-line="177" selection-start-column="24" selection-end-line="177" selection-end-column="24" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="UserBaseController.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="273">
-              <caret line="21" selection-start-line="21" selection-end-line="21" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="confirm_order.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/portal/index/confirm_order.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="357">
-              <caret line="35" column="17" lean-forward="true" selection-start-line="35" selection-start-column="17" selection-end-line="35" selection-end-column="17" />
+            <state relative-caret-position="609">
+              <caret line="59" column="20" selection-start-line="59" selection-start-column="20" selection-end-line="61" selection-end-column="25" />
             </state>
           </provider>
         </entry>
@@ -160,7 +87,6 @@
         <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_huigu.htm" />
         <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_jiuda.htm" />
         <option value="$PROJECT_DIR$/public/themes/simpleboot3/user/order/order_details_1.html" />
-        <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/booking/listing.html" />
         <option value="$PROJECT_DIR$/app/admin/controller/BookingController.php" />
         <option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" />
         <option value="$PROJECT_DIR$/public/index.php" />
@@ -175,6 +101,7 @@
         <option value="$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php" />
         <option value="$PROJECT_DIR$/app/user/controller/LoginController.php" />
         <option value="$PROJECT_DIR$/app/admin/controller/CommentController.php" />
+        <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/booking/listing.html" />
       </list>
     </option>
   </component>
@@ -217,6 +144,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -258,6 +186,30 @@
               <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
               <item name="public" type="462c0819:PsiDirectoryNode" />
               <item name="themes" type="462c0819:PsiDirectoryNode" />
+              <item name="admin_simpleboot3" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
+              <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
+              <item name="public" type="462c0819:PsiDirectoryNode" />
+              <item name="themes" type="462c0819:PsiDirectoryNode" />
+              <item name="admin_simpleboot3" type="462c0819:PsiDirectoryNode" />
+              <item name="admin" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
+              <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
+              <item name="public" type="462c0819:PsiDirectoryNode" />
+              <item name="themes" type="462c0819:PsiDirectoryNode" />
+              <item name="admin_simpleboot3" type="462c0819:PsiDirectoryNode" />
+              <item name="admin" type="462c0819:PsiDirectoryNode" />
+              <item name="booking" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
+              <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
+              <item name="public" type="462c0819:PsiDirectoryNode" />
+              <item name="themes" type="462c0819:PsiDirectoryNode" />
               <item name="simpleboot3" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -299,12 +251,11 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../ThinkCMF" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="nodejs_package_manager_path" value="npm" />
@@ -349,6 +300,7 @@
       <workItem from="1535532970259" duration="2527000" />
       <workItem from="1535546044129" duration="20814000" />
       <workItem from="1535633001243" duration="13825000" />
+      <workItem from="1536152467530" duration="559000" />
     </task>
     <task id="LOCAL-00010" summary="已评价无数据情况">
       <created>1535465766116</created>
@@ -697,13 +649,13 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="68277000" />
+    <option name="totallyTimeSpent" value="68836000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14658849" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14818764" />
       <window_info anchor="bottom" id="TODO" order="6" />
       <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
@@ -730,21 +682,21 @@
       <window_info id="npm" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Run" order="2" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14658849" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.32881355" />
+      <window_info anchor="bottom" id="Version Control" order="11" />
+      <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info anchor="right" id="Database" order="3" />
       <window_info anchor="bottom" id="Terminal" order="9" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info id="Favorites" order="3" side_tool="true" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32881355" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14658849" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -840,27 +792,9 @@
     <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou_acticle.htm" />
     <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_introduct.html" />
     <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou.htm" />
-    <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/database.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="147">
-          <caret line="9" column="21" selection-start-line="9" selection-start-column="21" selection-end-line="9" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/SysconfigController.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="405">
-          <caret line="529" column="42" selection-start-line="529" selection-start-column="38" selection-end-line="529" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/IndexController.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3108">
-          <caret line="158" column="18" lean-forward="true" selection-start-line="158" selection-start-column="18" selection-end-line="158" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/database.php" />
+    <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/SysconfigController.php" />
+    <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/IndexController.php" />
     <entry file="file://$PROJECT_DIR$/app/portal/controller/ToolController.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="420">
@@ -875,52 +809,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_huigu.htm">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="7602">
-          <caret line="362" column="14" selection-start-line="362" selection-start-column="14" selection-end-line="373" selection-end-column="31" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#section#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#2;n#div#0;n#div#0;n#section#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#3;n#div#0;n#div#0;n#section#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#4;n#div#0;n#div#0;n#section#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#5;n#div#0;n#div#0;n#section#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#6;n#div#0;n#div#0;n#section#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/index.htm">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3864">
-          <caret line="184" column="28" selection-start-line="184" selection-start-column="28" selection-end-line="184" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_jiuda.htm">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1932">
-          <caret line="797" column="85" selection-start-line="797" selection-start-column="85" selection-end-line="797" selection-end-column="85" />
-          <folding>
-            <element signature="n#style#0;n#head#0;n#html#0;n#!!top" />
-            <element signature="n#style#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#1;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#img#0;n#div#0;n#div#0;n#a#0;n#div#0;n#div#0;n#div#1;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#2;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#div#0;n#div#0;n#div#2;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#1;n#div#0;n#div#0;n#div#2;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#span#1;n#div#0;n#div#0;n#div#2;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#span#0;n#span#1;n#div#0;n#div#0;n#div#2;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#font#0;n#div#0;n#span#1;n#div#0;n#div#0;n#div#2;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#font#0;n#div#0;n#div#0;n#span#1;n#div#0;n#div#0;n#div#2;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#3;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#a#0;n#div#0;n#div#0;n#div#3;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#ul#0;n#div#0;n#div#1;n#div#0;n#section#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#li#0;n#ul#0;n#div#0;n#div#1;n#div#0;n#section#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_huigu.htm" />
+    <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/index.htm" />
+    <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_jiuda.htm" />
     <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/user/order/my_order.html">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -934,13 +825,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/booking/listing.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="420">
-          <caret line="47" column="44" lean-forward="true" selection-start-line="47" selection-start-column="44" selection-end-line="47" selection-end-column="44" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/portal/index/pay_success.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="420">
@@ -955,11 +839,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="660">
           <caret line="162" column="47" lean-forward="true" selection-start-line="162" selection-start-column="47" selection-end-line="162" selection-end-column="47" />
-          <folding>
-            <element signature="e#636#668#0#PHP" expanded="true" />
-            <element signature="e#17688#17731#0#PHP" />
-            <element signature="e#17688#17779#0#PHP" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -987,40 +866,14 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/SignatureHelper.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-99" />
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/sendSms.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1344">
-          <caret line="76" selection-start-line="76" selection-end-line="76" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2440">
-          <caret line="187" column="40" selection-start-line="187" selection-start-column="40" selection-end-line="187" selection-end-column="40" />
-          <folding>
-            <element signature="e#2713#3721#0#PHP" />
-            <element signature="e#5505#6819#0#PHP" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="126">
-          <caret line="15" column="19" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/SignatureHelper.php" />
+    <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/sendSms.php" />
+    <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController.php" />
+    <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController.php" />
     <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/student.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="468">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+        <state relative-caret-position="1071">
+          <caret line="51" selection-start-line="51" selection-end-line="51" />
         </state>
       </provider>
     </entry>
@@ -1031,13 +884,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/admin/controller/BookingController.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="534">
-          <caret line="195" column="31" selection-start-line="195" selection-start-column="31" selection-end-line="195" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [2].php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="567">
@@ -1045,24 +891,18 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController [2].php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="279">
-          <caret line="573" column="12" lean-forward="true" selection-start-line="573" selection-start-column="12" selection-end-line="573" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController [2].php" />
     <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/portal/index/confirm_order.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="35" column="17" lean-forward="true" selection-start-line="35" selection-start-column="17" selection-end-line="35" selection-end-column="17" />
+        <state relative-caret-position="735">
+          <caret line="35" column="17" selection-start-line="35" selection-start-column="17" selection-end-line="35" selection-end-column="17" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="188">
-          <caret line="131" column="6" lean-forward="true" selection-start-line="131" selection-start-column="6" selection-end-line="131" selection-end-column="6" />
+        <state relative-caret-position="2520">
+          <caret line="131" column="6" selection-start-line="131" selection-start-column="6" selection-end-line="131" selection-end-column="6" />
           <folding>
             <element signature="e#628#666#0#PHP" expanded="true" />
           </folding>
@@ -1078,7 +918,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="321">
+        <state relative-caret-position="399">
           <caret line="30" column="78" selection-start-line="30" selection-start-column="78" selection-end-line="30" selection-end-column="78" />
         </state>
       </provider>
@@ -1086,7 +926,21 @@
     <entry file="file://$PROJECT_DIR$/app/admin/controller/CommentController.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="357">
-          <caret line="177" column="24" selection-start-line="177" selection-start-column="24" selection-end-line="177" selection-end-column="24" />
+          <caret line="177" column="9" lean-forward="true" selection-start-line="177" selection-start-column="9" selection-end-line="177" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/admin/controller/BookingController.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="786">
+          <caret line="195" column="31" selection-start-line="195" selection-start-column="31" selection-end-line="195" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/booking/listing.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="609">
+          <caret line="59" column="20" selection-start-line="59" selection-start-column="20" selection-end-line="61" selection-end-column="25" />
         </state>
       </provider>
     </entry>
--- a/public/themes/admin_simpleboot3/admin/booking/listing.html
查看文件 @6c2577a
+++ b/public/themes/admin_simpleboot3/admin/booking/listing.html
查看文件 @6c2577a
@@ -40,7 +40,7 @@
                 <th width="50">预约时段</th>
                 <th width="50">预定时间</th>
                 <th width="50">状态</th>
-                <!--<th width="120">操作</th>-->
+                <th width="120">操作</th>
             </tr>
             </thead>
             <foreach name="list" item="vo">
@@ -57,10 +57,9 @@
                     </td>
                     <td>{$vo.status|yuyue_status_name}</td>
-                    <!--<td>-->
-                        <!--<a href="{:url('edit',array('id'=>$vo['id']))}">查看/编辑</a>-->
-                        <!--<a href="{:url('delete',array('id'=>$vo['id']))}" class="js-ajax-delete">{:lang('DELETE')}</a>-->
-                    <!--</td>-->
+                    <td>
+                        <a href="{:url('delete',array('id'=>$vo['id']))}" class="js-ajax-delete">{:lang('DELETE')}</a>
+                    </td>
                 </tr>
             </foreach>