我的订单详情标题

xiaohu thinkpad
.idea/workspace.xml
app/admin/controller/BookingController.php
public/themes/admin_simpleboot3/admin/booking/listing.html
--- a/.idea/workspace.xml
查看文件 @feb17ea
+++ b/.idea/workspace.xml
查看文件 @feb17ea
@@ -3,7 +3,8 @@
   <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$/public/themes/simpleboot3/user/order/order_details_1.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/themes/simpleboot3/user/order/order_details_1.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/admin/controller/BookingController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/controller/BookingController.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" />
@@ -20,132 +21,12 @@
       <file leaf-file-name="YuyueController.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="273">
+            <state relative-caret-position="1092">
               <caret line="65" column="34" selection-start-line="65" selection-start-column="34" selection-end-line="65" selection-end-column="34" />
               <folding>
                 <element signature="e#636#668#0#PHP" expanded="true" />
-                <element signature="e#911#990#0#PHP" />
-                <element signature="e#1015#1432#0#PHP" />
-                <element signature="e#1502#1569#0#PHP" />
-                <element signature="e#2902#4247#0#PHP" />
-                <element signature="e#3375#3420#0#PHP" />
-                <element signature="e#3375#3469#0#PHP" />
-                <element signature="e#3375#3510#0#PHP" />
-                <element signature="e#3375#3553#0#PHP" />
-                <element signature="e#3631#3704#0#PHP" />
-                <element signature="e#4272#8454#0#PHP" />
-                <element signature="e#4379#8447#0#PHP" />
-                <element signature="e#4468#8447#0#PHP" />
-                <element signature="e#4913#5015#0#PHP" />
-                <element signature="e#5338#5425#0#PHP" />
-                <element signature="e#5575#8437#0#PHP" />
-                <element signature="e#6315#7223#0#PHP" />
-                <element signature="e#6623#7205#1#PHP" />
-                <element signature="e#7251#8163#0#PHP" />
-                <element signature="e#7559#8145#1#PHP" />
-                <element signature="e#8351#8437#0#PHP" />
-                <element signature="e#8493#8677#0#PHP" />
-                <element signature="e#8702#9754#0#PHP" />
-                <element signature="e#8958#9003#0#PHP" />
-                <element signature="e#8958#9052#0#PHP" />
-                <element signature="e#8958#9093#0#PHP" />
-                <element signature="e#8958#9136#0#PHP" />
-                <element signature="e#9214#9287#0#PHP" />
-                <element signature="e#9779#10457#0#PHP" />
-                <element signature="e#10482#14397#0#PHP" />
-                <element signature="e#10746#14389#0#PHP" />
-                <element signature="e#10835#14389#0#PHP" />
-                <element signature="e#11279#11366#0#PHP" />
-                <element signature="e#11514#14379#0#PHP" />
-                <element signature="e#12255#13163#0#PHP" />
-                <element signature="e#12563#13145#1#PHP" />
-                <element signature="e#13191#14103#0#PHP" />
-                <element signature="e#13499#14085#1#PHP" />
-                <element signature="e#14293#14379#0#PHP" />
-                <element signature="e#14431#17090#0#PHP" />
-                <element signature="e#14576#14670#0#PHP" />
-                <element signature="e#14689#14731#0#PHP" />
-                <element signature="e#14689#14781#0#PHP" />
-                <element signature="e#14689#14830#0#PHP" />
-                <element signature="e#14689#14900#0#PHP" />
-                <element signature="e#14689#14942#0#PHP" />
-                <element signature="e#14689#14970#0#PHP" />
-                <element signature="e#14989#15032#0#PHP" />
-                <element signature="e#14989#15085#0#PHP" />
-                <element signature="e#14989#15121#0#PHP" />
-                <element signature="e#14989#15194#0#PHP" />
-                <element signature="e#14989#15234#0#PHP" />
-                <element signature="e#15291#15459#0#PHP" />
-                <element signature="e#15333#15449#0#PHP" />
-                <element signature="e#15478#15521#0#PHP" />
-                <element signature="e#15478#15574#0#PHP" />
-                <element signature="e#15478#15625#0#PHP" />
-                <element signature="e#15478#15698#0#PHP" />
-                <element signature="e#15478#15738#0#PHP" />
-                <element signature="e#15805#15848#0#PHP" />
-                <element signature="e#15805#15901#0#PHP" />
-                <element signature="e#15805#15963#0#PHP" />
-                <element signature="e#15805#16036#0#PHP" />
-                <element signature="e#15805#16076#0#PHP" />
-                <element signature="e#16133#16297#0#PHP" />
-                <element signature="e#16177#16287#0#PHP" />
-                <element signature="e#16316#16359#0#PHP" />
-                <element signature="e#16316#16412#0#PHP" />
-                <element signature="e#16316#16463#0#PHP" />
-                <element signature="e#16316#16536#0#PHP" />
-                <element signature="e#16316#16576#0#PHP" />
-                <element signature="e#16642#16710#0#PHP" />
-                <element signature="e#17110#19971#0#PHP" />
-                <element signature="e#17270#17313#0#PHP" />
-                <element signature="e#17270#17361#0#PHP" />
-                <element signature="e#17270#17492#0#PHP" />
-                <element signature="e#17270#17581#0#PHP" />
-                <element signature="e#17270#17621#0#PHP" />
                 <element signature="e#17688#17731#0#PHP" />
                 <element signature="e#17688#17779#0#PHP" />
