From 8919451085678c72aee4a126d3832ec3b435070c Mon Sep 17 00:00:00 2001
From: sa0ChunLuyu <sa0Chun_luyu@aliyun.com>
Date: Thu, 24 Oct 2024 01:47:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E6=A3=80=E5=89=8D?=
 =?UTF-8?q?=E9=97=AE=E5=8D=B7=20=E5=A5=97=E9=A4=90=E6=8B=86=E5=88=86?=
 =?UTF-8?q?=E6=88=90=20=E8=87=AA=E9=80=89=E9=A1=B9=E7=9B=AE=E3=80=82=20?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=9D=90=E6=96=99=E8=B4=B9=E5=89=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../API/H5/QuestionnairesLogsController.php   | 32 ++++++++++++++++---
 h5/pages/main/question/info/info.vue          | 27 ++++++----------
 2 files changed, 37 insertions(+), 22 deletions(-)

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 @@
 					<view class="items_title_wrapper">
 						<view class="items_title_text_wrapper">基础推荐方案</view>
 						<view class="items_title_count_wrapper">
-							<text>{{ question_info.items.length 
-							+ question_info.check_items_array.jichu.combo_items.length 
-							+ question_info.check_items_array.jichu.items.length 
-							}}项</text>
+							<text>{{ question_info.count.jichu }}项</text>
 							<view class="count_icon_wrapper">
 								<uni-icons type="right" size="20"></uni-icons>
 							</view>
@@ -131,10 +128,7 @@
 					<view class="items_title_wrapper">
 						<view class="items_title_text_wrapper">中等推荐方案</view>
 						<view class="items_title_count_wrapper">
-							<text>{{ question_info.items.length 
-							+ question_info.check_items_array.tuijian.combo_items.length 
-							+ question_info.check_items_array.tuijian.items.length 
-							}}项</text>
+							<text>{{ question_info.count.tuijian }}项</text>
 							<view class="count_icon_wrapper">
 								<uni-icons type="right" size="20"></uni-icons>
 							</view>
@@ -154,10 +148,7 @@
 					<view class="items_title_wrapper">
 						<view class="items_title_text_wrapper">高端推荐方案</view>
 						<view class="items_title_count_wrapper">
-							<text>{{ question_info.items.length 
-							+ question_info.check_items_array.gaoduan.combo_items.length 
-							+ question_info.check_items_array.gaoduan.items.length 
-							}}项</text>
+							<text>{{ question_info.count.gaoduan }}项</text>
 							<view class="count_icon_wrapper">
 								<uni-icons type="right" size="16"></uni-icons>
 							</view>