外包项目 / signUpForCar · 提交

转到一个项目

作者 xiaohu thinkpad
提交 5590f9d598a4ea85f855ee00a9adb5ec507bf539 1 个父辈 38a8b750

统计学时问题修复

内嵌 并排对比
正在显示 2 个修改的文件 包含 215 行增加 和 556 行删除
@@ -3,8 +3,7 @@ @@ -3,8 +3,7 @@
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
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" />  
7 - <change beforePath="$PROJECT_DIR$/app/user/controller/YuyueController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/user/controller/YuyueController.php" afterDir="false" /> 6 + <change beforePath="$PROJECT_DIR$/app/user/controller/ProfileController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/user/controller/ProfileController.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,137 +15,79 @@ @@ -16,137 +15,79 @@
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">
21 - <file leaf-file-name="YuyueController.php" pinned="false" current-in-tab="false">  
22 - <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php"> 34 + <file leaf-file-name="22.html" pinned="false" current-in-tab="false">
  35 + <entry file="file://$USER_HOME$/Desktop/开发资料/temp/22.html">
23 <provider selected="true" editor-type-id="text-editor"> 36 <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" /> 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" />
26 <folding> 39 <folding>
27 - <element signature="e#910#989#0#PHP" />  
28 - <element signature="e#1014#1431#0#PHP" />  
29 - <element signature="e#1458#2597#0#PHP" />  
30 - <element signature="e#1512#1579#0#PHP" />  
31 - <element signature="e#1727#1807#0#PHP" />  
32 - <element signature="e#1895#2062#0#PHP" />  
33 - <element signature="e#2622#3967#0#PHP" />  
34 - <element signature="e#3095#3140#0#PHP" />  
35 - <element signature="e#3095#3189#0#PHP" />  
36 - <element signature="e#3095#3230#0#PHP" />  
37 - <element signature="e#3095#3273#0#PHP" />  
38 - <element signature="e#3351#3424#0#PHP" />  
39 - <element signature="e#3992#8047#0#PHP" />  
40 - <element signature="e#4099#8040#0#PHP" />  
41 - <element signature="e#4188#8040#0#PHP" />  
42 - <element signature="e#4508#4602#0#PHP" />  
43 - <element signature="e#5168#8030#0#PHP" />  
44 - <element signature="e#5908#6816#0#PHP" />  
45 - <element signature="e#6216#6798#1#PHP" />  
46 - <element signature="e#6844#7756#0#PHP" />  
47 - <element signature="e#7152#7738#1#PHP" />  
48 - <element signature="e#7944#8030#0#PHP" />  
49 - <element signature="e#8086#8270#0#PHP" />  
50 - <element signature="e#8295#9347#0#PHP" />  
51 - <element signature="e#8551#8596#0#PHP" />  
52 - <element signature="e#8551#8645#0#PHP" />  
53 - <element signature="e#8551#8686#0#PHP" />  
54 - <element signature="e#8551#8729#0#PHP" />  
55 - <element signature="e#8807#8880#0#PHP" />  
56 - <element signature="e#9372#10050#0#PHP" />  
57 - <element signature="e#10075#14047#0#PHP" />  
58 - <element signature="e#10339#14039#0#PHP" />  
59 - <element signature="e#10428#14039#0#PHP" />  
60 - <element signature="e#10921#11015#0#PHP" />  
61 - <element signature="e#11164#14029#0#PHP" />  
62 - <element signature="e#11905#12813#0#PHP" />  
63 - <element signature="e#12213#12795#1#PHP" />  
64 - <element signature="e#12841#13753#0#PHP" />  
65 - <element signature="e#13149#13735#1#PHP" />  
66 - <element signature="e#13943#14029#0#PHP" />  
67 - <element signature="e#14339#14381#0#PHP" />  
68 - <element signature="e#14339#14431#0#PHP" />  
69 - <element signature="e#14339#14480#0#PHP" />  
70 - <element signature="e#14339#14550#0#PHP" />  
71 - <element signature="e#14339#14592#0#PHP" />  
72 - <element signature="e#14339#14620#0#PHP" />  
73 - <element signature="e#14639#14682#0#PHP" />  
74 - <element signature="e#14639#14735#0#PHP" />  
75 - <element signature="e#14639#14771#0#PHP" />  
76 - <element signature="e#14639#14844#0#PHP" />  
77 - <element signature="e#14639#14884#0#PHP" />  
78 - <element signature="e#15128#15171#0#PHP" />  
79 - <element signature="e#15128#15224#0#PHP" />  
80 - <element signature="e#15128#15275#0#PHP" />  
81 - <element signature="e#15128#15348#0#PHP" />  
82 - <element signature="e#15128#15388#0#PHP" />  
83 - <element signature="e#15455#15498#0#PHP" />  
84 - <element signature="e#15455#15551#0#PHP" />  
85 - <element signature="e#15455#15686#0#PHP" />  
86 - <element signature="e#15455#15726#0#PHP" />  
87 - <element signature="e#15966#16009#0#PHP" />  
88 - <element signature="e#15966#16062#0#PHP" />  
89 - <element signature="e#15966#16113#0#PHP" />  
90 - <element signature="e#15966#16186#0#PHP" />  
91 - <element signature="e#15966#16226#0#PHP" />  
92 - <element signature="e#16920#16963#0#PHP" />  
93 - <element signature="e#16920#17011#0#PHP" />  
94 - <element signature="e#16920#17052#0#PHP" />  
95 - <element signature="e#16920#17141#0#PHP" />  
96 - <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" /> 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" />
141 </folding> 82 </folding>
142 </state> 83 </state>
143 </provider> 84 </provider>
144 </entry> 85 </entry>
145 </file> 86 </file>
146 - <file leaf-file-name="CommentController.php" pinned="false" current-in-tab="true"> 87 + <file leaf-file-name="CommentController.php" pinned="false" current-in-tab="false">
147 <entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php"> 88 <entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
148 <provider selected="true" editor-type-id="text-editor"> 89 <provider selected="true" editor-type-id="text-editor">
149 - <state relative-caret-position="550"> 90 + <state relative-caret-position="2314">
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" /> 91 <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> 92 <folding>
152 <element signature="e#821#1437#0#PHP" /> 93 <element signature="e#821#1437#0#PHP" />
@@ -155,53 +96,40 @@ @@ -155,53 +96,40 @@
155 <element signature="e#1543#1618#0#PHP" /> 96 <element signature="e#1543#1618#0#PHP" />
156 <element signature="e#2165#2309#0#PHP" /> 97 <element signature="e#2165#2309#0#PHP" />
157 <element signature="e#2237#2309#0#PHP" /> 98 <element signature="e#2237#2309#0#PHP" />
158 - <element signature="e#2332#3161#0#PHP" />  
159 <element signature="e#2413#2488#0#PHP" /> 99 <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> 100 </folding>
196 </state> 101 </state>
197 </provider> 102 </provider>
198 </entry> 103 </entry>
199 </file> 104 </file>
  105 + <file leaf-file-name="ProfileController.php" pinned="false" current-in-tab="true">
  106 + <entry file="file://$PROJECT_DIR$/app/user/controller/ProfileController.php">
  107 + <provider selected="true" editor-type-id="text-editor">
  108 + <state relative-caret-position="693">
  109 + <caret line="47" column="46" selection-start-line="47" selection-start-column="46" selection-end-line="47" selection-end-column="46" />
  110 + </state>
  111 + </provider>
  112 + </entry>
  113 + </file>
  114 + <file leaf-file-name="refund.php" pinned="false" current-in-tab="false">
  115 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/refund.php">
  116 + <provider selected="true" editor-type-id="text-editor" />
  117 + </entry>
  118 + </file>
  119 + <file leaf-file-name="WxPay.Config.php" pinned="false" current-in-tab="false">
  120 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/WxPay.Config.php">
  121 + <provider selected="true" editor-type-id="text-editor">
  122 + <state relative-caret-position="468">
  123 + <caret line="104" column="85" lean-forward="true" selection-start-line="104" selection-start-column="85" selection-end-line="104" selection-end-column="85" />
  124 + </state>
  125 + </provider>
  126 + </entry>
  127 + </file>