-                <element signature="e#17688#17910#0#PHP" />
-                <element signature="e#17688#17952#0#PHP" />
-                <element signature="e#17688#18041#0#PHP" />
-                <element signature="e#17688#18081#0#PHP" />
-                <element signature="e#18147#18190#0#PHP" />
-                <element signature="e#18147#18238#0#PHP" />
-                <element signature="e#18147#18369#0#PHP" />
-                <element signature="e#18147#18411#0#PHP" />
-                <element signature="e#18147#18500#0#PHP" />
-                <element signature="e#18147#18540#0#PHP" />
-                <element signature="e#18606#18649#0#PHP" />
-                <element signature="e#18606#18697#0#PHP" />
-                <element signature="e#18606#18828#0#PHP" />
-                <element signature="e#18606#18870#0#PHP" />
-                <element signature="e#18606#18959#0#PHP" />
-                <element signature="e#18606#18999#0#PHP" />
-                <element signature="e#19065#19108#0#PHP" />
-                <element signature="e#19065#19156#0#PHP" />
-                <element signature="e#19065#19287#0#PHP" />
-                <element signature="e#19065#19329#0#PHP" />
-                <element signature="e#19065#19418#0#PHP" />
-                <element signature="e#19065#19458#0#PHP" />
-                <element signature="e#19524#19597#0#PHP" />
-                <element signature="e#19988#23151#0#PHP" />
-                <element signature="e#20080#20160#0#PHP" />
-                <element signature="e#20234#23144#0#PHP" />
-                <element signature="e#20399#23134#0#PHP" />
-                <element signature="e#20504#23120#0#PHP" />
-                <element signature="e#21213#22002#0#PHP" />
-                <element signature="e#21541#21980#1#PHP" />
-                <element signature="e#22034#22823#0#PHP" />
-                <element signature="e#22362#22801#1#PHP" />
-                <element signature="e#23026#23120#0#PHP" />
-                <element signature="e#23168#23642#0#PHP" />
-                <element signature="e#23256#23634#0#PHP" />
-                <element signature="e#23340#23634#0#PHP" />
-                <element signature="e#23449#23624#0#PHP" />
-                <element signature="e#23538#23624#0#PHP" />
-                <element signature="e#23659#24130#0#PHP" />
-                <element signature="e#23746#24123#0#PHP" />
-                <element signature="e#23830#24123#0#PHP" />
-                <element signature="e#23938#24113#0#PHP" />
-                <element signature="e#24027#24113#0#PHP" />
               </folding>
             </state>
           </provider>
