From 36e75d8768140820563f87ba6ce9a5ad49aab19b Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Fri, 1 Jul 2022 15:53:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=83=A8=E5=88=86=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E5=AD=97=E6=AE=B5=E5=8F=8A=E5=9B=BE=E7=89=87=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 colorui/components/cu-custom.vue              |  2 +-
 common/js/data.js                             | 30 ++++---------------
 components/goods-card/vertical-goods-card.vue |  6 ++--
 pages/index/home.vue                          | 20 ++++++++++---
 pages/product/product-detail.vue              |  2 +-
 5 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/colorui/components/cu-custom.vue b/colorui/components/cu-custom.vue
index 7240c12..fecaf03 100644
--- a/colorui/components/cu-custom.vue
+++ b/colorui/components/cu-custom.vue
@@ -11,7 +11,7 @@
 						<text class="cuIcon-homefill"></text>
 						<slot name="backHomeText"></slot>
 					</view>
-					<view></view>
+					<slot name="left-content"></slot>
 				</view>
 				<view class="content" :style="[{top:StatusBar + 'px'}]">
 					<slot name="content"></slot>
diff --git a/common/js/data.js b/common/js/data.js
index 9264e16..a77eb18 100644
--- a/common/js/data.js
+++ b/common/js/data.js
@@ -5,31 +5,11 @@
 const swiperList = [{
 	id: 0,
 	type: 'image',
-	url: 'https://ossweb-img.qq.com/images/lol/web201310/skin/big17000.jpg'
-}, {
-	id: 1,
-	type: 'image',
-	url: 'https://ossweb-img.qq.com/images/lol/web201310/skin/big37006.jpg',
-}, {
-	id: 2,
-	type: 'image',
-	url: 'https://ossweb-img.qq.com/images/lol/web201310/skin/big39000.jpg'
-}, {
-	id: 3,
-	type: 'image',
-	url: 'https://ossweb-img.qq.com/images/lol/web201310/skin/big10001.jpg'
-}, {
-	id: 4,
-	type: 'image',
-	url: 'https://ossweb-img.qq.com/images/lol/web201310/skin/big25011.jpg'
-}, {
-	id: 5,
-	type: 'image',
-	url: 'https://ossweb-img.qq.com/images/lol/web201310/skin/big21016.jpg'
-}, {
-	id: 6,
-	type: 'image',
-	url: 'https://ossweb-img.qq.com/images/lol/web201310/skin/big99008.jpg'
+	url: 'http://gqz.opsoul.com/f5cd5d9a378044aea5125ff150433bae'
+}, {
+	id: 1,
+	type: 'image',
+	url: 'http://gqz.opsoul.com/e456d5ceabec4a7f98895d74d2c6aeea'
 }]
 
 const categories = [{
diff --git a/components/goods-card/vertical-goods-card.vue b/components/goods-card/vertical-goods-card.vue
index b9838d9..195c195 100644
--- a/components/goods-card/vertical-goods-card.vue
+++ b/components/goods-card/vertical-goods-card.vue
@@ -8,10 +8,10 @@
 		<view class="cu-card case no-card solid-bottom bg-white padding-top-xs" v-for="(item, index) in goodsInfos" :key="index" @click="showDetails(item)">
 			<view class="cu-item shadow">
 				<view v-if="multiPicMode" class="flex justify-between align-center multi-pic-container">
-					<view class="left-view"><image class="radius" :src="item.goodsImgsMap[0][0].imgUrl" mode="scaleToFill"></image></view>
+					<view class="left-view"><image class="radius" :src="item.goodsImgsMap[0][0].imgUrl" mode="aspectFill"></image></view>
 					<view class="flex-column-between align-center right-view">
-						<image class="radius" :src="item.goodsImgsMap[0][1].imgUrl" mode="scaleToFill"></image>
-						<image class="radius" :src="item.goodsImgsMap[0][2].imgUrl" mode="scaleToFill"></image>
+						<image class="radius" :src="item.goodsImgsMap[0][1].imgUrl" mode="aspectFill"></image>
+						<image class="radius" :src="item.goodsImgsMap[0][2].imgUrl" mode="aspectFill"></image>
 					</view>
 				</view>
 				<view v-else>
diff --git a/pages/index/home.vue b/pages/index/home.vue
index 946acdd..bcd3eb5 100644
--- a/pages/index/home.vue
+++ b/pages/index/home.vue
@@ -1,10 +1,17 @@
 <template name="index">
-	<view>
+	<view>
+		<!-- 顶部操作条 -->
+		<!-- <cu-custom class="text-left">
+			<block slot="left-content">
+				<image :src="item.url" v-if="item.type=='image'"></image>
+				<text class="padding-left text-xl" style="float: left;">叮咚到家家政服务</text>
+			</block>
+		</cu-custom> -->
 		<!-- 轮播图-->
 		<swiper class="screen-swiper" :class="dotStyle?'square-dot':'round-dot'" :indicator-dots="true" :circular="true"
 			:autoplay="true" interval="5000" duration="500">
 			<swiper-item v-for="(item,index) in swiperList" :key="item.id">
-				<image :src="item.url" v-if="item.type=='image'"></image>
+				<image mode="aspectFill" :src="item.url" v-if="item.type=='image'"></image>
 				<video :src="item.url" autoplay loop muted :show-play-btn="false" :controls="false" objectFit="cover"
 					v-if="item.type=='video'"></video>
 			</swiper-item>
@@ -167,7 +174,8 @@
 				// 加载热门商品
 				let hotGoodsRes = await this.$request.getHotGoods({
 					pageNum: 0,
-					pageSize: 50
+					pageSize: 50,
+					status: 0
 				});
 				this.hotGoods = hotGoodsRes.rows;
 				// 加载品类
@@ -317,7 +325,11 @@
 	}
 </script>
 
-<style scoped>
+<style scoped>
+	.screen-swiper {
+		height: 500rpx;
+	}
+	
 	.cu-list+.cu-list {
 		margin-top: 0;
 	}
diff --git a/pages/product/product-detail.vue b/pages/product/product-detail.vue
index a5c106a..a40e01b 100644
--- a/pages/product/product-detail.vue
+++ b/pages/product/product-detail.vue
@@ -66,7 +66,7 @@
 						</view>
 						{{productDetail.goodsName}}
 					</view>
-					<view class="text-sm text-gray margin-top-xs">{{productInfo.comments}}</view>
+					<view class="text-sm text-gray margin-top-xs">{{productDetail.remark}}</view>
 				</view>
 				<view class="text-xl text-right padding-lr">
 					<!-- <view class="margin-tb-xs"><text class="cuIcon-share"></text></view> -->