From 6590a3514becafeac934b788b4797501c8762679 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 4 Dec 2025 17:17:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pageChat/chat.vue                  |   4 ++
 pageChat/components/chat-item.vue  | 109 +++++++++++++++++++++++------
 pageChat/coupon-activity/index.vue |   3 +-
 3 files changed, 95 insertions(+), 21 deletions(-)

diff --git a/pageChat/chat.vue b/pageChat/chat.vue
index 77ec76f..b7f0bd7 100644
--- a/pageChat/chat.vue
+++ b/pageChat/chat.vue
@@ -50,6 +50,10 @@
                     >
                       <chatItem :item="item"></chatItem>
                     </view>
+                    <view class="text-center u-m-t-20" v-if="item.msg_type==4&&item.hasGet">
+                      <text>{{item.hasGet||0}}人已领取</text>
+                      <text class="color-main">优惠券</text>
+                    </view>
                   </view>
                   <up-avatar
                     size="122rpx"
diff --git a/pageChat/components/chat-item.vue b/pageChat/components/chat-item.vue
index 597ee94..a85ca45 100644
--- a/pageChat/components/chat-item.vue
+++ b/pageChat/components/chat-item.vue
@@ -18,13 +18,64 @@
   <view class="" v-if="item.msg_type == 4">
     <view>{{ item.coupon.title }}</view>
     <view class="u-m-t-16 bg-f7 coupon u-flex">
-     <view class="left">
-        <view class="price">
+      <template v-if="item.coupon.type == 1">
+        <view class="left">
+          <view class="price">
             <text class="u-font-32">¥</text>
-            <text style="font-size: 72rpx;">15</text>
+            <text style="font-size: 72rpx">{{
+              item.coupon.discountAmount
+            }}</text>
+          </view>
+          <view class="u-font-24 color-999 no-wrap"
+            >满{{ item.coupon.fullAmount }}可用</view
+          >
         </view>
-        <view class="u-font-24 color-999 no-wrap">满{{item.coupon.fullAmount}}可用</view>
-     </view>
+      </template>
+      <template v-if="item.coupon.type == 2">
+        <view class="left">
+          <view class="price">
+            <text class="u-font-32"
+              >商品兑换券</text
+            >
+          </view>
+          <view class="u-font-24 color-999 no-wrap"
+            >满{{ item.coupon.fullAmount }}可用</view
+          >
+        </view>
+      </template>
+
+      <template v-if="item.coupon.type == 3">
+        <view class="left">
+          <view class="price">
+            <text class="u-font-32"
+              >{{ item.coupon.discountRate / 100 }}折</text
+            >
+          </view>
+          <view class="u-font-24 color-999 no-wrap"
+            >满{{ item.coupon.fullAmount }}可用</view
+          >
+        </view>
+      </template>
+      <template v-if="item.coupon.type == 4">
+        <view class="left">
+          <view class="price">
+            <text class="u-font-32"
+              >第二件半价券</text
+            >
+          </view>
+          
+        </view>
+      </template>
+      <template v-if="item.coupon.type == 6">
+        <view class="left">
+          <view class="price">
+            <text class="u-font-32"
+              >买一送一券</text
+            >
+          </view>
+          
+        </view>
+      </template>
      <view class="right u-p-l-28">
         <view class="u-font-32 ">{{item.coupon.couponName}}</view>
         <view class="u-font-24 color-999 u-m-t-8">有效期：{{ returnTime(item.coupon) }} </view>
@@ -34,6 +85,7 @@
 </template>
 
 <script setup>
+import dayjs from 'dayjs'
 const props = defineProps({
   item: {
     type: Object,
@@ -46,6 +98,9 @@ function previewImage(url) {
   });
 }
 function returnTime(coupon){
+  // if(coupon.validType=="fixed"){
+  //   return  dayjs().add(coupon.daysToTakeEffect,'day').format('YYYY-MM-DD')
+  // }
     let startTime = coupon.useStartTime;
     let endTime = coupon.useEndTime;
     if(startTime && endTime){
@@ -55,22 +110,36 @@ function returnTime(coupon){
 </script>
 
 <style lang="scss" scoped>
-  .img {
-    width: 50vw;
+.img {
+  width: 50vw;
+}
+.coupon {
+  padding: 16rpx 10rpx;
+  border-radius: 16rpx;
+  .price {
+    color: #ff1c1c;
+    font-weight: 700;
   }
-  .coupon{
-    padding: 16rpx 10rpx;
-    border-radius: 16rpx;
-    .price{
-        color: #FF1C1C;
-        font-weight: 700;
-    }
-    .left{
-        padding-right: 26rpx;
-        border-right: 1rpx solid #EDEDED;
-    }
-    .right{
+  .left {
+    width: 112rpx;
+    margin-right: 26rpx;
+  }
+  .right {
+    border-left: 1rpx solid #ededed;
 
-    }
   }
+}
+.lingqu {
+  background-color: #e8ad7b;
+  line-height: 48rpx;
+  font-size: 28rpx;
+  padding: 6rpx 70rpx;
+  color: #fff;
+  border-radius: 140rpx;
+  &.hasGet {
+    background-color: #eee;
+    color: #999;
+  }
+}
 </style>
+
diff --git a/pageChat/coupon-activity/index.vue b/pageChat/coupon-activity/index.vue
index 3043a56..7e4df64 100644
--- a/pageChat/coupon-activity/index.vue
+++ b/pageChat/coupon-activity/index.vue
@@ -163,8 +163,9 @@ function sendMsg(msg) {
   });
 }
 function toShare(item) {
+  const hasGet=item.couponJson.giveNum-item.couponJson.leftNum
   sendMsg({
-    coupon: { ...item.couponJson, title: item.title,activity_id:item.id },
+    coupon: { ...item.couponJson, title: item.title,activity_id:item.id, hasGet:hasGet<=0?0:hasGet} ,
     chat_coupon_id:item.id,
     msg_type: 4,
   });