200 <file leaf-file-name="index.php" pinned="false" current-in-tab="false"> 128 <file leaf-file-name="index.php" pinned="false" current-in-tab="false">
201 <entry file="file://$PROJECT_DIR$/public/index.php"> 129 <entry file="file://$PROJECT_DIR$/public/index.php">
202 <provider selected="true" editor-type-id="text-editor"> 130 <provider selected="true" editor-type-id="text-editor">
203 <state relative-caret-position="252"> 131 <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" /> 132 + <caret line="18" column="38" selection-start-line="18" selection-start-column="38" selection-end-line="18" selection-end-column="38" />
205 </state> 133 </state>
206 </provider> 134 </provider>
207 </entry> 135 </entry>
@@ -236,8 +164,6 @@ @@ -236,8 +164,6 @@
236 <component name="IdeDocumentHistory"> 164 <component name="IdeDocumentHistory">
237 <option name="CHANGED_PATHS"> 165 <option name="CHANGED_PATHS">
238 <list> 166 <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" /> 167 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/style.css" />
242 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/xinwen_acticle.htm" /> 168 <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" /> 169 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_jiuda.htm" />
@@ -256,8 +182,6 @@ @@ -256,8 +182,6 @@
256 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/https_www.ishowx.com.conf" /> 182 <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" /> 183 <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" /> 184 <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" /> 185 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/sucai.html" />
262 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/data_edit.html" /> 186 <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" /> 187 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/data_list.html" />
@@ -287,6 +211,10 @@ @@ -287,6 +211,10 @@
287 <option value="$PROJECT_DIR$/public/index.php" /> 211 <option value="$PROJECT_DIR$/public/index.php" />
288 <option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" /> 212 <option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" />
289 <option value="$PROJECT_DIR$/app/user/controller/CommentController.php" /> 213 <option value="$PROJECT_DIR$/app/user/controller/CommentController.php" />
  214 + <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/common.php" />
  215 + <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [4].php" />
  216 + <option value="$USER_HOME$/Desktop/开发资料/temp/22.html" />
  217 + <option value="$PROJECT_DIR$/app/user/controller/ProfileController.php" />
