From eb03747c6eb55885a8feb8270a0f7a1a0fc88d05 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Fri, 26 Sep 2025 19:56:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=88=E5=8A=9E=E8=AE=A2?=
=?UTF-8?q?=E5=8D=95=E4=BC=98=E6=83=A0=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages.json | 9 +-
pages/order/coupon.vue | 1241 ++++++++++++++++++++-------------------
pages/order/coupon1.vue | 634 ++++++++++++++++++++
3 files changed, 1285 insertions(+), 599 deletions(-)
create mode 100644 pages/order/coupon1.vue
diff --git a/pages.json b/pages.json
index 6d87585..2ff3cda 100644
--- a/pages.json
+++ b/pages.json
@@ -75,7 +75,7 @@
{
"path": "pages/order/coupon",
"style": {
- "navigationBarTitleText": "优惠劵"
+ "navigationBarTitleText": "选择优惠劵"
}
},
{
@@ -220,10 +220,9 @@
}
},
{
- "path" : "score/list",
- "style" :
- {
- "navigationBarTitleText" : "积分门店"
+ "path": "score/list",
+ "style": {
+ "navigationBarTitleText": "积分门店"
}
}
diff --git a/pages/order/coupon.vue b/pages/order/coupon.vue
index 5433e31..fa91e36 100644
--- a/pages/order/coupon.vue
+++ b/pages/order/coupon.vue
@@ -1,634 +1,687 @@
-
-
-
-
-
-
- 1
- 张
-
-
- ¥
- {{item.discountAmount || 0}}
-
-
-
- {{ item.type == 2 ? item.name : '优惠券(元)'}}
-
-
-
-
-
-
- {{ item.shopName }}
-
-
- 无门槛使用
-
-
- {{ item.type == 2 ? '会员商品券' : item.name}}
-
-
- 去使用
-
-
-
-
-
-
-
-
- 不可使用
-
-
-
- 有效期至:{{item.endTime}}
-
+
-
-
-
-
- 确定
-
-
-
+
+
+ 使用商品兑换券的商品,不再计入同享优惠券门槛和折扣计算。
+
+
+ 可用红包
+ 3张
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+ {{ dayjs(item.effectStartTime).format('YYYY.M.D') }} - {{ dayjs(item.effectEndTime).format('YYYY.M.D') }}
+
+
+
+
+
+
+
+
+
+
+ 1、可适用门店:{{ item.useShops }} 2、可适用商品:{{ item.foods }}3、可使用类型:{{ convertValuesToLabels(item.useType) }}
+
+ 查看详情
+
+
+
+
+ 不可用红包
+ 3张
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+ {{ dayjs(item.effectStartTime).format('YYYY.M.D') }} - {{ dayjs(item.effectEndTime).format('YYYY.M.D') }}
+
+
+
+
+
+
+
+
+
+ 不可用原因:
+ 不在使用时间内
+
+
+
+
+
+
+
+
+
+
-
+
\ No newline at end of file
+}
+.list-wrap {
+ padding-top: 28upx;
+ .tips {
+ .t {
+ color: #666;
+ font-size: 24upx;
+ }
+ }
+ .title-wrap {
+ display: flex;
+ align-items: center;
+ gap: 10upx;
+ padding-top: 28upx;
+ .t {
+ font-size: 32upx;
+ color: #333;
+ }
+ .n {
+ color: #666;
+ font-size: 24upx;
+ }
+ }
+ .item {
+ border-radius: 18upx;
+ background-color: #fff;
+ padding: 28upx;
+ &:not(:first-child) {
+ margin-top: 28upx;
+ }
+ &.disabled {
+ .top {
+ position: relative;
+ &::after {
+ content: '';
+ width: 100%;
+ height: 100%;
+ position: absolute;
+ top: 0;
+ left: 0;
+ z-index: 10;
+ background-color: rgba(255, 255, 255, 0.6);
+ }
+ .btn {
+ .round {
+ background-color: #f0f0f0;
+ }
+ }
+ }
+ }
+ .top {
+ display: flex;
+ align-items: center;
+ padding-bottom: 28upx;
+ .icon {
+ $size: 140upx;
+ width: $size;
+ height: $size;
+ margin-right: 28upx;
+ }
+ .info {
+ flex: 1;
+ display: flex;
+ justify-content: center;
+ flex-direction: column;
+ gap: 8upx;
+ padding: 0 28upx;
+ position: relative;
+ &::after {
+ $height: 100upx;
+ content: '';
+ height: $height;
+ border-left: 1upx solid #f7f7f7;
+ position: absolute;
+ top: 50%;
+ margin-top: $height * 0.5 * -1;
+ left: 0;
+ }
+ .view {
+ flex: 1;
+ &.name {
+ font-size: 32upx;
+ color: #333;
+ }
+ &.time {
+ .t {
+ font-size: 24upx;
+ color: #999;
+ }
+ }
+ }
+ }
+ .btn {
+ width: 40upx;
+ height: 40upx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ .round {
+ width: 100%;
+ height: 100%;
+ border-radius: 50%;
+ background-color: #fff;
+ border: 1px solid #d9d9d9;
+ }
+ }
+ }
+ .btm {
+ display: flex;
+ align-items: center;
+ padding: 28upx 0 14upx;
+ border-top: 1upx solid #f7f7f7;
+ .left {
+ flex: 1;
+ height: 40upx;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ font-size: 24upx;
+ color: #999;
+ }
+ .right {
+ flex: 1;
+ display: flex;
+ align-items: center;
+ padding-left: 28upx;
+ justify-content: flex-end;
+ .t {
+ font-size: 24upx;
+ color: #333;
+ }
+ }
+ .error {
+ flex: 1;
+ .t {
+ font-size: 24upx;
+
+ &.t1 {
+ color: #ff1c1c;
+ }
+ &.t2 {
+ color: #333;
+ }
+ }
+ }
+ }
+ }
+}
+.shoplist-popup {
+ padding: 0 28upx 28upx;
+ .title {
+ padding: 28upx 0;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ .t {
+ font-size: 32upx;
+ font-weight: bold;
+ color: #333;
+ }
+ }
+ .popup-list {
+ max-height: 50vh;
+ .item {
+ padding: 28upx;
+ border-radius: 12upx;
+ background-color: #f7f7f7;
+ margin-bottom: 28upx;
+ display: flex;
+ flex-direction: column;
+ padding: 28upx;
+ .t {
+ font-size: 28upx;
+ font-weight: bold;
+ color: #333;
+ /* 必须设置宽度 */
+ width: 600upx; /* 或具体像素值 */
+
+ /* 关键属性 */
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 1; /* 显示2行 */
+ overflow: hidden;
+
+ /* 文本溢出省略号 */
+ text-overflow: ellipsis;
+
+ /* 可选:防止行高度,确保计算准确 */
+ line-height: 1.5;
+ word-break: break-all; /* 允许在单词内换行 */
+ word-wrap: break-word; /* 允许长单词或URL换行 */
+ }
+ .intro {
+ font-size: 28upx;
+ color: #999;
+ /* 必须设置宽度 */
+ width: 600upx; /* 或具体像素值 */
+
+ /* 关键属性 */
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2; /* 显示2行 */
+ overflow: hidden;
+
+ /* 文本溢出省略号 */
+ text-overflow: ellipsis;
+
+ /* 可选:防止行高度,确保计算准确 */
+ line-height: 1.5;
+ word-break: break-all; /* 允许在单词内换行 */
+ word-wrap: break-word; /* 允许长单词或URL换行 */
+ }
+ }
+ .ul {
+ .li {
+ color: #999;
+ font-size: 28upx;
+ padding: 8upx 0;
+ .t {
+ color: #999;
+ font-size: 28upx;
+ }
+ }
+ }
+ }
+}
+
diff --git a/pages/order/coupon1.vue b/pages/order/coupon1.vue
new file mode 100644
index 0000000..5433e31
--- /dev/null
+++ b/pages/order/coupon1.vue
@@ -0,0 +1,634 @@
+
+
+
+
+
+
+
+
+ 1
+ 张
+
+
+ ¥
+ {{item.discountAmount || 0}}
+
+
+
+ {{ item.type == 2 ? item.name : '优惠券(元)'}}
+
+
+
+
+
+
+ {{ item.shopName }}
+
+
+ 无门槛使用
+
+
+ {{ item.type == 2 ? '会员商品券' : item.name}}
+
+
+ 去使用
+
+
+
+
+
+
+
+
+ 不可使用
+
+
+
+ 有效期至:{{item.endTime}}
+
+
+
+
+
+
+
+
+
+
+
+
+ 确定
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file