jsasg/orico-official-website-old
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: bug修复

Browse Source
This commit is contained in:
jsasg
2024-10-29 17:38:47 +08:00
parent 48bf3e6f33
commit cadb9dbcc4
31 changed files with 1032 additions and 662 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
app/admin/controller/Product.php
View File

@@ -13,6 +13,8 @@ class Product extends BaseController {
private $saveDirectory = 'default';
private $config; //配置信息
private $docDir;
private $rootDir;
public function __construct() {
parent::__construct();
date_default_timezone_set("Asia/Shanghai");
@@ -648,7 +650,7 @@ class Product extends BaseController {
foreach($productAttr[$key]['type'] as $kt => $attrValue ) {
//echo $attrValue."<pre>*****"; print_r($productAttr[$key]['sort']);
$arrribute[$kt] = array(
$data['product_attr'][$kt] => $attrValue,
$data['product_attr'][$kt] => trim($attrValue),
'sort'=> isset($productAttr[$key]['sort'][$kt]) ? $productAttr[$key]['sort'][$kt]: ''
);
@@ -694,7 +696,7 @@ class Product extends BaseController {
'product_id' => $last_insert_id,
'image_url' => isset($product_image['image_url']) ? $product_image['image_url'] : '',
'image_bk_color' => isset($product_image['image_bkcolor']) ? $product_image['image_bkcolor'] : '',
'image_color' => isset($product_image['image_color']) ? $product_image['image_color'] : '',
'image_color' => isset($product_image['image_color']) ? trim($product_image['image_color']) : '',
'original_url' => isset($product_image['image_url']) ? $product_image['image_url'] : '',
'country_code' => $this->country_code
);
@@ -821,9 +823,8 @@ class Product extends BaseController {
foreach($productImages as $color => $att_item) {
$product_images[] = $att_item;
}
//echo "<pre>-------"; print_r($product_images); die;
unset($tmp_product_images);
// tiaoshi($product_images);die;
@@ -831,7 +832,7 @@ class Product extends BaseController {
$value['product_images'] = $product_images;
$value['product_two_img'] = model('product_two_img')->getList(array('product_id'=> $product['id']),['id' => 'asc',]);//print_r($value['product_product']);die;
//$value['product_bkimg'] = model('product_bk_img')->getList(array('product_id'=> $product['id']),['id' => 'asc',]);//print_r($value['product_bkimg']);die;
//$value['product_bkimg'] = model('product_bk_img')->getList(array('product_id'=> $product['id']),['id' => 'asc',]);
$value['product_dls'] = model('product_dl')->getList(array('product_id' => $product['id']), ['dl_sort' => 'asc', 'id' => 'asc',]);
$value['product_relateds'] = model('product')->getRelatedProductList(array('pr.product_id' => $product['id']), ['pr.related_sort' => 'asc', 'pr.id' => 'asc',], ['p.id' => 'id', 'p.name', 'pr.id' => 'related_id', 'pr.related_product_id', 'pr.related_sort', 'pr.related_desc']);
// tiaoshi($value['product_images']);die;
@@ -1047,7 +1048,7 @@ class Product extends BaseController {
foreach($productAttr[$key]['type'] as $kt => $attrValue ) {
$arrribute[$kt] = array(
$data['product_attr'][$kt] => $attrValue,
$data['product_attr'][$kt] => trim($attrValue),
'sort'=> isset($productAttr[$key]['sort']) ? $productAttr[$key]['sort'][$kt]: ''
);
@@ -1082,8 +1083,8 @@ class Product extends BaseController {
$product_image_list[$product_image_id] = array('sign' => 'update', 'where' => array('id' => $product_image_id), 'data' => array(
'product_id' => $last_update_id,
'image_url' => $product_image['image_url'],
'image_bk_color' => isset( $product_image['image_bkcolor']) ? $product_image['image_bkcolor'] : '',
'image_color' => isset($product_image['image_color']) ? $product_image['image_color']: '',
'image_bk_color' => isset($product_image['image_bkcolor']) ? $product_image['image_bkcolor'] : '',
'image_color' => isset($product_image['image_color']) ? trim($product_image['image_color']) : '',
'original_url' => $product_image['image_url'],
));
} else {
@@ -1091,12 +1092,13 @@ class Product extends BaseController {
'product_id' => $last_update_id,
'image_url' => $product_image['image_url'],
'image_bk_color' => isset($product_image['image_bkcolor']) ? $product_image['image_bkcolor'] : '',
'image_color' => isset($product_image['image_color']) ? $product_image['image_color']: '',
'image_color' => isset($product_image['image_color']) ? trim($product_image['image_color']) : '',
'original_url' => $product_image['image_url'],
));
}
//$imageModel->insertRow($image);
}
foreach ($product_image_list as $product_image_id => $image) {
if ($image['sign'] == 'insert') {
$imageModel->insertRow($image['data']);
@@ -1106,6 +1108,8 @@ class Product extends BaseController {
$imageModel->deleteRow($image['where']);
}
}
} else {
model('product_two_img')->deleteRow(['product_id' => $last_update_id]);
}
/* 二级列表主图片 end */
@@ -1591,13 +1595,13 @@ class Product extends BaseController {
$arg_order = ['a.id' => 'desc'];
$arg_field = ['a.*', 'c.id' => 'categoryid', 'c.name' => 'categoryname'];
foreach ($id as $where ){
foreach ($id as $where) {
$where = [
'a.id'=>$where,
'a.stat'=>0,
'a.id' => $where,
'a.stat' => 0,
'a.country_code' => $this->country_code
];
$result = model('product')->getProductLists($where,$arg_order,$arg_field,12);
];
$result = model('product')->getProductLists($where, $arg_order, $arg_field, 12);
}
$this->assign($result);
@@ -1711,7 +1715,9 @@ class Product extends BaseController {
}
$arg_order = ['c.sort' => 'asc', 'c.id' => 'asc'];
$arg_field = array_map(function($value) {return 'a.' . $value;}, array_keys($fields));
$arg_field = array_map(function ($value) {
return 'a.' . $value;
}, array_keys($fields));
$arg_field['c.id'] = 'categoryid';
$arg_field['c.name'] = 'categoryname';
$arg_field['c.pid'] = 'pid';
@@ -2592,7 +2598,7 @@ class Product extends BaseController {
mysqli_query($con, $sql);
}
}
} catch (Exception $e) {
} catch (\Exception $e) {
return $this->json(-1, $e->getMessage());
}