feat: 界面优化

src/aiService-sub/index/index.vue

@@ -24,8 +24,9 @@ import { useUserStore } from '@/store'
 const userStore = useUserStore()
 
 //chat.ycymedu.com
+//chatv2.ycymedu.com
 const url = ref(
-  `https://chat.ycymedu.com?userId=${userStore.userInfo.estimatedAchievement.wxId}&subjectGroup=${userStore.userInfo.estimatedAchievement.subjectGroup}&expectedScore=${userStore.userInfo.estimatedAchievement.expectedScore}&provinceName=${userStore.userInfo.estimatedAchievement.provinceName}&token=${userStore.userInfo.token}`,
+  `https://chatv2.ycymedu.com?userId=${userStore.userInfo.estimatedAchievement.wxId}&subjectGroup=${userStore.userInfo.estimatedAchievement.subjectGroup}&expectedScore=${userStore.userInfo.estimatedAchievement.expectedScore}&provinceName=${userStore.userInfo.estimatedAchievement.provinceName}&token=${userStore.userInfo.token}`,
 )
 
 const handleChildMessage = (event) => {

src/pages-evaluation-sub/evaluate/academicReport/CapabilityReport.vue

@@ -43,16 +43,13 @@ import Navbar from '@/pages-evaluation-sub/components/navbar/Navbar.vue'
 import LineReport from '../components/interestChart/LineReport.vue'
 import AbilityDimension from '../components/AbilityDimension.vue'
 import AiFooter from '../components/AiFooter.vue'
+import { handleBack } from '../hooks/useEvaluateBack'
 
 import { getAbilityDimension } from '@/service/index/api'
 
 const pageType = ref(0)
 const pageId = ref(0)
 
-const handleBack = () => {
-  uni.navigateBack()
-}
-
 const studyRecord = ref({
   description: '',
   title: '',

src/pages-evaluation-sub/evaluate/academicReport/CharacterReport.vue

@@ -47,14 +47,11 @@ import CharacterChart from '../components/interestChart/CharacterChart.vue'
 import DependenciesChart from '../components/interestChart/DependenciesChart.vue'
 import AiFooter from '../components/AiFooter.vue'
 import { getMBTIDimension } from '@/service/index/api'
+import { handleBack } from '../hooks/useEvaluateBack'
 
 const pageType = ref(0)
 const pageId = ref(0)
 
-const handleBack = () => {
-  uni.navigateBack()
-}
-
 const studyRecord = ref({
   description: '',
   title: '',

src/pages-evaluation-sub/evaluate/academicReport/InterestReport.vue

@@ -51,14 +51,11 @@ import IntroMajor from '../components/IntroMajor.vue'
 import { getHollandDimensionInfo } from '@/service/index/api'
 import InterestingThings from '../components/InterestingThings.vue'
 import AiFooter from '../components/AiFooter.vue'
+import { handleBack } from '../hooks/useEvaluateBack'
 
 const pageType = ref(0)
 const pageId = ref(0)
 
-const handleBack = () => {
-  uni.navigateBack()
-}
-
 const studyRecord = ref({ description: '', title: '', picCharts: {}, reportItems: [], hTag: '' })
 
 onLoad((options) => {

src/pages-evaluation-sub/evaluate/academicReport/opinionAboutReport.vue

@@ -39,16 +39,13 @@ import Navbar from '@/pages-evaluation-sub/components/navbar/Navbar.vue'
 import OpinionChart from '../components/interestChart/OpinionChart.vue'
 import AbilityDimension from '../components/AbilityDimension.vue'
 import AiFooter from '../components/AiFooter.vue'
+import { handleBack } from '../hooks/useEvaluateBack'
 
 import { getOpinionAbout } from '@/service/index/api'
 
 const pageType = ref(0)
 const pageId = ref(0)
 
-const handleBack = () => {
-  uni.navigateBack()
-}
-
 const studyRecord = ref({
   description: '',
   title: '',

src/pages-evaluation-sub/evaluate/components/studyChart/LearnStyleChart.vue

@@ -76,7 +76,7 @@ watch(
         const option = {
           radar: {
             center: ['50%', '50%'],
-            radius: '65%',
+            radius: '60%',
             indicator: newData.map((item: any) => ({
               name: `${item.type},${item.desc}`,
             })),

src/pages-evaluation-sub/evaluate/hooks/useEvaluateBack.ts

@@ -0,0 +1,11 @@
+export const handleBack = () => {
+  const pages = getCurrentPages()
+  if (
+    pages.length > 1 &&
+    pages[pages.length - 1].route === 'pages-sub/ucenter/evaluate/evaluateList'
+  ) {
+    uni.navigateBack()
+  } else {
+    uni.switchTab({ url: '/pages/evaluation/index/index' })
+  }
+}

src/pages-evaluation-sub/evaluate/psychologicalReport/mhtReport.vue

@@ -31,16 +31,13 @@
 <script setup lang="ts">
 import Navbar from '@/pages-evaluation-sub/components/navbar/Navbar.vue'
 import StatusCard from '../components/StatusCard.vue'
+import { handleBack } from '../hooks/useEvaluateBack'
 
 import { getCustomScaleExplains } from '@/service/index/api'
 
 const pageType = ref(0)
 const pageId = ref(0)
 
-const handleBack = () => {
-  uni.navigateBack()
-}
-
 const studyRecord = ref({
   description: '',
   title: '',

src/pages-evaluation-sub/evaluate/psychologicalReport/sasReport.vue

@@ -47,6 +47,7 @@ import StatusCard from '../components/StatusCard.vue'
 import SuggestionCard from '../components/SuggestionCard.vue'
 import AiFooter from '../components/AiFooter.vue'
 import { getCustomScaleExplains } from '@/service/index/api'
+import { handleBack } from '../hooks/useEvaluateBack'
 
 const pageType = ref(0)
 const pageId = ref(0)
@@ -76,10 +77,6 @@ const anxietyRules = [
 const score = ref(0)
 const level = ref(0)
 
-const handleBack = () => {
-  uni.navigateBack()
-}
-
 const studyRecord = ref({
   description: '',
   title: '',

src/pages-evaluation-sub/evaluate/psychologicalReport/sdsReport.vue

@@ -47,6 +47,8 @@ import StatusCard from '../components/StatusCard.vue'
 import SuggestionCard from '../components/SuggestionCard.vue'
 import { getCustomScaleExplains } from '@/service/index/api'
 import AiFooter from '../components/AiFooter.vue'
+import { handleBack } from '../hooks/useEvaluateBack'
+
 const pageType = ref(0)
 const pageId = ref(0)
 
@@ -74,10 +76,6 @@ const depressionRules = [
   },
 ]
 
-const handleBack = () => {
-  uni.navigateBack()
-}
-
 const studyRecord = ref({
   description: '',
   title: '',

src/pages-evaluation-sub/evaluate/studyReport/LearnSkillReport.vue

@@ -52,6 +52,7 @@ import StatusCard from '../components/StatusCard.vue'
 import LearnSkillSuggestion from '../components/LearnSkillSuggestion.vue'
 import AiFooter from '../components/AiFooter.vue'
 import { getCustomScaleExplains } from '@/service/index/api'
+import { handleBack } from '../hooks/useEvaluateBack'
 
 const pageType = ref(0)
 const pageId = ref(0)
@@ -86,10 +87,6 @@ const anxietyRules = [
 const score = ref(0)
 const level = ref(0)
 
-const handleBack = () => {
-  uni.navigateBack()
-}
-
 const studyRecord = ref({
   description: '',
   title: '',

src/pages-evaluation-sub/evaluate/studyReport/LearnStudyReport.vue

@@ -45,14 +45,11 @@ import LearnStyleChart from '../components/studyChart/LearnStyleChart.vue'
 import LearnStudySuggestion from '../components/LearnStudySuggestion.vue'
 import AiFooter from '../components/AiFooter.vue'
 import { getCustomScaleExplains } from '@/service/index/api'
+import { handleBack } from '../hooks/useEvaluateBack'
 
 const pageType = ref(0)
 const pageId = ref(0)
 
-const handleBack = () => {
-  uni.navigateBack()
-}
-
 const studyRecord = ref({
   description: '',
   title: '',
@@ -81,7 +78,6 @@ onLoad((options) => {
       chartData.value = JSON.parse(studyRecord.value.result)
       parsing.value = studyRecord.value.suggestions
       suggestions.value = JSON.parse(studyRecord.value.description)
-      console.log(suggestions.value)
     }
   })
 })

src/pages-evaluation-sub/evaluate/studyReport/anxietyReport.vue

@@ -52,6 +52,7 @@ import StatusCard from '../components/StatusCard.vue'
 import LearnSkillSuggestion from '../components/LearnSkillSuggestion.vue'
 import AiFooter from '../components/AiFooter.vue'
 import { getCustomScaleExplains } from '@/service/index/api'
+import { handleBack } from '../hooks/useEvaluateBack'
 
 const pageType = ref(0)
 const pageId = ref(0)
@@ -76,10 +77,6 @@ const anxietyRules = [
 const score = ref(0)
 const level = ref(0)
 
-const handleBack = () => {
-  uni.navigateBack()
-}
-
 const studyRecord = ref({
   description: '',
   title: '',

src/pages-sub/home/autoFill/index.vue

@@ -69,11 +69,6 @@ const userStore = useUserStore()
 const show = ref(false)
 const badgeValue = ref(1)
 
-const close = () => {
-  filterMenuRef.value.clearForm()
-  show.value = false
-}
-
 const filterMenuRef = ref()
 
 const handleChange = (params) => {
@@ -117,6 +112,12 @@ const handleResult = () => {
     }
   })
 }
+
+const close = () => {
+  filterMenuRef.value.clearForm()
+  badgeValue.value = 1
+  show.value = false
+}
 </script>
 
 <style lang="scss" scoped>

src/pages-sub/home/city/index.vue

@@ -64,7 +64,14 @@ const getUserLocation = () => {
           cities.map((item) => {
             item.provinces.map((city) => {
               if (city.code === _locationCode) {
-                chooseCity(city)
+                userStore.setUserCity(city)
+                if (
+                  userStore.userInfo.estimatedAchievement.provinceCode &&
+                  userStore.userInfo.estimatedAchievement.provinceCode !== city.code
+                ) {
+                  userStore.clearUserEstimatedAchievement()
+                  // userStore.setEstimatedAchievement({ provinceName: city.provincename, provinceCode: city.code })
+                }
               }
             })
           })

src/pages-sub/home/college/components/EnrollmentMark.vue

@@ -33,7 +33,7 @@
       <view class="px-[32rpx]">
         <CustomPickerView :list="pickList" v-model:modelValue="pickValue" />
       </view>
-      <view class="flex items-center justify-between px-[32rpx]">
+      <view class="flex items-center justify-between px-[32rpx] gap-[20rpx]">
         <view class="cancel-btn" @click="show = false">取消</view>
         <view class="submit-btn" @click="handleConfirm">确认</view>
       </view>

src/pages-sub/home/college/components/EnrollmentPlan.vue

@@ -15,7 +15,7 @@
       <view
         @click="handleShow(2)"
         class="px-[24rpx] py-[8rpx] bg-[#f8f8f8] rounded-[8rpx] flex justify-between items-center text-[24rpx]"
-        v-show="batche"
+        v-show="batches.length > 0"
       >
         {{ batche }}
         <view class="i-carbon-chevron-down rotate-270"></view>
@@ -37,7 +37,7 @@
         <CustomPickerView :list="pickList" v-model:modelValue="pickValue" />
       </view>
       <template #footer>
-        <view class="flex items-center justify-between px-[32rpx] gap-[32rpx]">
+        <view class="flex items-center justify-between px-[32rpx] gap-[20rpx]">
           <view class="cancel-btn" @click="show = false">取消</view>
           <view class="submit-btn" @click="handleConfirm">确认</view>
         </view>
@@ -126,9 +126,9 @@ const getPlanProListData = async (newVal) => {
 
 const handleConfirm = () => {
   if (pickType === 1) {
-    year.value = pickValue.value
+    year.value = pickValue.value ? pickValue.value : yearList.value[0]
   } else if (pickType === 2) {
-    batche.value = pickValue.value
+    batche.value = pickValue.value ? pickValue.value : batches.value[0]
   }
   show.value = false
   getPlanProListData(props.id)

src/pages-sub/home/college/index.vue

@@ -66,7 +66,7 @@
                 @change="handleUniTypeIdChange"
                 class="custom-check-group"
               />
-              <view class="flex items-center justify-between px-[16rpx] pb-[32rpx]">
+              <view class="flex items-center justify-between px-[32rpx] pb-[32rpx] gap-[20rpx]">
                 <view class="cancel-btn" @click="handleClear(index)">清空</view>
                 <view class="submit-btn" @click="handleCheck">查看</view>
               </view>

src/pages-sub/home/distinguish/index.vue

@@ -50,7 +50,7 @@
         <view
           class="flex items-center justify-between bg-[#F7F7F7] text-[24rpx] text-[#333] font-semibold border-header sticky top-0"
         >
-          <view class="flex items-center py-[16rpx] pl-[42rpx] w-[37%] border-right">
+          <view class="flex items-center py-[16rpx] pl-[22rpx] w-[37%] border-right">
             <text>院校名称</text>
           </view>
           <view class="flex items-center justify-center py-[16rpx] w-[35%] border-right">
@@ -67,7 +67,7 @@
             v-for="(item, index) in tableData"
             :key="index"
           >
-            <view class="flex items-center py-[16rpx] pl-[42rpx] w-[37%] border-right">
+            <view class="flex items-center py-[16rpx] pl-[22rpx] w-[37%] border-right">
               <text>{{ item.universityName }}</text>
             </view>
             <view class="flex items-center justify-center py-[16rpx] w-[35%] border-right h-full">

src/pages-sub/home/expand/index.vue

@@ -58,7 +58,7 @@
             class="custom-check-group"
             v-if="item.id === 3"
           />
-          <view class="flex items-center justify-between px-[16rpx] pb-[32rpx]">
+          <view class="flex items-center justify-between px-[32rpx] pb-[32rpx] gap-[20rpx]">
             <view class="cancel-btn" @click="handleClear(index)">清空</view>
             <view class="submit-btn" @click="handleCheck">查看</view>
           </view>

src/pages-sub/home/inputScore/index.vue

@@ -109,7 +109,7 @@
           label-key="name"
         />
       </view>
-      <view class="flex items-center justify-between px-[32rpx]">
+      <view class="flex items-center justify-between px-[32rpx] gap-[20rpx]">
         <view class="cancel-btn" @click="show = false">取消</view>
         <view class="submit-btn" @click="handleConfirm">确认</view>
       </view>
@@ -191,6 +191,7 @@ const saveScore = () => {
   if (score.value === '') {
     uni.showToast({
       title: '请检查分数',
+      icon: 'none',
     })
     return
   }

src/pages-sub/home/major/components/EmploymentProspects.vue

@@ -45,7 +45,10 @@
   </view>
 
   <ActionSheet v-model:show="show" :title="title" :show-close="true">
-    <view class="mx-[32rpx] mt-[32rpx] text-[24rpx] text-[#636363]" v-show="showType !== 3">
+    <view
+      class="mx-[32rpx] mt-[32rpx] text-[24rpx] text-[#636363] line-height-[1.6]"
+      v-show="showType !== 3"
+    >
       {{ innerContent }}
     </view>
   </ActionSheet>

src/pages-sub/home/major/components/MajorUniversity.vue

@@ -38,7 +38,7 @@
           :key="item"
         >
           <image class="w-[112rpx] h-[112rpx]" :src="item.logo" mode="scaleToFill" />
-          <view class="flex flex-col">
+          <view class="flex flex-col flex-1">
             <text class="text-[32rpx] font-semibold">[{{ item.yxdm }}]{{ item.yxmc }}</text>
             <text class="text-[22rpx] text-[#505050]">{{ item.cityname }}·{{ item.ulevel }}</text>
             <text class="text-[#8F959E] text-[22rpx] my-[6rpx]">
@@ -58,7 +58,7 @@
           label-key="ssmc"
         />
       </view>
-      <view class="flex items-center justify-between px-[32rpx]">
+      <view class="flex items-center justify-between px-[32rpx] gap-[20rpx]">
         <view class="cancel-btn" @click="show = false">取消</view>
         <view class="submit-btn" @click="handleConfirm">确认</view>
       </view>
@@ -92,10 +92,9 @@ watch(
           ssdmList: { ssmc: string; code: string; count: number }[]
         }
         provinceList.value = result.ssdmList.filter((item) => {
+          provinceTotal.value += item.count
           if (item.code) {
             return item
-          } else {
-            provinceTotal.value = item.count
           }
         })
         universityList.value = result.schSpecList
@@ -120,6 +119,9 @@ const handleShow = () => {
 }
 const handleConfirm = () => {
   show.value = false
+  if (!provinceCode.value) {
+    provinceCode.value = provinceList.value[0].code
+  }
   subUniversityList.value = universityList.value.filter((item) => {
     return item.ssdm === provinceCode.value
   })

src/pages-sub/home/styles/picker-view-btn.scss

@@ -1,5 +1,5 @@
 .submit-btn {
-  width: 332rpx;
+  width: 100%;
   height: 80rpx;
   background: #1580ff;
   border-radius: 8rpx;
@@ -13,7 +13,7 @@
 }
 
 .cancel-btn {
-  width: 332rpx;
+  width: 100%;
   height: 80rpx;
   background: #f5f5f5;
   border-radius: 8rpx;

src/pages-sub/home/wishesList/components/ScrollListItemAction.vue

@@ -21,7 +21,7 @@
     <CollegeMajor :college="college" v-bind="$attrs" v-if="college" />
 
     <template #footer>
-      <view class="flex items-center justify-between mx-[32rpx] gap-[22rpx] pt-[16rpx]">
+      <view class="flex items-center justify-between mx-[32rpx] gap-[20rpx] pt-[16rpx]">
         <view class="cancel-btn" @click="handleConfirm">取消</view>
         <view class="submit-btn" @click="handleConfirm">确认</view>
       </view>

src/pages-sub/home/wishesList/index.vue

@@ -115,7 +115,7 @@
       @change="handleTypeModelChange"
     />
     <template #footer>
-      <view class="flex items-center justify-between mx-[32rpx] gap-[22rpx]">
+      <view class="flex items-center justify-between mx-[32rpx] gap-[20rpx]">
         <view class="cancel-btn" @click="show = false">取消</view>
         <view class="submit-btn" @click="handleConfirm">确认</view>
       </view>

src/pages-sub/ucenter/star/myStar.vue

@@ -37,24 +37,22 @@
     >
       <view class="flex gap-[24rpx] py-[40rpx] border-bt" v-if="currentTab === 0">
         <image class="w-[112rpx] h-[112rpx]" :src="item.logo" mode="scaleToFill" />
-        <view class="flex justify-between items-center flex-1">
+        <view class="flex flex-col flex-1">
-          <view class="flex flex-col" hover-class="none">
+          <text class="text-[28rpx] text-[#333] font-semibold mb-[6rpx]">
-            <text class="text-[28rpx] text-[#333] font-semibold mb-[6rpx]">
+            {{ item.name }}
-              {{ item.name }}
+          </text>
-            </text>
+          <view class="flex items-center gap-[8rpx] mb-[16rpx]">
-            <view class="flex items-center gap-[8rpx] mb-[16rpx]">
+            <view
-              <view
+              class="truncate max-w-[136rpx] bg-[#f8f8f8] rounded-[4rpx] text-[20rpx] px-[8rpx] py-[2rpx]"
-                class="truncate max-w-[176rpx] bg-[#f8f8f8] rounded-[4rpx] text-[20rpx] px-[8rpx] py-[2rpx]"
+              v-for="(fea, fIndex) in item.features.slice(0, 5)"
-                v-for="(fea, fIndex) in item.features.slice(0, 5)"
+              :key="fIndex"
-                :key="fIndex"
+            >
-              >
+              {{ fea }}
-                {{ fea }}
-              </view>
             </view>
-            <text class="text-[22rpx] text-[#999] font-normal">
-              {{ item.cityName }}.{{ item.nature }}
-            </text>
           </view>
+          <text class="text-[22rpx] text-[#999] font-normal">
+            {{ item.cityName }}.{{ item.nature }}
+          </text>
         </view>
         <button class="collect-btn" plain @click.stop="handleStar(item)">
           <view class="i-carbon-star-filled text-[#FFB032]" v-if="item.isStar"></view>

src/pages/evaluation/components/EvaluationItem.vue

@@ -71,7 +71,7 @@ const toAssessmentPage = () => {
 
 <style scoped lang="scss">
 .item-wrapper {
-  background: linear-gradient(90deg, #e5f2fa 0%, #dae8fa 100%);
+  background: linear-gradient(90deg, var(--start-color) 0%, var(--end-color) 100%);
   border-radius: 18rpx;
   padding: 32rpx;
 

src/pages/evaluation/index/index.vue

@@ -39,8 +39,8 @@
             v-for="item in learningList"
             :key="item.id"
             :item="item"
-            start-color="#E9EFFF"
+            :start-color="item.startColor"
-            end-color="#D8DFFD"
+            :end-color="item.endColor"
           ></EvaluationItem>
         </view>
       </swiper-item>
@@ -58,12 +58,18 @@ import { getEvaluationList } from '@/service/index/api'
 const tabs = [
   {
     title: '学职定位',
+    startColor: '#E5F2FA',
+    endColor: '#DAE8FA',
   },
   {
     title: '心理健康',
+    startColor: '#E6F4F2',
+    endColor: '#CAF4F0',
   },
   {
     title: '学习状态',
+    startColor: '#E9EFFF',
+    endColor: '#D8DFFD',
   },
 ]
 

src/service/index/api.ts

@@ -327,8 +327,8 @@ export const payTransaction = (params: { total: number; openId: string; descript
   return http.post('/api/sysWechatPay/payTransaction', params)
 }
 
-export const getWishList = () => {
+export const getWishList = (params: { locationCode: string }) => {
-  return http.get('/api/volunTb/list')
+  return http.get('/api/volunTb/v2/list', params)
 }
 
 export const deleteWishList = (params: { id: number }) => {