[feat]图片和svg

src/layout/index.vue

@@ -72,6 +72,7 @@
       background: url('@/assets/images/login/login-home-background.png') no-repeat;
       background-size: 100%;
       display: flex;
+      //justify-content: space-between;
       .page-left{
         background: url('@/assets/images/login/home-login-left-background.png') no-repeat;
         background-size: 100%;
@@ -100,15 +101,21 @@
         }
       }
       .page-left-text-box{
+        margin-left: 30px;
         p{
           font-weight: 400;
           font-size: 32px;
           color: #333333;
           letter-spacing: 3px;
+          margin: 0;
+          padding: 0;
+          line-height: 52px;
         }
       }
       .page-right{
+        margin-left: 30px;
         width: 70%;
+        //border: 1px solid;
         display: flex;
         justify-content:space-around;
         align-items: center;
@@ -124,7 +131,22 @@
           }
 
         }
-
+        //.img-box:nth-child(1),.img-box:nth-child(2),.img-box:nth-child(3){
+        //   margin-top: 20px;
+        //}
+        //.img-box:nth-child(4){
+        //   margin-left: 90px;
+        //   //margin-right: 90px;
+        //   //border: 1px solid;
+        //  border: #00afff 1px solid;
+        //  //margin-bottom: 30px;
+        //}
+        //.img-box:nth-child(5){
+        //  //margin-left: 90px;
+        //  margin-right: 90px;
+        //  //margin-bottom: 30px;
+        //  border: #00afff 1px solid;
+        //}
       }
     }
 </style>

src/views/xjc-integratedmachine/components/head_component.vue

@@ -1,11 +1,15 @@
 <template>
     <div class="contenter">
-        <el-button @click="backTo">返回</el-button>
-        <div>{{headinfo.title}}</div>
-        <div>头像</div>
-        <el-button @click="exit">退出</el-button>
-        <el-button>使用说明</el-button>
+      <img  class="head-icon" src="@/assets/images/login/login-return.png" @click="backTo" alt="404">
+
+<!-- 等UI图更新继续画     <div>-->
+<!--        <div>{{headInfo.title}}</div>-->
+<!--        <div>头像</div>-->
+<!--        <el-button @click="exit">退出</el-button>-->
+<!--        <el-button>使用说明</el-button>-->
+<!--      </div>-->
     </div>
+
 </template>
 
 <script setup>
