From 033431f73f8bf56c9287bebf32fe1e1dbb5d6476 Mon Sep 17 00:00:00 2001
From: mason369 <1960638223@qq.com>
Date: Fri, 20 Jan 2023 16:42:17 +0800
Subject: [PATCH] =?UTF-8?q?update:=E6=9B=B4=E6=96=B0=E5=85=A8=E9=83=A8?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E3=80=81=E5=A2=9E=E5=8A=A0=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue           |   9 +-
 src/request/api.js    |   3 +
 src/utils/index.js    |  43 ++++++++
 src/views/Details.vue |   2 +
 src/views/Goods.vue   | 228 ++++++++++++++++++++++++++++++++++++++++--
 5 files changed, 277 insertions(+), 8 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index abd5bd3..6513808 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,7 +4,7 @@
 		<TopBar :key="topBarKeyValue"></TopBar>
 		<Header></Header>
 		<!-- 路由出口 -->
-		<router-view></router-view>
+		<router-view @fn="reloadTopBar"></router-view>
 		<Footer></Footer>
 
 		<!-- 登录 -->
@@ -22,7 +22,7 @@ import { mapState } from "vuex";
 
 export default {
 	data() {
-		return {topBarKeyValue: 0};
+		return { topBarKeyValue: 0 };
 	},
 	name      : "App",
 	//注册组件
@@ -48,6 +48,11 @@ export default {
 			isShowLoginModal: (state) =>
 				state.isShowLoginModal.isShowLoginModal
 		})
+	},
+	methods: {
+		reloadTopBar() {
+			this.topBarKeyValue++;
+		}
 	}
 };
 </script>
diff --git a/src/request/api.js b/src/request/api.js
index df45bd7..84fa040 100644
--- a/src/request/api.js
+++ b/src/request/api.js
@@ -27,3 +27,6 @@ export const reqGetDetail = (id) => request.get(`/products/${id}`);
 
 //加入购物车
 export const reqAddCart = (params) => request.post("/shop/carts/add", qs.stringify( params ));
