From bf75dc276803954bf6f76898a44e0c8b73d2a85c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Thu, 15 Aug 2024 14:18:44 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E8=A3=85=E4=BF=AE=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8=E6=95=B4=E4=BD=93=E7=9A=84=E8=83=8C=E6=99=AF?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=97=AE=E9=A2=98=EF=BC=9B=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?2=E5=88=97=E6=88=96=E8=80=853=E6=8E=92=E4=BC=98=E6=83=A0?=
 =?UTF-8?q?=E5=88=B8=E7=8E=B0=E5=9C=A8=E5=B1=85=E4=B8=AD=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=B9=B6=E4=B8=94=E6=9C=89=E9=97=B4=E9=9A=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../s-coupon-block/s-coupon-block.vue         | 297 ++++++++++--------
 .../s-menu-button/s-menu-button.vue           |   1 -
 2 files changed, 159 insertions(+), 139 deletions(-)

diff --git a/sheep/components/s-coupon-block/s-coupon-block.vue b/sheep/components/s-coupon-block/s-coupon-block.vue
index 6250b4b6..8f66087b 100644
--- a/sheep/components/s-coupon-block/s-coupon-block.vue
+++ b/sheep/components/s-coupon-block/s-coupon-block.vue
@@ -1,152 +1,173 @@
 <!-- 装修营销组件：优惠券  -->
 <template>
-  <scroll-view class="scroll-box" scroll-x scroll-anchoring>
-    <view class="coupon-box ss-flex">
-      <view
-        class="coupon-item"
-        :style="[couponBg, { marginLeft: `${data.space}px` }]"
-        v-for="(item, index) in couponList"
-        :key="index"
-      >
-        <su-coupon
-          :size="SIZE_LIST[columns - 1]"
-          :textColor="data.textColor"
-          background=""
-          :couponId="item.id"
-          :title="item.name"
-          :type="formatCouponDiscountType(item)"
-          :value="formatCouponDiscountValue(item)"
-          :sellBy="formatValidityType(item)"
-        >
-          <template v-slot:btn>
-            <!-- 两列时，领取按钮坚排 -->
-            <button
-              v-if="columns === 2"
-              @click.stop="onGetCoupon(item.id)"
-              class="ss-reset-button card-btn vertical"
-              :style="[btnStyles]"
-            >
-              <view class="btn-text">立即领取</view>
-            </button>
-            <button
-              v-else
-              class="ss-reset-button card-btn"
-              :style="[btnStyles]"
-              @click.stop="onGetCoupon(item.id)"
-            >
-              立即领取
-            </button>
-          </template>
-        </su-coupon>
-      </view>
-    </view>
-  </scroll-view>
+	<scroll-view class="scroll-box" scroll-x scroll-anchoring :style="[bgStyle, { marginLeft: `${data.space}px` }]">
+		<view class="coupon-box ss-flex">
+			<view class="coupon-item" :style="[couponBg, { marginLeft: `${data.space}px` }]"
+				v-for="(item, index) in couponList" :key="index">
+				<su-coupon :size="SIZE_LIST[columns - 1]" :textColor="data.textColor" background="" :couponId="item.id"
+					:title="item.name" :type="formatCouponDiscountType(item)" :value="formatCouponDiscountValue(item)"
+					:sellBy="formatValidityType(item)">
+					<template v-slot:btn>
+						<!-- 两列时，领取按钮坚排 -->
+						<button v-if="columns === 2" @click.stop="onGetCoupon(item.id)"
+							class="ss-reset-button card-btn vertical" :style="[btnStyles]">
+							<view class="btn-text">立即领取</view>
+						</button>
+						<button v-else class="ss-reset-button card-btn" :style="[btnStyles]"
+							@click.stop="onGetCoupon(item.id)">
+							立即领取
+						</button>
+					</template>
+				</su-coupon>
+			</view>
+		</view>
+	</scroll-view>
 </template>
 
 <script setup>
-  import sheep from '@/sheep';
-  import CouponApi from '@/sheep/api/promotion/coupon';
-  import { ref, onMounted } from 'vue';
-  import { CouponTemplateValidityTypeEnum, PromotionDiscountTypeEnum } from "@/sheep/util/const";
-  import { floatToFixed2, formatDate } from "@/sheep/util";
+	import sheep from '@/sheep';
+	import CouponApi from '@/sheep/api/promotion/coupon';
+	import {
+		ref,
+		onMounted,
+		computed
+	} from 'vue';
+	import {
+		CouponTemplateValidityTypeEnum,
+		PromotionDiscountTypeEnum
+	} from "@/sheep/util/const";
+	import {
+		floatToFixed2,
+		formatDate
+	} from "@/sheep/util";
 
