Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 1d6c6a50 by 朱继来
Options

Merge branch 'zjl_adjust_20181026' into development

parents 9caf65e6 0e967310
Inline Side-by-side
Showing with 12 additions and 18 deletions
app/Http/Controllers/OrderController.php
...@@ -573,17 +573,7 @@ Class OrderController extends Controller ...@@ -573,17 +573,7 @@ Class OrderController extends Controller
public function templateData(Request $request, $id, $view_id) public function templateData(Request $request, $id, $view_id)
{ {
$info = $this->orderDetail($request, $id); $info = $this->orderDetail($request, $id);
$info['title'] = '订单详情'; $this->pageHeader($request, $info, '订单详情');
$param = $request->only('tags');
if (!$param['tags']) {
$info['paths'] = [["title" => '联营订单', "href" => '#'], ["title" => '平台订单', "href" => '/list'], ["title" => '订单明细', "href" => '#']];
} else if ($param['tags'] && $param['tags'] == 'erp') {
$info['paths'] = [["title" => '联营订单', "href" => '#'], ["title" => 'ERP订单', "href" => '/erp_order'], ["title" => '订单明细', "href" => '#']];
} else if ($param['tags'] && $param['tags'] == 'self') {
$info['paths'] = [["title" => '自营订单', "href" => '#'], ["title" => '自营订单', "href" => '/self_order'], ["title" => '订单明细', "href" => '#']];
}
if ($info['order_info']['order_goods_type'] == 2 && in_array($info['order_info']['order_type'], [1, 3])) { // 平台自营订单 if ($info['order_info']['order_goods_type'] == 2 && in_array($info['order_info']['order_type'], [1, 3])) { // 平台自营订单
if ($request->input('tags') != 'self') { if ($request->input('tags') != 'self') {
......
public/css/detail.css
...@@ -222,7 +222,7 @@ li { ...@@ -222,7 +222,7 @@ li {
.test-order { width: 130px !important; } .test-order { width: 130px !important; }
.Wdate{ width: 110px !important; } .Wdate{ width: 90px !important; }
.btn-group { width: 220px; } .btn-group { width: 220px; }
...@@ -233,3 +233,7 @@ li { ...@@ -233,3 +233,7 @@ li {
.payment-status { width: 220px; } .payment-status { width: 220px; }
} }
@media screen and (max-width: 460px) {
.order_contain { margin-left: 80px !important; }
}
resources/views/erpOrder/content.blade.php
...@@ -23,14 +23,14 @@ ...@@ -23,14 +23,14 @@
</ul> </ul>
</div> </div>
</dd> </dd>
<dd><input type="text" name="order_contain" value="{{$condition['order_contain']}}" placeholder="请输入内容"></dd> <dd class="order_contain"><input type="text" name="order_contain" value="{{$condition['order_contain']}}" placeholder="请输入内容"></dd>
</dl> </dl>
<dl> <dl>
<dt>创建日期： </dt> <dt>创建日期： </dt>
<dd style="width:auto !important;"> <dd style="width:auto !important;">
<input type="text" name="time_start" value="{{ !empty($condition['time_start']) ? date('Y/m/d', $condition['time_start']) : '' }}" class="Wdate " onfocus="WdatePicker({dateFmt:'yyyy/MM/dd'})" placeholder="开始时间" autocomplete="off" /> <input type="text" name="time_start" value="{{ !empty($condition['time_start']) ? date('Y/m/d', $condition['time_start']) : '' }}" class="Wdate " onfocus="WdatePicker({dateFmt:'yyyy/MM/dd'})" placeholder="开始时间" autocomplete="off" />
</dd> </dd>
<dd> <dd style="width:auto !important;">
<input type="text" name="time_end" value="{{ !empty($condition['time_end']) ? date('Y/m/d', $condition['time_end']) : '' }}" class="Wdate " onfocus="WdatePicker({dateFmt:'yyyy/MM/dd'})" placeholder="结束时间" autocomplete="off" /> <input type="text" name="time_end" value="{{ !empty($condition['time_end']) ? date('Y/m/d', $condition['time_end']) : '' }}" class="Wdate " onfocus="WdatePicker({dateFmt:'yyyy/MM/dd'})" placeholder="结束时间" autocomplete="off" />
</dd> </dd>
</dl> </dl>
......
resources/views/orderlist/content.blade.php
...@@ -23,14 +23,14 @@ ...@@ -23,14 +23,14 @@
</ul> </ul>
</div> </div>
</dd> </dd>
<dd><input type="text" name="order_contain" value="{{$condition['order_contain']}}" placeholder="请输入内容"></dd> <dd class="order_contain"><input type="text" name="order_contain" value="{{$condition['order_contain']}}" placeholder="请输入内容"></dd>
</dl> </dl>
<dl> <dl>
<dt>创建日期： </dt> <dt>创建日期： </dt>
<dd style="width:auto !important;"> <dd style="width:auto !important;">
<input type="text" name="time_start" value="{{ !empty($condition['time_start']) ? date('Y/m/d', $condition['time_start']) : '' }}" class="Wdate " onfocus="WdatePicker({dateFmt:'yyyy/MM/dd'})" placeholder="开始时间" autocomplete="off" /> <input type="text" name="time_start" value="{{ !empty($condition['time_start']) ? date('Y/m/d', $condition['time_start']) : '' }}" class="Wdate " onfocus="WdatePicker({dateFmt:'yyyy/MM/dd'})" placeholder="开始时间" autocomplete="off" />
</dd> </dd>
<dd> <dd style="width:auto !important;">
<input type="text" name="time_end" value="{{ !empty($condition['time_end']) ? date('Y/m/d', $condition['time_end']) : '' }}" class="Wdate " onfocus="WdatePicker({dateFmt:'yyyy/MM/dd'})" placeholder="结束时间" autocomplete="off" /> <input type="text" name="time_end" value="{{ !empty($condition['time_end']) ? date('Y/m/d', $condition['time_end']) : '' }}" class="Wdate " onfocus="WdatePicker({dateFmt:'yyyy/MM/dd'})" placeholder="结束时间" autocomplete="off" />
</dd> </dd>
</dl> </dl>
......
resources/views/selfOrder/content.blade.php
...@@ -24,14 +24,14 @@ ...@@ -24,14 +24,14 @@
</ul> </ul>
</div> </div>
</dd> </dd>
<dd><input type="text" name="order_contain" value="{{$condition['order_contain']}}" placeholder="请输入内容"></dd> <dd class="order_contain"><input type="text" name="order_contain" value="{{$condition['order_contain']}}" placeholder="请输入内容"></dd>
</dl> </dl>
<dl> <dl>
<dt>创建日期： </dt> <dt>创建日期： </dt>
<dd style="width:auto !important;"> <dd style="width:auto !important;">
<input type="text" name="time_start" value="{{ !empty($condition['time_start']) ? date('Y/m/d', $condition['time_start']) : '' }}" class="Wdate " onfocus="WdatePicker({dateFmt:'yyyy/MM/dd'})" placeholder="开始时间" autocomplete="off" /> <input type="text" name="time_start" value="{{ !empty($condition['time_start']) ? date('Y/m/d', $condition['time_start']) : '' }}" class="Wdate " onfocus="WdatePicker({dateFmt:'yyyy/MM/dd'})" placeholder="开始时间" autocomplete="off" />
</dd> </dd>
<dd> <dd style="width:auto !important;">
<input type="text" name="time_end" value="{{ !empty($condition['time_end']) ? date('Y/m/d', $condition['time_end']) : '' }}" class="Wdate " onfocus="WdatePicker({dateFmt:'yyyy/MM/dd'})" placeholder="结束时间" autocomplete="off" /> <input type="text" name="time_end" value="{{ !empty($condition['time_end']) ? date('Y/m/d', $condition['time_end']) : '' }}" class="Wdate " onfocus="WdatePicker({dateFmt:'yyyy/MM/dd'})" placeholder="结束时间" autocomplete="off" />
</dd> </dd>
</dl> </dl>
......
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 sign in to comment