diff --git a/components/bottom-line/bottom-line.vue b/components/bottom-line/bottom-line.vue
index b891a4dd..03c556c9 100644
--- a/components/bottom-line/bottom-line.vue
+++ b/components/bottom-line/bottom-line.vue
@@ -2,9 +2,9 @@
-
- {{propMsg || $t('bottom-line.bottom-line.44bct2')}}
-
+
+ {{propMsg || $t('bottom-line.bottom-line.44bct2')}}
+
@@ -33,24 +33,24 @@
.data-bottom-line .bottom-exclude {
padding-bottom: env(safe-area-inset-bottom);
}
- .data-bottom-line .item {
+ .data-bottom-line .line-item {
width: 33.3%;
}
- .data-bottom-line .left,
- .data-bottom-line .right {
+ .data-bottom-line .line-item.left,
+ .data-bottom-line .line-item.right {
margin-top: 8px;
border-bottom: 1px solid #e1e1e1;
}
- .data-bottom-line .msg {
+ .data-bottom-line .line-item.msg {
color: #999;
text-align: center;
font-size: 24rpx;
}
- .data-bottom-line .left,
- .data-bottom-line .msg {
+ .data-bottom-line .line-item.left,
+ .data-bottom-line .line-item.msg {
float: left;
}
- .data-bottom-line .right {
+ .data-bottom-line .line-item.right {
float: right;
}
\ No newline at end of file
diff --git a/components/coupon-card/coupon-card.vue b/components/coupon-card/coupon-card.vue
index d92065fa..3f869190 100644
--- a/components/coupon-card/coupon-card.vue
+++ b/components/coupon-card/coupon-card.vue
@@ -106,8 +106,8 @@
},
// 下标
propIndex: {
- type: Number,
- default: 1,
+ type: [Number,String],
+ default: 0,
},
// 按钮状态 0-领取,1-已领取,2-已抢完,3-去使用,4-已使用,5-已过期
propStatusType: {
diff --git a/locale/en.json b/locale/en.json
index 587659a7..6eebf956 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -127,6 +127,7 @@
"about": "About Us",
"plugins-seckill-index": "Limited time flash sale",
"plugins-coupon-index": "Coupon Collection Center",
+ "plugins-coupon-detail": "Coupon",
"plugins-coupon-shop": "Shop Coupon Collection Center",
"plugins-coupon-user": "My coupons",
"plugins-membershiplevelvip-index": "Member VIP",
diff --git a/locale/zh.json b/locale/zh.json
index dd467f37..32956833 100644
--- a/locale/zh.json
+++ b/locale/zh.json
@@ -129,6 +129,7 @@
"about": "关于我们",
"plugins-seckill-index": "限时秒杀",
"plugins-coupon-index": "领券中心",
+ "plugins-coupon-detail": "优惠券",
"plugins-coupon-shop": "店铺领券中心",
"plugins-coupon-user": "我的卡券",
"plugins-membershiplevelvip-index": "会员VIP",
diff --git a/pages.json b/pages.json
index 43b8e217..78627458 100644
--- a/pages.json
+++ b/pages.json
@@ -540,6 +540,13 @@
"navigationBarTitleText": ""
}
},
+ {
+ "path": "detail/detail",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": ""
+ }
+ },
{
"path": "shop/shop",
"style": {
diff --git a/pages/plugins/coupon/detail/detail.vue b/pages/plugins/coupon/detail/detail.vue
new file mode 100644
index 00000000..de2fc533
--- /dev/null
+++ b/pages/plugins/coupon/detail/detail.vue
@@ -0,0 +1,206 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/plugins/coupon/index/index.css b/pages/plugins/coupon/index/index.css
index adaec3b9..48a68fed 100644
--- a/pages/plugins/coupon/index/index.css
+++ b/pages/plugins/coupon/index/index.css
@@ -20,11 +20,6 @@
padding: 0 24rpx 24rpx 24rpx;
}
-.popup-bottom {
- box-shadow: inset 0px 1px 3px 0px rgba(0, 0, 0, 0.08);
- z-index: 2;
-}
-
.popup-btn {
border: 2rpx solid #FF6E01;
color: #FF6E01;
diff --git a/pages/plugins/coupon/index/index.vue b/pages/plugins/coupon/index/index.vue
index 58b67ebd..0215178c 100644
--- a/pages/plugins/coupon/index/index.vue
+++ b/pages/plugins/coupon/index/index.vue
@@ -14,19 +14,19 @@
-
+
-
+
-
-
+
+
+
+
@@ -55,7 +55,6 @@
data_bottom_line_status: false,
data_list_loding_status: 1,
data_list_loding_msg: '',
- currency_symbol: app.globalData.currency_symbol(),
data_list: [],
data_base: null,
// 优惠劵领取
@@ -98,16 +97,6 @@
this.get_data_list();
},
methods: {
- // 初始化配置
- init_config(status) {
- if ((status || false) == true) {
- this.setData({
- currency_symbol: app.globalData.get_config('currency_symbol'),
- });
- } else {
- app.globalData.is_config(this, 'init_config');
- }
- },
// 获取数据
init() {
this.get_data_list();