diff --git a/app/common/repositories/community/CommunityRepository.php b/app/common/repositories/community/CommunityRepository.php index cd9f6467..305375f6 100644 --- a/app/common/repositories/community/CommunityRepository.php +++ b/app/common/repositories/community/CommunityRepository.php @@ -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) { diff --git a/public/static.dev/images/plant-header.png b/public/static.dev/images/plant-header.png new file mode 100644 index 00000000..bdb1b754 Binary files /dev/null and b/public/static.dev/images/plant-header.png differ diff --git a/public/static.dev/images/plant-header.png:Zone.Identifier b/public/static.dev/images/plant-header.png:Zone.Identifier new file mode 100644 index 00000000..acf11b70 --- /dev/null +++ b/public/static.dev/images/plant-header.png:Zone.Identifier @@ -0,0 +1,3 @@ +[ZoneTransfer] +ZoneId=3 +HostUrl=https://mer.crmeb.net/static/images/plant-header.png