Skip to content

semour / semour_web

Go to a project
Commit 660d3237 by 杨树贤
Options

邮箱和询价问题

parent 37a51cd7
Inline Side-by-side
Showing with 7 additions and 8 deletions
.idea/workspace.xml
...@@ -4,14 +4,9 @@ ...@@ -4,14 +4,9 @@
<list default="true" id="fb90add0-1393-48c2-9f26-72365d42cd03" name="变更" comment=""> <list default="true" id="fb90add0-1393-48c2-9f26-72365d42cd03" name="变更" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/Api/AuthApiController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Api/AuthApiController.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/Http/Controllers/Api/AuthApiController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Api/AuthApiController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Kernel.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Kernel.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Middleware/Authenticate.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Middleware/Authenticate.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Services/InquiryService.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Services/InquiryService.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/Http/Services/InquiryService.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Services/InquiryService.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bootstrap/app.php" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/app.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/bootstrap/app.php" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/app.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bootstrap/cache/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/cache/.gitignore" afterDir="false" /> <change beforePath="$PROJECT_DIR$/bootstrap/cache/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/cache/.gitignore" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/app.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/app.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/common/mallUserHeaderNav.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/common/mallUserHeaderNav.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/web.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/.gitignore" afterDir="false" /> <change beforePath="$PROJECT_DIR$/storage/app/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/.gitignore" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/app/public/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/.gitignore" afterDir="false" /> <change beforePath="$PROJECT_DIR$/storage/app/public/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/storage/app/public/.gitignore" afterDir="false" />
<change beforePath="$PROJECT_DIR$/storage/framework/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/storage/framework/.gitignore" afterDir="false" /> <change beforePath="$PROJECT_DIR$/storage/framework/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/storage/framework/.gitignore" afterDir="false" />
...@@ -194,7 +189,7 @@ ...@@ -194,7 +189,7 @@
<workItem from="1667266026118" duration="40321000" /> <workItem from="1667266026118" duration="40321000" />
<workItem from="1667959054458" duration="183000" /> <workItem from="1667959054458" duration="183000" />
<workItem from="1667986756173" duration="14315000" /> <workItem from="1667986756173" duration="14315000" />
<workItem from="1668150640953" duration="13452000" /> <workItem from="1668150640953" duration="15808000" />
</task> </task>
<servers /> <servers />
</component> </component>
......
app/Http/Controllers/Api/AuthApiController.php
...@@ -185,11 +185,15 @@ class AuthApiController extends Controller ...@@ -185,11 +185,15 @@ class AuthApiController extends Controller
if ($info) { if ($info) {
return $this->setError('This email had been registered'); return $this->setError('This email had been registered');
} }
break;
case 'forget_password' : case 'forget_password' :
case 'update_email':
$existEmail = UserModel::where('email', $email)->exists(); $existEmail = UserModel::where('email', $email)->exists();
if (!$existEmail) { if (!$existEmail) {
return $this->setError('This email is not registered'); return $this->setError('This email is not registered');
} }
break;
} }
......
app/Http/Services/InquiryService.php
...@@ -11,7 +11,8 @@ class InquiryService ...@@ -11,7 +11,8 @@ class InquiryService
public static function addInquiry($data, $user) public static function addInquiry($data, $user)
{ {
return DB::transaction(function () use ($data, $user) { return DB::transaction(function () use ($data, $user) {
$items = \Arr::get($data, 'item', []); $items = \Arr::get($data, 'items', []);
$items = json_decode($items, true);
$remark = $data['remark']; $remark = $data['remark'];
$inquiry = [ $inquiry = [
'user_id' => $user->id, 'user_id' => $user->id,
...@@ -28,7 +29,6 @@ class InquiryService ...@@ -28,7 +29,6 @@ class InquiryService
'brand_name' => $item['brand_name'], 'brand_name' => $item['brand_name'],
'inquiry_number' => $item['inquiry_number'], 'inquiry_number' => $item['inquiry_number'],
'remark' => $remark, 'remark' => $remark,
'create_time' => $item['create_time'],
]; ];
} }
return InquiryItemsModel::addInquiryItems($inquiryItems); return InquiryItemsModel::addInquiryItems($inquiryItems);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment