@@ -149,14 +157,13 @@ export default {
"getUserInfo",
]),
categories() {
- return this.getCategories;
+ return this.getCategories || []; // 确保返回数组，避免undefined
},
cartTotalCount() {
- return this.getCartTotalCount;
+ return this.getCartTotalCount || 0; // 确保返回数字
},
isLogin() {
- // return this.isUserLogin;
- return true;
+ return this.isUserLogin; // 直接使用mapGetters获取的属性
},
userInfo() {
return this.getUserInfo || {};
@@ -168,16 +175,14 @@ export default {
methods: {
...mapActions(["fetchCategories", "logout"]),
handleSearch() {
- this.$store.commit("setSearchText", this.searchText); // 保存到 Vuex
+ if (!this.searchText.trim()) return;
- // 判断当前是否在搜索结果页
- const isSearchPage =
- this.$route.path === "/ProductList" &&
- this.$route.query.type === "search";
+ this.$store.commit("setSearchText", this.searchText);
- if (isSearchPage) {
- // 如果在搜索页，不跳转只触发重新搜索（假设通过事件或状态更新触发）
- this.$emit("search", this.searchText); // 可根据实际情况调整触发方式
+ // 判断当前是否在搜索结果页
+ if (this.$route.path === "/ProductList") {
+ // 如果在搜索页，触发父组件更新或重新获取数据
+ this.$bus.emit("search-product", this.searchText);
} else {
// 不在搜索页则跳转
this.$router.push({
@@ -193,12 +198,20 @@ export default {
type: "warning",
})
.then(() => {
- this.logout();
- this.$message.success("退出登录成功");
- this.$router.push("/");
+ this.logout()
+ .then(() => {
+ // 假设logout是异步操作
+ this.$message.success("退出登录成功");
+ // 跳转到登录页，并记录当前路径用于登录后跳转
+ localStorage.setItem("redirectPath", this.$route.path);
+ this.$router.push("/Login"); // 退出后跳转到登录页
+ })
+ .catch((err) => {
+ this.$message.error("退出失败：" + (err.message || "未知错误"));
+ });
})
.catch(() => {
- // 取消退出
+ // 取消退出，不做操作
});
},
},
@@ -224,6 +237,7 @@ export default {
p {
font-size: 14px;
color: #666;
+ margin: 0; // 移除默认margin
.highlight {
color: #ff4400;
@@ -244,21 +258,34 @@ export default {
border-radius: 50%;
margin-right: 5px;
vertical-align: middle;
+ object-fit: cover; // 确保图片正确显示
}
.separator {
color: #ccc;
}
- a {
+ a,
+ .logout-btn {
color: #666;
transition: color 0.2s;
- margin-left: 10px;
+ cursor: pointer; // 为退出按钮添加指针样式
+ text-decoration: none; // 移除链接下划线
&:hover {
color: #6a8a27;
}
}
+
+ .user-link {
+ display: flex;
+ align-items: center;
+ }
+
+ .cart-link {
+ display: inline-flex;
+ align-items: center;
+ }
}
}
}
@@ -281,11 +308,9 @@ export default {
a {
display: block;
- h1 {
- font-size: 28px;
- color: #409eff;
- margin: 0;
- font-weight: 700;
+ .logo-img {
+ height: 40px; // 设置logo高度，避免过大
+ object-fit: contain;
}
}
}
@@ -294,7 +319,7 @@ export default {
flex: 0 0 500px;
@media (max-width: 992px) {
- flex: 0 0 500px;
+ flex: 0 0 400px; // 响应式调整
}
@media (max-width: 768px) {
@@ -304,20 +329,34 @@ export default {
.search-input {
width: 100%;
border: 1px solid #6a8a27;
+
+ ::v-deep .el-input__inner {
+ border-right: none; // 修复搜索框和按钮边框重叠
+ }
+
+ ::v-deep .el-input-group__append {
+ background-color: #6a8a27;
+ border-color: #6a8a27;
+ color: white;
+ }
}
.hot-tags {
margin-top: 8px;
font-size: 12px;
color: #999;
+ display: flex;
+ align-items: center;
span {
margin-right: 5px;
}
- a {
+ .hot-tag {
margin: 0 5px;
color: #666;
+ cursor: pointer;
+ transition: color 0.2s;
&:hover {
color: #409eff;
@@ -327,20 +366,21 @@ export default {
}
}
- .cart-entry {
- .cart-link {
+ .phone-entry {
+ a {
display: flex;
align-items: center;
color: #333;
font-size: 16px;
+ text-decoration: none;
- span {
- margin-left: 10px;
+ img {
+ width: 24px;
+ height: 24px;
}
- .cart-icon {
- font-size: 20px;
- margin-right: 5px;
+ span {
+ margin-left: 10px;
}
.cart-count {
@@ -376,6 +416,7 @@ export default {
@media (max-width: 992px) {
overflow-x: auto;
white-space: nowrap;
+ -webkit-overflow-scrolling: touch; // 优化移动端滚动
}
.nav-item {
@@ -387,6 +428,7 @@ export default {
color: #fff;
font-size: 16px;
transition: background-color 0.2s;
+ text-decoration: none;
&:hover,
&.active {
@@ -397,4 +439,4 @@ export default {
}
}
}
-
+
\ No newline at end of file
diff --git a/src/components/layout/HomeLayout.vue b/src/components/layout/HomeLayout.vue
index 6525f96..45940ea 100644
--- a/src/components/layout/HomeLayout.vue
+++ b/src/components/layout/HomeLayout.vue
@@ -1,13 +1,19 @@
-
+
- -
+
![]()
{{ item.name }}
-
+
-
+
@@ -20,16 +26,16 @@
-
+
Hi-欢迎您
-
+
登录
@@ -39,29 +45,29 @@
客服
-
-
+
+
个人中心
-
-
+
+
我的订单
-
-
+
+
我的收藏
-
-
+
+
议价单
-
+
-
+
diff --git a/src/components/layout/Sidebar.vue b/src/components/layout/Sidebar.vue
index fff1ac3..fa09546 100644
--- a/src/components/layout/Sidebar.vue
+++ b/src/components/layout/Sidebar.vue
@@ -1,28 +1,22 @@
+
+
+
@@ -467,10 +532,12 @@ export default {
.hot-recommend-sidebar {
min-width: 200px;
+ max-width: 200px;
padding: 10px;
// border: 1px solid #eee;
background-color: #f7f9fa;
margin-right: 20px;
+ cursor: pointer;
.hot-title {
border-left: 4px solid #ff4d4f;
diff --git a/src/views/Index.vue b/src/views/Index.vue
index c35adfd..499c619 100644
--- a/src/views/Index.vue
+++ b/src/views/Index.vue
@@ -117,11 +117,12 @@ export default {
getTags() {
this.post(
{
- pid: 662,
+ pid: 683,
},
"/api/product/tag_list"
).then((res) => {
this.tagList = res.data;
+ this.tagList[0].id = 662;
});
},
// 三个分类商品
diff --git a/src/views/Login.vue b/src/views/Login.vue
index cfa464b..b011f2f 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -11,24 +11,6 @@
400-123-4xxx
-
+
diff --git a/src/views/User/UserAddress.vue b/src/views/User/UserAddress.vue
index 19b31a9..0ac058b 100644
--- a/src/views/User/UserAddress.vue
+++ b/src/views/User/UserAddress.vue
@@ -1,201 +1,198 @@
-
-
-
- 收货地址
- 收票人地址统一使用该地址管理设置
-
-
-
新增地址
+
+
+
+ 收货地址
+ 收票人地址统一使用该地址管理设置
-
-
-
-
-
-
-
-
-
- 编辑
- 删除
-
-
-
-
-
-
-
-
+
新增地址
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
![\"login](\"@/assets/logo.png\"){kind=logo}
\r\n 
- 