@@ -154,11 +35,10 @@
       <file leaf-file-name="hezuo_huigu.htm" pinned="false" current-in-tab="false">
         <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="405">
+            <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#0;n#div#0;n#section#0;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#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" />
@@ -172,7 +52,7 @@
       <file leaf-file-name="hezuo_jiuda.htm" pinned="false" current-in-tab="false">
         <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="489">
+            <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" />
@@ -183,7 +63,6 @@
                 <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="e#43535#43541#0" 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" />
@@ -206,47 +85,47 @@
           <provider selected="true" editor-type-id="text-editor" />
         </entry>
       </file>
-      <file leaf-file-name="order_details_1.html" pinned="false" current-in-tab="true">
+      <file leaf-file-name="order_details_1.html" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/user/order/order_details_1.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="651">
-              <caret line="31" column="7" lean-forward="true" selection-start-line="31" selection-start-column="7" selection-end-line="31" selection-end-column="7" />
+            <state relative-caret-position="315">
+              <caret line="15" column="48" selection-start-line="15" selection-start-column="48" selection-end-line="15" selection-end-column="48" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="index.htm" pinned="false" current-in-tab="false">
-        <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/index.htm">
+      <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="240">
-              <caret line="184" column="28" selection-start-line="184" selection-start-column="28" selection-end-line="184" selection-end-column="46" />
+            <state relative-caret-position="510">
+              <caret line="194" column="20" selection-start-line="194" selection-start-column="20" selection-end-line="194" selection-end-column="20" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ProfileController.php" pinned="false" current-in-tab="false">
-        <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController.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="630">
-              <caret line="38" column="36" lean-forward="true" selection-start-line="38" selection-start-column="36" selection-end-line="38" selection-end-column="36" />
+            <state relative-caret-position="504">
+              <caret line="51" column="65" selection-start-line="51" selection-start-column="65" selection-end-line="51" selection-end-column="65" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ToolController.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/portal/controller/ToolController.php">
+      <file leaf-file-name="index.htm" pinned="false" current-in-tab="false">
+        <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/index.htm">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="420">
-              <caret line="31" column="33" selection-start-line="31" selection-start-column="33" selection-end-line="31" selection-end-column="33" />
+            <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>
       </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="ProfileController.php" pinned="false" current-in-tab="false">
+        <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1134">
-              <caret line="65" column="23" lean-forward="true" selection-start-line="65" selection-start-column="23" selection-end-line="65" selection-end-column="23" />
+            <state relative-caret-position="630">
+              <caret line="38" column="36" selection-start-line="38" selection-start-column="36" selection-end-line="38" selection-end-column="36" />
             </state>
           </provider>
         </entry>
@@ -294,7 +173,6 @@
         <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/login.html" />
         <option value="$PROJECT_DIR$/app/admin/controller/PublicController.php" />
         <option value="$PROJECT_DIR$/app/portal/controller/IndexController.php" />
-        <option value="$PROJECT_DIR$/app/admin/controller/BookingController.php" />
         <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter.html" />
         <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/index2.htm" />
         <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou_acticle.htm" />
@@ -306,6 +184,8 @@
         <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$/app/admin/controller/BookingController.php" />
+        <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/booking/listing.html" />
       </list>
     </option>
   </component>
@@ -348,7 +228,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -359,6 +238,24 @@
             <path>
               <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
               <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
+              <item name="app" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
+              <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
+              <item name="app" 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="app" type="462c0819:PsiDirectoryNode" />
+              <item name="admin" type="462c0819:PsiDirectoryNode" />
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
+              <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
               <item name="public" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -372,15 +269,24 @@
               <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
               <item name="public" type="462c0819:PsiDirectoryNode" />
               <item name="themes" type="462c0819:PsiDirectoryNode" />
