拼团问题修复

common/api/market/package.js

@@ -0,0 +1,46 @@
+// 引入 request 文件
+import request from '@/common/api/request.js'
+import {prveUrl} from './config.js'
+
+export const package = (data) => {
+    return request({
+        url: prveUrl + '/user/package',
+        method: 'get',
+        data: data
+    })
+}
+
+
+export const order = (data) => {
+    return request({
+        url: prveUrl + '/user/package/order',
+        method: 'get',
+        data: data
+    })
+}
+
+
+export const cancel = (data) => {
+    return request({
+        url: prveUrl + '/user/package/cancel',
+        method: 'get',
+        data: data
+    })
+}
+
+export const help = (data) => {
+    return request({
+        url: prveUrl + '/user/package/help',
+        method: 'get',
+        data: data
+    })
+}
+
+export const orderDetail = (data) => {
+    return request({
+        url: prveUrl + '/user/package/order/detail',
+        method: 'get',
+        data: data
+    })
+}
+

groupBuying/detail/index.vue

@@ -2,12 +2,12 @@
 	<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"
-				@leftClick="uni.navigateBack()" title-color="#fff"></up-navbar>
+				@leftClick="back('/groupBuying/index/index')" title-color="#fff"></up-navbar>
 			<view class="u-flex info u-col-center">
 			</view>
 		</view>
 		<view class="bottom">
-			<view class="time" v-if="item.status=='待成团'">
+			<view class="time" v-if="item.status=='待成团'||item.wareGroupStatus=='ing'">
 				<text class="color-666">剩余成团时间：</text>
 				<view class="u-font-32">
 					<text class="number">{{returnNum(0)}}</text>
@@ -25,34 +25,40 @@
 							<image :src="imgs.pin" class="pin" mode=""></image>
 							<text class="">{{item.groupPeopleNum}}人团</text>
 						</view>
-						<statusVue :status="item.status"></statusVue>
+						<template v-if="item.id">
+							<statusVue :status="item.wareGroupStatus=='ing'?'待成团': item.status"></statusVue>
+						</template>
+						<template v-else>
+							<statusVue v-if="item.wareGroupStatus=='ing'" status="待成团"></statusVue>
+							<view v-else></view>
+						</template>
 
 					</view>
 					<view class="u-m-t-16 u-flex u-col-center">
 						<view style="width: 356rpx;">
