作者 郭盛
1 个管道 的构建 通过 耗费 4 秒

修改评论

... ... @@ -3,10 +3,8 @@
<component name="ChangeListManager">
<list default="true" id="73de7205-e736-4b59-941a-a54ab4506a41" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/active/edit.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/active/edit.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/attract/edit.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/attract/edit.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/demand/edit.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/demand/edit.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/provide/edit.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/provide/edit.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/ProvideController.php" afterPath="$PROJECT_DIR$/app/admin/controller/ProvideController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/provide/comment.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/provide/comment.html" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -15,47 +13,59 @@
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="DockManager">
<window id="1">
<content type="file-editors">
<state>
<leaf>
<file leaf-file-name="ResourceController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/index/controller/ResourceController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="394">
<caret line="579" column="38" lean-forward="false" selection-start-line="579" selection-start-column="8" selection-end-line="579" selection-end-column="38" />
<folding>
<element signature="e#346#543#0#PHP" expanded="false" />
<element signature="e#548#956#0#PHP" expanded="false" />
<element signature="e#962#1253#0#PHP" expanded="false" />
<element signature="e#1258#2915#0#PHP" expanded="false" />
<element signature="e#2921#3173#0#PHP" expanded="false" />
<element signature="e#3178#3633#0#PHP" expanded="false" />
<element signature="e#3639#4194#0#PHP" expanded="false" />
<element signature="e#4201#5476#0#PHP" expanded="false" />
<element signature="e#5482#6202#0#PHP" expanded="false" />
<element signature="e#6207#7625#0#PHP" expanded="false" />
<element signature="e#7631#8303#0#PHP" expanded="false" />
<element signature="e#8308#9894#0#PHP" expanded="false" />
<element signature="e#9900#10758#0#PHP" expanded="false" />
<element signature="e#10763#12524#0#PHP" expanded="false" />
<element signature="e#12530#13370#0#PHP" expanded="false" />
<element signature="e#13375#15480#0#PHP" expanded="false" />
<element signature="e#15486#16133#0#PHP" expanded="false" />
<element signature="e#16138#17576#0#PHP" expanded="false" />
<element signature="e#17582#17998#0#PHP" expanded="false" />
<element signature="e#18827#19505#0#PHP" expanded="false" />
<element signature="e#19511#19965#0#PHP" expanded="false" />
<element signature="e#19970#20744#0#PHP" expanded="false" />
<element signature="e#20750#21256#0#PHP" expanded="false" />
<element signature="e#21261#22692#0#PHP" expanded="false" />
<element signature="e#22698#22977#0#PHP" expanded="false" />
<element signature="e#22982#23424#0#PHP" expanded="false" />
<element signature="e#23430#23664#0#PHP" expanded="false" />
<element signature="e#23669#24062#0#PHP" expanded="false" />
<element signature="e#24068#24299#0#PHP" expanded="false" />
<element signature="e#24304#24662#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</state>
</content>
</window>
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="ProvideController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/admin/controller/ProvideController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="19">
<caret line="173" column="29" lean-forward="true" selection-start-line="173" selection-start-column="29" selection-end-line="173" selection-end-column="29" />
<folding>
<element signature="e#263#1922#0#PHP" expanded="false" />
<element signature="e#1937#4063#0#PHP" expanded="false" />
<element signature="e#4078#4931#0#PHP" expanded="false" />
<element signature="e#4946#5282#0#PHP" expanded="false" />
<element signature="e#5297#5738#0#PHP" expanded="false" />
<element signature="e#6708#7528#0#PHP" expanded="false" />
<element signature="e#7545#8276#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="comment.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/provide/comment.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-525">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="edit.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/demand/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-445">
<caret line="171" column="87" lean-forward="false" selection-start-line="171" selection-start-column="87" selection-end-line="171" selection-end-column="87" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
... ... @@ -99,7 +109,6 @@
<option value="$PROJECT_DIR$/app/admin/controller/MessageController.php" />
<option value="$PROJECT_DIR$/app/admin/controller/FinancsendController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/financsend/index.html" />
<option value="$PROJECT_DIR$/app/admin/controller/ProvideController.php" />
<option value="$PROJECT_DIR$/app/admin/controller/PictureController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/picture/index.html" />
<option value="$PROJECT_DIR$/app/admin/controller/ActiveController.php" />
... ... @@ -115,6 +124,8 @@
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/attract/edit.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/active/edit.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/demand/edit.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/provide/comment.html" />
<option value="$PROJECT_DIR$/app/admin/controller/ProvideController.php" />
</list>
</option>
</component>
... ... @@ -133,10 +144,10 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="237" />
<option name="y" value="66" />
<option name="x" value="179" />
<option name="y" value="62" />
<option name="width" value="1717" />
<option name="height" value="906" />
<option name="height" value="919" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -165,6 +176,24 @@
<path>
<item name="resource" type="b2602c69:ProjectViewProjectNode" />
<item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="resource" type="b2602c69:ProjectViewProjectNode" />
<item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="resource" type="b2602c69:ProjectViewProjectNode" />
<item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="resource" type="b2602c69:ProjectViewProjectNode" />
<item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
... ... @@ -287,16 +316,15 @@
<workItem from="1568958569115" duration="14347000" />
<workItem from="1569025438791" duration="15935000" />
<workItem from="1569053326084" duration="3343000" />
<workItem from="1569197707712" duration="18877000" />
<workItem from="1569197707712" duration="23819000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="328036000" />
<option name="totallyTimeSpent" value="332978000" />
</component>
<component name="ToolWindowManager">
<frame x="237" y="66" width="1717" height="906" extended-state="0" />
<editor active="true" />
<frame x="179" y="62" width="1717" height="919" extended-state="0" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17682558" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
... ... @@ -661,46 +689,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/ResourceController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="244">
<caret line="58" column="7" lean-forward="true" selection-start-line="58" selection-start-column="7" selection-end-line="58" selection-end-column="7" />
<folding>
<element signature="e#346#543#0#PHP" expanded="false" />
<element signature="e#548#956#0#PHP" expanded="false" />
<element signature="e#962#1253#0#PHP" expanded="false" />
<element signature="e#1258#2915#0#PHP" expanded="false" />
<element signature="e#2921#3173#0#PHP" expanded="false" />
<element signature="e#3178#3633#0#PHP" expanded="false" />
<element signature="e#3639#4194#0#PHP" expanded="false" />
<element signature="e#4201#5476#0#PHP" expanded="false" />
<element signature="e#5482#6202#0#PHP" expanded="false" />
<element signature="e#6207#7625#0#PHP" expanded="false" />
<element signature="e#7631#8303#0#PHP" expanded="false" />
<element signature="e#8308#9894#0#PHP" expanded="false" />
<element signature="e#9900#10758#0#PHP" expanded="false" />
<element signature="e#10763#12524#0#PHP" expanded="false" />
<element signature="e#12530#13370#0#PHP" expanded="false" />
<element signature="e#13375#15480#0#PHP" expanded="false" />
<element signature="e#15486#16133#0#PHP" expanded="false" />
<element signature="e#16138#17576#0#PHP" expanded="false" />
<element signature="e#17582#17998#0#PHP" expanded="false" />
<element signature="e#18003#18822#0#PHP" expanded="false" />
<element signature="e#18827#19505#0#PHP" expanded="false" />
<element signature="e#19511#19965#0#PHP" expanded="false" />
<element signature="e#19970#20744#0#PHP" expanded="false" />
<element signature="e#20750#21256#0#PHP" expanded="false" />
<element signature="e#21261#22692#0#PHP" expanded="false" />
<element signature="e#22698#22977#0#PHP" expanded="false" />
<element signature="e#22982#23424#0#PHP" expanded="false" />
<element signature="e#23430#23664#0#PHP" expanded="false" />
<element signature="e#23669#24062#0#PHP" expanded="false" />
<element signature="e#24068#24299#0#PHP" expanded="false" />
<element signature="e#24304#24662#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/ReleaseController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
... ... @@ -751,22 +739,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/ProvideController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="19">
<caret line="173" column="29" lean-forward="true" selection-start-line="173" selection-start-column="29" selection-end-line="173" selection-end-column="29" />
<folding>
<element signature="e#263#1922#0#PHP" expanded="false" />
<element signature="e#1937#4063#0#PHP" expanded="false" />
<element signature="e#4078#4931#0#PHP" expanded="false" />
<element signature="e#4946#5282#0#PHP" expanded="false" />
<element signature="e#5297#5738#0#PHP" expanded="false" />
<element signature="e#6708#7528#0#PHP" expanded="false" />
<element signature="e#7545#8276#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/active/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
... ... @@ -791,21 +763,78 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/provide/comment.html">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/demand/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-525">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<state relative-caret-position="-295">
<caret line="171" column="87" lean-forward="false" selection-start-line="171" selection-start-column="87" selection-end-line="171" selection-end-column="87" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/demand/edit.html">
<entry file="file://$PROJECT_DIR$/api/index/controller/ResourceController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-445">
<caret line="171" column="87" lean-forward="false" selection-start-line="171" selection-start-column="87" selection-end-line="171" selection-end-column="87" />
<state relative-caret-position="394">
<caret line="579" column="38" lean-forward="false" selection-start-line="579" selection-start-column="8" selection-end-line="579" selection-end-column="38" />
<folding>
<element signature="e#346#543#0#PHP" expanded="false" />
<element signature="e#548#956#0#PHP" expanded="false" />
<element signature="e#962#1253#0#PHP" expanded="false" />
<element signature="e#1258#2915#0#PHP" expanded="false" />
<element signature="e#2921#3173#0#PHP" expanded="false" />
<element signature="e#3178#3633#0#PHP" expanded="false" />
<element signature="e#3639#4194#0#PHP" expanded="false" />
<element signature="e#4201#5476#0#PHP" expanded="false" />
<element signature="e#5482#6202#0#PHP" expanded="false" />
<element signature="e#6207#7625#0#PHP" expanded="false" />
<element signature="e#7631#8303#0#PHP" expanded="false" />
<element signature="e#8308#9894#0#PHP" expanded="false" />
<element signature="e#9900#10758#0#PHP" expanded="false" />
<element signature="e#10763#12524#0#PHP" expanded="false" />
<element signature="e#12530#13370#0#PHP" expanded="false" />
<element signature="e#13375#15480#0#PHP" expanded="false" />
<element signature="e#15486#16133#0#PHP" expanded="false" />
<element signature="e#16138#17576#0#PHP" expanded="false" />
<element signature="e#17582#17998#0#PHP" expanded="false" />
<element signature="e#18827#19505#0#PHP" expanded="false" />
<element signature="e#19511#19965#0#PHP" expanded="false" />
<element signature="e#19970#20744#0#PHP" expanded="false" />
<element signature="e#20750#21256#0#PHP" expanded="false" />
<element signature="e#21261#22692#0#PHP" expanded="false" />
<element signature="e#22698#22977#0#PHP" expanded="false" />
<element signature="e#22982#23424#0#PHP" expanded="false" />
<element signature="e#23430#23664#0#PHP" expanded="false" />
<element signature="e#23669#24062#0#PHP" expanded="false" />
<element signature="e#24068#24299#0#PHP" expanded="false" />
<element signature="e#24304#24662#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/provide/comment.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="557">
<caret line="53" column="31" lean-forward="false" selection-start-line="53" selection-start-column="31" selection-end-line="53" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/ProvideController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="116" column="8" lean-forward="true" selection-start-line="116" selection-start-column="8" selection-end-line="116" selection-end-column="8" />
<folding>
<element signature="e#263#1922#0#PHP" expanded="false" />
<element signature="e#1937#4063#0#PHP" expanded="false" />
<element signature="e#4078#4931#0#PHP" expanded="false" />
<element signature="e#4946#5282#0#PHP" expanded="false" />
<element signature="e#5297#5738#0#PHP" expanded="false" />
<element signature="e#5753#6664#0#PHP" expanded="false" />
<element signature="e#6669#6969#0#PHP" expanded="false" />
<element signature="e#6986#8411#0#PHP" expanded="false" />
<element signature="e#8428#9159#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -178,7 +178,6 @@ class ProvideController extends AdminBaseController
if (!empty($keyword)) {
$where['d.content'] = ['like', "%$keyword%"];
}
$where['d.to_user_id'] = ['eq',0];
$id=$this->request->param('id', 0, 'intval');
$where['d.job_id'] = ['eq',$id];
$data = Db::name('discuss')
... ... @@ -186,18 +185,29 @@ class ProvideController extends AdminBaseController
->field('d.*,u.user_nickname')
->join('user u','d.user_id = u.id','left')
->where($where)
->order('id desc')
->paginate(10);
$list = $data->toArray();
$res = $this->digui($list['data']);
$data->appends($param);
$list=$data->items();
$this->assign([
'job_id'=>$id,
'data'=>$list,
'data'=>$res,
'page'=>$data->render(),
]);
$this->assign('keyword', isset($param['keyword']) ? $param['keyword'] : '');
return $this->fetch();
}
public function digui($array,$pid=0,$f=1){
static $arr=[];
foreach ($array as $k=>$v){
if($v['p_id'] == $pid){
$v['f'] = $f;
$arr[] = $v;
$this->digui($array,$v['id'],$f+1);
}
}
return $arr;
}
//删除评论
public function com_delete()
... ... @@ -206,15 +216,31 @@ class ProvideController extends AdminBaseController
if (isset($param['id'])) {
$id = $this->request->param('id', 0, 'intval');
$resultPortal = Db::name('discuss')
->where(['id' => $id])
->delete();
if($resultPortal){
$this->success("删除成功!", '');
$info = Db::name('discuss')
->where('id',$id)
->find();
if($info['p_id']==0){
Db::name('discuss')
->where('p_id',$id)
->delete();
$resultPortal = Db::name('discuss')
->where(['id' => $id])
->delete();
if($resultPortal){
$this->success("删除成功!", '');
}else{
$this->error("删除失败!", '');
}
}else{
$this->error("删除失败!", '');
$resultPortal = Db::name('discuss')
->where(['id' => $id])
->delete();
if($resultPortal){
$this->success("删除成功!", '');
}else{
$this->error("删除失败!", '');
}
}
}
if (isset($param['ids'])) {
... ...
... ... @@ -35,7 +35,9 @@
<input type="checkbox" class="js-check-all" data-direction="x" data-checklist="js-check-x">
</label>
</th>
<th>ID</th>
<th>用户ID</th>
<th>父级ID</th>
<th>昵称</th>
<th>评论时间</th>
<th>评论详情</th>
... ... @@ -49,9 +51,11 @@
<input type="checkbox" class="js-check" data-yid="js-check-y" data-xid="js-check-x" name="ids[]"
value="{$vo.id}" title="ID:{$vo.id}">
</td>
<td>{$vo.id}</td>
<td>{$vo.user_id}</td>
<td>{$vo.p_id}</td>
<td>{$vo.user_nickname}</td>
<td>{:date('Y-m-d H:i',$vo['create_time'])}</td>
<td>{:date('Y-m-d H:i:s',$vo['create_time'])}</td>
<td>{$vo.content}</td>
<td>
<a class="js-ajax-delete" href="{:url('provide/com_delete',array('id'=>$vo['id']))}">{:lang('DELETE')}</a>
... ...