From 0c5a1fbd4df0c56d5660e9996a23036b0ee3dd2e Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Wed, 24 Apr 2024 16:44:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=88=97=E8=A1=A8=E6=A0=B7?=
=?UTF-8?q?=E5=BC=8F=E6=94=B9=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/cart/index.vue | 69 +++++++-------
pages/goods/detail.vue | 63 ++++++-------
pages/goods/list.vue | 88 ++++++++---------
pages/index/index.vue | 95 ++++++++++---------
pages/user/index.vue | 210 +++++++++++++++++++++++++----------------
5 files changed, 289 insertions(+), 236 deletions(-)
diff --git a/pages/cart/index.vue b/pages/cart/index.vue
index 587290b..be88ffc 100644
--- a/pages/cart/index.vue
+++ b/pages/cart/index.vue
@@ -119,7 +119,7 @@
</view>
</template>
<template v-slot:right="{rightList}">
- <view class="goodsItem" v-for="(item,index) in rightList" @click="onTargetGoods(item.goods_id)"
+ <view class="goodsItem" style="margin-right: 0;" v-for="(item,index) in rightList" @click="onTargetGoods(item.goods_id)"
:key="index">
<view class="pic">
<image :src="item.goods_image" mode=""></image>
@@ -478,16 +478,16 @@
.goodsRecommend {
overflow: hidden;
- margin: 10rpx 5rpx 20rpx 25rpx;
+ margin: 10rpx 22rpx 20rpx 22rpx;
.goodsItem {
- width: 338rpx;
+ width: 348rpx;
border-radius: 8rpx;
overflow: hidden;
background-color: #ffffff;
- margin-bottom: 24rpx;
padding: 20rpx;
box-sizing: border-box;
+ margin: 0rpx 14rpx 20rpx 0;
.pic {
width: 100%;
@@ -502,17 +502,18 @@
}
.goodsInfo {
+ margin-bottom: 12rpx;
+
.title {
display: flex;
align-items: center;
- margin-top: 14rpx;
- white-space: normal;
+ margin-top: 10rpx;
display: -webkit-box;
-webkit-box-orient: vertical;
overflow: hidden;
-webkit-line-clamp: 2;
- height: 90rpx;
- line-height: 45rpx;
+ line-height: 33rpx;
+ white-space: normal;
.ziying {
padding: 4rpx 10rpx;
@@ -526,11 +527,14 @@
}
.name {
- margin-left: 6rpx;
- color: #1E1E1E;
- flex: 1;
- font-weight: bold;
- font-size: 30rpx;
+ font-family: PingFang SC, PingFang SC;
+ font-weight: 500;
+ font-size: 28rpx;
+ color: #2B2B2B;
+ line-height: 33rpx;
+ text-align: left;
+ font-style: normal;
+ text-transform: none;
}
}
@@ -849,7 +853,7 @@
.goods-price {
font-family: PingFang SC, PingFang SC;
font-weight: bold;
- font-size: 36rpx;
+ font-size: 32rpx;
color: #F21A1C !important;
}
@@ -857,7 +861,7 @@
text-decoration: line-through;
font-family: PingFang SC, PingFang SC;
font-weight: 400;
- font-size: 24rpx;
+ font-size: 22rpx;
color: #949494;
}
@@ -865,22 +869,21 @@
.goodsInfo1 {
display: flex;
align-items: center;
- margin-bottom: 10rpx;
+ margin: 18rpx 0rpx;
.oneTip {
padding: 0 16rpx;
- height: 42rpx;
+ height: 34rpx;
background: #F6F6F6;
- border-radius: 10rpx 10rpx 10rpx 10rpx;
+ border-radius: 4rpx;
font-family: PingFang SC, PingFang SC;
font-weight: 500;
- font-size: 24rpx;
+ font-size: 22rpx;
color: #333333;
- line-height: 42rpx;
+ line-height: 34rpx;
text-align: left;
font-style: normal;
text-transform: none;
- margin-top: 6rpx;
max-width: 300rpx;
display: -webkit-box;
-webkit-box-orient: vertical;
@@ -898,32 +901,32 @@
.sendLeft {
width: 120rpx;
border: 1rpx solid #F21A1C;
- border-radius: 10rpx;
- height: 42rpx;
+ border-radius: 4rpx;
+ height: 30rpx;
display: flex;
justify-content: space-between;
align-items: center;
.left_1 {
height: 100%;
- width: 50rpx;
- line-height: 36.5rpx;
+ width: 48rpx;
+ line-height: 26rpx;
font-family: PingFang SC, PingFang SC;
font-weight: bold;
- font-size: 30rpx;
+ font-size: 22rpx;
color: #F21A1C;
text-align: center;
}
.left_2 {
height: 100%;
- width: 70rpx;
+ width: 72rpx;
background-color: #F21A1C;
font-family: PingFang SC, PingFang SC;
font-weight: 500;
- font-size: 24rpx;
+ font-size: 20rpx;
color: #FFFFFF;
- line-height: 36rpx;
+ line-height: 26rpx;
text-align: center;
font-style: normal;
text-transform: none;
@@ -931,15 +934,15 @@
}
.sendRight {
- height: 42rpx;
+ height: 32rpx;
background: #FDEDED;
padding: 0 10rpx;
- border-radius: 10rpx 10rpx 10rpx 10rpx;
+ border-radius: 4rpx;
font-family: PingFang SC, PingFang SC;
font-weight: 500;
- font-size: 24rpx;
+ font-size: 20rpx;
color: #F21A1C;
- line-height: 42rpx;
+ line-height: 32rpx;
text-align: left;
font-style: normal;
text-transform: none;
diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
index b42b20c..5c3f613 100644
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@@ -89,9 +89,9 @@
</view>
</view> -->
<view class="rank" @click="goRanking()" v-if="goods && goods.category">
- <text><text style="font-size: 32rpx;font-weight: bold;">排行榜</text>
+ <text><text style="font-size: 32rpx;font-weight: bold;margin-right: 20rpx;">排行榜</text>
{{goods.category.name}}热搜榜第{{goods.paihang}}名</text>
- <image :src="$picUrl+'/static/detail/rightIcon.png'"></image>
+ <image :src="$picUrl+'/static/detail/rightIcon.png'" style="margin-right: 24rpx;"></image>
</view>
<view class="goodsOpera" style="margin-top: 30rpx;">
<!-- @click="toCity" -->
@@ -99,7 +99,7 @@
<picker mode="multiSelector" @change="multiChange" @columnchange="columnChange"
value="{{multiIndex}}" :range="multiArray" range-key="name">
<image :src="$picUrl+'/static/detail/address.png'"
- style="width: 46rpx;height: 46rpx;margin-right: 7rpx;">
+ style="width: 46rpx;height: 46rpx;margin-right: 7rpx;margin-left: 0;">
</image>
<text style="margin-right: 10rpx;">{{addressResult.city}}：{{stockValue}}</text>
<u-icon name="arrow-right" color="#B7B7B7" size="22"></u-icon>
@@ -109,9 +109,9 @@
<view class="left_1">
{{goods.goods_source}}
</view>
- <text>{{goods.goods_no}}</text>
+ <text style="color: #8A8A8A;font-size: 28rpx;">{{goods.goods_no}}</text>
<image :src="$picUrl+'/static/detail/copy.png'"
- style="width: 27rpx;height: 27rpx;margin-left: 8rpx;"></image>
+ style="width: 27rpx;height: 27rpx;margin-left: 14rpx;"></image>
</view>
</view>
</view>
@@ -262,7 +262,7 @@
修改价格
</view>
<view class="btn-bg"
- style="background:linear-gradient( 102deg, #FE5E06 0%, #F3221A 100%);margin-left:40rpx;"
+ style="background:linear-gradient( 102deg, #FE5E06 0%, #F3221A 100%);margin-left:8rpx;"
@click="setPirce()">
设置秒杀
</view>
@@ -1138,14 +1138,12 @@
}
&-content {
- padding: 30rpx;
+ border-radius: 6rpx;
font-size: 26rpx;
line-height: 50rpx;
- width: 710rpx;
- margin: 0 auto;
- margin-top: 30rpx;
background-color: #fff;
box-sizing: border-box;
+ margin: 20rpx 18rpx 0 18rpx;
}
}
@@ -1261,12 +1259,11 @@
}
.goodsInfo {
- width: 720rpx;
background: #FFFFFF;
border-radius: 6rpx;
- padding-bottom: 30rpx;
+ padding-bottom: 32rpx;
overflow: hidden;
- margin: 20rpx auto 16rpx;
+ margin: 20rpx 18rpx 0 18rpx;
.goodsPrice {
background-image: url('https://www.royaum.com.cn/static/detail/priceback.png');
@@ -1374,11 +1371,10 @@
.pro {
background-image: url('https://www.royaum.com.cn/static/detail/pro.png');
background-size: 100% 100%;
- width: 690rpx;
height: 82rpx;
display: flex;
align-items: center;
- margin: 20rpx 0 0 10rpx;
+ margin: 20rpx 28rpx 0 28rpx;
.proMem {
width: 142rpx;
@@ -1415,20 +1411,23 @@
}
.goodsDetail {
+ margin: 0 26rpx;
.goodsContent {
justify-content: space-between;
display: flex;
- margin: 28rpx 28rpx 0 28rpx;
+ margin-top: 32rpx;
align-items: center;
}
.goodsName {
- width: 582rpx;
- font-size: 32rpx;
- font-weight: 400;
color: #000;
- line-height: 50rpx;
- font-weight: bold;
+ font-family: PingFang SC, PingFang SC;
+ font-weight: 500;
+ font-size: 30rpx;
+ line-height: 35rpx;
+ text-align: left;
+ font-style: normal;
+ text-transform: none;
}
.line2 {
@@ -1463,7 +1462,6 @@
}
.goodsOpera {
- margin-left: 28rpx;
display: flex;
justify-content: space-between;
align-items: center;
@@ -1489,10 +1487,9 @@
}
.operaImg {
- margin-right: 34rpx;
display: flex;
align-items: center;
-
+
image {
width: 49rpx;
height: 49rpx;
@@ -1508,14 +1505,14 @@
height: 70rpx;
background: #FFF3EE;
border-radius: 8rpx 8rpx 8rpx 8rpx;
- width: 670rpx;
+ width: 100%;
border-radius: 8rpx;
display: flex;
align-items: center;
justify-content: space-between;
padding: 0 28rpx;
box-sizing: border-box;
- margin: 16rpx auto 0;
+ margin: 20rpx auto 0;
text {
font-size: 28rpx;
@@ -1533,18 +1530,18 @@
}
.orderInfo {
- width: 720rpx;
+ // width: 720rpx;
background: #FFFFFF;
border-radius: 6rpx;
opacity: 1;
- margin: 16rpx auto 20rpx;
- padding: 25rpx 25rpx 5rpx;
+ margin: 20rpx 18rpx 0 18rpx;
+ padding: 30rpx 26rpx 0rpx 26rpx;
box-sizing: border-box;
.chosed {
display: flex;
align-items: flex-start;
- padding-bottom: 18rpx;
+ padding-bottom: 30rpx;
overflow: hidden;
.title {
@@ -1666,12 +1663,10 @@
}
.about {
- width: 720rpx;
- // height: 730rpx;
background: #FFFFFF;
border-radius: 6rpx 6rpx 6rpx 6rpx;
opacity: 1;
- margin: 14rpx 0 0rpx 20rpx;
+ margin: 20rpx 18rpx 0rpx 18rpx;
padding: 24rpx 0 0 36rpx;
.aboutHead {
@@ -2244,6 +2239,6 @@
font-size: 30rpx;
color: #F21A1C;
text-align: center;
- margin-right: 10rpx;
+ margin-right: 12rpx;
}
</style>
diff --git a/pages/goods/list.vue b/pages/goods/list.vue
index a9a76bf..ddbe15d 100644
--- a/pages/goods/list.vue
+++ b/pages/goods/list.vue
@@ -113,7 +113,7 @@
<view class="goods-image">
<image class="image" mode="aspectFill" :src="item.goods_image"></image>
</view>
- <view class="detail">
+ <view class="detail" style="padding-top: 10rpx;">
<!-- 商品名称 -->
<view class="goods-name">
<text>{{ item.goods_name }}</text>
@@ -168,7 +168,7 @@
<view class="goods-image">
<image class="image" mode="aspectFill" :src="item.goods_image"></image>
</view>
- <view class="detail">
+ <view class="detail" style="padding-top: 10rpx;">
<!-- 商品名称 -->
<view class="goods-name">
<text>{{ item.goods_name }}</text>
@@ -605,7 +605,7 @@
// 商品列表
.goods-list {
- padding: 8rpx 16rpx;
+ padding: 0 22rpx 8rpx 22rpx;
box-sizing: border-box;
}
@@ -696,13 +696,15 @@
}
.goods-item1 {
- width: 365rpx;
+ width: 348rpx;
}
.goods-item {
- // float: left;
+ background: #FFFFFF;
box-sizing: border-box;
- padding: 12rpx 9rpx;
+ margin: 20rpx 14rpx 0rpx 0;
+ border-radius:8rpx;
+
.goods-image {
position: relative;
@@ -710,7 +712,6 @@
height: 0;
padding-bottom: 100%;
overflow: hidden;
- background: #fff;
&:after {
content: '';
@@ -726,27 +727,29 @@
left: 0;
-o-object-fit: cover;
object-fit: cover;
+ border-radius: 8rpx;
}
}
.detail {
padding: 20rpx;
- background: #fff;
.goods-name {
- line-height: 1.3;
- white-space: normal;
- font-weight: bold;
- font-size: 30rpx;
- color: #1E1E1E;
- margin-bottom: 4rpx;
+ margin-bottom: 12rpx;
display: -webkit-box;
-webkit-box-orient: vertical;
overflow: hidden;
-webkit-line-clamp: 2;
- height: 90rpx;
- line-height: 45rpx;
- text{
+ font-family: PingFang SC, PingFang SC;
+ font-weight: 500;
+ font-size: 28rpx;
+ color: #2B2B2B;
+ line-height: 33rpx;
+ text-align: left;
+ font-style: normal;
+ text-transform: none;
+
+ text {
display: block;
}
}
@@ -756,7 +759,7 @@
display: flex;
justify-content: space-between;
align-items: center;
-
+ margin-bottom: 16rpx;
image {
width: 28rpx;
height: 28rpx;
@@ -767,15 +770,15 @@
.goods-price {
font-family: PingFang SC, PingFang SC;
font-weight: bold;
- font-size: 36rpx;
- color: #F21A1C;
+ font-size: 32rpx;
+ color: #F21A1C !important;
}
.line-price {
text-decoration: line-through;
font-family: PingFang SC, PingFang SC;
font-weight: 400;
- font-size: 24rpx;
+ font-size: 22rpx;
color: #949494;
}
@@ -808,22 +811,21 @@
.goodsInfo {
display: flex;
align-items: center;
- margin-bottom: 10rpx;
+ margin-bottom: 12rpx;
.oneTip {
padding: 0 16rpx;
- height: 42rpx;
+ height: 34rpx;
background: #F6F6F6;
- border-radius: 10rpx 10rpx 10rpx 10rpx;
+ border-radius: 4rpx;
font-family: PingFang SC, PingFang SC;
font-weight: 500;
- font-size: 24rpx;
+ font-size: 22rpx;
color: #333333;
- line-height: 42rpx;
+ line-height: 34rpx;
text-align: left;
font-style: normal;
text-transform: none;
- margin-top: 6rpx;
max-width: 300rpx;
display: -webkit-box;
-webkit-box-orient: vertical;
@@ -837,52 +839,52 @@
display: flex;
justify-content: space-between;
align-items: center;
-
+
.sendLeft {
width: 120rpx;
border: 1rpx solid #F21A1C;
- border-radius: 10rpx;
- height: 42rpx;
+ border-radius: 4rpx;
+ height: 30rpx;
display: flex;
justify-content: space-between;
align-items: center;
-
+
.left_1 {
height: 100%;
- width: 50rpx;
- line-height: 36.5rpx;
+ width: 48rpx;
+ line-height: 26rpx;
font-family: PingFang SC, PingFang SC;
font-weight: bold;
- font-size: 30rpx;
+ font-size: 22rpx;
color: #F21A1C;
text-align: center;
}
-
+
.left_2 {
height: 100%;
- width: 70rpx;
+ width: 72rpx;
background-color: #F21A1C;
font-family: PingFang SC, PingFang SC;
font-weight: 500;
- font-size: 24rpx;
+ font-size: 20rpx;
color: #FFFFFF;
- line-height: 36rpx;
+ line-height: 26rpx;
text-align: center;
font-style: normal;
text-transform: none;
}
}
-
+
.sendRight {
- height: 42rpx;
+ height: 32rpx;
background: #FDEDED;
padding: 0 10rpx;
- border-radius: 10rpx 10rpx 10rpx 10rpx;
+ border-radius: 4rpx;
font-family: PingFang SC, PingFang SC;
font-weight: 500;
- font-size: 24rpx;
+ font-size: 20rpx;
color: #F21A1C;
- line-height: 42rpx;
+ line-height: 32rpx;
text-align: left;
font-style: normal;
text-transform: none;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index fe99a94..e32bcfa 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -259,7 +259,8 @@
<text v-if="item.line_price_min > 0"
class="line-price col-9 f-24">￥{{ item.line_price_min>0?Number(item.line_price_min):0.00 }}</text>
</view>
- <image :src="$picUrl+'/static/detail/redShen.png'" v-if="item.is_check==1" mode=""></image>
+ <image :src="$picUrl+'/static/detail/redShen.png'" v-if="item.is_check==1" mode="">
+ </image>
</view>
<view class="goodsInfo1">
<view class="oneTip">
@@ -288,7 +289,7 @@
</view>
</template>
<template v-slot:right="{rightList}">
- <view class="goodsItem" v-for="(item,index) in rightList" @click="goDetails(item)"
+ <view class="goodsItem" style="margin-right: 0;" v-for="(item,index) in rightList" @click="goDetails(item)"
:key="index">
<view class="pic">
<image :src="item.goods_image" mode="widthFix"></image>
@@ -308,7 +309,8 @@
<text v-if="item.line_price_min > 0"
class="line-price col-9 f-24">￥{{ item.line_price_min>0?Number(item.line_price_min):0.00 }}</text>
</view>
- <image :src="$picUrl+'/static/detail/redShen.png'" v-if="item.is_check==1" mode=""></image>
+ <image :src="$picUrl+'/static/detail/redShen.png'" v-if="item.is_check==1" mode="">
+ </image>
</view>
<view class="goodsInfo1">
<view class="oneTip">
@@ -853,7 +855,8 @@
} else {
this.seckillCutDownTime = 0
}
- if (result.data.goodsList && result.data.goodsList.data && result.data.goodsList.data.length > 0) {
+ if (result.data.goodsList && result.data.goodsList.data && result.data.goodsList.data.length >
+ 0) {
seckillList = result.data.goodsList.data;
for (var i = 0; i < seckillList.length; i++) {
seckillList[i].original_price = Number(seckillList[i].original_price)
@@ -950,8 +953,8 @@
// url: '/pages/goods/detail?goodsId=' + this.bannerList[index].redirect_url
// })
// } else {
- if(!this.bannerList[index].redirect_url){
- return ;
+ if (!this.bannerList[index].redirect_url) {
+ return;
}
uni.navigateTo({
url: '/pages/activity/newsshop?activeid=' + this.bannerList[index].redirect_url + '&type=1'
@@ -1100,7 +1103,7 @@
onLoad() {
this.getTypeList()
this.getSeckill()
- this.getSuggest()//根据数据格式需要分页
+ this.getSuggest() //根据数据格式需要分页
this.getCityInfo()
this.getCoupons();
this.getServeList();
@@ -1124,10 +1127,10 @@
*/
onShareAppMessage() {
return {
-
+
}
},
-
+
/**
* 分享到朋友圈
* 本接口为 Beta 版本，暂只在 Android 平台支持，详见分享到朋友圈 (Beta)
@@ -1135,7 +1138,7 @@
*/
onShareTimeline() {
return {
-
+
}
}
}
@@ -1640,7 +1643,8 @@
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
- margin-top: 10rpx;font-size: 24rpx;
+ margin-top: 10rpx;
+ font-size: 24rpx;
}
}
@@ -1881,13 +1885,13 @@
margin-top: 20rpx;
.goodsItem {
- width: 340rpx;
+ width: 345rpx;
border-radius: 8rpx;
overflow: hidden;
background-color: #ffffff;
- margin-bottom: 24rpx;
padding: 20rpx;
box-sizing: border-box;
+ margin: 0rpx 14rpx 20rpx 0;
.pic {
width: 100%;
@@ -1902,16 +1906,17 @@
}
.goodsInfo {
+ margin-bottom: 12rpx;
+
.title {
display: flex;
align-items: center;
- margin-top: 14rpx;
+ margin-top: 10rpx;
display: -webkit-box;
-webkit-box-orient: vertical;
overflow: hidden;
-webkit-line-clamp: 2;
- height: 90rpx;
- line-height: 45rpx;
+ line-height: 33rpx;
white-space: normal;
.ziying {
@@ -1926,15 +1931,14 @@
}
.name {
- margin-left: 6rpx;
- color: #1E1E1E;
- flex: 1;
- font-weight: bold;
- font-size: 30rpx;
- // overflow: hidden;
- // white-space: nowrap;
- // text-overflow: ellipsis;
-
+ font-family: PingFang SC, PingFang SC;
+ font-weight: 500;
+ font-size: 28rpx;
+ color: #2B2B2B;
+ line-height: 33rpx;
+ text-align: left;
+ font-style: normal;
+ text-transform: none;
}
}
@@ -2468,7 +2472,7 @@
.goods-price {
font-family: PingFang SC, PingFang SC;
font-weight: bold;
- font-size: 36rpx;
+ font-size: 32rpx;
color: #F21A1C !important;
}
@@ -2476,7 +2480,7 @@
text-decoration: line-through;
font-family: PingFang SC, PingFang SC;
font-weight: 400;
- font-size: 24rpx;
+ font-size: 22rpx;
color: #949494;
}
@@ -2484,22 +2488,21 @@
.goodsInfo1 {
display: flex;
align-items: center;
- margin-bottom: 10rpx;
+ margin: 18rpx 0rpx;
.oneTip {
padding: 0 16rpx;
- height: 42rpx;
+ height: 34rpx;
background: #F6F6F6;
- border-radius: 10rpx 10rpx 10rpx 10rpx;
+ border-radius: 4rpx;
font-family: PingFang SC, PingFang SC;
font-weight: 500;
- font-size: 24rpx;
+ font-size: 22rpx;
color: #333333;
- line-height: 42rpx;
+ line-height: 34rpx;
text-align: left;
font-style: normal;
text-transform: none;
- margin-top: 6rpx;
max-width: 300rpx;
display: -webkit-box;
-webkit-box-orient: vertical;
@@ -2517,32 +2520,32 @@
.sendLeft {
width: 120rpx;
border: 1rpx solid #F21A1C;
- border-radius: 10rpx;
- height: 42rpx;
+ border-radius: 4rpx;
+ height: 30rpx;
display: flex;
justify-content: space-between;
align-items: center;
.left_1 {
height: 100%;
- width: 50rpx;
- line-height: 36.5rpx;
+ width: 48rpx;
+ line-height: 26rpx;
font-family: PingFang SC, PingFang SC;
font-weight: bold;
- font-size: 30rpx;
+ font-size: 22rpx;
color: #F21A1C;
text-align: center;
}
.left_2 {
height: 100%;
- width: 70rpx;
+ width: 72rpx;
background-color: #F21A1C;
font-family: PingFang SC, PingFang SC;
font-weight: 500;
- font-size: 24rpx;
+ font-size: 20rpx;
color: #FFFFFF;
- line-height: 36rpx;
+ line-height: 26rpx;
text-align: center;
font-style: normal;
text-transform: none;
@@ -2550,15 +2553,15 @@
}
.sendRight {
- height: 42rpx;
+ height: 32rpx;
background: #FDEDED;
padding: 0 10rpx;
- border-radius: 10rpx 10rpx 10rpx 10rpx;
+ border-radius: 4rpx;
font-family: PingFang SC, PingFang SC;
font-weight: 500;
- font-size: 24rpx;
+ font-size: 20rpx;
color: #F21A1C;
- line-height: 42rpx;
+ line-height: 32rpx;
text-align: left;
font-style: normal;
text-transform: none;
@@ -2570,4 +2573,4 @@
font-weight: 500;
color: #F21A1C;
}
-</style>
+</style>
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 9d35fd9..f5f1098 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -6,7 +6,7 @@
<view class="section_1">
<view class="box_1">
<image :src="$picUrl+'/static/default-logo.png'" v-if="!isLogin || !userInfo.avatar_url" class="image_2"
- @click="goJump('/pages/news1/setting')"></image>
+ @click="goJump('/pages/news1/setting')"></image>
<image :src="userInfo.avatar_url" @click="goJump('/pages/news1/setting')" v-else class="image_2">
</image>
<view class="group_1">
@@ -512,61 +512,109 @@
</view>
</view>
<!-- 商品推荐 -->
- <view class="goodsRecommend-title" v-if="isLogin == false || userInfo.user_type != 40">
+ <!-- <view class="goodsRecommend-title" v-if="isLogin == false || userInfo.user_type != 40">
<image :src="$picUrl+'/static/user/left.png'"></image>专属推荐<image
:src="$picUrl+'/static/user/right.png'"></image>
</view>
- <view class="goodsRecommend" v-if="isLogin == false || userInfo.user_type != 40">
- <view class="goodsItem" v-for="(item,index) in suggestGoodsList" @click="goodsDetail(item)"
- :key="index">
- <view class="pic">
- <image :src="item.goods_image" mode=""></image>
- </view>
- <view class="goodsInfo">
- <view class="title">
- <text v-if="item.selling_point" class="ziying">{{item.selling_point}}</text>
- <text class="name">{{item.goods_name}}</text>
+ <view class="goodsRecommend" v-if="isLogin == false || userInfo.user_type != 40"> -->
+ <view class="goodsRecommend-title">
+ <image :src="$picUrl+'/static/user/left.png'"></image>专属推荐<image
+ :src="$picUrl+'/static/user/right.png'"></image>
+ </view>
+ <view class="goodsRecommend">
+ <u-waterfall v-model="suggestGoodsList" ref="uWaterfall1">
+ <template v-slot:left="{leftList}">
+ <view class="goodsItem" v-for="(item,index) in leftList" @click="goodsDetail(item)"
+ :key="index">
+ <view class="pic">
+ <image :src="item.goods_image" mode=""></image>
+ </view>
+ <view class="goodsInfo">
+ <view class="title">
+ <text v-if="item.selling_point" class="ziying">{{item.selling_point}}</text>
+ <text class="name">{{item.goods_name}}</text>
+ </view>
+ <view class="price" style="margin-top: 12rpx;">
+ <text style="font-size: 26rpx;">￥</text>
+ <text style="font-weight: bold;font-size: 32rpx;">{{item.goods_price_min}}</text>
+ <text style="font-size: 20rpx;margin-left:10rpx;"></text>
+ <text
+ style="color: #949494;font-size: 22rpx;text-decoration: line-through;">￥{{item.line_price_min}}</text>
+ </view>
+ <view class="goodsInfo1">
+ <view class="oneTip">
+ {{item.cmmdty_model}}
+ </view>
+ </view>
+ <view class="goodsSend">
+ <view class="sendLeft">
+ <view class="left_1">
+ {{item.goods_source}}
+ </view>
+ <view class="left_2">
+ {{Number(item.discount)}}折
+ </view>
+ </view>
+ <view class="sendRight">
+ <text v-if="item.delivery_time==0">24小时内发货</text>
+ <text v-if="item.delivery_time==1">48小时内发货</text>
+ <text v-if="item.delivery_time==2">72小时内发货</text>
+ <text v-if="item.delivery_time==3">7天内发货</text>
+ <text v-if="item.delivery_time==4">15天内发货</text>
+ <text v-if="item.delivery_time==5">30天内发货</text>
+ <text v-if="item.delivery_time==6">45天内发货</text>
+ </view>
+ </view>
+ </view>
</view>
- <!-- <view class="isExpress">
- <text>包邮</text>
- </view> -->
- <view class="price">
- <text style="font-size: 20rpx;">￥</text>
- <text style="font-weight: bold;font-size: 36rpx;">{{item.goods_price_min}}</text>
- <text style="font-size: 20rpx;margin-left:10rpx;"></text>
- <text
- style="color: #949494;font-size: 22rpx;text-decoration: line-through;">￥{{item.line_price_min}}</text>
+ </template>
+ <template v-slot:right="{rightList}">
+ <view class="goodsItem" style="margin-right: 0;" v-for="(item,index) in rightList"
+ @click="goodsDetail(item)" :key="index">
+ <view class="pic">
+ <image :src="item.goods_image" mode=""></image>
</view>
- <view class="goodsInfo1">
- <view class="oneTip">
- {{item.cmmdty_model}}
+ <view class="goodsInfo">
+ <view class="title">
+ <text v-if="item.selling_point" class="ziying">{{item.selling_point}}</text>
+ <text class="name">{{item.goods_name}}</text>
</view>
- </view>
- <view class="goodsSend">
- <view class="sendLeft">
- <view class="left_1">
- {{item.goods_source}}
- </view>
- <view class="left_2">
- {{Number(item.discount)}}折
+ <view class="price" style="margin-top: 12rpx;">
+ <text style="font-size: 26rpx;">￥</text>
+ <text style="font-weight: bold;font-size: 32rpx;">{{item.goods_price_min}}</text>
+ <text style="font-size: 20rpx;margin-left:10rpx;"></text>
+ <text
+ style="color: #949494;font-size: 22rpx;text-decoration: line-through;">￥{{item.line_price_min}}</text>
+ </view>
+ <view class="goodsInfo1">
+ <view class="oneTip">
+ {{item.cmmdty_model}}
</view>
</view>
- <view class="sendRight">
- <text v-if="item.delivery_time==0">24小时内发货</text>
- <text v-if="item.delivery_time==1">48小时内发货</text>
- <text v-if="item.delivery_time==2">72小时内发货</text>
- <text v-if="item.delivery_time==3">7天内发货</text>
- <text v-if="item.delivery_time==4">15天内发货</text>
- <text v-if="item.delivery_time==5">30天内发货</text>
- <text v-if="item.delivery_time==6">45天内发货</text>
+ <view class="goodsSend">
+ <view class="sendLeft">
+ <view class="left_1">
+ {{item.goods_source}}
+ </view>
+ <view class="left_2">
+ {{Number(item.discount)}}折
+ </view>
+ </view>
+ <view class="sendRight">
+ <text v-if="item.delivery_time==0">24小时内发货</text>
+ <text v-if="item.delivery_time==1">48小时内发货</text>
+ <text v-if="item.delivery_time==2">72小时内发货</text>
+ <text v-if="item.delivery_time==3">7天内发货</text>
+ <text v-if="item.delivery_time==4">15天内发货</text>
+ <text v-if="item.delivery_time==5">30天内发货</text>
+ <text v-if="item.delivery_time==6">45天内发货</text>
+ </view>
</view>
</view>
- <!-- <view class="comment">
- <text>{{item.goods_sales}}条评论</text>
- <text style="margin-left:20rpx;">{{item.remaizhishu}}%好评率</text>
- </view> -->
- </view>
- </view>
+
+ </view>
+ </template>
+ </u-waterfall>
</view>
</view>
@@ -1001,22 +1049,21 @@
.goodsInfo1 {
display: flex;
align-items: center;
- margin-bottom: 10rpx;
+ margin: 18rpx 0rpx;
.oneTip {
padding: 0 16rpx;
- height: 42rpx;
+ height: 34rpx;
background: #F6F6F6;
- border-radius: 10rpx 10rpx 10rpx 10rpx;
+ border-radius: 4rpx;
font-family: PingFang SC, PingFang SC;
font-weight: 500;
- font-size: 24rpx;
+ font-size: 22rpx;
color: #333333;
- line-height: 42rpx;
+ line-height: 34rpx;
text-align: left;
font-style: normal;
text-transform: none;
- margin-top: 6rpx;
max-width: 300rpx;
display: -webkit-box;
-webkit-box-orient: vertical;
@@ -1034,32 +1081,32 @@
.sendLeft {
width: 120rpx;
border: 1rpx solid #F21A1C;
- border-radius: 10rpx;
- height: 42rpx;
+ border-radius: 4rpx;
+ height: 30rpx;
display: flex;
justify-content: space-between;
align-items: center;
.left_1 {
height: 100%;
- width: 50rpx;
- line-height: 36.5rpx;
+ width: 48rpx;
+ line-height: 26rpx;
font-family: PingFang SC, PingFang SC;
font-weight: bold;
- font-size: 30rpx;
+ font-size: 22rpx;
color: #F21A1C;
text-align: center;
}
.left_2 {
height: 100%;
- width: 70rpx;
+ width: 72rpx;
background-color: #F21A1C;
font-family: PingFang SC, PingFang SC;
font-weight: 500;
- font-size: 24rpx;
+ font-size: 20rpx;
color: #FFFFFF;
- line-height: 36rpx;
+ line-height: 26rpx;
text-align: center;
font-style: normal;
text-transform: none;
@@ -1067,15 +1114,15 @@
}
.sendRight {
- height: 42rpx;
+ height: 32rpx;
background: #FDEDED;
padding: 0 10rpx;
- border-radius: 10rpx 10rpx 10rpx 10rpx;
+ border-radius: 4rpx;
font-family: PingFang SC, PingFang SC;
font-weight: 500;
- font-size: 24rpx;
+ font-size: 20rpx;
color: #F21A1C;
- line-height: 42rpx;
+ line-height: 32rpx;
text-align: left;
font-style: normal;
text-transform: none;
@@ -1145,13 +1192,13 @@
padding: 10rpx 25rpx 25rpx;
.goodsItem {
- width: 340rpx;
+ width: 345rpx;
border-radius: 8rpx;
overflow: hidden;
background-color: #ffffff;
- margin-bottom: 24rpx;
padding: 20rpx;
box-sizing: border-box;
+ margin: 0rpx 14rpx 20rpx 0;
.pic {
width: 100%;
@@ -1166,10 +1213,18 @@
}
.goodsInfo {
+ margin-bottom: 12rpx;
+
.title {
display: flex;
align-items: center;
- margin-top: 14rpx;
+ margin-top: 10rpx;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ overflow: hidden;
+ -webkit-line-clamp: 2;
+ line-height: 33rpx;
+ white-space: normal;
.ziying {
padding: 4rpx 10rpx;
@@ -1183,19 +1238,14 @@
}
.name {
- margin-left: 6rpx;
- color: #1E1E1E;
- flex: 1;
- font-weight: bold;
- font-size: 30rpx;
- flex: 1;
- display: -webkit-box;
- -webkit-box-orient: vertical;
- overflow: hidden;
- -webkit-line-clamp: 2;
- height: 90rpx;
- line-height: 45rpx;
-
+ font-family: PingFang SC, PingFang SC;
+ font-weight: 500;
+ font-size: 28rpx;
+ color: #2B2B2B;
+ line-height: 33rpx;
+ text-align: left;
+ font-style: normal;
+ text-transform: none;
}
}