结算单添加积分,砍价价格字段

This commit is contained in:
mabo
2021-07-28 10:56:37 +08:00
parent 2385bbd912
commit 94a9404b39
5 changed files with 126 additions and 189 deletions

View File

@@ -18,14 +18,14 @@ export default {
* @description api请求基础路径
*/
api_dev: {
// common: "https://common-api.pickmall.cn",
// buyer: "https://buyer-api.pickmall.cn",
// seller: "https://store-api.pickmall.cn",
// manager: "https://admin-api.pickmall.cn"
common: 'http://192.168.0.101:8890',
buyer: 'http://192.168.0.101:8888',
seller: 'http://192.168.0.101:8889',
manager: 'http://192.168.0.101:8887'
common: "https://common-api.pickmall.cn",
buyer: "https://buyer-api.pickmall.cn",
seller: "https://store-api.pickmall.cn",
manager: "https://admin-api.pickmall.cn"
// common: 'http://192.168.0.101:8890',
// buyer: 'http://192.168.0.101:8888',
// seller: 'http://192.168.0.101:8889',
// manager: 'http://192.168.0.101:8887'
},
api_prod: {
common: "https://common-api.pickmall.cn",

View File

@@ -165,17 +165,14 @@ export default {
{
title: "入账时间",
key: "createTime",
minWidth: 120
},
{
title: "订单编号",
key: "sn",
minWidth: 120
},
{
title: "订单金额",
key: "finalPrice",
minWidth: 120,
render: (h, params) => {
return h(
"div",
@@ -183,10 +180,29 @@ export default {
);
},
},
{
title: "砍价商品结算价格",
key: "kanjiaSettlementPrice",
render: (h, params) => {
return h(
"div",
this.$options.filters.unitPrice(params.row.kanjiaSettlementPrice, "¥")
);
},
},
{
title: "积分商品结算价格",
key: "pointSettlementPrice",
render: (h, params) => {
return h(
"div",
this.$options.filters.unitPrice(params.row.pointSettlementPrice, "¥")
);
},
},
{
title: "平台分佣",
key: "commissionPrice",
minWidth: 120,
render: (h, params) => {
return h(
"div",
@@ -197,7 +213,6 @@ export default {
{
title: "平台优惠券",
key: "siteCouponPrice",
minWidth: 120,
render: (h, params) => {
if(params.row.siteCouponPrice == null){
return h(
@@ -216,7 +231,6 @@ export default {
{
title: "分销金额",
key: "distributionRebate",
minWidth: 100,
render: (h, params) => {
if(params.row.distributionRebate == null){
return h(
@@ -235,7 +249,6 @@ export default {
{
title: "应结金额",
key: "billPrice",
minWidth: 120,
render: (h, params) => {
return h(
"div",