|
|
|
|
@ -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; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
fanfan
11 months ago