diff --git a/pages/index/hotlist.vue b/pages/index/hotlist.vue
index ae8f41c..680fd8d 100644
--- a/pages/index/hotlist.vue
+++ b/pages/index/hotlist.vue
@@ -20,7 +20,8 @@
-
{{item.name}}
@@ -35,46 +36,13 @@
-
+
+ 热销TOP.{{index + 1}}热销热销热销热销热销热销热销热销热销热销热销热销热销已抢{{item.realSalesNumber}}份
+
+
{{item.productName}}
已抢{{item.realSalesNumber}}份
-
-
-
- {{c.name}}
-
-
-
-
- 马上抢
-
-
-
- ¥
- {{item.salePrice}}
-
-
- ¥{{item.discount}}
-
-
-
-
- 共省{{item.save}}元
-
-
-
-
-
-
-
@@ -116,7 +84,7 @@
name: '饮品小吃'
}
],
- xitembtitemindex:0,
+ xitembtitemindex: 0,
xitembtitem: [{
name: '2小时销量飙升榜'
},
@@ -161,7 +129,7 @@
},
methods: {
//飙升榜
- clickxitembtitemindex(index){
+ clickxitembtitemindex(index) {
this.xitembtitemindex = index
},
towcontentclick(index) {
@@ -216,7 +184,7 @@
async onLoadlist() {
try {
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: '', //团购卷品类Id
@@ -416,7 +384,7 @@
.fivecontent_item {
margin-top: 32rpx;
- padding:32rpx 24rpx;
+ padding: 32rpx 24rpx;
width: 100%;
background: #FFFFFF;
border-radius: 18rpx 18rpx 18rpx 18rpx;
@@ -433,132 +401,38 @@
.fivecontent_item_boxitemleft {
margin-left: 24rpx;
- flex: auto;
-
+ flex: 1;
+ justify-content: flex-start;
+ height: 192rpx;
.fivecontent_item_boxitemleftone {
width: 100%;
-
- text {
- font-family: Source Han Sans CN, Source Han Sans CN;
- font-weight: 400;
- font-size: 24rpx;
- color: #999999;
- }
-
- view {
- font-family: Source Han Sans CN, Source Han Sans CN;
- font-weight: 500;
- font-size: 28rpx;
- color: #333333;
- }
- }
-
-
- .flexstartboxfttow {
- .fivecontent_item_boxitemlefttow {
- margin-left: 16rpx;
- margin-top: 8rpx;
- width: max-content;
- padding: 4rpx 10rpx;
- background: #FFF9E1;
- border-radius: 4rpx 4rpx 4rpx 4rpx;
-
- .fivecontent_item_boxitemlefttowtext {
- margin-left: 6rpx;
- font-family: Source Han Sans CN, Source Han Sans CN;
- font-weight: 400;
- font-size: 16rpx;
- color: #F9A511;
- }
-
- .fivecontent_item_boxitemlefttowimage {
- width: 10.82rpx;
- height: 14.06rpx;
- }
- }
-
- .fivecontent_item_boxitemlefttow:nth-child(1) {
- margin-left: 0;
- background: #FFD6D7;
- border-radius: 4rpx 4rpx 4rpx 4rpx;
- }
- }
-
- .fivecontent_item_boxitemlefttow:nth-child(2) {
- margin-left: 12rpx;
- background: #FFD6D7;
- border-radius: 4rpx 4rpx 4rpx 4rpx;
- }
-
- .indexboxitemleftthere {
- position: relative;
- 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%;
-
- .indexboxitemleftthereabsolute {
- position: absolute;
- top: 14rpx;
- right: 12rpx;
- font-family: Source Han Sans CN, Source Han Sans CN;
- font-weight: bold;
- font-size: 24rpx;
- color: #FFFFFF;
- }
-
- .indexboxitemlefttheretext {
- .indexboxitemlefttheretextone {
- text {
- font-family: SourceHanSansCN-Bold, SourceHanSansCN-Bold;
- font-weight: normal;
- color: #FF5053;
- }
-
- text:nth-child(2) {
- font-weight: bold;
- font-size: 34rpx;
- }
-
- text:nth-child(1) {
- font-size: 24rpx;
- }
- }
-
- .indexboxitemlefttheretexttow {
- margin-left: 12rpx;
- font-size: 20rpx;
- font-family: SourceHanSansCN-Regular, SourceHanSansCN-Regular;
- font-weight: normal;
- color: #999999;
- text-decoration: line-through;
- }
- }
-
- .indexboxitemleftthere_countdown {
- width: 100%;
- padding-right: 7rpx;
-
- .indexboxitemleftthere_countdowntext {
- font-family: Source Han Sans CN, Source Han Sans CN;
- font-weight: 400;
- font-size: 24rpx;
- color: #999999;
- }
-
- .indexboxitemleftthere_countdowntexts {
+ .fivecontent_item_boxitemleftone_t{
+ .fivecontent_item_boxitemleftone_o{
+ margin-right:10rpx ;
+ display: inline-block;
font-family: Roboto, Roboto;
- font-weight: 400;
- color: #333333;
- font-family: Source Han Sans CN, Source Han Sans CN;
- font-weight: bold;
+ font-weight: 500;
font-size: 16rpx;
color: #FFFFFF;
+ padding: 2rpx 6rpx ;
+ text-align: center;
+ background: linear-gradient( 116deg, #FF9D2B 0%, #FF4805 100%);
+ border-radius: 4rpx 4rpx 4rpx 4rpx;
}
+ font-family: Source Han Sans CN, Source Han Sans CN;
+ font-weight: 400;
+ font-size: 28rpx;
+ color: #333333;
+ overflow:hidden;
+ text-overflow:ellipsis;
+ display:-webkit-box;
+ -webkit-box-orient:vertical;
+ -webkit-line-clamp:2;
}
}
+ .fivecontent_item_boxitemlefttow{
+
+ }
}
}
}
diff --git a/pages/order/order.vue b/pages/order/order.vue
index 96d6956..383d391 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -25,71 +25,75 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+ 需付款
+ ￥
+ {{item.orderAmount}}
+
+
+ 下单日期：{{$u.timeFormat(item.createdAt, 'yyyy-mm-dd hh:MM')}}
+ 共{{item.totalNumber}}件商品 合计：￥{{item.orderAmount}}
-
- 需付款
- ￥
- {{item.orderAmount}}
-
-
- 下单日期：{{$u.timeFormat(item.createdAt, 'yyyy-mm-dd hh:MM')}}
- 共{{item.totalNumber}}件商品 合计：￥{{item.orderAmount}}
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/pages/product/index.vue b/pages/product/index.vue
index 8bb2cb3..7904bba 100644
--- a/pages/product/index.vue
+++ b/pages/product/index.vue
@@ -800,8 +800,8 @@
.fivecontent_item_boxitem {
image {
- width: 192rpx;
- height: 192rpx;
+ width: 208rpx;
+ height: 208rpx;
border-radius: 12rpx;
}
diff --git a/static/user/user_icon1.png b/static/user/user_icon1.png
deleted file mode 100644
index 5d7eb21..0000000
Binary files a/static/user/user_icon1.png and /dev/null differ
diff --git a/static/user/user_icon2.png b/static/user/user_icon2.png
deleted file mode 100644
index b57dd9e..0000000
Binary files a/static/user/user_icon2.png and /dev/null differ
diff --git a/static/user/user_icon3.png b/static/user/user_icon3.png
deleted file mode 100644
index ae1cd83..0000000
Binary files a/static/user/user_icon3.png and /dev/null differ
diff --git a/static/user/user_icon4.png b/static/user/user_icon4.png
deleted file mode 100644
index 5483621..0000000
Binary files a/static/user/user_icon4.png and /dev/null differ
diff --git a/static/user/user_icon5.png b/static/user/user_icon5.png
deleted file mode 100644
index ab801ae..0000000
Binary files a/static/user/user_icon5.png and /dev/null differ
diff --git a/static/user/user_icon6.png b/static/user/user_icon6.png
deleted file mode 100644
index 44c43bb..0000000
Binary files a/static/user/user_icon6.png and /dev/null differ
diff --git a/static/user/user_icon7.png b/static/user/user_icon7.png
deleted file mode 100644
index 2326413..0000000
Binary files a/static/user/user_icon7.png and /dev/null differ
diff --git a/static/user/user_icon8.png b/static/user/user_icon8.png
deleted file mode 100644
index 7b64485..0000000
Binary files a/static/user/user_icon8.png and /dev/null differ