外包项目 / signUpForCar · 提交

转到一个项目

作者 xiaohu thinkpad
提交 03ee846132614cbf5837b996c4ff0e95fd804056 1 个父辈 3c694df8

评价问题重构

内嵌 并排对比
正在显示 4 个修改的文件 包含 288 行增加 和 283 行删除
... ... @@ -4,6 +4,8 @@
<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$/public/themes/simpleboot3/user/comment/look_ping.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/themes/simpleboot3/user/comment/look_ping.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/themes/simpleboot3/user/comment/my_ping.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/themes/simpleboot3/user/comment/my_ping.html" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -31,107 +33,48 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="22.html" pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/Desktop/开发资料/temp/22.html">
<file leaf-file-name="go_ping.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/user/comment/go_ping.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="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 relative-caret-position="-2247" />
</provider>
</entry>
</file>
<file leaf-file-name="my_yuyue.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/user/yuyue/my_yuyue.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3906" />
</provider>
</entry>
</file>
<file leaf-file-name="my_ping.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/user/comment/my_ping.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="84">
<caret line="27" column="48" selection-start-line="27" selection-start-column="48" selection-end-line="27" selection-end-column="48" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="CommentController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
<file leaf-file-name="my_yuyue_coach.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/user/yuyue/my_yuyue_coach.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315">
<caret line="49" column="9" selection-start-line="49" selection-start-column="9" selection-end-line="49" selection-end-column="9" />
<folding>
<element signature="e#821#1437#0#PHP" />
<element signature="e#982#1035#0#PHP" />
<element signature="e#1543#1618#0#PHP" />
<element signature="e#2165#2309#0#PHP" />
<element signature="e#2237#2309#0#PHP" />
<element signature="e#3208#4141#0#PHP" />
<element signature="e#3305#3358#0#PHP" />
<element signature="e#3398#3441#0#PHP" />
<element signature="e#3398#3492#0#PHP" />
<element signature="e#3398#3551#0#PHP" />
<element signature="e#3398#3587#0#PHP" />
<element signature="e#3680#3722#0#PHP" />
<element signature="e#3680#3773#0#PHP" />
<element signature="e#3680#3840#0#PHP" />
<element signature="e#3680#3870#0#PHP" />
<element signature="e#4164#5267#0#PHP" />
<element signature="e#4264#4317#0#PHP" />
<element signature="e#4357#4400#0#PHP" />
<element signature="e#4357#4457#0#PHP" />
<element signature="e#4357#4516#0#PHP" />
<element signature="e#4357#4552#0#PHP" />
<element signature="e#4655#4697#0#PHP" />
<element signature="e#4655#4748#0#PHP" />
<element signature="e#4655#4815#0#PHP" />
<element signature="e#4655#4845#0#PHP" />
<element signature="e#5292#6190#0#PHP" />
<element signature="e#5479#5522#0#PHP" />
<element signature="e#5479#5574#0#PHP" />
<element signature="e#5479#5619#0#PHP" />
<element signature="e#5479#5662#0#PHP" />
<element signature="e#5479#5747#0#PHP" />
<element signature="e#5479#5783#0#PHP" />
<element signature="e#5824#5871#0#PHP" />
<element signature="e#5824#5928#0#PHP" />
<element signature="e#5824#5997#0#PHP" />
<element signature="e#5824#6032#0#PHP" />
<element signature="e#6504#7386#0#PHP" />
<element signature="e#6730#7380#0#PHP" />
<element signature="e#7141#7301#0#PHP" />
<element signature="e#7221#7301#0#PHP" />
<element signature="e#7311#7380#0#PHP" />
</folding>
<state relative-caret-position="3696">
<caret line="244" column="24" selection-start-line="244" selection-start-column="24" selection-end-line="247" selection-end-column="30" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="look_jindu.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/user/comment/look_jindu.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file leaf-file-name="look_ping.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/user/comment/look_ping.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="21" column="44" selection-start-line="21" selection-start-column="44" selection-end-line="21" selection-end-column="44" />
</state>
</provider>
</entry>
... ... @@ -288,52 +231,28 @@
</provider>
</entry>
</file>
<file leaf-file-name="student.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/user/student.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="567">
<caret line="43" column="29" lean-forward="true" selection-start-line="43" selection-start-column="29" selection-end-line="43" selection-end-column="29" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="common.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="796">
<caret line="2103" column="43" selection-start-line="2103" selection-start-column="43" selection-end-line="2103" selection-end-column="43" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="helper.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="297">
<caret line="458" column="13" selection-start-line="458" selection-start-column="13" selection-end-line="458" selection-end-column="13" />
</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">
<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="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 relative-caret-position="210">
<caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/index.php">
<file leaf-file-name="CommentController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
<state relative-caret-position="357">
<caret line="77" column="64" selection-start-line="77" selection-start-column="64" selection-end-line="77" selection-end-column="64" />
<folding>
<element signature="e#825#1441#0#PHP" />
<element signature="e#1465#2474#0#PHP" />
<element signature="e#3341#3620#0#PHP" />
<element signature="e#3649#4531#0#PHP" />
<element signature="e#2498#3504#0#PHP" />
<element signature="e#3530#4205#0#PHP" />
</folding>
</state>
</provider>
</entry>
... ... @@ -369,8 +288,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/xinwen_acticle.htm" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_jiuda.htm" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_huigu.htm" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/chanye_shoucangpin.htm" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou [2].htm" />
... ... @@ -384,7 +301,6 @@
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/scps_fc_acticle.htm" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/SysconfigController.php" />
<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/sucai.html" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/data_edit.html" />
... ... @@ -419,6 +335,9 @@
<option value="$PROJECT_DIR$/public/index.php" />
<option value="$PROJECT_DIR$/app/user/controller/ProfileController.php" />
<option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" />
<option value="$PROJECT_DIR$/public/themes/simpleboot3/user/yuyue/my_yuyue_coach.html" />
<option value="$PROJECT_DIR$/public/themes/simpleboot3/user/comment/my_ping.html" />
<option value="$PROJECT_DIR$/public/themes/simpleboot3/user/comment/look_ping.html" />
<option value="$PROJECT_DIR$/app/user/controller/CommentController.php" />
</list>
</option>
... ... @@ -496,6 +415,45 @@
<path>
<item name="dm161xueche" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xueche" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="themes" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dm161xueche" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xueche" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="themes" type="462c0819:PsiDirectoryNode" />
<item name="simpleboot3" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dm161xueche" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xueche" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="themes" type="462c0819:PsiDirectoryNode" />
<item name="simpleboot3" type="462c0819:PsiDirectoryNode" />
<item name="user" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dm161xueche" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xueche" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="themes" type="462c0819:PsiDirectoryNode" />
<item name="simpleboot3" type="462c0819:PsiDirectoryNode" />
<item name="user" type="462c0819:PsiDirectoryNode" />
<item name="comment" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dm161xueche" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xueche" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="themes" type="462c0819:PsiDirectoryNode" />
<item name="simpleboot3" type="462c0819:PsiDirectoryNode" />
<item name="user" type="462c0819:PsiDirectoryNode" />
<item name="yuyue" 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>
... ... @@ -562,21 +520,7 @@
<workItem from="1536326693570" duration="30018000" />
<workItem from="1536496471879" duration="16852000" />
<workItem from="1536677895835" duration="7811000" />
<workItem from="1536940132237" duration="9678000" />
</task>
<task id="LOCAL-00030" summary="我的订单详情标题">
<created>1535634119952</created>
<option name="number" value="00030" />
<option name="presentableId" value="LOCAL-00030" />
<option name="project" value="LOCAL" />
<updated>1535634119952</updated>
</task>
<task id="LOCAL-00031" summary="我的订单详情标题">
<created>1535634366456</created>
<option name="number" value="00031" />
<option name="presentableId" value="LOCAL-00031" />
<option name="project" value="LOCAL" />
<updated>1535634366456</updated>
<workItem from="1536940132237" duration="13704000" />
</task>
<task id="LOCAL-00032" summary="我的订单详情标题">
<created>1535634457149</created>
... ... @@ -907,17 +851,31 @@
<option name="project" value="LOCAL" />
<updated>1536983829524</updated>
</task>
<option name="localTasksCounter" value="79" />
<task id="LOCAL-00079" summary="提交评价限制一次哦">
<created>1536986695538</created>
<option name="number" value="00079" />
<option name="presentableId" value="LOCAL-00079" />
<option name="project" value="LOCAL" />
<updated>1536986695538</updated>
</task>
<task id="LOCAL-00080" summary="教练评价">
<created>1536987676288</created>
<option name="number" value="00080" />
<option name="presentableId" value="LOCAL-00080" />
<option name="project" value="LOCAL" />
<updated>1536987676288</updated>
</task>
<option name="localTasksCounter" value="81" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="149260000" />
<option name="totallyTimeSpent" value="153286000" />
</component>
<component name="ToolWindowManager">
<frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" weight="0.16085792" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20442359" />
<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" />
... ... @@ -979,21 +937,16 @@
<MESSAGE value="登录处理" />
<MESSAGE value="预约时间错误" />
<MESSAGE value="统计学时问题修复" />
<option name="LAST_COMMIT_MESSAGE" value="统计学时问题修复" />
<MESSAGE value="提交评价限制一次哦" />
<MESSAGE value="教练评价" />
<option name="LAST_COMMIT_MESSAGE" value="教练评价" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<option name="time" value="3" />
<option name="time" value="4" />
</breakpoint-manager>
</component>
<component name="editorHistoryManager">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/data_edit.html" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/data_addpic.html" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/BannerController.php" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/index.html" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [6].php" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/data_list.html" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/kemu [2].html" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/common [2].php" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/SubjectController.php" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/data_edit_single.html" />
... ... @@ -1279,52 +1232,106 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/user/comment/look_jindu.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/CommentController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-168">
<caret line="17" column="51" lean-forward="true" selection-start-line="17" selection-start-column="51" selection-end-line="17" selection-end-column="51" />
<folding>
<element signature="e#913#1483#0#PHP" />
<element signature="e#1058#1144#0#PHP" />
<element signature="e#1214#1288#0#PHP" />
<element signature="e#1504#1567#0#PHP" />
<element signature="e#1572#2192#0#PHP" />
<element signature="e#1676#1721#1#PHP" />
<element signature="e#1732#2186#0#PHP" />
<element signature="e#1810#2186#0#PHP" />
<element signature="e#2037#2176#0#PHP" />
<element signature="e#2118#2176#0#PHP" />
<element signature="e#2213#2576#0#PHP" />
<element signature="e#2305#2539#0#PHP" />
<element signature="e#2488#2539#0#PHP" />
<element signature="e#2581#3244#0#PHP" />
<element signature="e#2687#2732#1#PHP" />
<element signature="e#2743#3238#0#PHP" />
<element signature="e#2821#3238#0#PHP" />
<element signature="e#3089#3228#0#PHP" />
<element signature="e#3170#3228#0#PHP" />
<element signature="e#3258#3632#0#PHP" />
<element signature="e#3514#3626#0#PHP" />
<element signature="e#3576#3626#0#PHP" />
<element signature="e#3664#4401#0#PHP" />
<element signature="e#3803#3880#0#PHP" />
<element signature="e#3956#4028#0#PHP" />
<element signature="e#4082#4134#0#PHP" />
<element signature="e#4082#4185#0#PHP" />
<element signature="e#4082#4212#0#PHP" />
<element signature="e#4082#4240#0#PHP" />
<element signature="e#4082#4267#0#PHP" />
<element signature="e#4407#4766#0#PHP" />
<element signature="e#4509#4562#0#PHP" />
<element signature="e#4648#4760#0#PHP" />
<element signature="e#4710#4760#0#PHP" />
<element signature="e#4783#5496#0#PHP" />
<element signature="e#4922#5002#0#PHP" />
<element signature="e#5078#5150#0#PHP" />
<element signature="e#5167#5220#0#PHP" />
<element signature="e#5167#5266#0#PHP" />
<element signature="e#5167#5293#0#PHP" />
<element signature="e#5167#5335#0#PHP" />
<element signature="e#5167#5362#0#PHP" />
<element signature="e#5502#5862#0#PHP" />
<element signature="e#5604#5657#0#PHP" />
<element signature="e#5744#5856#0#PHP" />
<element signature="e#5806#5856#0#PHP" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/user/comment/go_ping.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2247" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/user/yuyue/my_yuyue.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3906" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/user/comment/look_ping.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="21" column="44" selection-start-line="21" selection-start-column="44" selection-end-line="21" selection-end-column="44" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/user/comment/my_ping.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="84">
<caret line="27" column="48" selection-start-line="27" selection-start-column="48" selection-end-line="27" selection-end-column="48" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/user/yuyue/my_yuyue_coach.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3696">
<caret line="244" column="24" selection-start-line="244" selection-start-column="24" selection-end-line="247" selection-end-column="30" />
</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="315">
<caret line="49" column="9" selection-start-line="49" selection-start-column="9" selection-end-line="49" selection-end-column="9" />
<state relative-caret-position="357">
<caret line="77" column="64" selection-start-line="77" selection-start-column="64" selection-end-line="77" selection-end-column="64" />
<folding>
<element signature="e#821#1437#0#PHP" />
<element signature="e#982#1035#0#PHP" />
<element signature="e#1543#1618#0#PHP" />
<element signature="e#2165#2309#0#PHP" />
<element signature="e#2237#2309#0#PHP" />
<element signature="e#3208#4141#0#PHP" />
<element signature="e#3305#3358#0#PHP" />
<element signature="e#3398#3441#0#PHP" />
<element signature="e#3398#3492#0#PHP" />
<element signature="e#3398#3551#0#PHP" />
<element signature="e#3398#3587#0#PHP" />
<element signature="e#3680#3722#0#PHP" />
<element signature="e#3680#3773#0#PHP" />
<element signature="e#3680#3840#0#PHP" />
<element signature="e#3680#3870#0#PHP" />
<element signature="e#4164#5267#0#PHP" />
<element signature="e#4264#4317#0#PHP" />
<element signature="e#4357#4400#0#PHP" />
<element signature="e#4357#4457#0#PHP" />
<element signature="e#4357#4516#0#PHP" />
<element signature="e#4357#4552#0#PHP" />
<element signature="e#4655#4697#0#PHP" />
<element signature="e#4655#4748#0#PHP" />
<element signature="e#4655#4815#0#PHP" />
<element signature="e#4655#4845#0#PHP" />
<element signature="e#5292#6190#0#PHP" />
<element signature="e#5479#5522#0#PHP" />
<element signature="e#5479#5574#0#PHP" />
<element signature="e#5479#5619#0#PHP" />
<element signature="e#5479#5662#0#PHP" />
<element signature="e#5479#5747#0#PHP" />
<element signature="e#5479#5783#0#PHP" />
<element signature="e#5824#5871#0#PHP" />
<element signature="e#5824#5928#0#PHP" />
<element signature="e#5824#5997#0#PHP" />
<element signature="e#5824#6032#0#PHP" />
<element signature="e#6504#7386#0#PHP" />
<element signature="e#6730#7380#0#PHP" />
<element signature="e#7141#7301#0#PHP" />
<element signature="e#7221#7301#0#PHP" />
<element signature="e#7311#7380#0#PHP" />
<element signature="e#825#1441#0#PHP" />
<element signature="e#1465#2474#0#PHP" />
<element signature="e#3341#3620#0#PHP" />
<element signature="e#3649#4531#0#PHP" />
<element signature="e#2498#3504#0#PHP" />
<element signature="e#3530#4205#0#PHP" />
</folding>
</state>
</provider>
... ...
... ... @@ -18,7 +18,10 @@ use think\Db;
class CommentController extends UserBaseController
{
//去评价
/**
* 学生评价部分
*/
//学员去评价教练
public function index(){
$id = $this->request->param("id", 0, "intval");
$yuyue_id = $this->request->param("yuyue_id", 0, "intval");
... ... @@ -35,7 +38,7 @@ class CommentController extends UserBaseController
$this->assign("yuyue_id", $yuyue_id);
return $this->fetch('go_ping');
}
//评价提交接口
//学员去评价教练提交接口
public function comment_do_by_stu(){
$data = $this->request->param();
if(!$data){
... ... @@ -61,7 +64,64 @@ class CommentController extends UserBaseController
}else{
return json(['code'=>'0','msg'=>'抱歉，评价失败']);
}
} //评价提交接口
}
//评价详情--对教练的评价
public function show_stu(){
$id = $this->request->param("yuyue_id", 0, "intval");
if(!$id){
$this->error('数据异常');
}
//获取预约信息
$yuyue_data = Db::name('yuyue')
->alias('yy')
->join('qnb_user qu','qu.id = yy .teach_id')
->field('yy.*,qu.user_nickname,qu.headimgurl,qu.kemu')
->where(['yy.id'=>$id])
->find();
$teach_id = $yuyue_data['teach_id'];
//获取标签
$rre = Db::name('commente')->where(['teach_id'=>$teach_id])->find();
$rree = Db::name('commente_tag')->where(['id'=>['in',$rre['comment_tag']]])->field('name')->select()->toArray();
$this->assign("yuyue",$yuyue_data);
$this->assign("ctdata",$rree);
$this->assign("cdata",$rre);
return $this->fetch('look_ping');
}
/**
* 教练评价部分
*/
public function pingjia_by_coach(){
$id = $this->request->param("yuyue_id", 0, "intval");
$uid = $this->request->param("id", 0, "intval");
$this->assign('yuyue_id',$id);
$this->assign('uid',$uid);
return $this->fetch('ping_stu');
}
//对学生的评价放到commente1
public function pingjia_by_coach_do(){
$id = $this->request->param("yuyue_id", 0, "intval");
$uid = $this->request->param("uid", 0, "intval");
$comment = $this->request->param("comment");
if($id && $uid){
$data['uid'] = $uid;
$data['yuyue_id'] = $id;
$data['teach_id'] = session('user.id');
$data['comment'] = $comment;
$data['create_time'] = time();
$re = DB::name('commente1')->insert($data);
$res = Db::name('yuyue')->where(['id'=>$data['yuyue_id']])->update(['status'=>'3','pingjia_xueyuan'=>'1']);
if($re){
return json(['code'=>'1','msg'=>'评价成功']);
}else{
return json(['code'=>'0','msg'=>'抱歉，评价失败']);
}
}else{
return json(['code'=>'0','msg'=>'数据异常']);
}
}
//教练对学生的评价提交
public function comment_do(){
$data = $this->request->param();
if(!$data){
... ... @@ -71,7 +131,7 @@ class CommentController extends UserBaseController
$dataa['teach_id'] = $data['teach_id'];
$dataa['yuyue_id'] = $data['yuyue_id'];
$dataa['uid'] = session('user.id');
$yiping = Db::name('commente')->where($dataa)->find();
$yiping = Db::name('commente1')->where($dataa)->find();
if($yiping){
return json(['code'=>'1','msg'=>'您已经评价']);
}
... ... @@ -81,7 +141,7 @@ class CommentController extends UserBaseController
$dataa['comment_tag'] = $data['comment_tag'];
$dataa['comment'] = $data['comment'];
$dataa['type'] = $data['type'];
$re = Db::name('commente')->insert($dataa);
$re = Db::name('commente1')->insert($dataa);
$res = Db::name('yuyue')->where(['id'=>$data['yuyue_id']])->update(['status'=>'3','pingjia_xueyuan'=>'1']);
//echo Db::name('yuyue')->getLastSql();
... ... @@ -91,7 +151,7 @@ class CommentController extends UserBaseController
return json(['code'=>'0','msg'=>'抱歉，评价失败']);
}
}
//评价详情--对学生的评价
//评价详情--教练对学生的评价
public function show(){
$id = $this->request->param("yuyue_id", 0, "intval");
... ... @@ -102,54 +162,22 @@ class CommentController extends UserBaseController
$yuyue_data = Db::name('yuyue')
->alias('yy')
->join('qnb_user qu','qu.id = yy.uid')
->field('yy.*,qu.user_nickname,qu.headimgurl')
->field('yy.*,qu.user_nickname,qu.headimgurl,qu.kemu')
->where(['yy.id'=>$id])
->find();
$uid = $yuyue_data['uid'];
//获取学车的资料
$gname = Db::name('goods')
->alias('g')
->join('qnb_order qo','qo.gid = g.id')
->where(['qo.uid'=>$yuyue_data['uid'],'qo.status'=>1])
->value('g.name');
//获取评价
$cdata = Db::name('commente1')->where(['uid'=>$uid,'yuyue_id'=>$id])->find();
$this->assign("gname",$gname);
$this->assign("yuyue",$yuyue_data);
$this->assign("cdata",$cdata);
return $this->fetch('my_ping');
}
//评价详情--教练的评价
public function show_stu(){
$id = $this->request->param("yuyue_id", 0, "intval");
if(!$id){
$this->error('数据异常');
}
//获取预约信息
$yuyue_data = Db::name('yuyue')
->alias('yy')
->join('qnb_user qu','qu.id = yy .teach_id')
->field('yy.*,qu.user_nickname,qu.headimgurl')
->where(['yy.id'=>$id])
->find();
//获取学车的资料
$teach_id = $yuyue_data['teach_id'];
$gname = Db::name('goods')
->alias('g')
->join('qnb_order qo','qo.gid = g.id')
->where(['qo.uid'=>$yuyue_data['uid'],'qo.status'=>1])
->value('g.name');
//获取标签
$rre = Db::name('commente')->where(['teach_id'=>$teach_id])->find();
$rree = Db::name('commente_tag')->where(['id'=>['in',$rre['comment_tag']]])->field('name')->select()->toArray();
$this->assign("gname",$gname);
$this->assign("yuyue",$yuyue_data);
$this->assign("ctdata",$rree);
$this->assign("cdata",$rre);
return $this->fetch('look_ping');
}
//评价详情--对教练的评价
public function jindu(){
... ... @@ -178,36 +206,6 @@ class CommentController extends UserBaseController
}
public function pingjia_by_coach(){
$id = $this->request->param("yuyue_id", 0, "intval");
$uid = $this->request->param("id", 0, "intval");
$this->assign('yuyue_id',$id);
$this->assign('uid',$uid);
return $this->fetch('ping_stu');
}
//对学生的评价放到commente1
public function pingjia_by_coach_do(){
$id = $this->request->param("yuyue_id", 0, "intval");
$uid = $this->request->param("uid", 0, "intval");
$comment = $this->request->param("comment");
if($id && $uid){
$data['uid'] = $uid;
$data['yuyue_id'] = $id;
$data['teach_id'] = session('user.id');
$data['comment'] = $comment;
$data['create_time'] = time();
$re = DB::name('commente1')->insert($data);
$res = Db::name('yuyue')->where(['id'=>$data['yuyue_id']])->update(['status'=>'3','pingjia_xueyuan'=>'1']);
if($re){
return json(['code'=>'1','msg'=>'评价成功']);
}else{
return json(['code'=>'0','msg'=>'抱歉，评价失败']);
}
}else{
return json(['code'=>'0','msg'=>'数据异常']);
}
}
... ...
... ... @@ -19,7 +19,7 @@
<img src="{$yuyue.headimgurl}" class="yu_user_head"/>
<div class="yu_user_info">
<b class="user_name">{$yuyue.user_nickname}</b>
<i class="user_fun">{$gname}</i>
<i class="user_fun">{$yuyue.kemu}</i>
</div>
<div class="yu_date">
<b class="yu_week">{$yuyue.yuyue_week}</b>
... ...
... ... @@ -25,7 +25,7 @@
<img src="{$yuyue.headimgurl}" class="yu_user_head"/>
<div class="yu_user_info">
<b class="user_name">{$yuyue.user_nickname}</b>
<i class="user_fun">{$gname}</i>
<i class="user_fun">{$yuyue.kemu}</i>
</div>
<div class="yu_date">
<b class="yu_week">{$yuyue.yuyue_week}</b>
... ...