From 7f9af40ab0eecd59be876e3090a92b61e05df344 Mon Sep 17 00:00:00 2001
From: LinCyJang <linxi957440651@163.com>
Date: Mon, 28 Jul 2025 01:17:47 +0800
Subject: [PATCH] =?UTF-8?q?Feat=EF=BC=9A=E5=A4=9A=E5=93=81=E9=80=81?=
 =?UTF-8?q?=E7=A4=BC=EF=BC=8C=E5=BB=BA=E7=AB=8B=E9=80=81=E7=A4=BC=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=EF=BC=88=E7=9B=B2=E7=9B=92=EF=BC=89/=20=E7=9B=B2?=
 =?UTF-8?q?=E7=9B=92=E8=AE=A2=E5=8D=95=E5=95=86=E5=93=81=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/MyOrder/index.vue               |  9 ++++-
 pages/order/OrderDetails/index.vue          | 15 +++++++-
 pkg_user/views/gift/components/GiftCard.vue | 40 ++++++++++++++++-----
 pkg_user/views/giftList.vue                 | 13 +++++--
 4 files changed, 64 insertions(+), 13 deletions(-)

diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue
index e38fdae..a86dc4f 100644
--- a/pages/order/MyOrder/index.vue
+++ b/pages/order/MyOrder/index.vue
@@ -42,9 +42,16 @@
           <view class="font-color-white statusTag v12-primary" v-if="order.isTickets===1 && order._status._type === 1">
             待核销
           </view>
-          <view class="font-color-white statusTag v12-primary" v-else>{{ order.isGiftCardSend ? '礼包' :getStatus(order) }}</view>
+          <view class="font-color-white statusTag v12-primary" v-else>{{ order.isGiftCardSend || order.isGiftCardReceive ? '礼包' :getStatus(order) }}</view>
         </view>
         <view @click="goOrderDetails(order)">
+          <view class="item-info acea-row row-between row-top"  v-if="order.isGiftCardReceiveBlind === 1">
+            <view class="pictrue">
+              <image
+                :src="webUrl+'/orderIcon/盲盒礼包.png'"
+              />
+            </view>
+          </view>
           <view class="item-info acea-row row-between row-top" v-for="(cart,cartInfoIndex) in order.cartInfo"
                 :key="cartInfoIndex">
             <view class="pictrue">
diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue
index 174bdbb..62e6294 100644
--- a/pages/order/OrderDetails/index.vue
+++ b/pages/order/OrderDetails/index.vue
@@ -112,7 +112,7 @@
     <view style="margin-top: 30rpx;border-radius:20rpx;overflow: hidden;" class="v12-white">
       <!-- <OrderGoods :evaluate="status.type || 0" :cartInfo="orderInfo.cartInfo || []" title="商品信息"></OrderGoods> -->
       <view class="v12-radius-20 v12-pa-3" v-for="(cart, d) in orderInfo.cartInfo" :key="d" @click="goGoodsCon(cart)">
-        <view class="v12-justify-between">
+        <view class="v12-justify-between" v-if="orderInfo.isGiftCardReceiveBlind === 0">
           <view class="">
             <image style="width: 120rpx; height: 120rpx" class="v12-radius-8" :src="cart.productInfo.image"></image>
           </view>
@@ -136,6 +136,19 @@
             </view>
           </view>
         </view>
+        <view class="v12-justify-between" v-else>
+          <view class="">
+            <image style="width: 120rpx; height: 120rpx" class="v12-radius-8" :src="webUrl+'/orderIcon/盲盒礼包.png'"></image>
+          </view>
+          <view class="v12-justify-between v12-flex-column v12-ml-2 v12-py-2" style="flex: 2">
+            <view class="v12-font-28 v12-dark-text v12-font-bold more-t">
+              盲盒礼物
+            </view>
+            <view class="more-t v12-secondary-dark-text v12-font-24">
+              待收货后展示商品信息
+            </view>
+          </view>
+        </view>
         <view class=""  v-if="orderInfo.cartInfo &&( d === orderInfo.cartInfo.length - 1)">
           <view class="v12-justify-between v12-align-center v12-mt-3 v12-dark-text">
             <view class="v12-font-24 v12-dark-text">
diff --git a/pkg_user/views/gift/components/GiftCard.vue b/pkg_user/views/gift/components/GiftCard.vue
index 4d21961..d0d329e 100644
--- a/pkg_user/views/gift/components/GiftCard.vue
+++ b/pkg_user/views/gift/components/GiftCard.vue
@@ -1,8 +1,11 @@
 <template>
   <view class="dialog-conent" v-show="isLogin">
     <view class="gift-card-modal" >