-							<view class="font-bold" v-if="item.wareJson">{{item.wareJson
+							<view class="font-bold" v-if="item&&item.wareJson">{{item.wareJson
 .wareName}}</view>
 							<view class="u-flex u-m-t-10 u-col-center ">
 								<view class="price">
 									<text class="u-font-30">¥</text>
-									<text class="u-font-48 font-bold">{{item.payAmount}} </text>
+									<text class="u-font-48 font-bold">{{item.wareGroupPrice}} </text>
 								</view>
 								<view class="old-price u-m-l-32">
 									<text>¥</text>
-									<text>{{item.payAmount}} </text>
+									<text>{{item.wareOriginalPrice}} </text>
 								</view>
 							</view>
 						</view>
-						<view class="u-p-l-16 color-333">
+						<view class="u-p-l-16 color-333 no-wrap" v-if="item.id">
 							数量：{{item.num}}
 						</view>
 					</view>
 				</view>
 			</view>
 
-			<view class="refund" v-if="item.status=='待退款'">已申请退款，需等待商家审核</view>
+			<view class="refund" v-if="item.status=='退款中'">已申请退款，需等待商家审核</view>
-			<view class="shop-box" v-if="item.status=='待核销'">
+			<view class="shop-box" >
-				<view class="u-flex u-row-center u-flex-col u-col-center">
+				<view class="u-flex u-row-center u-flex-col u-col-center" v-if="item.status=='待核销'||item.status=='退款中'">
 					<up-qrcode :val="item.verifyCode" :size="104"></up-qrcode>
 					<view class="u-flex u-m-t-22 u-m-b-18 u-col-center">
 						<text>{{item.verifyCode}}</text>
@@ -74,7 +80,7 @@
 			</view>
 
 			<view class="members">
-				<view class="list">
+				<view class="list"  v-if="item.users&&item.users.length">
 					<view class="item" v-for="(user,index) in item.users" :key="index">
 						<view class="box">
 							<view class="u-flex  relative">
@@ -101,43 +107,52 @@
 						</view>
 					</view>
 				</view>
-				<view class="u-flex u-row-center" v-if="item.status=='待成团'&&!item.id">
+				<view class="u-flex u-row-center" v-if="item.wareGroupStatus=='ing'&&!item.id">
-					<view class="pin-btn">立即参与拼团</view>
+					<view class="pin-btn" @click="fastBuy">立即参与拼团</view>
 				</view>
 			</view>
+			<template v-if="item.id">
+				<view class="order">
+					<view class="u-flex u-row-between">
+						<view class="font-bold u-font-32">订单信息</view>
 
-			<view class="order">
+						<view class="u-flex color-666" @click="showOrder=!showOrder" style="align-items: baseline;">
-				<view class="u-flex u-row-between">
+							<text class="u-m-r-18">{{showOrder?'收起':'展开'}}</text>
-					<view class="font-bold u-font-32">订单信息</view>
+							<view class="guodu" :class="{rotate:!showOrder}">
-
+								<up-icon name="arrow-down" bold></up-icon>
-					<view class="u-flex color-666" @click="showOrder=!showOrder" style="align-items: baseline;">
+							</view>
-						<text class="u-m-r-18">{{showOrder?'收起':'展开'}}</text>
+						</view>
-						<view class="guodu" :class="{rotate:!showOrder}">
+					</view>
-							<up-icon name="arrow-down" bold></up-icon>
+					<view class="u-m-t-16" v-if="showOrder">
+						<view class="u-flex u-row-between item">
+							<view class="color-666">商品总额</view>
+							<view class="">¥{{item.payAmount}}</view>
+						</view>
+						<view class="u-flex u-row-between item">
+							<view class="color-666">实付金额</view>
+							<view class="">¥{{item.payAmount}}</view>
+						</view>
+						<view class="u-flex u-row-between item">
+							<view class="color-666">订单号</view>
+							<view class="">{{item.orderNo}}</view>
+						</view>
+						<view class="u-flex u-row-between item">
+							<view class="color-666">支付时间</view>
+							<view class="">{{item.payTime}}</view>
+						</view>
+						<view class="u-flex u-row-between item" v-if="item.groupEndTime&&item.status=='待核销'">
+							<view class="color-666">成团时间</view>
+							<view class="">{{item.groupEndTime}}</view>
+						</view>
+						<view class="u-flex u-row-between item" v-if="item.verifyTime">
+							<view class="color-666">核销时间</view>
+							<view class="">{{item.verifyTime}}</view>
 						</view>
 					</view>
-				</view>
 
-				<view class="u-m-t-16" v-if="showOrder">
-					<view class="u-flex u-row-between item">
-						<view class="color-666">商品总额</view>
-						<view class="">¥99.99</view>
-					</view>
-					<view class="u-flex u-row-between item">
-						<view class="color-666">实付金额</view>
-						<view class="">¥{{item.payAmount}}</view>
-					</view>
-					<view class="u-flex u-row-between item">
-						<view class="color-666">订单号</view>
-						<view class="">{{item.orderNo}}</view>
-					</view>
-					<view class="u-flex u-row-between item">
-						<view class="color-666">支付时间</view>
-						<view class="">{{item.payTime}}</view>
-					</view>
 				</view>
+			</template>
 
-			</view>
 		</view>
 		<view style="height: 100px;"></view>
 		<view class="btns" v-if="item.id">
@@ -148,14 +163,67 @@
 			<template v-if="item.status=='待核销'">
 				<view class="btn" @click="refund(item)" v-if="canRefund(item)">申请退款</view>
 			</template>
-			<template v-if="item.status=='待退款'">
+			<template v-if="item.status=='退款中'">
 				<view class="btn" @click="cancelRefund(item)">取消退款</view>
 			</template>
 		</view>
+
+
+
+
+		<!-- 需要支付的弹窗 -->
+		<up-popup :show="popupData.show" mode="bottom" closeOnClickOverlay @close="popupData.show = false">
+			<view class="popup-content">
+				<view class="popup-content-top u-flex u-row-right">
+					<up-icon name="close" bold="" @click="popupData.show = false"></up-icon>
+				</view>
+				<view class="goods-info" v-if="item&&item.wareJson">
+					<view class="u-flex">
+						<image class="cover" :src="item.goodsImg"></image>
+						<view class="u-flex u-flex-1 u-row-between u-p-l-16 u-col-center">
+							<view style="max-width: 340rpx;">
+								<view class="u-font-32 font-bold" v-if="item && item.wareJson">{{item.wareJson.wareName}}</view>
+
+								<view class="u-m-t-12 color-666 u-line-2">{{item.wareJson.wareDetail}}</view>
+							</view>
+							<view>
+								<view class="price">¥{{item.wareGroupPrice}}</view>
+								<view class="old-price">¥{{item.wareOriginalPrice}}</view>
+								<view class="limitBuyNum" v-if="item.wareJson.limitBuyNum">
+									限购{{item.wareJson.limitBuyNum}} </view>
+							</view>
+						</view>
+					</view>
+
+				</view>
+
+				<view class="popup-content-bottom   u-flex u-row-between u-col-center">
+					<view class="u-flex u-col-baseline">
+						<text class="color-666">合计：</text>
+						<text class=" price">{{totalPrice}}</text>
+					</view>
+					<view class="u-flex">
+						<up-icon name="minus-circle" size="20" color="#666" @click="changeNumber('-')"></up-icon>
+						<text class="u-m-l-20 u-m-r-20">{{number}}</text>
+						<up-icon name="plus-circle-fill" size="20" color="#ED5A2E" @click="changeNumber('+')"></up-icon>
+					</view>
+
+				</view>
+
+				<view class="u-m-t-42 u-flex u-row-center">
+					<view class="btn" @click="payExchange">去支付</view>
+				</view>
+			</view>
+		</up-popup>
+		<!-- 兑换确认弹窗end -->
+
 	</view>
 </template>
 
 <script setup>
+	import {
+		back
+	} from '@/utils/uniapp.js'
 	import statusVue from '@/groupBuying/components/status.vue'
 	import * as Api from '@/common/api/order/gbOrder.js'
 	import {
@@ -173,6 +241,68 @@
 		bg: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/1/d21f2dfd7bec44618f2d5e4b88372b08.png',
 		pin: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/2/3947892924dd481782331513aff00eb3.png'
 	}
+	const popupData = reactive({
+		show: false,
+		item: null
+	});
+
+	const number = ref(1)
+
+	import {
+		BigNumber
+	} from "bignumber.js";
+	const totalPrice = computed(() => {
+		if (!item.wareGroupPrice) {
+			return 0;
+		}
+		return BigNumber(number.value).times(item.wareGroupPrice).toNumber()
+	})
+
+	function changeNumber(step) {
+		if (step === '-') {
+			if (number.value == 1) {
+				return
+			}
+			number.value--
+			return
+		}
+		if (step === '+') {
+			if (item.wareJson.limitBuyNum == -10086) {
+				number.value++
+				return
+			}
+			if (number.value >= item.wareJson.limitBuyNum) {
+				return uni.showToast({
+					title: '最多可购买' + item.wareJson.limitBuyNum + '份',
+					icon: 'none'
+				})
+			}
+			number.value++
+			return
+		}
+	}
+
+	function fastBuy() {
+		popupData.show = true
+	}
+
+	async function payExchange() {
+		uni.setStorageSync('group_buying_order', {
+			...item,
+			...item.wareJson,
+			number: number.value,
+			id:item.wareId||'',
+			originalPrice:item.wareOriginalPrice,
+			groupPrice:item.wareGroupPrice,
+			wareImgs:item.wareJson.wareImgs.join(','),
+			groupOrderNo: item.groupOrderNo||'',
+		})
+		uni.navigateTo({
+			url: '/groupBuying/confirm-order/confirm-order'
+		})
+
+	}
+
 
 
 	const canRefundStatus = ['待成团', '待核销']
@@ -223,6 +353,19 @@
 			res.goodsImg = wareJson.wareImgs[0];
 			Object.assign(item, res)
 			console.log('item', item)
+			if(!item.id&& item.wareGroupStatus!='ing'){
+				uni.showModal({
+					title:'提示',
+					content:'拼团已结束',
+					showCancel:false,
+					success() {
+						uni.redirectTo({
+							url:'/groupBuying/index/index',
+						})
+					}
+				})
+				return 
+			}
 		})
 	}
 	onLoad(init)
