外包项目 / signUpForCar · 提交

转到一个项目

作者 654550265
提交 518e1510e490878283bc50a5133c58ae276120cb 2 个父辈 500088b0 3c694df8

Merge branch 'master' of http://114.215.101.231:8099/outsource/signUpForCar

内嵌 并排对比
正在显示 6 个修改的文件 包含 624 行增加 和 567 行删除
@@ -4,7 +4,6 @@ @@ -4,7 +4,6 @@
4 <list default="true" id="03b59864-5835-4588-bfae-54004809f199" name="Default" comment=""> 4 <list default="true" id="03b59864-5835-4588-bfae-54004809f199" name="Default" comment="">
5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 <change beforePath="$PROJECT_DIR$/app/user/controller/CommentController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/user/controller/CommentController.php" afterDir="false" /> 6 <change beforePath="$PROJECT_DIR$/app/user/controller/CommentController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/user/controller/CommentController.php" afterDir="false" />
7 - <change beforePath="$PROJECT_DIR$/app/user/controller/YuyueController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/user/controller/YuyueController.php" afterDir="false" />  
8 </list> 7 </list>
9 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
10 <option name="TRACKING_ENABLED" value="true" /> 9 <option name="TRACKING_ENABLED" value="true" />
@@ -16,13 +15,141 @@ @@ -16,13 +15,141 @@
16 <component name="ComposerSettings" doNotAsk="true" synchronizationState="SYNCHRONIZE"> 15 <component name="ComposerSettings" doNotAsk="true" synchronizationState="SYNCHRONIZE">
17 <pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath> 16 <pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
18 </component> 17 </component>
  18 + <component name="DatabaseView">
  19 + <option name="SHOW_INTERMEDIATE" value="true" />
  20 + <option name="GROUP_DATA_SOURCES" value="true" />
  21 + <option name="GROUP_SCHEMA" value="true" />
  22 + <option name="GROUP_CONTENTS" value="false" />
  23 + <option name="SORT_POSITIONED" value="false" />
  24 + <option name="SHOW_EMPTY_GROUPS" value="false" />
  25 + <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
  26 + <option name="HIDDEN_KINDS">
  27 + <set />
  28 + </option>
  29 + <expand />
  30 + <select />
  31 + </component>
19 <component name="FileEditorManager"> 32 <component name="FileEditorManager">
20 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 33 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
  34 + <file leaf-file-name="22.html" pinned="false" current-in-tab="false">
  35 + <entry file="file://$USER_HOME$/Desktop/开发资料/temp/22.html">
  36 + <provider selected="true" editor-type-id="text-editor">
  37 + <state relative-caret-position="21">
  38 + <caret line="573" column="31" selection-start-line="573" selection-start-column="31" selection-end-line="573" selection-end-column="31" />
  39 + <folding>
  40 + <element signature="n#style#0;n#head#0;n#html#0;n#!!top" />
  41 + <element signature="n#script#5;n#head#0;n#html#0;n#!!top" />
  42 + <element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  43 + <element signature="n#style#0;n#span#1;n#li#1;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  44 + <element signature="n#style#0;n#span#1;n#li#2;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  45 + <element signature="n#style#0;n#input#1;n#span#1;n#li#2;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  46 + <element signature="n#style#0;n#input#2;n#span#1;n#li#2;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  47 + <element signature="n#style#0;n#span#1;n#li#3;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  48 + <element signature="n#style#0;n#span#1;n#li#4;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  49 + <element signature="n#style#0;n#span#1;n#li#5;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  50 + <element signature="n#style#0;n#span#1;n#li#6;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  51 + <element signature="n#style#0;n#span#1;n#li#7;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  52 + <element signature="n#style#0;n#span#1;n#li#8;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  53 + <element signature="n#style#0;n#span#1;n#li#9;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  54 + <element signature="n#style#0;n#span#1;n#li#10;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  55 + <element signature="n#style#0;n#span#1;n#li#11;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  56 + <element signature="n#style#0;n#span#2;n#li#11;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  57 + <element signature="n#style#0;n#li#12;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  58 + <element signature="n#style#0;n#span#1;n#li#12;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  59 + <element signature="n#style#0;n#span#1;n#li#13;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  60 + <element signature="n#style#0;n#span#1;n#li#14;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  61 + <element signature="n#style#0;n#li#15;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  62 + <element signature="n#style#0;n#span#1;n#li#15;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  63 + <element signature="n#style#0;n#li#16;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  64 + <element signature="n#style#0;n#span#1;n#li#16;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  65 + <element signature="n#style#0;n#li#17;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  66 + <element signature="n#style#0;n#span#1;n#li#17;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  67 + <element signature="n#style#0;n#li#20;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  68 + <element signature="n#style#0;n#li#21;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  69 + <element signature="n#style#0;n#span#1;n#li#21;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  70 + <element signature="n#style#0;n#li#22;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  71 + <element signature="n#style#0;n#span#1;n#li#22;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  72 + <element signature="n#style#0;n#li#23;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  73 + <element signature="n#style#0;n#span#1;n#li#23;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  74 + <element signature="n#style#0;n#li#24;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  75 + <element signature="n#style#0;n#span#1;n#li#24;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  76 + <element signature="n#style#0;n#span#2;n#li#24;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  77 + <element signature="n#style#0;n#span#3;n#li#24;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  78 + <element signature="n#style#0;n#span#4;n#li#24;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  79 + <element signature="n#style#0;n#li#25;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  80 + <element signature="n#style#0;n#span#1;n#li#25;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  81 + <element signature="n#style#0;n#div#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  82 + </folding>
  83 + </state>
  84 + </provider>
  85 + </entry>
  86 + </file>
  87 + <file leaf-file-name="CommentController.php" pinned="false" current-in-tab="true">
  88 + <entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
  89 + <provider selected="true" editor-type-id="text-editor">
  90 + <state relative-caret-position="315">
  91 + <caret line="49" column="9" selection-start-line="49" selection-start-column="9" selection-end-line="49" selection-end-column="9" />
  92 + <folding>
  93 + <element signature="e#821#1437#0#PHP" />
  94 + <element signature="e#982#1035#0#PHP" />
  95 + <element signature="e#1543#1618#0#PHP" />
  96 + <element signature="e#2165#2309#0#PHP" />
  97 + <element signature="e#2237#2309#0#PHP" />
  98 + <element signature="e#3208#4141#0#PHP" />
  99 + <element signature="e#3305#3358#0#PHP" />
  100 + <element signature="e#3398#3441#0#PHP" />
  101 + <element signature="e#3398#3492#0#PHP" />
  102 + <element signature="e#3398#3551#0#PHP" />
  103 + <element signature="e#3398#3587#0#PHP" />
  104 + <element signature="e#3680#3722#0#PHP" />
  105 + <element signature="e#3680#3773#0#PHP" />
  106 + <element signature="e#3680#3840#0#PHP" />
  107 + <element signature="e#3680#3870#0#PHP" />
  108 + <element signature="e#4164#5267#0#PHP" />
  109 + <element signature="e#4264#4317#0#PHP" />
  110 + <element signature="e#4357#4400#0#PHP" />
  111 + <element signature="e#4357#4457#0#PHP" />
  112 + <element signature="e#4357#4516#0#PHP" />
  113 + <element signature="e#4357#4552#0#PHP" />
  114 + <element signature="e#4655#4697#0#PHP" />
  115 + <element signature="e#4655#4748#0#PHP" />
  116 + <element signature="e#4655#4815#0#PHP" />
  117 + <element signature="e#4655#4845#0#PHP" />
  118 + <element signature="e#5292#6190#0#PHP" />
  119 + <element signature="e#5479#5522#0#PHP" />
  120 + <element signature="e#5479#5574#0#PHP" />
  121 + <element signature="e#5479#5619#0#PHP" />
  122 + <element signature="e#5479#5662#0#PHP" />
  123 + <element signature="e#5479#5747#0#PHP" />
  124 + <element signature="e#5479#5783#0#PHP" />
  125 + <element signature="e#5824#5871#0#PHP" />
  126 + <element signature="e#5824#5928#0#PHP" />
  127 + <element signature="e#5824#5997#0#PHP" />
  128 + <element signature="e#5824#6032#0#PHP" />
  129 + <element signature="e#6504#7386#0#PHP" />
  130 + <element signature="e#6730#7380#0#PHP" />
  131 + <element signature="e#7141#7301#0#PHP" />
  132 + <element signature="e#7221#7301#0#PHP" />
  133 + <element signature="e#7311#7380#0#PHP" />
  134 + </folding>
  135 + </state>
  136 + </provider>
  137 + </entry>
  138 + </file>
  139 + <file leaf-file-name="ProfileController.php" pinned="false" current-in-tab="false">
  140 + <entry file="file://$PROJECT_DIR$/app/user/controller/ProfileController.php">
  141 + <provider selected="true" editor-type-id="text-editor">
  142 + <state relative-caret-position="-4368">
  143 + <caret line="43" column="8" lean-forward="true" selection-start-line="43" selection-start-column="8" selection-end-line="47" selection-end-column="51" />
  144 + </state>
  145 + </provider>
  146 + </entry>
  147 + </file>
21 <file leaf-file-name="YuyueController.php" pinned="false" current-in-tab="false"> 148 <file leaf-file-name="YuyueController.php" pinned="false" current-in-tab="false">
22 <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php"> 149 <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
23 <provider selected="true" editor-type-id="text-editor"> 150 <provider selected="true" editor-type-id="text-editor">
24 - <state relative-caret-position="-63">  
25 - <caret line="482" column="22" lean-forward="true" selection-start-line="482" selection-start-column="22" selection-end-line="482" selection-end-column="22" /> 151 + <state relative-caret-position="210">
  152 + <caret line="427" column="5" lean-forward="true" selection-start-line="427" selection-start-column="5" selection-end-line="427" selection-end-column="5" />
26 <folding> 153 <folding>
27 <element signature="e#910#989#0#PHP" /> 154 <element signature="e#910#989#0#PHP" />
28 <element signature="e#1014#1431#0#PHP" /> 155 <element signature="e#1014#1431#0#PHP" />
@@ -64,6 +191,8 @@ @@ -64,6 +191,8 @@
64 <element signature="e#12841#13753#0#PHP" /> 191 <element signature="e#12841#13753#0#PHP" />
65 <element signature="e#13149#13735#1#PHP" /> 192 <element signature="e#13149#13735#1#PHP" />
66 <element signature="e#13943#14029#0#PHP" /> 193 <element signature="e#13943#14029#0#PHP" />
  194 + <element signature="e#14081#16740#0#PHP" />
  195 + <element signature="e#14226#14320#0#PHP" />
67 <element signature="e#14339#14381#0#PHP" /> 196 <element signature="e#14339#14381#0#PHP" />
68 <element signature="e#14339#14431#0#PHP" /> 197 <element signature="e#14339#14431#0#PHP" />
69 <element signature="e#14339#14480#0#PHP" /> 198 <element signature="e#14339#14480#0#PHP" />
@@ -75,6 +204,8 @@ @@ -75,6 +204,8 @@
75 <element signature="e#14639#14771#0#PHP" /> 204 <element signature="e#14639#14771#0#PHP" />
76 <element signature="e#14639#14844#0#PHP" /> 205 <element signature="e#14639#14844#0#PHP" />
77 <element signature="e#14639#14884#0#PHP" /> 206 <element signature="e#14639#14884#0#PHP" />
  207 + <element signature="e#14941#15109#0#PHP" />
  208 + <element signature="e#14983#15099#0#PHP" />
