From 1d00f35bc9eb3b79dc2da6d8cd400caf8e41d7c3 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Mon, 13 May 2024 09:18:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/api.js                            |   4 +
 pages.json                                  |   7 +
 pages/group_order/components/groupTitle.vue |  16 +-
 pages/group_order/order_groupdetail.vue     |   2 -
 pages/product/index.vue                     |  20 ++-
 pages/product/placeOrder.vue                | 172 ++++++++++++++++++++
 pages/user/shop/shopinfo.vue                |   1 +
 7 files changed, 210 insertions(+), 12 deletions(-)
 create mode 100644 pages/product/placeOrder.vue

diff --git a/common/js/api.js b/common/js/api.js
index cdec843..02ab0fd 100644
--- a/common/js/api.js
+++ b/common/js/api.js
@@ -8,6 +8,10 @@ export default {
 	productqueryProduct(data) { //获取商品信息
 		return uni.api.post("/product/queryProduct", data);
 	},
+	// 下单详情
+	getproductorderConfirm(data) { 
+		return uni.api.get("/product/orderConfirm", data);
+	},
 	cartadd(data) { //添加到购物车
 		return uni.api.post("/cart/add", data);
 	},
diff --git a/pages.json b/pages.json
index 244836b..f08b564 100644
--- a/pages.json
+++ b/pages.json
@@ -206,6 +206,13 @@
 			"style": {
 				"navigationBarTitleText": "订单详情"
 			}
+		},
+		{
+			"path" : "pages/product/placeOrder",
+			"style" : 
+			{
+				"navigationBarTitleText" : "提交订单"
+			}
 		}
 	],
 	"globalStyle": {
diff --git a/pages/group_order/components/groupTitle.vue b/pages/group_order/components/groupTitle.vue
index 271a565..1898108 100644
--- a/pages/group_order/components/groupTitle.vue
+++ b/pages/group_order/components/groupTitle.vue
@@ -2,15 +2,16 @@
 	<view class="title">
 		<text class="fontStyle">{{info.proName}}</text>
 		<view class="titleBox">
-			<image :src="info.proImg" mode="" style="width: 102rpx;height: 102rpx;border-radius: 12rpx 12rpx 12rpx 12rpx;"></image>
+			<image :src="info.proImg" mode=""
+				style="width: 102rpx;height: 102rpx;border-radius: 12rpx 12rpx 12rpx 12rpx;"></image>
 			<view class="ml-20 rightText">
-				<view >
+				<view>
 					{{info.avaTime}}
 				</view>
 				<view style="margin-top: 8rpx;">{{info.proDetail}}</view>
 			</view>
 		</view>
-		<view class="moneyStyle">
+		<view class="moneyStyle" @click="fivecontentclick(info.proId)">
 			<text class="moneys">￥{{info.orderAmount}}</text>
 			<u-icon name="arrow-right" color="#000" size="28"></u-icon>
 		</view>
@@ -26,7 +27,11 @@
 			}
 		},
 		methods: {
-
+			fivecontentclick(proId) {
+				uni.pro.navigateTo('product/index', {
+					id: proId
+				})
+			},
 		}
 	}
 </script>
@@ -62,7 +67,8 @@
 			right: 30rpx;
 			top: 80rpx;
 			.df();
