From f1d8c6ad42b716a4cd385367b08f480cc6b82682 Mon Sep 17 00:00:00 2001 From: liapples Date: Wed, 8 Sep 2021 18:18:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/AdminSupplier/Controllers/ProductController.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/AdminSupplier/Controllers/ProductController.php b/app/AdminSupplier/Controllers/ProductController.php index c72aa80..414c975 100644 --- a/app/AdminSupplier/Controllers/ProductController.php +++ b/app/AdminSupplier/Controllers/ProductController.php @@ -152,6 +152,7 @@ class ProductController extends AdminController $table->text('tag', '包含项目')->placeholder('如：24小时热水、干洗服务等'); })->value($default)->help('首次创建时，系统会默认填充基本服务，请根据本酒店情况进行删减或新增'); + $form->text('extends.field_1.name', '酒店名'); $form->text('extends.field_1.address', '地址'); $form->map('extends.field_1.latitude', 'extends.field_1.longitude', '位置'); })->when(2, function (Form $form) { //景区 @@ -167,6 +168,7 @@ class ProductController extends AdminController $table->text('price', '费用'); })->help('第一行数据默认是表头，如：项目名称、数量、额外费用'); + $form->text('extends.field_2.name', '景区名'); $form->text('extends.field_2.address', '地址'); $form->map('extends.field_2.latitude', 'extends.field_2.longitude', '位置'); })->when(3, function (Form $form) { //餐厅 @@ -182,6 +184,7 @@ class ProductController extends AdminController $table->text('price', '价格')->placeholder('如：99元'); })->help('第一行数据默认是表头，如：项目名称、数量、额外费用'); + $form->text('extends.field_3.name', '餐厅名'); $form->text('extends.field_3.address', '地址'); $form->map('extends.field_3.latitude', 'extends.field_3.longitude', '位置'); }); From 648dbb7e92ee536eb68070093b73a273e87bf1b8 Mon Sep 17 00:00:00 2001 From: liapples Date: Wed, 8 Sep 2021 18:35:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0jump=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/OrderController.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/Http/Controllers/Api/OrderController.php b/app/Http/Controllers/Api/OrderController.php index 483645c..0a94040 100644 --- a/app/Http/Controllers/Api/OrderController.php +++ b/app/Http/Controllers/Api/OrderController.php @@ -306,6 +306,10 @@ class OrderController extends Controller $ap->final_price = $this->calc($ap->price, $formData['num'], $formData['pay_type'], $ap); $ap->num = $formData['num']; + + //是否跳转到外部小程序支付（分账测试） + $ap->jump = true; + return $this->success($ap); }