From a587937ce53f79b4680e930b5d5f7fee33de5311 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 14 八月 2024 14:50:40 +0800
Subject: [PATCH] 标签

---
 sub_pages/customer/trade/detail.vue |  293 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 258 insertions(+), 35 deletions(-)

diff --git a/sub_pages/customer/trade/detail.vue b/sub_pages/customer/trade/detail.vue
index 1748d7e..97e4269 100644
--- a/sub_pages/customer/trade/detail.vue
+++ b/sub_pages/customer/trade/detail.vue
@@ -1,15 +1,47 @@
 <template>
 	<view class="trade-detail">
 		<view class="top-img-container">
-			<image :src="dto.cover" class="top-img" mode="aspectFill"></image>
+
+			<!-- <image :src="dto.cover" class="top-img" mode="aspectFill"></image> -->
+			<uni-swiper-dot class="uni-swiper-dot-box" :mode="'dot'" field="content">
+				<swiper class="swiper-box" :interval="10000" :circular="true" :current="0" :autoplay="true">
+
+					<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>
+						<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>
+						<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>
+
+
+				</swiper>
+			</uni-swiper-dot>
+
+
+
+
 			<view class="icon-container">
 				<image v-if="!dto.collection" src="../../../static/common/icon-sc.png" @click="collectItem(dto)"
 					class="icon-sc"></image>
 				<image v-if="dto.collection" src="../../../static/common/icon-sc-fill.png" @click="collectItem(dto)"
 					class="icon-sc"></image>
-
-
-				<!--        <view class="num">12</view>-->
 			</view>
 			<view class="icon-container">
 				<image src="../../../static/common/icon-shop.png" @click="toShopping(dto)" class="icon-shop">
@@ -36,7 +68,10 @@
 					元/扎
 				</view>
 				<view class="m-l-a m-r-15">
-					<image src="../../../static/common/icon-kf.png" class="icon-kf m-l-15 img100"></image>
+					<button open-type="contact" class="component-button-contact">
+						<image src="../../../static/common/icon-kf.png" class="icon-kf m-l-15 img100"></image>
+
+					</button>
 
 				</view>
 				<view class="m-r-0 gwc" @click="submitShopping(dto)" v-if="!dto.shopnum">
@@ -68,14 +103,6 @@
 					<view class="label">暂无</view>
 				</view>
 			</view>
-			<!--      <view class="flex m-t-8">
-			<!--        <view class="label">枝粗:</view>-->
-			<!--        <view class="value">中等粗细</view>-->
-			<!--      </view>-->
-			<!--      <view class="flex m-t-8">-->
-			<!--        <view class="label">均匀度:</view>-->
-			<!--        <view class="value">1-2支不均匀</view>-->
-			<!--      </view>-->
 		</view>
 		<view class="line">
 
@@ -92,6 +119,34 @@
 				<view class="store-to m-l-a m-r-0">进入店铺</view>
 			</view>
 		</view>
+
+		<!-- 		<view class="line" v-if="dto.bannerList&&dto.bannerList.length>0">
+
+		</view>
+		<uni-swiper-dot class="uni-swiper-dot-box" :mode="'dot'" field="content"
+			v-if="dto.bannerList&&dto.bannerList.length>0">
+			<swiper class="swiper-box" :interval="10000" :circular="true" :current="0" :autoplay="true">
+				<swiper-item v-for="(url, index) in dto.bannerList" :key="index">
+					<view class="swiper-item" :class="'swiper-item' + index">
+						<image class="home-banner-image m-auto m-t-12 m-b-12" style="display: block;" mode="scaleToFill"
+							@click="previewImg(url)" :src="url">
+						</image>
+					</view>
+				</swiper-item>
+			</swiper>
+		</uni-swiper-dot> -->
+
+		<!-- 	<view class="line" v-if="dto.video">
+
+		</view>
+		<view class="info-brand m-t-12" v-if="dto.video">
+			<video :src="dto.video" :auto-pause-if-navigate="true" style="display: block;margin: 0 auto;"></video>
+
+		</view> -->
+
+
+
+
 		<view class="m-t-20 shop-recommend-container" v-if="false">
 			<view class="shop-recommend-title">店铺推荐</view>
 			<view class="flex">
@@ -146,6 +201,7 @@
 				id: '',
 				dto: {},
 				shopnum: 0,
