解决冲突

packageSearch/goods-category-search/category-index.vue

@@ -16,7 +16,7 @@
 									<image :src="item.icon" mode="aspectFit" class="icon"
 										:style="{border: item.active?'2rpx #14CA65 solid':'0',}" />
 								</view>
-								<view class="name" :style="{width: item.active?'156rpx':'126rpx'}">
+								<view class="name" :style="{width: item.active?'74px':'126rpx'}">
 									<u-tag v-if="item.active" :text="item.name" bg-color="#14CA65" color="#fff"
 										borderColor="#14CA65" shape="circle" />
 									<text v-else class="no-active">{{item.name}}</text>
@@ -87,7 +87,7 @@
 											<view class="publish-date-box">
 												<view
 													style="width: fit-content; display: inline-block;margin-right:6rpx;">
-													<u-icon size="16" name="clock" color="#A3A3A3" />
+													<u-icon size="14" name="clock" color="#A3A3A3" />
 												</view>
 												<text style="margin-right: 6rpx;">发布日期</text>
 												<text>{{item1.pub_time_str}}</text>
@@ -444,11 +444,11 @@
 				}
 
 				.name {
-					width: 126px;
+					// width: 126px;
 					text-align: center;
 
 					.no-active {
-						font-size: 28rpx;
+						font-size: 24rpx;
 						font-family: PingFang-SC-Medium, PingFang-SC;
 						font-weight: 500;
 						color: #616161;
@@ -500,7 +500,7 @@
 				line-height: 1;
 
 				.title {
-					font-size: 32rpx;
+					font-size: 28rpx;
 					font-family: PingFangSC-Regular, PingFang SC;
 					font-weight: 400;
 					color: #343434;
@@ -518,7 +518,7 @@
 				border-radius: 25% 0 0 0;
 
 				.title {
-					font-size: 32rpx;
+					font-size: 28rpx;
 					font-family: PingFangSC-Regular, PingFang SC;
 					font-weight: 400;
 					color: #14CA65;
@@ -669,6 +669,7 @@
 							.publish-date-box {
 								display: flex;
 								align-items: center;
+								font-size: 22rpx;
 							}
 						}
 

packageSearch/search-products/search-products.vue

@@ -7,14 +7,14 @@
 					</u-image>
 					<view class="bgContent">
 						<view>
-							<u-image :src="item.cover" width="346rpx" height="320rpx" :lazy-load="true">
+							<u-image :src="imgUrl+item.cover" width="346rpx" height="320rpx" :lazy-load="true">
 							</u-image>
 							<view class="img_tag">{{item.cate_name}}</view>
 						</view>
-						<view style="padding: 14rpx 22rpx;">
+						<view style="padding: 14rpx 24rpx 14rpx 16rpx;">
 							<view class="title_box">
 								<text class="title">{{item.name}}</text>
-								<u-tag :text="item.tag" type="warning" shape="circle"></u-tag>
+								<u-tag :text="item.tags" type="warning" shape="circle"></u-tag>
 							</view>
 							<view class="product_desc">
 								{{item.title}}
@@ -24,7 +24,7 @@
 									:lazy-load="true">
 								</u-image>
 								<text class="release">发布日期：</text>
-								<text>{{item.pub_time}}</text>
+								<text>{{item.pub_time_str}}</text>
 							</view>
 						</view>
 					</view>
@@ -43,10 +43,13 @@
 					pageNum: 1
 				},
 				queryTitle: null,
-				productList: []
+				imgUrl: null,
+				productList: [],
+				tagsArray: [],
 			}
 		},
 		onLoad(options) {
+			this.imgUrl = uni.getStorageSync('img_url')
 			this.queryTitle = options.title
 			this.goSearch()
 		},
@@ -56,8 +59,17 @@
 					...this.queryParam,
 					title: this.queryTitle
 				}
+
 				this.$apiServe.getProductList(data).then(res => {
-					this.productList = res.data.data
+					let tags = res.data.data
+					if (tags) {
+						for (const item of tags) {
+							let tag = item.tags
+							this.tagsArray = tag.split(',')
+							item.tags = this.tagsArray[0]
+						}
+						this.productList = tags
+					}
 				}).finally(_ => {})
 			},
 			//点击图片跳转到详情页

packageSearch/search/search.vue

@@ -58,7 +58,6 @@
 			this.getDiscover()
 			const tempList = uni.getStorageSync('storage_search_record')
 			this.recentRecordList = tempList ? tempList : [];
-			console.log(this.recentRecordList)
 			const menuButtonInfo = uni.getMenuButtonBoundingClientRect();
 			this.searchBarTop = menuButtonInfo.top;
 			this.searchBarHeight = menuButtonInfo.height;
@@ -104,7 +103,6 @@
 			getDiscover() {
 				this.$apiServe.getDiscover().then(res => {
 					this.foundList = res.data.data
-					console.log(res.data.data)
 				}).finally(_ => {})
 			}
 		}