From 35cf8d289a09a6a4a34cf3d73fb41d84969ae4ee Mon Sep 17 00:00:00 2001 From: zhangwei <1504152376@qq.com> Date: 星期一, 18 八月 2025 17:30:26 +0800 Subject: [PATCH] '注册修改' --- src/views/home/index.vue | 103 +++++++++++++++------------------------------------ 1 files changed, 30 insertions(+), 73 deletions(-) diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 0b2c4fa..402fc9e 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -1,24 +1,6 @@ el <template> - <div class="header"> - <img width="227px" height="74px" src="@/assets/home/logo.png" alt="" /> - <img width="427px" height="74px" src="@/assets/home/Header.png" alt="" /> - <div class="other"> - <div class="item"> - <img width="21px" height="21px" src="@/assets/home/share.png" alt="" /> - <span>鍒嗕韩缃戠珯</span> - </div> - <div class="item"> - <img - width="21px" - height="21px" - src="@/assets/home/BellFilled.png" - alt="" - /> - <span>鎴戠殑娑堟伅</span> - </div> - </div> - </div> + <my-header /> <div class="banner"> <!-- <img width="100%" height="306px" src="@/assets/home/banner.png" alt="" /> --> </div> @@ -170,16 +152,20 @@ v-else-if="!state.accessToken" :underline="false" class="hover:cursor-pointer" - @click="toRegister" + @click="toRegister(item)" >娉ㄥ唽</el-link > <el-link v-else :underline="false" class="hover:cursor-pointer" - @click="toApply" - >鐢宠</el-link - ><span class="m-2">|</span> + @click="toApply(item)" + ><span v-if="item.name !== '璇勫涓撳'">鐢宠</span></el-link + ><span + v-if="!state.accessToken || item.name !== '璇勫涓撳'" + class="m-2" + >|</span + > <el-link v-if="state.rolesCode.indexOf(item.code) !== -1" :underline="false" @@ -394,9 +380,10 @@ <script lang="ts" setup> import { onMounted, ref, computed, reactive } from "vue"; -import myFooter from "./component/myFooter.vue"; +import MyFooter from "./component/myFooter.vue"; +import MyHeader from "./component/myHeader.vue"; import { useUserStoreHook } from "@/store/modules/user"; -import { exRole } from "@/api/register/index.ts"; +import { exRole } from "@/api/register/index"; import { storageLocal, isString, isIncludeAllChildren } from "@pureadmin/utils"; import { getToken } from "@/utils/auth"; @@ -409,7 +396,7 @@ // 璁块棶 state 灞炴�� // console.log(userStore.roles,'-'); // 鐩存帴鑾峰彇鍊� defineOptions({ - name: "Main" + name: "MainPage" }); let activeName = ref("first"); /** 瑙掕壊锛堝鏋滄樀绉颁负绌哄垯鏄剧ず鐢ㄦ埛鍚嶏級 */ @@ -426,32 +413,35 @@ accessToken: "" }); onMounted(() => { - exRole().then(res => { - state.roleList = res.result; - }); + // exRole().then(res => { + // state.roleList = res.result; + // }); + state.roleList = useUserStoreHook().rolesList; getUseRoles(); state.accessToken = getToken()?.accessToken; }); -const toRegister = () => { - router.push({ name: "Register" }); +const toRegister = item => { + router.push({ name: "newRegister", query: { code: item.code } }); }; // 閫�鍑� const logOut = () => { useUserStoreHook().logOut(); + state.rolesCode = []; + state.accessToken = ""; }; // 鐢宠 -const toApply = () => {}; +const toApply = item => { + router.push({ name: "RegisterNav", query: { code: item.code } }); +}; // 鍘婚椤� -const toWelcome = item => { - let role = state.userInfo?.exRoles.find(ele => { - return item.code == ele.code; - }); - console.log(role); - if (role.hasFlsh) { - return router.push({ name: "Welcome" }); +const toWelcome = async item => { + if (useUserStoreHook().nowRole.code !== item.code) { + await useUserStoreHook().changeLogoInExRule({ + ruleCode: item.code + }); } - router.push({ name: "RegisterNav", query: { code: role.code } }); + router.push({ name: "Mine" }); }; // 鍘荤櫥褰� const toLogin = item => { @@ -460,39 +450,6 @@ </script> <style lang="scss" scoped> -.header { - display: flex; - align-items: center; - justify-content: space-evenly; - height: 80px; - width: 100%; - .middle { - width: 50%; - display: flex; - justify-content: space-around; - color: rgb(51, 51, 51); - font-family: 鎬濇簮榛戜綋; - } - .other { - display: flex; - .item { - display: flex; - justify-content: center; - width: 63px; - height: 48px; - color: rgb(51, 51, 51); - font-family: 鎬濇簮榛戜綋; - font-size: 12px; - font-weight: 400; - line-height: 20px; - letter-spacing: 0%; - text-align: left; - text-transform: capitalize; - flex-wrap: wrap; - margin-right: 10px; - } - } -} .banner { // left: -3.76px; // top: 80px; -- Gitblit v1.9.1