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

Merge branch 'develop'

Browse Source 
# Conflicts:
#	app/listener/CommunityAddress.php
This commit is contained in:
monanxiao 2023-03-23 10:00:42 +08:00
commit 8e0b2b6ae0
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controller/api/store/merchant/Merchant.php
View File

@ -159,6 +159,10 @@ class Merchant extends BaseController
'lat', 'lat',
['delivery_way',[2]], ['delivery_way',[2]],
]); ]);
// 如果手机号不存在，则使用入驻时的手机号
$data['service_phone'] = empty($data['service_phone'])?$merchant['mer_phone']:$data['service_phone'];
$validate->check($data); $validate->check($data);
$sys_bases_status = systemConfig('sys_bases_status') === '0' ? 0 : 1; $sys_bases_status = systemConfig('sys_bases_status') === '0' ? 0 : 1;
if ($sys_bases_status && empty($data['mer_certificate'])) if ($sys_bases_status && empty($data['mer_certificate']))