78 <element signature="e#15128#15171#0#PHP" /> 209 <element signature="e#15128#15171#0#PHP" />
79 <element signature="e#15128#15224#0#PHP" /> 210 <element signature="e#15128#15224#0#PHP" />
80 <element signature="e#15128#15275#0#PHP" /> 211 <element signature="e#15128#15275#0#PHP" />
@@ -82,117 +213,118 @@ @@ -82,117 +213,118 @@
82 <element signature="e#15128#15388#0#PHP" /> 213 <element signature="e#15128#15388#0#PHP" />
83 <element signature="e#15455#15498#0#PHP" /> 214 <element signature="e#15455#15498#0#PHP" />
84 <element signature="e#15455#15551#0#PHP" /> 215 <element signature="e#15455#15551#0#PHP" />
  216 + <element signature="e#15455#15613#0#PHP" />
85 <element signature="e#15455#15686#0#PHP" /> 217 <element signature="e#15455#15686#0#PHP" />
86 <element signature="e#15455#15726#0#PHP" /> 218 <element signature="e#15455#15726#0#PHP" />
  219 + <element signature="e#15783#15947#0#PHP" />
  220 + <element signature="e#15827#15937#0#PHP" />
87 <element signature="e#15966#16009#0#PHP" /> 221 <element signature="e#15966#16009#0#PHP" />
88 <element signature="e#15966#16062#0#PHP" /> 222 <element signature="e#15966#16062#0#PHP" />
89 <element signature="e#15966#16113#0#PHP" /> 223 <element signature="e#15966#16113#0#PHP" />
90 <element signature="e#15966#16186#0#PHP" /> 224 <element signature="e#15966#16186#0#PHP" />
91 <element signature="e#15966#16226#0#PHP" /> 225 <element signature="e#15966#16226#0#PHP" />
  226 + <element signature="e#16276#16311#0#PHP" />
  227 + <element signature="e#16448#16521#0#PHP" />
  228 + <element signature="e#16448#16587#0#PHP" />
  229 + <element signature="e#16760#19526#0#PHP" />
92 <element signature="e#16920#16963#0#PHP" /> 230 <element signature="e#16920#16963#0#PHP" />
93 <element signature="e#16920#17011#0#PHP" /> 231 <element signature="e#16920#17011#0#PHP" />
94 <element signature="e#16920#17052#0#PHP" /> 232 <element signature="e#16920#17052#0#PHP" />
95 <element signature="e#16920#17141#0#PHP" /> 233 <element signature="e#16920#17141#0#PHP" />
96 <element signature="e#16920#17181#0#PHP" /> 234 <element signature="e#16920#17181#0#PHP" />
97 - <element signature="e#17249#17292#0#PHP" />  
98 - <element signature="e#17249#17340#0#PHP" />  
99 - <element signature="e#17249#17381#0#PHP" />  
100 - <element signature="e#17249#17423#0#PHP" />  
101 - <element signature="e#17249#17512#0#PHP" />  
102 - <element signature="e#17249#17552#0#PHP" />  
103 - <element signature="e#17618#17661#0#PHP" />  
104 - <element signature="e#17618#17709#0#PHP" />  
105 - <element signature="e#17618#17750#0#PHP" />  
106 - <element signature="e#17618#17792#0#PHP" />  
107 - <element signature="e#17618#17881#0#PHP" />  
108 - <element signature="e#17618#17921#0#PHP" />  
109 - <element signature="e#17987#18030#0#PHP" />  
110 - <element signature="e#17987#18078#0#PHP" />  
111 - <element signature="e#17987#18119#0#PHP" />  
112 - <element signature="e#17987#18250#0#PHP" />  
113 - <element signature="e#17987#18290#0#PHP" />  
114 - <element signature="e#18356#18399#0#PHP" />  
115 - <element signature="e#18356#18447#0#PHP" />  
116 - <element signature="e#18356#18488#0#PHP" />  
117 - <element signature="e#18356#18530#0#PHP" />  
118 - <element signature="e#18356#18619#0#PHP" />  
119 - <element signature="e#18356#18659#0#PHP" />  
120 - <element signature="e#18725#18798#0#PHP" />  
121 - <element signature="e#19189#22352#0#PHP" />  
122 - <element signature="e#19281#19361#0#PHP" />  
123 - <element signature="e#19435#22345#0#PHP" />  
124 - <element signature="e#19600#22335#0#PHP" />  
125 - <element signature="e#19705#22321#0#PHP" />  
126 - <element signature="e#20414#21203#0#PHP" />  
127 - <element signature="e#20742#21181#1#PHP" />  
128 - <element signature="e#21235#22024#0#PHP" />  
129 - <element signature="e#21563#22002#1#PHP" />  
130 - <element signature="e#22227#22321#0#PHP" />  
131 - <element signature="e#22369#22843#0#PHP" />  
132 - <element signature="e#22457#22835#0#PHP" />  
133 - <element signature="e#22541#22835#0#PHP" />  
134 - <element signature="e#22650#22825#0#PHP" />  
135 - <element signature="e#22739#22825#0#PHP" />  
136 - <element signature="e#22860#23331#0#PHP" />  
137 - <element signature="e#22947#23324#0#PHP" />  
138 - <element signature="e#23031#23324#0#PHP" />  
139 - <element signature="e#23139#23314#0#PHP" />  
140 - <element signature="e#23228#23314#0#PHP" /> 235 + <element signature="e#17238#17405#0#PHP" />
  236 + <element signature="e#17280#17395#0#PHP" />
  237 + <element signature="e#17424#17467#0#PHP" />
  238 + <element signature="e#17424#17515#0#PHP" />
  239 + <element signature="e#17424#17556#0#PHP" />
  240 + <element signature="e#17424#17598#0#PHP" />
  241 + <element signature="e#17424#17687#0#PHP" />
  242 + <element signature="e#17424#17727#0#PHP" />
  243 + <element signature="e#17793#17836#0#PHP" />
  244 + <element signature="e#17793#17884#0#PHP" />
  245 + <element signature="e#17793#17925#0#PHP" />
  246 + <element signature="e#17793#17967#0#PHP" />
  247 + <element signature="e#17793#18056#0#PHP" />
  248 + <element signature="e#17793#18096#0#PHP" />
  249 + <element signature="e#18162#18205#0#PHP" />
  250 + <element signature="e#18162#18253#0#PHP" />
  251 + <element signature="e#18162#18294#0#PHP" />
  252 + <element signature="e#18162#18345#0#PHP" />
  253 + <element signature="e#18162#18434#0#PHP" />
  254 + <element signature="e#18162#18474#0#PHP" />
  255 + <element signature="e#18531#18692#0#PHP" />
  256 + <element signature="e#18574#18682#0#PHP" />
  257 + <element signature="e#18710#18753#0#PHP" />
  258 + <element signature="e#18710#18801#0#PHP" />
  259 + <element signature="e#18710#18842#0#PHP" />
  260 + <element signature="e#18710#18884#0#PHP" />
  261 + <element signature="e#18710#18973#0#PHP" />
  262 + <element signature="e#18710#19013#0#PHP" />
  263 + <element signature="e#19302#19337#0#PHP" />
  264 + <element signature="e#19479#19552#0#PHP" />
  265 + <element signature="e#19479#19618#0#PHP" />
  266 + <element signature="e#19543#22706#0#PHP" />
  267 + <element signature="e#19635#19715#0#PHP" />
  268 + <element signature="e#19789#22699#0#PHP" />
  269 + <element signature="e#19954#22689#0#PHP" />
  270 + <element signature="e#20059#22675#0#PHP" />
  271 + <element signature="e#20768#21557#0#PHP" />
  272 + <element signature="e#21096#21535#1#PHP" />
  273 + <element signature="e#21589#22378#0#PHP" />
  274 + <element signature="e#21917#22356#1#PHP" />
  275 + <element signature="e#22581#22675#0#PHP" />
  276 + <element signature="e#22723#23197#0#PHP" />
  277 + <element signature="e#22811#23189#0#PHP" />
  278 + <element signature="e#22895#23189#0#PHP" />
  279 + <element signature="e#23004#23179#0#PHP" />
  280 + <element signature="e#23093#23179#0#PHP" />
  281 + <element signature="e#23214#23685#0#PHP" />
  282 + <element signature="e#23301#23678#0#PHP" />
  283 + <element signature="e#23385#23678#0#PHP" />
  284 + <element signature="e#23493#23668#0#PHP" />
  285 + <element signature="e#23582#23668#0#PHP" />
141 </folding> 286 </folding>
142 </state> 287 </state>
143 </provider> 288 </provider>
144 </entry> 289 </entry>
145 </file> 290 </file>
146 - <file leaf-file-name="CommentController.php" pinned="false" current-in-tab="true">  
147 - <entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php"> 291 + <file leaf-file-name="student.html" pinned="false" current-in-tab="false">
  292 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/user/student.html">
148 <provider selected="true" editor-type-id="text-editor"> 293 <provider selected="true" editor-type-id="text-editor">
149 - <state relative-caret-position="550">  
150 - <caret line="191" column="18" lean-forward="true" selection-start-line="191" selection-start-column="18" selection-end-line="191" selection-end-column="18" />  
151 - <folding>  
152 - <element signature="e#821#1437#0#PHP" />  
153 - <element signature="e#982#1035#0#PHP" />  
154 - <element signature="e#1455#2315#0#PHP" />  
155 - <element signature="e#1543#1618#0#PHP" />  
156 - <element signature="e#2165#2309#0#PHP" />  
157 - <element signature="e#2237#2309#0#PHP" />  
158 - <element signature="e#2332#3161#0#PHP" />  
159 - <element signature="e#2413#2488#0#PHP" />  
160 - <element signature="e#3011#3155#0#PHP" />  
161 - <element signature="e#3083#3155#0#PHP" />  
162 - <element signature="e#3185#4118#0#PHP" />  
163 - <element signature="e#3282#3335#0#PHP" />  
164 - <element signature="e#3375#3418#0#PHP" />  
165 - <element signature="e#3375#3469#0#PHP" />  
166 - <element signature="e#3375#3528#0#PHP" />  
167 - <element signature="e#3375#3564#0#PHP" />  
168 - <element signature="e#3657#3699#0#PHP" />  
169 - <element signature="e#3657#3750#0#PHP" />  
170 - <element signature="e#3657#3817#0#PHP" />  
171 - <element signature="e#3657#3847#0#PHP" />  
172 - <element signature="e#4141#5244#0#PHP" />  
173 - <element signature="e#4241#4294#0#PHP" />  
174 - <element signature="e#4334#4377#0#PHP" />  
175 - <element signature="e#4334#4434#0#PHP" />  
176 - <element signature="e#4334#4493#0#PHP" />  
177 - <element signature="e#4334#4529#0#PHP" />  
178 - <element signature="e#4632#4674#0#PHP" />  
179 - <element signature="e#4632#4725#0#PHP" />  
180 - <element signature="e#4632#4792#0#PHP" />  
181 - <element signature="e#4632#4822#0#PHP" />  
182 - <element signature="e#5269#6167#0#PHP" />  
183 - <element signature="e#5456#5499#0#PHP" />  
184 - <element signature="e#5456#5551#0#PHP" />  
185 - <element signature="e#5456#5596#0#PHP" />  
186 - <element signature="e#5456#5639#0#PHP" />  
187 - <element signature="e#5456#5724#0#PHP" />  
188 - <element signature="e#5456#5760#0#PHP" />  
189 - <element signature="e#5801#5848#0#PHP" />  
190 - <element signature="e#5801#5905#0#PHP" />  
191 - <element signature="e#5801#5974#0#PHP" />  
192 - <element signature="e#5801#6009#0#PHP" />  
193 - <element signature="e#6173#6452#0#PHP" />  
194 - <element signature="e#7244#7313#0#PHP" />  
195 - </folding> 294 + <state relative-caret-position="567">
  295 + <caret line="43" column="29" lean-forward="true" selection-start-line="43" selection-start-column="29" selection-end-line="43" selection-end-column="29" />
  296 + </state>
  297 + </provider>
  298 + </entry>
  299 + </file>
  300 + <file leaf-file-name="common.php" pinned="false" current-in-tab="false">
  301 + <entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
  302 + <provider selected="true" editor-type-id="text-editor">
  303 + <state relative-caret-position="796">
  304 + <caret line="2103" column="43" selection-start-line="2103" selection-start-column="43" selection-end-line="2103" selection-end-column="43" />
  305 + </state>
  306 + </provider>
  307 + </entry>
  308 + </file>
  309 + <file leaf-file-name="helper.php" pinned="false" current-in-tab="false">
  310 + <entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php">
  311 + <provider selected="true" editor-type-id="text-editor">
  312 + <state relative-caret-position="297">
  313 + <caret line="458" column="13" selection-start-line="458" selection-start-column="13" selection-end-line="458" selection-end-column="13" />
  314 + </state>
  315 + </provider>
  316 + </entry>
  317 + </file>
  318 + <file leaf-file-name="refund.php" pinned="false" current-in-tab="false">
  319 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/refund.php">
  320 + <provider selected="true" editor-type-id="text-editor" />
  321 + </entry>
  322 + </file>
  323 + <file leaf-file-name="WxPay.Config.php" pinned="false" current-in-tab="false">
  324 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/WxPay.Config.php">
  325 + <provider selected="true" editor-type-id="text-editor">
  326 + <state relative-caret-position="468">
  327 + <caret line="104" column="85" lean-forward="true" selection-start-line="104" selection-start-column="85" selection-end-line="104" selection-end-column="85" />
