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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
mkm 2023-03-23 14:54:51 +08:00
commit 3e6bdcb50f
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controller/api/Auth.php
View File

@ -367,8 +367,8 @@ class Auth extends BaseController
{ {
$data = $this->request->params(['phone', 'sms_code', 'spread', 'auth_token',['user_type','h5']]); $data = $this->request->params(['phone', 'sms_code', 'spread', 'auth_token',['user_type','h5']]);
$validate->sceneSmslogin()->check($data); $validate->sceneSmslogin()->check($data);
// $sms_code = app()->make(SmsService::class)->checkSmsCode($data['phone'], $data['sms_code'], 'login'); $sms_code = app()->make(SmsService::class)->checkSmsCode($data['phone'], $data['sms_code'], 'login');
// if (!$sms_code) return app('json')->fail('验证码不正确'); if (!$sms_code) return app('json')->fail('验证码不正确');
$user = $repository->accountByUser($data['phone']); $user = $repository->accountByUser($data['phone']);
$auth = $this->parseAuthToken($data['auth_token']); $auth = $this->parseAuthToken($data['auth_token']);
Db::startTrans(); Db::startTrans();

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']))