From 667563d6ae12c2da2a16bf68be67a008d5bc6138 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 06 八月 2024 20:48:41 +0800
Subject: [PATCH] update
---
sub_pages/supplier/order-settlement/order-settlement-detail.vue | 46 ++++++++++++++++++++++++++++------------------
sub_pages/supplier/order-settlement/order-settlement.vue | 8 ++++++--
2 files changed, 34 insertions(+), 20 deletions(-)
diff --git a/sub_pages/supplier/order-settlement/order-settlement-detail.vue b/sub_pages/supplier/order-settlement/order-settlement-detail.vue
index d51ec47..e2b9bfb 100644
--- a/sub_pages/supplier/order-settlement/order-settlement-detail.vue
+++ b/sub_pages/supplier/order-settlement/order-settlement-detail.vue
@@ -55,24 +55,24 @@
</view> -->
<view class="tj-container-p">
<view class="tj-container flex">
- <view class="tj-each flex1">
- <view class="value">￥{{dto.price||'0.00'}}</view>
- <view class="label">结算单价</view>
- </view>
- <view class="tj-each flex1">
- <view class="value">{{dto.flowerNum||'0.00'}}</view>
- <view class="label">商品数量</view>
- </view>
- <view class="tj-each flex1">
- <view class="value">{{dto.orderNum}}</view>
- <view class="label">订单数量</view>
- </view>
- <view class="tj-each flex1">
- <view class="value">{{dto.customerNum}}</view>
- <view class="label">买家数量</view>
- </view>
+ <view class="tj-each flex1">
+ <view class="value">￥{{dto.price||'0.00'}}</view>
+ <view class="label">结算单价</view>
</view>
-
+ <view class="tj-each flex1">
+ <view class="value">{{dto.flowerNum||'0.00'}}</view>
+ <view class="label">商品数量</view>
+ </view>
+ <view class="tj-each flex1">
+ <view class="value">{{dto.orderNum}}</view>
+ <view class="label">订单数量</view>
+ </view>
+ <view class="tj-each flex1">
+ <view class="value">{{dto.customerNum}}</view>
+ <view class="label">买家数量</view>
+ </view>
+ </view>
+
<view class="tj-container m-t-12 flex">
<view class="tj-each flex1">
<view class="value">{{dto.serviceFee}}</view>
@@ -179,11 +179,21 @@
methods: {
async getDetail() {
+ var turl = ''
+ // #ifdef PUB_SUPPLIER
+ turl = '/api/supplier/settlement/list/view?id='
+ // #endif
+ // #ifdef PUB_PARTNER
+ turl = '/api/partner/settlement/list/view?id='
+ // #endif
+
+
+
this.$message.showLoading()
const {
code,
data
- } = await this.$http.request('get', '/api/partner/settlement/list/view?id=' + this.id, {
+ } = await this.$http.request('get', turl + this.id, {
})
diff --git a/sub_pages/supplier/order-settlement/order-settlement.vue b/sub_pages/supplier/order-settlement/order-settlement.vue
index 72251da..47e859f 100644
--- a/sub_pages/supplier/order-settlement/order-settlement.vue
+++ b/sub_pages/supplier/order-settlement/order-settlement.vue
@@ -101,8 +101,12 @@
var lastMonthDate = new Date(new Date(this.$util.toDate(new Date(currentMonthStr).getTime() + 3600_000 * 24 *
40).substring(0, 8) + '01').getTime() - 3600_000 * 24 * 1)
this.query.endDateStr = this.$util.toDate(lastMonthDate)
-
- this.listApi = '/api/partner/settlement/list'
+ // #ifdef PUB_PARTNER
+ this.listApi = '/api/partner/settlement/list'
+ // #endif
+ // #ifdef PUB_SUPPLIER
+ this.listApi = '/api/supplier/settlement/list'
+ // #endif
this.getList()
},
--
Gitblit v1.9.3