@@ -13,7 +17,7 @@
     const {proxy} = getCurrentInstance()
     const router = useRouter()
     const props = defineProps({
-        headinfo: {}
+      headinfo: {}
     })
 
     function backTo() {
@@ -37,9 +41,20 @@
 </script>
 
 <style scoped>
-    .contenter {
-        width: 100%;
-        display: flex;
-        flex-direction: row;
+
+    .contenter{
+      position: absolute;
+      top: 0;
+      left: 0;
+      width:100%;
+      height: 123px;
+      background: #FFFFFF;
+      display: flex;
+      align-items: center;
+      .head-icon{
+        width: 74px;
+        height: 74px;
+        margin-left: 74px;
+      }
     }
 </style>

src/views/xjc-integratedmachine/login/index.vue

@@ -1,8 +1,9 @@
 <template>
   <div class="login-page">
-    <div class="page-head">
-      <img class="head-icon" src="@/assets/images/login/login-return.png" alt="404" @click="router.go(-1)">
-    </div>
+<!--    <div class="page-head">-->
+<!--      <img class="head-icon" src="@/assets/images/login/login-return.png" alt="404" @click="router.go(-1)">-->
+<!--    </div>-->
+    <HeadComponent ref="childRef" :headinfo="headinfo"/>
     <div class="page-content">
       <div class="content-background">
         <div class="content-left">
@@ -20,11 +21,17 @@
 
 <script setup>
 
+import HeadComponent from "@/views/xjc-integratedmachine/components/head_component.vue";
+
 const router = useRouter()
 const route = useRoute()
 
 const params = route.query
 
+const headinfo = ref({
+  backUrl:'/index',
+  isLogin:true,
+})
 function jumpTo(path) {
   router.push({
     path: path,

src/views/xjc-integratedmachine/login/student_forgetpass.vue

@@ -1,8 +1,6 @@
 <template>
   <div class="login-student-forgetpass-page">
-    <div class="page-head">
-      <img class="head-icon" src="@/assets/login/login-return.png" @click="router.go(-1)" alt="404">
-    </div>
+    <HeadComponent ref="childRef" :headinfo="headinfo"/>
     <div class="page-content">
       <div class="content-background">
         <div class="content-left">
@@ -77,12 +75,12 @@
     import {getSecretByUser,changPasswordBySecret} from '@/api/xjc-platform/xjc_index.js'
     import {login} from "@/api/login.js";
     import {setToken} from "@/utils/auth.js";
+    import HeadComponent from "@/views/xjc-integratedmachine/components/head_component.vue";
 
     const loading = ref(false)
     const router = useRouter()
     const route = useRoute()
     const {proxy} = getCurrentInstance()
-
     const params = route.query
 
     const form = ref({
@@ -92,7 +90,10 @@
         secretQuestion: '',
         secretAnswer: '',
     })
-
+    const headinfo = ref({
+      backUrl:'/xjc-integratedmachine/login/student_login',
+      isLogin:true,
+    })
     function getSecret() {
         if (form.value.userName.length == 15 || form.value.userName.length == 18) {
             getSecretByUser(form.value.userName).then(resp => {

src/views/xjc-integratedmachine/login/student_login.vue

@@ -1,8 +1,6 @@
 <template>
     <div class="student-login-page">
-      <div class="page-head">
-        <img class="head-icon" src="@/assets/images/login/login-return.png" @click="router.go(-1)" alt="404">
-      </div>
+      <HeadComponent ref="childRef" :headinfo="headinfo"/>
       <div class="page-content">
         <div class="content-background">
           <div class="content-left">
@@ -75,6 +73,7 @@
     import {login} from '@/api/login'
     import useUserStore from '@/store/modules/user'
     import { setToken } from '@/utils/auth'
+    import HeadComponent from '@/views/xjc-integratedmachine/components/head_component.vue';
     const userStore = useUserStore()
 
     const {proxy} = getCurrentInstance()
@@ -93,6 +92,10 @@
         code: "",
         uuid: ""
     })
+    const headinfo = ref({
+      backUrl:'/xjc-integratedmachine/login/login_index',
+      isLogin:true,
+    })
     const loginRules = {
         username: [{required: true, trigger: "blur", message: "请输入您的身份证号"}],
         password: [{required: true, trigger: "blur", message: "请输入您的密码"}],
@@ -107,10 +110,13 @@
                 login(loginForm.value.username, loginForm.value.password, null, null, loginForm.value.loginType)
                     .then(resp => {
                     setToken(resp.data.access_token)
-                    router.push({
-                        path: params.modulePath
-                    })
-                      console.log("11",resp)
+                      loading.value = false;
+                      router.push({
+                          path: params.modulePath
+                      })
+                      if(resp.data.access_token === 600){
+                        loading.value = false;
+                      }
                 })
             }
         })
@@ -146,21 +152,7 @@
   z-index:10;
   width: 100%;
   height: 1080px;
-  .page-head{
-    position: absolute;
-    top: 0;
-    left: 0;
-    width:100%;
-    height: 123px;
-    background: #FFFFFF;
-    display: flex;
-    align-items: center;
-    .head-icon{
-      width: 74px;
-      height: 74px;
-      margin-left: 74px;
-    }
-  }
+
   .page-content{
     //background: #ECF2F6;
     width: 100%;
@@ -212,7 +204,6 @@
               box-shadow: none;
             }
 
-
           }
           .form-box-text{
             font-weight: 400;

src/views/xjc-integratedmachine/login/visitor_login.vue

@@ -1,8 +1,6 @@
 <template>
   <div class="visitor-login-page">
-    <div class="page-head">
-      <img class="head-icon" src="@/assets/images/login/login-return.png" @click="router.go(-1)" alt="404">
-    </div>
+    <HeadComponent ref="childRef" :headinfo="headinfo"/>
     <div class="page-content">
       <div class="content-background">
         <div class="content-left">
@@ -24,7 +22,7 @@
                 </template>
               </el-input>
             </el-form-item>
-              <p class="form-box-text">
+              <p class="form-box-text" v-show="needRegister">
                 未检测到该手机号 请先注册
                </p>
                 <div style="display: flex;justify-content: center">
@@ -186,6 +184,9 @@ import { setToken } from '@/utils/auth'
 const loading = ref(false)
 const router = useRouter()
 const route = useRoute()
+import HeadComponent from '@/views/xjc-integratedmachine/components/head_component.vue';
+import {handleThemeStyle} from "@/utils/theme.js";
+import useSettingsStore from "@/store/modules/settings.js";
 const {proxy} = getCurrentInstance()
 const {rank, gk_province,sys_user_sex,register_province} = proxy.useDict('rank', 'gk_province','sys_user_sex','register_province')
 const params = route.query
@@ -193,7 +194,7 @@ const params = route.query
 
 const step = ref(1)
 const seconds = ref(60)
-
+const needRegister = ref(false)
 
 
 const loginForm = ref({
@@ -210,6 +211,11 @@ const loginForm = ref({
   checkCodeText:'',
 })
 
+const headinfo = ref({
+  backUrl:'/xjc-integratedmachine/login/login_index',
+  isLogin:true,
+})
+
 const loginStepOneRules = {
   userName: [{required: true, trigger: "blur", message: "请输入您的手机号"}]
 }
@@ -235,11 +241,14 @@ function phoneLogin() {
       getUserInfo(loginForm.value.userName).then(resp => {
         if (resp.sysUser == null) {
           //没有此人，需要注册
+          needRegister
           step.value = 2
         } else {
           step.value = 4
         }
       })
+      //清空数据
+      clearFrom()
     }
   })
 }
@@ -248,7 +257,6 @@ function getCheckCode() {
   sendCheckCode(loginForm.value).then(resp => {
     console.log("一体机注册，验证码:", resp.checkCode)
     loginForm.value.checkCodeText =  resp.checkCode
-
         //开始倒计数
     secondsBegin()
   })
@@ -272,6 +280,8 @@ function validCheckCode() {
           step.value = 3
         }
       })
+      //清空数据
+      clearFrom()
     }
   })
 
