diff --git a/src/api/system/giftcoupon.js b/src/api/system/giftcoupon.js
index 975e3c2..79f108b 100644
--- a/src/api/system/giftcoupon.js
+++ b/src/api/system/giftcoupon.js
@@ -9,7 +9,7 @@ export function listGiftCoupons(query) {
})
}
-// 礼金详情
+// 礼金详情(包含关联订单)
export function getGiftCoupon(giftCouponKey) {
return request({
url: `/system/giftcoupon/${giftCouponKey}`,
diff --git a/src/router/index.js b/src/router/index.js
index 980750f..0ab20e3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -243,6 +243,23 @@ export const dynamicRoutes = [
}
]
},
+ // 礼金管理
+ {
+ path: '/giftcoupon',
+ component: Layout,
+ redirect: 'noredirect',
+ name: 'GiftCoupon',
+ meta: { title: '礼金管理', icon: 'money' },
+ permissions: ['system:giftcoupon:list'],
+ children: [
+ {
+ path: 'index',
+ component: () => import('@/views/system/giftcoupon/index'),
+ name: 'GiftCouponIndex',
+ meta: { title: '礼金列表', icon: 'gift' }
+ }
+ ]
+ },
// 系统管理
{
path: '/system',
diff --git a/src/views/system/giftcoupon/index.vue b/src/views/system/giftcoupon/index.vue
index 17e051c..55d943a 100644
--- a/src/views/system/giftcoupon/index.vue
+++ b/src/views/system/giftcoupon/index.vue
@@ -40,6 +40,7 @@
搜索
重置
+ 创建礼金
导出
@@ -147,30 +148,97 @@
+
+
+
+
+
+
+
+
+
+
+
+ 自营
+ POP
+
+
+
+
+ 范围:1-50元
+
+
+
+ 范围:1-100
+
+
+
+
+
-
-
- {{ currentRow.giftCouponKey }}
- {{ currentRow.skuId }}
- {{ currentRow.skuName }}
-
-
- {{ currentRow.owner === 'g' ? '自营' : 'POP' }}
-
-
- {{ currentRow.useCount }}
- ¥{{ formatMoney(currentRow.totalOcsAmount || 0) }}
- {{ parseTime(currentRow.createTime) }}
-
- {{ parseTime(currentRow.expireTime) }}
- -
-
-
-
- {{ currentRow.isExpired === 1 ? '已过期' : '未过期' }}
-
-
-
+
+
+
+
+
+
+ {{ detailData.giftCoupon.giftCouponKey }}
+ 复制
+
+ {{ detailData.giftCoupon.skuId }}
+ {{ detailData.giftCoupon.skuName }}
+
+
+ {{ detailData.giftCoupon.owner === 'g' ? '自营' : 'POP' }}
+
+
+ {{ detailData.giftCoupon.useCount }}
+ ¥{{ formatMoney(detailData.giftCoupon.totalOcsAmount || 0) }}
+ {{ parseTime(detailData.giftCoupon.createTime) }}
+
+ {{ parseTime(detailData.giftCoupon.expireTime) }}
+ -
+
+
+
+ {{ detailData.giftCoupon.isExpired === 1 ? '已过期' : '未过期' }}
+
+
+
+
+
+
+
+
+
+
+ ¥{{ formatMoney(scope.row.price || 0) }}
+
+
+ ¥{{ formatMoney(scope.row.giftCouponOcsAmount || 0) }}
+
+
+ {{ parseTime(scope.row.orderTime) }}
+
+
+
+
+ -
+
+
+
+
+ 暂无关联订单
+
+
+
+
@@ -179,7 +247,8 @@