From 6d54fb64df667c0c396fc7d74aeed9e096d95f95 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 11 九月 2024 10:36:50 +0800
Subject: [PATCH] Merge branch 'v2' of ssh://47.96.225.205:29418/hmy_farmer-main into v2
---
sub_pages/customer/trade/detail.vue | 132 +++++++++++++++++++++++++++++++++++---------
1 files changed, 105 insertions(+), 27 deletions(-)
diff --git a/sub_pages/customer/trade/detail.vue b/sub_pages/customer/trade/detail.vue
index e0db91c..32e7c41 100644
--- a/sub_pages/customer/trade/detail.vue
+++ b/sub_pages/customer/trade/detail.vue
@@ -9,17 +9,25 @@
<swiper-item v-if="dto.video">
<video :src="dto.video" class="top-img" :auto-pause-if-navigate="true"
style="display: block;margin: 0 auto;"></video>
-
+ <view class="index-tag">
+ 1/{{(dto.video&&1||0)+(dto.cover&&1||0)+(dto.bannerList&&dto.bannerList.length||0)}}
+ </view>
</swiper-item>
<swiper-item v-for="(url, index) in dto.bannerList" :key="index">
- <image class="top-img" :lazy-load="true" mode="scaleToFill" @click="previewImg(url)"
- :src="url">
+ <image class="top-img" :lazy-load="true" mode="scaleToFill" @click="previewImg(url)" :src="url">
</image>
+ <view class="index-tag">
+ {{index+1+(dto.video&&1)}}/{{(dto.video&&1||0)+(dto.cover&&1||0)+(dto.bannerList&&dto.bannerList.length||0)}}
+ </view>
</swiper-item>
<swiper-item>
- <image :src="dto.cover" :lazy-load="true" @click="previewImg(dto.cover)" class="top-img" mode="scaleToFill">
+ <image :src="dto.cover" :lazy-load="true" @click="previewImg(dto.cover)" class="top-img"
+ mode="scaleToFill">
</image>
+ <view class="index-tag">
+ {{(dto.bannerList&&dto.bannerList.length||0)+1+(dto.video&&1||0)}}/{{(dto.video&&1||0)+(dto.cover&&1||0)+(dto.bannerList&&dto.bannerList.length||0)}}
+ </view>
</swiper-item>
@@ -49,16 +57,41 @@
{{ dto.name || '-' }}
</view>
</view>
+
+ <view class="tags" v-if="dto.tags||false">
+ <!-- <view class="tag red">限时抢购</view> -->
+ <!-- <view class="tag green">品质严选</view> -->
+ <view class="tag red" v-for="(tag,k) of dto.tagArr" :class="[k===0?'red':'green']" :key="tag">{{
+ tag
+ }}
+ </view>
+ </view>
<view class="desc m-t-12">
- <view class="m-r-15">已售:{{ dto.sales || 0 }}</view>
+ <view class="m-r-15">已售:{{ ((dto.sales||0) +(dto.realSales||0)) || 0 }}</view>
<view class="m-r-15">剩余:{{ dto.stock || 0 }}</view>
<view class=" ">{{ dto.unit || '-' }}</view>
</view>
- <view class="flex m-t-12">
- <view class="price m-r-a">
- <span class="num">{{ dto.price || '-' }}</span>
- 元/扎
- </view>
+ <view class="flex m-t-12">
+ <!-- #ifdef PUB_CUSTOMER_DEV -->
+ <view>
+ <view class="price m-r-a component-price-new">
+ <span class="tip">会员价</span><span class="num p">{{ dto.priceMember || dto.price || '-' }}</span>
+ 元/扎
+ </view>
+ <view class="price m-r-a component-price-old">
+ <span class="num">{{ dto.price || '-' }}</span>
+ 元/扎
+ </view>
+ </view>
+ <!-- #endif -->
+ <!-- #ifndef PUB_CUSTOMER_DEV -->
+ <view class="price m-r-a">
+ <span class="num">{{ dto.price || '-' }}</span>
+ 元/扎
+ </view>
+ <!-- #endif -->
+
+
<view class="m-l-a m-r-15">
<button open-type="contact" class="component-button-contact">
<image src="../../../static/common/icon-kf.png" class="icon-kf m-l-15 img100"></image>
@@ -86,7 +119,7 @@
</view>
<view class="info-detail" v-if="dto.params">
<view class="title-before-blue" style="padding-top: 0rpx;padding-bottom: 0rpx;">详情</view>
- <view class="flex m-t-8" v-for="(param,index) of dto.params" :key="index">
+ <view class="flex flex-wrap-normal m-t-8" v-for="(param,index) of dto.params" :key="index">
<view class="label">{{ param.name}}：</view>
<view class="value">{{ param.value || '-'}}</view>
</view>
@@ -202,7 +235,7 @@
}
this.refreshShopNum()
},
- onLoad(options) {
+ async onLoad(options) {
console.log('trade detail options', options)
this.id = options.id || ''
@@ -212,22 +245,24 @@
let tmp = this
tmp.sharePartnerUserId = options.partnerUserId
//合伙人绑定的，判断当前用户，是否有登录,登录没绑定，没登录先缓存合伙人id，等注册和登录时候再弄
- setTimeout(() => {
- //并且当前用户没有绑定
- if (tmp.currentInfo.id && tmp.currentInfo.customerDTO.partnerId) {
- return
- }
- if (tmp.currentInfo.id) {
- tmp.bindPartnerUser(options.partnerUserId, '')
- } else {
- tmp.sharePartnerUserId = options.partnerUserId
- //没有登录到话设置到缓存
- if (tmp.sharePartnerUserId) {
- tmp.$storage.setItem('cache_sharePartnerUserId', tmp.sharePartnerUserId)
- }
- }
+ // setTimeout(() => {
+ //并且当前用户没有绑定
+ if (tmp.currentInfo.id && tmp.currentInfo.customerDTO.partnerId) {
+
+ }else{
+ if (tmp.currentInfo.id) {
+ await tmp.bindPartnerUser(options.partnerUserId, '')
+ } else {
+ tmp.sharePartnerUserId = options.partnerUserId
+ //没有登录到话设置到缓存
+ if (tmp.sharePartnerUserId) {
+ tmp.$storage.setItem('cache_sharePartnerUserId', tmp.sharePartnerUserId)
+ }
+ }
+ }
+
- }, 1000)
+ // }, 1000)
}
// #endif
if (this.id) {
@@ -441,6 +476,11 @@
if (!this.dto.bannerList) {
this.dto.bannerList = []
}
+ if (this.dto.tags) {
+ this.dto.tagArr = this.dto.tags.split(",") || []
+ } else {
+ this.dto.tagArr = []
+ }
}
this.$message.hideLoading()
@@ -529,6 +569,19 @@
swiper-item {
background-color: #fff;
border-radius: 8rpx;
+ position: relative;
+
+ .index-tag {
+ position: absolute;
+ color: #fff;
+ font-size: 22rpx;
+ right: 10rpx;
+ bottom: 10rpx;
+ padding: 10rpx 20rpx;
+ text-align: center;
+ background-color: #545454;
+ border-radius: 30rpx;
+ }
}
}
@@ -551,6 +604,31 @@
padding: 46rpx 30rpx;
border-radius: 40rpx 40rpx 0rpx 0rpx;
+ .tags {
+ margin-top: 12rpx;
+ display: flex;
+
+ .tag {
+ // min-width: 60rpx;
+ padding-left: 10rpx;
+ padding-right: 10rpx;
+ line-height: 30rpx;
+ background: #FEE6E6;
+ border-radius: 10rpx;
+ font-size: 18rpx;
+ color: #CD1212;
+ margin-right: 6rpx;
+ text-align: center;
+ }
+
+ .tag.green {
+ color: rgba(110, 159, 102, 1);
+ background: rgba(202, 229, 214, 1);
+ border-radius: 10rpx;
+ // opacity: 0.57;
+ }
+ }
+
.title {
font-weight: 600;
font-size: 36rpx;
--
Gitblit v1.9.3