Leadfyy.co
/
hainan
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/develop' into develop

develop
李可松 4 years ago
parent
b4e4658887 f0426dd03d
commit
2c3edfbeee
19 changed files with 13554 additions and 169 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      app/Admin/Controllers/AgentController.php
  2. 1
      app/Admin/Controllers/GuideController.php
  3. 1
      app/Admin/Controllers/SupplierController.php
  4. 6
      app/AdminAgent/Controllers/DemandBiddingController.php
  5. 5
      app/AdminAgent/Controllers/DemandController.php
  6. 6
      app/AdminGuide/Controllers/DemandBiddingController.php
  7. 164
      app/AdminGuide/Controllers/DemandController.php
  8. 3
      app/AdminSettled/Controllers/AgentController.php
  9. 3
      app/AdminSettled/Controllers/GuideController.php
  10. 6
      app/AdminSettled/Controllers/SupplierController.php
  11. 1
      app/AdminSettled/routes.php
  12. 5
      app/AdminSupplier/Controllers/DemandBiddingController.php
  13. 166
      app/AdminSupplier/Controllers/DemandController.php
  14. 1
      composer.json
  15. 63
      composer.lock
  16. 4427
      public/vendor/dcat-admin-extensions/super-eggs/dcat-distpicker/dist/distpicker.common.js
  17. 4423
      public/vendor/dcat-admin-extensions/super-eggs/dcat-distpicker/dist/distpicker.esm.js
  18. 4431
      public/vendor/dcat-admin-extensions/super-eggs/dcat-distpicker/dist/distpicker.js
  19. 10
      public/vendor/dcat-admin-extensions/super-eggs/dcat-distpicker/dist/distpicker.min.js

1
app/Admin/Controllers/AgentController.php
View File

@ -152,6 +152,7 @@ class AgentController extends AdminController
->default(AgentType::OPERATOR)
->required();
$form->text('company_name');
$form->distpicker(['province_id', 'city_id', 'area_id'], '请选择区域')->required();
$form->image('logo')->removable(false)->uniqueName();
$form->text('address');
$form->image('license_pic')->removable(false)->uniqueName();

1
app/Admin/Controllers/GuideController.php
View File

@ -111,6 +111,7 @@ class GuideController extends AdminController
}
$form->select('status')->options(UserStatus::array())->default(UserStatus::NORMAL);
$form->text('name');
$form->distpicker(['province_id', 'city_id', 'area_id'], '请选择区域')->required();
$form->image('photo')->removable(false)->uniqueName();
$form->image('license_pic')->removable(false)->uniqueName();
$form->text('contact_phone');

1
app/Admin/Controllers/SupplierController.php
View File

@ -133,6 +133,7 @@ class SupplierController extends AdminController
->help('如果禁用供应商，其下的<span style="color:#f00;">所有产品都会跟着下架</span>，包括代理商在售的产品')
->required();
$form->text('company_name');
$form->distpicker(['province_id', 'city_id', 'area_id'], '请选择区域')->required();
$form->image('logo')->removable(false)->uniqueName();
$form->text('address');
$form->image('license_pic')->removable(false)->uniqueName();

6
app/AdminAgent/Controllers/DemandBiddingController.php
View File

