diff --git a/Laravel/app/Http/Controllers/API/H5/QuestionnairesLogsController.php b/Laravel/app/Http/Controllers/API/H5/QuestionnairesLogsController.php index 3cd09bc..e9d05bb 100644 --- a/Laravel/app/Http/Controllers/API/H5/QuestionnairesLogsController.php +++ b/Laravel/app/Http/Controllers/API/H5/QuestionnairesLogsController.php @@ -113,17 +113,41 @@ class QuestionnairesLogsController extends Controller 'jichu' => self::sum_items($items, $check_items_array['jichu']), 'tuijian' => self::sum_items($items, $check_items_array['tuijian']), 'gaoduan' => self::sum_items($items, $check_items_array['gaoduan']), + ], + 'count' => [ + 'jichu' => self::item_count($items, $check_items_array['jichu']), + 'tuijian' => self::item_count($items, $check_items_array['tuijian']), + 'gaoduan' => self::item_count($items, $check_items_array['gaoduan']), ] ]); } + public function item_count($items, $check_items) + { + $ic = count($items) + count($check_items['items']) + count($check_items['combo_items']); + return $ic; + } + public function sum_items($items, $check_items) { - $sum = DB::table('items')->whereIn('item_id', $items)->where('status', 1)->sum('price'); - $check_sum = DB::table('items')->whereIn('item_id', $check_items['items'])->where('status', 1)->sum('price'); - $combo = DB::table('combos')->whereIn('combo_id', [$check_items['combo']])->where('status', 1)->sum('price'); + if (count($items)) { + $sum = DB::table('items')->whereIn('item_id', $items)->where('status', 1)->sum('price'); + } else { + $sum = 0; + } + if (count($check_items['items'])) { + $check_sum = DB::table('items')->whereIn('item_id', $check_items['items'])->where('status', 1)->sum('price'); + } else { + $check_sum = 0; + } + + if (count($check_items['combo_items'])) { + $combo = DB::table('items')->whereIn('item_id', $check_items['combo_items'])->where('status', 1)->sum('price'); + } else { + $combo = 0; + } $zhekou = config('app.globals.Wj_ZheKou'); - return number_format($combo + (($sum + $check_sum) * $zhekou), 2, '.', ''); + return number_format((($combo + $sum + $check_sum) * $zhekou), 2, '.', ''); } public function submit(Request $request) { diff --git a/h5/pages/main/question/info/info.vue b/h5/pages/main/question/info/info.vue index 25e68c0..5420905 100644 --- a/h5/pages/main/question/info/info.vue +++ b/h5/pages/main/question/info/info.vue @@ -77,15 +77,15 @@ const id = question_info.value.check_items_array[type].combo const mergedArray = [...new Set([ ...question_info.value.items, - ...question_info.value.check_items_array[type].items + ...question_info.value.check_items_array[type].items, + ...question_info.value.check_items_array[type].combo_items, ])] - let query = "?comboId=" + id + '&wj=1'; if (mergedArray.length !== 0) { - query += "&itemIds=" + mergedArray.join(','); + let query = "?wj=1&itemIds=" + mergedArray.join(','); + uni.navigateTo({ + url: "/pages/main/tj/tjxq" + query, + }); } - uni.navigateTo({ - url: "/pages/main/tj/tjxq" + query, - }); } onShow(() => { @@ -108,10 +108,7 @@ 基础推荐方案 - {{ question_info.items.length - + question_info.check_items_array.jichu.combo_items.length - + question_info.check_items_array.jichu.items.length - }}项 + {{ question_info.count.jichu }}项 @@ -131,10 +128,7 @@ 中等推荐方案 - {{ question_info.items.length - + question_info.check_items_array.tuijian.combo_items.length - + question_info.check_items_array.tuijian.items.length - }}项 + {{ question_info.count.tuijian }}项 @@ -154,10 +148,7 @@ 高端推荐方案 - {{ question_info.items.length - + question_info.check_items_array.gaoduan.combo_items.length - + question_info.check_items_array.gaoduan.items.length - }}项 + {{ question_info.count.gaoduan }}项