From da87e38df04cd6bb5aac94df5cf31b63687164fd Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Tue, 14 May 2024 11:34:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |  15 +-
 pages/group_order/components/groupCoupons.vue |   1 +
 pages/group_order/order_groupdetail.vue       |   3 +-
 pages/group_order/refund.vue                  | 221 ++++++++++++++++++
 pages/order/order.vue                         |  44 +++-
 pages/product/placeOrder.vue                  |   1 +
 6 files changed, 276 insertions(+), 9 deletions(-)
 create mode 100644 pages/group_order/refund.vue

diff --git a/pages.json b/pages.json
index f08b564..00d3abb 100644
--- a/pages.json
+++ b/pages.json
@@ -202,16 +202,21 @@
 			}
 		},
 		{
-			"path" : "pages/group_order/order_groupdetail",
+			"path": "pages/group_order/order_groupdetail",
 			"style": {
 				"navigationBarTitleText": "订单详情"
 			}
 		},
 		{
-			"path" : "pages/product/placeOrder",
-			"style" : 
-			{
-				"navigationBarTitleText" : "提交订单"
+			"path": "pages/product/placeOrder",
+			"style": {
+				"navigationBarTitleText": "提交订单"
+			}
+		},
+		{
+			"path": "pages/group_order/refund",
+			"style": {
+				"navigationBarTitleText": "订单详情"
 			}
 		}
 	],
diff --git a/pages/group_order/components/groupCoupons.vue b/pages/group_order/components/groupCoupons.vue
index ce9290a..c9d9e60 100644
--- a/pages/group_order/components/groupCoupons.vue
+++ b/pages/group_order/components/groupCoupons.vue
@@ -34,6 +34,7 @@
 				uni.makePhoneCall({
 					phoneNumber: e
 				});
