Merge branch 'master' of http://123.60.98.226:3000/jiazhipeng/EpicSoul

components/CustomTabBar.vue

@@ -91,6 +91,7 @@ export default {
     justify-content: center;
 	flex: 1;
 	flex-shrink: 0;
+	height: 100%;
 }
 
 

pages/index/index.vue

@@ -49,23 +49,12 @@
 				// 大轮播
 				this.Post({
 					type_id: 3,
-					position: 1,
+					position: 17,
 				}, '/api/adv/getAdv').then(res => {
 					if(res.data) {
 						this.topBanner = res.data;
 					}
 				});
-				
-				// 小轮播
-				this.Post({
-					type_id: 3,
-					position: 2,
-				}, '/api/adv/getAdv').then(res => {
-					if(res.data) {
-						this.smallBanner = res.data;
-						this.screenPng = res.data[0]
-					}
-				});
 			},
 			gotoVideo(item) {
 				uni.navigateTo({

pages/index/intelligentAgent.vue

@@ -32,7 +32,7 @@
 				// 大轮播
 				this.Post({
 					type_id: 3,
-					position: 1,
+					position: 3,
 				}, '/api/adv/getAdv').then(res => {
 					if(res.data) {
 						this.topBanner = res.data;

pages/index/sensoryStore.vue

@@ -20,7 +20,7 @@
 			<image  class="head-img" src="https://static.ticket.sz-trip.com/uploads/20250625/e3112c280ef9761af741907a737ef221.png"></image>
 			
 			<view class="product">
-				<view class="item" v-for="(item,i) in list" :key="item.goods.id">
+				<view class="item" v-for="(item,i) in list" :key="item.goods.id" @click="goDetailByType(item)">
 					<image class="item-img" :src="showImg(item.goods.image)"></image>
 					<view class="content">
 						<view class="title text-overflow">{{item.goods.title}}</view>
@@ -32,11 +32,11 @@
 				</view>
 			</view>
 			
-			<image style="margin: 53rpx 0 35rpx;" class="head-img" src="https://static.ticket.sz-trip.com/uploads/20250625/e3112c280ef9761af741907a737ef221.png"></image>
+			<image style="margin: 53rpx 0 35rpx;" class="head-img" src="https://static.ticket.sz-trip.com/uploads/20250627/73153098ff5c115e02afb0328ade1e29.png"></image>
 		
 			<view class="img-container">
-				<image v-for="i in 3" :key="i" src="https://cgc.js-dyyj.com/uploads/20250619/839df8a6ffaa539b213551577b6fc388.png?timestamp=1750841365993"
-				@click="gotoPath('/subPackages/haveFeeling/detailXiang')"></image>
+				<image v-for="(type,i) in typeList" :key="i" :src="showImg(type.img)"
+				@click="gotoPath(`/subPackages/haveFeeling/detailXiang?id=${type.id}`)"></image>
 			</view>
 		</view>
 		<CustomTabBar :currentTab="2" />
@@ -53,6 +53,7 @@
 				topBanner: [],
 				list: [],
 				swiperIndex: 0,
+				typeList: [],
 			}
 		},
 		onLoad() {
@@ -60,8 +61,8 @@
 		},
 		onReady() {
 			this.getProduct()
+			this.getTypes()
 			this.getList()
-			
 		},
 		onReachBottom() {
 			
@@ -85,7 +86,7 @@
 			
 			getProduct () {
 				this.Post({
-					tag_id: 45,
+					tag_id: 40,
 					offset: 0,
 					limit: 3,
 				},'/api/tag/getGoodsByTagId').then(res => {
@@ -93,17 +94,30 @@
 				})
 			},
 			
+			
 			getList() {
 				// 大轮播
 				this.Post({
 					type_id: 3,
-					position: 1,
+					position: 18,
 				}, '/api/adv/getAdv').then(res => {
 					if(res.data) {
 						this.topBanner = res.data;
 					}
 				});
 			},
+			
+			// 获取分类图片
+			getTypes () {
+				this.Post({
+					parent_id: 0,
+				}, '/api/goods/type').then(res => {
+					if(res.data) {
+						this.typeList = res.data;
+					}
+				});
+			},
+			
 			// 2是各种详情页，3是列表专题页面，4是小程序
 			gotoUrlNew(item) {
 				console.log(item);
@@ -232,5 +246,14 @@
 			margin-bottom: 20rpx;
 		}
 	}
-	
+	.line{
+		width: 220rpx;
+		height: 1rpx;
+		background: #E4E4E4;
+		flex-shrink: 0;
+	}
+	.head-img-yougan{
+		width: 183.45rpx;
+		height: 42.57rpx;
+	}
 </style>