196 </state> 328 </state>
197 </provider> 329 </provider>
198 </entry> 330 </entry>
@@ -200,8 +332,8 @@ @@ -200,8 +332,8 @@
200 <file leaf-file-name="index.php" pinned="false" current-in-tab="false"> 332 <file leaf-file-name="index.php" pinned="false" current-in-tab="false">
201 <entry file="file://$PROJECT_DIR$/public/index.php"> 333 <entry file="file://$PROJECT_DIR$/public/index.php">
202 <provider selected="true" editor-type-id="text-editor"> 334 <provider selected="true" editor-type-id="text-editor">
203 - <state relative-caret-position="252">  
204 - <caret line="18" column="38" lean-forward="true" selection-start-line="18" selection-start-column="38" selection-end-line="18" selection-end-column="38" /> 335 + <state relative-caret-position="210">
  336 + <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
205 </state> 337 </state>
206 </provider> 338 </provider>
207 </entry> 339 </entry>
@@ -224,6 +356,7 @@ @@ -224,6 +356,7 @@
224 <find>imageUrlPrefix</find> 356 <find>imageUrlPrefix</find>
225 <find>$otherid</find> 357 <find>$otherid</find>
226 <find>commente1</find> 358 <find>commente1</find>
  359 + <find>id_xueshi</find>
227 </findStrings> 360 </findStrings>
228 <dirStrings> 361 <dirStrings>
229 <dir>$PROJECT_DIR$/../07-08-voyager/your-project-name</dir> 362 <dir>$PROJECT_DIR$/../07-08-voyager/your-project-name</dir>
@@ -236,9 +369,6 @@ @@ -236,9 +369,6 @@
236 <component name="IdeDocumentHistory"> 369 <component name="IdeDocumentHistory">
237 <option name="CHANGED_PATHS"> 370 <option name="CHANGED_PATHS">
238 <list> 371 <list>
239 - <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/zhaopin_lianxi.htm" />  
240 - <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/zhaopin_center.htm" />  
241 - <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/style.css" />  
242 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/xinwen_acticle.htm" /> 372 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/xinwen_acticle.htm" />
243 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_jiuda.htm" /> 373 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_jiuda.htm" />
244 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_huigu.htm" /> 374 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_huigu.htm" />
@@ -256,8 +386,6 @@ @@ -256,8 +386,6 @@
256 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/https_www.ishowx.com.conf" /> 386 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/https_www.ishowx.com.conf" />
257 <option value="$PROJECT_DIR$/public/themes/simpleboot3/user/yuyue/my_yuyue_coach.html" /> 387 <option value="$PROJECT_DIR$/public/themes/simpleboot3/user/yuyue/my_yuyue_coach.html" />
258 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/OrderController.php" /> 388 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/OrderController.php" />
259 - <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [4].php" />  
260 - <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/common.php" />  
261 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/sucai.html" /> 389 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/sucai.html" />
262 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/data_edit.html" /> 390 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/data_edit.html" />
263 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/data_list.html" /> 391 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/data_list.html" />
@@ -284,7 +412,12 @@ @@ -284,7 +412,12 @@
284 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/PublicController.php" /> 412 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/PublicController.php" />
285 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [8].php" /> 413 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [8].php" />
286 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/PublicController [2].php" /> 414 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/PublicController [2].php" />
  415 + <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/common.php" />
  416 + <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [4].php" />
  417 + <option value="$USER_HOME$/Desktop/开发资料/temp/22.html" />
  418 + <option value="$PROJECT_DIR$/simplewind/cmf/common.php" />
287 <option value="$PROJECT_DIR$/public/index.php" /> 419 <option value="$PROJECT_DIR$/public/index.php" />
  420 + <option value="$PROJECT_DIR$/app/user/controller/ProfileController.php" />
288 <option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" /> 421 <option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" />
289 <option value="$PROJECT_DIR$/app/user/controller/CommentController.php" /> 422 <option value="$PROJECT_DIR$/app/user/controller/CommentController.php" />
290 </list> 423 </list>
@@ -320,10 +453,10 @@ @@ -320,10 +453,10 @@
320 </include_path> 453 </include_path>
321 </component> 454 </component>
322 <component name="ProjectFrameBounds" extendedState="6"> 455 <component name="ProjectFrameBounds" extendedState="6">
323 - <option name="x" value="-10" />  
324 - <option name="y" value="-10" />  
325 - <option name="width" value="1939" />  
326 - <option name="height" value="1049" /> 456 + <option name="x" value="-9" />
  457 + <option name="y" value="-9" />
  458 + <option name="width" value="1938" />
  459 + <option name="height" value="1098" />
327 </component> 460 </component>
328 <component name="ProjectView"> 461 <component name="ProjectView">
329 <navigator proportions="" version="1"> 462 <navigator proportions="" version="1">
@@ -355,6 +488,22 @@ @@ -355,6 +488,22 @@
355 <item name="user" type="462c0819:PsiDirectoryNode" /> 488 <item name="user" type="462c0819:PsiDirectoryNode" />
356 <item name="controller" type="462c0819:PsiDirectoryNode" /> 489 <item name="controller" type="462c0819:PsiDirectoryNode" />
357 </path> 490 </path>
  491 + <path>
  492 + <item name="dm161xueche" type="b2602c69:ProjectViewProjectNode" />
  493 + <item name="dm161xueche" type="462c0819:PsiDirectoryNode" />
  494 + <item name="public" type="462c0819:PsiDirectoryNode" />
  495 + </path>
  496 + <path>
  497 + <item name="dm161xueche" type="b2602c69:ProjectViewProjectNode" />
  498 + <item name="dm161xueche" type="462c0819:PsiDirectoryNode" />
  499 + <item name="simplewind" type="462c0819:PsiDirectoryNode" />
  500 + </path>
  501 + <path>
  502 + <item name="dm161xueche" type="b2602c69:ProjectViewProjectNode" />
  503 + <item name="dm161xueche" type="462c0819:PsiDirectoryNode" />
  504 + <item name="simplewind" type="462c0819:PsiDirectoryNode" />
  505 + <item name="cmf" type="462c0819:PsiDirectoryNode" />
  506 + </path>
358 </expand> 507 </expand>
359 <select /> 508 <select />
360 </subPane> 509 </subPane>
@@ -412,112 +561,8 @@ @@ -412,112 +561,8 @@
412 <workItem from="1536152467530" duration="16624000" /> 561 <workItem from="1536152467530" duration="16624000" />
413 <workItem from="1536326693570" duration="30018000" /> 562 <workItem from="1536326693570" duration="30018000" />
414 <workItem from="1536496471879" duration="16852000" /> 563 <workItem from="1536496471879" duration="16852000" />
415 - <workItem from="1536677895835" duration="1253000" />  
416 - </task>  
417 - <task id="LOCAL-00015" summary="ceshi wode jiaolian">  
418 - <created>1535546534569</created>  
419 - <option name="number" value="00015" />  
420 - <option name="presentableId" value="LOCAL-00015" />  
421 - <option name="project" value="LOCAL" />  
422 - <updated>1535546534569</updated>  
423 - </task>  
424 - <task id="LOCAL-00016" summary="ceshi wode jiaolian">  
425 - <created>1535546965523</created>  
426 - <option name="number" value="00016" />  
427 - <option name="presentableId" value="LOCAL-00016" />  
428 - <option name="project" value="LOCAL" />  
429 - <updated>1535546965523</updated>  
430 - </task>  
431 - <task id="LOCAL-00017" summary="ceshi wode jiaolian">  
432 - <created>1535547118071</created>  
433 - <option name="number" value="00017" />  
434 - <option name="presentableId" value="LOCAL-00017" />  
435 - <option name="project" value="LOCAL" />  
436 - <updated>1535547118071</updated>  
437 - </task>  
438 - <task id="LOCAL-00018" summary="ceshi wode jiaolian">  
439 - <created>1535548842017</created>  
440 - <option name="number" value="00018" />  
441 - <option name="presentableId" value="LOCAL-00018" />  
442 - <option name="project" value="LOCAL" />  
443 - <updated>1535548842017</updated>  
444 - </task>  
445 - <task id="LOCAL-00019" summary="测试获取当前时段的老师">  
446 - <created>1535559377550</created>  
447 - <option name="number" value="00019" />  
448 - <option name="presentableId" value="LOCAL-00019" />  
449 - <option name="project" value="LOCAL" />  
450 - <updated>1535559377550</updated>  
451 - </task>  
452 - <task id="LOCAL-00020" summary="测试获取当前时段的老师">  
453 - <created>1535559508443</created>  
454 - <option name="number" value="00020" />  
455 - <option name="presentableId" value="LOCAL-00020" />  
456 - <option name="project" value="LOCAL" />  
457 - <updated>1535559508443</updated>  
458 - </task>  
459 - <task id="LOCAL-00021" summary="测试获取当前时段的老师">  
460 - <created>1535559794285</created>  
461 - <option name="number" value="00021" />  
462 - <option name="presentableId" value="LOCAL-00021" />  
463 - <option name="project" value="LOCAL" />  
464 - <updated>1535559794285</updated>  
465 - </task>  
466 - <task id="LOCAL-00022" summary="测试获取当前时段的老师">  
467 - <created>1535559978125</created>  
468 - <option name="number" value="00022" />  
469 - <option name="presentableId" value="LOCAL-00022" />  
470 - <option name="project" value="LOCAL" />  
471 - <updated>1535559978125</updated>  
472 - </task>  
473 - <task id="LOCAL-00023" summary="测试获取当前时段的老师">  
474 - <created>1535560263207</created>  
475 - <option name="number" value="00023" />  
476 - <option name="presentableId" value="LOCAL-00023" />  
477 - <option name="project" value="LOCAL" />  
478 - <updated>1535560263207</updated>  
479 - </task>  
480 - <task id="LOCAL-00024" summary="测试获取当前时段的老师">  
481 - <created>1535560747816</created>  
482 - <option name="number" value="00024" />  
483 - <option name="presentableId" value="LOCAL-00024" />  
484 - <option name="project" value="LOCAL" />  
485 - <updated>1535560747819</updated>  
486 - </task>  
487 - <task id="LOCAL-00025" summary="测试获取当前时段的老师">  
488 - <created>1535560861762</created>  
489 - <option name="number" value="00025" />  
490 - <option name="presentableId" value="LOCAL-00025" />  
491 - <option name="project" value="LOCAL" />  
492 - <updated>1535560861762</updated>  
493 - </task>  
494 - <task id="LOCAL-00026" summary="测试获取当前时段的老师">  
495 - <created>1535561095876</created>  
496 - <option name="number" value="00026" />  
497 - <option name="presentableId" value="LOCAL-00026" />  
498 - <option name="project" value="LOCAL" />  
499 - <updated>1535561095876</updated>  
500 - </task>  
501 - <task id="LOCAL-00027" summary="我的订单详情标题">  
502 - <created>1535600080734</created>  
503 - <option name="number" value="00027" />  
504 - <option name="presentableId" value="LOCAL-00027" />  
505 - <option name="project" value="LOCAL" />  
506 - <updated>1535600080734</updated>  
507 - </task>  
508 - <task id="LOCAL-00028" summary="我的订单详情标题">  
509 - <created>1535633219778</created>  
510 - <option name="number" value="00028" />  
511 - <option name="presentableId" value="LOCAL-00028" />  
512 - <option name="project" value="LOCAL" />  
513 - <updated>1535633219778</updated>  
514 - </task>  
515 - <task id="LOCAL-00029" summary="我的订单详情标题">  
516 - <created>1535633983516</created>  
517 - <option name="number" value="00029" />  
518 - <option name="presentableId" value="LOCAL-00029" />  
519 - <option name="project" value="LOCAL" />  
520 - <updated>1535633983516</updated> 564 + <workItem from="1536677895835" duration="7811000" />
  565 + <workItem from="1536940132237" duration="9678000" />
