Merge branch 'v2.0' into debug

src/layout/Index.vue

@@ -24,6 +24,7 @@ async function handleLoginOut(){
   <div class="layout-wrap">
     <div class="flex header">
       <img class="logo" src="@/assets/imgs/logo.png" alt="" />
+			<div class="fav-btn" @click="$router.push('/etaChart/favorite')">我的收藏</div>
       <t-popup placement="bottom-left" overlayInnerClassName="header-userInfo-pop-wrap">
 				<template #content>
 					<div class="content">
@@ -40,11 +41,11 @@ async function handleLoginOut(){
 								<span>{{userInfo?.Position}}</span>
 							</div>
 						</div>
-						<div class="flex my-fav-box" @click="$router.push('/etaChart/favorite')">
+						<!-- <div class="flex my-fav-box" @click="$router.push('/etaChart/favorite')">
 							<t-icon name="star" style="font-size:20px"></t-icon>
 							<span>我的收藏</span>
 							<t-icon class="arrow-right" name="chevron-right-s" style="font-size:20px"></t-icon>
-						</div>
+						</div> -->
 						<div class="flex my-fav-box" style="color:#D54941" @click="handleLoginOut">
 							<t-icon name="logout" style="font-size:20px"></t-icon>
 							<span>退出登录</span>
@@ -121,8 +122,13 @@ async function handleLoginOut(){
     .logo {
       width: 168px;
     }
-		.userInfo-box{
+		.fav-btn{
+			cursor: pointer;
+			color: #fff;
 			margin-left: auto;
+		}
+		.userInfo-box{
+			margin-left: 30px;
 			color: #fff;
 			display: flex;
 			align-items: center;

src/views/Login.vue

@@ -142,6 +142,12 @@ async function handleMobileVerifyCode(){
               </t-select>
 							<t-input class="tel-input" placeholder="请输入手机号" v-model="formData.tel" style="flex:1"></t-input>
             </div>
+          </t-form-item>
+          <t-form-item name="imgVerifyCode">
+            <div class="flex form-item-box" style="padding-top:6px;padding-bottom:6px;">
+							<t-input placeholder="请输入图形验证码" v-model="formData.imgVerifyCode" style="flex:1"></t-input>
+							<img class="img-code" :src="imgCodeUrl" alt="" @click="getImgCode">
+            </div>
           </t-form-item>
 					<t-form-item name="telVerifyCode">
             <div class="flex form-item-box">
@@ -149,12 +155,6 @@ async function handleMobileVerifyCode(){
 							<span class="get_telcode_btn" @click="handleMobileVerifyCode" v-if="!isSendCode">获取验证码</span>
               <span v-else class="get_telcode_btn" style="color:#666">{{countDownTime}}s</span>
             </div>
-          </t-form-item>
-					<t-form-item name="imgVerifyCode">
-            <div class="flex form-item-box" style="padding-top:6px;padding-bottom:6px;">
-							<t-input placeholder="请输入图形验证码" v-model="formData.imgVerifyCode" style="flex:1"></t-input>
-							<img class="img-code" :src="imgCodeUrl" alt="" @click="getImgCode">
-            </div>
           </t-form-item>
 					<div>
 						<t-checkbox v-model="keepLogin">60天内保持登录</t-checkbox>

src/views/user/favorite/components/ClassifyWrap.vue

@@ -7,7 +7,7 @@ import { MessagePlugin } from 'tdesign-vue-next';
 
 const emits=defineEmits(['change'])
 
-const selecClassify=ref(0)
+const selecClassify=defineModel('classifyId',{type:[Number,String],default:0})
 function handleClassifyItemClick({node}){
   selecClassify.value=node.value
 }

src/views/user/favorite/etaChart.vue

@@ -5,7 +5,7 @@ import {apiETAChartUser} from '@/api/etaChart'
 import ChartDetailPop from '@/views/etaChart/components/ChartDetailPop.vue'
 import { MessagePlugin } from 'tdesign-vue-next'
 
-let classifyId=0
+const classifyId=ref(0)
 const SysUserIds=ref([])
 const keyword=ref('')
 const chartList=ref([])
@@ -15,7 +15,7 @@ const total=ref(0)
 const finished=ref(false)
 async function getChartList(){
   const res=await apiETAChartUser.chartCollectList({
-    CollectClassifyIds:classifyId,
+    CollectClassifyIds:classifyId.value||'',
     SysUserIds:SysUserIds.value.join(','),
     Keyword:keyword.value,
     PageSize:pageSize.value,
@@ -38,7 +38,12 @@ function refreshList(){
   getChartList()
 }
 function handleClassifyChange(e){
-  classifyId=e
+  refreshList()
+}
+
+// 搜索
+function handleSearch(){
+  classifyId.value=0
   refreshList()
 }
 
@@ -69,7 +74,7 @@ async function handleCancelCollect(item,index){
         <span @click="$router.push('/etaChart/index')">研究图库 ></span>
         <span>我的收藏</span>
       </div>
-      <ClassifyWrap @change="handleClassifyChange"/>
+      <ClassifyWrap v-model:classifyId="classifyId" @change="handleClassifyChange"/>
     </div>
     <div class="flex right-wrap">
       <div class="flex top-filter">
@@ -80,7 +85,7 @@ async function handleCancelCollect(item,index){
           size="large" 
           style="max-width:600px"
           clearable
-          @change="refreshList"
+          @change="handleSearch"
         >
           <template #prefixIcon>
             <SearchIcon />
@@ -169,7 +174,7 @@ async function handleCancelCollect(item,index){
       overflow: hidden;
       .chart-name{
         border-bottom: 1px solid var(--border-color);
-        padding: 10px 14px;
+        padding: 14px;
         .name{
           font-size: 16px;
           font-weight: 600;