Merge remote-tracking branch 'origin/main'

pages/index/components/index-one.vue

@@ -130,6 +130,12 @@
                     </view>
                     <view class="service-title">测试页面</view>
                 </view>
+                <view class="service-item press-button" @click="navToPage">
+                    <view class="service-icon service-icon-10">
+                        <uni-icons type="gear-filled" size="32" color="#FFFFFF"></uni-icons>
+                    </view>
+                    <view class="service-title">帮扶</view>
+                </view>
             </view>
         </view>
         
@@ -742,6 +748,9 @@ const handleLiveClick = () => {
 const navToTestPage = () => {
     navTo('/pages/test/homepage-test');
 };
+const navToPage = () =>{
+	navTo('/packageB/priority/helpFilter');
+}
 
 async function loadData() {
     try {
@@ -1038,14 +1047,14 @@ import { getToken } from '@/utilsRc/auth.js';
 // 跳转到高校毕业页面
 function goRc(){
     if (checkLogin()) {
+         navTo('/packageRc/pages/index/index');
         let token = getToken();
-        if( token != null ){
+        if( token != null && token != '' && token != undefined ){
             if(storeRc.state.user.type == 'person'){
                 navTo('/packageRc/pages/index/index');
             }else{
                 navTo('/packageRc/pages/daiban/daiban');
             }
-            console.log(storeRc.state.user.roles, storeRc.state.user.type, 'state')
         }else{
             let userInfo = uni.getStorageSync('userInfo')
             storeRc.dispatch('LoginByUserInfo', userInfo).then(res => {