diff --git a/components/discountCoupon/index.js b/components/discountCoupon/index.js index 2b2cddd..eeff869 100644 --- a/components/discountCoupon/index.js +++ b/components/discountCoupon/index.js @@ -38,10 +38,27 @@ Component({ that.triggerEvent("change", { id, type: 2 }) }) }, + showRemark() { + wx.showModal({ + title: '备注', + content: this.data?.data?.remark, + showCancel: false, + complete: (res) => { + if (res.cancel) { + + } + + if (res.confirm) { + + } + } + }) + + }, handleUseIt() { alertInfo("敬请期待") }, - async handleUse(e) { + async handleUse() { const { data } = this.data; const that = this; loadingFunc(async () => { diff --git a/components/discountCoupon/index.json b/components/discountCoupon/index.json index 3b51cdc..6a35321 100644 --- a/components/discountCoupon/index.json +++ b/components/discountCoupon/index.json @@ -1,6 +1,7 @@ { "component": true, "usingComponents": { - "van-button": "@vant/weapp/button/index" + "van-button": "@vant/weapp/button/index", + "van-dialog": "@vant/weapp/dialog/index" } } \ No newline at end of file diff --git a/components/discountCoupon/index.wxml b/components/discountCoupon/index.wxml index 8db85d7..4e012c2 100644 --- a/components/discountCoupon/index.wxml +++ b/components/discountCoupon/index.wxml @@ -26,8 +26,8 @@ - - + + {{data.remark}} 去领取 @@ -35,4 +35,5 @@ 去使用 - \ No newline at end of file + + \ No newline at end of file diff --git a/components/discountCoupon/index.wxss b/components/discountCoupon/index.wxss index 4dac214..214f566 100644 --- a/components/discountCoupon/index.wxss +++ b/components/discountCoupon/index.wxss @@ -10,7 +10,7 @@ display: flex; justify-content: space-between; border-bottom: 1rpx dashed #ccc; - padding-bottom: 20rpx; + padding-bottom: 30rpx; } .top .right { @@ -25,7 +25,7 @@ .typeText { font-weight: 700; - font-size: 42rpx; + font-size: 36rpx; margin-bottom: 20rpx; } @@ -51,5 +51,10 @@ .bottom .left { flex: 1; - font-size: 32rpx; -} \ No newline at end of file + max-width: calc(100vw - 60rpx - 250rpx); + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + font-size: 30rpx; + color: rgba(0, 0, 0, 0.7) +} diff --git a/components/table/table.js b/components/table/table.js index e4dd2c2..c104dcd 100644 --- a/components/table/table.js +++ b/components/table/table.js @@ -27,6 +27,9 @@ Component({ type: String, value: '#d6e8ff' }, + topColor: String, + topStyle: String, + bodyStyle: String, maxLine: { type: Number, value: 2 diff --git a/components/table/table.wxml b/components/table/table.wxml index 54a5a3b..e46080e 100644 --- a/components/table/table.wxml +++ b/components/table/table.wxml @@ -8,12 +8,19 @@