diff --git a/sheep/api/promotion/coupon.js b/sheep/api/promotion/coupon.js
new file mode 100644
index 00000000..d4e62dd5
--- /dev/null
+++ b/sheep/api/promotion/coupon.js
@@ -0,0 +1,12 @@
+import request from '@/sheep/request';
+
+export default {
+ // 获得优惠劵模板列表
+ getCouponTemplateListByIds: (ids) => {
+ return request({
+ url: '/app-api/promotion/coupon-template/list-by-ids',
+ method: 'GET',
+ params: { ids }
+ });
+ }
+}
diff --git a/sheep/components/s-block-item/s-block-item.vue b/sheep/components/s-block-item/s-block-item.vue
index e0be2c48..21fe32da 100644
--- a/sheep/components/s-block-item/s-block-item.vue
+++ b/sheep/components/s-block-item/s-block-item.vue
@@ -31,7 +31,7 @@
-
+
@@ -42,7 +42,7 @@
-
+
diff --git a/sheep/components/s-coupon-block/s-coupon-block.vue b/sheep/components/s-coupon-block/s-coupon-block.vue
index d8060bce..af29c097 100644
--- a/sheep/components/s-coupon-block/s-coupon-block.vue
+++ b/sheep/components/s-coupon-block/s-coupon-block.vue
@@ -1,126 +1,54 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
- 立即领取
+
+
-
-
- {{ item.get_status_text }}
-
-
-
-
-
-
+ 立即领取
+
+
+
+
-
-
-
-
-
-
-
-
- {{ item.get_status_text }}
-
-
-
-
-
-
-
-
+
@@ -168,25 +131,21 @@
border-radius: 25rpx;
font-size: 24rpx;
line-height: 50rpx;
+ &.vertical {
+ width: 50rpx;
+ height: 140rpx;
+ margin: auto 20rpx auto 0;
+
+ .btn-text {
+ font-size: 24rpx;
+ text-align: center;
+ writing-mode: vertical-lr;
+ }
+ }
}
.coupon-item {
&:nth-of-type(1) {
margin-left: 0 !important;
}
}
- .md-coupon-wrap {
- .card-btn {
- width: 50rpx;
- height: 140rpx;
- margin: auto 0;
- margin-right: 20rpx;
-
- .btn-text {
- font-size: 24rpx;
- text-align: center;
- writing-mode: vertical-lr;
- writing-mode: tb-lr;
- }
- }
- }
diff --git a/sheep/components/s-goods-column/s-goods-column.vue b/sheep/components/s-goods-column/s-goods-column.vue
index 8cf57c76..e82b870d 100644
--- a/sheep/components/s-goods-column/s-goods-column.vue
+++ b/sheep/components/s-goods-column/s-goods-column.vue
@@ -11,7 +11,7 @@
-
+
-
+
-
+
拼团
-
+
-
+
diff --git a/sheep/components/s-goods-shelves/s-goods-shelves.vue b/sheep/components/s-goods-shelves/s-goods-shelves.vue
index 06975d34..2992807a 100644
--- a/sheep/components/s-goods-shelves/s-goods-shelves.vue
+++ b/sheep/components/s-goods-shelves/s-goods-shelves.vue
@@ -1,8 +1,8 @@
-
+
@@ -19,10 +19,10 @@
-
+
@@ -49,10 +49,10 @@
-
-
+
+
@@ -89,12 +89,11 @@