diff --git a/jeepay-ui-uapp-merchant/pageCoupon/discountCoupons.vue b/jeepay-ui-uapp-merchant/pageCoupon/discountCoupons.vue
new file mode 100644
index 0000000..73816ad
--- /dev/null
+++ b/jeepay-ui-uapp-merchant/pageCoupon/discountCoupons.vue
@@ -0,0 +1,280 @@
+
+
+
+
+ 基础设置
+
+
+ 赠送设置
+
+
+
+
+
+ 折扣名称
+
+
+
+
+
+
+ 折扣（%）
+
+
+
+
+
+
+ 使用门槛
+
+
+
+
+
+
+ 优惠券类型
+
+
+ 单次折扣券
+ 储值折扣券
+
+
+ 最大抵扣金额
+
+
+
+
+
+
+ 抵扣规则
+
+ 从最高价开始抵扣
+
+ 可抵扣件数
+
+
+
+
+
+
+ 有效期类型
+
+ 领券后有效期内可用
+
+ 有效期（天）
+
+
+
+
+
+
+ 隔天生效
+
+
+
+
+
+
+ 总发放数量
+
+
+
+
+
+
+ 可用门店
+
+
+ 进本店可用
+ >
+
+
+
+
+ 可用商品
+
+
+ 指定商品可用
+ >
+
+
+
+
+
+ 选择商品
+
+ >
+
+
+
+
+
+
+
+
+ 更多设置
+ >
+
+
+
+
+ 指定时间段可用
+
+
+ 全时段可用
+ 指定时段可用
+
+
+
+
+ 发放方式
+
+
+ 用户不可自行领取
+ >
+
+
+
+
+ 每人领取限量
+
+ 不限量
+
+
+ 不限量
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jeepay-ui-uapp-merchant/pageCoupon/index.vue b/jeepay-ui-uapp-merchant/pageCoupon/index.vue
new file mode 100644
index 0000000..ccf5b16
--- /dev/null
+++ b/jeepay-ui-uapp-merchant/pageCoupon/index.vue
@@ -0,0 +1,515 @@
+
+
+
+
+ {{item}}
+
+
+
+
+
+ 搜索优惠券名称
+
+
+ 搜索
+
+
+
+
+
+
+
+ 充值20元优惠券
+
+
+ ID:258792
+
+
+
+
+
+ 使用门槛
+
+
+ 满200.00元减20.00元
+
+
+
+
+ 券类型
+
+
+ 店铺领取可用
+
+
+
+
+ 使用门槛
+
+
+ 满200.00元减20.00元
+
+
+
+
+ 使用门槛
+
+
+ 满200.00元减20.00元
+
+
+
+
+ 使用门槛门槛
+
+
+ 满200.00元减20.00元
+
+
+
+
+
+
+
+
+
+ 1000
+
+
+ 发放数量
+
+
+
+
+ 1000
+
+
+ 发放数量
+
+
+
+
+ 1000
+
+
+ 发放数量
+
+
+
+
+ 1000
+
+
+ 发放数量
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 充值20元优惠券
+
+
+ ID:258792
+
+
+
+
+
+ 使用门槛
+
+
+ 满200.00元减20.00元
+
+
+
+
+ 券类型
+
+
+ 店铺领取可用
+
+
+
+
+ 使用门槛
+
+
+ 满200.00元减20.00元
+
+
+
+
+ 使用门槛
+
+
+ 满200.00元减20.00元
+
+
+
+
+ 使用门槛门槛
+
+
+ 满200.00元减20.00元
+
+
+
+
+
+
+
+
+
+ 1000
+
+
+ 发放数量
+
+
+
+
+ 1000
+
+
+ 发放数量
+
+
+
+
+ 1000
+
+
+ 发放数量
+
+
+
+
+ 1000
+
+
+ 发放数量
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 充值20元优惠券
+
+
+ ID:258792
+
+
+
+
+
+ 使用门槛
+
+
+ 满200.00元减20.00元
+
+
+
+
+ 券类型
+
+
+ 店铺领取可用
+
+
+
+
+ 使用门槛
+
+
+ 满200.00元减20.00元
+
+
+
+
+ 使用门槛
+
+
+ 满200.00元减20.00元
+
+
+
+
+ 使用门槛门槛
+
+
+ 满200.00元减20.00元
+
+
+
+
+
+
+
+
+
+ 1000
+
+
+ 发放数量
+
+
+
+
+ 1000
+
+
+ 发放数量
+
+
+
+
+ 1000
+
+
+ 发放数量
+
+
+
+
+ 1000
+
+
+ 发放数量
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jeepay-ui-uapp-merchant/pages.json b/jeepay-ui-uapp-merchant/pages.json
index 8a44b33..882ad9f 100644
--- a/jeepay-ui-uapp-merchant/pages.json
+++ b/jeepay-ui-uapp-merchant/pages.json
@@ -2,8 +2,8 @@
"easycom": {
"autoscan": true,
"custom": {
- "^my-(.*)":"@/components/my-components/my-$1.vue",
- "^u-(.*)": "@/components/my-components/u-$1/u-$1.vue"
+ "^my-(.*)": "@/components/my-components/my-$1.vue",
+ "^u-(.*)": "@/components/my-components/u-$1/u-$1.vue"
}
},
"pages": [{
@@ -875,18 +875,16 @@
},
{
"pageId": "PAGES_PRODUCT_INVOICING_LIST",
- "path" : "invoicing-list/invoicing-list",
- "style" :
- {
- "navigationBarTitleText" : "库存记录"
+ "path": "invoicing-list/invoicing-list",
+ "style": {
+ "navigationBarTitleText": "库存记录"
}
},
{
"pageId": "PAGES_PRODUCT_INVOICING_CHECK",
- "path" : "invoicing-check/invoicing-check",
- "style" :
- {
- "navigationBarTitleText" : "库存盘点"
+ "path": "invoicing-check/invoicing-check",
+ "style": {
+ "navigationBarTitleText": "库存盘点"
}
}
@@ -997,10 +995,9 @@
},
{
"pageId": "PAGES_CRESATE_ORDER_DETAIL",
- "path" : "order-detail/order-detail",
- "style" :
- {
- "navigationBarTitleText" : "订单详情"
+ "path": "order-detail/order-detail",
+ "style": {
+ "navigationBarTitleText": "订单详情"
}
}
@@ -1172,26 +1169,41 @@
{
"root": "pageStoringWine",
"pages": [{
- "pageId": "PAGES_STORING_WINE_INDEX",
- "path": "index/index",
+ "pageId": "PAGES_STORING_WINE_INDEX",
+ "path": "index/index",
+ "style": {
+ "navigationBarTitleText": "存酒管理"
+ }
+ },
+ {
+ "pageId": "PAGES_STORING_WINE_EDIT",
+ "path": "storing-wine/storing-wine",
+ "style": {
+ "navigationBarTitleText": "存酒"
+ }
+ },
+ {
+ "pageId": "PAGES_STORING_WINE_RECORD_DETAIL",
+ "path": "record-details/record-details",
+ "style": {
+ "navigationBarTitleText": "记录详情"
+ }
+ }
+ ]
+ },
+ {
+ "root": "pageCoupon",
+ "pages": [{
+ "pageId": "PAGES_COUPON_INDEX",
+ "path": "index",
"style": {
- "navigationBarTitleText": "存酒管理"
+ "navigationBarTitleText": "优惠券管理"
}
- },
- {
- "pageId": "PAGES_STORING_WINE_EDIT",
- "path" : "storing-wine/storing-wine",
- "style" :
- {
- "navigationBarTitleText" : "存酒"
- }
- },
- {
- "pageId": "PAGES_STORING_WINE_RECORD_DETAIL",
- "path" : "record-details/record-details",
- "style" :
- {
- "navigationBarTitleText" : "记录详情"
+ }, {
+ "pageId": "PAGES_COUPON_DISCOUNTCOUPONS",
+ "path": "discountCoupons",
+ "style": {
+ "navigationBarTitleText": "添加折扣券"
}
}]
}
diff --git a/jeepay-ui-uapp-merchant/pages/index/index.vue b/jeepay-ui-uapp-merchant/pages/index/index.vue
index b289618..95a1df2 100644
--- a/jeepay-ui-uapp-merchant/pages/index/index.vue
+++ b/jeepay-ui-uapp-merchant/pages/index/index.vue
@@ -183,6 +183,11 @@
title: '极速开票',
icon: '/static/indexImg/red-envelope.svg',
pageUrl: 'PAGES_INVOICE'
+ },
+ {
+ title: '优惠券',
+ icon: '/static/indexImg/red-envelope.svg',
+ pageUrl: 'PAGES_COUPON_INDEX'
}
];