290 </list> 218 </list>
291 </option> 219 </option>
292 </component> 220 </component>
@@ -320,10 +248,10 @@ @@ -320,10 +248,10 @@
320 </include_path> 248 </include_path>
321 </component> 249 </component>
322 <component name="ProjectFrameBounds" extendedState="6"> 250 <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" /> 251 + <option name="x" value="1912" />
  252 + <option name="y" value="-152" />
  253 + <option name="width" value="1936" />
  254 + <option name="height" value="1056" />
327 </component> 255 </component>
328 <component name="ProjectView"> 256 <component name="ProjectView">
329 <navigator proportions="" version="1"> 257 <navigator proportions="" version="1">
@@ -355,6 +283,17 @@ @@ -355,6 +283,17 @@
355 <item name="user" type="462c0819:PsiDirectoryNode" /> 283 <item name="user" type="462c0819:PsiDirectoryNode" />
356 <item name="controller" type="462c0819:PsiDirectoryNode" /> 284 <item name="controller" type="462c0819:PsiDirectoryNode" />
357 </path> 285 </path>
  286 + <path>
  287 + <item name="dm161xueche" type="b2602c69:ProjectViewProjectNode" />
  288 + <item name="dm161xueche" type="462c0819:PsiDirectoryNode" />
  289 + <item name="simplewind" type="462c0819:PsiDirectoryNode" />
  290 + </path>
  291 + <path>
  292 + <item name="dm161xueche" type="b2602c69:ProjectViewProjectNode" />
  293 + <item name="dm161xueche" type="462c0819:PsiDirectoryNode" />
  294 + <item name="simplewind" type="462c0819:PsiDirectoryNode" />
  295 + <item name="cmf" type="462c0819:PsiDirectoryNode" />
  296 + </path>
