From 99b73eb0cf9c87fb872cbfe0d7c0b60778ee3001 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=B5=E5=AE=AA=E7=91=9E?=
 <9198107+min-xianrui@user.noreply.gitee.com>
Date: Fri, 10 Jan 2025 17:26:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/front/info-top.vue  |  8 ++++++--
 src/components/nav/Navigation1.vue | 11 +++++------
 src/pages/front/index.vue          |  2 +-
 src/pages/index.vue                |  4 ++--
 src/stores/navStore.ts             |  1 +
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/components/front/info-top.vue b/src/components/front/info-top.vue
index f1987a5..9706974 100644
--- a/src/components/front/info-top.vue
+++ b/src/components/front/info-top.vue
@@ -9,9 +9,13 @@
 <!--			标题-->
 			<h1>{{state.info.title}}</h1>
 <!--			简介-->
-			<div class="introduction">
+			<div class="introduction" v-if="state.info.introduction">
 			{{state.info.introduction}}
 			</div>
+<!--			价格-->
+			<div class="tag" v-if="state.info.price">
+				<span style="color: red;font-size: 26px"> ￥ <span style="font-weight: 700">{{state.info.price}}</span></span>
+			</div>
 			<!--标签-->
 			<div class="tag">
 				<el-tag v-for="tag in state.info.tags" :key="tag">{{tag}}</el-tag>
@@ -21,7 +25,7 @@
 				<!--        加入购物车-->
 <!--				<el-button type="primary" @click="handleCart">加入购物车</el-button>-->
         <!--        立即购买-->
-        <el-button type="primary" @click="handleBuy">立即购买</el-button>
+        <el-button type="primary" @click="handleBuy" v-if="state.info.price">立即购买</el-button>
 				<!--        收藏-->
 				<el-button type="primary" @click="handleFavorite">
 					{{state.isFavorite?'已收藏':'收藏'}}
diff --git a/src/components/nav/Navigation1.vue b/src/components/nav/Navigation1.vue
index 6f295de..de49f73 100644
--- a/src/components/nav/Navigation1.vue
+++ b/src/components/nav/Navigation1.vue
@@ -6,7 +6,7 @@
 		</el-col>
 		<el-col :span="12">
 			<el-menu
-				:default-active="activeIndex"
+				:default-active="nav.frontPath"
 				mode="horizontal"
 				@select="handleSelect"
 				router
@@ -20,7 +20,8 @@
 			</el-menu>
 		</el-col>
 		<el-col :span="3">
-			<el-dropdown>
+			<el-button v-if="userStore().frontUserInfo" style="margin-top: 12px" type="primary" round @click="router.push('/login')">登录</el-button>
+			<el-dropdown v-else>
 				<el-row :gutter="20">
 					<el-col :span="8">
 <!--						<el-avatar :src="userStore().frontUserInfo.avatar" />-->
@@ -39,16 +40,14 @@
 		</el-col>
 	</el-row>
 </template>
-
 <script setup lang="ts">
 import { getFrontList } from '~/utils/utils'
 import { useRouter } from 'vue-router'
 import { logoutFront } from '~/api/user/frontUserApi'
 const router = useRouter()
-
-const activeIndex = ref('1')
+const  nav = navStore()
 const handleSelect = (key: string, keyPath: string[]) => {
-	console.log(key, keyPath)
+	nav.frontPath  = key.fullPath
 }
 /**
  * 退出登录
diff --git a/src/pages/front/index.vue b/src/pages/front/index.vue
index c0f01ff..6c881c9 100644
--- a/src/pages/front/index.vue
+++ b/src/pages/front/index.vue
@@ -2,7 +2,7 @@
 	<!--轮播图-->
 	<el-row :gutter="20">
 		<el-col :span="12">
-			<div class="h-350px">
+			<div class="h-300px">
 				<carousel></carousel>
 			</div>
 		</el-col>
diff --git a/src/pages/index.vue b/src/pages/index.vue
index aeaa333..0648429 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -2,12 +2,12 @@
 	<!--轮播图-->
 	<el-row :gutter="20">
 		<el-col :span="12">
-			<div class="h-350px">
+			<div class="h-300px">
 				<carousel></carousel>
 			</div>
 		</el-col>
 		<el-col :span="12">
-			<div class="h-350px">
+			<div class="h-300px">
 				<carousel></carousel>
 			</div>
 		</el-col>
diff --git a/src/stores/navStore.ts b/src/stores/navStore.ts
index 0ca6da7..0d060d1 100644
--- a/src/stores/navStore.ts
+++ b/src/stores/navStore.ts
@@ -4,6 +4,7 @@ export default defineStore('navStore', {
 	state() {
 		return {
 			adminPath: "/",
+			frontPath: "/front/",
 		}
 	},
 	actions: {