-              <item name="simpleboot3" 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="simpleboot3" type="462c0819:PsiDirectoryNode" />
-              <item name="user" 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" />
@@ -388,13 +294,12 @@
               <item name="public" type="462c0819:PsiDirectoryNode" />
               <item name="themes" type="462c0819:PsiDirectoryNode" />
               <item name="simpleboot3" type="462c0819:PsiDirectoryNode" />
-              <item name="user" type="462c0819:PsiDirectoryNode" />
-              <item name="order" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -439,7 +344,8 @@
       <workItem from="1535458114609" duration="13848000" />
       <workItem from="1535514127808" duration="727000" />
       <workItem from="1535532970259" duration="2527000" />
-      <workItem from="1535546044129" duration="18932000" />
+      <workItem from="1535546044129" duration="20814000" />
+      <workItem from="1535633001243" duration="190000" />
     </task>
     <task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
       <created>1535458170068</created>
@@ -623,17 +529,24 @@
       <option name="project" value="LOCAL" />
       <updated>1535561095876</updated>
     </task>
-    <option name="localTasksCounter" value="27" />
+    <task id="LOCAL-00027" summary="我的订单详情标题">
+      <created>1535600080734</created>
+      <option name="number" value="00027" />
+      <option name="presentableId" value="LOCAL-00027" />
+      <option name="project" value="LOCAL" />
+      <updated>1535600080734</updated>
+    </task>
+    <option name="localTasksCounter" value="28" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="52570000" />
+    <option name="totallyTimeSpent" value="54642000" />
   </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.14498934" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14658849" />
       <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" />
@@ -669,16 +582,10 @@
     <MESSAGE value="取消预约短信" />
     <MESSAGE value="ceshi wode jiaolian" />
     <MESSAGE value="测试获取当前时段的老师" />
-    <option name="LAST_COMMIT_MESSAGE" value="测试获取当前时段的老师" />
+    <MESSAGE value="我的订单详情标题" />
+    <option name="LAST_COMMIT_MESSAGE" value="我的订单详情标题" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/api/home/controller/IndexController.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="76">
-          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/api/home/controller/RestController.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-280" />
@@ -831,112 +738,12 @@
         <state relative-caret-position="-1701" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/admin/controller/BookingController.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2898">
-          <caret line="147" selection-start-line="147" selection-end-line="147" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="525">
-          <caret line="25" column="16" selection-start-line="25" selection-start-column="16" selection-end-line="25" selection-end-column="16" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#div#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/index2.htm">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2142">
-          <caret line="102" column="130" selection-start-line="102" selection-start-column="130" selection-end-line="102" selection-end-column="130" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/send_template.log">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2646">
-          <caret line="126" selection-start-line="125" selection-start-column="436" selection-end-line="126" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou_acticle.htm">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1449">
-          <caret line="69" selection-start-line="69" selection-end-line="69" />
-          <folding>
-            <element signature="n#style#0;n#div#2;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/enter_introduct.html">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou.htm">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2772">
-          <caret line="132" column="176" selection-start-line="132" selection-start-column="176" selection-end-line="132" selection-end-column="176" />
-          <folding>
-            <element signature="n#style#0;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#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#div#1;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#p#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;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#em#0;n#p#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;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#strong#0;n#span#0;n#em#0;n#p#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;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#p#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;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#p#3;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;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#p#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#section#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#section#0;n#section#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#section#0;n#section#0;n#section#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#section#0;n#section#0;n#section#0;n#section#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#section#0;n#section#0;n#section#0;n#section#0;n#section#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#p#0;n#section#0;n#section#0;n#section#0;n#section#0;n#section#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;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#strong#0;n#p#0;n#section#0;n#section#0;n#section#0;n#section#0;n#section#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#section#1;n#section#0;n#section#0;n#section#0;n#section#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#section#0;n#section#1;n#section#0;n#section#0;n#section#0;n#section#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#section#1;n#section#1;n#section#0;n#section#0;n#section#0;n#section#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#section#2;n#section#1;n#section#0;n#section#0;n#section#0;n#section#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;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#p#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;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#p#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#section#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#section#0;n#section#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#section#0;n#section#0;n#section#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#section#0;n#section#0;n#section#0;n#section#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#p#0;n#section#0;n#section#0;n#section#0;n#section#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;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#p#0;n#section#0;n#section#0;n#section#0;n#section#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;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#p#2;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;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#p#3;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;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#p#4;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;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#p#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#section#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#section#0;n#section#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#section#0;n#section#0;n#section#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#section#0;n#section#0;n#section#0;n#section#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#section#0;n#section#0;n#section#0;n#section#0;n#section#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#p#0;n#section#0;n#section#0;n#section#0;n#section#0;n#section#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;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#strong#0;n#p#0;n#section#0;n#section#0;n#section#0;n#section#0;n#section#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#section#1;n#section#0;n#section#0;n#section#0;n#section#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#section#0;n#section#1;n#section#0;n#section#0;n#section#0;n#section#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#section#1;n#section#1;n#section#0;n#section#0;n#section#0;n#section#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#section#2;n#section#1;n#section#0;n#section#0;n#section#0;n#section#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#p#1;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;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#p#1;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#section#1;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#section#0;n#section#1;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#section#0;n#section#0;n#section#1;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#section#0;n#section#0;n#section#0;n#section#1;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#p#0;n#section#0;n#section#0;n#section#0;n#section#1;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;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#p#0;n#section#0;n#section#0;n#section#0;n#section#1;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#p#2;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;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#p#2;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;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/enter.html" />
+    <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/index2.htm" />
+    <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/send_template.log" />
+    <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">
@@ -968,156 +775,35 @@
     <entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1134">