358 </expand> 297 </expand>
359 <select /> 298 <select />
360 </subPane> 299 </subPane>
@@ -412,14 +351,8 @@ @@ -412,14 +351,8 @@
412 <workItem from="1536152467530" duration="16624000" /> 351 <workItem from="1536152467530" duration="16624000" />
413 <workItem from="1536326693570" duration="30018000" /> 352 <workItem from="1536326693570" duration="30018000" />
414 <workItem from="1536496471879" duration="16852000" /> 353 <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> 354 + <workItem from="1536677895835" duration="7811000" />
  355 + <workItem from="1536940132237" duration="2280000" />
423 </task> 356 </task>
424 <task id="LOCAL-00016" summary="ceshi wode jiaolian"> 357 <task id="LOCAL-00016" summary="ceshi wode jiaolian">
425 <created>1535546965523</created> 358 <created>1535546965523</created>
@@ -757,21 +690,28 @@ @@ -757,21 +690,28 @@
757 <option name="project" value="LOCAL" /> 690 <option name="project" value="LOCAL" />
758 <updated>1536517797514</updated> 691 <updated>1536517797514</updated>
759 </task> 692 </task>
760 - <option name="localTasksCounter" value="64" /> 693 + <task id="LOCAL-00064" summary="预约时间错误">
  694 + <created>1536679162719</created>
  695 + <option name="number" value="00064" />
  696 + <option name="presentableId" value="LOCAL-00064" />
  697 + <option name="project" value="LOCAL" />
  698 + <updated>1536679162719</updated>
  699 + </task>
  700 + <option name="localTasksCounter" value="65" />
761 <servers /> 701 <servers />
762 </component> 702 </component>
763 <component name="TimeTrackingManager"> 703 <component name="TimeTrackingManager">
764 - <option name="totallyTimeSpent" value="133024000" /> 704 + <option name="totallyTimeSpent" value="141862000" />
765 </component> 705 </component>
766 <component name="ToolWindowManager"> 706 <component name="ToolWindowManager">
767 - <frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> 707 + <frame x="1912" y="-152" width="1936" height="1056" extended-state="6" />
768 <editor active="true" /> 708 <editor active="true" />
769 <layout> 709 <layout>
770 - <window_info content_ui="combo" id="Project" order="0" weight="0.23927614" /> 710 + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.23880596" />
771 <window_info anchor="bottom" id="TODO" order="6" /> 711 <window_info anchor="bottom" id="TODO" order="6" />
772 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> 712 <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" /> 713 <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
774 - <window_info anchor="right" id="Database" order="3" /> 714 + <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" /> 715 <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" /> 716 <window_info anchor="bottom" id="Version Control" order="7" weight="0.3293348" />
777 <window_info anchor="bottom" id="Run" order="2" /> 717 <window_info anchor="bottom" id="Run" order="2" />
@@ -792,22 +732,22 @@ @@ -792,22 +732,22 @@
792 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> 732 <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" /> 733 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
794 <window_info id="npm" order="2" side_tool="true" /> 734 <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" /> 735 + <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" /> 736 <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" /> 737 <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" /> 738 <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" /> 739 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
801 <window_info anchor="bottom" id="TODO" order="6" /> 740 <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" /> 741 + <window_info anchor="bottom" id="Version Control" order="11" />
  742 + <window_info anchor="bottom" id="Run" order="2" />
  743 + <window_info anchor="bottom" id="Message" order="0" />