521 </task> 566 </task>
522 <task id="LOCAL-00030" summary="我的订单详情标题"> 567 <task id="LOCAL-00030" summary="我的订单详情标题">
523 <created>1535634119952</created> 568 <created>1535634119952</created>
@@ -757,21 +802,126 @@ @@ -757,21 +802,126 @@
757 <option name="project" value="LOCAL" /> 802 <option name="project" value="LOCAL" />
758 <updated>1536517797514</updated> 803 <updated>1536517797514</updated>
759 </task> 804 </task>
760 - <option name="localTasksCounter" value="64" /> 805 + <task id="LOCAL-00064" summary="预约时间错误">
  806 + <created>1536679162719</created>
  807 + <option name="number" value="00064" />
  808 + <option name="presentableId" value="LOCAL-00064" />
  809 + <option name="project" value="LOCAL" />
  810 + <updated>1536679162719</updated>
  811 + </task>
  812 + <task id="LOCAL-00065" summary="统计学时问题修复">
  813 + <created>1536976333614</created>
  814 + <option name="number" value="00065" />
  815 + <option name="presentableId" value="LOCAL-00065" />
  816 + <option name="project" value="LOCAL" />
  817 + <updated>1536976333615</updated>
  818 + </task>
  819 + <task id="LOCAL-00066" summary="统计学时问题修复">
  820 + <created>1536977008226</created>
  821 + <option name="number" value="00066" />
  822 + <option name="presentableId" value="LOCAL-00066" />
  823 + <option name="project" value="LOCAL" />
  824 + <updated>1536977008226</updated>
  825 + </task>
  826 + <task id="LOCAL-00067" summary="统计学时问题修复">
  827 + <created>1536977579249</created>
  828 + <option name="number" value="00067" />
  829 + <option name="presentableId" value="LOCAL-00067" />
  830 + <option name="project" value="LOCAL" />
  831 + <updated>1536977579249</updated>
  832 + </task>
  833 + <task id="LOCAL-00068" summary="统计学时问题修复">
  834 + <created>1536977777123</created>
  835 + <option name="number" value="00068" />
  836 + <option name="presentableId" value="LOCAL-00068" />
  837 + <option name="project" value="LOCAL" />
  838 + <updated>1536977777123</updated>
  839 + </task>
  840 + <task id="LOCAL-00069" summary="统计学时问题修复">
  841 + <created>1536979269191</created>
  842 + <option name="number" value="00069" />
  843 + <option name="presentableId" value="LOCAL-00069" />
  844 + <option name="project" value="LOCAL" />
  845 + <updated>1536979269191</updated>
  846 + </task>
  847 + <task id="LOCAL-00070" summary="统计学时问题修复">
  848 + <created>1536979616129</created>
  849 + <option name="number" value="00070" />
  850 + <option name="presentableId" value="LOCAL-00070" />
  851 + <option name="project" value="LOCAL" />
  852 + <updated>1536979616129</updated>
  853 + </task>
  854 + <task id="LOCAL-00071" summary="统计学时问题修复">
  855 + <created>1536979859742</created>
  856 + <option name="number" value="00071" />
  857 + <option name="presentableId" value="LOCAL-00071" />
  858 + <option name="project" value="LOCAL" />
  859 + <updated>1536979859742</updated>
  860 + </task>
  861 + <task id="LOCAL-00072" summary="统计学时问题修复">
  862 + <created>1536980014690</created>
  863 + <option name="number" value="00072" />
  864 + <option name="presentableId" value="LOCAL-00072" />
  865 + <option name="project" value="LOCAL" />
  866 + <updated>1536980014691</updated>
  867 + </task>
  868 + <task id="LOCAL-00073" summary="统计学时问题修复">
  869 + <created>1536980110186</created>
  870 + <option name="number" value="00073" />
  871 + <option name="presentableId" value="LOCAL-00073" />
  872 + <option name="project" value="LOCAL" />
  873 + <updated>1536980110187</updated>
  874 + </task>
  875 + <task id="LOCAL-00074" summary="统计学时问题修复">
  876 + <created>1536980231752</created>
  877 + <option name="number" value="00074" />
  878 + <option name="presentableId" value="LOCAL-00074" />
  879 + <option name="project" value="LOCAL" />
  880 + <updated>1536980231752</updated>
  881 + </task>
  882 + <task id="LOCAL-00075" summary="统计学时问题修复">
  883 + <created>1536980337690</created>
  884 + <option name="number" value="00075" />
  885 + <option name="presentableId" value="LOCAL-00075" />
  886 + <option name="project" value="LOCAL" />
  887 + <updated>1536980337690</updated>
  888 + </task>
  889 + <task id="LOCAL-00076" summary="统计学时问题修复">
  890 + <created>1536980477645</created>
  891 + <option name="number" value="00076" />
  892 + <option name="presentableId" value="LOCAL-00076" />
  893 + <option name="project" value="LOCAL" />
  894 + <updated>1536980477646</updated>
  895 + </task>
  896 + <task id="LOCAL-00077" summary="统计学时问题修复">
  897 + <created>1536981518980</created>
  898 + <option name="number" value="00077" />
  899 + <option name="presentableId" value="LOCAL-00077" />
  900 + <option name="project" value="LOCAL" />
  901 + <updated>1536981518980</updated>
  902 + </task>
  903 + <task id="LOCAL-00078" summary="统计学时问题修复">
  904 + <created>1536983829524</created>
  905 + <option name="number" value="00078" />
  906 + <option name="presentableId" value="LOCAL-00078" />
  907 + <option name="project" value="LOCAL" />
  908 + <updated>1536983829524</updated>
  909 + </task>
  910 + <option name="localTasksCounter" value="79" />
761 <servers /> 911 <servers />
762 </component> 912 </component>
763 <component name="TimeTrackingManager"> 913 <component name="TimeTrackingManager">
764 - <option name="totallyTimeSpent" value="133024000" /> 914 + <option name="totallyTimeSpent" value="149260000" />
765 </component> 915 </component>
766 <component name="ToolWindowManager"> 916 <component name="ToolWindowManager">
767 <frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> 917 <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
768 <editor active="true" /> 918 <editor active="true" />
769 <layout> 919 <layout>
770 - <window_info content_ui="combo" id="Project" order="0" weight="0.23927614" /> 920 + <window_info content_ui="combo" id="Project" order="0" weight="0.16085792" />
771 <window_info anchor="bottom" id="TODO" order="6" /> 921 <window_info anchor="bottom" id="TODO" order="6" />
772 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> 922 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
773 <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" /> 923 <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
774 - <window_info anchor="right" id="Database" order="3" /> 924 + <window_info anchor="right" id="Database" order="3" weight="0.32995737" />
775 <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" /> 925 <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
776 <window_info anchor="bottom" id="Version Control" order="7" weight="0.3293348" /> 926 <window_info anchor="bottom" id="Version Control" order="7" weight="0.3293348" />
777 <window_info anchor="bottom" id="Run" order="2" /> 927 <window_info anchor="bottom" id="Run" order="2" />
@@ -792,22 +942,22 @@ @@ -792,22 +942,22 @@
792 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> 942 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
793 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> 943 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
794 <window_info id="npm" order="2" side_tool="true" /> 944 <window_info id="npm" order="2" side_tool="true" />
795 - <window_info anchor="bottom" id="Run" order="2" />  
796 - <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> 945 + <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
797 <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14658849" /> 946 <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14658849" />
798 <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> 947 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
799 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> 948 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
800 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> 949 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
801 <window_info anchor="bottom" id="TODO" order="6" /> 950 <window_info anchor="bottom" id="TODO" order="6" />
802 - <window_info anchor="bottom" id="Find" order="1" weight="0.32881355" />  
803 - <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> 951 + <window_info anchor="bottom" id="Version Control" order="11" />
  952 + <window_info anchor="bottom" id="Run" order="2" />
  953 + <window_info anchor="bottom" id="Message" order="0" />
804 <window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> 954 <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
805 <window_info anchor="right" id="Database" order="3" /> 955 <window_info anchor="right" id="Database" order="3" />
806 <window_info anchor="bottom" id="Terminal" order="9" /> 956 <window_info anchor="bottom" id="Terminal" order="9" />
807 <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" /> 957 <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
808 <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" /> 958 <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
809 - <window_info anchor="bottom" id="Version Control" order="11" />  
810 - <window_info anchor="bottom" id="Message" order="0" /> 959 + <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
  960 + <window_info anchor="bottom" id="Find" order="1" weight="0.32881355" />
811 <window_info id="Favorites" order="3" side_tool="true" /> 961 <window_info id="Favorites" order="3" side_tool="true" />
812 </layout-to-restore> 962 </layout-to-restore>
813 </component> 963 </component>
@@ -828,7 +978,8 @@ @@ -828,7 +978,8 @@
828 <MESSAGE value="我的订单详情标题" /> 978 <MESSAGE value="我的订单详情标题" />
829 <MESSAGE value="登录处理" /> 979 <MESSAGE value="登录处理" />
830 <MESSAGE value="预约时间错误" /> 980 <MESSAGE value="预约时间错误" />
831 - <option name="LAST_COMMIT_MESSAGE" value="预约时间错误" /> 981 + <MESSAGE value="统计学时问题修复" />
  982 + <option name="LAST_COMMIT_MESSAGE" value="统计学时问题修复" />
