Merge branch 'develop' of ssh://8.134.10.79:222/Leadfyy.co/hainan into develop

app/AdminAgent/Controllers/AgentProductController.php

@@ -267,11 +267,11 @@ class AgentProductController extends AdminController
 				$form->number('earnest')->min(0)
 					->default(0)->help('单位：元。不输入或输入 0 则不支持定金支付，必须和定金超时时间同时设置才会生效');
 				$form->number('earnest_timeout')->min(0)
-					->default(0)->help('单位：分钟。超过这个时间未支付，订单将自动关闭');
+					->default(0)->help('单位：分钟。超过这个时间未支付尾款，订单将自动关闭，且定金不退');
 				$form->number('deposit')->min(0)
 					->default(0)->help('单位：元。不输入或输入 0 则不支持订金支付，必须和订金超时时间同时设置才会生效');
 				$form->number('deposit_timeout')->min(0)
-					->default(0)->help('单位：分钟。超过这个时间未支付，订单将自动关闭');
+					->default(0)->help('单位：分钟。超过这个时间未支付尾款，订单将自动关闭，且订金不退');
 
 				/*$form->tree('channel_id', '所属频道')
 					->expand(false)
@@ -348,6 +348,8 @@ class AgentProductController extends AdminController
 					return $form->response()->error('产品ID '. $form->product_id .' 已下架');
 				} else if ($product->stock < $form->stock) {
 					return $form->response()->error("供应商当前库存为{$product->stock}，你设置的库存不能超过该数值");
+				} else if ($form->price < $product->price) {
+					return $form->response()->error("产品售价不能小于供应商售价{$product->price}");
 				}
 				$form->title = $product->title;
 				$form->pictures = $product->pictures;
@@ -386,6 +388,11 @@ class AgentProductController extends AdminController
 					return $form->response()->error('产品ID ' . join('，', $not_in_id) . ' 库存小于你设置的库存' . $form->stock . '，或不存在、已下架等');
 				}
 
+				$total_price = Product::query()->whereIn('id', $product_ids)->sum('price');
+				if ($form->price < $total_price) {
+					return $form->response()->error("产品售价不能小于供应商产品总售价{$total_price}");
+				}
+
 				//如果是组团版旅行社，标记为是云产品
 				if (Admin::user()->type == AgentType::CLUSTER) {
 					$form->hidden('is_cloud');
@@ -412,6 +419,8 @@ class AgentProductController extends AdminController
 					return $form->response()->error('你选择的组团云产品库存不足或已下架，请重新选择');
 				} else if ($cloud_product->stock < $form->stock) {
 					return $form->response()->error("组团云产品当前库存为{$cloud_product->stock}，你设置的库存不能超过该数值");
+				} else if ($form->price < $cloud_product->price) {
+					return $form->response()->error("产品售价不能小于组团云产品售价{$cloud_product->price}");
 				}
 
 				//同步关键字段信息

app/AdminAgent/Controllers/DemandBiddingController.php

@@ -27,7 +27,13 @@ class DemandBiddingController extends AdminController
             $grid->column('price');
             $grid->column('comment');
 			$grid->column('demand.title','竞拍标题');
-			$grid->column('demand.comment','竞拍内容');
+			$grid->column('demand.comment','竞拍内容')
+				->display('查看')
+				->modal('详情',function ($modal) {
+					$modal->xl();
+					return $this->demand->comment;
+				});
+
 			$grid->column('state','状态')->using(DemandTraits::$biddingState)->dot(
 				[
 					'yellow',

app/AdminAgent/Controllers/DemandController.php

@@ -46,7 +46,7 @@ class DemandController extends AdminController
 			});
 			$grid->column('images','图片')->display(function ($image) {
 				return json_decode($image,true);
-			})->image();
+			})->image('', 60, 60);
             $grid->column('deadline');
 			$grid->column('publisher.name','发布人');
 			$grid->column('publisher_type')->using(DemandTraits::$polymorphic);
@@ -143,7 +143,7 @@ class DemandController extends AdminController
 			$form->disableViewCheck();
             $form->display('id');
             $form->text('title');
-            $form->text('comment');
+            $form->textarea('comment');
 			$form->multipleImage('images','图片')->limit(5)->saving(function ($path) {
 				return json_encode($path);
 			});

app/AdminAgent/Forms/Setting.php

@@ -33,7 +33,7 @@ class Setting extends Form
     public function form()
     {
         $this->text('order_timeout')->required()->default(60)
-			->help('订单超时时间，单位：分钟。（订金、定金支付的超时时间将根据产品设定的超时时间）');
+			->help('订单超时时间，单位：分钟。超过该时间未支付，订单将自动关闭');
         $this->radio('auto_shelves')->when([1], function (Form $form) {
 				// 值为1和4时显示文本框
 				$form->number('profit','利润(%)')->min(0)->max(100)->help('请填写利润百分比 上架商品会自动根据供应商提供的价格 上调设置值的百分比');

app/AdminAgent/Lazys/DemandBiddingLazys.php

@@ -20,7 +20,7 @@ class DemandBiddingLazys extends LazyRenderable
 			$demand = Demand::find($demandId);
 			$grid->model()->where('demand_id',$demandId);
 			$grid->column('id');
-			$grid->column('price','出价');
+			$grid->column('price','出价')->sortable();
 			$grid->column('comment','内容');
 			$grid->column('biddingUser.name','竞拍人');
 			$grid->column('bidding','竞标')

app/AdminAgent/Renderable/SelectAgentCloudProduct.php

@@ -37,6 +37,7 @@ class SelectAgentCloudProduct extends LazyRenderable
 			$grid->column('id');
 			$grid->column('title');
 			$grid->column('picture')->image('', 60, 60);
+			$grid->column('price');
 			$grid->column('sale');
 			$grid->column('stock');
 			$grid->column('updated_at');

app/AdminAgent/Renderable/SelectAgentProduct.php

@@ -31,6 +31,7 @@ class SelectAgentProduct extends LazyRenderable
 			$grid->column('id');
 			$grid->column('title');
 			$grid->column('picture')->image('', 60, 60);
+			$grid->column('price');
 			$grid->column('sale');
 			$grid->column('stock');
 			$grid->column('updated_at');

app/AdminAgent/Renderable/SelectGuide.php

@@ -1,7 +1,6 @@
 <?php
 
 namespace App\AdminAgent\Renderable;
-use App\AdminAgent\Repositories\User;
 use App\Common\UserStatus;
 use App\Models\Guide;
 use Dcat\Admin\Admin;
@@ -25,7 +24,11 @@ class SelectGuide extends LazyRenderable
 			$grid->disableBatchDelete();
 			$grid->disableBatchActions();
 
-			$grid->model()->where(['status' => UserStatus::NORMAL]);
+			$grid->model()->where(['status' => UserStatus::NORMAL])
+				->whereExists(function ($query) {
+					$role_table = 'admin_guide_role_users';
+					return $query->from($role_table)->whereRaw("guides.id=$role_table.user_id")->where('role_id', 2);
+				});
 			$grid->quickSearch(['contact_phone', 'name'])->placeholder('搜索手机号、地接名称');
 
 			$grid->column('id');

app/AdminAgent/Renderable/SelectProduct.php

@@ -31,6 +31,7 @@ class SelectProduct extends LazyRenderable
 			//$grid->column('supplier.name', '供应商');
 			$grid->column('title');
 			$grid->column('picture')->image('',60, 60);
+			$grid->column('price');
 			$grid->column('sale');
 			$grid->column('stock');
 			$grid->column('updated_at');

app/AdminGuide/Controllers/DemandBiddingController.php

@@ -27,7 +27,13 @@ class DemandBiddingController extends AdminController
             $grid->column('price');
             $grid->column('comment');
 			$grid->column('demand.title','竞拍标题');
-			$grid->column('demand.comment','竞拍内容');
+			$grid->column('demand.comment','竞拍内容')
+				->display('查看')
+				->modal('详情',function ($modal) {
+					$modal->xl();
+					return $this->demand->comment;
+				});
+
 			$grid->column('state','状态')->using(DemandTraits::$biddingState)->dot(
 				[
 					'yellow',

app/AdminGuide/Controllers/DemandController.php

@@ -45,7 +45,7 @@ class DemandController extends AdminController
 			});
 			$grid->column('images','图片')->display(function ($image) {
 				return json_decode($image,true);
-			})->image();
+			})->image('', 60, 60);
             $grid->column('deadline');
 			$grid->column('publisher.name','发布人');
 			$grid->column('publisher_type')->using(DemandTraits::$polymorphic);
@@ -142,7 +142,7 @@ class DemandController extends AdminController
 			$form->disableViewCheck();
             $form->display('id');
             $form->text('title');
-            $form->text('comment');
+            $form->textarea('comment');
 			$form->multipleImage('images','图片')->limit(5)->saving(function ($path) {
 				return json_encode($path);
 			});

app/AdminSupplier/Controllers/DemandBiddingController.php

@@ -35,7 +35,12 @@ class DemandBiddingController extends AdminController
             $grid->column('price');
             $grid->column('comment');
 			$grid->column('demand.title','竞拍标题');
-			$grid->column('demand.comment','竞拍内容');
+			$grid->column('demand.comment','竞拍内容')
+				->display('查看')
+				->modal('详情',function ($modal) {
+					$modal->xl();
+					return $this->demand->comment;
+				});
 			$grid->column('state','状态')->using(DemandTraits::$biddingState)->dot(
 				[
 					'yellow',
@@ -48,7 +53,7 @@ class DemandBiddingController extends AdminController
 					return $this->state == 1 && $this->bidding_user_type == DemandTraits::$col[1] && empty($this->demand->demand_product_id);
 				})
 				->then(function (Grid\Column $column) {
-					$column->append('<a class="btn btn-sm btn-success" href="'.admin_url('/demand_bidding/'.$this->id.'/edit?is_bidding=true').'">绑定产品</a>');
+					$column->append('<a class="btn btn-sm btn-success" href="'.admin_url('/demand_bidding/'.$this->id.'/edit?is_bidding=true').'">添加中标产品</a>');
 				})
 				->if(function (){
 					return $this->state == 1 && $this->bidding_user_type == DemandTraits::$col[1] && !empty($this->demand->demand_product_id);
@@ -109,7 +114,7 @@ class DemandBiddingController extends AdminController
 					->title('选择产品')
 					->dialogWidth('50%;min-width:600px;') //不起作用
 					->from(SelectProduct::make())
-					->model(DemandProduct::class, 'id', 'title');
+					->model(DemandProduct::class);
 			}else{
 				$form->text('price');
 				$form->textarea('comment');

app/AdminSupplier/Controllers/DemandController.php

@@ -45,7 +45,7 @@ class DemandController extends AdminController
 			});
 			$grid->column('images','图片')->display(function ($image) {
 				return json_decode($image,true);
-			})->image();
+			})->image('', 60, 60);
             $grid->column('deadline');
 			$grid->column('publisher.name','发布人');
 			$grid->column('publisher_type')->using(DemandTraits::$polymorphic);
@@ -136,7 +136,7 @@ class DemandController extends AdminController
 			$form->disableViewCheck();
             $form->display('id');
             $form->text('title');
-            $form->text('comment');
+            $form->textarea('comment');
 			$form->multipleImage('images','图片')->limit(5)->saving(function ($path) {
 				return json_encode($path);
 			});
@@ -151,7 +151,7 @@ class DemandController extends AdminController
 					'代理商'
 				])
 				->default(0);
-			$form->decimal('price');
+			$form->decimal('price')->required();
             $form->number('stock');
             $form->hidden('publisher_type');
             $form->hidden('publisher_id');

app/AdminSupplier/Extensions/Grid/ChooseDemand.php

@@ -23,7 +23,7 @@ class ChooseDemand extends RowAction
 
 	public function __construct($biddingId = '')
 	{
-		parent::__construct('选中竞标');
+		parent::__construct('参与竞标');
 		$this->id = $biddingId;
 		$this->title = '选中竞标';
 	}

app/AdminSupplier/Lazys/DemandBiddingLazys.php

@@ -20,7 +20,7 @@ class DemandBiddingLazys extends LazyRenderable
 			$demand = Demand::find($demandId);
 			$grid->model()->where('demand_id',$demandId);
 			$grid->column('id');
-			$grid->column('price','出价');
+			$grid->column('price','出价')->sortable();
 			$grid->column('comment','内容');
 			$grid->column('biddingUser.name','竞拍人');
 			$grid->column('bidding','竞标')

app/AdminSupplier/Renderable/SelectProduct.php

@@ -30,7 +30,7 @@ class SelectProduct extends LazyRenderable
 			$grid->quickSearch(['title', 'supplier.name'])->placeholder('搜索产品名称、供应商');
 
 			$grid->column('id');
-			$grid->column('supplier.name', '供应商');
+			$grid->column('supplier.name', '供应商')->display(fn($v) => $v);
 			$grid->column('title');
 			$grid->column('picture')->image('',60, 60);
 			$grid->column('sale');

resources/lang/zh_CN/agent-product.php

@@ -7,7 +7,7 @@ return [
     'fields' => [
         'agent_id' => '代理商ID',
         'product_id' => '供应商产品ID',
-        'price' => '现价',
+        'price' => '售价',
         'original_price' => '原价',
         'sale' => '销量',
         'stock' => '库存',

resources/lang/zh_CN/demand-product.php

@@ -13,6 +13,7 @@ return [
         'know' => '旅客须知',
         'original_price' => '原价',
         'picture' => '产品图片',
+        'pictures' => '产品图片',
         'price' => '价格',
         'sale' => '销量',
         'status' => '状态',

resources/lang/zh_CN/product.php

@@ -11,7 +11,7 @@ return [
         'original_price' => '原价',
         'pictures' => '产品图片',
         'picture' => '产品图片',
-        'price' => '现价',
+        'price' => '售价',
         'sale' => '销量',
         'status' => '状态',
         'stock' => '库存',