调整渠道名

app/Http/Controllers/OrderController.php

@@ -279,9 +279,9 @@ function getOrderAddress($order_id)
 function getSupplierName($key)
 function getSupplierName($key)
 {
 {
     $redis = Redis::connection('read');
     $redis = Redis::connection('read');
-    $supp_info = json_decode($redis->hget('supp_info_', $key), true);
+    $supp_info = $redis->hget('supp_info_', $key);
 
 
-    return $supp_info['supplier_name'];
+    return $supp_info;
 }
 }
 
 
 Class OrderController extends Controller
 Class OrderController extends Controller

resources/views/detail/changeOrder.blade.php

@@ -113,7 +113,7 @@
                 <p>附加费设置</p>
                 <p>附加费设置</p>
                 <table class="table table-bordered table-hover extend-fee-table">
                 <table class="table table-bordered table-hover extend-fee-table">
                     <thead>
                     <thead>
-                        <th>供应商</th>
+                        <th>供应商/渠道</th>
                         <th>商品金额</th>
                         <th>商品金额</th>
                         <th>调整附加费</th>
                         <th>调整附加费</th>
                     </thead>
                     </thead>