-          <caret line="65" column="23" lean-forward="true" selection-start-line="65" selection-start-column="23" selection-end-line="65" selection-end-column="23" />
+          <caret line="65" column="23" selection-start-line="65" selection-start-column="23" selection-end-line="65" selection-end-column="23" />
         </state>
       </provider>
     </entry>
     <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="630">
-          <caret line="38" column="36" lean-forward="true" selection-start-line="38" selection-start-column="36" selection-end-line="38" selection-end-column="36" />
+          <caret line="38" column="36" selection-start-line="38" selection-start-column="36" selection-end-line="38" selection-end-column="36" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="273">
+        <state relative-caret-position="1092">
           <caret line="65" column="34" selection-start-line="65" selection-start-column="34" selection-end-line="65" selection-end-column="34" />
           <folding>
             <element signature="e#636#668#0#PHP" expanded="true" />
-            <element signature="e#911#990#0#PHP" />
-            <element signature="e#1015#1432#0#PHP" />
-            <element signature="e#1502#1569#0#PHP" />
-            <element signature="e#2902#4247#0#PHP" />
-            <element signature="e#3375#3420#0#PHP" />
-            <element signature="e#3375#3469#0#PHP" />
-            <element signature="e#3375#3510#0#PHP" />
-            <element signature="e#3375#3553#0#PHP" />
-            <element signature="e#3631#3704#0#PHP" />
-            <element signature="e#4272#8454#0#PHP" />
-            <element signature="e#4379#8447#0#PHP" />
-            <element signature="e#4468#8447#0#PHP" />
-            <element signature="e#4913#5015#0#PHP" />
-            <element signature="e#5338#5425#0#PHP" />
-            <element signature="e#5575#8437#0#PHP" />
-            <element signature="e#6315#7223#0#PHP" />
-            <element signature="e#6623#7205#1#PHP" />
-            <element signature="e#7251#8163#0#PHP" />
-            <element signature="e#7559#8145#1#PHP" />
-            <element signature="e#8351#8437#0#PHP" />
-            <element signature="e#8493#8677#0#PHP" />
-            <element signature="e#8702#9754#0#PHP" />
-            <element signature="e#8958#9003#0#PHP" />
-            <element signature="e#8958#9052#0#PHP" />
-            <element signature="e#8958#9093#0#PHP" />
-            <element signature="e#8958#9136#0#PHP" />
-            <element signature="e#9214#9287#0#PHP" />
-            <element signature="e#9779#10457#0#PHP" />
-            <element signature="e#10482#14397#0#PHP" />
-            <element signature="e#10746#14389#0#PHP" />
-            <element signature="e#10835#14389#0#PHP" />
-            <element signature="e#11279#11366#0#PHP" />
-            <element signature="e#11514#14379#0#PHP" />
-            <element signature="e#12255#13163#0#PHP" />
-            <element signature="e#12563#13145#1#PHP" />
-            <element signature="e#13191#14103#0#PHP" />
-            <element signature="e#13499#14085#1#PHP" />
-            <element signature="e#14293#14379#0#PHP" />
-            <element signature="e#14431#17090#0#PHP" />
-            <element signature="e#14576#14670#0#PHP" />
-            <element signature="e#14689#14731#0#PHP" />
-            <element signature="e#14689#14781#0#PHP" />
-            <element signature="e#14689#14830#0#PHP" />
-            <element signature="e#14689#14900#0#PHP" />
-            <element signature="e#14689#14942#0#PHP" />
-            <element signature="e#14689#14970#0#PHP" />
-            <element signature="e#14989#15032#0#PHP" />
-            <element signature="e#14989#15085#0#PHP" />
-            <element signature="e#14989#15121#0#PHP" />
-            <element signature="e#14989#15194#0#PHP" />
-            <element signature="e#14989#15234#0#PHP" />
-            <element signature="e#15291#15459#0#PHP" />
-            <element signature="e#15333#15449#0#PHP" />
-            <element signature="e#15478#15521#0#PHP" />
-            <element signature="e#15478#15574#0#PHP" />
-            <element signature="e#15478#15625#0#PHP" />
-            <element signature="e#15478#15698#0#PHP" />
-            <element signature="e#15478#15738#0#PHP" />
-            <element signature="e#15805#15848#0#PHP" />
-            <element signature="e#15805#15901#0#PHP" />
-            <element signature="e#15805#15963#0#PHP" />
-            <element signature="e#15805#16036#0#PHP" />
-            <element signature="e#15805#16076#0#PHP" />
-            <element signature="e#16133#16297#0#PHP" />
-            <element signature="e#16177#16287#0#PHP" />
-            <element signature="e#16316#16359#0#PHP" />
-            <element signature="e#16316#16412#0#PHP" />
-            <element signature="e#16316#16463#0#PHP" />
-            <element signature="e#16316#16536#0#PHP" />
-            <element signature="e#16316#16576#0#PHP" />
-            <element signature="e#16642#16710#0#PHP" />
-            <element signature="e#17110#19971#0#PHP" />
-            <element signature="e#17270#17313#0#PHP" />
-            <element signature="e#17270#17361#0#PHP" />
-            <element signature="e#17270#17492#0#PHP" />
-            <element signature="e#17270#17581#0#PHP" />
-            <element signature="e#17270#17621#0#PHP" />
             <element signature="e#17688#17731#0#PHP" />
             <element signature="e#17688#17779#0#PHP" />
