From 64a2688d80d3a69ac1224c2bc0cf22e8925eb0e5 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Wed, 22 Jun 2022 17:38:20 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/multi-level-nav/vertical-nav.vue | 6 +++---
 pages/product/product-category.vue          | 8 +++++---
 pages/product/product-detail.vue            | 6 +++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/components/multi-level-nav/vertical-nav.vue b/components/multi-level-nav/vertical-nav.vue
index 7c315f4..e1daded 100644
--- a/components/multi-level-nav/vertical-nav.vue
+++ b/components/multi-level-nav/vertical-nav.vue
@@ -1,14 +1,14 @@
 <template>
 	<view>
 		<!-- 搜索栏 -->
-		<view class="cu-bar search bg-white">
+		<!-- <view class="cu-bar search bg-white">
 			<view class="search-form round">
 				<text class="cuIcon-search"></text>
 				<input @confirm="searchGoods" :adjust-position="true" type="text" placeholder="输入搜索内容"
 					confirm-type="search"></input>
 			</view>
-		</view>
-		<view class="VerticalBox" :style="'height:calc(' + containerHeight + ' - 100rpx)'">
+		</view> -->
+		<view class="VerticalBox" :style="'height:calc(' + containerHeight + ')'">
 			<scroll-view class="VerticalNav nav" scroll-y scroll-with-animation :scroll-top="verticalNavTop">
 				<view class="cu-item" :class="item.goodsCategoryId==tabCur?'text-main-color cur':''" v-for="(item,index) in list"
 					:key="index" @tap="tabSelect" :data-index="index" :data-id="item.goodsCategoryId"
diff --git a/pages/product/product-category.vue b/pages/product/product-category.vue
index e418976..1993d5b 100644
--- a/pages/product/product-category.vue
+++ b/pages/product/product-category.vue
@@ -30,9 +30,9 @@
 			this.offBindEvent();
 		},
 		methods: {
-			async loadData() {
+			async loadData(params = {}) {
 				// this.categoryList = await this.$api.data('categoryList');
-				let res = await this.$request.getProductCategories({deptId: this.$globalData.deptId});
+				let res = await this.$request.getProductCategories(params);
 				this.categoryList = res[1].data.data;
 			},
 			bindEvent() {
@@ -52,7 +52,9 @@
 				})
 			},
 			searchType(keyWords) {
-				console.log("搜索" + keyWords)
+				this.loadData({
+					goodsCategoryName: keyWords
+				});
 			}
 		}
 	}
diff --git a/pages/product/product-detail.vue b/pages/product/product-detail.vue
index 8a0d62f..b261ccb 100644
--- a/pages/product/product-detail.vue
+++ b/pages/product/product-detail.vue
@@ -18,11 +18,11 @@
 		<!-- 轮播图，视频 -->
 		<swiper :class="changeSwiperHeight ? 'sm-screen-swiper' : 'sm-screen-swiper lg-screen-swiper'" @change="changeSwiper">
 			<swiper-item v-if="productDetail.goodsVideoUrl">
-				<video id="productVideo" :src="productDetail.goodsVideoUrl" :controls="true" :autoplay="false"
+				<video style="width: 100%; height: 100%;" id="productVideo" :src="productDetail.goodsVideoUrl" :controls="true" :autoplay="false"
 					:show-center-play-btn="true" :show-fullscreen-btn="false" @click="clickSwiper($event, item, 0)"></video>
 			</swiper-item>
 			<swiper-item v-for="(item,index) in swiperList" :key="item.goodsImgsId" @click="clickSwiper($event, item, 1)">
-				<image :src="item.imgUrl" mode="aspectFill"></image>
+				<image style="width: 100%; height: 100%;" :src="item.imgUrl" mode="aspectFit"></image>
 			</swiper-item>
 		</swiper>
 		<!-- 价格及活动栏 -->
@@ -266,7 +266,7 @@
 			},
 			clickSwiper(e, item, type) {
 				if (type === 1) {
-					this.viewImage(item.url);
+					this.viewImage(item.imgUrl);
 				} else if (type === 0) {
 					this.pauseVideo(e);
 				}