1

src/api/index.js

@@ -795,7 +795,7 @@ export const disableCourier = (id, params) => {
     return postRequest(`/courier/admin/disable/${id}`, params)
 }
 
-// 查询充值记录
+// 拼团管理列表
 export const getGroupList = (params) => {
     return postBodyRequest(`/mall/admin/orderGroup/page`, params)
 }

src/views/app/business/recharge/recharge.vue

@@ -86,6 +86,7 @@
 					isFace:'',
 					pageNumber: 1,
 					pageSize: 10,
+					regionId:JSON.parse(this.getStore("user")).departmentId
 				},
 				dictData: [{
 					title: "待成团",

src/views/sys/order-manage/logisticsAddress.vue

@@ -250,10 +250,19 @@
 				return diffMinutes;
 			},
 			returnOrder(){
-				returnOrder({
-					orderId:this.orderData.id,
-					userId:this.orderData.userId
-				}).then((res) => {
+				console.log('好的',this.orderData)
+				let returnFormData = {}
+				
+				this.returnFormData.status = 4
+				this.returnFormData.id = this.orderData.id;
+				this.returnFormData.regionId = JSON.parse(this.getStore("user")).departmentId;
+				this.returnFormData.orderId = this.orderData.orderId;
+				this.returnFormData.deliveryType = this.orderData.deliveryType;
+				this.returnFormData.orderType = this.orderData.orderType;
+				this.returnFormData.refundAmount = this.orderData.refundAmount;
+				this.returnFormData.refundType = this.orderData.refundType;
+				this.returnFormData.refundTypeStatus = this.orderData.refundTypeStatus;
+				returnOrNoOrder(this.returnFormData).then((res) => {
 					this.loading = false;
 					if (res.success) {
 						this.$Message.success("取消订单成功");