-
- 导出
-
+ 导出
售后提醒内容
@@ -317,34 +315,11 @@ export default {
key: 'aftersales_bn',
width: 200,
render: (h, { row }) => {
- const linkPath =
- (`${this.$store.getters.login_type}` == 'distributor' &&
- '/shopadmin/order/aftersaleslist/detail') ||
- (`${this.$store.getters.login_type}` == 'supplier' &&
- '/supplier/order/aftersaleslist/detail') ||
- (`${this.$store.getters.login_type}` == 'merchant' &&
- '/merchant/order/aftersaleslist/detail') ||
- '/order/aftersales/aftersaleslist/detail'
return h('div', [
h('div', { class: 'order-num' }, [
h(
- 'el-button',
- {
- props: { type: 'text' },
- on: {
- click: () => {
- const routeData = this.$router.resolve({
- path: linkPath,
- query: { aftersales_bn: row.aftersales_bn }
- })
- window.open(routeData.href, '_blank')
- // this.$router.push({
- // path: linkPath,
- // query: { aftersales_bn: row.aftersales_bn }
- // })
- }
- }
- },
+ 'span',
+ {},
row.aftersales_bn
),
h(
@@ -392,30 +367,10 @@ export default {
key: 'order_id',
minWidth: 180,
render: (h, { row }) => {
- const linkPath =
- (`${this.$store.getters.login_type}` == 'distributor' &&
- '/shopadmin/order/tradenormalorders/detail') ||
- (`${this.$store.getters.login_type}` == 'supplier' &&
- '/supplier/order/tradenormalorders/detail') ||
- (`${this.$store.getters.login_type}` == 'merchant' &&
- '/merchant/order/tradenormalorders/detail') ||
- '/order/entitytrade/tradenormalorders/detail'
-
return h('div', { class: 'order-num' }, [
h(
- 'el-button',
- {
- props: { type: 'text' },
- on: {
- click: () => {
- const routeData = this.$router.resolve({
- path: linkPath,
- query: { orderId: row.order_id }
- })
- window.open(routeData.href, '_blank')
- }
- }
- },
+ 'span',
+ {},
row.order_id
),
h(
@@ -456,40 +411,55 @@ export default {
}
},
{
- name: '退款金额（¥）',
+ name: '退款商品金额（¥）',
key: 'refund_fee',
- width: 120,
+ width: 160,
align: 'center'
},
{
- name: '退款运费（¥）',
- key: 'freight',
- width: 120,
- align: 'center',
- render: (h, { row }) => h('span', {}, row.freight / 100)
- },
- {
- name: '退款抵扣积分（¥）',
+ name: '退款抵扣积分',
key: 'refund_point',
width: 160,
align: 'center'
},
{
- name: '实退金额（¥）',
- key: 'refunded_fee',
- width: 120,
+ name: '退款运费金额（¥）',
+ key: 'freight',
+ width: 150,
align: 'center',
render: (h, { row }) => {
+ if (row.freight_type == 'point') return null
+ return h('span', {}, (row.freight / 100).toFixed(2))
+ },
+ },
+ {
+ name: '退款运费（积分）',
+ key: 'freight',
+ width: 160,
+ align: 'center',
+ render: (h, { row }) => {
+ if (row.freight_type == 'cash') return null
+ return h('span', {}, row.freight)
+ },
+ },
+ {
+ name: '实退金额（¥）',
+ key: 'refunded_fee',
+ width: 150,
+ align: 'center',
+ render: (h, { row }) => {
+ if (row.freight_type == 'point') return null
const amount = row.refunded_fee || 0
return h('span', {}, `${(amount / 100).toFixed(2)}`)
}
},
{
- name: '实退积分（¥）',
+ name: '实退积分',
key: 'refunded_point',
width: 120,
align: 'center',
render: (h, { row }) => {
+ if (row.freight_type == 'cash') return null
const points = row.refunded_point || 0
return h('span', {}, `${points}`)
}
@@ -528,22 +498,7 @@ export default {
: '/shopadmin/member/member/memberlist/detail'
return h('div', { class: 'order-num' }, [
- h(
- 'el-button',
- {
- props: { type: 'text' },
- on: {
- click: () => {
- const routeData = this.$router.resolve({
- path: linkPath,
- query: { user_id: row.user_id }
- })
- window.open(routeData.href, '_blank')
- }
- }
- },
- row.mobile
- )
+ h('span', {}, row.mobile)
])
}
return h('span', {}, row.mobile)
diff --git a/src/view/mall/aftersales/reason.vue b/src/view/mall/aftersales/reason.vue
index f934f7f..d4b2f9b 100755
--- a/src/view/mall/aftersales/reason.vue
+++ b/src/view/mall/aftersales/reason.vue
@@ -36,7 +36,7 @@
-
+
提交
diff --git a/src/view/mall/aftersales/refundDetail.vue b/src/view/mall/aftersales/refundDetail.vue
index a238391..1697763 100755
--- a/src/view/mall/aftersales/refundDetail.vue
+++ b/src/view/mall/aftersales/refundDetail.vue
@@ -37,21 +37,21 @@
- 应退金额:
+ 应退商品金额:
￥{{ refundDetail.refund_fee / 100 }}
- 实退金额:
+ 实退商品金额:
￥{{ refundDetail.refunded_fee / 100 }}
- 应退积分:
+ 应退商品积分:
{{ refundDetail.refund_point }}
- 实退积分:
+ 实退商品积分:
{{ refundDetail.refunded_point }}
@@ -126,9 +126,15 @@
- 退运费金额:
+ 退款运费金额（¥）:
- {{ refundDetail.freight / 100 }}
+ {{ refundDetail.freight_type == 'cash' ? (refundDetail.freight / 100).toFixed(2) : 0 }}
+
+
+
+ 退款运费（积分）:
+
+ {{ refundDetail.freight_type == 'point' ? refundDetail.freight : 0 }}
@@ -217,7 +223,7 @@ h3.title {
color: #ff5000;
}
.col-3 {
- width: 120px;
+ width: 150px;
margin-right: 10px;
}
.detail-info {
diff --git a/src/view/mall/aftersales/refundList/components/order.vue b/src/view/mall/aftersales/refundList/components/order.vue
index 709bfc3..3c49bde 100755
--- a/src/view/mall/aftersales/refundList/components/order.vue
+++ b/src/view/mall/aftersales/refundList/components/order.vue
@@ -75,8 +75,25 @@
-
+
+ 详情
+
+ 确认退款
+
+
+
+
+
售后
@@ -222,8 +239,11 @@