mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
mkm 2024-03-01 15:06:04 +08:00
parent 37bd5326b6
commit 738cca59bc
26 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/common/repositories/store/parameter/ParameterValueRepository.php
View File

@ -35,6 +35,7 @@ class ParameterValueRepository extends BaseRepository
public function create($id, $data,$merId) public function create($id, $data,$merId)
{ {
if (empty($data)) return ; if (empty($data)) return ;
$create=[];
foreach ($data as $datum) { foreach ($data as $datum) {
if ($datum['name'] && $datum['value']) { if ($datum['name'] && $datum['value']) {
$create[] = [ $create[] = [
@ -48,7 +49,7 @@ class ParameterValueRepository extends BaseRepository
]; ];
} }
} }
if ($create) $this->dao->insertAll($create); if (count($create)>0) $this->dao->insertAll($create);
} }

38
app/controller/admin/store/StoreProduct.php
View File

@ -306,30 +306,30 @@ class StoreProduct extends BaseController
public function copy($product_id = 0, $mer_id = 0, $street_code = 0, $type_id = 0, $category_id = 0) public function copy($product_id = 0, $mer_id = 0, $street_code = 0, $type_id = 0, $category_id = 0)
{ {
if ($product_id == 0) return app('json')->fail('参数错误'); if ($product_id == 0) return app('json')->fail('参数错误');
$find= Db::name('merchant')->where('mer_id',$mer_id)->find(); // $find= Db::name('merchant')->where('mer_id',$mer_id)->find();
$products = $this->repository->getAdminOneProduct($product_id, 0); $products = $this->repository->getAdminOneProduct($product_id, 0);
$product = $products->toArray(); $product = $products->toArray();
$product['mer_id'] = $mer_id; $product['mer_id'] = $mer_id;
$product['old_product_id'] = $product['product_id']; $product['old_product_id'] = $product['product_id'];
$productId = $this->repository->create($product, 0, 1); $productId = $this->repository->create($product, 0, 1);
$data = [ // $data = [
'product_id' => $productId, // 'product_id' => $productId,
'mer_id' => $mer_id, // 'mer_id' => $mer_id,
'source_mer_id' => $products['mer_id'], // 'source_mer_id' => $products['mer_id'],
'street_code' => $street_code, // 'street_code' => $street_code,
'weight' => 1, // 'weight' => 1,
'status' => 1, // 'status' => 1,
'create_time' => date('Y-m-d H:i:s'), // 'create_time' => date('Y-m-d H:i:s'),
'type_id' => $type_id, // 'type_id' => $type_id,
'category_id' => $category_id, // 'category_id' => $category_id,
'cate_id' => 2244, // 'cate_id' => 2244,
'long' => $find['long'], // 'long' => $find['long'],
'lat' => $find['lat'], // 'lat' => $find['lat'],
'lat' => $find['lat'], // 'lat' => $find['lat'],
'store_name' => $products['store_name'], // 'store_name' => $products['store_name'],
'activity_id' =>2, // 'activity_id' =>2,
]; // ];
Db::name('cloud_product')->insert($data); // Db::name('cloud_product')->insert($data);
return $productId; return $productId;
} }
} }

2
public/index.html
View File

@ -2,4 +2,4 @@
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />') document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')
if(window.location.protocol == 'https:'){ if(window.location.protocol == 'https:'){
document.write('<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">') document.write('<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">')
}</script><link rel=stylesheet href=/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.c6349b23.js></script><script src=/static/js/index.c19c6f8b.js></script></body></html> }</script><link rel=stylesheet href=/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.c6349b23.js></script><script src=/static/js/index.0bfdbb83.js></script></body></html>

1
public/static/js/index.0bfdbb83.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/index.c19c6f8b.js
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-cloud_warehouse-small_classification-index.2cdfedb1.js
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-cloud_warehouse-small_classification-index.acf837c8.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-gather-gather~pages-moreProject-moreProject~pages-plant_release-index~pages-trading_hall-adddi~105e47dc.2f69226a.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-gather-gather~pages-moreProject-moreProject~pages-plant_release-index~pages-trading_hall-adddi~105e47dc.6cf65515.js
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-goods_details-index.790c107a.js
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-goods_details-index.e51e9103.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-goods_details-index_v.6a15bfe7.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-goods_details-index_v.b0480cf3.js
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-index-index.04dff1d5.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-index-index.2cba09d4.js
View File

File diff suppressed because one or more lines are too long

2
public/static/js/pages-nongKe-supply_chain-purchase_control~pages-payment-settlement~pages-users-order_confirm-index~~2c6b68f2.a111bd74.js → public/static/js/pages-nongKe-supply_chain-purchase_control~pages-users-order_confirm-index~pages-users-order_list-in~de58159c.b483e7de.js
View File

File diff suppressed because one or more lines are too long

2
public/static/js/pages-order_details-index.5c980249.js → public/static/js/pages-order_details-index.bdf3d377.js
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-payment-get_payment.61922bdc.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-payment-get_payment.707f0025.js
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-payment-settlement.7f7884fd.js
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-payment-settlement.90b15d32.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-payment-settlement~pages-users-order_confirm-index.7f1e567b.js
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-supply_chains-supply_chains.85bf15b1.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-supply_chains-supply_chains.869f63fb.js
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-users-order_confirm-index.4a808f60.js
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-users-order_confirm-index.da5bbfe7.js Normal file
View File

File diff suppressed because one or more lines are too long