Merge branch 'main' of http://124.243.245.42:3000/sdz/qingdao-employment-service

pages/login/login.vue

@@ -1,6 +1,6 @@
 <template>
     <AppLayout title="就业服务程序">
-        <view v-if="isMachineEnv" class="alipay-login-container">
+        <view v-if="isMachineEnv && !hasLogin" class="alipay-login-container">
             <!-- 切换 -->
             <view class="login-method-switch">
                 <view
@@ -199,7 +199,7 @@ import useDictStore from '@/stores/useDictStore';
 import { playTextDirectly } from '@/hook/useTTSPlayer-all-in-one';
 const { $api, navTo } = inject('globalFunction');
 const { loginSetToken, getUserResume } = useUserStore();
-const { isMachineEnv } = storeToRefs(useUserStore());
+const { isMachineEnv, hasLogin } = storeToRefs(useUserStore());
 const { getDictSelectOption, oneDictData } = useDictStore();
 const openSelectPopup = inject('openSelectPopup');
 
@@ -336,7 +336,7 @@ function changeEducation() {
         success: (_, [value]) => {
             fromValue.education = value.value;
             state.educationText = value.label;
-            console.log()
+            console.log();
         },
     });
 }