@@ -331,6 +474,7 @@
 		transform: translateY(-160rpx);
 		border-radius: 16rpx;
 		overflow: hidden;
+
 		.time {
 			padding: 18rpx 24rpx;
 			background: #FFF4E2;
@@ -355,7 +499,7 @@
 
 		.goods {
 			background-color: #fff;
-			padding: 22rpx 24rpx ;
+			padding: 22rpx 24rpx;
 
 			.pin {
 				width: 60rpx;
@@ -376,6 +520,7 @@
 
 			.old-price {
 				color: #666666;
+				text-decoration: line-through;
 			}
 		}
 
@@ -536,4 +681,73 @@
 		font-weight: 700;
 		margin-bottom: 32rpx;
 	}
+	
+	.popup-content {
+		font-size: 28rpx;
+		min-height: 300px;
+	
+		.popup-content-top {
+			padding: 32rpx 28rpx;
+			border-bottom: 1px solid #ededed;
+		}
+	
+		.goods-info {
+			padding: 32rpx 28rpx;
+			border-bottom: 1px solid #ededed;
+	
+			.cover {
+				width: 184rpx;
+				height: 184rpx;
+				border-radius: 16rpx;
+				background: #d9d9d9;
+	
+				&.bg-fff {
+					background-color: #fff;
+				}
+			}
+	
+			.price {
+				font-size: 32rpx;
+				font-weight: 700;
+				color: #ed5a2e;
+				line-height: 46rpx;
+			}
+	
+			.old-price {
+				font-size: 32rpx;
+				color: #999;
+				text-decoration-line: line-through;
+				line-height: 48rpx;
+			}
+	
+			.limitBuyNum {
+				color: #666;
+				line-height: 42rpx;
+			}
+	
+		}
+	
+		.popup-content-bottom {
+			padding: 20rpx;
+			border-bottom: 1px solid #ededed;
+	
+			.price {
+				color: #ed5a2e;
+				font-size: 32rpx;
+				font-weight: 700;
+			}
+		}
+	
+		.btn {
+			display: flex;
+			padding: 22rpx 214rpx;
+			align-items: flex-start;
+			gap: 20rpx;
+			border-radius: 66rpx;
+			background: #e8ad7b;
+			font-size: 32rpx;
+			color: #fff;
+			font-size: 700;
+		}
+	}
 </style>

groupBuying/goodsDetail/goodsDetail.vue

@@ -58,18 +58,8 @@
 		</template>
 
 
-		<view class="bg-f7" style="height: 32rpx"></view>
 
-		<view class="desc">
+		
-			<view class="u-flex">
-				<view class="color-666 no-wrap" style="min-width: 180rpx;">可核销门店：</view>
-				<view class="">这里是店铺名称</view>
-			</view>
-			<view class="u-flex u-m-t-16 u-col-baseline">
-				<view class="color-666 no-wrap" style="min-width: 180rpx;">门店地址：</view>
-				<view class="">站前北街7号附近</view>
-			</view>
-		</view>
 
 		<view class="bg-f7" style="height: 24rpx"></view>
 
@@ -481,6 +471,7 @@
 			color: #E7E7E7;
 			opacity: .85;
 			font-weight: 700;
+			text-decoration: line-through;
 		}
 
 		.text {

groupBuying/index/index.vue

@@ -2,8 +2,8 @@
 	<view class="min-page bg-f7 u-font-28">
 		<up-sticky :offsetTop="0" :customNavHeight="0">
 			<view class="top" :style="topStyle">
-				<up-navbar bg-color="transparent" :fixed="false" :placeholder="false" title="拼团特惠" @leftClick="uni.navigateBack()"
+				<up-navbar bg-color="transparent" :fixed="false" :placeholder="false" title="拼团特惠"
-					left-icon-color="#fff" title-color="#fff"></up-navbar>
+					@leftClick="back()" left-icon-color="#fff" title-color="#fff"></up-navbar>
 				<view class="u-flex info u-col-center">
 					<image :src="imgs.map" class="map"></image>
 					<view class="u-line-1 u-m-l-20">{{shopInfo.shopName||''}}</view>
@@ -80,7 +80,7 @@
 		<view class="orders" v-else-if="tabs.sel==1">
 			<view class="item" v-for="(item,index) in list" :key="index" @click="toOrderDetail(item)">
 				<view class="u-flex u-col-center u-row-between">
-					<text class="numbers">{{1}}人团</text>
+					<text class="numbers">{{item.groupPeopleNum}}人团</text>
 					<statusVue :status="item.status"></statusVue>
 				</view>
 				<view class="u-m-t-32 u-flex">
@@ -114,9 +114,12 @@
 						<view class="btn " @click.stop="lookCode(item)">查看券码</view>
 						<button class="btn black" @click.stop="refund(item)">申请退款</button>
 					</template>
+					<template v-else-if="item.status=='退款中'">
+						<view class="btn " @click.stop="lookCode(item)">查看券码</view>
+						<view class="btn black" @click.stop="cancelRefund(item)">取消退款</view>
+					</template>
 					<template v-else>
 						<view class="btn " @click.stop="refund(item)" v-if="canRefund(item)">申请退款</view>
-						<view class="btn " @click.stop="cancelRefund(item)" v-if="item.status=='退款中'">取消退款</view>
 						<button open-type="share" class="btn black" @click.stop="share(item)"
 							v-if="showShare(item)">邀请好友</button>
 					</template>
@@ -126,13 +129,14 @@
 
 		</view>
 
-		
+
-		
+
 		<LookQrcode v-model="modalData.show" :qrcode="qrcode"></LookQrcode>
 	</view>
 </template>
 
 <script setup>
+	import {back} from '@/utils/uniapp.js'
 	import LookQrcode from "@/components/look-qrcode/look-qrcode.vue";
 	import {
 		wxShare
@@ -399,7 +403,7 @@
 			query,
 		})
 	})
