外包项目 / signUpForCar · 提交

转到一个项目

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

统计学时问题修复

内嵌 并排对比
正在显示 2 个修改的文件 包含 215 行增加 和 556 行删除
... ... @@ -3,8 +3,7 @@
<component name="ChangeListManager">
<list default="true" id="03b59864-5835-4588-bfae-54004809f199" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/user/controller/CommentController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/user/controller/CommentController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/user/controller/YuyueController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/user/controller/YuyueController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/user/controller/ProfileController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/user/controller/ProfileController.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -16,137 +15,79 @@
<component name="ComposerSettings" doNotAsk="true" synchronizationState="SYNCHRONIZE">
<pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
</component>
<component name="DatabaseView">
<option name="SHOW_INTERMEDIATE" value="true" />
<option name="GROUP_DATA_SOURCES" value="true" />
<option name="GROUP_SCHEMA" value="true" />
<option name="GROUP_CONTENTS" value="false" />
<option name="SORT_POSITIONED" value="false" />
<option name="SHOW_EMPTY_GROUPS" value="false" />
<option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
<option name="HIDDEN_KINDS">
<set />
</option>
<expand />
<select />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="YuyueController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
<file leaf-file-name="22.html" pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/Desktop/开发资料/temp/22.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-63">
<caret line="482" column="22" lean-forward="true" selection-start-line="482" selection-start-column="22" selection-end-line="482" selection-end-column="22" />
<state relative-caret-position="21">
<caret line="573" column="31" selection-start-line="573" selection-start-column="31" selection-end-line="573" selection-end-column="31" />
<folding>
<element signature="e#910#989#0#PHP" />
<element signature="e#1014#1431#0#PHP" />
<element signature="e#1458#2597#0#PHP" />
<element signature="e#1512#1579#0#PHP" />
<element signature="e#1727#1807#0#PHP" />
<element signature="e#1895#2062#0#PHP" />
<element signature="e#2622#3967#0#PHP" />
<element signature="e#3095#3140#0#PHP" />
<element signature="e#3095#3189#0#PHP" />
<element signature="e#3095#3230#0#PHP" />
<element signature="e#3095#3273#0#PHP" />
<element signature="e#3351#3424#0#PHP" />
<element signature="e#3992#8047#0#PHP" />
<element signature="e#4099#8040#0#PHP" />
<element signature="e#4188#8040#0#PHP" />
<element signature="e#4508#4602#0#PHP" />
<element signature="e#5168#8030#0#PHP" />
<element signature="e#5908#6816#0#PHP" />
<element signature="e#6216#6798#1#PHP" />
<element signature="e#6844#7756#0#PHP" />
<element signature="e#7152#7738#1#PHP" />
<element signature="e#7944#8030#0#PHP" />
<element signature="e#8086#8270#0#PHP" />
<element signature="e#8295#9347#0#PHP" />
<element signature="e#8551#8596#0#PHP" />
<element signature="e#8551#8645#0#PHP" />
<element signature="e#8551#8686#0#PHP" />
<element signature="e#8551#8729#0#PHP" />
<element signature="e#8807#8880#0#PHP" />
<element signature="e#9372#10050#0#PHP" />
<element signature="e#10075#14047#0#PHP" />
<element signature="e#10339#14039#0#PHP" />
<element signature="e#10428#14039#0#PHP" />
<element signature="e#10921#11015#0#PHP" />
<element signature="e#11164#14029#0#PHP" />
<element signature="e#11905#12813#0#PHP" />
<element signature="e#12213#12795#1#PHP" />
<element signature="e#12841#13753#0#PHP" />
<element signature="e#13149#13735#1#PHP" />
<element signature="e#13943#14029#0#PHP" />
<element signature="e#14339#14381#0#PHP" />
<element signature="e#14339#14431#0#PHP" />
<element signature="e#14339#14480#0#PHP" />
<element signature="e#14339#14550#0#PHP" />
<element signature="e#14339#14592#0#PHP" />
<element signature="e#14339#14620#0#PHP" />
<element signature="e#14639#14682#0#PHP" />
<element signature="e#14639#14735#0#PHP" />
<element signature="e#14639#14771#0#PHP" />
<element signature="e#14639#14844#0#PHP" />
<element signature="e#14639#14884#0#PHP" />
<element signature="e#15128#15171#0#PHP" />
<element signature="e#15128#15224#0#PHP" />
<element signature="e#15128#15275#0#PHP" />
<element signature="e#15128#15348#0#PHP" />
<element signature="e#15128#15388#0#PHP" />
<element signature="e#15455#15498#0#PHP" />
<element signature="e#15455#15551#0#PHP" />
<element signature="e#15455#15686#0#PHP" />
<element signature="e#15455#15726#0#PHP" />
<element signature="e#15966#16009#0#PHP" />
<element signature="e#15966#16062#0#PHP" />
<element signature="e#15966#16113#0#PHP" />
<element signature="e#15966#16186#0#PHP" />
<element signature="e#15966#16226#0#PHP" />
<element signature="e#16920#16963#0#PHP" />
<element signature="e#16920#17011#0#PHP" />
<element signature="e#16920#17052#0#PHP" />
<element signature="e#16920#17141#0#PHP" />
<element signature="e#16920#17181#0#PHP" />
<element signature="e#17249#17292#0#PHP" />
<element signature="e#17249#17340#0#PHP" />
<element signature="e#17249#17381#0#PHP" />
<element signature="e#17249#17423#0#PHP" />
<element signature="e#17249#17512#0#PHP" />
<element signature="e#17249#17552#0#PHP" />
<element signature="e#17618#17661#0#PHP" />
<element signature="e#17618#17709#0#PHP" />
<element signature="e#17618#17750#0#PHP" />
<element signature="e#17618#17792#0#PHP" />
<element signature="e#17618#17881#0#PHP" />
<element signature="e#17618#17921#0#PHP" />
<element signature="e#17987#18030#0#PHP" />
<element signature="e#17987#18078#0#PHP" />
<element signature="e#17987#18119#0#PHP" />
<element signature="e#17987#18250#0#PHP" />
<element signature="e#17987#18290#0#PHP" />
<element signature="e#18356#18399#0#PHP" />
<element signature="e#18356#18447#0#PHP" />
<element signature="e#18356#18488#0#PHP" />
<element signature="e#18356#18530#0#PHP" />
<element signature="e#18356#18619#0#PHP" />
<element signature="e#18356#18659#0#PHP" />
<element signature="e#18725#18798#0#PHP" />
<element signature="e#19189#22352#0#PHP" />
<element signature="e#19281#19361#0#PHP" />
<element signature="e#19435#22345#0#PHP" />
<element signature="e#19600#22335#0#PHP" />
<element signature="e#19705#22321#0#PHP" />
<element signature="e#20414#21203#0#PHP" />
<element signature="e#20742#21181#1#PHP" />
<element signature="e#21235#22024#0#PHP" />
<element signature="e#21563#22002#1#PHP" />
<element signature="e#22227#22321#0#PHP" />
<element signature="e#22369#22843#0#PHP" />
<element signature="e#22457#22835#0#PHP" />
<element signature="e#22541#22835#0#PHP" />
<element signature="e#22650#22825#0#PHP" />
<element signature="e#22739#22825#0#PHP" />
<element signature="e#22860#23331#0#PHP" />
<element signature="e#22947#23324#0#PHP" />
<element signature="e#23031#23324#0#PHP" />
<element signature="e#23139#23314#0#PHP" />
<element signature="e#23228#23314#0#PHP" />
<element signature="n#style#0;n#head#0;n#html#0;n#!!top" />
<element signature="n#script#5;n#head#0;n#html#0;n#!!top" />
<element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="CommentController.php" pinned="false" current-in-tab="true">
<file leaf-file-name="CommentController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<state relative-caret-position="2314">
<caret line="191" column="18" lean-forward="true" selection-start-line="191" selection-start-column="18" selection-end-line="191" selection-end-column="18" />
<folding>
<element signature="e#821#1437#0#PHP" />
... ... @@ -155,53 +96,40 @@
<element signature="e#1543#1618#0#PHP" />
<element signature="e#2165#2309#0#PHP" />
<element signature="e#2237#2309#0#PHP" />
<element signature="e#2332#3161#0#PHP" />
<element signature="e#2413#2488#0#PHP" />
<element signature="e#3011#3155#0#PHP" />
<element signature="e#3083#3155#0#PHP" />
<element signature="e#3185#4118#0#PHP" />
<element signature="e#3282#3335#0#PHP" />
<element signature="e#3375#3418#0#PHP" />
<element signature="e#3375#3469#0#PHP" />
<element signature="e#3375#3528#0#PHP" />
<element signature="e#3375#3564#0#PHP" />
<element signature="e#3657#3699#0#PHP" />
<element signature="e#3657#3750#0#PHP" />
<element signature="e#3657#3817#0#PHP" />
<element signature="e#3657#3847#0#PHP" />
<element signature="e#4141#5244#0#PHP" />
<element signature="e#4241#4294#0#PHP" />
<element signature="e#4334#4377#0#PHP" />
<element signature="e#4334#4434#0#PHP" />
<element signature="e#4334#4493#0#PHP" />
<element signature="e#4334#4529#0#PHP" />
<element signature="e#4632#4674#0#PHP" />
<element signature="e#4632#4725#0#PHP" />
<element signature="e#4632#4792#0#PHP" />
<element signature="e#4632#4822#0#PHP" />
<element signature="e#5269#6167#0#PHP" />
<element signature="e#5456#5499#0#PHP" />
<element signature="e#5456#5551#0#PHP" />
<element signature="e#5456#5596#0#PHP" />
<element signature="e#5456#5639#0#PHP" />
<element signature="e#5456#5724#0#PHP" />
<element signature="e#5456#5760#0#PHP" />
<element signature="e#5801#5848#0#PHP" />
<element signature="e#5801#5905#0#PHP" />
<element signature="e#5801#5974#0#PHP" />
<element signature="e#5801#6009#0#PHP" />
<element signature="e#6173#6452#0#PHP" />
<element signature="e#7244#7313#0#PHP" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ProfileController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/user/controller/ProfileController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="693">
<caret line="47" column="46" selection-start-line="47" selection-start-column="46" selection-end-line="47" selection-end-column="46" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="refund.php" pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/refund.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file leaf-file-name="WxPay.Config.php" pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/WxPay.Config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="468">
<caret line="104" column="85" lean-forward="true" selection-start-line="104" selection-start-column="85" selection-end-line="104" selection-end-column="85" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="252">
<caret line="18" column="38" lean-forward="true" selection-start-line="18" selection-start-column="38" selection-end-line="18" selection-end-column="38" />
<caret line="18" column="38" selection-start-line="18" selection-start-column="38" selection-end-line="18" selection-end-column="38" />
</state>
</provider>
</entry>
... ... @@ -236,8 +164,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/zhaopin_lianxi.htm" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/zhaopin_center.htm" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/style.css" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/xinwen_acticle.htm" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_jiuda.htm" />
... ... @@ -256,8 +182,6 @@
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/https_www.ishowx.com.conf" />
<option value="$PROJECT_DIR$/public/themes/simpleboot3/user/yuyue/my_yuyue_coach.html" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/OrderController.php" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [4].php" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/common.php" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/sucai.html" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/data_edit.html" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/data_list.html" />
... ... @@ -287,6 +211,10 @@
<option value="$PROJECT_DIR$/public/index.php" />
<option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" />
<option value="$PROJECT_DIR$/app/user/controller/CommentController.php" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/common.php" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [4].php" />
<option value="$USER_HOME$/Desktop/开发资料/temp/22.html" />
<option value="$PROJECT_DIR$/app/user/controller/ProfileController.php" />
</list>
</option>
</component>
... ... @@ -320,10 +248,10 @@
</include_path>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-10" />
<option name="y" value="-10" />
<option name="width" value="1939" />
<option name="height" value="1049" />
<option name="x" value="1912" />
<option name="y" value="-152" />
<option name="width" value="1936" />
<option name="height" value="1056" />
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
... ... @@ -355,6 +283,17 @@
<item name="user" type="462c0819:PsiDirectoryNode" />
<item name="controller" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dm161xueche" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xueche" type="462c0819:PsiDirectoryNode" />
<item name="simplewind" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dm161xueche" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xueche" type="462c0819:PsiDirectoryNode" />
<item name="simplewind" type="462c0819:PsiDirectoryNode" />
<item name="cmf" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
... ... @@ -412,14 +351,8 @@
<workItem from="1536152467530" duration="16624000" />
<workItem from="1536326693570" duration="30018000" />
<workItem from="1536496471879" duration="16852000" />
<workItem from="1536677895835" duration="1253000" />
</task>
<task id="LOCAL-00015" summary="ceshi wode jiaolian">
<created>1535546534569</created>
<option name="number" value="00015" />
<option name="presentableId" value="LOCAL-00015" />
<option name="project" value="LOCAL" />
<updated>1535546534569</updated>
<workItem from="1536677895835" duration="7811000" />
<workItem from="1536940132237" duration="2280000" />
</task>
<task id="LOCAL-00016" summary="ceshi wode jiaolian">
<created>1535546965523</created>
... ... @@ -757,21 +690,28 @@
<option name="project" value="LOCAL" />
<updated>1536517797514</updated>
</task>
<option name="localTasksCounter" value="64" />
<task id="LOCAL-00064" summary="预约时间错误">
<created>1536679162719</created>
<option name="number" value="00064" />
<option name="presentableId" value="LOCAL-00064" />
<option name="project" value="LOCAL" />
<updated>1536679162719</updated>
</task>
<option name="localTasksCounter" value="65" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="133024000" />
<option name="totallyTimeSpent" value="141862000" />
</component>
<component name="ToolWindowManager">
<frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
<frame x="1912" y="-152" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" weight="0.23927614" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.23880596" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
<window_info anchor="right" id="Database" order="3" />
<window_info anchor="right" id="Database" order="3" weight="0.32995737" />
<window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="7" weight="0.3293348" />
<window_info anchor="bottom" id="Run" order="2" />
... ... @@ -792,22 +732,22 @@
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info id="npm" order="2" side_tool="true" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14658849" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32881355" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="Version Control" order="11" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="right" id="Database" order="3" />
<window_info anchor="bottom" id="Terminal" order="9" />
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
<window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="11" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32881355" />
<window_info id="Favorites" order="3" side_tool="true" />
</layout-to-restore>
</component>
... ... @@ -836,12 +776,6 @@
</breakpoint-manager>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/user/yuyue/my_yuyue.html" />
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/user/yuyue/my_yuyue_coach.html" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/OrderController.php" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [4].php" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/sucai.html" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/common.php" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/kemu.html" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/data_edit [2].html" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/data_edit.html" />
... ... @@ -874,216 +808,12 @@
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/BannerController [2].php" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/CommentController.php" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [7].php" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1617">
<caret line="224" column="49" selection-start-line="224" selection-start-column="49" selection-end-line="224" selection-end-column="49" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [3].php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5502">
<caret line="873" column="26" selection-start-line="873" selection-start-column="26" selection-end-line="873" selection-end-column="26" />
<folding>
<element signature="e#635#1068#0#PHP" />
<element signature="e#768#821#0#PHP" />
<element signature="e#962#1062#0#PHP" />
<element signature="e#1015#1062#0#PHP" />
<element signature="e#1087#2128#0#PHP" />
<element signature="e#1159#1321#1#PHP" />
<element signature="e#1333#1584#0#PHP" />
<element signature="e#1352#1583#1#PHP" />
<element signature="e#1636#1726#0#PHP" />
<element signature="e#1865#1978#0#PHP" />
<element signature="e#2148#3263#0#PHP" />
<element signature="e#2218#2349#1#PHP" />
<element signature="e#2361#2615#0#PHP" />
<element signature="e#2380#2614#1#PHP" />
<element signature="e#2667#2757#0#PHP" />
<element signature="e#2891#2964#0#PHP" />
<element signature="e#3065#3132#0#PHP" />
<element signature="e#3284#4421#0#PHP" />
<element signature="e#3355#3476#1#PHP" />
<element signature="e#3488#3685#0#PHP" />
<element signature="e#3507#3684#1#PHP" />
<element signature="e#3737#3827#0#PHP" />
<element signature="e#3837#3929#0#PHP" />
<element signature="e#4054#4124#0#PHP" />
<element signature="e#4226#4293#0#PHP" />
<element signature="e#4427#6322#0#PHP" />
<element signature="e#4503#5603#0#PHP" />
<element signature="e#4794#5545#0#PHP" />
<element signature="e#4908#5545#0#PHP" />
<element signature="e#5117#5208#0#PHP" />
<element signature="e#5225#5531#0#PHP" />
<element signature="e#5415#5531#0#PHP" />
<element signature="e#5637#6316#0#PHP" />
<element signature="e#5853#5932#0#PHP" />
<element signature="e#5946#6058#0#PHP" />
<element signature="e#6167#6306#0#PHP" />
<element signature="e#6247#6306#0#PHP" />
<element signature="e#6328#6349#0#PHP" />
<element signature="e#6354#9214#0#PHP" />
<element signature="e#6426#9208#0#PHP" />
<element signature="e#6559#6632#0#PHP" />
<element signature="e#7550#9145#0#PHP" />
<element signature="e#7609#7705#0#PHP" />
<element signature="e#7805#9071#0#PHP" />
<element signature="e#7850#8620#0#PHP" />
<element signature="e#7933#8598#0#PHP" />
<element signature="e#8621#8649#0#PHP" />
<element signature="e#9001#9071#0#PHP" />
<element signature="e#9086#9145#0#PHP" />
<element signature="e#9156#9208#0#PHP" />
<element signature="e#9220#9241#0#PHP" />
<element signature="e#9246#12077#0#PHP" />
<element signature="e#9319#12071#0#PHP" />
<element signature="e#9452#9524#0#PHP" />
<element signature="e#10328#12008#0#PHP" />
<element signature="e#10356#10452#0#PHP" />
<element signature="e#10670#11934#0#PHP" />
<element signature="e#10715#11486#0#PHP" />
<element signature="e#10798#11463#0#PHP" />
<element signature="e#11507#11513#0#PHP" />
<element signature="e#11864#11934#0#PHP" />
<element signature="e#11949#12008#0#PHP" />
<element signature="e#12019#12071#0#PHP" />
<element signature="e#12083#12104#0#PHP" />
<element signature="e#12109#14966#0#PHP" />
<element signature="e#12180#14960#0#PHP" />
<element signature="e#12313#12385#0#PHP" />
<element signature="e#13333#14897#0#PHP" />
<element signature="e#13361#13457#0#PHP" />
<element signature="e#13557#14823#0#PHP" />
<element signature="e#13602#14373#0#PHP" />
<element signature="e#13685#14350#0#PHP" />
<element signature="e#14374#14402#0#PHP" />
<element signature="e#14753#14823#0#PHP" />
<element signature="e#14838#14897#0#PHP" />
<element signature="e#14908#14960#0#PHP" />
<element signature="e#14972#15262#0#PHP" />
<element signature="e#15117#15254#0#PHP" />
<element signature="e#15202#15254#0#PHP" />
<element signature="e#15268#16957#0#PHP" />
<element signature="e#15845#16025#0#PHP" />
<element signature="e#15912#15973#0#PHP" />
<element signature="e#15974#16025#0#PHP" />
<element signature="e#16132#16191#0#PHP" />
<element signature="e#16333#16949#0#PHP" />
<element signature="e#16897#16949#0#PHP" />
<element signature="e#16963#17681#0#PHP" />
<element signature="e#17078#17171#0#PHP" />
<element signature="e#17240#17532#0#PHP" />
<element signature="e#17286#17342#0#PHP" />
<element signature="e#17286#17378#0#PHP" />
<element signature="e#17417#17522#0#PHP" />
<element signature="e#17472#17522#0#PHP" />
<element signature="e#17544#17673#0#PHP" />
<element signature="e#17621#17673#0#PHP" />
<element signature="e#17687#18198#0#PHP" />
<element signature="e#17863#17915#0#PHP" />
<element signature="e#17863#17973#0#PHP" />
<element signature="e#17863#18001#0#PHP" />
<element signature="e#18059#18190#0#PHP" />
<element signature="e#18138#18190#0#PHP" />
<element signature="e#18204#19187#0#PHP" />
<element signature="e#18464#18797#0#PHP" />
<element signature="e#18558#18787#0#PHP" />
<element signature="e#18726#18787#0#PHP" />
<element signature="e#18975#19181#0#PHP" />
<element signature="e#19129#19181#0#PHP" />
<element signature="e#19193#21216#0#PHP" />
<element signature="e#19550#20522#0#PHP" />
<element signature="e#19590#19641#0#PHP" />
<element signature="e#19590#19698#0#PHP" />
<element signature="e#19590#19772#0#PHP" />
<element signature="e#19590#19839#0#PHP" />
<element signature="e#19590#19931#0#PHP" />
<element signature="e#19590#19977#0#PHP" />
<element signature="e#20009#20471#0#PHP" />
<element signature="e#20053#20104#0#PHP" />
<element signature="e#20053#20161#0#PHP" />
<element signature="e#20053#20234#0#PHP" />
<element signature="e#20053#20301#0#PHP" />
<element signature="e#20053#20393#0#PHP" />
<element signature="e#20053#20439#0#PHP" />
<element signature="e#20471#20522#0#PHP" />
<element signature="e#20535#21081#0#PHP" />
<element signature="e#20840#20961#0#PHP" />
<element signature="e#20974#21070#0#PHP" />
<element signature="e#21091#21210#0#PHP" />
<element signature="e#21158#21210#0#PHP" />
<element signature="e#21222#21742#0#PHP" />
<element signature="e#21623#21736#0#PHP" />
<element signature="e#21682#21736#0#PHP" />
<element signature="e#21748#22020#0#PHP" />
<element signature="e#21895#22014#0#PHP" />
<element signature="e#21960#22014#0#PHP" />
<element signature="e#22268#22347#0#PHP" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController [2].php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
<caret line="146" column="5" lean-forward="true" selection-start-line="146" selection-start-column="5" selection-end-line="146" selection-end-column="5" />
<folding>
<element signature="e#724#2784#0#PHP" />
<element signature="e#813#871#0#PHP" />
<element signature="e#1041#1174#0#PHP" />
<element signature="e#1183#1329#0#PHP" />
<element signature="e#1338#1481#0#PHP" />
<element signature="e#1678#1720#0#PHP" />
<element signature="e#1678#1780#0#PHP" />
<element signature="e#1678#1835#0#PHP" />
<element signature="e#1678#1905#0#PHP" />
<element signature="e#1678#2011#0#PHP" />
<element signature="e#1678#2039#0#PHP" />
<element signature="e#1678#2072#0#PHP" />
<element signature="e#2185#2729#0#PHP" />
<element signature="e#2485#2718#0#PHP" />
<element signature="e#2606#2704#0#PHP" />
<element signature="e#2789#3798#0#PHP" />
<element signature="e#2964#3006#0#PHP" />
<element signature="e#2964#3066#0#PHP" />
<element signature="e#2964#3121#0#PHP" />
<element signature="e#2964#3191#0#PHP" />
<element signature="e#2964#3297#0#PHP" />
<element signature="e#2964#3325#0#PHP" />
<element signature="e#3367#3412#0#PHP" />
<element signature="e#3367#3464#0#PHP" />
<element signature="e#3367#3500#0#PHP" />
<element signature="e#3367#3554#0#PHP" />
<element signature="e#3611#3706#0#PHP" />
<element signature="e#3812#5652#0#PHP" />
<element signature="e#3901#4034#0#PHP" />
<element signature="e#4043#4189#0#PHP" />
<element signature="e#4198#4318#0#PHP" />
<element signature="e#4650#4692#0#PHP" />
<element signature="e#4650#4753#0#PHP" />
<element signature="e#4650#4808#0#PHP" />
<element signature="e#4650#4884#0#PHP" />
<element signature="e#4650#4912#0#PHP" />
<element signature="e#4971#5596#0#PHP" />
<element signature="e#5009#5585#0#PHP" />
<element signature="e#5328#5456#0#PHP" />
<element signature="e#5473#5571#0#PHP" />
<element signature="e#5832#5874#0#PHP" />
<element signature="e#5832#5942#0#PHP" />
<element signature="e#5832#6004#0#PHP" />
<element signature="e#5832#6080#0#PHP" />
<element signature="e#5832#6108#0#PHP" />
<element signature="e#6431#6533#0#PHP" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController.php" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [3].php" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController [2].php" />
<entry file="file://$PROJECT_DIR$/public/jsapi_ticket.json" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController [3].php" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [5].php" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/WxPay.Config.php" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/edit_single.html" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/PostController.php" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController [4].php" />
... ... @@ -1102,136 +832,82 @@
<entry file="file://$PROJECT_DIR$/public/index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="252">
<caret line="18" column="38" lean-forward="true" selection-start-line="18" selection-start-column="38" selection-end-line="18" selection-end-column="38" />
<caret line="18" column="38" selection-start-line="18" selection-start-column="38" selection-end-line="18" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-63">
<state relative-caret-position="468">
<caret line="482" column="22" lean-forward="true" selection-start-line="482" selection-start-column="22" selection-end-line="482" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [4].php" />
<entry file="file://$USER_HOME$/Desktop/开发资料/temp/22.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="21">
<caret line="573" column="31" selection-start-line="573" selection-start-column="31" selection-end-line="573" selection-end-column="31" />
<folding>
<element signature="e#910#989#0#PHP" />
<element signature="e#1014#1431#0#PHP" />
<element signature="e#1458#2597#0#PHP" />
<element signature="e#1512#1579#0#PHP" />
<element signature="e#1727#1807#0#PHP" />
<element signature="e#1895#2062#0#PHP" />
<element signature="e#2622#3967#0#PHP" />
<element signature="e#3095#3140#0#PHP" />
<element signature="e#3095#3189#0#PHP" />
<element signature="e#3095#3230#0#PHP" />
<element signature="e#3095#3273#0#PHP" />
<element signature="e#3351#3424#0#PHP" />
<element signature="e#3992#8047#0#PHP" />
<element signature="e#4099#8040#0#PHP" />
<element signature="e#4188#8040#0#PHP" />
<element signature="e#4508#4602#0#PHP" />
<element signature="e#5168#8030#0#PHP" />
<element signature="e#5908#6816#0#PHP" />
<element signature="e#6216#6798#1#PHP" />
<element signature="e#6844#7756#0#PHP" />
<element signature="e#7152#7738#1#PHP" />
<element signature="e#7944#8030#0#PHP" />
<element signature="e#8086#8270#0#PHP" />
<element signature="e#8295#9347#0#PHP" />
<element signature="e#8551#8596#0#PHP" />
<element signature="e#8551#8645#0#PHP" />
<element signature="e#8551#8686#0#PHP" />
<element signature="e#8551#8729#0#PHP" />
<element signature="e#8807#8880#0#PHP" />
<element signature="e#9372#10050#0#PHP" />
<element signature="e#10075#14047#0#PHP" />
<element signature="e#10339#14039#0#PHP" />
<element signature="e#10428#14039#0#PHP" />
<element signature="e#10921#11015#0#PHP" />
<element signature="e#11164#14029#0#PHP" />
<element signature="e#11905#12813#0#PHP" />
<element signature="e#12213#12795#1#PHP" />
<element signature="e#12841#13753#0#PHP" />
<element signature="e#13149#13735#1#PHP" />
<element signature="e#13943#14029#0#PHP" />
<element signature="e#14339#14381#0#PHP" />
<element signature="e#14339#14431#0#PHP" />
<element signature="e#14339#14480#0#PHP" />
<element signature="e#14339#14550#0#PHP" />
<element signature="e#14339#14592#0#PHP" />
<element signature="e#14339#14620#0#PHP" />
<element signature="e#14639#14682#0#PHP" />
<element signature="e#14639#14735#0#PHP" />
<element signature="e#14639#14771#0#PHP" />
<element signature="e#14639#14844#0#PHP" />
<element signature="e#14639#14884#0#PHP" />
<element signature="e#15128#15171#0#PHP" />
<element signature="e#15128#15224#0#PHP" />
<element signature="e#15128#15275#0#PHP" />
<element signature="e#15128#15348#0#PHP" />
<element signature="e#15128#15388#0#PHP" />
<element signature="e#15455#15498#0#PHP" />
<element signature="e#15455#15551#0#PHP" />
<element signature="e#15455#15686#0#PHP" />
<element signature="e#15455#15726#0#PHP" />
<element signature="e#15966#16009#0#PHP" />
<element signature="e#15966#16062#0#PHP" />
<element signature="e#15966#16113#0#PHP" />
<element signature="e#15966#16186#0#PHP" />
<element signature="e#15966#16226#0#PHP" />
<element signature="e#16920#16963#0#PHP" />
<element signature="e#16920#17011#0#PHP" />
<element signature="e#16920#17052#0#PHP" />
<element signature="e#16920#17141#0#PHP" />
<element signature="e#16920#17181#0#PHP" />
<element signature="e#17249#17292#0#PHP" />
<element signature="e#17249#17340#0#PHP" />
<element signature="e#17249#17381#0#PHP" />
<element signature="e#17249#17423#0#PHP" />
<element signature="e#17249#17512#0#PHP" />
<element signature="e#17249#17552#0#PHP" />
<element signature="e#17618#17661#0#PHP" />
<element signature="e#17618#17709#0#PHP" />
<element signature="e#17618#17750#0#PHP" />
<element signature="e#17618#17792#0#PHP" />
<element signature="e#17618#17881#0#PHP" />
<element signature="e#17618#17921#0#PHP" />
<element signature="e#17987#18030#0#PHP" />
<element signature="e#17987#18078#0#PHP" />
<element signature="e#17987#18119#0#PHP" />
<element signature="e#17987#18250#0#PHP" />
<element signature="e#17987#18290#0#PHP" />
<element signature="e#18356#18399#0#PHP" />
<element signature="e#18356#18447#0#PHP" />
<element signature="e#18356#18488#0#PHP" />
<element signature="e#18356#18530#0#PHP" />
<element signature="e#18356#18619#0#PHP" />
<element signature="e#18356#18659#0#PHP" />
<element signature="e#18725#18798#0#PHP" />
<element signature="e#19189#22352#0#PHP" />
<element signature="e#19281#19361#0#PHP" />
<element signature="e#19435#22345#0#PHP" />
<element signature="e#19600#22335#0#PHP" />
<element signature="e#19705#22321#0#PHP" />
<element signature="e#20414#21203#0#PHP" />
<element signature="e#20742#21181#1#PHP" />
<element signature="e#21235#22024#0#PHP" />
<element signature="e#21563#22002#1#PHP" />
<element signature="e#22227#22321#0#PHP" />
<element signature="e#22369#22843#0#PHP" />
<element signature="e#22457#22835#0#PHP" />
<element signature="e#22541#22835#0#PHP" />
<element signature="e#22650#22825#0#PHP" />
<element signature="e#22739#22825#0#PHP" />
<element signature="e#22860#23331#0#PHP" />
<element signature="e#22947#23324#0#PHP" />
<element signature="e#23031#23324#0#PHP" />
<element signature="e#23139#23314#0#PHP" />
<element signature="e#23228#23314#0#PHP" />
<element signature="n#style#0;n#head#0;n#html#0;n#!!top" />
<element signature="n#script#5;n#head#0;n#html#0;n#!!top" />
<element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/common.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-40608">
<caret line="41" column="32" lean-forward="true" selection-start-line="41" selection-start-column="32" selection-end-line="41" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<state relative-caret-position="2314">
<caret line="191" column="18" lean-forward="true" selection-start-line="191" selection-start-column="18" selection-end-line="191" selection-end-column="18" />
<folding>
<element signature="e#821#1437#0#PHP" />
... ... @@ -1240,46 +916,27 @@
<element signature="e#1543#1618#0#PHP" />
<element signature="e#2165#2309#0#PHP" />
<element signature="e#2237#2309#0#PHP" />
<element signature="e#2332#3161#0#PHP" />
<element signature="e#2413#2488#0#PHP" />
<element signature="e#3011#3155#0#PHP" />
<element signature="e#3083#3155#0#PHP" />
<element signature="e#3185#4118#0#PHP" />
<element signature="e#3282#3335#0#PHP" />
<element signature="e#3375#3418#0#PHP" />
<element signature="e#3375#3469#0#PHP" />
<element signature="e#3375#3528#0#PHP" />
<element signature="e#3375#3564#0#PHP" />
<element signature="e#3657#3699#0#PHP" />
<element signature="e#3657#3750#0#PHP" />
<element signature="e#3657#3817#0#PHP" />
<element signature="e#3657#3847#0#PHP" />
<element signature="e#4141#5244#0#PHP" />
<element signature="e#4241#4294#0#PHP" />
<element signature="e#4334#4377#0#PHP" />
<element signature="e#4334#4434#0#PHP" />
<element signature="e#4334#4493#0#PHP" />
<element signature="e#4334#4529#0#PHP" />
<element signature="e#4632#4674#0#PHP" />
<element signature="e#4632#4725#0#PHP" />
<element signature="e#4632#4792#0#PHP" />
<element signature="e#4632#4822#0#PHP" />
<element signature="e#5269#6167#0#PHP" />
<element signature="e#5456#5499#0#PHP" />
<element signature="e#5456#5551#0#PHP" />
<element signature="e#5456#5596#0#PHP" />
<element signature="e#5456#5639#0#PHP" />
<element signature="e#5456#5724#0#PHP" />
<element signature="e#5456#5760#0#PHP" />
<element signature="e#5801#5848#0#PHP" />
<element signature="e#5801#5905#0#PHP" />
<element signature="e#5801#5974#0#PHP" />
<element signature="e#5801#6009#0#PHP" />
<element signature="e#6173#6452#0#PHP" />
<element signature="e#7244#7313#0#PHP" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/refund.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/WxPay.Config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="468">
<caret line="104" column="85" lean-forward="true" selection-start-line="104" selection-start-column="85" selection-end-line="104" selection-end-column="85" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/user/controller/ProfileController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="693">
<caret line="47" column="46" selection-start-line="47" selection-start-column="46" selection-end-line="47" selection-end-column="46" />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -35,15 +35,17 @@ class ProfileController extends UserBaseController
if ($data['user_type'] == '3') {
$yyxs = Db::name('yuyue')
->where(['teach_id' => $uid, 'status' => 3])
->count();
$yyxs = $yyxs ? $yyxs : 0;
->field(' SUM(yuyue_end - yuyue_begin) as yyxs ')
->select();
$yyxs = $yyxs ? $yyxs['yyxs'] : 0;
$this->assign("yyxs", $yyxs);
return $this->fetch('percenter_coach');
} else {
$yyxs = Db::name('yuyue')
->where(['uid' => $uid, 'status' => 3])
->count();
$yyxs = $yyxs ? $yyxs : 0;
->field(' SUM(yuyue_end - yuyue_begin) as yyxs ')
->select();
$yyxs = $yyxs ? $yyxs['yyxs'] : 0;
$this->assign("yyxs", $yyxs);
return $this->fetch('percenter_stu');
}
... ...