2023-5-10

pages/index/index.vue

@@ -30,13 +30,13 @@
 					<view class="hot-title clamp">
 						{{item.title}}
 					</view>
-					<view class="hot-money flex flex-start">
-						<view class="money">
+					<view class="hot-money clamp">
+						<text class="money">
 							￥{{item.price}}
-						</view>
-						<view class="oldmoney">
+						</text>
+						<text class="oldmoney">
 							{{item.old_price}}
-						</view>
+						</text>
 					</view>
 				</view>
 				<view class="item-none" v-if="rmList.length<3" v-for="item in (3-rmList.length)">

pages/user/model/model.vue

@@ -699,12 +699,8 @@
 			padding: 0;
 			border-radius: 0;
 			flex-grow: 1;
-<<<<<<< HEAD
-
-=======
 			background-color: $base-color;
 			color: #fff;
->>>>>>> 42b0f2d4a99933a348671f4f0ae2be3891df035a
 			&::after {
 				border: none;
 			}