From 05fe0b3b3235b6ebd8b6135512eea2288edf6037 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Thu, 13 Jun 2024 15:18:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8C=85=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=9C=8D=E5=8A=A1=E5=8C=85=E5=8F=8A=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bl/massage/massagePackage.vue | 28 ++++-----
 src/views/bl/order/packageOrder.vue     | 76 ++++++++++++++++++++-----
 2 files changed, 77 insertions(+), 27 deletions(-)

diff --git a/src/views/bl/massage/massagePackage.vue b/src/views/bl/massage/massagePackage.vue
index 25f69d9..dcd5ecf 100644
--- a/src/views/bl/massage/massagePackage.vue
+++ b/src/views/bl/massage/massagePackage.vue
@@ -2208,20 +2208,20 @@ export default {
 		},
 //<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<服务项目<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
-		showBuyView(row){
-			this.packageId = row.id;
-			this.userId = 400;
-			this.quantity = 5;
-			this.couponId = "2636,2635";
-			this.packagePrice = row.price;//单价
-
-			this.vipRate = 90;
-			this.oldSumMoney = 835;
-			this.sumMoney = 751.5;
-
-			this.dialogFormVisibleBuy = true;
-		},
-
+		// showBuyView(row){
+		// 	this.packageId = row.id;
+		// 	this.userId = 400;
+		// 	this.quantity = 5;
+		// 	this.couponId = "2636,2635";
+		// 	this.packagePrice = row.price;//单价
+		//
+		// 	this.vipRate = 90;
+		// 	this.oldSumMoney = 835;
+		// 	this.sumMoney = 751.5;
+		//
+		// 	this.dialogFormVisibleBuy = true;
+		// },
+		//
 		// handleBuy(){
 		// 	if(this.quantity <= 0){
 		// 		this.$message({
diff --git a/src/views/bl/order/packageOrder.vue b/src/views/bl/order/packageOrder.vue
index 984c89f..14b2a37 100644
--- a/src/views/bl/order/packageOrder.vue
+++ b/src/views/bl/order/packageOrder.vue
@@ -66,6 +66,7 @@
 					<span style="color: #f56c6c;" v-if="scope.row.status==0">待支付</span>
 					<span style="color: #009900;" v-if="scope.row.status==1">已支付</span>
 					<span style="color: #FF0000;" v-if="scope.row.status==2">已退款</span>
+					<span style="color: #FF0000;" v-if="scope.row.status==3">已取消</span>
 				</template>
 			</el-table-column>
 			<el-table-column prop="couponCount" label="优惠券数量" width="120">
@@ -88,8 +89,8 @@
 						size="mini"
 						type="primary"
 						style="margin: 5px"
-						@click="showDetailView(scope.row)"
-					>项目详情
+						@click="showPackageView(scope.row)"
+					>服务包
 					</el-button>
 					<el-button v-if="scope.row.status==1"
 						size="mini"
@@ -122,6 +123,43 @@
 			</el-table>
 		</el-dialog>
 
+		<!-- 显示服务包-->
+		<el-dialog title="订单服务包" :visible.sync="dialogVisiblePackage" center>
+			<el-table v-loading="packageTableDataLoading" :data="packageTableData">
+				<el-table-column prop="id" label="服务编号"></el-table-column>
+				<el-table-column label="服务类型" fixed="left" prop="type">
+					<template slot-scope="scope">
+						{{ showDictValue(scope.row.type, typeDictData) }}
+					</template>
+				</el-table-column>
+				<el-table-column prop="title" label="服务名称" width="360"></el-table-column>
+				<el-table-column prop="massageImg" label="图片">
+					<template slot-scope="scope">
+						　　<img
+						v-if="scope.row.packageImg && scope.row.packageImg != ''"
+						:src="scope.row.packageImg"
+						width="40"
+						height="40"
+					/>
+						<span v-else>暂无图片</span>
+					</template>
+				</el-table-column>
+				<el-table-column prop="oldPrice" label="原价"></el-table-column>
+				<el-table-column prop="price" label="现价"></el-table-column>
+				<el-table-column label="操作" prop="id" width="100" fixed="right">
+					<template slot-scope="scope">
+						<el-button
+							size="mini"
+							type="primary"
+							style="margin: 5px"
+							@click="showDetailView(scope.row)"
+						>项目详情
+						</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+		</el-dialog>
+
 		<!-- 显示详情 需改造，订单映射表取数据在匹配服务包，再匹配服务包详情-->
 		<el-dialog title="订单项目详情" :visible.sync="dialogVisibleDetail" center>
 			<el-table v-loading="detailTableDataLoading" :data="detailTableData">
@@ -151,14 +189,6 @@
 				<span style="width: 200px; display: inline-block; text-align: right">订单号：</span>
 				<span style="width: 50%; display: inline-block; text-align: left">{{ ordersNo }}</span>
 			</div>
-			<div style="margin-bottom: 10px">
-				<span style="width: 200px; display: inline-block; text-align: right">服务类型：</span>
-				<span style="width: 50%; display: inline-block; text-align: left">{{ showDictValue(type, typeDictData) }}</span>
-			</div>
-			<div style="margin-bottom: 10px">
-				<span style="width: 200px; display: inline-block; text-align: right">服务名称：</span>
-				<span style="width: 50%; display: inline-block; text-align: left">{{ packageName }}</span>
-			</div>
 			<div style="margin-bottom: 10px">
 				<span style="width: 200px; display: inline-block; text-align: right">支付金额：</span>
 				<span style="width: 50%; display: inline-block; text-align: left">{{ payMoney }}</span>
@@ -204,6 +234,10 @@ export default {
 			couponTableDataLoading: false,//代金券loading
 			couponTableData: [],//代金券表格数据
 
+			dialogVisiblePackage: false,//服务包弹窗
+			packageTableDataLoading: false,//服务包loading
+			packageTableData: [],//服务包
+
 
 			dialogVisibleDetail: false,//详情弹窗
 			detailTableDataLoading: false,//详情loading
@@ -312,6 +346,23 @@ export default {
 			});
 		},
 
+		showPackageView(row){
+			this.dialogVisiblePackage = true;
+			this.packageTableDataLoading = true;
+			this.$http({
+				url: this.$http.adornUrl("user/package/findList"),
+				method: "get",
+				params: this.$http.adornParams({
+					ordersId: row.ordersId,
+					status: row.status
+				}),
+			}).then(({data}) => {
+				this.packageTableData = data.data;
+
+				this.packageTableDataLoading = false;
+			});
+		},
+
 		//显示订单项目详情
 		showDetailView(row){
 			this.dialogVisibleDetail = true;
@@ -320,7 +371,8 @@ export default {
 				url: this.$http.adornUrl("user/package/detail/findDetailUsedQuantity"),
 				method: "get",
 				params: this.$http.adornParams({
-					ordersId: row.ordersId,
+					mainId: row.id,
+					status: row.status
 				}),
 			}).then(({data}) => {
 				this.detailTableData = data.data;
@@ -332,8 +384,6 @@ export default {
 		showRefundView(row){
 			this.ordersId = row.ordersId;
 			this.ordersNo = row.ordersNo;
-			this.type = row.type;
-			this.packageName = row.packageName;
 			this.payMoney = row.payMoney;
 			this.dialogFormVisibleRefund = true;
 		},