-            <element signature="e#17688#17910#0#PHP" />
-            <element signature="e#17688#17952#0#PHP" />
-            <element signature="e#17688#18041#0#PHP" />
-            <element signature="e#17688#18081#0#PHP" />
-            <element signature="e#18147#18190#0#PHP" />
-            <element signature="e#18147#18238#0#PHP" />
-            <element signature="e#18147#18369#0#PHP" />
-            <element signature="e#18147#18411#0#PHP" />
-            <element signature="e#18147#18500#0#PHP" />
-            <element signature="e#18147#18540#0#PHP" />
-            <element signature="e#18606#18649#0#PHP" />
-            <element signature="e#18606#18697#0#PHP" />
-            <element signature="e#18606#18828#0#PHP" />
-            <element signature="e#18606#18870#0#PHP" />
-            <element signature="e#18606#18959#0#PHP" />
-            <element signature="e#18606#18999#0#PHP" />
-            <element signature="e#19065#19108#0#PHP" />
-            <element signature="e#19065#19156#0#PHP" />
-            <element signature="e#19065#19287#0#PHP" />
-            <element signature="e#19065#19329#0#PHP" />
-            <element signature="e#19065#19418#0#PHP" />
-            <element signature="e#19065#19458#0#PHP" />
-            <element signature="e#19524#19597#0#PHP" />
-            <element signature="e#19988#23151#0#PHP" />
-            <element signature="e#20080#20160#0#PHP" />
-            <element signature="e#20234#23144#0#PHP" />
-            <element signature="e#20399#23134#0#PHP" />
-            <element signature="e#20504#23120#0#PHP" />
-            <element signature="e#21213#22002#0#PHP" />
-            <element signature="e#21541#21980#1#PHP" />
-            <element signature="e#22034#22823#0#PHP" />
-            <element signature="e#22362#22801#1#PHP" />
-            <element signature="e#23026#23120#0#PHP" />
-            <element signature="e#23168#23642#0#PHP" />
-            <element signature="e#23256#23634#0#PHP" />
-            <element signature="e#23340#23634#0#PHP" />
-            <element signature="e#23449#23624#0#PHP" />
-            <element signature="e#23538#23624#0#PHP" />
-            <element signature="e#23659#24130#0#PHP" />
-            <element signature="e#23746#24123#0#PHP" />
-            <element signature="e#23830#24123#0#PHP" />
-            <element signature="e#23938#24113#0#PHP" />
-            <element signature="e#24027#24113#0#PHP" />
           </folding>
         </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="405">
