Merge branch 'zjl_order_20200923'

app/Http/Controllers/OrderController.php

@@ -465,6 +465,8 @@ Class OrderController extends Controller
         // 非尽调账号显示真实数据
         if ($request->user->email != 'vpadmin@ichunt.com') {
             $map['is_fake'] = 0;
+        } else {
+            $map['vp_time_set'] = strtotime(Config('website.vp_time_set'));
         }
 
         $map['order_goods_type'] = $tid;

config/website.php

@@ -25,7 +25,7 @@ return [
     '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',

resources/views/orderlist/content.blade.php

@@ -37,6 +37,8 @@
                                         <input type="text" name="erp_sn" value="{{$condition['erp_sn']}}" placeholder="请输入ERP订单号">
                                     </dd>
                                 </dl> 
+                                
+                                @if ($username != 'vpadmin@ichunt.com')
                                 <dl>
                                     <dd style="width: 110px;">
                                         <div class="droplist" data-default="{{$condition['select_time_type']}}" id="select_time_type" name="select_time_type">
@@ -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" />
                                     </dd>
                                 </dl>
+                                @endif
+
                                 <dl>
                                     <dt>型号名称：</dt>
                                     <dd>