修改团购详情页面

api/home.js

@@ -114,7 +114,7 @@ export function postUserOrderRefund(data) {
 
 // 立即购买下单前置校验
 export function postOrderSubmit(data) {
-	return request.post("v1/re/order/submit",data);
+	return request.post("v1/order/submit",data);
 }
 
 // jspai下单API

api/order.js

@@ -359,3 +359,10 @@ export function refundOrderDetail(uni) {
 export function cancelRefundOrder(uni) {
 	return request.post('order/refund/cancel/' + uni);
 }
+
+/**
+ * 获取拼团下单数据
+ */
+export function getGroupOrderData(data) {
+	return request.post('/v1/order/groupon', data);
+}

pages/groupbuying_details/detail/index.vue

@@ -5,24 +5,24 @@
 
 			<view class="detail-img">
 				<image
-					src="https://lanhu-dds-backend.oss-cn-beijing.aliyuncs.com/merge_image/imgs/38e693de009644aa9de2dc6d6f7e747a_mergeImage.png"
+					:src="goodsInfo.goodsCover"
 					mode="scaleToFill" />
 			</view>
 			<view class="detail-content">
 				<view style="display:flex; 	margin-bottom: 20rpx;">
-					<text class="red"> ¥48.00</text>
-					<text class="line-thr">¥52.00</text>
+					<text class="red"> ¥{{goodsInfo.discountPrice}}</text>
+					<text class="line-thr">¥{{goodsInfo.salePrice}}</text>
 				</view>
 				<view class="detail-content-t">
-					宫中秘策（GOONGBE）进口儿童韩国进口儿童防晒霜80g
+					{{goodsInfo.goodsName}}
 				</view>
-				<view class='time '>
+<!-- 				<view class='time '>
 					<image src="http://www.gzzzyd.com/groupon/home_slices/编辑@2x.png" mode="scaleToFill" />
 					发布于：
 					<text class="imp_info">
 						1天20小时36分钟前
 					</text>
-				</view>
+				</view> -->
 			</view>
 
 			<view class="detail-info">
@@ -45,11 +45,11 @@
 
 			<view style="    margin-right: 30rpx;">
 				<view class="bnt acea-row">
-					<view class="buy-box" @submit="goBuy">
+					<view class="buy-box">
 						<button class="share-btn ">
 							分享有礼
 						</button>
-						<button class="now-btn ">
+						<button class="now-btn "  @submit="goBuy">
 							立即购买
 						</button>
 					</view>
@@ -79,6 +79,12 @@ import authorize from '@/components/Authorize';
 import colors from '@/mixins/color.js';
 
 export default {
+	props: {
+		goodsInfo: {
+			type: Object,
+			default: () => { }
+		}
+	},
 	components: {
 		// #ifdef APP-PLUS
 		appUpdate,
@@ -114,7 +120,7 @@ export default {
 				console.log(inf.version)
 				this.version = inf.version;
 			});
-			// #endif 
+			// #endif
 			this.setLang();
 		} else {
 			toLogin();

pages/groupbuying_details/index.vue

@@ -36,9 +36,22 @@
 						</view>
 
 						<view class="wrapper">
+
 							<view class="share acea-row row-between row-bottom">
+								<view class="box_3 flex-row justify-between">
+									<view class="text-group_11 flex-col"  @click="goToDetail(e.id)">
+										<view class="text-wrapper_4">
+											<text class="text_8">¥</text>
+											<text class="text_9">{{storeInfo.minPrice}}</text>
+											<text class="text_10">&nbsp;~</text>
+											<text class="text_8">¥</text>
+											<text class="text_9">{{storeInfo.maxPrice}}</text>
+										</view>
+										<text class="text_13">{{storeInfo.mainTitle}}</text>
+									</view>
+									<view class="iconfont icon-fenxiang skeleton-rect" @click="listenerActionSheet"></view>
+								</view>
 
-								<!-- <view class="iconfont icon-fenxiang skeleton-rect" @click="listenerActionSheet"></view> -->
 							</view>
 							<view class="introduce skeleton-rect" v-text="storeInfo.goodsName"></view>
 							<view class='info-area'>
@@ -69,69 +82,24 @@
 									<image src="http://www.gzzzyd.com/groupon/home_slices/倒计时@2x.png" mode="scaleToFill" />
 									<text class="yellow">截止倒计时</text>
 									<!-- <text class="red2">02时25分19秒</text> -->
-									<uni-countdown :show-day="false" :hour="12" :minute="12" :second="12"></uni-countdown>
+									<uni-countdown color="#B22338" :show-day="false" :show-colon="false" :hour="storeInfo.h" :minute="storeInfo.m" :second="storeInfo.s"></uni-countdown>
 								</view>
 							</view>
 
 							<view class="groupbuying-log" hover-class="none" hover-stop-propagation="false">
 								<view class="log-top">
 									<text class="log-top-title">团购记录</text>
-									<text class="log-top-count">共8条</text>
+									<text class="log-top-count">共{{storeInfo.grouponUserTotal}}条</text>
 								</view>
-								<view class="log-body">
-									<view class="log-item">
-										<image
-											src="https://lanhu-dds-backend.oss-cn-beijing.aliyuncs.com/merge_image/imgs/38e693de009644aa9de2dc6d6f7e747a_mergeImage.png"
-											mode="scaleToFill" />
-
-										<view class="log-item-content">
-											<view class="log-item-content-t">
-												2023-05-31 10:22:35 下单了
-											</view>
-											<view class="log-item-content-b">
-												宫中秘策（GOONGBE）进口儿童韩国进口儿童防晒霜80g
-											</view>
-										</view>
-									</view>
-									<view class="log-item">
-										<image
-											src="https://lanhu-dds-backend.oss-cn-beijing.aliyuncs.com/merge_image/imgs/38e693de009644aa9de2dc6d6f7e747a_mergeImage.png"
-											mode="scaleToFill" />
-
-										<view class="log-item-content">
-											<view class="log-item-content-t">
-												2023-05-31 10:22:35 下单了
-											</view>
-											<view class="log-item-content-b">
-												宫中秘策（GOONGBE）进口儿童韩国进口儿童防晒霜80g
-											</view>
-										</view>
-									</view>
-									<view class="log-item">
-										<image
-											src="https://lanhu-dds-backend.oss-cn-beijing.aliyuncs.com/merge_image/imgs/38e693de009644aa9de2dc6d6f7e747a_mergeImage.png"
-											mode="scaleToFill" />
-
-										<view class="log-item-content">
-											<view class="log-item-content-t">
-												2023-05-31 10:22:35 下单了
-											</view>
-											<view class="log-item-content-b">
-												宫中秘策（GOONGBE）进口儿童韩国进口儿童防晒霜80g
-											</view>
-										</view>
-									</view>
+								<view class="log-body" v-if="storeInfo.grouponUserTotal > 0" v-for="(item, index) in storeInfo.grouponUsers" :key="index">
 									<view class="log-item">
 										<image
-											src="https://lanhu-dds-backend.oss-cn-beijing.aliyuncs.com/merge_image/imgs/38e693de009644aa9de2dc6d6f7e747a_mergeImage.png"
+											:src="item.userAvatar"
 											mode="scaleToFill" />
 
 										<view class="log-item-content">
 											<view class="log-item-content-t">
-												2023-05-31 10:22:35 下单了
-											</view>
-											<view class="log-item-content-b">
-												宫中秘策（GOONGBE）进口儿童韩国进口儿童防晒霜80g
+												{{item.createTime}} 下单了
 											</view>
 										</view>
 									</view>
@@ -147,8 +115,8 @@
 								</view>
 
 								<view class="all-products-body" v-for="(item, index) in storeInfo.goodsList" :key="index">
-									
-									<view class="all-products-item" @click="addGoodPopupShow = true">
+
+									<view class="all-products-item" @click="getGoodsDetails(item.id)">
 										<image
 											:src="item.goodsCover"
 											mode="scaleToFill" />
@@ -164,7 +132,7 @@
 												</view>
 
 												<view>
-													<u-number-box v-model="value" @change="valChange"></u-number-box>
+													<u-number-box :min="0" :max="10" v-model="storeInfo.goodsList[index].num" @change="addGoodsNum"></u-number-box>
 												</view>
 											</view>
 										</view>
@@ -291,7 +259,7 @@
 
 		<u-popup :show="addGoodPopupShow" @close="addGoodPopupShow = false" @open="	">
 			<view>
-				<detail v-if="addGoodPopupShow"></detail>
+				<detail :goodsInfo="goods" v-if="addGoodPopupShow"></detail>
 			</view>
 		</u-popup>
 
@@ -485,9 +453,15 @@ export default {
 			currentPage: false,
 			svip_price_open: 1,
 			promotionNo: '',
-			promotionShare: ''
+			promotionShare: '',
+			selfTakeId: '',
+			organizerUserId: '',
+			goodsMap:{}
 		};
 	},
+	created() {
+		this.goodsMap = new Map();
+	},
 	computed: mapGetters(["isLogin", "uid", "userInfo", "selectAddr"]),
 	watch: {
 		isLogin: {
@@ -528,6 +502,9 @@ export default {
 	},
 	onLoad (options) {
     console.log("options -》 ",options);
+	let that = this;
+	that.selfTakeId = options.selfTakeId;
+	that.organizerUserId = options.organizerUserId;
 		console.log(this.userInfo);
 		uni.hideShareMenu();
 		console.log("是否登录：" + this.isLogin);
@@ -925,7 +902,7 @@ export default {
       let that = this;
       console.log(that.id)
       detailGroupon({grouponId: that.id}).then((res) => {
-        that.storeInfo = res.data
+        that.storeInfo = res.data;
       })
     },
 
@@ -933,38 +910,42 @@ export default {
 		 * 获取产品详情
 		 *
 		 */
-		getGoodsDetails: function () {
-			uni.showLoading({ title: '团购信息加载中' });
+		getGoodsDetails (goodsId) {
+			// uni.showLoading({ title: '团购信息加载中' });
 			let that = this;
-			goodsDetail({ id: that.id })
+			that.goods = {}
+			that.addGoodPopupShow = true
+			goodsDetail({ id: goodsId })
 				.then((res) => {
-					let storeInfo = res.data;
-					that.storeInfo = res.data
-					console.log('res.data.slideshowList', res.data.slideshowList);
-					res.data.imgList = res.data.slideshowList.map(e => {
-						return {
-							image: e,
-							title: ''
-						}
-					})
-					console.log('res.data', res.data);
-					// 处理分享
-					if (that.storeInfo.zoneType == 8) {
-						that.sharePacket.isState = true
-					}
-					that.skuArr = storeInfo.goodsSpecList
-					that.$set(that, "storeInfo", storeInfo);
-					that.$set(that.attr, "productAttr", storeInfo.goodsSpecList);
-					// that.downloadFilestoreImage();
-					that.getUserAddressByUserId()
-					setTimeout(function () {
-						that.infoScroll();
-					}, 500);
-					setTimeout(() => {
-						this.showSkeleton = false;
-					}, 100);
-				})
-				.catch((err) => {
+
+					that.goods = res.data;
+					// let storeInfo = res.data;
+					// that.storeInfo = res.data
+
+					// console.log('res.data.slideshowList', res.data.slideshowList);
+					// res.data.imgList = res.data.slideshowList.map(e => {
+					// 	return {
+					// 		image: e,
+					// 		title: ''
+					// 	}
+					// })
+					// console.log('res.data', res.data);
+					// // 处理分享
+					// if (that.storeInfo.zoneType == 8) {
+					// 	that.sharePacket.isState = true
+					// }
+					// that.skuArr = storeInfo.goodsSpecList
+					// that.$set(that, "storeInfo", storeInfo);
+					// that.$set(that.attr, "productAttr", storeInfo.goodsSpecList);
+					// // that.downloadFilestoreImage();
+					// that.getUserAddressByUserId()
+					// setTimeout(function () {
+					// 	that.infoScroll();
+					// }, 500);
+					// setTimeout(() => {
+					// 	this.showSkeleton = false;
+					// }, 100);
+				}).catch((err) => {
 					//状态异常返回上级页面
 					return that.$util.Tips({
 						title: err.toString(),
@@ -973,9 +954,9 @@ export default {
 						url: 1,
 					});
 				});
-			this.sharePacket.isCanShare = false
-			this.sharePacket.isFristUrl = true
-			this.listenerActionSheet()
+			// this.sharePacket.isCanShare = false
+			// this.sharePacket.isFristUrl = true
+			// this.listenerActionSheet()
 		},
 		infoScroll: function () {
 			var that = this,
@@ -1348,20 +1329,24 @@ export default {
 			}
 		},
 		goBuyNew(){
-			if (true) {
-					uni.navigateTo({
-						url: "/pages/groupbuying_details/order_details_confirm/index?num=123"
-							+ "&freight=123"
-
-					});
-				} else {
-					that.$util.Tips({
-						title: that.$t(`所选商品属性不支持下单`),
-						success: () => {
-							// that.getCartCount(true);
-						},
-					});
+			let goodsArr = []
+			this.storeInfo.goodsList.forEach(e => {
+				if(e.num > 0) {
+					goodsArr.push({goodsId: e.id, num: e.num})
 				}
+			})
+			if (goodsArr.length < 1) {
+				uni.showToast({
+					title: '请选择商品',
+					icon: 'none'
+				});
+				return;
+			}
+			console.log("goodsArr -> ", goodsArr)
+			uni.navigateTo({
+				url: "/pages/groupbuying_details/order_details_confirm/index?organizerUserId=" + this.organizerUserId
+				 + "&selfTakeId=" + this.selfTakeId + "&goods=" + encodeURIComponent(JSON.stringify(goodsArr))
+			});
 		},
 		open (data) {
 			this.showMenuIcon = data;
@@ -1534,6 +1519,9 @@ export default {
 				this.$set(this, "attrValue", productSelect.suk);
 			}
 		},
+		addGoodsNum(item) {
+
+		}
 	},
 };
 </script>
@@ -2566,8 +2554,65 @@ action-sheet-item {
 	font-weight: 400;
 	color: #fff;
 	line-height: 84rpx;
+}
 
-
+.box_3 {
+	width: 100%;
+	align-self: center;
+	margin-top: 4px;
+	padding: 0 10px;
+}
+.text-group_11 {
+	flex-direction: column;
+}
+.text-wrapper_4 {
+	height: 24px;
+	margin-bottom: 10px;
+	overflow-wrap: break-word;
+	letter-spacing: 0.20000000298023224px;
+	font-family: PingFangSC-Medium;
+	font-weight: 500;
+	text-align: left;
+	line-height: 24px;
+}
+
+.text_8 {
+	overflow-wrap: break-word;
+	color: rgba(178, 35, 56, 1);
+	font-size: 12px;
+	font-family: PingFangSC-Medium;
+	font-weight: 500;
+	text-align: left;
+	line-height: 24px;
+}
+
+.text_9 {
+	overflow-wrap: break-word;
+	color: rgba(178, 35, 56, 1);
+	font-size: 18px;
+	font-family: DINAlternate-Bold;
+	font-weight: 700;
+	text-align: left;
+	white-space: nowrap;
+	line-height: 24px;
+}
+.text_10 {
+	overflow-wrap: break-word;
+	color: rgba(178, 35, 56, 1);
+	font-size: 17px;
+	font-family: DINAlternate-Bold;
+	font-weight: 700;
+	text-align: left;
+	white-space: nowrap;
+	line-height: 24px;
+}
+.text_13 {
+	width: 100%;
+}
+.icon_4 {
+	width: 12px;
+	height: 12px;
+	margin: 33px 0 5px 0;
 }
 </style>
 

pages/index/diy/components/latestGroupBuying.vue

@@ -29,12 +29,12 @@
 						¥{{ e.minPrice || 0.00 }} ~ ¥ {{ e.minPrice || 0.00 }}
 					</view>
 				</view>
-				<view class="introduce" @click="goToDetail(e.id)"> 
+				<view class="introduce" @click="goToDetail(e.id)">
 					<view>
 						{{ e.goodsName || '测试名字' }}
 					</view>
 					<image src="http://www.gzzzyd.com/groupon/home_slices/进入箭头2小@2x.png" mode="scaleToFill" />
-					
+
 				</view>
 
 				<view class="countdown flex-row">
@@ -163,11 +163,10 @@ export default {
 		this.onLoadData(this.currentId);
 	},
 	methods: {
-		goToDetail (id) {
+		goToDetail(item){
 			uni.navigateTo({
-				url: `/pages/groupbuying_details/index?id=${id}`
+				url: `/pages/groupbuying_details/index?id=${item.id}&selfTakeId=${item.selfTake.id}&organizerUserId=${item.organizerUserId}`
 			})
-
 		},
 		onLoadData (currentId) {
 			// 最新团购
@@ -179,7 +178,7 @@ export default {
 				this.getHistoryGroupon()
 			}
 		},
-		getLatestGroupon () {
+		getLatestGroupon() {
 			let that = this;
 			latestGroupon({
 				current: 1,
@@ -192,7 +191,7 @@ export default {
 				console.log(this.grouponData)
 			})
 		},
-		getHistoryGroupon () {
+		getHistoryGroupon() {
 			let that = this;
 			historyGroupon({
 				current: 1,
@@ -245,12 +244,11 @@ export default {
 </script>
 
 <style lang="scss">
-.list-box {
+.list-box{
 	background: white;
 
 	padding-bottom: 20px;
 }
-
 .index-product-wrapper {
 
 	&.on {
@@ -568,7 +566,7 @@ export default {
 
 	button {
 		flex:1;
-		
+
 		text-align: center;
 		margin: auto;
 

pages/index/diy/index_mall.vue

@@ -271,6 +271,8 @@ export default {
 			uni.getLocation({
 				type: 'wgs84',
 				success: function (res) {
+					uni.setStorageSync('user_longitude', res.longitude);
+					uni.setStorageSync('user_latitude', res.latitude);
 					console.log("dizhixinxi -> ", res)
 					that.positionInfo.longitude = res.longitude;
 					that.positionInfo.latitude = res.latitude;