-			.moneys{
+
+			.moneys {
 				font-weight: bold;
 				font-size: 32rpx;
 				color: #333333;
diff --git a/pages/group_order/order_groupdetail.vue b/pages/group_order/order_groupdetail.vue
index a349125..a364c6c 100644
--- a/pages/group_order/order_groupdetail.vue
+++ b/pages/group_order/order_groupdetail.vue
@@ -78,12 +78,10 @@
 		},
 		methods: {
 			async payEvent() {
-				console.log('调试1')
 				let res = await this.api.payOrderPay({
 					payType:'wechatPay',
 					orderId:this.listinfo.id,  
 				})
-				console.log('调试2')
 				if (res) {
 					return
 					uni.requestPayment({
diff --git a/pages/product/index.vue b/pages/product/index.vue
index 64cfec1..edde981 100644
--- a/pages/product/index.vue
+++ b/pages/product/index.vue
@@ -180,19 +180,21 @@
 		<view class="fixedview flex-between">
 			<view class="fixedview_letr flex-start">
 				<view class="fixedview_letr_item flex-colum" @click="eeInfoindex">
-					<image src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/product/index.png" mode="aspectFill"></image>
+					<image src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/product/index.png" mode="aspectFill">
+					</image>
 					<text>首页</text>
 				</view>
 				<view class="fixedview_letr_item flex-colum" @click="makePhoneCall">
-					<image src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/product/Call.png" mode="aspectFill"></image>
+					<image src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/product/Call.png" mode="aspectFill">
+					</image>
 					<text>客服</text>
 				</view>
 			</view>
 			<view class="fixedview_tow">
-			<!-- 	<view class="fixedview_towone" @click="overlayshowsboxs(1)">
+				<!-- 	<view class="fixedview_towone" @click="overlayshowsboxs(1)">
 					加入购物车
 				</view> -->
-				<view class="fixedview_towtow" @click="overlayshowsboxs(2)">
+				<view class="fixedview_towtow" @click="overlayshowsboxs(listdata)">
 					立即购买
 				</view>
 				<!-- <view class="fixedview_towtow" style="background: #ccc;">
@@ -381,6 +383,14 @@
 			//#endif
 		},
 		methods: {
+			overlayshowsboxs(e) {
+				// this.cartshping = e
+				// this.overlayshow = true
+				let _this = this
+				uni.pro.navigateTo('product/placeOrder', {
+					id: _this.indexform
+				})
+			},
 			//打电话
 			clickphone(e) {
 				uni.makePhoneCall({
@@ -517,7 +527,7 @@
 					height: 72rpx;
 					text-align: center;
 					line-height: 72rpx;
-					background: linear-gradient( 110deg, #F1A666 0%, #FF4C11 100%);
+					background: linear-gradient(110deg, #F1A666 0%, #FF4C11 100%);
 					border-radius: 48rpx 48rpx 48rpx 48rpx;
 					font-family: Source Han Sans CN, Source Han Sans CN;
 					font-weight: bold;
diff --git a/pages/product/placeOrder.vue b/pages/product/placeOrder.vue
new file mode 100644
index 0000000..56694eb
--- /dev/null
+++ b/pages/product/placeOrder.vue
@@ -0,0 +1,172 @@
+<template>
+	<view class="placeOrder">
+		<view class="placetop">
+			<view class="placetopone">
+				<view style="display: flex;">
+					<image :src="info.proImg"
+						style="width: 102rpx;height: 102rpx;border-radius: 50%;margin-left: 28rpx;" mode=""></image>
+					<view class="placetopInfo">
+						<view>{{info.proName.length>12?info.proName.substring(0,12)+'...':info.proName}} </view>
+						<view>{{info.avaTime}} </view>
+						<view>{{info.proDetail}} </view>
+					</view>
+				</view>
+				<view class="placetopmoney">
+					<view>
+						<text>￥12</text>
+						<text>￥13</text>
+					</view>
+					<u-number-box v-model="Quantity">
+						<view slot="minus" class="minus">
+							<u-icon name="minus" color="#CCCCCC" bold size="40"></u-icon>
+						</view>
+						<text slot="input" style="width: 20px;text-align: center;">{{Quantity}}</text>
+						<view slot="plus" class="plus">
+							<u-icon name="plus" color="#FF4B10" bold size="30"></u-icon>
+						</view>
+					</u-number-box>
+				</view>
+			</view>
+			<view class="redMoney">
+				<view class="">
+					红包/低佣券
+				</view>
+				<view class="">
+					有20张优惠券可选择
+				</view>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		onLoad(e) {
+			this.getInfo(e.id)
+		},
+		data() {
+			return {
+				info: null,
+				Quantity: 1
+			}
+		},
+		methods: {
+			valChange(e) {
+				console.log('当前值为: ' + e.value)
+			},
+			async getInfo(id) {
+				let res = await this.api.getproductorderConfirm({
+					productId: id,
+				})
+				if (res.code == 0) {
+					this.info = res.data
+					console.log(this.info, 'tiaoshi1')
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.placeOrder {
+
+		.placetop {
+			width: 750rpx;
+			background: #FFFFFF;
+			border-radius: 16rpx 16rpx 16rpx 16rpx;
+			padding: 30rpx;
+
+			.placetopone {
+				.df(space-between);
+
+				.placetopInfo {
+					margin-left: 18rpx;
+
+					>view:first-child {
+						font-weight: 400;
+						font-size: 32rpx;
+						color: #333333;
+					}
+
+					>view:nth-child(2),
+					>view:last-child {
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #666666;
+
+					}
+				}
+
+				.placetopmoney {
+
+					>view:first-child {
+						margin-bottom: 20rpx;
+
+						>text:first-child {
+							text-decoration: line-through;
+							color: #999;
+							font-weight: 400;
+							font-size: 24rpx;
+						}
+
+						>text:last-child {
+							font-weight: bold;
+							font-size: 28rpx;
+							color: #333333;
+						}
+					}
+
+				}
+			}
+
+			.redMoney {
+				.df(space-between);
+				margin-top: 30rpx;
+				.m(30rpx);
+
+				>view:first-child {
+					.df
+				}
+			}
+		}
+	}
+
+	.m(@top, @right: 0, @bottom: 0, @left: 0) {
+		margin: @top, @right, @bottom, @left
+	}
+
+	.df(@start: flex-start, @position: center) {
+		display: flex;
+		align-items: @position;
+		justify-content: @start;
+	}
+</style>
+<style lang="scss">
+	.minus {
+		width: 22px;
+		height: 22px;
+		border-width: 1px;
+		border-color: #F0F0F0;
+		border-style: solid;
+		border-top-left-radius: 100px;
+		border-top-right-radius: 100px;
+		border-bottom-left-radius: 100px;
+		border-bottom-right-radius: 100px;
+		@include flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.plus {
+		width: 22px;
+		height: 22px;
+		background-color: #FFF1EC;
+		border-radius: 50%;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/user/shop/shopinfo.vue b/pages/user/shop/shopinfo.vue
index 8ba926f..c84bfb5 100644
--- a/pages/user/shop/shopinfo.vue
+++ b/pages/user/shop/shopinfo.vue
@@ -159,6 +159,7 @@
 			overlayshowsboxs(e) {
 				this.cartshping = e
 				this.overlayshow = true
+				
 			},
 			async overlayshowsbox(item1, index1) {
 				this.towrecttowclass = index1