Merge branch 'develop' of http://gogs.zlhuiyun.com/szr190/ShenhaiH5 into develop

src/api/investigation.ts

@@ -3,7 +3,7 @@
  * @Author: Fengyu
  * @Date: 2025-12-12 14:00:09
  * @LastEditors: Fengyu
- * @LastEditTime: 2025-12-15 17:16:22
+ * @LastEditTime: 2025-12-15 17:34:10
  */
 import { http } from '@/utils/http'
 
@@ -30,4 +30,17 @@ export const submitQuestionnaireApi = (data: any) => {
     url: '/questionnaire/answer',
     data
   })
+}
+
+/**
+ * @description: 获取服务区
+ * @param {*} data
+ * @return {*}
+ */
+export const getParkList = (data: any) => {
+  return http({
+    method: 'GET',
+    url: '/space/park/select/web',
+    data
+  })
 }

src/pages/questionnaire.vue

@@ -3,7 +3,7 @@
  * @Author: Fengyu
  * @Date: 2025-12-12 10:12:59
  * @LastEditors: Fengyu
- * @LastEditTime: 2025-12-15 17:14:50
+ * @LastEditTime: 2025-12-17 10:26:23
 -->
 <template>
   <view class="questionnaire-container">
@@ -33,9 +33,18 @@
     <!-- 网格选择区域 -->
     <view class="grid-section">
       <view class="grid-container">
+        <view class="grid-item">
+          <view class="grid-content flex j-sb a-center">
+            <view class="grid-title">1.您所在的服务区</view>
+            <view class="grid-desc">
+              <u-select v-model="parkSelectShow" :list="parkList" @confirm="confirm"></u-select>
+              <span @click="parkSelectShow = true">{{ parkName || '请选择' }}</span>
+            </view>
+          </view>
+        </view>
         <view v-for="(item, index) in dataFilledIn" :key="item.id" class="grid-item">
           <view class="grid-content">
-            <view class="grid-title">{{ index + 1 }}. {{ item.name }}</view>
+            <view class="grid-title">{{ index + 2 }}. {{ item.name }}</view>
             <view class="grid-desc">
               <u-radio-group v-model="item.value">
                 <u-radio
@@ -52,7 +61,7 @@
         <!-- 最好的高速 -->
         <view class="grid-item">
           <view class="grid-content">
-            <view class="grid-title">{{ dataFilledIn.length + 1 }}. 您认为本服务区的最好的高速是？</view>
+            <view class="grid-title">{{ dataFilledIn.length + 2 }}. 您认为本服务区的最好的高速是？</view>
             <view class="grid-desc">
               <u-input v-model="bestWay" type="textarea" :border="false" :height="100" :auto-height="true" placeholder="请输入您的评价" />
             </view>
@@ -61,7 +70,7 @@
         <!-- 最好的服务区 -->
         <view class="grid-item">
           <view class="grid-content">
-            <view class="grid-title">{{ dataFilledIn.length + 2 }}. 您认为本服务区的最好的服务区是？</view>
+            <view class="grid-title">{{ dataFilledIn.length + 3 }}. 您认为本服务区的最好的服务区是？</view>
             <view class="grid-desc">
               <u-input v-model="bestService" type="textarea" :border="false" :height="100" :auto-height="true" placeholder="请输入您的评价" />
             </view>
@@ -78,7 +87,7 @@
 
 <script setup>
   import { ref, onMounted } from 'vue'
-  import { getQuestionnaireDetailApi, submitQuestionnaireApi } from '@/api/investigation'
+  import { getQuestionnaireDetailApi, submitQuestionnaireApi, getParkList } from '@/api/investigation'
 
   const dataList = ref([
     {
@@ -137,6 +146,46 @@
     }
   ])
 
+  // 服务区选择框是否显示
+  const parkSelectShow = ref(false)
+
+  // 服务区列表
+  const parkList = ref([])
+
+  const parkId = ref('')
+  const parkName = ref('')
+
+  // 获取服务区列表
+  const getParkListApi = () => {
+    getParkList().then(res => {
+      if (res.code === 200) {
+        parkList.value = res.data.map(item => ({
+          label: item.name,
+          value: item.id
+        }))
+      } else {
+        uni.showToast({
+          title: res.message || '获取服务区列表失败',
+          icon: 'none'
+        });
+      }
+    }).catch(err => {
+      console.error('获取服务区列表失败:', err);
+      uni.showToast({
+        title: err.data.msg ||'网络错误，请重试',
+        icon: 'none'
+      });
+    });
+  }
+
+  // 选择服务区
+  const confirm = (e) => {
+    console.log(e[0].value, e[0].label)
+    parkId.value = e[0].value
+    parkName.value = e[0].label
+  }
+  
+
   // 最好的高速
   const bestWay = ref('')
 
@@ -148,7 +197,7 @@
 
   // 问卷信息
   const questionnaireInfo = ref({
-    id: '',
+    // id: '',
     name: '',
     endAt: '',
     fileId: 0,
@@ -157,6 +206,7 @@
 
   // 根据页面参数获取问卷详情
   onMounted(() => {
+    getParkListApi()
     // 使用URLSearchParams正确解析URL参数
     const urlParams = new URLSearchParams(window.location.search);
     const questionnaireId = urlParams.get('id');
@@ -204,10 +254,19 @@
         });
         return;
       }
+
+      if (!parkId.value) {
+        uni.showToast({
+          title: '请选择服务区',
+          icon: 'none'
+        });
+        return;
+      }
       
       // 解析URL参数
       const urlParams = new URLSearchParams(window.location.search);
-      const questionnaireId = parseInt(questionnaireInfo.value.id) || 0;
+      const questionnaireId = questionnaireInfo.value.id || 0;
+      // const questionnaireId = '2000476937984221185' || 0;
       // const parkid = parseInt(urlParams.get('parkid')) || 0; // 与API参数名保持一致
       const mobile = urlParams.get('m') || '';
       
@@ -240,7 +299,9 @@
         targetF: parseInt(dataFilledIn.value.find(item => item.id === 6)?.value) || 0, // 车辆维修站
         targetG: parseInt(dataFilledIn.value.find(item => item.id === 7)?.value) || 0, // 总体评价
         bestWay: bestWay.value, // 最好的高速
-        bestService: bestService.value // 最好的服务区
+        bestService: bestService.value, // 最好的服务区
+        parkId: parkId.value,
+        // id: questionnaireId
       };
       
       // 构建完整参数对象，确保与API要求一致
@@ -260,6 +321,11 @@
             title: '感谢您的反馈！',
             icon: 'success'
           });
+          setTimeout(() => {
+            uni.redirectTo({
+              url: '/pages/index'
+            })
+          }, 2000);
         } else {
           uni.showToast({
             title: res.message || '提交失败，请重试',