+        <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#0;n#div#0;n#section#0;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#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" />
@@ -1129,14 +815,14 @@
     </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="240">
+        <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="489">
+        <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" />
@@ -1147,7 +833,6 @@
             <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="e#43535#43541#0" 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" />
@@ -1167,8 +852,22 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/user/order/order_details_1.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="651">
-          <caret line="31" column="7" lean-forward="true" selection-start-line="31" selection-start-column="7" selection-end-line="31" selection-end-column="7" />
+        <state relative-caret-position="315">
+          <caret line="15" column="48" selection-start-line="15" selection-start-column="48" selection-end-line="15" selection-end-column="48" />
+        </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="510">
+          <caret line="194" column="20" selection-start-line="194" selection-start-column="20" selection-end-line="194" selection-end-column="20" />
+        </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="504">
+          <caret line="51" column="65" selection-start-line="51" selection-start-column="65" selection-end-line="51" selection-end-column="65" />
         </state>
       </provider>
     </entry>
--- a/app/admin/controller/BookingController.php
查看文件 @feb17ea
+++ b/app/admin/controller/BookingController.php
查看文件 @feb17ea
@@ -192,6 +192,7 @@ class BookingController extends AdminBaseController
         }
         $where['yy.create_time'] = array('gt',0);
+        $where['yy.yid'] = array('gt',0);
         $list = DB::name('yuyue')
             ->alias('yy')
             ->join('qnb_user u','u.id=yy.teach_id')
--- a/public/themes/admin_simpleboot3/admin/booking/listing.html
查看文件 @feb17ea
+++ b/public/themes/admin_simpleboot3/admin/booking/listing.html
查看文件 @feb17ea
@@ -48,8 +48,8 @@
                     <td><b>{$vo.id}</b></td>
                     <td>{$vo.user_nickname}</td>
                     <td>{$vo.uid|id_name}</td>
-                    <td>{$vo.yuyue_day1}</td>
-                    <td>{$vo.yuyue_hour1}</td>
+                    <td>{$vo.yuyue_day}</td>
+                    <td>{$vo.yuyue_begin}:00 - {$vo.yuyue_end}:00</td>
                     <td>
                         <notempty name="vo.create_time">
                             {:date('Y-m-d H:i',$vo['create_time'])}