-	onLoad(getData)
+	onShow(getData)
 
 
 	let timer = null

groupBuying/success/index.vue

@@ -40,11 +40,11 @@
 									<view class="u-flex u-m-t-10 u-col-center ">
 										<view class="price">
 											<text class="u-font-30">¥</text>
-											<text class="u-font-48 font-bold">{{item.payAmount}} </text>
+											<text class="u-font-48 font-bold">{{item.wareGroupPrice}} </text>
 										</view>
 										<view class="old-price u-m-l-32">
 											<text>¥</text>
-											<text>{{item.payAmount}} </text>
+											<text>{{item.wareOriginalPrice}} </text>
 										</view>
 									</view>
 								</view>
@@ -107,7 +107,7 @@
 					<view class="u-m-t-16" v-if="showOrder">
 						<view class="u-flex u-row-between item">
 							<view class="color-666">商品总额</view>
-							<view class="">¥99.99</view>
+							<view class="">¥{{item.payAmount}}</view>
 						</view>
 						<view class="u-flex u-row-between item">
 							<view class="color-666">实付金额</view>
@@ -136,7 +136,7 @@
 		<template v-if="item.status=='待成团'">
 			<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="订单详情"
+					<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>
@@ -170,11 +170,11 @@
 									<view class="u-flex u-m-t-10 u-col-center ">
 										<view class="price">
 											<text class="u-font-30">¥</text>
