From cf3c0d7745e5a0678f2961cdad0664e39c3b0b58 Mon Sep 17 00:00:00 2001
From: xxb <xuxianbin1990820@163.com>
Date: Wed, 8 Sep 2021 17:21:31 +0800
Subject: [PATCH] liche update for admin order detail display mv

---
 admin/controllers/receiver/Orders.php |  2 +-
 admin/views/receiver/orders/oinfo.php | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/admin/controllers/receiver/Orders.php b/admin/controllers/receiver/Orders.php
index 63c897cc..d0586bdc 100644
--- a/admin/controllers/receiver/Orders.php
+++ b/admin/controllers/receiver/Orders.php
@@ -102,7 +102,7 @@ class Orders extends HD_Controller{
             if($biz_id){
                 $row_biz = $this->biz_model->get(array('id' => $biz_id));
             }
-            $admin_name = $row_admin ? "{$row_biz['biz_name']}门店 {$row_admin['uname']}":"";
+            $admin_name = $row_admin ? "{$row_biz['biz_name']} {$row_admin['uname']}":"";
             $row['admin_name'] = $admin_name;
         }
 
diff --git a/admin/views/receiver/orders/oinfo.php b/admin/views/receiver/orders/oinfo.php
index 2a114b25..8b38f4d8 100644
--- a/admin/views/receiver/orders/oinfo.php
+++ b/admin/views/receiver/orders/oinfo.php
@@ -59,6 +59,14 @@
                     </label>
                 </div>
             </div>
+            <div class="am-form-group am-u-lg-3 am-u-end">
+                <label class="am-para-label label-width"><span class="span-bold">销售员：</span></label>
+                <div class="am-para-input">
+                    <label class="am-para-label align-l w200">{{info.admin_name}}</label>
+                </div>
+            </div>
+        </div>
+        <div class="am-form-inline am-u-lg-12">
             <div class="am-form-group am-u-lg-3">
                 <label class="am-para-label label-width"><span class="span-bold">车辆信息：</span></label>
                 <div class="am-para-input">
@@ -70,14 +78,10 @@
                     </label>
                 </div>
             </div>
-            <div class="am-form-group am-u-lg-3">
-                <label class="am-para-label label-width"><span class="span-bold">销售员：</span></label>
-                <div class="am-para-input">
-                    <label class="am-para-label align-l w200">{{info.admin_name}}</label>
-                </div>
-            </div>
-            <div class="am-form-group am-u-lg-3 align-r">
-                <a @click="carModal" class='am-btn am-btn-primary am-btn-xs'>车辆匹配</a>
+            <div class="am-form-group am-u-lg-3 am-u-end align-r">
+                <label class="am-para-label label-width">
+                    <a @click="carModal" class='am-btn am-btn-primary am-btn-xs'>车辆匹配</a>
+                </label>
             </div>
         </div>
     </div>