832 </component> 983 </component>
833 <component name="XDebuggerManager"> 984 <component name="XDebuggerManager">
834 <breakpoint-manager> 985 <breakpoint-manager>
@@ -836,14 +987,6 @@ @@ -836,14 +987,6 @@
836 </breakpoint-manager> 987 </breakpoint-manager>
837 </component> 988 </component>
838 <component name="editorHistoryManager"> 989 <component name="editorHistoryManager">
839 - <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/user/yuyue/my_yuyue.html" />  
840 - <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/user/yuyue/my_yuyue_coach.html" />  
841 - <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/OrderController.php" />  
842 - <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [4].php" />  
843 - <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/sucai.html" />  
844 - <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/common.php" />  
845 - <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/kemu.html" />  
846 - <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/data_edit [2].html" />  
847 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/data_edit.html" /> 990 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/data_edit.html" />
848 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/data_addpic.html" /> 991 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/data_addpic.html" />
849 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/BannerController.php" /> 992 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/BannerController.php" />
@@ -874,216 +1017,12 @@ @@ -874,216 +1017,12 @@
874 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/BannerController [2].php" /> 1017 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/BannerController [2].php" />
875 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/CommentController.php" /> 1018 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/CommentController.php" />
876 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [7].php" /> 1019 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [7].php" />
877 - <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController.php">  
878 - <provider selected="true" editor-type-id="text-editor">  
879 - <state relative-caret-position="1617">  
880 - <caret line="224" column="49" selection-start-line="224" selection-start-column="49" selection-end-line="224" selection-end-column="49" />  
881 - </state>  
882 - </provider>  
883 - </entry>  
884 - <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [3].php">  
885 - <provider selected="true" editor-type-id="text-editor">  
886 - <state relative-caret-position="5502">  
887 - <caret line="873" column="26" selection-start-line="873" selection-start-column="26" selection-end-line="873" selection-end-column="26" />  
888 - <folding>  
889 - <element signature="e#635#1068#0#PHP" />  
890 - <element signature="e#768#821#0#PHP" />  
891 - <element signature="e#962#1062#0#PHP" />  
892 - <element signature="e#1015#1062#0#PHP" />  
893 - <element signature="e#1087#2128#0#PHP" />  
894 - <element signature="e#1159#1321#1#PHP" />  
895 - <element signature="e#1333#1584#0#PHP" />  
896 - <element signature="e#1352#1583#1#PHP" />  
897 - <element signature="e#1636#1726#0#PHP" />  
898 - <element signature="e#1865#1978#0#PHP" />  
899 - <element signature="e#2148#3263#0#PHP" />  
900 - <element signature="e#2218#2349#1#PHP" />  
901 - <element signature="e#2361#2615#0#PHP" />  
902 - <element signature="e#2380#2614#1#PHP" />  
903 - <element signature="e#2667#2757#0#PHP" />  
904 - <element signature="e#2891#2964#0#PHP" />  
905 - <element signature="e#3065#3132#0#PHP" />  
906 - <element signature="e#3284#4421#0#PHP" />  
907 - <element signature="e#3355#3476#1#PHP" />  
908 - <element signature="e#3488#3685#0#PHP" />  
909 - <element signature="e#3507#3684#1#PHP" />  
910 - <element signature="e#3737#3827#0#PHP" />  
911 - <element signature="e#3837#3929#0#PHP" />  
912 - <element signature="e#4054#4124#0#PHP" />  
913 - <element signature="e#4226#4293#0#PHP" />  
914 - <element signature="e#4427#6322#0#PHP" />  
915 - <element signature="e#4503#5603#0#PHP" />  
916 - <element signature="e#4794#5545#0#PHP" />  
917 - <element signature="e#4908#5545#0#PHP" />  
918 - <element signature="e#5117#5208#0#PHP" />  
919 - <element signature="e#5225#5531#0#PHP" />  
920 - <element signature="e#5415#5531#0#PHP" />  
921 - <element signature="e#5637#6316#0#PHP" />  
922 - <element signature="e#5853#5932#0#PHP" />  
923 - <element signature="e#5946#6058#0#PHP" />  
924 - <element signature="e#6167#6306#0#PHP" />  
925 - <element signature="e#6247#6306#0#PHP" />  
926 - <element signature="e#6328#6349#0#PHP" />  
927 - <element signature="e#6354#9214#0#PHP" />  
928 - <element signature="e#6426#9208#0#PHP" />  
929 - <element signature="e#6559#6632#0#PHP" />  
930 - <element signature="e#7550#9145#0#PHP" />  
931 - <element signature="e#7609#7705#0#PHP" />  
932 - <element signature="e#7805#9071#0#PHP" />  
933 - <element signature="e#7850#8620#0#PHP" />  
934 - <element signature="e#7933#8598#0#PHP" />  
935 - <element signature="e#8621#8649#0#PHP" />  
936 - <element signature="e#9001#9071#0#PHP" />  
937 - <element signature="e#9086#9145#0#PHP" />  
938 - <element signature="e#9156#9208#0#PHP" />  
939 - <element signature="e#9220#9241#0#PHP" />  
940 - <element signature="e#9246#12077#0#PHP" />  
941 - <element signature="e#9319#12071#0#PHP" />  
942 - <element signature="e#9452#9524#0#PHP" />  
943 - <element signature="e#10328#12008#0#PHP" />  
944 - <element signature="e#10356#10452#0#PHP" />  
945 - <element signature="e#10670#11934#0#PHP" />  
946 - <element signature="e#10715#11486#0#PHP" />  
947 - <element signature="e#10798#11463#0#PHP" />  
948 - <element signature="e#11507#11513#0#PHP" />  
949 - <element signature="e#11864#11934#0#PHP" />  
950 - <element signature="e#11949#12008#0#PHP" />  
951 - <element signature="e#12019#12071#0#PHP" />  
952 - <element signature="e#12083#12104#0#PHP" />  
953 - <element signature="e#12109#14966#0#PHP" />  
954 - <element signature="e#12180#14960#0#PHP" />  
955 - <element signature="e#12313#12385#0#PHP" />  
956 - <element signature="e#13333#14897#0#PHP" />  
957 - <element signature="e#13361#13457#0#PHP" />  
958 - <element signature="e#13557#14823#0#PHP" />  
959 - <element signature="e#13602#14373#0#PHP" />  
960 - <element signature="e#13685#14350#0#PHP" />  
961 - <element signature="e#14374#14402#0#PHP" />  
962 - <element signature="e#14753#14823#0#PHP" />  
963 - <element signature="e#14838#14897#0#PHP" />  
964 - <element signature="e#14908#14960#0#PHP" />  
965 - <element signature="e#14972#15262#0#PHP" />  
966 - <element signature="e#15117#15254#0#PHP" />  
967 - <element signature="e#15202#15254#0#PHP" />  
968 - <element signature="e#15268#16957#0#PHP" />  
969 - <element signature="e#15845#16025#0#PHP" />  
970 - <element signature="e#15912#15973#0#PHP" />  
971 - <element signature="e#15974#16025#0#PHP" />  
972 - <element signature="e#16132#16191#0#PHP" />  
973 - <element signature="e#16333#16949#0#PHP" />  
974 - <element signature="e#16897#16949#0#PHP" />  
975 - <element signature="e#16963#17681#0#PHP" />  
976 - <element signature="e#17078#17171#0#PHP" />  
977 - <element signature="e#17240#17532#0#PHP" />  
978 - <element signature="e#17286#17342#0#PHP" />  
979 - <element signature="e#17286#17378#0#PHP" />  
980 - <element signature="e#17417#17522#0#PHP" />  
981 - <element signature="e#17472#17522#0#PHP" />  
982 - <element signature="e#17544#17673#0#PHP" />  
983 - <element signature="e#17621#17673#0#PHP" />  
984 - <element signature="e#17687#18198#0#PHP" />  
985 - <element signature="e#17863#17915#0#PHP" />  
986 - <element signature="e#17863#17973#0#PHP" />  
987 - <element signature="e#17863#18001#0#PHP" />  
988 - <element signature="e#18059#18190#0#PHP" />  
989 - <element signature="e#18138#18190#0#PHP" />  
990 - <element signature="e#18204#19187#0#PHP" />  
991 - <element signature="e#18464#18797#0#PHP" />  
992 - <element signature="e#18558#18787#0#PHP" />  
993 - <element signature="e#18726#18787#0#PHP" />  
994 - <element signature="e#18975#19181#0#PHP" />  
995 - <element signature="e#19129#19181#0#PHP" />  
996 - <element signature="e#19193#21216#0#PHP" />  
997 - <element signature="e#19550#20522#0#PHP" />  
998 - <element signature="e#19590#19641#0#PHP" />  
999 - <element signature="e#19590#19698#0#PHP" />  
1000 - <element signature="e#19590#19772#0#PHP" />  
1001 - <element signature="e#19590#19839#0#PHP" />  
1002 - <element signature="e#19590#19931#0#PHP" />  
1003 - <element signature="e#19590#19977#0#PHP" />  
1004 - <element signature="e#20009#20471#0#PHP" />  
1005 - <element signature="e#20053#20104#0#PHP" />  
1006 - <element signature="e#20053#20161#0#PHP" />  
1007 - <element signature="e#20053#20234#0#PHP" />  
1008 - <element signature="e#20053#20301#0#PHP" />  
1009 - <element signature="e#20053#20393#0#PHP" />  
1010 - <element signature="e#20053#20439#0#PHP" />  
1011 - <element signature="e#20471#20522#0#PHP" />  
1012 - <element signature="e#20535#21081#0#PHP" />  
1013 - <element signature="e#20840#20961#0#PHP" />  
1014 - <element signature="e#20974#21070#0#PHP" />  
1015 - <element signature="e#21091#21210#0#PHP" />  
1016 - <element signature="e#21158#21210#0#PHP" />  
1017 - <element signature="e#21222#21742#0#PHP" />  
1018 - <element signature="e#21623#21736#0#PHP" />  
1019 - <element signature="e#21682#21736#0#PHP" />  
1020 - <element signature="e#21748#22020#0#PHP" />  
1021 - <element signature="e#21895#22014#0#PHP" />  
1022 - <element signature="e#21960#22014#0#PHP" />  
1023 - <element signature="e#22268#22347#0#PHP" />  
1024 - </folding>  
1025 - </state>  
1026 - </provider>  
1027 - </entry>  
1028 - <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController [2].php">  
1029 - <provider selected="true" editor-type-id="text-editor">  
1030 - <state relative-caret-position="105">  
1031 - <caret line="146" column="5" lean-forward="true" selection-start-line="146" selection-start-column="5" selection-end-line="146" selection-end-column="5" />  
1032 - <folding>  
1033 - <element signature="e#724#2784#0#PHP" />  
1034 - <element signature="e#813#871#0#PHP" />  
1035 - <element signature="e#1041#1174#0#PHP" />  
1036 - <element signature="e#1183#1329#0#PHP" />  
1037 - <element signature="e#1338#1481#0#PHP" />  
1038 - <element signature="e#1678#1720#0#PHP" />  
1039 - <element signature="e#1678#1780#0#PHP" />  
1040 - <element signature="e#1678#1835#0#PHP" />  
1041 - <element signature="e#1678#1905#0#PHP" />  
1042 - <element signature="e#1678#2011#0#PHP" />  
1043 - <element signature="e#1678#2039#0#PHP" />  
1044 - <element signature="e#1678#2072#0#PHP" />  
1045 - <element signature="e#2185#2729#0#PHP" />  
1046 - <element signature="e#2485#2718#0#PHP" />  
1047 - <element signature="e#2606#2704#0#PHP" />  
1048 - <element signature="e#2789#3798#0#PHP" />  
1049 - <element signature="e#2964#3006#0#PHP" />  
1050 - <element signature="e#2964#3066#0#PHP" />  
1051 - <element signature="e#2964#3121#0#PHP" />  
1052 - <element signature="e#2964#3191#0#PHP" />  
1053 - <element signature="e#2964#3297#0#PHP" />  
1054 - <element signature="e#2964#3325#0#PHP" />  
1055 - <element signature="e#3367#3412#0#PHP" />  
1056 - <element signature="e#3367#3464#0#PHP" />  
1057 - <element signature="e#3367#3500#0#PHP" />  
1058 - <element signature="e#3367#3554#0#PHP" />  
1059 - <element signature="e#3611#3706#0#PHP" />  
1060 - <element signature="e#3812#5652#0#PHP" />  
1061 - <element signature="e#3901#4034#0#PHP" />  
1062 - <element signature="e#4043#4189#0#PHP" />  
1063 - <element signature="e#4198#4318#0#PHP" />  
1064 - <element signature="e#4650#4692#0#PHP" />  
1065 - <element signature="e#4650#4753#0#PHP" />  
1066 - <element signature="e#4650#4808#0#PHP" />  
1067 - <element signature="e#4650#4884#0#PHP" />  
1068 - <element signature="e#4650#4912#0#PHP" />  
1069 - <element signature="e#4971#5596#0#PHP" />  
1070 - <element signature="e#5009#5585#0#PHP" />  
1071 - <element signature="e#5328#5456#0#PHP" />  
1072 - <element signature="e#5473#5571#0#PHP" />  
1073 - <element signature="e#5832#5874#0#PHP" />  
1074 - <element signature="e#5832#5942#0#PHP" />  
1075 - <element signature="e#5832#6004#0#PHP" />  
1076 - <element signature="e#5832#6080#0#PHP" />  
1077 - <element signature="e#5832#6108#0#PHP" />  
1078 - <element signature="e#6431#6533#0#PHP" />  
1079 - </folding>  
1080 - </state>  
1081 - </provider>  
1082 - </entry> 1020 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController.php" />
  1021 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [3].php" />
  1022 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController [2].php" />