@@ -282,7 +292,17 @@ function chooseArea(val) {
   loginForm.value.areaName = loginForm.value.areaItem.label
   console.log("loginForm.value",loginForm.value)
 }
-
+function clearFrom (){
+  //清空数据
+      loginForm.value.checkCode = '';
+      loginForm.value.areaName = null;
+      loginForm.value.areaId = null;
+      loginForm.value.userName = '';
+      loginForm.value.sex = null;
+      loginForm.value.areaItem = null;
+      loginForm.value.reppassword  = '';
+      loginForm.value.password = '';
+}
 
 function registHandler() {
   proxy.$refs.loginStepThreeRef.validate(valid => {
@@ -293,6 +313,7 @@ function registHandler() {
       }else{
         regist(loginForm.value).then(resp =>{
           proxy.$modal.msgSuccess("注册成功")
+          clearFrom()
           //跳转到主页
           router.push({
             path : '/xjc_login',
@@ -320,6 +341,8 @@ function visitor_login(){
         router.push({
           path: params.modulePath
         })
+        //清空数据
+        clearFrom()
       })
     }
   })
@@ -332,6 +355,9 @@ function jumpReturn(path) {
     }
   })
 }
+onMounted(() => {
+  clearFrom()
+})
 </script>
 
 <style scoped lang="scss">

src/views/xjc-integratedmachine/wakeup/index.vue

@@ -1,6 +1,6 @@
 <template>
     <head-component :headinfo=headinfo></head-component>
-    <div style="display: flex;flex-direction: row">
+    <div style="display: flex;flex-direction: row;margin-top: 130px">
         <div class="temp" @click="jumpTo('/xjc-integratedmachine/wakeup/career_recognize/index')">
             认识生涯
         </div>
@@ -16,7 +16,6 @@
         <div class="temp" @click="jumpTo('/xjc-integratedmachine/wakeup/career_cinema/index')">
             生涯影院
         </div>
-
     </div>
 </template>
 
@@ -26,7 +25,7 @@
 
     const router = useRouter()
 
-    let headinfo =ref({})
+    const headinfo = ref({})
     function setHeadinfo(){
         headinfo.value = {
             title: '生涯唤醒学习系统',