804 <window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> 744 <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
805 <window_info anchor="right" id="Database" order="3" /> 745 <window_info anchor="right" id="Database" order="3" />
806 <window_info anchor="bottom" id="Terminal" order="9" /> 746 <window_info anchor="bottom" id="Terminal" order="9" />
807 <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" /> 747 <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" /> 748 <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" /> 749 + <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
  750 + <window_info anchor="bottom" id="Find" order="1" weight="0.32881355" />
811 <window_info id="Favorites" order="3" side_tool="true" /> 751 <window_info id="Favorites" order="3" side_tool="true" />
812 </layout-to-restore> 752 </layout-to-restore>
813 </component> 753 </component>
@@ -836,12 +776,6 @@ @@ -836,12 +776,6 @@
836 </breakpoint-manager> 776 </breakpoint-manager>
837 </component> 777 </component>
838 <component name="editorHistoryManager"> 778 <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" /> 779 <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" /> 780 <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" /> 781 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/data_edit.html" />
@@ -874,216 +808,12 @@ @@ -874,216 +808,12 @@
874 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/BannerController [2].php" /> 808 <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" /> 809 <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" /> 810 <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> 811 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController.php" />
  812 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [3].php" />
  813 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController [2].php" />
1083 <entry file="file://$PROJECT_DIR$/public/jsapi_ticket.json" /> 814 <entry file="file://$PROJECT_DIR$/public/jsapi_ticket.json" />
1084 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController [3].php" /> 815 <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" /> 816 <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" /> 817 <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" /> 818 <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" /> 819 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController [4].php" />
@@ -1102,136 +832,82 @@ @@ -1102,136 +832,82 @@
1102 <entry file="file://$PROJECT_DIR$/public/index.php"> 832 <entry file="file://$PROJECT_DIR$/public/index.php">
1103 <provider selected="true" editor-type-id="text-editor"> 833 <provider selected="true" editor-type-id="text-editor">
1104 <state relative-caret-position="252"> 834 <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" /> 835 + <caret line="18" column="38" selection-start-line="18" selection-start-column="38" selection-end-line="18" selection-end-column="38" />
1106 </state> 836 </state>
1107 </provider> 837 </provider>
1108 </entry> 838 </entry>
1109 <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php"> 839 <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
1110 <provider selected="true" editor-type-id="text-editor"> 840 <provider selected="true" editor-type-id="text-editor">
1111 - <state relative-caret-position="-63"> 841 + <state relative-caret-position="468">
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" /> 842 <caret line="482" column="22" lean-forward="true" selection-start-line="482" selection-start-column="22" selection-end-line="482" selection-end-column="22" />
  843 + </state>
  844 + </provider>
  845 + </entry>
  846 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [4].php" />
  847 + <entry file="file://$USER_HOME$/Desktop/开发资料/temp/22.html">
  848 + <provider selected="true" editor-type-id="text-editor">
  849 + <state relative-caret-position="21">
  850 + <caret line="573" column="31" selection-start-line="573" selection-start-column="31" selection-end-line="573" selection-end-column="31" />
