调整

app/Model/CommonModel.php

@@ -213,13 +213,13 @@ class CommonModel extends Model
     // 判断品牌是否存在
     // 判断品牌是否存在
     public function isBrandNameExists($brand_name)
     public function isBrandNameExists($brand_name)
     {
     {
-        return DB::connection("spu")->table('lie_brand')->where('brand_name', $brand_name)->value('brand_id');
+        return DB::connection("spu")->table('brand')->where('brand_name', $brand_name)->value('brand_id');
     }
     }
 
 
     // 判断供应商是否存在
     // 判断供应商是否存在
     public function isSupplierNameExists($supplier_name)
     public function isSupplierNameExists($supplier_name)
     {
     {
-        return  DB::connection('ass')->table('lie_supplier_channel')->where('supplier_name', $supplier_name)->value('supplier_id');
+        return  DB::connection('ass')->table('supplier_channel')->where('supplier_name', $supplier_name)->value('supplier_id');
     }
     }
 
 
 }
 }
\ No newline at end of file

app/Model/QuoteModel.php

@@ -235,7 +235,7 @@ class QuoteModel extends Model
         foreach ($data as &$v) {
         foreach ($data as &$v) {
             $currency_sign = $v['currency'] == 1 ? '￥' : '$';
             $currency_sign = $v['currency'] == 1 ? '￥' : '$';
 
 
-            $v['currency_val']  = $v['currency'] == 1 ? 'RMB' : 'USD';
+            $v['currency_val']  = array_get(Config('quote.currency'), $v['currency'], '人民币');
             $v['price']         = $v['currency'] == 1 ? $currency_sign.$v['price_rmb'] : $currency_sign.$v['price_origin'];
             $v['price']         = $v['currency'] == 1 ? $currency_sign.$v['price_rmb'] : $currency_sign.$v['price_origin'];
             $v['status_val']    = array_get(Config('quote.quote_status'), $v['status'], '');
             $v['status_val']    = array_get(Config('quote.quote_status'), $v['status'], '');