Răsfoiți Sursa

优化:修改优惠券分类判断

hy 10 ore în urmă
părinte
comite
def4e6f7c5

+ 11 - 5
src/components/discountCoupon.vue

@@ -30,17 +30,23 @@ const coupon = computed(() => props.coupon)
 const couponTemplateId = computed(() => coupon.value.templateId || '')
 const deadline = computed(() => {
     const type = props.coupon.validityType
-    if (type === '1') {
+    if (type === '2') {
         return `自领取之日起${props.coupon.validDays}日内使用`
     }
-    else if (type === '2') {
+    else if (type === '1') {
         return `限${props.coupon.validStartTime}到${props.coupon.validEndTime}日内使用`
     }
     return '长期有效'
 })
 const category = computed(() => {
+    const relatedType = coupon.value.relatedType
     const relatedName = getLastPartAfterSlash(coupon.value.relatedName)
-    return `限${relatedName}商品使用`
+    if (relatedType === '2') {
+        return `限${relatedName}分类商品使用`
+    }
+    else {
+        return `限${relatedName}商品使用`
+    }
 })
 
 // 分享弹窗相关 - 使用v-model控制弹窗显示
@@ -219,8 +225,8 @@ function handleCloseShareModal() {
                 font-size: 18rpx;
                 color: #666666;
                 line-height: 18rpx;
-                text-align: center;
-                text-indent: -5em;
+                padding-left: 1rem;
+                
             }
         }
 

+ 8 - 8
src/components/spendAndSaveCoupon_large.vue

@@ -27,11 +27,11 @@ const coupon = computed(() => props.coupon)
 const couponTemplateId = computed(() => coupon.value.templateId || '')
 const deadline = computed(() => {
     const type = props.coupon.validityType
-    if (type === '1') {
+    if (type === '2') {
         return `自领取之日起${props.coupon.validDays}日内使用`
     }
-    else if (type === '2') {
-        return `${props.coupon.validStartTime}至${props.coupon.validEndTime}`
+    else if (type === '1') {
+        return `限${props.coupon.validStartTime}到${props.coupon.validEndTime}日内使用`
     }
     return '长期有效'
 })
@@ -39,7 +39,7 @@ const deadline = computed(() => {
 const category = computed(() => {
     const relatedType = props.coupon.relatedType
     const relatedName = getLastPartAfterSlash(props.coupon.relatedName)
-    if (relatedType === '1') {
+    if (relatedType === '2') {
         return `限${relatedName}分类商品使用`
     }
     else {
@@ -104,11 +104,11 @@ function handleCloseShareModal() {
                     {{ category }}
                 </view>
                 <view class="coupon-info-time">
-                    <template v-if="coupon.validityType === '1'">
+                    <template v-if="coupon.validityType === '2'">
                         <view>{{ deadline }}</view>
                     </template>
-                    <template v-else-if="coupon.validityType === '2'">
-                        <view>使用日期</view>
+                    <template v-else-if="coupon.validityType === '1'">
+                        <!-- <view>使用日期</view> -->
                         <view>{{ deadline }}</view>
                     </template>
                     <template v-else>
@@ -212,7 +212,7 @@ function handleCloseShareModal() {
             }
 
             .coupon-info-time {
-                padding-top: 14rpx;
+                // padding-top: 14rpx;
                 display: flex;
                 flex-direction: column;
                 gap: 5rpx;