-											<text class="u-font-48 font-bold">{{item.payAmount}} </text>
+											<text class="u-font-48 font-bold">{{item.wareGroupPrice}} </text>
 										</view>
 										<view class="old-price u-m-l-32">
 											<text>¥</text>
-											<text>{{item.payAmount}} </text>
+											<text>{{item.wareOriginalPrice}} </text>
 										</view>
 									</view>
 								</view>
@@ -249,7 +249,7 @@
 						<view class="u-m-t-16" v-if="showOrder">
 							<view class="u-flex u-row-between item">
 								<view class="color-666">商品总额</view>
-								<view class="">¥99.99</view>
+								<view class="">¥{{item.payAmount}}</view>
 							</view>
 							<view class="u-flex u-row-between item">
 								<view class="color-666">实付金额</view>

pages.json

@@ -397,6 +397,19 @@
 					}
 				}
 
+			]
+		},
+		{
+			"root": "userPackage",
+			"pages": [
+				{
+					"path": "index/index",
+					"style": {
+						"navigationBarTitleText": "taocan1tuig1",
+						"navigationStyle": "custom"
+					}
+				}
+				
 			]
 		}
 	],

pages/index/indexs.vue

@@ -68,6 +68,14 @@
 			</view>
 			<image class="img" :src="imgs.points"></image>
 		</view>
