fix: 接口联调

src/App.vue

@@ -1,12 +1,7 @@
 <script setup lang="ts">
-import { user } from '@/stores/modules/user'
 import { onLaunch, onShow, onHide } from '@dcloudio/uni-app'
 
-const userStore = user()
-
-onLaunch(() => {
-  //
-})
+onLaunch(() => {})
 onShow(() => {
   console.log('App Show')
 })

src/api/home.ts

@@ -158,3 +158,40 @@ export const getQuestionDetail = (id: string) => {
     url: `/other/question/web/${id}`
   })
 }
+
+// 新增问题反馈
+export const addQuestionFeedback = (data: any) => {
+  return http({
+    method: 'POST',
+    url: `/operate/feedback/mpAdd`,
+    data
+  })
+}
+
+// 查询问题反馈列表
+export const getQuestionFeedbackList = (data: any) => {
+  return http({
+    method: 'GET',
+    url: `/operate/feedback/mpList`,
+    data
+  })
+}
+
+// 查询问题反馈详情
+export const getQuestionFeedbackDetail = (id: string) => {
+  return http({
+    method: 'GET',
+    url: `/operate/feedback/mp/${id}`
+  })
+}
+
+/**
+ * @description: 获取banner
+ * @return {*}
+ */
+export const getBannerApi = () => {
+  return http<EmptyObjectType[]>({
+    method: 'GET',
+    url: '/operate/banner/web'
+  })
+}

src/api/login.ts

@@ -154,9 +154,9 @@ export const phoneLoginApi = (data: { code: string }) => {
 }
 
 // 手机号登录