1113 <folding> 851 <folding>
1114 - <element signature="e#910#989#0#PHP" />  
1115 - <element signature="e#1014#1431#0#PHP" />  
1116 - <element signature="e#1458#2597#0#PHP" />  
1117 - <element signature="e#1512#1579#0#PHP" />  
1118 - <element signature="e#1727#1807#0#PHP" />  
1119 - <element signature="e#1895#2062#0#PHP" />  
1120 - <element signature="e#2622#3967#0#PHP" />  
1121 - <element signature="e#3095#3140#0#PHP" />  
1122 - <element signature="e#3095#3189#0#PHP" />  
1123 - <element signature="e#3095#3230#0#PHP" />  
1124 - <element signature="e#3095#3273#0#PHP" />  
1125 - <element signature="e#3351#3424#0#PHP" />  
1126 - <element signature="e#3992#8047#0#PHP" />  
1127 - <element signature="e#4099#8040#0#PHP" />  
1128 - <element signature="e#4188#8040#0#PHP" />  
1129 - <element signature="e#4508#4602#0#PHP" />  
1130 - <element signature="e#5168#8030#0#PHP" />  
1131 - <element signature="e#5908#6816#0#PHP" />  
1132 - <element signature="e#6216#6798#1#PHP" />  
1133 - <element signature="e#6844#7756#0#PHP" />  
1134 - <element signature="e#7152#7738#1#PHP" />  
1135 - <element signature="e#7944#8030#0#PHP" />  
1136 - <element signature="e#8086#8270#0#PHP" />  
1137 - <element signature="e#8295#9347#0#PHP" />  
1138 - <element signature="e#8551#8596#0#PHP" />  
1139 - <element signature="e#8551#8645#0#PHP" />  
1140 - <element signature="e#8551#8686#0#PHP" />  
1141 - <element signature="e#8551#8729#0#PHP" />  
1142 - <element signature="e#8807#8880#0#PHP" />  
1143 - <element signature="e#9372#10050#0#PHP" />  
1144 - <element signature="e#10075#14047#0#PHP" />  
1145 - <element signature="e#10339#14039#0#PHP" />  
1146 - <element signature="e#10428#14039#0#PHP" />  
1147 - <element signature="e#10921#11015#0#PHP" />  
1148 - <element signature="e#11164#14029#0#PHP" />  
1149 - <element signature="e#11905#12813#0#PHP" />  
1150 - <element signature="e#12213#12795#1#PHP" />  
1151 - <element signature="e#12841#13753#0#PHP" />  
1152 - <element signature="e#13149#13735#1#PHP" />  
1153 - <element signature="e#13943#14029#0#PHP" />  
1154 - <element signature="e#14339#14381#0#PHP" />  
1155 - <element signature="e#14339#14431#0#PHP" />  
1156 - <element signature="e#14339#14480#0#PHP" />  
1157 - <element signature="e#14339#14550#0#PHP" />  
1158 - <element signature="e#14339#14592#0#PHP" />  
1159 - <element signature="e#14339#14620#0#PHP" />  
1160 - <element signature="e#14639#14682#0#PHP" />  
1161 - <element signature="e#14639#14735#0#PHP" />  
1162 - <element signature="e#14639#14771#0#PHP" />  
1163 - <element signature="e#14639#14844#0#PHP" />  
1164 - <element signature="e#14639#14884#0#PHP" />  
1165 - <element signature="e#15128#15171#0#PHP" />  
1166 - <element signature="e#15128#15224#0#PHP" />  
1167 - <element signature="e#15128#15275#0#PHP" />  
1168 - <element signature="e#15128#15348#0#PHP" />  
1169 - <element signature="e#15128#15388#0#PHP" />  
1170 - <element signature="e#15455#15498#0#PHP" />  
1171 - <element signature="e#15455#15551#0#PHP" />  
1172 - <element signature="e#15455#15686#0#PHP" />  
1173 - <element signature="e#15455#15726#0#PHP" />  
1174 - <element signature="e#15966#16009#0#PHP" />  
1175 - <element signature="e#15966#16062#0#PHP" />  
1176 - <element signature="e#15966#16113#0#PHP" />  
1177 - <element signature="e#15966#16186#0#PHP" />  
1178 - <element signature="e#15966#16226#0#PHP" />  
1179 - <element signature="e#16920#16963#0#PHP" />  
1180 - <element signature="e#16920#17011#0#PHP" />  
1181 - <element signature="e#16920#17052#0#PHP" />  
1182 - <element signature="e#16920#17141#0#PHP" />  
1183 - <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" /> 852 + <element signature="n#style#0;n#head#0;n#html#0;n#!!top" />
  853 + <element signature="n#script#5;n#head#0;n#html#0;n#!!top" />
  854 + <element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  855 + <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" />
  856 + <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" />
  857 + <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" />
  858 + <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" />
  859 + <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" />
  860 + <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" />
  861 + <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" />
  862 + <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" />
  863 + <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" />
  864 + <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" />
  865 + <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" />
  866 + <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" />
  867 + <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" />
  868 + <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" />
  869 + <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" />
  870 + <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" />
  871 + <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" />
  872 + <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" />
  873 + <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" />
  874 + <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" />
  875 + <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" />
  876 + <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" />
  877 + <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" />
  878 + <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" />
  879 + <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" />
  880 + <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" />
  881 + <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" />
  882 + <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" />
  883 + <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" />
  884 + <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" />
  885 + <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" />
  886 + <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" />
  887 + <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" />
  888 + <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" />
  889 + <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" />
  890 + <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" />
  891 + <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" />
  892 + <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" />
  893 + <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" />
