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

Merge branch 'hotfix-phoenix' into develop

master
liangyuyan 5 years ago
parent
72fef689ae 3d26481463
commit
2c5483617a
5 changed files with 36 additions and 19 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. 4
      app/Admin/Controllers/v3/CouponController.php
  2. 8
      app/Admin/Controllers/v3/GoodsController.php
  3. 15
      app/Admin/Controllers/v3/ServicePersonnelController.php
  4. 11
      app/Admin/Controllers/v3/StoreController.php
  5. 17
      app/Admin/Forms/v3/StoreSetTimeForm.php

4
app/Admin/Controllers/v3/CouponController.php
View File

@ -150,8 +150,8 @@ class CouponController extends AdminController
$form->column(6,function(Form $form){
$form->text('title')->required()->maxLength(255,'最多只能输入500个字');
$form->textarea('introduce')->required();
$form->currency('full_amount')->required()->floatTwo()->symbol('￥');
$form->currency('discounts')->required()->floatTwo()->symbol('￥');
$form->currency('full_amount')->required()->symbol('￥');
$form->currency('discounts')->required()->symbol('￥');
$form->radio('discount_type')->options(CouponModel::$_DISCOUNTTYPE)->default(1);
$form->number('inventory')->required()->type('number')->attribute('min', 1)->default(1);
$form->number('weigh')->type('number')->attribute('min', 0)->default(0);

8
app/Admin/Controllers/v3/GoodsController.php
View File

@ -191,16 +191,16 @@ class GoodsController extends AdminController
$form->column(6, function (Form $form) use($storeList,$categoryList,$goodsCategoryList ){
$form->hidden('market_id')->default(0);
$form->select('category_id')->required()->options($categoryList)->load('goods_category_id', '/api/goods_category_list');
$form->select('goods_category_id')->required();
$form->select('goods_category_id');
$form->select('store_id')->required()->options($storeList);
$form->text('name')->required()->maxLength(20);
$form->image('cover_img')->autoUpload()->required();
$form->number('sort');
});
$form->column(6, function (Form $form) {
$form->currency('price')->required()->floatTwo()->symbol('￥');
$form->currency('original_price')->required()->floatTwo()->symbol('￥');
$form->currency('vip_price')->required()->floatTwo()->symbol('￥');
$form->currency('price')->required()->symbol('￥');
$form->currency('original_price')->required()->symbol('￥');
$form->currency('vip_price')->required()->symbol('￥');
$form->text('goods_unit')->help('如：斤，个，盒，500克，1000克，1500克等');
$form->radio('is_infinite')->options(['关闭','开启'])->default(1);
$form->number('inventory')->required()->attribute('min', 1)->default(1);

15
app/Admin/Controllers/v3/ServicePersonnelController.php
View File

@ -122,7 +122,7 @@ class ServicePersonnelController extends AdminController
$form->select('type')->options(ServicePersonnelModel::$_TYPE)->required();
$form->select('market_id')->options($marketList)->required();
// $form->select('user_id')->options($userList)->required();
$form->number('user_id')->required()->min(0);
$form->number('user_id')->required()->min(1);
$statusList = ServicePersonnelModel::$_STATUS;
unset($statusList[0],$statusList[2]);
$form->radio('status')->options($statusList)->default(1);
@ -131,15 +131,18 @@ class ServicePersonnelController extends AdminController
$form->saving(function(Form $form){
$id = $form->getKey();
$userId = $form->input('user_id');
if(!empty($id) && !empty($userId)){
if(!empty($userId)){
$user = UserModel::getUserInfo($userId,'id');
if(empty($user)){
return $form->error('懒ID不存在');
}
$store = ServicePersonnelModel::select('id')->where([
['user_id','=',$userId],
['id','<>',$id?$id:0],
])->first();
$storePer = ServicePersonnelModel::select('id')->where('user_id',$userId);
if($form->isEditing()){
$storePer->where([['id','<>',$id?$id:0]]);
}
$store = $storePer->first();
if(!empty($store)){
return $form->error('用户已经为服务专员');
}

11
app/Admin/Controllers/v3/StoreController.php
View File

@ -264,16 +264,17 @@ class StoreController extends AdminController
if($form->isEditing() && !empty($marketId) && $marketId != $form->model()->market_id){
return $form->error('不能更换市场，会影响店铺下商品所属市场！');
}
if(!empty($id) && !empty($adminId)){
if(!empty($adminId)){
$user = UserModel::getUserInfo($adminId,'id');
if(empty($user)){
return $form->error('管理员不存在');
}
$store = StoreModel::select('id')->where([
['admin_id','=',$adminId],
['id','<>',$id?$id:0],
])->first();
$storeM = StoreModel::select('id')->where('admin_id',$adminId);
if($form->isEditing()){
$storeM->where([['id','<>',$id?$id:0]]);
}
$store = $storeM->first();
if(!empty($store)){
return $form->error('管理员已经绑定了店铺');
}

17
app/Admin/Forms/v3/StoreSetTimeForm.php
View File

@ -26,6 +26,19 @@ class StoreSetTimeForm extends Form
$store->time2 = $input['time2'];
$store->time3 = $input['time3'];
$store->time4 = $input['time4'];
if(!empty($store->time1) && !empty($store->time2) && (!empty($store->time3) || !empty($store->time4))){
if($store->time3 && empty($store->time4)){
return $this->error('请选择时间段二的结束时间！');
}else if($store->time4 && empty($store->time3)){
return $this->error('请选择时间段二的开始时间！');
}else if(str_replace(':', '', $store->time3) <= str_replace(':', '', $store->time2)){
return $this->error('时间段二的开始时间 必须大于 时间段一的结束时间！');
}else if(str_replace(':', '', $store->time4) <= str_replace(':', '', $store->time3)){
return $this->error('时间段二的结束时间 必须大于 时间段二的开始时间！');
}
}
if($store->save()){
return $this->success('修改成功', '/store');
}
@ -48,8 +61,8 @@ class StoreSetTimeForm extends Form
$this->display('name','店铺名称')->value($name);
$this->time('time1','时间段一开始')->format('HH:mm')->value($time1);
$this->time('time2','时间段一结束')->format('HH:mm')->rules('after:time1',['after'=>'选择的时间必须比时间段一开始时间晚'])->value($time2);
$this->time('time3','时间段二开始')->format('HH:mm')->rules('after:time2',['after'=>'选择的时间必须比时间段一结束时间晚'])->value($time3);
$this->time('time4','时间段二结束')->format('HH:mm')->rules('after:time3',['after'=>'选择的时间必须比时间段二开始时间晚'])->value($time4);
$this->time('time3','时间段二开始')->format('HH:mm')->value($time3);
$this->time('time4','时间段二结束')->format('HH:mm')->value($time4);
}
/**

Write Preview
Loading…
Cancel
Save