From 06263aad85b68013a93e5b53030c1c879169078a Mon Sep 17 00:00:00 2001
From: tianyi <13521030702@163.com>
Date: Wed, 8 Apr 2026 18:06:04 +0800
Subject: [PATCH] 11

---
 src/api/index.js                           |  4 +++
 src/views/app/shop/dictManage.vue          | 12 ++++++---
 src/views/sys/order-manage/orderManage.vue | 31 +++++++---------------
 3 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 95f3910..3e69b7e 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -735,6 +735,10 @@ export const getOwListData = (params) => {
 export const getOrderList = (params) => {
     return postBodyRequest('/mall/order/page', params)
 }
+//取消订单
+export const returnOrder = (params) => {
+    return postRequest('/mall/order/cancel', params)
+}
 
 //查询物流自取 
 export const getSaleByCompanyId = (params) => {
diff --git a/src/views/app/shop/dictManage.vue b/src/views/app/shop/dictManage.vue
index 9085f0a..d6a8f09 100644
--- a/src/views/app/shop/dictManage.vue
+++ b/src/views/app/shop/dictManage.vue
@@ -622,6 +622,10 @@
 				this.shopId = v.id
 				this.searchForm.shopId = v.id
 				this.addGoodsForm.shopId = v.id
+				// if(this.addGoodsForm.productGroupBuyPrices == null){
+				// 	this.addGoodsForm.productGroupBuyPrices = []
+				// }
+				console.log('aaa',this.addGoodsForm)
 				this.screenWidth = window.screen.width;
 				// 获取树数据
 				this.getGoodsType();
@@ -1138,13 +1142,13 @@
 				let data = JSON.parse(str);
 				console.log('111111',data)
 				this.addGoodsForm = data;
+				if(this.addGoodsForm.productGroupBuyPrices == ''){
+					this.addGoodsForm.productGroupBuyPrices = []
+				}
 				this.addGoodsForm.attributeList1 = JSON.parse(this.addGoodsForm.attributeList)
 				this.addGoodsForm.attributeList1 = new Map(Object.entries(this.addGoodsForm.attributeList1));
 				this.addGoodsForm.attributeListPrice = JSON.parse(this.addGoodsForm.attributeListPrice)
 				
-				console.log("this.addGoodsForm.attributeList1",this.addGoodsForm.attributeList1)
-				console.log("this.addGoodsForm.attributeListPrice",this.addGoodsForm.attributeListPrice)
-				
 				this.addGoodsForm.attributeList1.forEach((value, key) => {
 					for(let i = 0;i<value.title.length;i++){
 						this.attrValueArr.push({
@@ -1155,7 +1159,6 @@
 				});
 				this.specValueArr = this.addGoodsForm.attributeListPrice
 				
-				
 				this.addGoodsForm.sellTime = this.addGoodsForm.sellBeginTime != '' ? 1 : 0
 				this.modalVisible = true;
 			},
@@ -1184,6 +1187,7 @@
 							});
 						} else if (this.modalType == 1) {
 							// 编辑
+							
 							this.addGoodsForm.attributeListPrice = JSON.stringify(this.addGoodsForm.attributeListPrice)
 							this.addGoodsForm.attributeList = Object.fromEntries(this.addGoodsForm.attributeList1)
 							this.addGoodsForm.attributeList = JSON.stringify(this.addGoodsForm.attributeList)
diff --git a/src/views/sys/order-manage/orderManage.vue b/src/views/sys/order-manage/orderManage.vue
index 69d62b0..4a35610 100644
--- a/src/views/sys/order-manage/orderManage.vue
+++ b/src/views/sys/order-manage/orderManage.vue
@@ -180,7 +180,7 @@
 	import excel from "@/libs/excel";
 	import addEdit from "./addEdit.vue";
 	import dict from "@/views/my-components/hiver/dict";
-	import logisticsAddress from "@/views/app/business/logistics/logisticsAddress";
+	import logisticsAddress from "@/views/sys/order-manage/logisticsAddress";
 	export default {
 		name: "order-manage",
 		components: {
@@ -191,6 +191,7 @@
 		data() {
 			return {
 				tableSize: "default",
+				Visiable: false,
 				height: 510,
 				loading1: false,
 				loading2: false,
@@ -300,7 +301,7 @@
 									"a", {
 										on: {
 											click: () => {
-												this.getDetail(params.row);
+												this.showDetail(params.row);
 											},
 										},
 									},
@@ -350,7 +351,7 @@
 		mounted() {
 			// 计算高度
 			this.height = Number(document.documentElement.clientHeight - 230);
-			
+
 			this.init();
 		},
 		methods: {
@@ -511,7 +512,7 @@
 					}
 				});
 			},
-			
+
 			handleSearch() {
 				this.searchForm.pageNum = 1;
 				this.searchForm.pageSize = 10;
@@ -527,7 +528,7 @@
 				this.searchForm.startDate = dayTime
 				this.searchForm.endDate = dayTime
 				this.searchForm.searchStr = "";
-				
+
 				this.searchForm.companyId = "";
 				this.searchForm.companyName = "";
 				this.$refs.dep.clearSelect();
@@ -661,22 +662,10 @@
 				}
 				let str = JSON.stringify(v);
 				let data = JSON.parse(str);
-				this.form = data;
-				if (this.form.methodOfSettlement == 0) { //现金
-					this.form.xianjin = this.form.allCost
-					this.form.yuefu = ""
-				} else if (this.form.methodOfSettlement == 1) {
-					this.form.xianjin = ""
-					this.form.yuefu = this.form.allCost
-				}
-				this.showType = "0";
-				this.showOrder = true;
-			},
-			
-			
-			
-			getDetail(v) {
-				this.showDetail(v);
+				this.Visiable = true;
+				this.$nextTick(() => {
+					this.$refs.dialog.initRecharge(data);
+				});
 			},
 			dropDown() {
 				if (this.drop) {