+				// uni.pro.navigateTo('group_order/refund',{})
 			},
 			openQR() {
 				this.$emit('clickEvent')
diff --git a/pages/group_order/order_groupdetail.vue b/pages/group_order/order_groupdetail.vue
index a364c6c..e053844 100644
--- a/pages/group_order/order_groupdetail.vue
+++ b/pages/group_order/order_groupdetail.vue
@@ -81,6 +81,7 @@
 				let res = await this.api.payOrderPay({
 					payType:'wechatPay',
 					orderId:this.listinfo.id,  
+					orderType:'group'
 				})
 				if (res) {
 					return
@@ -159,7 +160,7 @@
 
 <style lang="less" scoped>
 	.qrimg {
-		width: 55vh;
+		width: 100vw;
 		height: 100vh;
 		background-color: rgba(0, 0, 0, .6);
 		display: flex;
diff --git a/pages/group_order/refund.vue b/pages/group_order/refund.vue
new file mode 100644
index 0000000..49e766b
--- /dev/null
+++ b/pages/group_order/refund.vue
@@ -0,0 +1,221 @@
+<template>
+	<!-- 退款 -->
+	<view class="refund">
+		<view class="refundBox">
+			<view class="refundBoxA">
+				<image src="../../static/avatar.png"
+					style="width: 86rpx;height: 86rpx;border-radius: 12rpx 12rpx 12rpx 12rpx;" mode=""></image>
+				<view>
+					【辣与不辣随心选】汉堡3选1MT19
+				</view>
+			</view>
+			<view style="width: 100%;height: 2rpx;background-color: #E6E6E6;margin-top: 18rpx;"> </view>
+			<view class="refundBoxB">
+				<view>
+					退款数量
+				</view>
+				<view>
+					最多可退1张
+				</view>
+				<!-- 计步器 -->
+				<u-number-box class="Unumber" v-model="Unumbervalue" style="position: absolute;right: 20rpx;"
+					:disabled="true"></u-number-box>
+			</view>
+			<view style="width: 100%;height: 2rpx;background-color: #E6E6E6;margin-top: 32rpx;"> </view>
+			<view class="refundBoxC">
+				<view>
+					退款金额
+				</view>
+				<view>
+					1-3 个工作日退还至原支付方，以实际退款金额为准
+				</view>
+				<view>$9.9</view>
+			</view>
+			<view style="width: 100%;height: 2rpx;background-color: #E6E6E6;margin-top: 32rpx;"> </view>
+			<view class="refundBoxD">
+				<view>退款原因 <text style="color: #FF4C11;">*</text> </view>
+				<view>请至少选择一项 <u-icon name="arrow-right" color="#000" size="28"></u-icon></view>
+			</view>
+			<view style="width: 100%;height: 2rpx;background-color: #E6E6E6;margin-top: 32rpx;"> </view>
+			<view class="refundBoxE">
+				<view>退款说明 </view>
+				<textarea placeholder-style="font-size: 24rpx;color: #999999;" @input="sumfontnum" :value='tareaValue'
+					placeholder="请输入退款说明，我们将用心倾听你的任何不满" name="" id="" maxlength="200" cols="30" rows="10"
+					style="padding: 16rpx 26rpx;margin-top: 16rpx;border: solid 2rpx #999;border-radius: 18rpx 18rpx 18rpx 18rpx;"></textarea>
+				<view class="Unumberxz"><text>{{fontNum}}</text>/200</view>
+			</view>
+		</view>
+		<view class="buttonBox">
+			<button class="buttonStyle">
+				提交订单
+			</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				Unumbervalue: 1,
+				tareaValue: '',
+				fontNum: 0
+			}
+		},
+		methods: {
+			// 限制文本框字数
+			sumfontnum(e) {
+				console.log(e)
+				this.fontNum = e.detail.value.length
+			}
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.refundBox {
+		background-color: #fff;
+		padding: 32rpx 64rpx;
+
+		.refundBoxA {
+			.df(flex-start, stretch);
+
+			>view {
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #333333;
+			}
+		}
+
+		.refundBoxB {
+			position: relative;
+
+			>view:first-child {
+				font-weight: 500;
+				font-size: 28rpx;
+				color: #333333;
+				margin-top: 16rpx;
+			}
+
+			>view:nth-child(2) {
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #999999;
+				margin-top: 16rpx;
+			}
+
+			.Unumber {
+
+				// transform: translateY(-50%);
+			}
+		}
+
+		.refundBoxC {
+			position: relative;
+
+			>view:first-child {
+				font-weight: 500;
+				font-size: 28rpx;
+				color: #333333;
+				margin-top: 16rpx;
+			}
+
+			>view:nth-child(2) {
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #999999;
+				margin-top: 16rpx;
+			}
+
+			>view:last-child {
+				position: absolute;
+				right: 0rpx;
+				top: 20rpx;
+				font-weight: 500;
+				font-size: 28rpx;
+				color: #FF4C11;
+			}
+		}
+
+		.refundBoxD {
+			.df(space-between);
+			// margin-top: 32rpx;
+			padding-top: 32rpx;
+
+			>view:first-child {
+				font-weight: 500;
+				font-size: 28rpx;
+			}
+
+			>view:last-child {
+				.df();
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #333333;
+			}
+		}
+
+		.refundBoxE {
+			margin-top: 32rpx;
+			font-weight: 500;
+			font-size: 28rpx;
+			color: #333333;
+			position: relative;
+
+			.Unumberxz {
+				position: absolute;
+				right: 40rpx;
+				bottom: 14rpx;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #999999;
+
+				>text {
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #999999;
+				}
+			}
+		}
+	}
+
+	.buttonBox {
+		width: 100%;
+		height: 136rpx;
+		background: #FFFFFF;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		// .df(center,center);
+
+		.buttonStyle {
+			margin-left: 50%;
+			margin-top: 40rpx;
+			transform: translateX(-50%);
+			width: 712rpx;
+			height: 72rpx;
+			line-height: 72rpx;
+			text-align: center;
+			background: linear-gradient(110deg, #F1A666 0%, #FF4C11 100%);
+			border-radius: 48rpx 48rpx 48rpx 48rpx;
+			font-weight: bold;
+			font-size: 36rpx;
+			color: #FFFFFF;
+		}
+	}
+
+	.df(@start: flex-start, @position: center) {
+		// @start:     flex-start(默认)     space-between(两端对齐)     space-around(间隔相等)
+		// @position:stretch(默认) center(垂直居中)
+		display: flex;
+		align-items: @position;
+		justify-content: @start;
+	}
+</style>
+<style>
+	/deep/ .u-number-box {
+		position: absolute;
+		right: 0;
+		top: 30%;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/order/order.vue b/pages/order/order.vue
index e6380dc..6a9657c 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -12,9 +12,17 @@
 		</view>
 		<u-sticky bgColor="#fff">
 			<view class="tab-wrap">
-				<view class="item" v-for="(item, index) in tabs" :key="index" @click="orderswitch(item,index)">
-					<text>{{ item.name }}</text>
+				<block v-if="navtabindex==0">
+					<view class="item" v-for="(item, index) in tabs2" :key="index"  @click="orderswitch(item,index)">
+						<text >{{ item.name }}</text>
+					</view>
+				</block>
+				
+			<block v-if="navtabindex==1">
+				<view class="item" v-for="(item, index) in tabs" :key="index"  @click="orderswitch(item,index)">
+					<text >{{ item.name }}</text>
 				</view>
+			</block>
 				<view class="line-wrap"
 					:style="{ left: `${(100 / tabs.length) * active}%`, width: `${100 / tabs.length}%` }">
 					<view class="line">
@@ -38,6 +46,8 @@
 					<text class="status" v-if="item.status == 'unsend'">
 						<text>待发货</text>
 					</text>
+					
+					
 					<text class="status" v-if="item.status == 'closed'">
 						<text>订单完成</text>
 					</text>
@@ -141,6 +151,7 @@
 						type: 3,
 						status: 'unsend'
 					},
+			
 					{
 						name: '已完成',
 						type: 4,
@@ -150,7 +161,34 @@
 						name: '退款',
 						type: 5,
 						status: 'refund'
-					}
+					},
+				],
+				tabs2: [{
+						name: '全部',
+						type: 1,
+						status: ''
+					},
+					{
+						name: '待支付',
+						type: 2,
+						status: 'unpaid'
+					},
+					{
+						name: '待使用',
+						type: 3,
+						status: 'unused'
+					},
+							
+					{
+						name: '已完成',
+						type: 4,
+						status: 'closed'
+					},
+					{
+						name: '退款',
+						type: 5,
+						status: 'refund'
+					},
 				],
 				list: [],
 				groupList: [],
diff --git a/pages/product/placeOrder.vue b/pages/product/placeOrder.vue
index 3534acb..9cad19f 100644
--- a/pages/product/placeOrder.vue
+++ b/pages/product/placeOrder.vue
@@ -91,6 +91,7 @@
 				let res = await this.api.payOrderPay({
 					payType:'wechatPay',
 					orderId:id,  
+					orderType:'group'
 				})
 				if (res) {
 					return