@ -3,6 +3,7 @@
namespace App\AdminAgent\Controllers;
use App\AdminAgent\Repositories\DemandBidding;
use App\Models\Demand;
use App\Traits\DemandTraits;
use Dcat\Admin\Admin;
use Dcat\Admin\Form;
@ -92,6 +93,11 @@ class DemandBiddingController extends AdminController
$form->hidden('bidding_user_type');
$form->hidden('bidding_user_id');
$form->saving(function (Form $form) {
$provinceId = Demand::query()->where('id',$this->demand_id)->value('province_id');
if ($provinceId != Admin::user()->province_id) {
$form->response()->error('竞标失败,指能竞标跟自己相同省份的的需求');
}
// 判断是否是新增操作
if ($form->isCreating()) {
//发布人身份

5
app/AdminAgent/Controllers/DemandController.php
View File

@ -37,6 +37,8 @@ class DemandController extends AdminController
return Grid::make(new Demand(['publisher','biddingUser']), function (Grid $grid) {
if (\request('self',0)) {
$grid->model()->where(['publisher_id' => Admin::user()->id,'publisher_type' => DemandTraits::$col[0]]);
} else {
$grid->model()->where(['province_id' => Admin::user()->province_id]);
}
$grid->column('id')->sortable();
$grid->column('title');
@ -47,7 +49,7 @@ class DemandController extends AdminController
$grid->column('images','图片')->display(function ($image) {
return json_decode($image,true);
})->image('', 60, 60);
$grid->column('deadline');
//$grid->column('deadline');
$grid->column('publisher.name','发布人');
$grid->column('publisher_type')->using(DemandTraits::$polymorphic);
$grid->column('biddingUser.name','中标人');
@ -144,6 +146,7 @@ class DemandController extends AdminController
$form->display('id');
$form->text('title')->required();
$form->textarea('comment')->required();
$form->distpicker(['province_id', 'city_id', 'area_id'], '请选择区域')->required();
$form->multipleImage('images','图片')->limit(5)->saving(function ($path) {
return json_encode($path);
});

6
app/AdminGuide/Controllers/DemandBiddingController.php
View File

@ -3,6 +3,7 @@
namespace App\AdminGuide\Controllers;
use App\AdminAgent\Repositories\DemandBidding;
use App\Models\Demand;
use App\Traits\DemandTraits;
use Dcat\Admin\Admin;
use Dcat\Admin\Form;
@ -92,6 +93,11 @@ class DemandBiddingController extends AdminController
$form->hidden('bidding_user_type');
$form->hidden('bidding_user_id');
$form->saving(function (Form $form) {
$provinceId = Demand::query()->where('id',$this->demand_id)->value('province_id');
if ($provinceId != Admin::user()->province_id) {
$form->response()->error('竞标失败,指能竞标跟自己相同省份的的需求');
}
// 判断是否是新增操作
if ($form->isCreating()) {
//发布人身份

164
app/AdminGuide/Controllers/DemandController.php
View File

@ -36,6 +36,8 @@ class DemandController extends AdminController
return Grid::make(new Demand(['publisher','biddingUser']), function (Grid $grid) {
if (\request('self',0)) {
$grid->model()->where(['publisher_id' => Admin::user()->id,'publisher_type' => DemandTraits::$col[2]]);
} else {
$grid->model()->where(['province_id' => Admin::user()->province_id]);
}
$grid->column('id')->sortable();
$grid->column('title');
@ -98,87 +100,87 @@ class DemandController extends AdminController
});
}
/**
* Make a show builder.
*
* @param mixed $id
*
* @return Show
*/
protected function detail($id)
{
return Show::make($id, new Demand(['publisher','biddingUser']), function (Show $show) {
$show->field('id');
$show->field('title');
$show->field('comment');
$show->field('images')->image();
$show->field('deadline');
$show->field('bidding_user_type','竞标用户类型')->using(DemandTraits::$polymorphic);
$show->field('price');
$show->field('stock');
$show->field('publisher_type')->using(DemandTraits::$polymorphic);
$show->field('publisher.name','发布人');
$show->field('state')->using(DemandTraits::$state)->dot(
[
1 => 'yellow',
2 => 'danger',
3 => 'success',
]
);;
$show->field('created_at');
});
}
/**
* Make a form builder.
*
* @return Form
*/
protected function form()
{
return Form::make(new Demand(), function (Form $form) {
$form->disableEditingCheck();
$form->disableCreatingCheck();
$form->disableViewCheck();
$form->display('id');
$form->text('title')->required();
$form->textarea('comment')->required();
$form->multipleImage('images','图片')->limit(5)->saving(function ($path) {
return json_encode($path);
});
$form->hidden('deadline')->required();
$form->select('bidding_user_type','竞标用户类型')
->when([2],function (Form $form){
$form->select('demand_product_id','产品')->options(function (){
return Product::query()->whereIn('agent_id',[0,Admin::user()->id])->pluck('title','id');
});
})
->options([
1 => '供应商',
2 => '地接'
])
->default(1)
->required();
$form->decimal('price')->required();
$form->number('stock')->required();
$form->hidden('publisher_type')->required();
$form->hidden('publisher_id')->required();
$form->saving(function (Form $form) {
// 判断是否是新增操作
if ($form->isCreating()) {
if ($form->bidding_user_type != 2) {
$form->demand_product_id = 0;
}
$form->bidding_user_type = DemandTraits::$col[$form->bidding_user_type];
//处理流拍时间
$form->deadline = now()->addDays(5);
//发布人身份
$form->publisher_type = DemandTraits::$col[2];
$form->publisher_id = Admin::user()->id;
}
});
});
}
///**
// * Make a show builder.
// *
// * @param mixed $id
// *
// * @return Show
// */
//protected function detail($id)
//{
// return Show::make($id, new Demand(['publisher','biddingUser']), function (Show $show) {
// $show->field('id');
// $show->field('title');
// $show->field('comment');
// $show->field('images')->image();
// $show->field('deadline');
// $show->field('bidding_user_type','竞标用户类型')->using(DemandTraits::$polymorphic);
// $show->field('price');
// $show->field('stock');
// $show->field('publisher_type')->using(DemandTraits::$polymorphic);
// $show->field('publisher.name','发布人');
// $show->field('state')->using(DemandTraits::$state)->dot(
// [
// 1 => 'yellow',
// 2 => 'danger',
// 3 => 'success',
// ]
// );;
// $show->field('created_at');
// });
//}
//
///**
// * Make a form builder.
// *
// * @return Form
// */
//protected function form()
//{
// return Form::make(new Demand(), function (Form $form) {
// $form->disableEditingCheck();
// $form->disableCreatingCheck();
// $form->disableViewCheck();
// $form->display('id');
// $form->text('title')->required();
// $form->textarea('comment')->required();
// $form->multipleImage('images','图片')->limit(5)->saving(function ($path) {
// return json_encode($path);
// });
// $form->hidden('deadline')->required();
// $form->select('bidding_user_type','竞标用户类型')
// ->when([2],function (Form $form){
// $form->select('demand_product_id','产品')->options(function (){
// return Product::query()->whereIn('agent_id',[0,Admin::user()->id])->pluck('title','id');
// });
// })
// ->options([
// 1 => '供应商',
// 2 => '地接'
// ])
// ->default(1)
// ->required();
// $form->decimal('price')->required();
// $form->number('stock')->required();
// $form->hidden('publisher_type')->required();
// $form->hidden('publisher_id')->required();
// $form->saving(function (Form $form) {
// // 判断是否是新增操作
// if ($form->isCreating()) {
// if ($form->bidding_user_type != 2) {
// $form->demand_product_id = 0;
// }
// $form->bidding_user_type = DemandTraits::$col[$form->bidding_user_type];
// //处理流拍时间
// $form->deadline = now()->addDays(5);
// //发布人身份
// $form->publisher_type = DemandTraits::$col[2];
// $form->publisher_id = Admin::user()->id;
// }
// });
// });
//}
//public function binding()
//{

3
app/AdminSettled/Controllers/AgentController.php
View File

@ -59,7 +59,7 @@ class AgentController extends AdminController
$form->disableDeleteButton();
$form->text('username')->required();
$form->text('password')->required();
$form->password('password')->required();
$form->text('name')->required();
$form->text('appid')->placeholder('可以先不填，审核通过之后再设置');
$form->text('appsecret')->placeholder('可以先不填，审核通过之后再设置');
@ -70,6 +70,7 @@ class AgentController extends AdminController
->default(AgentType::OPERATOR)
->required();
$form->text('company_name')->required();
$form->distpicker(['province_id', 'city_id', 'area_id'], '请选择区域')->required();
$form->image('logo')->required()->removable(false)->uniqueName();
$form->text('address')->required();
$form->image('license_pic')->required()->removable(false)->uniqueName();

3
app/AdminSettled/Controllers/GuideController.php
View File

@ -57,8 +57,9 @@ class GuideController extends AdminController
$form->disableDeleteButton();
$form->text('username')->required();
$form->text('password')->required();
$form->password('password')->required();
$form->text('name')->required();
$form->distpicker(['province_id', 'city_id', 'area_id'], '请选择区域')->required();
$form->image('photo')->required()->removable(false)->uniqueName();
$form->image('license_pic')->required()->removable(false)->uniqueName();
$form->text('contact_phone')->required()->maxLength(13);

6
app/AdminSettled/Controllers/SupplierController.php
View File

@ -55,12 +55,12 @@ class SupplierController extends AdminController
$form->disableCreatingCheck();
$form->disableEditingCheck();
$form->disableDeleteButton();
$form->text('username')->required();
$form->text('password')->required();
$form->password('password')->required();
$form->text('name')->required();
$form->text('company_name')->required();
$form->image('logo')->removable(false)->uniqueName();
$form->distpicker(['province_id', 'city_id', 'area_id'], '请选择区域')->required();
$form->image('logo')->removable(false)->uniqueName();
$form->text('address')->required();
$form->image('license_pic')->required()->removable(false)->uniqueName();
$form->text('director')->required();

1
app/AdminSettled/routes.php
View File

@ -9,6 +9,7 @@ Admin::routes();
Route::group([
'prefix' => config('admin.route.prefix'),
'namespace' => config('admin.route.namespace'),
'middleware' => config('admin.route.middleware'),
], function (Router $router) {
$router->redirect('/', admin_url('supplier/create'));
$router->redirect('auth/login', admin_url('supplier/create'));

5
app/AdminSupplier/Controllers/DemandBiddingController.php
View File

@ -137,6 +137,11 @@ class DemandBiddingController extends AdminController
});
$form->saved(function (Form $form) {
$provinceId = Demand::query()->where('id',$this->demand_id)->value('province_id');
if ($provinceId != Admin::user()->province_id) {
$form->response()->error('竞标失败,指能竞标跟自己相同省份的的需求');
}
if($form->isEditing()) {
$productId = request('demand_product_id', 0);
if (!empty($productId)) {

166
app/AdminSupplier/Controllers/DemandController.php
View File

@ -28,6 +28,8 @@ class DemandController extends AdminController
return Grid::make(new Demand(['publisher','biddingUser', 'bidding']), function (Grid $grid) {
if (\request('self',0)) {
$grid->model()->where(['publisher_id' => Admin::user()->id,'publisher_type' => DemandTraits::$col[1]]);
}else {
$grid->model()->where(['province_id' => Admin::user()->province_id]);
}
$grid->column('id')->sortable();
$grid->column('title');
@ -38,7 +40,7 @@ class DemandController extends AdminController
$grid->column('images','图片')->display(function ($image) {
return json_decode($image,true);
})->image('', 60, 60);
$grid->column('deadline');
//$grid->column('deadline');
$grid->column('publisher.name','发布人');
$grid->column('publisher_type')->using(DemandTraits::$polymorphic);
$grid->column('biddingUser.name','中标人');
@ -79,6 +81,7 @@ class DemandController extends AdminController
$grid->disableEditButton();
$grid->disableQuickEditButton();
$grid->disableViewButton();
$grid->disableCreateButton();
$grid->disableActions();
$grid->filter(function (Grid\Filter $filter) {
$filter->equal('id');
@ -86,87 +89,88 @@ class DemandController extends AdminController
});
});
}
//
///**
// * Make a show builder.
// *
// * @param mixed $id
// *
// * @return Show
// */
//protected function detail($id)
//{
// return Show::make($id, new Demand(['publisher','biddingUser']), function (Show $show) {
// $show->field('id');
// $show->field('title');
// $show->field('comment');
// $show->field('images')->image();
// $show->field('deadline');
// $show->field('bidding_user_type','竞标用户类型')->using(DemandTraits::$polymorphic);
// $show->field('price');
// $show->field('stock');
// $show->field('publisher_type')->using(DemandTraits::$polymorphic);
// $show->field('publisher.name','发布人');
// $show->field('state')->using(DemandTraits::$state)->dot(
// [
// 1 => 'yellow',
// 2 => 'danger',
// 3 => 'success',
// ]
// );;
// $show->field('created_at');
// });
//}
/**
* Make a show builder.
*
* @param mixed $id
*
* @return Show
*/
protected function detail($id)
{
return Show::make($id, new Demand(['publisher','biddingUser']), function (Show $show) {
$show->field('id');
$show->field('title');
$show->field('comment');
$show->field('images')->image();
$show->field('deadline');
$show->field('bidding_user_type','竞标用户类型')->using(DemandTraits::$polymorphic);
$show->field('price');
$show->field('stock');
$show->field('publisher_type')->using(DemandTraits::$polymorphic);
$show->field('publisher.name','发布人');
$show->field('state')->using(DemandTraits::$state)->dot(
[
1 => 'yellow',
2 => 'danger',
3 => 'success',
]
);;
$show->field('created_at');
});
}
/**
* Make a form builder.
*
* @return Form
*/
protected function form()
{
return Form::make(new Demand(), function (Form $form) {
$form->disableEditingCheck();
$form->disableCreatingCheck();
$form->disableViewCheck();
$form->display('id');
$form->text('title')->required();
$form->textarea('comment')->required();
$form->multipleImage('images','图片')->limit(5)->saving(function ($path) {
return json_encode($path);
});
$form->hidden('deadline');
$form->select('bidding_user_type','竞标用户类型')
->when([0],function (Form $form){
$form->select('demand_product_id','产品')->options(function (){
return DemandProduct::query()->where('supplier_id',Admin::user()->id)->where('status',1)->pluck('title','id');
});
})
->options([
'代理商'
])
->default(0)
->required();
$form->decimal('price')->required();
$form->number('stock')->required();
$form->hidden('publisher_type');
$form->hidden('publisher_id');
$form->saving(function (Form $form) {
// 判断是否是新增操作
if ($form->isCreating()) {
//if ($form->bidding_user_type != 2) {
// $form->demand_product_id = 0;
//}
$form->bidding_user_type = DemandTraits::$col[$form->bidding_user_type];
//处理流拍时间
$form->deadline = now()->addDays(5);
//发布人身份
$form->publisher_type = DemandTraits::$col[1];
$form->publisher_id = Admin::user()->id;
}
});
});
}
///**
// * Make a form builder.
// *
// * @return Form
// */
//protected function form()
//{
// return Form::make(new Demand(), function (Form $form) {
// $form->disableEditingCheck();
// $form->disableCreatingCheck();
// $form->disableViewCheck();
// $form->display('id');
// $form->text('title')->required();
// $form->textarea('comment')->required();
// $form->distpicker(['province_id', 'city_id', 'area_id'], '请选择区域')->required();
// $form->multipleImage('images','图片')->limit(5)->saving(function ($path) {
// return json_encode($path);
// });
// $form->hidden('deadline');
// $form->select('bidding_user_type','竞标用户类型')
// ->when([0],function (Form $form){
// $form->select('demand_product_id','产品')->options(function (){
// return DemandProduct::query()->where('supplier_id',Admin::user()->id)->where('status',1)->pluck('title','id');
// });
// })
// ->options([
// '代理商'
// ])
// ->default(0)
// ->required();
// $form->decimal('price')->required();
// $form->number('stock')->required();
// $form->hidden('publisher_type');
// $form->hidden('publisher_id');
// $form->saving(function (Form $form) {
// // 判断是否是新增操作
// if ($form->isCreating()) {
// //if ($form->bidding_user_type != 2) {
// // $form->demand_product_id = 0;
// //}
// $form->bidding_user_type = DemandTraits::$col[$form->bidding_user_type];
// //处理流拍时间
// $form->deadline = now()->addDays(5);
// //发布人身份
// $form->publisher_type = DemandTraits::$col[1];
// $form->publisher_id = Admin::user()->id;
// }
// });
// });
//}
//public function binding()
//{

1
composer.json
View File

@ -13,6 +13,7 @@
"laravel/framework": "^8.40",
"laravel/tinker": "^2.5",
"overtrue/wechat": "~5.0",
"super-eggs/dcat-distpicker": "^2.0",
"tencentcloud/tencentcloud-sdk-php": "^3.0"
},
"require-dev": {

63
composer.lock
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "5dd2556c6bb5b2e049435c53c47893ff",
"content-hash": "439b8933da7d940b25e1fbcb525e2bdf",
"packages": [
{
"name": "asm89/stack-cors",
@ -3654,6 +3654,67 @@
],
"time": "2021-05-23T15:12:33+00:00"
},
{
"name": "super-eggs/dcat-distpicker",
"version": "2.0.1",
"source": {
"type": "git",
"url": "https://github.com/super-eggs/dcat-distpicker.git",
"reference": "b55b2ad2dcb2fa8c72138ca40b95a1dd10878530"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/super-eggs/dcat-distpicker/zipball/b55b2ad2dcb2fa8c72138ca40b95a1dd10878530",
"reference": "b55b2ad2dcb2fa8c72138ca40b95a1dd10878530",
"shasum": "",
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
},
"require": {
"dcat/laravel-admin": "~2.0",
"php": ">=7.1.0"
},
"type": "library",
"extra": {
"dcat-admin": "SuperEggs\\DcatDistpicker\\DcatDistpickerServiceProvider",
"laravel": {
"providers": [
"SuperEggs\\DcatDistpicker\\DcatDistpickerServiceProvider"
]
}
},
"autoload": {
"psr-4": {
"SuperEggs\\DcatDistpicker\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "SuperEggs",
"email": "1552915523@qq.com"
}
],
"description": "Distpicker extension for dcat-admin",
"homepage": "https://github.com/super-eggs/dcat-distpicker",
"keywords": [
"dcat-admin",
"distpicker",
"extension"
],
"support": {
"issues": "https://github.com/super-eggs/dcat-distpicker/issues",
"source": "https://github.com/super-eggs/dcat-distpicker/tree/2.0.1"
},
"time": "2021-03-10T02:32:24+00:00"
},
{
"name": "swiftmailer/swiftmailer",
"version": "v6.2.7",

4427
public/vendor/dcat-admin-extensions/super-eggs/dcat-distpicker/dist/distpicker.common.js
File diff suppressed because it is too large
View File

4423
public/vendor/dcat-admin-extensions/super-eggs/dcat-distpicker/dist/distpicker.esm.js
File diff suppressed because it is too large
View File

4431
public/vendor/dcat-admin-extensions/super-eggs/dcat-distpicker/dist/distpicker.js
File diff suppressed because it is too large
View File

10
public/vendor/dcat-admin-extensions/super-eggs/dcat-distpicker/dist/distpicker.min.js
File diff suppressed because it is too large
View File

Write Preview
Loading…
Cancel
Save