1083 <entry file="file://$PROJECT_DIR$/public/jsapi_ticket.json" /> 1023 <entry file="file://$PROJECT_DIR$/public/jsapi_ticket.json" />
1084 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController [3].php" /> 1024 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController [3].php" />
1085 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [5].php" /> 1025 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [5].php" />
1086 - <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/WxPay.Config.php" />  
1087 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/edit_single.html" /> 1026 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/edit_single.html" />
1088 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/PostController.php" /> 1027 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/PostController.php" />
1089 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController [4].php" /> 1028 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController [4].php" />
@@ -1099,17 +1038,110 @@ @@ -1099,17 +1038,110 @@
1099 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/HomeBaseController.php" /> 1038 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/HomeBaseController.php" />
1100 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [10].php" /> 1039 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [10].php" />
1101 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/PublicController [2].php" /> 1040 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/PublicController [2].php" />
  1041 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [4].php" />
  1042 + <entry file="file://$USER_HOME$/Desktop/开发资料/temp/22.html">
  1043 + <provider selected="true" editor-type-id="text-editor">
  1044 + <state relative-caret-position="21">
  1045 + <caret line="573" column="31" selection-start-line="573" selection-start-column="31" selection-end-line="573" selection-end-column="31" />
  1046 + <folding>
  1047 + <element signature="n#style#0;n#head#0;n#html#0;n#!!top" />
  1048 + <element signature="n#script#5;n#head#0;n#html#0;n#!!top" />
  1049 + <element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1050 + <element signature="n#style#0;n#span#1;n#li#1;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1051 + <element signature="n#style#0;n#span#1;n#li#2;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1052 + <element signature="n#style#0;n#input#1;n#span#1;n#li#2;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1053 + <element signature="n#style#0;n#input#2;n#span#1;n#li#2;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1054 + <element signature="n#style#0;n#span#1;n#li#3;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1055 + <element signature="n#style#0;n#span#1;n#li#4;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1056 + <element signature="n#style#0;n#span#1;n#li#5;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1057 + <element signature="n#style#0;n#span#1;n#li#6;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1058 + <element signature="n#style#0;n#span#1;n#li#7;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1059 + <element signature="n#style#0;n#span#1;n#li#8;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1060 + <element signature="n#style#0;n#span#1;n#li#9;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1061 + <element signature="n#style#0;n#span#1;n#li#10;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1062 + <element signature="n#style#0;n#span#1;n#li#11;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1063 + <element signature="n#style#0;n#span#2;n#li#11;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1064 + <element signature="n#style#0;n#li#12;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1065 + <element signature="n#style#0;n#span#1;n#li#12;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1066 + <element signature="n#style#0;n#span#1;n#li#13;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1067 + <element signature="n#style#0;n#span#1;n#li#14;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1068 + <element signature="n#style#0;n#li#15;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1069 + <element signature="n#style#0;n#span#1;n#li#15;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1070 + <element signature="n#style#0;n#li#16;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1071 + <element signature="n#style#0;n#span#1;n#li#16;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1072 + <element signature="n#style#0;n#li#17;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1073 + <element signature="n#style#0;n#span#1;n#li#17;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1074 + <element signature="n#style#0;n#li#20;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1075 + <element signature="n#style#0;n#li#21;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1076 + <element signature="n#style#0;n#span#1;n#li#21;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1077 + <element signature="n#style#0;n#li#22;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1078 + <element signature="n#style#0;n#span#1;n#li#22;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1079 + <element signature="n#style#0;n#li#23;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1080 + <element signature="n#style#0;n#span#1;n#li#23;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1081 + <element signature="n#style#0;n#li#24;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1082 + <element signature="n#style#0;n#span#1;n#li#24;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1083 + <element signature="n#style#0;n#span#2;n#li#24;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1084 + <element signature="n#style#0;n#span#3;n#li#24;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1085 + <element signature="n#style#0;n#span#4;n#li#24;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1086 + <element signature="n#style#0;n#li#25;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1087 + <element signature="n#style#0;n#span#1;n#li#25;n#ul#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1088 + <element signature="n#style#0;n#div#0;n#form#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1089 + </folding>
  1090 + </state>
  1091 + </provider>
  1092 + </entry>
  1093 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/common.php">
  1094 + <provider selected="true" editor-type-id="text-editor" />
  1095 + </entry>
  1096 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/refund.php">
  1097 + <provider selected="true" editor-type-id="text-editor" />
  1098 + </entry>
  1099 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/WxPay.Config.php">
  1100 + <provider selected="true" editor-type-id="text-editor">
  1101 + <state relative-caret-position="468">
  1102 + <caret line="104" column="85" lean-forward="true" selection-start-line="104" selection-start-column="85" selection-end-line="104" selection-end-column="85" />
  1103 + </state>
  1104 + </provider>
  1105 + </entry>
  1106 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/user/student.html">
  1107 + <provider selected="true" editor-type-id="text-editor">
  1108 + <state relative-caret-position="567">
  1109 + <caret line="43" column="29" lean-forward="true" selection-start-line="43" selection-start-column="29" selection-end-line="43" selection-end-column="29" />
  1110 + </state>
  1111 + </provider>
  1112 + </entry>
  1113 + <entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php">
  1114 + <provider selected="true" editor-type-id="text-editor">
  1115 + <state relative-caret-position="297">
  1116 + <caret line="458" column="13" selection-start-line="458" selection-start-column="13" selection-end-line="458" selection-end-column="13" />
  1117 + </state>
  1118 + </provider>
  1119 + </entry>
  1120 + <entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
  1121 + <provider selected="true" editor-type-id="text-editor">
  1122 + <state relative-caret-position="796">
  1123 + <caret line="2103" column="43" selection-start-line="2103" selection-start-column="43" selection-end-line="2103" selection-end-column="43" />
  1124 + </state>
  1125 + </provider>
  1126 + </entry>
1102 <entry file="file://$PROJECT_DIR$/public/index.php"> 1127 <entry file="file://$PROJECT_DIR$/public/index.php">
1103 <provider selected="true" editor-type-id="text-editor"> 1128 <provider selected="true" editor-type-id="text-editor">
1104 - <state relative-caret-position="252">  
1105 - <caret line="18" column="38" lean-forward="true" selection-start-line="18" selection-start-column="38" selection-end-line="18" selection-end-column="38" /> 1129 + <state relative-caret-position="210">
  1130 + <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
  1131 + </state>
  1132 + </provider>
  1133 + </entry>
  1134 + <entry file="file://$PROJECT_DIR$/app/user/controller/ProfileController.php">
  1135 + <provider selected="true" editor-type-id="text-editor">
  1136 + <state relative-caret-position="-4368">
  1137 + <caret line="43" column="8" lean-forward="true" selection-start-line="43" selection-start-column="8" selection-end-line="47" selection-end-column="51" />
1106 </state> 1138 </state>
1107 </provider> 1139 </provider>
1108 </entry> 1140 </entry>
1109 <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php"> 1141 <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
1110 <provider selected="true" editor-type-id="text-editor"> 1142 <provider selected="true" editor-type-id="text-editor">
1111 - <state relative-caret-position="-63">  
1112 - <caret line="482" column="22" lean-forward="true" selection-start-line="482" selection-start-column="22" selection-end-line="482" selection-end-column="22" /> 1143 + <state relative-caret-position="210">
  1144 + <caret line="427" column="5" lean-forward="true" selection-start-line="427" selection-start-column="5" selection-end-line="427" selection-end-column="5" />
1113 <folding> 1145 <folding>
1114 <element signature="e#910#989#0#PHP" /> 1146 <element signature="e#910#989#0#PHP" />
1115 <element signature="e#1014#1431#0#PHP" /> 1147 <element signature="e#1014#1431#0#PHP" />
@@ -1151,6 +1183,8 @@ @@ -1151,6 +1183,8 @@
1151 <element signature="e#12841#13753#0#PHP" /> 1183 <element signature="e#12841#13753#0#PHP" />
1152 <element signature="e#13149#13735#1#PHP" /> 1184 <element signature="e#13149#13735#1#PHP" />
1153 <element signature="e#13943#14029#0#PHP" /> 1185 <element signature="e#13943#14029#0#PHP" />
  1186 + <element signature="e#14081#16740#0#PHP" />
  1187 + <element signature="e#14226#14320#0#PHP" />
1154 <element signature="e#14339#14381#0#PHP" /> 1188 <element signature="e#14339#14381#0#PHP" />
1155 <element signature="e#14339#14431#0#PHP" /> 1189 <element signature="e#14339#14431#0#PHP" />
1156 <element signature="e#14339#14480#0#PHP" /> 1190 <element signature="e#14339#14480#0#PHP" />
@@ -1162,6 +1196,8 @@ @@ -1162,6 +1196,8 @@
1162 <element signature="e#14639#14771#0#PHP" /> 1196 <element signature="e#14639#14771#0#PHP" />
1163 <element signature="e#14639#14844#0#PHP" /> 1197 <element signature="e#14639#14844#0#PHP" />
1164 <element signature="e#14639#14884#0#PHP" /> 1198 <element signature="e#14639#14884#0#PHP" />
  1199 + <element signature="e#14941#15109#0#PHP" />
  1200 + <element signature="e#14983#15099#0#PHP" />
1165 <element signature="e#15128#15171#0#PHP" /> 1201 <element signature="e#15128#15171#0#PHP" />
1166 <element signature="e#15128#15224#0#PHP" /> 1202 <element signature="e#15128#15224#0#PHP" />
1167 <element signature="e#15128#15275#0#PHP" /> 1203 <element signature="e#15128#15275#0#PHP" />
@@ -1169,114 +1205,126 @@ @@ -1169,114 +1205,126 @@
1169 <element signature="e#15128#15388#0#PHP" /> 1205 <element signature="e#15128#15388#0#PHP" />
1170 <element signature="e#15455#15498#0#PHP" /> 1206 <element signature="e#15455#15498#0#PHP" />
1171 <element signature="e#15455#15551#0#PHP" /> 1207 <element signature="e#15455#15551#0#PHP" />
  1208 + <element signature="e#15455#15613#0#PHP" />
1172 <element signature="e#15455#15686#0#PHP" /> 1209 <element signature="e#15455#15686#0#PHP" />
1173 <element signature="e#15455#15726#0#PHP" /> 1210 <element signature="e#15455#15726#0#PHP" />
  1211 + <element signature="e#15783#15947#0#PHP" />
  1212 + <element signature="e#15827#15937#0#PHP" />