+
+//商品搜索
+export const reqGetGoodsSearch = (params) => request.get("/products", { params });
diff --git a/src/utils/index.js b/src/utils/index.js
index e69de29..b81c353 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -0,0 +1,43 @@
+// validatePhoneNumber这个方法用来验证手机号是否符合规则
+export const validatePhoneNumber = (value) => {
+	let reg = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+	return reg.test(value);
+};
+
+//获取滚动条当前的位置
+export function getScrollTop() {
+	var scrollTop = 0;
+	if (document.documentElement && document.documentElement.scrollTop) {
+		scrollTop = document.documentElement.scrollTop;
+	}
+	else if (document.body) {
+		scrollTop = document.body.scrollTop;
+	}
+	return scrollTop;
+}
+
+//获取当前可视范围的高度
+export function getClientHeight() {
+	var clientHeight = 0;
+	if (document.body.clientHeight && document.documentElement.clientHeight) {
+		clientHeight = Math.min(
+			document.body.clientHeight,
+			document.documentElement.clientHeight
+		);
+	}
+	else {
+		clientHeight = Math.max(
+			document.body.clientHeight,
+			document.documentElement.clientHeight
+		);
+	}
+	return clientHeight;
+}
+
+//获取文档完整的高度
+export function getScrollHeight() {
+	return Math.max(
+		document.body.scrollHeight,
+		document.documentElement.scrollHeight
+	);
+}
diff --git a/src/views/Details.vue b/src/views/Details.vue
index e6c0eac..20610c9 100644
--- a/src/views/Details.vue
+++ b/src/views/Details.vue
@@ -231,6 +231,8 @@ export default {
 			//加入成功
 			if (res.code === 0) {
 				this.$message.success("加入购物车成功");
+				//topBar的购物车数量重载
+				this.$emit("fn");
 			}
 			//加入失败
 			else {
diff --git a/src/views/Goods.vue b/src/views/Goods.vue
index c3263c1..0f9daa5 100644
--- a/src/views/Goods.vue
+++ b/src/views/Goods.vue
@@ -1,13 +1,229 @@
 <template>
-    <div>
-
-    </div>
+	<div class="goods">
+		<div class="wrap">
+			<Crumb> </Crumb>
+			<img src="../assets/img/banner.4c6b6225.png" width="100%" alt="" />
+			<ul class="options">
+				<li>
+					<strong>排序：</strong>
+					<span
+						:class="num1 == index ? 'active' : ''"
+						v-for="(item, index) in option1"
+						:key="index"
+						@click="option1Click(index, item.min, item.max)"
+					>
+						{{ item.txt }}</span
+					>
+				</li>
+				<li>
+					<strong>分类：</strong>
+					<span
+						:class="num2 == index ? 'active' : ''"
+						v-for="(item, index) in option2"
+						:key="index"
+						@click="option2Click(index, item.type)"
+					>
+						{{ item.txt }}</span
+					>
+				</li>
+			</ul>
+			<List :arr="goodsListShow" :maxLength="300" />
+			<p style="text-align: center; margin-top: 20px;">
+				{{ isReachBottom ? "已经没有数据了" : "正在加载 ... ..." }}
+			</p>
+		</div>
+	</div>
 </template>
-
 <script>
-export default {}
+import Crumb from "../components/Crumb.vue";
+import List from "../components/home/List.vue";
+import { reqGetGoodsSearch } from "@/request/api";
+import {getClientHeight, getScrollHeight, getScrollTop} from "@/utils"
+export default {
+	data() {
+		return {
+			// 请求回来的商品列表数据
+			goodsList    : [],
+			// 用来展示的goodsList数组
+			goodsListShow: [],
+			// 每页条数 size
+			size         : 8,
+			page         : 1,
+			// isLoading 是否正在加载
+			isLoading    : false,
+			// 是不是已经没有数据的布尔值
+			isReachBottom: false,
+			// 栏目 目前可提供的参数是 1->精品推荐 2-> 热门兑换 0->全部
+			did          : 0,
+			// ( 1->实体商品 2->虚拟商品 0->全部 )
+			type         : 0,
+			// 积分范围的最小值
+			min          : 0,
+			// 积分返回的最大值
+			max          : 0,
+			// 搜索框中的关键词
+			keyword      : "",
+
+			// 排序的数组项
+			// 我能兑换的 0-500分 1000-1500分 1500-2500分
+			option1: [
+				{ min: 0, max: 100000, txt: "全部" },
+				{ min: 0, max: 0, txt: "我能兑换的" },
+				{ min: 0, max: 500, txt: "0-500分" },
+				{ min: 500, max: 1000, txt: "500-1000分" },
+				{ min: 1000, max: 1500, txt: "1500-2500分" },
+				{ min: 2500, max: 6500, txt: "2500-6500分" },
+				{ min: 6500, max: 10000, txt: "6500-10000分" }
+			],
+			// 分类的数组项
+			option2: [
+				{ type: 0, txt: "全部" },
+				{ type: 1, txt: "实物商品" },
+				{ type: 2, txt: "虚拟商品" }
+			],
+			// 排序当前项记录
+			num1: 0,
+			// 分类当前项记录
+			num2: 0
+		};
+	},
+	created() {
+		// this.keyword=路由参数keyword
+		this.keyword = this.$route.query.keyword;
+		console.log("this.keyword", this.keyword);
+		this.goodsSearch();
+	},
+	mounted() {
+		window.addEventListener("scroll", this.scrollFn);
+	},
+	beforeDestroy() {
+		window.removeEventListener("scroll", this.scrollFn);
+	},
+	watch: {
+		"$route.query.keyword": {
+			handler(newVal, oldVal) {
+				// 什么时候执行? 地址栏上面的keyword一变化就会执行
+				this.keyword = newVal;
+				// 发送请求
+				this.goodsSearch();
+			}
+		}
+	},
+	methods: {
+		scrollFn() {
+			// 节流:利用一个变量,控制代码在一段时间内(setTimeout)不会重复触发执行
+
+			// if(有没有到底部了){
+			// if(窗口高度+超出窗口高度的网页>= 页面高度){
+			if (getClientHeight() + getScrollTop() >= getScrollHeight() - 20) {
+				// 到底部了就在goodsList数组中取8个元素到goodsListShow数组中
+				console.log("到底部了");
+				// if(是不是没有数据了){
+				if (this.goodsListShow.length >= this.goodsList.length) {
+					this.isReachBottom = true;
+					return;
+				}
+
+				if (this.isLoading == false) {
+					this.isLoading = true;
+					// 下一次加载第page页的数据,所以page需要++
+					this.page++;
+
+					setTimeout(() => {
+						for (
+							var i = this.size * (this.page - 1);
+							i < this.size * this.page;
+							i++
+						) {
+							// 处理最后一页没有整除的情况,加了个判断
+							this.goodsList[i]
+								? this.goodsListShow.push(this.goodsList[i])
+								: "";
+						}
+						this.isLoading = false;
+					}, 500);
+				}
+			}
+		},
+		option1Click(i, min, max) {
+			// 处理样式
+			this.num1 = i;
+			// 需要要传参的数据
+			this.min = min;
+			this.max = max;
+
+			// 发送请求
+			this.goodsSearch();
+		},
+		option2Click(i, type) {
+			// 处理样式
+			this.num2 = i;
+			// 需要要传参的数据
+			this.type = type;
+			// 发送请求
+			this.goodsSearch();
+		},
+		async goodsSearch() {
+			let res = await reqGetGoodsSearch({
+				did    : this.did,
+				type   : this.type,
+				min    : this.min,
+				max    : this.max,
+				keyword: this.keyword
+			});
+			if (!res) {
+				return;
+			}
+
+			this.goodsList = res.data;
+			console.log(this.goodsList);
+			// 处理初始的前8条数据
+			this.goodsListShow = this.goodsList.filter(
+				(item, index) => index < this.size
+			);
+			// 初始化数据
+			this.isReachBottom = false;
+			this.page = 1;
+			// if(是不是没有数据了){
+			if (this.goodsListShow.length >= this.goodsList.length) {
+				this.isReachBottom = true;
+				return;
+			}
+		}
+	},
+	components: {
+		Crumb,
+		List
+	}
+};
 </script>
 
 <style lang="scss" scoped>
 
-</style>
\ No newline at end of file
+.goods {
+	padding-bottom: 50px;
+	background: #efefef;
+	padding-top: 20px;
+	.options {
+		padding-top: 20px;
+		padding-bottom: 40px;
+		li {
+			margin-top: 20px;
+			strong {
+				color: #000;
+				font-weight: bold;
+			}
+			span {
+				margin-right: 20px;
+				margin-left: 10px;
+				cursor: pointer;
+				color: #999;
+				&.active {
+					color: #0a328d;
+					font-weight: bold;
+				}
+			}
+		}
+	}
+}
+</style>