-  const props = defineProps({
-    data: {
-      type: Object,
-      default: () => ({}),
-    },
-    styles: {
-      type: Object,
-      default: () => ({}),
-    },
-  });
-  const { columns, button } = props.data;
-  const SIZE_LIST = ['lg', 'md', 'xs']
-  const couponBg = {
-    background: `url(${sheep.$url.cdn(props.data.bgImg)}) no-repeat top center / 100% 100%`,
-  };
-  const btnStyles = {
-    background: button.bgColor,
-    color: button.color,
-  };
+	const props = defineProps({
+		data: {
+			type: Object,
+			default: () => ({}),
+		},
+		styles: {
+			type: Object,
+			default: () => ({}),
+		},
+	});
+	const {
+		columns,
+		button
+	} = props.data;
+	const SIZE_LIST = ['lg', 'md', 'xs']
+	const couponBg = {
+		background: `url(${sheep.$url.cdn(props.data.bgImg)}) no-repeat top center / 100% 100%`,
+	};
+	const btnStyles = {
+		background: button.bgColor,
+		color: button.color,
+	};
+	// 设置背景样式
+	const bgStyle = computed(() => {
+		// 直接从 props.styles 解构
+		const {
+			bgType,
+			bgImg,
+			bgColor
+		} = props.styles;
 
-  // 格式化【折扣类型】
-  const formatCouponDiscountType = (coupon) => {
-    if(coupon.discountType === PromotionDiscountTypeEnum.PRICE.type) {
-      return 'reduce'
-    }
-    if(coupon.discountType === PromotionDiscountTypeEnum.PERCENT.type) {
-      return 'percent'
-    }
-    return `未知【${coupon.discountType}】`
-  }
+		// 根据 bgType 返回相应的样式
+		return {
+			background: bgType === 'img' ? `url(${bgImg}) no-repeat top center / 100% 100%` : bgColor
+		};
+	});
+	// 格式化【折扣类型】
+	const formatCouponDiscountType = (coupon) => {
+		if (coupon.discountType === PromotionDiscountTypeEnum.PRICE.type) {
+			return 'reduce'
+		}
+		if (coupon.discountType === PromotionDiscountTypeEnum.PERCENT.type) {
+			return 'percent'
+		}
+		return `未知【${coupon.discountType}】`
+	}
 
-  // 格式化【折扣】
-  const formatCouponDiscountValue = (coupon) => {
-    if(coupon.discountType === PromotionDiscountTypeEnum.PRICE.type) {
-      return floatToFixed2(coupon.discountPrice)
-    }
-    if(coupon.discountType === PromotionDiscountTypeEnum.PERCENT.type) {
-      return coupon.discountPercent
-    }
-    return `未知【${coupon.discountType}】`
-  }
+	// 格式化【折扣】
+	const formatCouponDiscountValue = (coupon) => {
+		if (coupon.discountType === PromotionDiscountTypeEnum.PRICE.type) {
+			return floatToFixed2(coupon.discountPrice)
+		}
+		if (coupon.discountType === PromotionDiscountTypeEnum.PERCENT.type) {
+			return coupon.discountPercent
+		}
+		return `未知【${coupon.discountType}】`
+	}
 
-  // 格式化【有效期限】
-  const formatValidityType = (row) => {
-    if (row.validityType === CouponTemplateValidityTypeEnum.DATE.type) {
-      return `${formatDate(row.validStartTime)} 至 ${formatDate(row.validEndTime)}`
-    }
-    if (row.validityType === CouponTemplateValidityTypeEnum.TERM.type) {
-      return `领取后第 ${row.fixedStartTerm} - ${row.fixedEndTerm} 天内可用`
-    }
-    return '未知【' + row.validityType + '】'
-  }
+	// 格式化【有效期限】
+	const formatValidityType = (row) => {
+		if (row.validityType === CouponTemplateValidityTypeEnum.DATE.type) {
+			return `${formatDate(row.validStartTime)} 至 ${formatDate(row.validEndTime)}`
+		}
+		if (row.validityType === CouponTemplateValidityTypeEnum.TERM.type) {
+			return `领取后第 ${row.fixedStartTerm} - ${row.fixedEndTerm} 天内可用`
+		}
+		return '未知【' + row.validityType + '】'
+	}
 