+		
+		<view class="points taocan" @click="toTaocan" >
+			<view>
+				<view class="title">套餐推广</view>
+				<view class="desc">邀好友助力，套餐更优惠</view>
+			</view>
+			<image class="img" :src="imgs.taocan"></image>
+		</view>
 
 		<view class="bottom_menus">
 			<view class="item" @click="tomember">
@@ -130,7 +138,8 @@ const imgs = {
 	groupBuying: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/117745e0f3db48b489f9d4e5c5967043.png',
 	points: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/df0758f7b86449f89f882e50226e17c7.png',
 	code: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/044dcaf913054f03a9db7983f048b1e6.png',
-	defaultAvatar: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/b98d2c7110e847f996e8d7ba4342f0a5.png'
+	defaultAvatar: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/b98d2c7110e847f996e8d7ba4342f0a5.png',
+	taocan:'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/1eb9aa9b865b47b39ab9d7ac404601a9.png'
 };
 // 定义接收的属性
 const props = defineProps({
@@ -184,6 +193,10 @@ async function scanOrderHandle() {
 	await store.scanCodeactions();
 }
 
+function toTaocan(){
+	
+}
+
 const memberindex = (url) => {
 	uni.pro.navigateTo(url, {
 		shopId: uni.cache.get('shopId'),
@@ -576,6 +589,13 @@ page {
 	}
 }
 
+.taocan{
+	.img {
+		width: 117px;
+		height: 117px;
+	}
+}
+
 .bottom_menus {
 	display: flex;
 	gap: 14rpx;

userPackage/index/index.vue

@@ -0,0 +1,13 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script setup>
+	
+</script>
+
+<style>
+	       
+</style>

utils/uniapp.js

@@ -1,12 +1,13 @@
-export const back = () => {
+export const back = (url) => {
 	console.log('调用返回方法back');
 	try {
 		const arr = getCurrentPages()
 		if (arr.length >= 2) {
 			return uni.navigateBack()
 		} else {
+			
 			uni.reLaunch({
-				url: '/pages/index/index'
+				url: url?url:'/pages/index/index'
 			})
 		}
 	} catch (error) {