完善首页热榜推荐和今日上新

pages/index/index.vue

@@ -109,14 +109,16 @@
 											马上抢
 										</view>
 										<view class="indexboxitemlefttheretext flex-start">
-											<view class="indexboxitemlefttheretextone">
-												<text>¥</text>
-												<text>{{item.salePrice}}</text>
+											<view class="fivecontent_item_boxitemlefthere_one flex-start">
+												<text class="flex_startone">到手</text>
+												<text class="flex_starttow">¥{{item.salePrice}}</text>
 											</view>
-											<view class="indexboxitemlefttheretexttow">
-												¥{{item.discount}}
+											<view class="fivecontent_item_boxitemlefthere_tow">
+												{{item.discount || ''}}折
+											</view>
+											<view class="fivecontent_item_boxitemlefthere_there">
+												¥{{item.originPrice}}
 											</view>
-
 										</view>
 										<view class="indexboxitemleftthere_countdown flex-between">
 											<text class="indexboxitemleftthere_countdowntext">共省{{item.save}}元</text>
@@ -394,7 +396,7 @@
 			init_fn() {
 				this.homelist = []
 				this.form = {
-						address:uni.cache.get('getLocationstorage').address, //地址
+						address: uni.cache.get('getLocationstorage').address, //地址
 						lng: uni.cache.get('getLocationstorage').lng,
 						lat: uni.cache.get('getLocationstorage').lat,
 						type: '', //品类
@@ -429,9 +431,6 @@
 					})
 					if (res.data.pages < this.form.page) {
 						this.form.status = 'nomore'
-						// if (res.data.pageNum == 1) {
-						// 	this.is_end = true
-						// }
 						return false;
 					} else {
 						this.form.status = 'loading';
@@ -843,7 +842,6 @@
 								margin-top: 30rpx;
 								padding-left: 16rpx;
 								width: 100%;
-								height: 88rpx;
 								background: url(https://czg-qr-order.oss-cn-beijing.aliyuncs.com/index/qinggou.png) no-repeat;
 								background-size: 100% 100%;
 
@@ -858,42 +856,59 @@
 								}
 
 								.indexboxitemlefttheretext {
-									.indexboxitemlefttheretextone {
-										text {
-											font-family: SourceHanSansCN-Bold, SourceHanSansCN-Bold;
-											font-weight: normal;
-											color: #FF5053;
+									// width: 100%;
+									margin-top: 12rpx;
+									align-items: flex-end;
+
+									.fivecontent_item_boxitemlefthere_one {
+										align-items: flex-end;
+
+										.flex_startone {
+											font-family: Source Han Sans CN, Source Han Sans CN;
+											font-weight: 500;
+											font-size: 16rpx;
+											color: #FF7127;
 										}
 
-										text:nth-child(2) {
-											font-weight: bold;
-											font-size: 34rpx;
-										}
-
-										text:nth-child(1) {
+										.flex_starttow {
+											font-family: Source Han Sans CN, Source Han Sans CN;
+											font-weight: 500;
 											font-size: 24rpx;
+											color: #FF7127;
 										}
 									}
 
-									.indexboxitemlefttheretexttow {
-										margin-left: 12rpx;
-										font-size: 20rpx;
-										font-family: SourceHanSansCN-Regular, SourceHanSansCN-Regular;
-										font-weight: normal;
+									.fivecontent_item_boxitemlefthere_tow {
+										margin-left: 4rpx;
+										padding: 2rpx 10rpx;
+										border-radius: 4rpx 4rpx 4rpx 4rpx;
+										border: 2rpx solid #FF7127;
+										font-family: Source Han Sans CN, Source Han Sans CN;
+										font-weight: 500;
+										font-size: 16rpx;
+										color: #FF7127;
+									}
+
+									.fivecontent_item_boxitemlefthere_there {
+										margin-left: 6rpx;
+										font-family: Source Han Sans CN, Source Han Sans CN;
+										font-weight: 400;
+										font-size: 16rpx;
 										color: #999999;
-										text-decoration: line-through;
+										text-decoration-line: line-through;
 									}
 								}
 
 								.indexboxitemleftthere_countdown {
 									width: 100%;
 									padding-right: 7rpx;
-
+									margin-top: 2rpx;
 									.indexboxitemleftthere_countdowntext {
 										font-family: Source Han Sans CN, Source Han Sans CN;
 										font-weight: 400;
 										font-size: 24rpx;
 										color: #999999;
+										padding-bottom: 8rpx;
 									}
 
 									.indexboxitemleftthere_countdowntexts {