-  const couponList = ref([]);
-  // 立即领取优惠券
-  async function onGetCoupon(id) {
-    const { error, msg } = await CouponApi.takeCoupon(id);
-    if (error === 0) {
-      uni.showToast({
-        title: msg,
-        icon: 'none',
-      });
-      return
-    }
-    await getCouponTemplateList()
-  }
-  const getCouponTemplateList = async () => {
-    const { data } = await CouponApi.getCouponTemplateListByIds(props.data.couponIds.join(','));
-    couponList.value = data;
-  }
-  onMounted(() => {
-    getCouponTemplateList()
-  });
+	const couponList = ref([]);
+	// 立即领取优惠券
+	async function onGetCoupon(id) {
+		const {
+			error,
+			msg
+		} = await CouponApi.takeCoupon(id);
+		if (error === 0) {
+			uni.showToast({
+				title: msg,
+				icon: 'none',
+			});
+			return
+		}
+		await getCouponTemplateList()
+	}
+	const getCouponTemplateList = async () => {
+		const {
+			data
+		} = await CouponApi.getCouponTemplateListByIds(props.data.couponIds.join(','));
+		couponList.value = data;
+	}
+	onMounted(() => {
+		getCouponTemplateList()
+	});
 </script>
 
 <style lang="scss" scoped>
