From d5f269a4155d4e7cd08d85f44861c7d6076d9b2a Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 18 十二月 2024 09:52:06 +0800
Subject: [PATCH] 1.暂时屏蔽掉子账号相关功能
---
sub_pages/supplier/order-settlement/order-settlement-detail.vue | 140 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 128 insertions(+), 12 deletions(-)
diff --git a/sub_pages/supplier/order-settlement/order-settlement-detail.vue b/sub_pages/supplier/order-settlement/order-settlement-detail.vue
index e2defe2..68b8a6a 100644
--- a/sub_pages/supplier/order-settlement/order-settlement-detail.vue
+++ b/sub_pages/supplier/order-settlement/order-settlement-detail.vue
@@ -1,5 +1,7 @@
<template>
<view class="list-container order-sale supplier p20">
+
+
<view class="m-b-24 order-sale-list list-container">
<view class="order-sale-item br-4 m-t-12 list-item bg-white">
<view class="title flex">
@@ -9,10 +11,10 @@
</view>
</view>
<view class="line"></view>
- <view class="form">
+ <!-- <view class="form">
<view class="flex">
<view class="form-item flex1">
- <view class="label">结算单价/均价</view>
+ <view class="label">结算单价</view>
<view class="value">￥{{dto.price||'0.00'}}</view>
</view>
<view class="form-item flex1">
@@ -50,6 +52,63 @@
<view class="value">{{dto.stationFee}}</view>
</view>
</view>
+ </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'}}扎</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.salesFee}}</view>
+ <view class="label">售后理赔</view>
+ </view>
+ <view class="tj-each flex1">
+ <view class="value">{{dto.lackFee}}</view>
+ <view class="label">缺货扣款</view>
+ </view>
+ <view class="tj-each flex1">
+ <view class="value">{{dto.replaceFee}}</view>
+ <view class="label">补货扣款</view>
+ </view>
+ <view class="tj-each flex1">
+ <view class="value">{{dto.checkFee}}</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>
+ <view class="label">服务费</view>
+ </view>
+ <view class="tj-each flex1">
+ <view class="value">{{dto.stationFee}}</view>
+ <view class="label">集货站运费</view>
+ </view>
+ <view class="tj-each flex1">
+ <view class="value"> </view>
+ <view class="label"> </view>
+ </view>
+ <view class="tj-each flex1">
+ <view class="value"> </view>
+ <view class="label"> </view>
+ </view>
+ </view>
</view>
<view class="line"></view>
@@ -67,7 +126,7 @@
</view>
</view>
</view>
-
+
<view class="m-b-24 order-sale-list list-container">
<view class="order-sale-item br-4 m-t-12 list-item bg-white">
<view class="title flex">
@@ -96,8 +155,18 @@
<view class="value">￥{{item.totalAmount||0}}</view>
</view>
<view class="form-item">
- <view class="label">质检扣款</view>
+ <view class="label">降级扣款</view>
<view class="value">￥{{item.checkFee||'0.00'}}</view>
+ </view>
+ </view>
+ <view class="flex">
+ <view class="form-item">
+ <view class="label">缺货扣款</view>
+ <view class="value">￥{{item.lackFee||'0.00'}}</view>
+ </view>
+ <view class="form-item">
+ <view class="label">补货扣款</view>
+ <view class="value">￥{{item.replaceFee||'0.00'}}</view>
</view>
</view>
<view class="flex">
@@ -111,9 +180,9 @@
</view>
</view>
</view>
-
+
</view>
-
+
</view>
</view>
</view>
@@ -130,19 +199,32 @@
}
},
onLoad(options) {
+ console.log('options',options)
this.id = options.id || ''
- if (this.id)
- this.getList()
+ if (this.id){
+ this.getDetail()
+
+ }
},
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
+ console.log('turl',turl)
+
+
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, {
})
@@ -150,7 +232,7 @@
if (code == 0) {
this.dto = {
...data,
- details:data.details||[]
+ details: data.details || []
}
}
@@ -161,6 +243,40 @@
</script>
<style lang="scss" scope>
+ .order-sale {
+ .tj-container-p {
+ background: #E6F2EB;
+ padding: 30rpx;
+
+ .tj-container {
+ // height: 148rpx;
+ background: #FFFFFF;
+ border-radius: 8rpx;
+ padding-top: 16rpx;
+ padding-bottom: 16rpx;
+
+ .tj-each {
+ text-align: center;
+
+ .label {
+ margin-top: 16rpx;
+ font-weight: 400;
+ font-size: 24rpx;
+ color: #000000;
+ line-height: 34rpx;
+ }
+
+ .value {
+ font-weight: 400;
+ font-size: 32rpx;
+ color: #CF0000;
+ line-height: 44rpx;
+ }
+ }
+ }
+ }
+ }
+
.order-sale-list {
.order-sale-item {
margin-bottom: 20rpx;
@@ -181,8 +297,8 @@
}
.form {
- display: flex;
- flex-wrap: wrap;
+ // display: flex;
+ // flex-wrap: wrap;
.form-item {
flex: 1;
--
Gitblit v1.9.3