调整vp账号显示

app/Http/Controllers/AddOrderController.php

@@ -281,7 +281,7 @@ Class AddOrderController extends Controller
         if (!empty($intracode)) {
             $user = DB::connection('order')->table('lie_user_main')->where('user_id', $intracode->user_id)->select('mobile')->first();
 
-            $info['mobile'] = $user->mobile;
+            $info['mobile'] = $user->mobile ? $user->mobile : '';
         }
 
         return view('addOffline', $info);

public/css/detail.css

@@ -203,7 +203,11 @@ li {
 }
 
 /* 响应式 */
-@media screen and (max-width: 500px) {
+@media screen and (max-width: 768px) {
+	.body-small .navbar-static-side { width: 170px; top: 48px; left: 10px;  }
+
+	.search-box > div dl dd { width: 130px; }
+
 	.Wdate{ width: 110px !important; }
 
     .btn-group { width: 220px; }

resources/views/detail/content.blade.php

@@ -406,10 +406,16 @@
                             <th>型号</th>
                         @endif
                         <th>制造商</th>
+
+                        @if ($username != 'vpadmin@ichunt.com')
                             <th>采购数量</th>
                             <th>采购单价</th>
-                        <!-- <th>采购小计</th> -->
                             <th>均摊后单价</th>
+                        @else
+                            <th>商品数量</th>
+                            <th>商品单价</th>
+                        @endif
+                        
                         <th>小计</th>
                         <th>货期</th>
                         <th>供应商</th>
@@ -436,14 +442,15 @@
                             <td id="goods_number_{{$v['rec_id']}}">{{$v['goods_number']}}</td>
                             <td>
                                 <span id="{{$v['rec_id']}}">{{$v['goods_price_format']}}</span>
-                                <!-- {$currency}<span id="{$v.rec_id}">{$v.goods_price}</span> -->
                             </td>
-                            <!-- <td> -->
-                                <!-- <span id="total_{{$v['rec_id']}}">{{$v['goods_amount_format']}}</span> -->
-                                <!-- {$currency}<span id="total_{$v.rec_id}">{$v.total}</span> -->
-                            <!-- </td> -->
+                            
+                            @if ($username != 'vpadmin@ichunt.com')
                                 <td>{{$v['single_pre_price_format']}}</td>
                                 <td>{{$v['single_pre_price_amount']}}</td>
+                            @else
+                                <td>{{ $currency . number_format($v['goods_price'] * $v['goods_number'], 4, '.', '') }}</td>
+                            @endif
+
                             <td>{{$v['delivery_time']}}</td>
                             <td>{{$v['supplier_name']}}</td>
 
@@ -470,7 +477,7 @@
                 <table>
                     <tr>
                         <td>商品总额：</td>
-                        <td>{{$currency}}<span id="order-total" class="amount">{{$order_price_info['goods_price']}}</span></td>
+                        <td>{{$currency}}<span id="order-total" class="amount">{{$order_price_info['goods_price'] ? $order_price_info['goods_price'] : $order_info['order_amount']}}</span></td>
                     </tr>
 
                     @if (isset($order_price_info['ext_price']))

resources/views/index/css.blade.php

@@ -14,6 +14,7 @@
 <link href="/js/plugins/jsonformater/jsonFormater.css" rel="stylesheet">
 <link href="/css/animate.css" rel="stylesheet">
 <link href="/css/style.css" rel="stylesheet">
+<link href="/css/detail.css" rel="stylesheet">
 
 <style>
 .well .form-group {

resources/views/orderlist/content.blade.php

@@ -110,6 +110,7 @@
                                         </div>
                                     </dd>
                                 </dl> -->
+                                @if ($username != 'vpadmin@ichunt.com')
                                 <dl>
                                     <dt>订单来源：</dt>
                                     <dd style="width: 115px;">
@@ -123,6 +124,7 @@
                                         </div>
                                     </dd>
                                 </dl>
+                                @endif
                                 <dl>
                                     <dt>adtag来源：</dt>
                                     <dd>
@@ -135,6 +137,7 @@
                                         <input type="text" name="order_source_ptag" value="{{$condition['order_source_ptag']}}" placeholder="请输入内容">
                                     </dd>
                                 </dl>
+                                @if ($username != 'vpadmin@ichunt.com')
                                 <dl>
                                     <dt>同步状态：</dt>
                                     <dd style="width: 115px;">
@@ -146,6 +149,7 @@
                                         </div>
                                     </dd>
                                 </dl>
+                                @endif
                                 <dl>
                                     <dt>用户标签：</dt>
                                     <dd>
@@ -206,9 +210,11 @@
                     <th class="pl30">订单类型</th>
                     <th class="pl30">支付方式</th>                  
                     <th class="pl30">推送业务员</th>
+                    @if ($username != 'vpadmin@ichunt.com')
                         <th class="pl30">订单来源</th>
                         <th class="pl30">同步状态</th>
                         <th class="pl30">收货人</th> 
+                    @endif                  
                     <th class="pl30">下单时间</th>                   
                     <th class="pl30">操作</th>
                 </tr>
@@ -259,6 +265,7 @@
                             
                             <td class="show-list"><?php print_r(App\Http\Controllers\getSalesName($v['sale_id'])); ?></td>
                             
+                            @if ($username != 'vpadmin@ichunt.com')
                                 <td class="show-list"><?php echo App\Http\Controllers\getOrderSource($v['order_id']); ?></td>
                                 
                                 <td class="show-list">
@@ -276,7 +283,10 @@
                                         }
                                     ?>
                                 </td>
+                                
                                 <td class="show-list"><?php echo App\Http\Controllers\getOrderAddress($v['order_id']); ?></td>
+                            @endif
+
                             <td class="show-list">{{$username != 'vpadmin@ichunt.com' ? date('Y-m-d H:i:s', $v['create_time']) : date('Y-m-d', $v['create_time'])}}</td>
                             <td>
                                 <div class="btn-group btn-group-xs">