-      <image class="bg-image" :src="card.cover" mode="aspectFit|aspectFill|widthFix" lazy-load="false"></image>
-      <view class="image-wrap">
+      <image class="bg-image" :src="card.cover || card.blindBoxImage" mode="aspectFit|aspectFill|widthFix" lazy-load="false"></image>
+      <view v-if="card.isBlind !== 1" class="image-wrap" :style="{
+        top: card.productImageY*2 * 1.8 + 'rpx',
+        left: card.productImageX*2 * 1.8 + 'rpx'
+      }">
         <image class="pro-image" :src="card.giftProducts[0].productImage" mode="aspectFit|aspectFill|widthFix" lazy-load="false" @error="" @load="">
           
         </image>
@@ -15,6 +18,10 @@
       </view>
       
     </view>
+    <view class="blind-box" v-if="card.isBlind">
+      <u-icon :name="webUrl + '/orderIcon/礼物.png'" size="30" ></u-icon>
+      <text class="v12-font-30 v12-dark-text v12-font-bold v12-ml-2">您收到一份来自朋友的神秘礼物</text>
+    </view>
     <view class="btn-wrap">
       <button v-if="!isReceive && myGift.isCurrentUser !== 1" class="share-btn v12-white-text v12-primary" @click="setAddress(0)">
         填写地址并收下
@@ -176,6 +183,17 @@ export default {
 </script>
 
 <style scoped>
+.blind-box{
+  width: 578rpx;
+  height: 90rpx;
+  background: rgba(255,255,255,0.39);
+  box-shadow: 0rpx 2rpx 20rpx rgba(0,0,0,0.05);
+  border-radius: 16rpx;
+  line-height: 90rpx;
+  display: flex;
+  padding-left: 35rpx;
+  align-items: center;
+}
 .info-btn{
   border: 1px solid #C52733;
   color: #C52733;
@@ -202,9 +220,10 @@ export default {
   align-content: center;
 }
 .bg-image{
-  width: 586rpx;
-  height: 704rpx;
+  width: 576rpx;
+  height: 720rpx;
   position: absolute;
+  border-radius: 16rpx;
   top: 0;
 }
 .tips{
@@ -233,17 +252,19 @@ export default {
   height: 296rpx;
 }
 .image-wrap{
-  width: 296rpx;
-  height: 296rpx;
+  width: 288rpx;
+  height: 288rpx;
   border: 10rpx solid #FDF0D3;
   border-radius: 30rpx;
   position: absolute;
   overflow: hidden;
   top: -140rpx;
+  right: 0;
+  margin: auto;
 }
 .pro-image{
-  width: 296rpx;
-  height: 296rpx;
+  width: 288rpx;
+  height: 288rpx;
   /* border-radius: 30rpx; */
 }
 .auto-text-color {
@@ -287,7 +308,8 @@ export default {
   text-align: center;
 }
 .gift-card-modal {
-    height: 704rpx;
+    height: 720rpx;
+    width: 576rpx;
     justify-content: center;
     z-index: 999;
     margin-top: 100rpx;
diff --git a/pkg_user/views/giftList.vue b/pkg_user/views/giftList.vue
index e6d4445..e254245 100644
--- a/pkg_user/views/giftList.vue
+++ b/pkg_user/views/giftList.vue
@@ -142,6 +142,15 @@
                   </view>
                 </view>
               </view>
+              <view v-if="item.isBlind" class="gift-body" @click="giftItemClickHanlde(item)">
+                <view class="gift-img">
+                  <image
+                    :src="webUrl+'/orderIcon/盲盒礼包.png'"
+                    class="img"
+                    mode="widthFix"
+                  />
+                </view>
+              </view>
               <view class="gift-bottom">
                 <view class="gift-txt">
                   赠言：{{ item.message || '' }}
@@ -335,7 +344,7 @@ export default {
       this.isLoad = false
       giftCardReceiveList({
         page: 1,
-        limit: 999
+        limit: 10
       }).then(res => {
         const { success, data } = res
         if (success) {
@@ -351,7 +360,7 @@ export default {
       this.isLoad = false
       giftCardSendList({
         page: 1,
-        limit: 999
+        limit: 10
       }).then(res => {
         const { success, data } = res
         if (success) {