From 5e78e9b69f218d275340c7373c64e02c1eb3bd32 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Thu, 9 May 2024 15:51:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=9B=A2=E8=B4=AD=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/order_groupdetail.vue | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/pages/order/order_groupdetail.vue b/pages/order/order_groupdetail.vue
index bbe57a4..ed28cd1 100644
--- a/pages/order/order_groupdetail.vue
+++ b/pages/order/order_groupdetail.vue
@@ -17,14 +17,24 @@
 			}
 		},
 		methods: {
-			async orderorderInfo() {
-				let res = await this.api.groupOrderInfoDetail({
-					orderId: this.orderId
-				})
-				if (res.code == 0) {
-					this.listinfo = res.data
-					// this.mountedcreateSelectorQuery()
+			 orderorderInfo() {
+				 let _this = this
+			uni.getStorage({
+				key: "getLocationstorage",
+				success:  function (data) {
+					let {lat , lng} = data.data
+					let res =  _this.api.groupOrderInfoDetail({
+						id: _this.orderId,
+						lat,
+						lng
+					})
+					if (res.code == 0) {
+						_this.listinfo = res.data
+						// this.mountedcreateSelectorQuery()
+					}
 				}
+			});
+				
 			},
 		}
 	}

From 7dc98c0cc75eab4467545e0ac9ec56eefb7f23e2 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Fri, 10 May 2024 10:50:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=9B=A2=E8=B4=AD=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E6=9E=84=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |  2 +-
 pages/group_order/components/groupCoupons.vue | 22 ++++++
 .../group_order/components/groupMerchants.vue | 22 ++++++
 pages/group_order/components/groupPay.vue     | 22 ++++++
 pages/group_order/components/groupPrompt.vue  | 22 ++++++
 pages/group_order/components/groupStore.vue   | 22 ++++++
 pages/group_order/components/groupTitle.vue   | 22 ++++++
 pages/group_order/order_groupdetail.vue       | 74 +++++++++++++++++++
 pages/order/order.vue                         |  2 +-
 pages/order/order_groupdetail.vue             | 45 -----------
 10 files changed, 208 insertions(+), 47 deletions(-)
 create mode 100644 pages/group_order/components/groupCoupons.vue
 create mode 100644 pages/group_order/components/groupMerchants.vue
 create mode 100644 pages/group_order/components/groupPay.vue
 create mode 100644 pages/group_order/components/groupPrompt.vue
 create mode 100644 pages/group_order/components/groupStore.vue
 create mode 100644 pages/group_order/components/groupTitle.vue
 create mode 100644 pages/group_order/order_groupdetail.vue
 delete mode 100644 pages/order/order_groupdetail.vue

diff --git a/pages.json b/pages.json
index 839ec9e..244836b 100644
--- a/pages.json
+++ b/pages.json
@@ -202,7 +202,7 @@
 			}
 		},
 		{
-			"path" : "pages/order/order_groupdetail",
+			"path" : "pages/group_order/order_groupdetail",
 			"style": {
 				"navigationBarTitleText": "订单详情"
 			}
diff --git a/pages/group_order/components/groupCoupons.vue b/pages/group_order/components/groupCoupons.vue
new file mode 100644
index 0000000..ae2efda
--- /dev/null
+++ b/pages/group_order/components/groupCoupons.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		2
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/group_order/components/groupMerchants.vue b/pages/group_order/components/groupMerchants.vue
new file mode 100644
index 0000000..a1312d5
--- /dev/null
+++ b/pages/group_order/components/groupMerchants.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		3
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/group_order/components/groupPay.vue b/pages/group_order/components/groupPay.vue
new file mode 100644
index 0000000..e77fefa
--- /dev/null
+++ b/pages/group_order/components/groupPay.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		6
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/group_order/components/groupPrompt.vue b/pages/group_order/components/groupPrompt.vue
new file mode 100644
index 0000000..ffda636
--- /dev/null
+++ b/pages/group_order/components/groupPrompt.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		5
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/group_order/components/groupStore.vue b/pages/group_order/components/groupStore.vue
new file mode 100644
index 0000000..e7c1f76
--- /dev/null
+++ b/pages/group_order/components/groupStore.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		4
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/group_order/components/groupTitle.vue b/pages/group_order/components/groupTitle.vue
new file mode 100644
index 0000000..1fbba54
--- /dev/null
+++ b/pages/group_order/components/groupTitle.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		1
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/group_order/order_groupdetail.vue b/pages/group_order/order_groupdetail.vue
new file mode 100644
index 0000000..8b36865
--- /dev/null
+++ b/pages/group_order/order_groupdetail.vue
@@ -0,0 +1,74 @@
+<template>
+	<!-- 团购订单详情 -->
+	<view>
+		<!-- 头部 -->
+		<groupTitle></groupTitle>
+		<!-- 券 -->
+		<groupCoupons></groupCoupons>
+		<!-- 商家信息 -->
+		<groupMerchants></groupMerchants>
+		<!-- 到店 -->
+		<groupStore></groupStore>
+		<!-- 提示 -->
+		<groupPrompt></groupPrompt>
+		<!-- 实付 -->
+		<groupPay></groupPay>
+	</view>
+</template>
+
+<script>
+	import groupTitle from './components/groupTitle.vue'
+	import groupCoupons from './components/groupCoupons.vue'
+	import groupMerchants from './components/groupMerchants.vue'
+	import groupStore from './components/groupStore.vue'
+	import groupPrompt from './components/groupPrompt.vue'
+	import groupPay from './components/groupPay.vue'
+	export default {
+		components: {
+			groupTitle,
+			groupCoupons,
+			groupMerchants,
+			groupStore,
+			groupPrompt,
+			groupPay
+		},
+		onLoad(e) {
+			this.orderId = e.orderId
+			this.orderorderInfo()
+		},
+		data() {
+			return {
+				orderId: "",
+				listinfo: null
+			}
+		},
+		methods: {
+			orderorderInfo() {
+				let _this = this
+				uni.getStorage({
+					key: "getLocationstorage",
+					success: function(data) {
+						let {
+							lat,
+							lng
+						} = data.data
+						let res = _this.api.groupOrderInfoDetail({
+							id: _this.orderId,
+							lat,
+							lng
+						})
+						if (res.code == 0) {
+							_this.listinfo = res.data
+							// this.mountedcreateSelectorQuery()
+						}
+					}
+				});
+
+			},
+		}
+	}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/pages/order/order.vue b/pages/order/order.vue
index 5ef0233..1eabb4a 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -213,7 +213,7 @@
 				})
 			},
 			orderinfoTo(e) {
-				uni.pro.navigateTo('order/order_groupdetail', {
+				uni.pro.navigateTo('group_order/order_groupdetail', {
 					orderId: e.id
 				})
 			},
diff --git a/pages/order/order_groupdetail.vue b/pages/order/order_groupdetail.vue
deleted file mode 100644
index ed28cd1..0000000
--- a/pages/order/order_groupdetail.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-<template>
-	<view>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		onLoad(e) {
-			this.orderId = e.orderId
-			this.orderorderInfo()
-		},
-		data() {
-			return {
-				orderId:"",
-				listinfo:null
-			}
-		},
-		methods: {
-			 orderorderInfo() {
-				 let _this = this
-			uni.getStorage({
-				key: "getLocationstorage",
-				success:  function (data) {
-					let {lat , lng} = data.data
-					let res =  _this.api.groupOrderInfoDetail({
-						id: _this.orderId,
-						lat,
-						lng
-					})
-					if (res.code == 0) {
-						_this.listinfo = res.data
-						// this.mountedcreateSelectorQuery()
-					}
-				}
-			});
-				
-			},
-		}
-	}
-</script>
-
-<style>
-
-</style>