diff --git a/pages/index/index.vue b/pages/index/index.vue
index 00f17b2..6e015bd 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -10,32 +10,13 @@
-
+
-
+
+ -->
@@ -49,7 +30,8 @@
:duration="duration"
>
@@ -62,34 +44,38 @@
-
-
- {{ item.specialAreaName }}
-
-
-
-
-
-
-
-
+ :key="index"
+ >
+
+
+
+ {{ item.specialAreaName }}
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
@@ -102,28 +88,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
{{ item.waresName }}
- {{ item.vipPrice | numberToCurrency | isLocal }}
+
+ 累计销量{{ item.sales | seles }}
+
+ ¥
+ {{ item.vipPrice | numberToCurrency }}
+
+
+ ¥
+ {{ item.waresPrice | numberToCurrency }}
+
+
+ ¥
+ {{ item.waresPrice | numberToCurrency }}
+
- {{
- item.waresPrice | numberToCurrency | isLocal
- }}
-
-
- {{ item.waresPrice | numberToCurrency | isLocal }}
-
-
- {{ '累计销量' }}{{ item.sales | seles }}
+
@@ -730,64 +697,90 @@ header {
padding: 0 20rpx;
}
-.goods-sales {
- font-size: 24rpx;
- color: #999;
- margin-top: 10rpx;
-}
-.goods-price {
- color: #f82c1a;
- margin-top: 10rpx;
- font-style: 22rpx;
- margin-left: -7rpx;
- span {
- font-size: 30rpx;
- font-weight: bold;
- }
-}
-.goods-price1 {
- color: #999;
- // margin-top: 10rpx;
- font-size: 10px;
- margin-left: -7rpx;
- span {
- font-size: 10rpx;
- }
-}
.goods-name {
+ width: 100%;
margin-top: 10rpx;
color: #333;
font-size: 26rpx;
overflow: hidden;
- white-space: nowrap;
text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-line-clamp: 2;
+ -webkit-box-orient: vertical;
+ word-break: break-word;
+ line-height: 1.4;
+ // min-height: calc(26rpx * 1.4 * 2);
}
-.goods-img {
- image {
- width: 100%;
- border-radius: 10rpx 10rpx 0 0;
- height: 322rpx;
- }
-}
-.goods-center-lists:nth-child(3) {
- //margin-top: 0rpx;
-}
.goods-center-lists {
- width: 345rpx; // height: 450rpx;
+ width: calc(100% - 40rpx); // height: 450rpx;
background: #ffffff;
margin-left: 20rpx;
+ margin-right: 20rpx;
border-radius: 15rpx;
border-bottom: 20rpx;
margin-bottom: 20rpx;
- padding-bottom: 30rpx;
+ // padding-bottom: 30rpx;
position: relative;
+ .goods-flex-s {
+ display: flex;
+ padding: 20rpx;
+ .goods-img {
+ flex-shrink: 0;
+ width: 236rpx;
+ height: 236rpx;
+ image {
+ width: 100%;
+ height: 100%;
+ border-radius: 10rpx;
+ }
+ }
+ }
+ .goods-info {
+ flex: 1;
+ padding-left: 20rpx;
+ width: 0;
+ display: flex;
+ flex-direction: column;
+ .goods-sales-wrapper {
+ display: flex;
+ flex: 1;
+ flex-direction: column;
+ justify-content: space-between;
+ .goods-sales {
+ font-size: 24rpx;
+ color: #999;
+ margin-top: 10rpx;
+ }
+ .goods-price {
+ color: #f82c1a;
+ margin-top: 10rpx;
+ font-style: 22rpx;
+ margin-left: -7rpx;
+ .price-symbol {
+ font-size: 22rpx;
+ }
+ span {
+ font-size: 36rpx;
+ font-weight: bold;
+ }
+ }
+ .goods-price1 {
+ color: #999;
+ font-size: 10px;
+ margin-left: -7rpx;
+ span {
+ font-size: 10rpx;
+ }
+ }
+ }
+ }
}
.goods-sort {
@@ -806,6 +799,7 @@ header {
.goods_content {
display: flex;
+ flex-direction: column;
padding: 0;
flex-wrap: wrap;
}
@@ -970,7 +964,7 @@ header {
}
.banner {
- padding: 140rpx 0 0 0;
+ padding: 30rpx 0 0 0;
text-align: center;
width: 100%;
}
@@ -1028,7 +1022,7 @@ page {
position: fixed;
z-index: 10;
width: 100%;
- height: 120rpx;
+ height: 20rpx;
.index_t {
padding: 30rpx 20rpx;
}
@@ -1043,7 +1037,7 @@ page {
position: fixed;
z-index: 10;
width: 100%;
- height: 120rpx;
+ height: 100%;
.index_t {
padding: 30rpx 20rpx;
}
diff --git a/pages/other/index.vue b/pages/other/index.vue
index b72e43b..934b213 100644
--- a/pages/other/index.vue
+++ b/pages/other/index.vue
@@ -750,6 +750,7 @@ export default {
api.memLevel(this.allGoodsData).then(res => {
if (res.data.isEnough) {
+ console.log(res.data, 'res.data...memLevel')
this.form.pkGradeVal = res.data.pkGradeVal
} else {
this.isLoading.close()