+				sharePartnerUserId: '',
 			}
 		},
 		onShow() {
@@ -155,38 +211,102 @@
 			this.refreshShopNum()
 		},
 		onLoad(options) {
+			console.log('trade detail options', options)
 			this.id = options.id || ''
+
+			// #ifdef PUB_CUSTOMER
+
+			if (options.partnerUserId) {
+				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)
+						}
+					}
+
+				}, 1000)
+			}
+			// #endif
 			if (this.id) {
 				this.getDetail()
 			}
 			this.refreshShopNum()
+
 		},
 		// #ifdef PUB_CUSTOMER
 		onShareAppMessage() {
 			let that = this;
-			var name = that.currentInfo.customerDTO && currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
-				currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && currentInfo.partnerDTO.name || ''
-			var url =
-				`/sub_pages/customer/trade/detail?id=${this.id}&shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
-			return {
+			var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
+				that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || ''
+			//如果是合伙人的id,那么分享出去,需要附加id了
+			console.log('onShareAppMessage', this.currentInfo)
 
-				title: this.dto.id ? (this.dto.name + " " + (this.dto.price || '-') + '元/扎 ' + (this.dto.unit || '')) : "花满芫",
+			var partnerUserId = ''
+
+			if (that.currentInfo.customerDTO && that.currentInfo.customerDTO.partnerId) {
+				partnerUserId = that.currentInfo.customerDTO.partnerId
+			}
+			// if (that.currentInfo.partnerDTO && currentInfo.partnerDTO.id) {
+			// 	partnerUserId = this.currentInfo.id
+			// }
+			var url =
+				`/sub_pages/customer/trade/detail?partnerUserId=${partnerUserId}&id=${this.id}&shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
+			return {
+				// 
+				title: this.dto.id ? (this.dto.name + " " + (this.dto.price || '-') + '元/扎 ' + (this.dto.unit || '')) :
+					"花满芫",
 				path: url,
 			}
 		},
 		onShareTimeline() {
 			let that = this;
-			var name = that.currentInfo.customerDTO && currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
-				currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && currentInfo.partnerDTO.name || ''
+			var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
+				currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || ''
+			//如果是合伙人的id,那么分享出去,需要附加id了
+			var partnerUserId = ''
+
+			if (that.currentInfo.customerDTO && that.currentInfo.customerDTO.partnerId) {
+				partnerUserId = that.currentInfo.customerDTO.partnerId
+			}
 			var url =
-				`/sub_pages/customer/trade/detail?id=${this.id}&shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
+				`/sub_pages/customer/trade/detail?partnerUserId=${partnerUserId}&id=${this.id}&shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
 			return {
-				title: this.dto.id ? (this.dto.name + " " + (this.dto.price || '-') + '元/扎 ' + (this.dto.unit || '')) : "花满芫",
+				// 
+				title: this.dto.id ? (this.dto.name + " " + (this.dto.price || '-') + '元/扎 ' + (this.dto.unit || '')) :
+					"花满芫",
 				path: url,
 			}
 		},
 		// #endif
 		methods: {
+			async bindPartnerUser(userId, name) {
+				//调用接口绑定
+				this.$message.showLoading()
+				const {
+					code,
+					data
+				} = await this.$http.request('post', '/api/customer/bind/partner', {
+					data: {
+						partnerUserId: userId
+					}
+				})
+				this.$message.hideLoading()
+				if (code == 0) {
+					this.$message.showToast(`绑定合伙人${name}成功`)
+					await this.$store.dispatch('getCurrentInfo')
+				}
+			},
 			async updateItemNum(item) {
 				const res = await this.$message.confirm('', {
 					editable: true,
@@ -212,9 +332,9 @@
 			},
 			async addnum(item, addnum) {
 				if (!this.currentInfo.id) {
-					await this.$message.confirm('请前往登录')
+					// await this.$message.confirm('请前往登录')
 					uni.navigateTo({
-						url: '/pages/user/supplier-user'
+						url: `/pages/login/supplier-login?source=jump&sharePartnerUserId=${this.sharePartnerUserId}`
 					})
 					return
 				}
@@ -257,7 +377,10 @@
 			},
 			async collectItem(dto) {
 				if (!this.currentInfo.id) {
-					this.$message.showToast('请先登录')
+					// this.$message.showToast('请先登录')
+					uni.navigateTo({
+						url: `/pages/login/supplier-login?source=jump&sharePartnerUserId=${this.sharePartnerUserId}`
+					})
 					return
 				}
 				await this.$message.confirm(`是否${dto.collection?'移除':'添加到'}收藏`)
@@ -285,6 +408,13 @@
 			async submitShopping(dto) {
 				//提交到购物车中
 				// this.$message.showLoading()
+				if (!this.currentInfo.id) {
+					// this.$message.showToast('请先登录')
+					uni.navigateTo({
+						url: `/pages/login/supplier-login?source=jump&sharePartnerUserId=${this.sharePartnerUserId}`
+					})
+					return
+				}
 				const {
 					code,
 					data
@@ -298,18 +428,26 @@
 				}
 			},
 			async getDetail() {
+				var params = {
+					id: this.id,
+				}
+				if (this.sharePartnerUserId && !isNaN(parseInt(this.sharePartnerUserId))) {
+					params.partnerId = parseInt(this.sharePartnerUserId)
+				}
 				this.$message.showLoading()
 				const {
 					code,
 					data
 				} = await this.$http.request('get', '/api/customer/flower/list/view', {
-					params: {
-						id: this.id
-					}
+					params: params
 				})
 				if (code === 0) {
 					this.dto = {
+						bannerList: [],
 						...data,
+					}
+					if (!this.dto.bannerList) {
+						this.dto.bannerList = []
 					}
 				}
 
@@ -317,14 +455,69 @@
 
 			},
 			toShopping() {
-				uni.navigateTo({
-					url: '/sub_pages/customer/shopping/shopping'
-				})
+				if (!this.currentInfo.id) {
+					// this.$message.showToast('请先登录')
+					uni.navigateTo({
+						url: `/pages/login/supplier-login?source=jump&sharePartnerUserId=${this.sharePartnerUserId}`
+					})
+					return
+				}
+				//判断堆栈,如果是购物车,就直接返回
+				const pages = getCurrentPages();
+				//如果上一层就是购物车,那么就返回,而不是跳转
+				// console.log('toShopping',pages)
+				if (pages && pages.length >= 2) {
+					if (pages[pages.length - 2].route === "sub_pages/customer/shopping/shopping") {
+						uni.navigateBack()
+						return
+					}
+				}
+				if (pages.length >= 10) {
+					//直接强制购物车
+					uni.reLaunch({
+						url: '/sub_pages/customer/shopping/shopping'
+					})
+				} else {
+					uni.navigateTo({
+						url: '/sub_pages/customer/shopping/shopping'
+					})
+				}
+
 			},
 			openbrand() {
-				uni.navigateTo({
-					url: '/sub_pages/customer/shop/shop?id=' + (this.dto.id || '')
-				})
+				//也要判断一下是否重复进入
+				//判断堆栈,如果是店铺,就直接返回
+				//或者是:从商铺到列表再到详情,再到商铺,这种也不行
+				const pages = getCurrentPages();
+				console.log('toShopping', pages)
+				if (pages && pages.length >= 2) {
+					if (pages[pages.length - 2].route === "sub_pages/customer/shop/shop") {
+						uni.navigateBack()
+						return
+					}
+				}
+				if (pages && pages.length >= 3) {
+					if (pages[pages.length - 3].route === "sub_pages/customer/shop/shop" &&
+						pages[pages.length - 2].route === "sub_pages/customer/trade/list"
+					) {
+						uni.navigateBack({
+							delta: 2
+						})
+						return
+					}
+				}
+
+				if (pages.length >= 10) {
+					//直接强制购物车
+					uni.reLaunch({
+						url: '/sub_pages/customer/shop/shop?id=' + (this.dto.supplierId || '')
+					})
+				} else {
+					uni.navigateTo({
+						url: '/sub_pages/customer/shop/shop?id=' + (this.dto.supplierId || '')
+					})
+				}
+
 			}
 		}
 	}
@@ -333,6 +526,31 @@
 <style lang="scss" scoped>
 	.trade-detail {
 		background-color: #FFFFFF;
+
+		swiper {
+			height: 320rpx;
+		}
+
+		.swiper-box {
+			position: relative;
+
+			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;
+				}
+			}
+		}
 
 		.image-shop-number {
 			width: 30rpx;
@@ -514,6 +732,11 @@
 		.top-img-container {
 			position: relative;
 
+			swiper {
+				width: 750rpx;
+				height: 764rpx;
+			}
+
 			.top-img {
 				width: 750rpx;
 				height: 764rpx;

--
Gitblit v1.9.3