Skip to content

B
backend
Commit 7788147e by LiuJunYi
Options

删除活动

parent 883782ab
Showing with 30 additions and 17 deletions
application/admin/controller/Guide.php
...@@ -117,6 +117,7 @@ class Guide extends AuthBase ...@@ -117,6 +117,7 @@ class Guide extends AuthBase
if (!$validate->scene('update')->check($data)) { if (!$validate->scene('update')->check($data)) {
$msg = $validate->getError(); $msg = $validate->getError();
$this->assign('msg', $msg); $this->assign('msg', $msg);
// halt($msg);
return view(); return view();
} }
$condition = [ $condition = [
......
application/admin/controller/Order.php
...@@ -53,7 +53,13 @@ class Order extends AuthBase ...@@ -53,7 +53,13 @@ class Order extends AuthBase
} }
} }
//根据筛选条件查询 //根据筛选条件查询
$order_list = $this->order_model->where($condition)->order('created_at desc')->paginate(10, false, ['query' => ['status' => $status, 'start_time' => $start_time, 'end_time' => $end_time, 'type' => $type]]); $order_list = $this->order_model->with(['project' => function ($query) {
}])->where($condition)->order('created_at desc')->paginate(10, false, ['query' => ['status' => $status, 'start_time' => $start_time, 'end_time' => $end_time, 'type' => $type]])->each(function ($item) {
$project = \app\common\model\Project::withTrashed()->find($item['pid']);
$item['project_poster'] = $project['poster'];
$item['project_title'] = $project['title'];
});
$this->assign("order_list", $order_list); $this->assign("order_list", $order_list);
$this->assign("status", $status); $this->assign("status", $status);
return $this->fetch(); return $this->fetch();
...@@ -236,13 +242,13 @@ class Order extends AuthBase ...@@ -236,13 +242,13 @@ class Order extends AuthBase
} }
$order = \app\common\model\Order::get($refund->order_id); $order = \app\common\model\Order::get($refund->order_id);
Db::startTrans(); Db::startTrans();
try{ try {
//修改订单状态 //修改订单状态
$refund->status = 2; $refund->status = 2;
$order->is_refund = 3; $order->is_refund = 3;
$order->status = 3; $order->status = 3;
$project = \app\common\model\Project::get($order->pid); $project = \app\common\model\Project::get($order->pid);
$project->sign_num = $project->sign_num-$order['extras']['sign_limits']; $project->sign_num = $project->sign_num - $order['extras']['sign_limits'];
$refund->save();//修改退款列表状态 $refund->save();//修改退款列表状态
$order->save();//修改订单状态 $order->save();//修改订单状态
$project->save();//减少限制数组量 $project->save();//减少限制数组量
...@@ -277,7 +283,7 @@ class Order extends AuthBase ...@@ -277,7 +283,7 @@ class Order extends AuthBase
} else { } else {
throw new Exception($result['return_msg']); throw new Exception($result['return_msg']);
} }
}catch(Exception $e){ } catch (Exception $e) {
Db::rollback(); Db::rollback();
return json(['code' => 1, 'msg' => $e->getMessage()]); return json(['code' => 1, 'msg' => $e->getMessage()]);
} }
......
application/admin/controller/Project.php
...@@ -125,9 +125,9 @@ class Project extends AuthBase ...@@ -125,9 +125,9 @@ class Project extends AuthBase
{ {
$id = input('post.id'); $id = input('post.id');
$used = model('Orders')->where('pid', $id)->count(); $used = model('Orders')->where('pid', $id)->count();
if ($used > 0) { // if ($used > 0) {
$this->error('该项目已有用户下单,不可删除！', '', '', 1); // $this->error('该项目已有用户下单,不可删除！', '', '', 1);
} // }
$res = model('project')->destroy($id); $res = model('project')->destroy($id);
if ($res) { if ($res) {
...@@ -301,7 +301,11 @@ class Project extends AuthBase ...@@ -301,7 +301,11 @@ class Project extends AuthBase
public function appoint() public function appoint()
{ {
$title = input('get.name', ''); $title = input('get.name', '');
$items = $this->appoint_model->where('nickname', 'like', "%" . $title . "%")->order('id', 'desc')->paginate(15, false, ['query' => ['nickname' => $title]]); $items = $this->appoint_model->where('nickname', 'like', "%" . $title . "%")->order('id', 'desc')->paginate(15, false, ['query' => ['nickname' => $title]])->each(function($item){
$project = \app\common\model\Project::withTrashed()->find($item['pid']);
$item['project_poster'] = $project['poster'];
$item['project_title'] = $project['title'];
});
$this->assign("items", $items); $this->assign("items", $items);
return $this->fetch(''); return $this->fetch('');
} }
......
application/admin/view/guide/update.html
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<h3 class=""> <h3 class="">
<a href="<?php echo url('@admin/Guide/index')?>"> <a href="<?php echo url('@admin/Guide/index')?>">
<i class="fa fa-angle-right"></i> <a href="{:url('admin/Guide/index')}">美行攻略</a> <i class="fa fa-angle-right"></i> <i class="fa fa-angle-right"></i> <a href="{:url('admin/Guide/index')}">美行攻略</a> <i class="fa fa-angle-right"></i>
{if condition="$article"} {if $article}
修改攻略 修改攻略
{else/} {else/}
发布攻略 发布攻略
...@@ -107,6 +107,7 @@ ...@@ -107,6 +107,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="col-sm-offset-2 col-sm-10"> <div class="col-sm-offset-2 col-sm-10">
<input type="hidden" name="id" value="{$article.id??'';}">
<button type="submit" class="btn btn-success" id="btn-save">提交</button> <button type="submit" class="btn btn-success" id="btn-save">提交</button>
</div> </div>
</div> </div>
......
application/admin/view/order/index.html
...@@ -68,11 +68,11 @@ ...@@ -68,11 +68,11 @@
{/if} {/if}
</td> </td>
<td> <td>
{if condition="$vo.project"} {if condition="$vo.project_poster"}
<a href="{$vo.project.poster}" target="_blank" data-fancybox="images"> <a href="{$vo.project_poster}" target="_blank" data-fancybox="images">
<img src="{$vo.project.poster}" width='100'> <img src="{$vo.project_poster}" width='100'>
</a> </a>
<p style="padding:0;margin:0;">{$vo.project.title}</p> <p style="padding:0;margin:0;">{$vo.project_title}</p>
{/if} {/if}
</td> </td>
<td> <td>
......
application/admin/view/project/appoint.html
...@@ -37,11 +37,11 @@ ...@@ -37,11 +37,11 @@
<tr id="tr_{$vo.id}"> <tr id="tr_{$vo.id}">
<td>{$k}</td> <td>{$k}</td>
<td> <td>
{if condition="$vo.project"} {if condition="$vo.project_poster"}
<a href="{$vo.project.poster}" target="_blank" data-fancybox="images"> <a href="{$vo.project_poster}" target="_blank" data-fancybox="images">
<img src="{$vo.project.poster}" width='100'> <img src="{$vo.project_poster}" width='100'>
</a> </a>
<p style="padding:0;margin:0;">{$vo.project.title}</p> <p style="padding:0;margin:0;">{$vo.project_title}</p>
{/if} {/if}
</td> </td>
<td> <td>
......
application/common/model/Orders.php
...@@ -21,4 +21,5 @@ class Orders extends BaseModel ...@@ -21,4 +21,5 @@ class Orders extends BaseModel
public function getProjectNameAttr($value,$data){ public function getProjectNameAttr($value,$data){
return ProjectModel::get($data['pid']); return ProjectModel::get($data['pid']);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment