Browse Source

团餐增加参数

lishanshan 4 months ago
parent
commit
deff1bbdf3

+ 2 - 2
api/account.js

@@ -32,8 +32,8 @@ const apiService = {
 	},
 
   // 结算详情
-	settlementDetail(id) {
-		return http.get(`/merchant/account/settlementDetail?settlementId=${id}`);
+	settlementDetail(params) {
+		return http.get('/merchant/account/settlementDetail',{params});
 	},
 
   // 结算订单详情

+ 1 - 1
pages/finance/components/order-list.vue

@@ -34,7 +34,7 @@ export default {
     goDetails(item) {
       const pathName = this.orderType === 2 ? 'groupMealDetails' : 'orderDetails';
       uni.navigateTo({
-        url: `/pages/finance/${pathName}?id=${item.orderId}`,
+        url: `/pages/finance/${pathName}?id=${item.orderId}&jumpType=${item.jumpType}`,
       });
     },
   },

+ 5 - 3
pages/finance/groupMealDetails.vue

@@ -52,6 +52,7 @@ export default {
   data() {
     return {
       orderId: '',
+      jumpType: '',
       settlementInfo: {},
       orderList: [],
       groupMealFields,
@@ -74,15 +75,16 @@ export default {
   onLoad(options) {
     if (options.id) {
       this.orderId = options.id;
+      this.jumpType = options.jumpType;
     }
   },
   onShow() {
-    this.getDetails(this.orderId);
+    this.getDetails(this.orderId, this.jumpType);
   },
   methods: {
-    getDetails(id) {
+    getDetails(id, jumpType) {
       api
-        .settlementDetail(id)
+        .settlementDetail({ settlementId: id, jumpType })
         .then((res) => {
           if (res.data.code === 200) {
             this.settlementInfo = res.data.result || {};

+ 1 - 1
pages/finance/settlementDetails.vue

@@ -88,7 +88,7 @@ export default {
   methods: {
     getDetails(id) {
       api
-        .settlementDetail(id)
+        .settlementDetail({ settlementId: id })
         .then((res) => {
           if (res.data.code === 200) {
             this.settlementInfo = res.data.result;