1228 </folding> 894 </folding>
1229 </state> 895 </state>
1230 </provider> 896 </provider>
1231 </entry> 897 </entry>
  898 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/common.php">
  899 + <provider selected="true" editor-type-id="text-editor" />
  900 + </entry>
  901 + <entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
  902 + <provider selected="true" editor-type-id="text-editor">
  903 + <state relative-caret-position="-40608">
  904 + <caret line="41" column="32" lean-forward="true" selection-start-line="41" selection-start-column="32" selection-end-line="41" selection-end-column="32" />
  905 + </state>
  906 + </provider>
  907 + </entry>
1232 <entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php"> 908 <entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
1233 <provider selected="true" editor-type-id="text-editor"> 909 <provider selected="true" editor-type-id="text-editor">
1234 - <state relative-caret-position="550"> 910 + <state relative-caret-position="2314">
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" /> 911 <caret line="191" column="18" lean-forward="true" selection-start-line="191" selection-start-column="18" selection-end-line="191" selection-end-column="18" />
1236 <folding> 912 <folding>
1237 <element signature="e#821#1437#0#PHP" /> 913 <element signature="e#821#1437#0#PHP" />
@@ -1240,46 +916,27 @@ @@ -1240,46 +916,27 @@
1240 <element signature="e#1543#1618#0#PHP" /> 916 <element signature="e#1543#1618#0#PHP" />
1241 <element signature="e#2165#2309#0#PHP" /> 917 <element signature="e#2165#2309#0#PHP" />
1242 <element signature="e#2237#2309#0#PHP" /> 918 <element signature="e#2237#2309#0#PHP" />
1243 - <element signature="e#2332#3161#0#PHP" />  
1244 <element signature="e#2413#2488#0#PHP" /> 919 <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" />  
1280 </folding> 920 </folding>
1281 </state> 921 </state>
1282 </provider> 922 </provider>
1283 </entry> 923 </entry>
  924 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/refund.php">
  925 + <provider selected="true" editor-type-id="text-editor" />
  926 + </entry>
  927 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/WxPay.Config.php">
  928 + <provider selected="true" editor-type-id="text-editor">
  929 + <state relative-caret-position="468">
  930 + <caret line="104" column="85" lean-forward="true" selection-start-line="104" selection-start-column="85" selection-end-line="104" selection-end-column="85" />
  931 + </state>
  932 + </provider>
  933 + </entry>
  934 + <entry file="file://$PROJECT_DIR$/app/user/controller/ProfileController.php">
  935 + <provider selected="true" editor-type-id="text-editor">
  936 + <state relative-caret-position="693">
  937 + <caret line="47" column="46" selection-start-line="47" selection-start-column="46" selection-end-line="47" selection-end-column="46" />
  938 + </state>
  939 + </provider>
  940 + </entry>
1284 </component> 941 </component>
1285 </project> 942 </project>
@@ -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();
  40 + $yyxs = $yyxs ? $yyxs['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();
  48 + $yyxs = $yyxs ? $yyxs['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 }