1174 <element signature="e#15966#16009#0#PHP" /> 1213 <element signature="e#15966#16009#0#PHP" />
1175 <element signature="e#15966#16062#0#PHP" /> 1214 <element signature="e#15966#16062#0#PHP" />
1176 <element signature="e#15966#16113#0#PHP" /> 1215 <element signature="e#15966#16113#0#PHP" />
1177 <element signature="e#15966#16186#0#PHP" /> 1216 <element signature="e#15966#16186#0#PHP" />
1178 <element signature="e#15966#16226#0#PHP" /> 1217 <element signature="e#15966#16226#0#PHP" />
  1218 + <element signature="e#16276#16311#0#PHP" />
  1219 + <element signature="e#16448#16521#0#PHP" />
  1220 + <element signature="e#16448#16587#0#PHP" />
  1221 + <element signature="e#16760#19526#0#PHP" />
1179 <element signature="e#16920#16963#0#PHP" /> 1222 <element signature="e#16920#16963#0#PHP" />
1180 <element signature="e#16920#17011#0#PHP" /> 1223 <element signature="e#16920#17011#0#PHP" />
1181 <element signature="e#16920#17052#0#PHP" /> 1224 <element signature="e#16920#17052#0#PHP" />
1182 <element signature="e#16920#17141#0#PHP" /> 1225 <element signature="e#16920#17141#0#PHP" />
1183 <element signature="e#16920#17181#0#PHP" /> 1226 <element signature="e#16920#17181#0#PHP" />
1184 - <element signature="e#17249#17292#0#PHP" />  
1185 - <element signature="e#17249#17340#0#PHP" />  
1186 - <element signature="e#17249#17381#0#PHP" />  
1187 - <element signature="e#17249#17423#0#PHP" />  
1188 - <element signature="e#17249#17512#0#PHP" />  
1189 - <element signature="e#17249#17552#0#PHP" />  
1190 - <element signature="e#17618#17661#0#PHP" />  
1191 - <element signature="e#17618#17709#0#PHP" />  
1192 - <element signature="e#17618#17750#0#PHP" />  
1193 - <element signature="e#17618#17792#0#PHP" />  
1194 - <element signature="e#17618#17881#0#PHP" />  
1195 - <element signature="e#17618#17921#0#PHP" />  
1196 - <element signature="e#17987#18030#0#PHP" />  
1197 - <element signature="e#17987#18078#0#PHP" />  
1198 - <element signature="e#17987#18119#0#PHP" />  
1199 - <element signature="e#17987#18250#0#PHP" />  
1200 - <element signature="e#17987#18290#0#PHP" />  
1201 - <element signature="e#18356#18399#0#PHP" />  
1202 - <element signature="e#18356#18447#0#PHP" />  
1203 - <element signature="e#18356#18488#0#PHP" />  
1204 - <element signature="e#18356#18530#0#PHP" />  
1205 - <element signature="e#18356#18619#0#PHP" />  
1206 - <element signature="e#18356#18659#0#PHP" />  
1207 - <element signature="e#18725#18798#0#PHP" />  
1208 - <element signature="e#19189#22352#0#PHP" />  
1209 - <element signature="e#19281#19361#0#PHP" />  
1210 - <element signature="e#19435#22345#0#PHP" />  
1211 - <element signature="e#19600#22335#0#PHP" />  
1212 - <element signature="e#19705#22321#0#PHP" />  
1213 - <element signature="e#20414#21203#0#PHP" />  
1214 - <element signature="e#20742#21181#1#PHP" />  
1215 - <element signature="e#21235#22024#0#PHP" />  
1216 - <element signature="e#21563#22002#1#PHP" />  
1217 - <element signature="e#22227#22321#0#PHP" />  
1218 - <element signature="e#22369#22843#0#PHP" />  
1219 - <element signature="e#22457#22835#0#PHP" />  
1220 - <element signature="e#22541#22835#0#PHP" />  
1221 - <element signature="e#22650#22825#0#PHP" />  
1222 - <element signature="e#22739#22825#0#PHP" />  
1223 - <element signature="e#22860#23331#0#PHP" />  
1224 - <element signature="e#22947#23324#0#PHP" />  
1225 - <element signature="e#23031#23324#0#PHP" />  
1226 - <element signature="e#23139#23314#0#PHP" />  
1227 - <element signature="e#23228#23314#0#PHP" /> 1227 + <element signature="e#17238#17405#0#PHP" />
  1228 + <element signature="e#17280#17395#0#PHP" />
  1229 + <element signature="e#17424#17467#0#PHP" />
  1230 + <element signature="e#17424#17515#0#PHP" />
  1231 + <element signature="e#17424#17556#0#PHP" />
  1232 + <element signature="e#17424#17598#0#PHP" />
  1233 + <element signature="e#17424#17687#0#PHP" />
  1234 + <element signature="e#17424#17727#0#PHP" />
  1235 + <element signature="e#17793#17836#0#PHP" />
  1236 + <element signature="e#17793#17884#0#PHP" />
  1237 + <element signature="e#17793#17925#0#PHP" />
  1238 + <element signature="e#17793#17967#0#PHP" />
  1239 + <element signature="e#17793#18056#0#PHP" />
  1240 + <element signature="e#17793#18096#0#PHP" />
  1241 + <element signature="e#18162#18205#0#PHP" />
  1242 + <element signature="e#18162#18253#0#PHP" />
  1243 + <element signature="e#18162#18294#0#PHP" />
  1244 + <element signature="e#18162#18345#0#PHP" />
  1245 + <element signature="e#18162#18434#0#PHP" />
  1246 + <element signature="e#18162#18474#0#PHP" />
  1247 + <element signature="e#18531#18692#0#PHP" />
  1248 + <element signature="e#18574#18682#0#PHP" />
  1249 + <element signature="e#18710#18753#0#PHP" />
  1250 + <element signature="e#18710#18801#0#PHP" />
  1251 + <element signature="e#18710#18842#0#PHP" />
  1252 + <element signature="e#18710#18884#0#PHP" />
  1253 + <element signature="e#18710#18973#0#PHP" />
  1254 + <element signature="e#18710#19013#0#PHP" />
  1255 + <element signature="e#19302#19337#0#PHP" />
  1256 + <element signature="e#19479#19552#0#PHP" />
  1257 + <element signature="e#19479#19618#0#PHP" />
  1258 + <element signature="e#19543#22706#0#PHP" />
  1259 + <element signature="e#19635#19715#0#PHP" />
  1260 + <element signature="e#19789#22699#0#PHP" />
  1261 + <element signature="e#19954#22689#0#PHP" />
  1262 + <element signature="e#20059#22675#0#PHP" />
  1263 + <element signature="e#20768#21557#0#PHP" />
  1264 + <element signature="e#21096#21535#1#PHP" />
  1265 + <element signature="e#21589#22378#0#PHP" />
  1266 + <element signature="e#21917#22356#1#PHP" />
  1267 + <element signature="e#22581#22675#0#PHP" />
  1268 + <element signature="e#22723#23197#0#PHP" />
  1269 + <element signature="e#22811#23189#0#PHP" />
  1270 + <element signature="e#22895#23189#0#PHP" />
  1271 + <element signature="e#23004#23179#0#PHP" />
  1272 + <element signature="e#23093#23179#0#PHP" />
  1273 + <element signature="e#23214#23685#0#PHP" />
  1274 + <element signature="e#23301#23678#0#PHP" />
  1275 + <element signature="e#23385#23678#0#PHP" />
  1276 + <element signature="e#23493#23668#0#PHP" />
  1277 + <element signature="e#23582#23668#0#PHP" />
1228 </folding> 1278 </folding>
1229 </state> 1279 </state>
1230 </provider> 1280 </provider>
1231 </entry> 1281 </entry>
1232 <entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php"> 1282 <entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
1233 <provider selected="true" editor-type-id="text-editor"> 1283 <provider selected="true" editor-type-id="text-editor">
1234 - <state relative-caret-position="550">  
1235 - <caret line="191" column="18" lean-forward="true" selection-start-line="191" selection-start-column="18" selection-end-line="191" selection-end-column="18" /> 1284 + <state relative-caret-position="315">
  1285 + <caret line="49" column="9" selection-start-line="49" selection-start-column="9" selection-end-line="49" selection-end-column="9" />
1236 <folding> 1286 <folding>
1237 <element signature="e#821#1437#0#PHP" /> 1287 <element signature="e#821#1437#0#PHP" />
1238 <element signature="e#982#1035#0#PHP" /> 1288 <element signature="e#982#1035#0#PHP" />
1239 - <element signature="e#1455#2315#0#PHP" />  
1240 <element signature="e#1543#1618#0#PHP" /> 1289 <element signature="e#1543#1618#0#PHP" />
1241 <element signature="e#2165#2309#0#PHP" /> 1290 <element signature="e#2165#2309#0#PHP" />
1242 <element signature="e#2237#2309#0#PHP" /> 1291 <element signature="e#2237#2309#0#PHP" />
1243 - <element signature="e#2332#3161#0#PHP" />  
1244 - <element signature="e#2413#2488#0#PHP" />  
1245 - <element signature="e#3011#3155#0#PHP" />  
1246 - <element signature="e#3083#3155#0#PHP" />  
1247 - <element signature="e#3185#4118#0#PHP" />  
1248 - <element signature="e#3282#3335#0#PHP" />  
1249 - <element signature="e#3375#3418#0#PHP" />  
1250 - <element signature="e#3375#3469#0#PHP" />  
1251 - <element signature="e#3375#3528#0#PHP" />  
1252 - <element signature="e#3375#3564#0#PHP" />  
1253 - <element signature="e#3657#3699#0#PHP" />  
1254 - <element signature="e#3657#3750#0#PHP" />  
1255 - <element signature="e#3657#3817#0#PHP" />  
1256 - <element signature="e#3657#3847#0#PHP" />  
1257 - <element signature="e#4141#5244#0#PHP" />  
1258 - <element signature="e#4241#4294#0#PHP" />  
1259 - <element signature="e#4334#4377#0#PHP" />  
1260 - <element signature="e#4334#4434#0#PHP" />  
1261 - <element signature="e#4334#4493#0#PHP" />  
1262 - <element signature="e#4334#4529#0#PHP" />  
1263 - <element signature="e#4632#4674#0#PHP" />  
1264 - <element signature="e#4632#4725#0#PHP" />  
1265 - <element signature="e#4632#4792#0#PHP" />  
1266 - <element signature="e#4632#4822#0#PHP" />  
1267 - <element signature="e#5269#6167#0#PHP" />  
1268 - <element signature="e#5456#5499#0#PHP" />  
1269 - <element signature="e#5456#5551#0#PHP" />  
1270 - <element signature="e#5456#5596#0#PHP" />  
1271 - <element signature="e#5456#5639#0#PHP" />  
1272 - <element signature="e#5456#5724#0#PHP" />  
1273 - <element signature="e#5456#5760#0#PHP" />  
1274 - <element signature="e#5801#5848#0#PHP" />  
1275 - <element signature="e#5801#5905#0#PHP" />  
1276 - <element signature="e#5801#5974#0#PHP" />  
1277 - <element signature="e#5801#6009#0#PHP" />  
1278 - <element signature="e#6173#6452#0#PHP" />  
1279 - <element signature="e#7244#7313#0#PHP" /> 1292 + <element signature="e#3208#4141#0#PHP" />
  1293 + <element signature="e#3305#3358#0#PHP" />
  1294 + <element signature="e#3398#3441#0#PHP" />
  1295 + <element signature="e#3398#3492#0#PHP" />
  1296 + <element signature="e#3398#3551#0#PHP" />
  1297 + <element signature="e#3398#3587#0#PHP" />
  1298 + <element signature="e#3680#3722#0#PHP" />
  1299 + <element signature="e#3680#3773#0#PHP" />
  1300 + <element signature="e#3680#3840#0#PHP" />
  1301 + <element signature="e#3680#3870#0#PHP" />
  1302 + <element signature="e#4164#5267#0#PHP" />
  1303 + <element signature="e#4264#4317#0#PHP" />
  1304 + <element signature="e#4357#4400#0#PHP" />
  1305 + <element signature="e#4357#4457#0#PHP" />
  1306 + <element signature="e#4357#4516#0#PHP" />
  1307 + <element signature="e#4357#4552#0#PHP" />
  1308 + <element signature="e#4655#4697#0#PHP" />
  1309 + <element signature="e#4655#4748#0#PHP" />
  1310 + <element signature="e#4655#4815#0#PHP" />
  1311 + <element signature="e#4655#4845#0#PHP" />
  1312 + <element signature="e#5292#6190#0#PHP" />
  1313 + <element signature="e#5479#5522#0#PHP" />
  1314 + <element signature="e#5479#5574#0#PHP" />
  1315 + <element signature="e#5479#5619#0#PHP" />
  1316 + <element signature="e#5479#5662#0#PHP" />
  1317 + <element signature="e#5479#5747#0#PHP" />
  1318 + <element signature="e#5479#5783#0#PHP" />
  1319 + <element signature="e#5824#5871#0#PHP" />
  1320 + <element signature="e#5824#5928#0#PHP" />
  1321 + <element signature="e#5824#5997#0#PHP" />
  1322 + <element signature="e#5824#6032#0#PHP" />
  1323 + <element signature="e#6504#7386#0#PHP" />
  1324 + <element signature="e#6730#7380#0#PHP" />
  1325 + <element signature="e#7141#7301#0#PHP" />
  1326 + <element signature="e#7221#7301#0#PHP" />
  1327 + <element signature="e#7311#7380#0#PHP" />
