diff --git a/src/router/modules/marketing.js b/src/router/modules/marketing.js index 3d43b7f..6b354ba 100644 --- a/src/router/modules/marketing.js +++ b/src/router/modules/marketing.js @@ -199,6 +199,36 @@ const marketingRouter = } ] }, + { + path: 'energy', + name: 'energy', + meta: { + title: '能量管理', + noCache: true + }, + redirect: 'noRedirect', + component: () => import('@/views/marketing/energy/index'), + children: [ + { + path: 'energyConfig', + name: 'energyConfig', + meta: { + title: '能量配置', + noCache: true + }, + component: () => import('@/views/marketing/energy/energyConfig/index') + }, + { + path: 'list', + name: 'energyList', + meta: { + title: '能量列表', + noCache: true + }, + component: () => import('@/views/marketing/energy/energyGoods/index.vue') + } + ] + }, { path: 'allDiscount', name: 'allDiscount', diff --git a/src/views/marketing/energy/energyConfig/index.vue b/src/views/marketing/energy/energyConfig/index.vue new file mode 100644 index 0000000..d01b376 --- /dev/null +++ b/src/views/marketing/energy/energyConfig/index.vue @@ -0,0 +1,201 @@ + + + + + diff --git a/src/views/marketing/energy/energyGoods/editAttr.vue b/src/views/marketing/energy/energyGoods/editAttr.vue new file mode 100644 index 0000000..935b27a --- /dev/null +++ b/src/views/marketing/energy/energyGoods/editAttr.vue @@ -0,0 +1,1417 @@ + + + + + diff --git a/src/views/marketing/energy/energyGoods/index.vue b/src/views/marketing/energy/energyGoods/index.vue new file mode 100644 index 0000000..8ae300e --- /dev/null +++ b/src/views/marketing/energy/energyGoods/index.vue @@ -0,0 +1,1406 @@ + + + + + diff --git a/src/views/marketing/energy/energyGoods/info.vue b/src/views/marketing/energy/energyGoods/info.vue new file mode 100644 index 0000000..fc129a4 --- /dev/null +++ b/src/views/marketing/energy/energyGoods/info.vue @@ -0,0 +1,1281 @@ + + + + + diff --git a/src/views/marketing/energy/index.vue b/src/views/marketing/energy/index.vue new file mode 100644 index 0000000..98240ae --- /dev/null +++ b/src/views/marketing/energy/index.vue @@ -0,0 +1,3 @@ + diff --git a/src/views/order/list/orderDetails.vue b/src/views/order/list/orderDetails.vue index f0cc547..29eb673 100644 --- a/src/views/order/list/orderDetails.vue +++ b/src/views/order/list/orderDetails.vue @@ -175,10 +175,10 @@ }} - +
  • 铸源星抵扣:
    diff --git a/src/views/order/refund/refundDetail.vue b/src/views/order/refund/refundDetail.vue index cc21da4..79d50c6 100644 --- a/src/views/order/refund/refundDetail.vue +++ b/src/views/order/refund/refundDetail.vue @@ -74,6 +74,9 @@ 退货金额:{{ orderDatalist.refund_good_price }}
    退折扣:{{ orderDatalist.amount }}
    +
    + 退铸源星:{{ orderDatalist.integral }} +
    退运费金额:{{ orderDatalist.refund_postage }}