Merge branch 'master' into dev_delivery

subPackages/activity/xinjiang.vue

@@ -4,21 +4,26 @@
 		<view class="main-container">
 			<view class="flex flex-between">
 				<view class="main-title">
-					<view class="header-left-line" style="width: 6rpx;height: 20rpx;"></view>
+					<view class="header-left-line" style="width: 6rpx;height: 27rpx;"></view>
 					商品列表
 				</view>
 				<view class="sort-area">
 					<view :class="['sort-item',search==0?'active':'']" @click="changeSearch(0)">综合</view>
 					<view :class="['sort-item',search==2?'active':'']" @click="changeSearch(2)">销量</view>
 					<view :class="['sort-item',(search==3||search==4)?'active':'']" class="sort-item" @click="changeSearch(search==3?4:3)">
-						<text>价格{{search==3?"从低到高":search==4?"从高到低":""}}</text>
+						<text>价格</text>
 						<view class="search-item">
-							<view class="rotate-90">
+							<image v-if="search!=3&&search!=4" src="https://static.ticket.sz-trip.com/uploads/20251023/eefe8898ad30a80a0f19f48555a7a1e4.png"></image>
+							
+							<image v-if="search==3" src="https://static.ticket.sz-trip.com/uploads/20251023/fe082fea867dae5b02c1ef2567d320a4.png"></image>
+							
+							<image v-if="search==4" src="https://static.ticket.sz-trip.com/uploads/20251023/b3253a1499d24790c32fbcab437d9984.png"></image>
+							<!-- <view class="rotate-90">
 								<uni-icons type="left" size="11" :color="search==3?'#71873D':'#A0A0A0'"></uni-icons>
 							</view>
 							<view class="rotate-90">
 								<uni-icons type="right" size="11" :color="search==4?'#71873D':'#A0A0A0'"></uni-icons>
-							</view>
+							</view> -->
 						</view>
 					</view>
 				</view>
@@ -158,7 +163,7 @@
 		position: relative;
 		.main-title{
 			font-weight: 500;
-			font-size: 29rpx;
+			font-size: 32rpx;
 			color: #363636;
 			display: flex;
 			align-items: center;
@@ -175,14 +180,15 @@
 			}
 			.sort-item.active{
 				color: #71873D;
+				font-weight: bold;
 			}
 			
 			.search-item{
-				padding-left: 9rpx;
+				padding-left: 8rpx;
-				display: flex;
+				image{
-				flex-direction: column;
+					width: 20rpx;
-				align-items: center;
+					height: 20rpx;
-				line-height: 0.6;
+				}
 			}
 		}
 	}