|
@@ -892,7 +892,7 @@ class StoreProduct extends BaseController
|
|
892
|
// $mmerchat_data = Db::name('merchant')->where('mer_id', $pdata['mer_id'])->find();
|
892
|
// $mmerchat_data = Db::name('merchant')->where('mer_id', $pdata['mer_id'])->find();
|
|
893
|
// $mer_name = $mmerchat_data['mer_name'];
|
893
|
// $mer_name = $mmerchat_data['mer_name'];
|
|
894
|
$price = $pdata['price'];
|
894
|
$price = $pdata['price'];
|
|
895
|
- $yanglao=$ProductRepository->yanglaojin($pdata['product_id']);
|
|
|
|
|
|
895
|
+ $yanglao=$ProductRepository->pvParm($pdata['product_id']);
|
|
896
|
// if($pdata['type'] == 5){
|
896
|
// if($pdata['type'] == 5){
|
|
897
|
// $mer_name = Db::name('big_warehouse') -> where('id',$pdata['dc_id']) -> value('warehouse_name');
|
897
|
// $mer_name = Db::name('big_warehouse') -> where('id',$pdata['dc_id']) -> value('warehouse_name');
|
|
898
|
// $price = $pdata['dc_price'];
|
898
|
// $price = $pdata['dc_price'];
|
|
@@ -914,7 +914,7 @@ class StoreProduct extends BaseController
|
|
914
|
|
914
|
|
|
915
|
'text' => array(
|
915
|
'text' => array(
|
|
916
|
array(
|
916
|
array(
|
|
917
|
- 'text' => $yanglao,
|
|
|
|
|
|
917
|
+ 'text' => $yanglao['yanglao'],
|
|
918
|
'left' => 160,
|
918
|
'left' => 160,
|
|
919
|
'top' => 315,
|
919
|
'top' => 315,
|
|
920
|
'fontPath' => $filelink['Normal'], //字体文件
|
920
|
'fontPath' => $filelink['Normal'], //字体文件
|