拼团修改

groupBuying/detail/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="min-page bg-f7 color-333 u-font-28 relative">
 		<view class="top" :style="topStyle">
-			<up-navbar bg-color="transparent" :fixed="false" :placeholder="false" title="订单详情" left-icon-color="#fff"
+			<up-navbar bg-color="transparent" :fixed="false" :placeholder="false" title="订单详情" left-icon-color="#fff"  @leftClick="uni.navigateBack()"
 				title-color="#fff"></up-navbar>
 			<view class="u-flex info u-col-center">
 			</view>
@@ -184,8 +184,16 @@
 	})
 
 	function init(opt) {
+		// 获取小程序进入场景和参数
+		const launchOptions = uni.getLaunchOptionsSync();
+		console.log(launchOptions);
+		// 获取链接上的参数
+		const launchOptionsQuery = launchOptions.query;
+		console.log('launchOptionsQuery', launchOptionsQuery);
+		Object.assign(query, launchOptionsQuery)
 		console.log(opt)
 		Object.assign(query, opt)
+		console.log(query)
 		getDetail()
 	}
 	const item = reactive({})

groupBuying/goodsDetail/goodsDetail.vue

@@ -33,6 +33,7 @@
 			</view>
 		</view>
 
+		<template v-if="item.gbOrderList.length">
 			<view class="bg-f7" style="height: 32rpx"></view>
 			<view class="groups">
 				<view class="color-000 u-m-b-28 u-font-32 font-700">立即拼团</view>
@@ -54,6 +55,8 @@
 
 				</view>
 			</view>
+		</template>
+
 
 		<view class="bg-f7" style="height: 32rpx"></view>
 
@@ -196,7 +199,7 @@
 
 	const popupData = reactive({
 		show: false,
-		item:null
+		item: null
 	});
 
 	function exchangeClick() {
@@ -204,13 +207,13 @@
 
 	}
 
-	function fastBuy(item){
+	function fastBuy(item) {
-		popupData.item=item;
+		popupData.item = item;
 		popupData.show = true
 	}
-	watch(()=>popupData.show,(newval)=>{
+	watch(() => popupData.show, (newval) => {
-		if(!newval){
+		if (!newval) {
-			popupData.item=null
+			popupData.item = null
 		}
 	})
 
@@ -230,7 +233,7 @@
 				shopId: item.shopId,
 				number: 1,
 				price: item.extraPrice,
-				groupOrderNo:popupData.item?popupData.item.groupOrderNo:'',
+				groupOrderNo: popupData.item ? popupData.item.groupOrderNo : '',
 				openId
 			}).then(orderRes => {
 				popupData.show = false;
@@ -238,7 +241,8 @@
 					console.log(res)
 					if (res) {
 						uni.redirectTo({
-							url: '/groupBuying/success/index?detailId='+orderRes.goodsRecord.id
+							url: '/groupBuying/success/index?detailId=' + orderRes.goodsRecord
+								.id
 						})
 					} else {
 						uni.showToast({
@@ -327,20 +331,29 @@
 	const query = reactive({
 		shopId: '',
 		wareId: '',
+		groupOrderNo:''
 	})
 
 
 	const coverImgs = ref([])
 
 	function init(opt) {
+		// 获取小程序进入场景和参数
+		const launchOptions = uni.getLaunchOptionsSync();
+		console.log(launchOptions);
+		// 获取链接上的参数
+		const launchOptionsQuery = launchOptions.query;
+		console.log('launchOptionsQuery', launchOptionsQuery);
+		Object.assign(query, launchOptionsQuery)
 		console.log(opt)
 		Object.assign(query, opt)
+		console.log(query)
 		getDetail()
 	}
 
 	function getDetail() {
 		Api.wareDetail(query).then(res => {
-			res.wareCommentImgs = res.wareCommentImgs.split(',').filter(v=>v)
+			res.wareCommentImgs = res.wareCommentImgs.split(',').filter(v => v)
 			Object.assign(item, res)
 			console.log(item)
 			coverImgs.value = res.wareImgs.split(',')
@@ -386,11 +399,11 @@
 	}
 
 
-	let timer=null
+	let timer = null
-	let nowTime=ref(Date.now())
+	let nowTime = ref(Date.now())
-	timer=setInterval(()=>{
+	timer = setInterval(() => {
-		nowTime.value=Date.now()
+		nowTime.value = Date.now()
-	},1000)
+	}, 1000)
 
 	// 组合使用：获取格式化后的剩余时间
 	function getRemainingHMS(item) {
@@ -400,8 +413,8 @@
 	}
 
 
-	function returnNeedPerpole(data){
+	function returnNeedPerpole(data) {
-		return data.groupPeopleNum-data.currentPeopleNum
+		return data.groupPeopleNum - data.currentPeopleNum
 	}
 
 
@@ -622,19 +635,23 @@
 		width: 100%;
 	}
 
-	.groups{
+	.groups {
 		padding: 28rpx 22rpx;
 		background-color: #fff;
-		.item{
+
+		.item {
 			padding: 28rpx 0;
 			border-bottom: 2rpx solid #EDEDED;
-			&:last-child{
+
+			&:last-child {
 				border-bottom: none;
 			}
-			.main-color{
+
+			.main-color {
 				color: #ed5a2e;
 			}
-			.btn{
+
+			.btn {
 				padding: 8rpx 26rpx;
 				border-radius: 36rpx;
 				background: #E8AD7B;

groupBuying/index/index.vue

@@ -352,12 +352,13 @@
 
 	onShareAppMessage(() => {
 		console.log('onShareAppMessage')
-
+		console.log(shareItem)
+		const query=`groupOrderNo=${shareItem.groupOrderNo}&shopId=${shareItem.shopId}`
 		return wxShare({
 			title: shareItem.wareJson.wareName,
 			imageUrl: shareItem.goodsImg,
-			path:'/groupBuying/goodsDetail/goodsDetail',
+			path:'/groupBuying/detail/index' +'?'+query,
-			query: `wareId=${shareItem.wareId}&shopId=${shareItem.shopId}`,
+			query,
 		})
 	})
 	onLoad(getData)