Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 55d6d681 by 朱继来
Options

Merge branch 'zjl_order_20200923'

parents 600874a7 db15ba4d
Inline Side-by-side
Showing with 7 additions and 1 deletions
app/Http/Controllers/OrderController.php
...@@ -465,6 +465,8 @@ Class OrderController extends Controller ...@@ -465,6 +465,8 @@ Class OrderController extends Controller
// 非尽调账号显示真实数据 // 非尽调账号显示真实数据
if ($request->user->email != 'vpadmin@ichunt.com') { if ($request->user->email != 'vpadmin@ichunt.com') {
$map['is_fake'] = 0; $map['is_fake'] = 0;
} else {
$map['vp_time_set'] = strtotime(Config('website.vp_time_set'));
} }
$map['order_goods_type'] = $tid; $map['order_goods_type'] = $tid;
......
config/website.php
...@@ -25,7 +25,7 @@ return [ ...@@ -25,7 +25,7 @@ return [
'check_access_api' => 'http://perm.liexin.net/api/perms/access', 'check_access_api' => 'http://perm.liexin.net/api/perms/access',
// 竞调账户配置显示时间 // 竞调账户配置显示时间
'vp_time_set' => '2018-05-01', 'vp_time_set' => '2019-8-30',
// 基石服务地址 // 基石服务地址
'SERVICE_DOMAIN' => 'http://192.168.1.100', 'SERVICE_DOMAIN' => 'http://192.168.1.100',
......
resources/views/orderlist/content.blade.php
...@@ -37,6 +37,8 @@ ...@@ -37,6 +37,8 @@
<input type="text" name="erp_sn" value="{{$condition['erp_sn']}}" placeholder="请输入ERP订单号"> <input type="text" name="erp_sn" value="{{$condition['erp_sn']}}" placeholder="请输入ERP订单号">
</dd> </dd>
</dl> </dl>
@if ($username != 'vpadmin@ichunt.com')
<dl> <dl>
<dd style="width: 110px;"> <dd style="width: 110px;">
<div class="droplist" data-default="{{$condition['select_time_type']}}" id="select_time_type" name="select_time_type"> <div class="droplist" data-default="{{$condition['select_time_type']}}" id="select_time_type" name="select_time_type">
...@@ -57,6 +59,8 @@ ...@@ -57,6 +59,8 @@
<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>
@endif
<dl> <dl>
<dt>型号名称：</dt> <dt>型号名称：</dt>
<dd> <dd>
......
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