-export const h5PhoneLoginApi = () => {
+export const h5PhoneLoginApi = (phone: string) => {
   return http({
     method: 'POST',
-    url: `/h5PhoneLogin`
+    url: `/h5PhoneLogin?phone=${phone}`
   })
 }

src/base/common/charge.vue

@@ -5,15 +5,12 @@
     </view>
     <view class="common-content-wrapper">
       <view class="common-card">
-        <!-- common title -->
         <view class="common-card-title">{{ chargeInfo?.title }}</view>
-        <!-- sub title -->
         <view class="common-sub-title">营业时间:{{ chargeInfo?.businessAt }}</view>
         <view class="common-sub-title">客服电话:{{ chargeInfo?.mobile }}</view>
       </view>
       <view class="common-card">
         <view class="common-card-title u-margin-bottom-20">当前电价</view>
-        <!-- 当前电价及时间展示 -->
         <view class="charge-current-wrapper">
           <view class="current-left-wrap">
             <view class="text">{{ content?.price }}</view>
@@ -46,8 +43,10 @@ onLoad(async () => {
   const parkId = uni.getStorageSync('parkId')
   const res = await getParkServicePower(parkId)
   if (res.code === 200) {
-    chargeInfo.value = res.data
-    content.value = JSON.parse(chargeInfo.value.content)
+    if (res.data) {
+      chargeInfo.value = res.data
+      content.value = JSON.parse(chargeInfo.value?.content)
+    }
   }
 })
 </script>

src/base/common/driversHome.vue

@@ -5,9 +5,7 @@
     </view>
     <view class="common-content-wrapper">
       <view class="common-card">
-        <!-- common title -->
         <view class="common-card-title">{{ driverInfo?.title }}</view>
-        <!-- sub title -->
         <view class="common-sub-title">营业时间:{{ driverInfo?.businessAt }}</view>
         <view class="common-sub-title">客服电话:{{ driverInfo?.mobile }}</view>
       </view>
@@ -39,9 +37,10 @@ onLoad(async () => {
   const parkId = uni.getStorageSync('parkId')
   const res = await getParkServiceDriver(parkId)
   if (res.code === 200) {
-    driverInfo.value = res.data
-    content.value = JSON.parse(driverInfo.value.content)
-    console.log('🚀 ~ content.value:', content.value)
+    if (res.data) {
+      driverInfo.value = res.data
+      content.value = JSON.parse(driverInfo.value?.content)
+    }
   }
 })
 </script>

src/base/common/join.vue

@@ -20,8 +20,6 @@
 import { ref } from 'vue'
 import { onLoad } from '@dcloudio/uni-app'
 import { getParkServiceInvestment } from '@/api/home'
-import { useGlobal } from '../../composables/index'
-const { minioUrl } = useGlobal()
 
 // 招商加盟详情
 const joinInfo = ref<any>({})
@@ -32,8 +30,10 @@ onLoad(async () => {
   if (parkId) {
     const res = await getParkServiceInvestment(parkId)
     if (res.code === 200) {
-      joinInfo.value = res.data
-      content.value = JSON.parse(joinInfo.value.content)
+      if (res.data) {
+        joinInfo.value = res.data
+        content.value = JSON.parse(joinInfo.value?.content)
+      }
     }
   }
 })

src/base/common/nursingRoom.vue

@@ -5,9 +5,7 @@
     </view>
     <view class="common-content-wrapper">
       <view class="common-card">
-        <!-- common title -->
         <view class="common-card-title">{{ boyInfo?.title }}</view>
-        <!-- sub title -->
         <view class="common-sub-title">营业时间:{{ boyInfo?.businessAt }}</view>
         <view class="common-sub-title">客服电话:{{ boyInfo?.mobile }}</view>
       </view>
@@ -39,8 +37,10 @@ onLoad(async () => {
   const parkId = uni.getStorageSync('parkId')
   const res = await getParkServiceBoy(parkId)
   if (res.code === 200) {
-    boyInfo.value = res.data
-    content.value = JSON.parse(boyInfo.value.content)
+    if (res.data) {
+      boyInfo.value = res.data
+      content.value = JSON.parse(boyInfo.value?.content)
+    }
   }
 })
 </script>

src/base/common/refuel.vue

@@ -5,9 +5,7 @@
     </view>
     <view class="common-content-wrapper">
       <view class="common-card">
-        <!-- common title -->
         <view class="common-card-title">{{ refuelInfo.title }}</view>
-        <!-- sub title -->
         <view class="common-sub-title">营业时间:{{ refuelInfo?.businessAt }}</view>
         <view class="common-sub-title">客服电话:{{ refuelInfo?.mobile }}</view>
       </view>
@@ -30,8 +28,6 @@
 import { ref } from 'vue'
 import { onLoad } from '@dcloudio/uni-app'
 import { getParkServiceOil } from '@/api/home'
-import { useGlobal } from '../../composables/index'
-const { minioUrl } = useGlobal()
 
 // 我要加油
 const refuelInfo = ref<any>({})

src/base/common/repair.vue

@@ -5,9 +5,7 @@
     </view>
     <view class="common-content-wrapper">
       <view class="common-card">
-        <!-- common title -->
         <view class="common-card-title">{{ carInfo?.title }}</view>
-        <!-- sub title -->
         <view class="common-sub-title">营业时间:{{ carInfo?.businessAt }}</view>
         <view class="common-sub-title">客服电话:{{ carInfo?.mobile }}</view>
       </view>
@@ -34,8 +32,10 @@ onLoad(async () => {
   const parkId = uni.getStorageSync('parkId')
   const res = await getParkServiceCar(parkId)
   if (res.code === 200) {
-    carInfo.value = res.data
-    content.value = JSON.parse(carInfo.value.content)
+    if (res.data) {
+      carInfo.value = res.data
+      content.value = JSON.parse(carInfo.value.content)
+    }
   }
 })
 </script>

src/base/common/spot.vue

@@ -5,12 +5,10 @@
     </view>
     <view class="common-content-wrapper">
       <view class="common-card">
-        <!-- common title -->
         <view class="common-card-title">
           <view class="text">{{ details.title }}</view>
           <view class="card-tag">{{ content.level }}</view>
         </view>
-        <!-- sub title -->
         <view class="common-sub-title">开放时间：{{ details?.businessAt }}</view>
         <view class="common-sub-title">
           <view class="text">地址：{{ content?.address }}</view>

src/base/shop/details.vue

@@ -5,14 +5,11 @@
     </view>
     <view class="common-content-wrapper">
       <view class="common-card">
-        <!-- common title -->
         <view class="common-card-title">{{ details.title }}</view>
-        <!-- rate -->
         <view class="common-card-rate">
-          <uni-rate allow-half :value="content.rate" color="#ddd" activeColor="#ff5702" />
+          <uni-rate allow-half :value="content.rate" disabled disabledColor="#ff5702" color="#ddd" activeColor="#ff5702" />
           <text>{{ content.rate }}</text>
         </view>
-        <!-- sub title -->
         <view class="common-sub-title">营业时间: {{ details.businessAt }}</view>
       </view>
       <view class="common-card">
@@ -21,7 +18,7 @@
           <u-parse :html="content?.intro" />
         </view>
         <view class="common-card-title u-margin-top-30">精品推荐</view>
-        <view class="common-card-list" v-if="content.facilities.length > 0">
+        <view class="common-card-list" v-if="content.facilities?.length > 0">
           <view class="card-list-item" v-for="(item, index) in content.facilities" :key="index">
             <view class="item-img-wrap">
               <image :src="item.img" mode="scaleToFill" />
@@ -50,8 +47,10 @@ onLoad(async (options) => {
   const parkId = uni.getStorageSync('parkId')
   const res = await getParkServiceEatDetail(id.value, parkId)
   if (res.code === 200) {
-    details.value = res.data
-    content.value = JSON.parse(details.value.content)
+    if (res.data) {
+      details.value = res.data
+      content.value = JSON.parse(details.value?.content || '{}')
+    }
   }
 })
 </script>

src/base/shop/detailsShop.vue

@@ -5,23 +5,23 @@
     </view>
     <view class="common-content-wrapper">
       <view class="common-card">
-        <!-- common title -->
         <view class="common-card-title">{{ details.title }}</view>
-        <!-- rate -->
         <view class="common-card-rate">
-          <uni-rate allow-half :value="content.rate" color="#ddd" activeColor="#ff5702" />
+          <uni-rate allow-half :value="content.rate" disabled disabledColor="#ff5702" color="#ddd" activeColor="#ff5702" />
           <text>{{ content.rate }}</text>
         </view>
-        <!-- sub title -->
         <view class="common-sub-title">营业时间: {{ details.businessAt }}</view>
       </view>
       <view class="common-card">
         <view class="common-card-title">店铺简介</view>
-        <view class="common-card-content">
+        <view class="common-card-content" v-if="content?.intro">
           <u-parse :html="content?.intro" />
         </view>
+        <view class="common-card-content" v-else>
+          <u-empty text="暂无简介" />
+        </view>
         <view class="common-card-title u-margin-top-30">精品推荐</view>
-        <view class="common-card-list" v-if="content.facilities.length > 0">
+        <view class="common-card-list" v-if="content.facilities?.length > 0">
           <view class="card-list-item" v-for="(item, index) in content.facilities" :key="index">
             <view class="item-img-wrap">
               <image :src="item.img" mode="scaleToFill" />
@@ -50,8 +50,10 @@ onLoad(async (options) => {
   const parkId = uni.getStorageSync('parkId')
   const res = await getParkServiceShopDetail(id.value, parkId)
   if (res.code === 200) {
-    details.value = res.data
-    content.value = JSON.parse(details.value.content)
+    if (res.data) {
+      details.value = res.data
+      content.value = JSON.parse(details.value?.content || '{}')
+    }
   }
 })
 </script>

src/base/shop/index.vue

@@ -8,7 +8,7 @@
 
 <script lang="ts" setup>
 import { ref, computed } from 'vue'
-import { onLoad, onShow, onPageScroll } from '@dcloudio/uni-app'
+import { onShow, onPageScroll } from '@dcloudio/uni-app'
 import { getParkServiceShopList } from '@/api/home'
 import { useListLoader } from '@/composables/useListLoader'
 

src/base/shop/meal.vue

@@ -8,7 +8,7 @@
 
 <script lang="ts" setup>
 import { ref, computed } from 'vue'
-import { onLoad, onShow, onPageScroll } from '@dcloudio/uni-app'
+import { onShow, onPageScroll } from '@dcloudio/uni-app'
 import { getParkServiceEatList } from '@/api/home'
 import { useListLoader } from '@/composables/useListLoader'
 

src/base/suggest/details.vue

@@ -1,6 +1,5 @@
 <template>
   <view class="notice-detail-container">
-    <!-- 详情内容 -->
     <view class="notice-detail-content">
       <view class="detail-content-header">
         <view class="title">{{ detailInfo.title }}</view>

src/base/suggest/record.vue

@@ -1,30 +1,65 @@
 <template>
-  <view class="suggest-record-container">
-    <view class="record-item">
-      <view class="record-item-header">
-        <view class="title u-line-2">功能还有不少需要提升的，需要改进的地方不少希望尽快处理提升完善</view>
-        <view class="pic-list">
-          <view class="pic-wrap">
-            <image src="" mode="scaleToFill" />
+  <mescroll-body @init="mescrollInit" :down="{ use: true, minAngle: angle }" @down="downCallback" @up="upCallback">
+    <view class="suggest-record-container">
+      <view class="record-item" v-for="(item, index) in listData" :key="index">
+        <view class="record-item-header" :class="{ borderBottom: item.status === 1 }" :style="{ paddingBottom: item.status === 0 ? '0' : '24rpx' }">
+          <view class="title u-line-2">{{ item.content }}</view>
+          <view class="pic-list">
+            <view class="pic-wrap" v-for="(pic, index) in item.albumPics" :key="index">
+              <image :src="pic" mode="aspectFill" @click="previewImage(item.albumPics, index)" />
+            </view>
           </view>
-          <view class="pic-wrap">
-            <image src="" mode="scaleToFill" />
+          <view class="time-status-wrap">
+            <view class="time-text">{{ item.publishAt }}</view>
+            <view class="status-text" :class="{ warning: item.status === 0 }">{{ item.status === 1 ? '已完结' : '待反馈' }}</view>
           </view>
         </view>
-        <view class="time-status-wrap">
-          <view class="time-text">2025-10-12 12:36:50</view>
-          <view class="status-text">已完结</view>
+        <view class="record-item-bottom" v-if="item.status === 1">
+          <view class="bottom-title-text">{{ item.feedback }}</view>
+          <view class="bottom-time-text">{{ item.feedbackAt }}</view>
         </view>
       </view>
-      <view class="record-item-bottom">
-        <view class="bottom-title-text">感谢您对我们的反馈，我们会持续优化， 继续完善！</view>
-        <view class="bottom-time-text">2025-10-12 12:36:50</view>
-      </view>
     </view>
-  </view>
+  </mescroll-body>
 </template>
 
-<script lang="ts" setup></script>
+<script lang="ts" setup>
+import { ref } from 'vue'
+import { onLoad, onPageScroll } from '@dcloudio/uni-app'
+import { getQuestionFeedbackList } from '@/api/home'
+import { useListLoader } from '@/composables/useListLoader'
+
+const angle = ref(45)
+// 监听页面滚动
+onPageScroll((e) => {
+  if (e.scrollTop > 80) {
+    angle.value = 90
+  } else {
+    angle.value = 45
+  }
+})
+
+// 图片预览功能
+const previewImage = (pics: string[], currentIndex: number) => {
+  // 将图片路径转换为完整路径
+  const fullImageList = pics.map((pic) => pic)
+
+  // 调用uni的图片预览API
+  uni.previewImage({
+    current: fullImageList[currentIndex], // 当前显示图片的http链接
+    urls: fullImageList, // 需要预览的图片http链接列表
+    loop: true // 是否可循环预览
+  })
+}
+
+// 列表加载
+const { listData, upCallback, downCallback, handleSearch, mescrollInit } = useListLoader({
+  apiFn: getQuestionFeedbackList,
+  initialParams: {
+    parkId: uni.getStorageSync('parkId')
+  }
+})
+</script>
 
 <style lang="scss" scoped>
 .suggest-record-container {
@@ -36,10 +71,12 @@
     padding: 34rpx 34rpx 38rpx 34rpx;
     background-color: #fff;
     border-radius: 14rpx;
+    margin-bottom: 24rpx;
     .record-item-header {
       box-sizing: border-box;
-      padding-bottom: 24rpx;
-      border-bottom: 1rpx solid #f4f5f9;
+      &.borderBottom {
+        border-bottom: 1rpx solid #f4f5f9;
+      }
       .title {
         font-size: 28rpx;
         color: #333;
@@ -88,6 +125,7 @@
         font-weight: 500;
         line-height: 42rpx;
         margin-bottom: 20rpx;
+        color: #999;
       }
       .bottom-time-text {
         font-size: 25rpx;

src/base/suggest/suggest.vue

@@ -3,17 +3,22 @@
     <!-- 问题类型 -->
     <HyCard title="请选择您要反馈的问题类型">
       <view class="suggest-type-wrapper">
-        <view class="type-item active">现场环境</view>
-        <view class="type-item">商家服务</view>
-        <view class="type-item">商品问题</view>
-        <view class="type-item">价格问题</view>
-        <view class="type-item">其他</view>
+        <view
+          v-for="(item, index) in typeList"
+          :key="index"
+          class="type-item"
+          :class="{ active: index === typeIndex }"
+          @click="handleTypeClick(index)"
+        >
+          {{ item.name }}
+        </view>
       </view>
     </HyCard>
     <!-- 描述问题 -->
     <HyCard title="请描述您的问题">
       <view class="suggest-common-wrapper">
         <u-input
+          v-model="form.content"
           type="textarea"
           :height="328"
           :maxlength="200"
@@ -25,21 +30,95 @@
     <!-- 图片描述 -->
     <HyCard title="图片描述（选填）">
       <view class="suggest-common-wrapper">
-        <u-upload />
+        <u-upload ref="uploadRef" width="160" height="160" :action="'/system/oss/upload'" />
       </view>
     </HyCard>
     <!-- 联系方式 -->
     <HyCard title="联系方式">
       <view class="suggest-common-wrapper">
-        <u-input placeholder="请输入您的联系方式" />
+        <u-input v-model="form.phone" placeholder="请输入您的联系方式" />
       </view>
     </HyCard>
     <!-- 提交 -->
-    <view class="submit-btn-wrapper">提交</view>
+    <view class="submit-btn-wrapper" @click="submit">提交</view>
   </view>
 </template>
 
-<script lang="ts" setup></script>
+<script lang="ts" setup>
+import { computed, reactive, ref, getCurrentInstance } from 'vue'
+import { addQuestionFeedback } from '@/api/home'
+
+const { proxy } = getCurrentInstance() as any
+
+const typeList = ref([
+  { name: '现场环境', value: 1 },
+  { name: '商家服务', value: 2 },
+  { name: '商品问题', value: 3 },
+  { name: '价格问题', value: 4 },
+  { name: '其他', value: 5 }
+])
+const typeIndex = ref(0)
+const categoryId = computed(() => typeList.value[typeIndex.value].value)
+
+const handleTypeClick = (index: number) => {
+  typeIndex.value = index
+}
+
+const form = reactive({
+  content: '',
+  phone: ''
+})
+
+const pics = ref<any>([])
+
+const submit = () => {
+  if (!form.content) {
+    uni.showToast({
+      title: '请描述您的问题',
+      icon: 'none'
+    })
+    return
+  }
+  if (!form.phone) {
+    uni.showToast({
+      title: '请输入您的联系方式',
+      icon: 'none'
+    })
+    return
+  }
+  // 处理上传的图片
+  const files = proxy?.$refs?.uploadRef?.lists.filter((v: any) => v.progress == 100) || []
+  files.forEach((file: any) => {
+    if (file.response && file.response.data && file.response.data.url) {
+      pics.value.push(file.response.data.url)
+    }
+  })
+  // 构造提交参数
+  const submitParams = {
+    ...form,
+    categoryId: categoryId.value,
+    albumPics: pics.value,
+    parkId: uni.getStorageSync('parkId')
+  }
+  // 提交到服务器
+  addQuestionFeedback(submitParams).then((res: any) => {
+    if (res.code == 200) {
+      uni.showToast({
+        title: '提交成功',
+        icon: 'success'
+      })
+      // 提交成功后，清空表单数据
+      form.content = ''
+      form.phone = ''
+      pics.value = []
+      typeIndex.value = 0
+      setTimeout(() => {
+        uni.navigateBack()
+      }, 1000)
+    }
+  })
+}
+</script>
 
 <style lang="scss" scoped>
 .suggest-submit-container {
@@ -83,9 +162,10 @@
     font-size: 31rpx;
     color: #fff;
     border-radius: 42rpx;
-    position: fixed;
-    bottom: 31rpx;
-    left: 28rpx;
+    margin-top: 50rpx;
+    // position: fixed;
+    // bottom: 31rpx;
+    // left: 28rpx;
   }
 }
 </style>

src/base/travel/tips.vue

@@ -1,7 +1,6 @@
 <template>
   <mescroll-body @init="mescrollInit" :down="{ use: true, minAngle: angle }" @down="downCallback" @up="upCallback">
     <view class="travel-tips-container">
-      <!-- tabs -->
       <u-tabs
         v-model="tabActive"
         :list="list"
@@ -13,7 +12,6 @@
         }"
         @change="handleTabChange"
       ></u-tabs>
-      <!-- list -->
       <view class="travel-tips-list">
         <view class="tips-list-item" v-for="(item, index) in listData" :key="index" @click="toDetail(item.id)">
           <view class="title u-line-2">{{ item.title }}</view>

src/components/HyCard.vue

@@ -16,9 +16,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue'
-
-const props = defineProps({
+defineProps({
   title: {
     type: String,
     default: ''
@@ -61,7 +59,8 @@ const handleClickRight = () => {
   border-radius: 14rpx;
   &.bg-card {
     width: 100%;
-    min-height: 549rpx;
+    // min-height: 549rpx;
+    padding-bottom: 24rpx;
     background-position: center center;
     background-size: 100% 100%;
     background-repeat: no-repeat;

src/components/HyCharge.vue

@@ -13,9 +13,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue'
-
-const props = defineProps({
+defineProps({
   title: {
     type: String,
     default: '快充'

src/components/HyService.vue

@@ -5,7 +5,7 @@
       <text>{{ item.title }}</text>
     </view>
     <view class="item-right-wrap" :style="{ backgroundImage: `url(${minioUrl}/bg_service_03.png)` }">
-      <view class="main-text" v-if="item.title === '司机之家'">淋浴/洗衣</view>
+      <view class="main-text" v-if="item.title === '司机之家'">{{ item.content.serviceContent }}</view>
       <view class="block-content" v-else>
         <view class="label">空闲</view>
         <view class="number-box">
@@ -20,7 +20,8 @@
 <script lang="ts" setup>
 import { useGlobal } from '@/composables/index'
 const { minioUrl } = useGlobal()
-const props = defineProps({
+
+defineProps({
   item: {
     type: Object,
     default: () => ({})

src/components/HyTag.vue

@@ -8,9 +8,6 @@
 </template>
 
 <script lang="ts" setup>
-import { useGlobal } from '@/composables/index'
-const { minioUrl } = useGlobal()
-
 // props需要传入 图片宽高、文字、字号、是否需要背景边框
 defineProps({
   imgWidth: {

src/pages.json

@@ -54,7 +54,7 @@
           "path": "suggest/record",
           "style": {
             "navigationBarTitleText": "反馈历史",
-            "enablePullDownRefresh": true
+            "enablePullDownRefresh": false
           }
         },
         {

src/pages/index.vue

@@ -7,15 +7,16 @@ import {
   getParkServiceShopList,
   getParkServiceScenicList,
   getParkServiceFacility,
-  getParkServiceNoticeList
+  getParkServiceNoticeList,
+  getBannerApi
 } from '@/api/home'
-import { getParkWebAPI } from '@/api/system'
+import { h5PhoneLoginApi } from '@/api/login'
 import { useListLoader } from '@/composables/useListLoader'
 import { useGlobal } from '@/composables/index'
 import { user } from '@/stores/modules/user'
 
-const userStore = user()
 const { minioUrl } = useGlobal()
+const userStore = user()
 
 const angle = ref(45)
 // 监听页面滚动
@@ -54,7 +55,17 @@ const isRescueShow = ref(false)
 // 失物招领弹窗展示
 const isLostFoundShow = ref(false)
 
-onLoad(() => {
+onLoad((options) => {
+  const m = options?.m || ''
+  if (m) {
+    h5PhoneLoginApi(m).then((res: any) => {
+      const token = res.data.token || ''
+      if (token) {
+        uni.setStorageSync('token', token)
+        userStore.setToken(token)
+      }
+    })
+  }
   // 页面加载时从本地缓存获取园区ID
   const cachedParkId = uni.getStorageSync('parkId')
   if (cachedParkId) {
@@ -74,6 +85,8 @@ const init = () => {
   getFacilityList()
   // 获取出行提醒数据
   getNoticeList()
+  // 获取banner数据
+  // getBannerList()
 }
 
 // 处理园区选择变化
@@ -93,6 +106,15 @@ onShow(() => {
   init()
 })
 
+// 获取banner数据
+const bannerList = ref<any>([])
+const getBannerList = async () => {
+  const res = (await getBannerApi()) as any
+  if (res.data) {
+    bannerList.value = res.data.map((item: any) => item.imageInfo?.url)
+  }
+}
+
 // 获取我要加油数据
 const oilInfo = ref<any>({})
 const listOli = ref<any>([])
@@ -209,6 +231,13 @@ const navigateToShop = () => {
   })
 }
 
+// 精选商家详情点击事件
+const navigateToShopDetail = (id: string) => {
+  uni.navigateTo({
+    url: '/base/shop/detailsShop?id=' + id
+  })
+}
+
 // 景点点击事件
 const navigateToSpot = (id: string) => {
   uni.navigateTo({
@@ -354,7 +383,7 @@ const callPhone = (phone: string) => {
       <!-- 人气优选商家 -->
       <HyCard title="人气优选商家" rightText="更多商家" isShowRight :marginBottom="24" @clickRight="navigateToShop">
         <view class="index-shop-wrapper" v-if="shopList.length > 0">
-          <view class="shop-item" v-for="(item, index) in shopList" :key="index">
+          <view class="shop-item" v-for="(item, index) in shopList" :key="index" @click="navigateToShopDetail(item.id)">
             <view class="img-wrap">
               <image :src="item.content.image" mode="scaleToFill" />
             </view>

src/pages/my.vue

@@ -1,16 +1,40 @@
 <script setup lang="ts">
+import { ref } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { getUserInfoApi } from '@/api/login'
 import { useGlobal } from '@/composables/index'
 const { minioUrl } = useGlobal()
+
+const userInfo = ref<any>({})
+
+onLoad(() => {
+  getUserInfoApi().then((res: any) => {
+    const _userInfo = res.data || {}
+    userInfo.value = _userInfo
+  })
+})
+
+const toPage = (path: string) => {
+  uni.navigateTo({
+    url: path
+  })
+}
+
+const callPhone = (phone: string) => {
+  uni.makePhoneCall({
+    phoneNumber: phone
+  })
+}
 </script>
 
 <template>
   <view class="my-container" :style="{ backgroundImage: `url(${minioUrl + '/my_bg.png'})` }">
     <view class="my-header-wrapper">
       <image :src="minioUrl + '/icon_default_user.png'" mode="scaleToFill" />
-      <text class="user-name-text">用户15615550287</text>
+      <text class="user-name-text">{{ userInfo.user.mobile || userInfo.user.username }}</text>
     </view>
     <HyCard>
-      <view class="my-list-item">
+      <view class="my-list-item" @click="toPage('/base/suggest/record')">
         <view class="list-left">
           <image :src="minioUrl + '/icon_feed.png'" mode="scaleToFill" style="width: 42rpx; height: 42rpx" />
           <text class="text">我的反馈</text>
@@ -19,7 +43,7 @@ const { minioUrl } = useGlobal()
           <image :src="minioUrl + '/icon_right.png'" mode="scaleToFill" />
         </view>
       </view>
-      <view class="my-list-item">
+      <view class="my-list-item" @click="callPhone('0532-88886666')">
         <view class="list-left">
           <image :src="minioUrl + '/icon_phone.png'" mode="scaleToFill" style="width: 42rpx; height: 42rpx" />
           <text class="text">客服热线:0532-88886666</text>

src/pages/service.vue

@@ -19,10 +19,10 @@ onPageScroll((e) => {
 
 const rateMap = {
   5: '五星级服务区',
-  4: '四星服务区',
-  3: '三星服务区',
-  2: '二星服务区',
-  1: '一星服务区'
+  4: '四星级服务区',
+  3: '三星级服务区',
+  2: '二星级服务区',
+  1: '一星级服务区'
 } as any
 
 const list = computed(() => {
@@ -64,7 +64,7 @@ const goToNavigation = (longitude: string, latitude: string, name: string) => {
             <view class="header-right-box">
               <view class="u-line-1 title">{{ item.title }}</view>
               <view class="rate-content">
-                <uni-rate :value="item.content.rate" activeColor="#ff5702"></uni-rate>
+                <uni-rate allow-half :value="item.content.rate" disabled disabledColor="#ff5702" activeColor="#ff5702"></uni-rate>
                 <text class="rate-text">{{ rateMap[item.content.rate] }}</text>
               </view>
               <view class="distance">{{ item.content.distance }}KM</view>

src/stores/index.ts

@@ -1,10 +1,3 @@
-/*
- * @Author: wyd
- * @Date: 2024-02
- * @LastEditors: wyd
- * @LastEditTime: 2024-03
- * @Description:
- */
 import { createPinia } from 'pinia'
 import persist from 'pinia-plugin-persistedstate'
 

src/stores/modules/system.ts

@@ -37,13 +37,13 @@ export const system = defineStore(
       clearInfo,
       setLoad
     }
-  },
+  }
   // 持久化配置
   // {
   //   persist: {
   //     paths: [],
   //     storage: {
-        
+
   //     }
   //   }
   // }

src/stores/modules/user.ts

@@ -1,10 +1,3 @@
-/*
- * @Author: wyd
- * @Date: 2024-02
- * @LastEditors: wyd
- * @LastEditTime: 2024-04
- * @Description: 用户信息
- */
 import { defineStore } from 'pinia'
 import { ref } from 'vue'
 import type { UserInfo } from '@/types/user'

src/stores/reset.ts

@@ -1,10 +1,3 @@
-/*
- * @Author: wyd
- * @Date: 2024-03
- * @LastEditors: wyd
- * @LastEditTime: 2024-03
- * @Description: 重置pinia所有状态
- */
 import cloneDeep from 'lodash/cloneDeep'
 
 export default function resetStore(data: { store: any }) {