1280 </folding> 1328 </folding>
1281 </state> 1329 </state>
1282 </provider> 1330 </provider>
@@ -44,6 +44,10 @@ class CommentController extends UserBaseController @@ -44,6 +44,10 @@ class CommentController extends UserBaseController
44 $dataa['teach_id'] = $data['teach_id']; 44 $dataa['teach_id'] = $data['teach_id'];
45 $dataa['yuyue_id'] = $data['yuyue_id']; 45 $dataa['yuyue_id'] = $data['yuyue_id'];
46 $dataa['uid'] = session('user.id'); 46 $dataa['uid'] = session('user.id');
  47 + $yiping = Db::name('commente')->where($dataa)->find();
  48 + if($yiping){
  49 + return json(['code'=>'1','msg'=>'您已经评价']);
  50 + }
47 $dataa['create_time'] = time(); 51 $dataa['create_time'] = time();
48 $dataa['comment_tag'] = $data['comment_tag']; 52 $dataa['comment_tag'] = $data['comment_tag'];
49 $dataa['comment'] = $data['comment']; 53 $dataa['comment'] = $data['comment'];
@@ -63,9 +67,16 @@ class CommentController extends UserBaseController @@ -63,9 +67,16 @@ class CommentController extends UserBaseController
63 if(!$data){ 67 if(!$data){
64 return json(['code'=>'0','msg'=>'非法提交']); 68 return json(['code'=>'0','msg'=>'非法提交']);
65 } 69 }
  70 +
66 $dataa['teach_id'] = $data['teach_id']; 71 $dataa['teach_id'] = $data['teach_id'];
67 $dataa['yuyue_id'] = $data['yuyue_id']; 72 $dataa['yuyue_id'] = $data['yuyue_id'];
68 $dataa['uid'] = session('user.id'); 73 $dataa['uid'] = session('user.id');
  74 + $yiping = Db::name('commente')->where($dataa)->find();
  75 + if($yiping){
  76 + return json(['code'=>'1','msg'=>'您已经评价']);
  77 + }
  78 +
  79 +
69 $dataa['create_time'] = time(); 80 $dataa['create_time'] = time();
70 $dataa['comment_tag'] = $data['comment_tag']; 81 $dataa['comment_tag'] = $data['comment_tag'];
71 $dataa['comment'] = $data['comment']; 82 $dataa['comment'] = $data['comment'];
@@ -35,15 +35,17 @@ class ProfileController extends UserBaseController @@ -35,15 +35,17 @@ class ProfileController extends UserBaseController
35 if ($data['user_type'] == '3') { 35 if ($data['user_type'] == '3') {
36 $yyxs = Db::name('yuyue') 36 $yyxs = Db::name('yuyue')
37 ->where(['teach_id' => $uid, 'status' => 3]) 37 ->where(['teach_id' => $uid, 'status' => 3])
38 - ->count();  
39 - $yyxs = $yyxs ? $yyxs : 0; 38 + ->field(' SUM(yuyue_end - yuyue_begin) as yyxs ')
  39 + ->select()->toArray();
  40 + $yyxs = $yyxs ? $yyxs[0]['yyxs'] : '0';
40 $this->assign("yyxs", $yyxs); 41 $this->assign("yyxs", $yyxs);
41 return $this->fetch('percenter_coach'); 42 return $this->fetch('percenter_coach');
42 } else { 43 } else {
43 $yyxs = Db::name('yuyue') 44 $yyxs = Db::name('yuyue')
44 ->where(['uid' => $uid, 'status' => 3]) 45 ->where(['uid' => $uid, 'status' => 3])
45 - ->count();  
46 - $yyxs = $yyxs ? $yyxs : 0; 46 + ->field(' SUM(yuyue_end - yuyue_begin) as yyxs ')
  47 + ->select()->toArray();
  48 + $yyxs = $yyxs ? $yyxs[0]['yyxs'] : '0';
47 $this->assign("yyxs", $yyxs); 49 $this->assign("yyxs", $yyxs);
48 return $this->fetch('percenter_stu'); 50 return $this->fetch('percenter_stu');
49 } 51 }
@@ -406,10 +406,16 @@ class YuyueController extends UserBaseController @@ -406,10 +406,16 @@ class YuyueController extends UserBaseController
406 ->select() 406 ->select()
407 ->toArray(); 407 ->toArray();
408 408
  409 +// $yyxs = Db::name('yuyue')
  410 +// ->where(['uid' => $id, 'status' => 3])
  411 +// ->count();
  412 +// $yyxs = $yyxs ? $yyxs : 0;
  413 +
409 $yyxs = Db::name('yuyue') 414 $yyxs = Db::name('yuyue')
410 ->where(['uid' => $id, 'status' => 3]) 415 ->where(['uid' => $id, 'status' => 3])
411 - ->count();  
412 - $yyxs = $yyxs ? $yyxs : 0; 416 + ->field(' SUM(yuyue_end - yuyue_begin) as yyxs ')
  417 + ->select()->toArray();
  418 + $yyxs = $yyxs ? $yyxs[0]['yyxs'] : '0';
413 419
414 $this->assign("data", $data); 420 $this->assign("data", $data);
415 $this->assign("yyxs", $yyxs); 421 $this->assign("yyxs", $yyxs);
@@ -483,10 +489,16 @@ class YuyueController extends UserBaseController @@ -483,10 +489,16 @@ class YuyueController extends UserBaseController
483 ->select() 489 ->select()
484 ->toArray(); 490 ->toArray();
485 491
486 - $yjxs = Db::name('yuyue') 492 +// $yjxs = Db::name('yuyue')
  493 +// ->where(['teach_id' => $id, 'status' => 3])
  494 +// ->count();
  495 +// $yjxs = $yjxs ? $yjxs : 0;
  496 +
  497 + $yyxs = Db::name('yuyue')
487 ->where(['teach_id' => $id, 'status' => 3]) 498 ->where(['teach_id' => $id, 'status' => 3])
488 - ->count();  
489 - $yjxs = $yjxs ? $yjxs : 0; 499 + ->field(' SUM(yuyue_end - yuyue_begin) as yyxs ')
  500 + ->select()->toArray();
  501 + $yjxs = $yyxs ? $yyxs[0]['yyxs'] : '0';
490 502
491 $this->assign("data", $data); 503 $this->assign("data", $data);
492 $this->assign("data1", $data1); 504 $this->assign("data1", $data1);
@@ -241,33 +241,11 @@ @@ -241,33 +241,11 @@
241 <i class="yu_times">{$vo.yuyue_begin}:00 - {$vo.yuyue_end}:00</i> 241 <i class="yu_times">{$vo.yuyue_begin}:00 - {$vo.yuyue_end}:00</i>
242 </div> 242 </div>
243 </div> 243 </div>
244 - <switch name="$vo.status">  
245 - <case value="1">  
246 - <div class="yuyue_btn">  
247 - <b class="click_yuyue" data-id="{$vo.id}">开始学车</b>  
248 - <b class="click_jindu"  
249 - onclick=location.href="{:url('user/comment/jindu',array('id'=>$vo['uid'],'yuyue_id'=>$vo['id']))}">查看进度</b>  
250 - </div>  
251 - </case>  
252 - <case value="2">  
253 - <div class="yuyue_btn" onclick=location.href="{:url('user/comment/pingjia_by_coach',array('id'=>  
254 - $vo['uid'],'yuyue_id'=>$vo['id']))}">  
255 - <b class="click_yuyue">去评价</b>  
256 - </div>  
257 - </case>  
258 - <case value="3">  
259 - <div class="yuyue_btn" onclick=location.href="{:url('user/comment/show',array('id'=>  
260 - $vo['uid'],'yuyue_id'=>$vo['id']))}">  
261 - <b class="click_yuyue">查看评价</b>  
262 - </div>  
263 - </case>  
264 - <case value="4">  
265 - <div class="yuyue_btn">  
266 - <b class="click_yuyue" data-id="{$vo.id}">学车完毕</b>  
267 - </div>  
268 - </case>  
269 - <default/>  
270 - </switch> 244 +
  245 + <div class="yuyue_btn" onclick=location.href="{:url('user/comment/pingjia_by_coach',array('id'=>
  246 + $vo['uid'],'yuyue_id'=>$vo['id']))}">
  247 + <b class="click_yuyue">去评价</b>
  248 + </div>
271 </div> 249 </div>
272 </volist> 250 </volist>
273 </empty> 251 </empty>
@@ -2089,12 +2089,18 @@ function birthday_old($id){ @@ -2089,12 +2089,18 @@ function birthday_old($id){
2089 function id_xueshi($id){ 2089 function id_xueshi($id){
2090 $name = Db::name('yuyue') 2090 $name = Db::name('yuyue')
2091 ->where(['uid'=>$id,'status'=>'3']) 2091 ->where(['uid'=>$id,'status'=>'3'])
2092 - ->count();  
2093 - return $name; 2092 + ->field(' SUM(yuyue_end - yuyue_begin) as yyxs ')
  2093 + ->select()->toArray();
  2094 +// return Db::name('yuyue')->getLastSql();
  2095 + // return json_encode($name,true) ;
  2096 + $yyxs = $name ? $name[0]['yyxs'] : '0';
  2097 + return $yyxs;
2094 } 2098 }
2095 function tid_xueshi($id){ 2099 function tid_xueshi($id){
2096 $name = Db::name('yuyue') 2100 $name = Db::name('yuyue')
2097 ->where(['teach_id'=>$id,'status'=>'3']) 2101 ->where(['teach_id'=>$id,'status'=>'3'])
2098 - ->count();  
2099 - return $name; 2102 + ->field(' SUM(yuyue_end - yuyue_begin) as yyxs ')
  2103 + ->select()->toArray();
  2104 + $yyxs = $name ? $name[0]['yyxs'] : '0';
  2105 + return $yyxs;
2100 } 2106 }