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

Merge pull request 'dev' (#21) from dev into master

Browse Source 
Reviewed-on: http://git.excellentkk.cn/mkm/shop-php/pulls/21
This commit is contained in:
mkm 2023-09-01 09:16:56 +08:00
commit 26884cfd16
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/common/repositories/community/CommunityRepository.php
View File

@ -407,11 +407,14 @@ class CommunityRepository extends BaseRepository
if (!$getTopic || !$getTopic->status) throw new ValidateException('话题不存在或已关闭');
$data['category_id'] = $getTopic->category_id;
}
Db::transaction(function () use($id, $data) {
$spuId = $data['spu_id'];
$productInfo = $data['product_info'];
unset($data['spu_id'], $data['product_info']);
if ($data['is_type'] != self::COMMUNITY_TYPE_ENTRUST) {
unset($data['entrust_mer_id'], $data['entrust_day']);
}
$community = $this->dao->update($id, $data);
if ($spuId) $this->joinProduct($id, $spuId);
if ($productInfo && $data['is_type'] == self::COMMUNITY_TYPE_RESALE) {

BIN
public/static.dev/images/plant-header.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 843 KiB

3
public/static.dev/images/plant-header.png:Zone.Identifier Normal file
View File

@ -0,0 +1,3 @@
[ZoneTransfer]
ZoneId=3
HostUrl=https://mer.crmeb.net/static/images/plant-header.png