xuanchen/water_new
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

调整身份相关

Browse Source
This commit is contained in:
徐永宾
2023-03-10 17:53:02 +08:00
parent 3cd75b1d6e
commit 2bf6a397b1
10 changed files with 86 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/User/Models/Identity.php
View File

@@ -118,12 +118,15 @@ class Identity extends Model
public function getRules()
{
$rules = $this->ruleshows;
foreach ($rules as $key => $rule) {
if (isset($rule['icon'])) {
$rules[$key]['cover'] = $this->parseImageUrl($rule['icon']);
if ($rules) {
foreach ($rules as $key => $rule) {
if (isset($rule['icon'])) {
$rules[$key]['cover'] = $this->parseImageUrl($rule['icon']);
}
$rules[$key]['text'] = Arr::get(config('identity.show_rules'), $rule['name']);
}
$rules[$key]['text'] = Arr::get(config('identity.show_rules'), $rule['name']);
}
return $rules;
}

6
modules/User/Models/Traits/HasStock.php
View File

@@ -4,12 +4,6 @@ namespace Modules\User\Models\Traits;
use Illuminate\Database\Eloquent\Relations\HasOne;
use Illuminate\Support\Arr;
use Modules\Mall\Facades\Item;
use Modules\Mall\Facades\Order as OrderFacade;
use Modules\Mall\Models\Address;
use Modules\Mall\Models\Goods;
use Modules\Mall\Models\GoodsSku;
use Modules\Mall\Models\Order;
use Modules\Mall\Models\OrderItem;
use Modules\User\Models\Identity;