From b4d15e91fe18a02a572c0166ff470cd5eb3ec0ca Mon Sep 17 00:00:00 2001 From: yanzai Date: Tue, 11 Mar 2025 11:11:20 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E7=9B=B8=E5=85=B3=E3=80=81bu?= =?UTF-8?q?g=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../API/Admin/QuestionnaireController.php | 13 +++++++ .../API/Admin/YeWu/ComboController.php | 7 +++- .../Controllers/API/H5/OrderController.php | 8 ++--- .../API/H5/QuestionnairesLogsController.php | 36 +++++++++++++++++-- admin/src/views/Question/Question.vue | 33 +++++++++++++++-- h5/config.js | 4 +-- h5/pages/main/question/info/info.vue | 4 +-- h5/pages/main/yytjsj/yytjsj_new.vue | 2 ++ 8 files changed, 93 insertions(+), 14 deletions(-) diff --git a/Laravel/app/Http/Controllers/API/Admin/QuestionnaireController.php b/Laravel/app/Http/Controllers/API/Admin/QuestionnaireController.php index 7c5a1e6..9c98996 100644 --- a/Laravel/app/Http/Controllers/API/Admin/QuestionnaireController.php +++ b/Laravel/app/Http/Controllers/API/Admin/QuestionnaireController.php @@ -14,6 +14,9 @@ class QuestionnaireController extends Controller $name = $request->post('name'); $items = $request->post('items'); $questions = $request->post('questions'); + $jichu_combo_id = $request->post('jichu_combo'); + $tuijian_combo_id = $request->post('tuijian_combo'); + $gaoduan_combo_id = $request->post('gaoduan_combo'); if (!$name) { return \Yz::echoError('请填写问卷名称'); } @@ -28,6 +31,9 @@ class QuestionnaireController extends Controller 'type' => $type, 'name' => $name, 'items' => $items ?? '[]', + 'jichu_combo' => $jichu_combo_id, + 'tuijian_combo' => $tuijian_combo_id, + 'gaoduan_combo' => $gaoduan_combo_id, 'questions' => $questions ?? '[]', 'created_at' => date('Y-m-d H:i:s'), 'updated_at' => date('Y-m-d H:i:s'), @@ -41,6 +47,10 @@ class QuestionnaireController extends Controller $type = $request->post('type'); $name = $request->post('name'); $items = $request->post('items'); + $jichu_combo_id = $request->post('jichu_combo'); + $tuijian_combo_id = $request->post('tuijian_combo'); + $gaoduan_combo_id = $request->post('gaoduan_combo'); + $questions = $request->post('questions'); if (!$name) { return \Yz::echoError('请填写问卷名称'); @@ -56,6 +66,9 @@ class QuestionnaireController extends Controller 'type' => $type, 'name' => $name, 'items' => $items ?? '[]', + 'jichu_combo' => $jichu_combo_id, + 'tuijian_combo' => $tuijian_combo_id, + 'gaoduan_combo' => $gaoduan_combo_id, 'questions' => $questions ?? '[]', 'updated_at' => date('Y-m-d H:i:s'), ]); diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php index 4549c3b..8a252bb 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php @@ -181,7 +181,12 @@ class ComboController extends Controller return \Yz::Return(true, "查询完成", ['list' => $list, 'count' => $count]); } public function GetAllList(){ - $list = DB::table('combos')->get(); + $status = request('status'); + $list = DB::table('combos'); + if(isset($status) and $status=='enable'){ + $list = $list->where(['status'=>1]); + } + $list = $list->get(); return \Yz::Return(true, "查询完成", ['list' => $list]); } diff --git a/Laravel/app/Http/Controllers/API/H5/OrderController.php b/Laravel/app/Http/Controllers/API/H5/OrderController.php index 926eac3..ca5c9d1 100644 --- a/Laravel/app/Http/Controllers/API/H5/OrderController.php +++ b/Laravel/app/Http/Controllers/API/H5/OrderController.php @@ -287,10 +287,10 @@ class OrderController extends Controller ]; } } - if (isset($wj_flag) and $wj_flag == 1) { - $item_price = $item_price * $wj_zhekou; - } - +// if (isset($wj_flag) and $wj_flag == 1) { +// $item_price = $item_price * $wj_zhekou; +// } + $item_price = $item_price * config('app.globals.ZiXuan_ZheKou'); //所有自选项目打8折 $price += $item_price; $missingIds = array_diff($item_ids, $existingIds); diff --git a/Laravel/app/Http/Controllers/API/H5/QuestionnairesLogsController.php b/Laravel/app/Http/Controllers/API/H5/QuestionnairesLogsController.php index 708b997..99c6f4d 100644 --- a/Laravel/app/Http/Controllers/API/H5/QuestionnairesLogsController.php +++ b/Laravel/app/Http/Controllers/API/H5/QuestionnairesLogsController.php @@ -204,22 +204,52 @@ class QuestionnairesLogsController extends Controller } $type = $question_info->type; $items = json_decode($question_info->items, true); + //获取绑定套餐的id + $jichu_combo_new = (isset($question_info->jichu_combo) and !empty($question_info->jichu_combo))?$question_info->jichu_combo:0; + $tuijian_combo_new = (isset($question_info->tuijian_combo) and !empty($question_info->tuijian_combo))?$question_info->tuijian_combo:0; + $gaoduan_combo_new = (isset($question_info->gaoduan_combo) and !empty($question_info->gaoduan_combo))?$question_info->gaoduan_combo:0; + //获取套餐的项目 + $jichu_items_ids = []; + if ($jichu_combo_new) { + $jichu_combo_items = DB::table('combo_items')->where('combo_id', $jichu_combo_new)->get(); + foreach ($jichu_combo_items as $key => $value) { + $jichu_items_ids[]=$value->item_id; + } + } + $tuijian_items_ids = []; + if ($tuijian_combo_new) { + $tuijian_combo_items = DB::table('combo_items')->where('combo_id', $tuijian_combo_new)->get(); + foreach ($tuijian_combo_items as $key => $value) { + $tuijian_items_ids[]=$value->item_id; + } + } + $gaoduan_items_ids = []; + if ($gaoduan_combo_new) { + $gaoduan_combo_items = DB::table('combo_items')->where('combo_id', $gaoduan_combo_new)->get(); + foreach ($gaoduan_combo_items as $key => $value) { + $gaoduan_items_ids[]=$value->item_id; + } + } + $check_items = []; $check_items_array = [ 'jichu' => [ 'combo' => '0', 'combo_items' => [], - 'items' => [] + 'jichu' => $jichu_combo_new, + 'items' => $jichu_items_ids ], 'tuijian' => [ 'combo' => '0', 'combo_items' => [], - 'items' => [] + 'jichu' => $jichu_combo_new, + 'items' =>$tuijian_items_ids ], 'gaoduan' => [ 'combo' => '0', 'combo_items' => [], - 'items' => [] + 'jichu' => $jichu_combo_new, + 'items' => $gaoduan_items_ids ], ]; $question_ids = []; diff --git a/admin/src/views/Question/Question.vue b/admin/src/views/Question/Question.vue index 5dcb233..f4b9850 100644 --- a/admin/src/views/Question/Question.vue +++ b/admin/src/views/Question/Question.vue @@ -14,7 +14,8 @@ import { QuestionDeleteAction, QuestionListAction, QuestionItemItemAction, - QuestionQuestionSelectAction + QuestionQuestionSelectAction, + ComboGetAllList } from '@/api/api.js' const default_page_options = { @@ -75,7 +76,16 @@ const routerChange = (query) => { } QuestionList() } - +//获取可用套餐列表 +let combolist=ref([]); +const GetCombolist = async () => { + const response = await ComboGetAllList({status:"enable"}) + if (response.status) { + combolist.value=response.data.list + } else { + ElMessage.error(response.msg) + } +} const searchClick = (page = 1) => { page_options.value.page = page $router.push({ @@ -189,6 +199,7 @@ onMounted(() => { routerChange($router.currentRoute.value.query) QuestionItemItem() QuestionQuestionSelect() + GetCombolist() })