-  .card-btn {
-    width: 140rpx;
-    height: 50rpx;
-    border-radius: 25rpx;
-    font-size: 24rpx;
-    line-height: 50rpx;
-    &.vertical {
-      width: 50rpx;
-      height: 140rpx;
-      margin: auto 20rpx auto 0;
+	.scroll-box {
+		.coupon-box {
+			display: flex;
+			justify-content: space-around;
 
-      .btn-text {
-        font-size: 24rpx;
-        text-align: center;
-        writing-mode: vertical-lr;
-      }
-    }
-  }
-  .coupon-item {
-    &:nth-of-type(1) {
-      margin-left: 0 !important;
-    }
-  }
-</style>
+			.card-btn {
+				width: 140rpx;
+				height: 50rpx;
+				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;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/sheep/components/s-menu-button/s-menu-button.vue b/sheep/components/s-menu-button/s-menu-button.vue
index 5a6653aa..ef647b89 100644
--- a/sheep/components/s-menu-button/s-menu-button.vue
+++ b/sheep/components/s-menu-button/s-menu-button.vue
@@ -173,7 +173,6 @@
 
 	// 设置背景样式
 	const bgStyle = computed(() => {
-		console.log(props.styles)
 		// 直接从 props.styles 解构
 		const {
 			bgType,
-- 
Gitee


From c8a95ef3ec6e27eeb0e76be4bccc22b3f0be68ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Thu, 15 Aug 2024 14:27:27 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E8=A3=85=E4=BF=AE=E9=A1=B5=E9=9D=A2=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=A4=9A=E4=B8=AA=E4=BC=98=E6=83=A0=E5=88=B8=EF=BC=8C?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=80=E4=B8=AA=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sheep/components/s-coupon-block/s-coupon-block.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sheep/components/s-coupon-block/s-coupon-block.vue b/sheep/components/s-coupon-block/s-coupon-block.vue
index 8f66087b..59d49714 100644
--- a/sheep/components/s-coupon-block/s-coupon-block.vue
+++ b/sheep/components/s-coupon-block/s-coupon-block.vue
@@ -141,7 +141,7 @@
 	.scroll-box {
 		.coupon-box {
 			display: flex;
-			justify-content: space-around;
+			justify-content: space-between;
 
 			.card-btn {
 				width: 140rpx;
-- 
Gitee


From ea8ea9e74466ff565f11e73b01294117272c6e5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Thu, 15 Aug 2024 14:51:15 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E8=A3=85=E4=BF=AE=E9=A1=B5=E9=9D=A2=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=AF=8F=E8=A1=8C?=
 =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E4=BC=98=E6=83=A0=E5=88=B8=EF=BC=8C=E5=88=99?=
 =?UTF-8?q?=E8=AE=A9=E4=BC=98=E6=83=A0=E5=88=B8=E5=B1=85=E4=B8=AD=EF=BC=8C?=
 =?UTF-8?q?=E8=80=8C=E4=B8=8D=E6=98=AF=E5=88=86=E6=95=A3=E5=9C=A8=E4=B8=A4?=
 =?UTF-8?q?=E8=BE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../s-coupon-block/s-coupon-block.vue         | 57 ++++++++++---------
 1 file changed, 30 insertions(+), 27 deletions(-)

diff --git a/sheep/components/s-coupon-block/s-coupon-block.vue b/sheep/components/s-coupon-block/s-coupon-block.vue
index 59d49714..9e75f93d 100644
--- a/sheep/components/s-coupon-block/s-coupon-block.vue
+++ b/sheep/components/s-coupon-block/s-coupon-block.vue
@@ -1,7 +1,7 @@
 <!-- 装修营销组件：优惠券  -->
 <template>
 	<scroll-view class="scroll-box" scroll-x scroll-anchoring :style="[bgStyle, { marginLeft: `${data.space}px` }]">
-		<view class="coupon-box ss-flex">
+		<view class="coupon-box ss-flex" :style="columns === 2 ? couponBoxStyleTwo : couponBoxStyleNormal">
 			<view class="coupon-item" :style="[couponBg, { marginLeft: `${data.space}px` }]"
 				v-for="(item, index) in couponList" :key="index">
 				<su-coupon :size="SIZE_LIST[columns - 1]" :textColor="data.textColor" background="" :couponId="item.id"
@@ -63,6 +63,16 @@
 		background: button.bgColor,
 		color: button.color,
 	};
+	// 两列优惠券时的排版方式
+	const couponBoxStyleNormal = {
+		'display': 'flex',
+		'justify-content': 'space-between'
+	};
+	// 非两列优惠券时的排版方式
+	const couponBoxStyleTwo = {
+		'display': 'flex',
+		'justify-content': 'space-around'
+	};
 	// 设置背景样式
 	const bgStyle = computed(() => {
 		// 直接从 props.styles 解构
@@ -138,36 +148,29 @@
 </script>
 
 <style lang="scss" scoped>
-	.scroll-box {
-		.coupon-box {
-			display: flex;
-			justify-content: space-between;
-
-			.card-btn {
-				width: 140rpx;
-				height: 50rpx;
-				border-radius: 25rpx;
-				font-size: 24rpx;
-				line-height: 50rpx;
+	.card-btn {
+		width: 140rpx;
+		height: 50rpx;
+		border-radius: 25rpx;
+		font-size: 24rpx;
+		line-height: 50rpx;
 
-				&.vertical {
-					width: 50rpx;
-					height: 140rpx;
-					margin: auto 20rpx auto 0;
+		&.vertical {
+			width: 50rpx;
+			height: 140rpx;
+			margin: auto 20rpx auto 0;
 
-					.btn-text {
-						font-size: 24rpx;
-						text-align: center;
-						writing-mode: vertical-lr;
-					}
-				}
+			.btn-text {
+				font-size: 24rpx;
+				text-align: center;
+				writing-mode: vertical-lr;
 			}
+		}
+	}
 
-			.coupon-item {
-				&:nth-of-type(1) {
-					margin-left: 0 !important;
-				}
-			}
+	.coupon-item {
+		&:nth-of-type(1) {
+			margin-left: 0 !important;
 		}
 	}
 </style>
\ No newline at end of file
-- 
Gitee


From e66e1c6eac736c413de19d2be2555911d7cac99b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Thu, 15 Aug 2024 15:46:22 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E4=BC=98=E6=83=A0=E5=88=B8?=
 =?UTF-8?q?=E6=8E=92=E7=89=88=E9=97=AE=E9=A2=98=E5=92=8C=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BA=A4=E4=BA=92=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sheep/components/s-coupon-block/s-coupon-block.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sheep/components/s-coupon-block/s-coupon-block.vue b/sheep/components/s-coupon-block/s-coupon-block.vue
index 9e75f93d..89a0f0e8 100644
--- a/sheep/components/s-coupon-block/s-coupon-block.vue
+++ b/sheep/components/s-coupon-block/s-coupon-block.vue
@@ -1,7 +1,7 @@
 <!-- 装修营销组件：优惠券  -->
 <template>
 	<scroll-view class="scroll-box" scroll-x scroll-anchoring :style="[bgStyle, { marginLeft: `${data.space}px` }]">
-		<view class="coupon-box ss-flex" :style="columns === 2 ? couponBoxStyleTwo : couponBoxStyleNormal">
+		<view class="coupon-box ss-flex" :style="couponList.length === 2 ? couponBoxStyleTwo : couponBoxStyleNormal">
 			<view class="coupon-item" :style="[couponBg, { marginLeft: `${data.space}px` }]"
 				v-for="(item, index) in couponList" :key="index">
 				<su-coupon :size="SIZE_LIST[columns - 1]" :textColor="data.textColor" background="" :couponId="item.id"
-- 
Gitee