From 5dc1f5ad92a7661c32c0fb63107db7ab50f2b47b Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Mon, 17 Feb 2025 23:36:27 +0800
Subject: [PATCH] =?UTF-8?q?Task=EF=BC=9A=E7=A4=BC=E5=93=81=E8=B5=A0?=
 =?UTF-8?q?=E9=80=81/=E9=80=81=E7=A4=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                      |  12 ++++
 pages/shop/GoodsCon/index.vue   |  25 +++++++-
 pkg_user/views/gift/gift.vue    | 102 ++++++++++++++++++++++++++++++++
 pkg_user/views/gift/receive.vue |  22 +++++++
 4 files changed, 159 insertions(+), 2 deletions(-)
 create mode 100644 pkg_user/views/gift/gift.vue
 create mode 100644 pkg_user/views/gift/receive.vue

diff --git a/pages.json b/pages.json
index 3d6c0c8..bb7a5f1 100644
--- a/pages.json
+++ b/pages.json
@@ -771,6 +771,18 @@
             "navigationBarTitleText": "我的礼品卡"
           }
         },
+        {
+          "path": "views/gift/gift",
+          "style": {
+            "navigationBarTitleText": "送礼包"
+          }
+        },
+        {
+          "path": "views/giftList/receive",
+          "style": {
+            "navigationBarTitleText": "好友赠送的礼包"
+          }
+        },
         {
           "path": "views/myFavorite",
           "style": {
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index 1c76e22..2168e80 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -63,6 +63,15 @@
             </view>
           </view>
           <view class="introduce bold">{{ storeInfo.storeName }}</view>
+          <view class="v12-primary v12-white-text v12-px-2 v12-py-1 v12-mt-2 v12-radius-20 v12-font-bold v12-justify-between v12-align-center">
+            <view class="v12-font-28 v12-align-center">
+              <img class="gift-img" :src="webUrl + '/orderIcon/gift.png'" mode="widthFix">
+              支持礼包赠送
+            </view>
+            <view @click="toGift" class="v12-white v12-dark-text v12-radius-20 v12-font-28 gift-btn">
+              送给朋友
+            </view>
+          </view>
           <rich-text class="subInfo" :nodes="storeInfo.storeInfo" v-if="storeInfo.storeInfo"/>
         </view>
 
@@ -482,9 +491,9 @@
           </view>
         </view>
         <view class="mask" @touchmove.prevent @click="listenerActionClose" v-show="posters"></view>
-        <view class="posterCanvasWarp">
+        <!-- <view class="posterCanvasWarp">
           <canvas class="posterCanvas" canvas-id="myCanvas"></canvas>
-        </view>
+        </view> -->
       </view>
     </view>
   </view>
@@ -763,6 +772,11 @@ export default {
     }
   },
   methods: {
+    toGift() {
+      uni.navigateTo({
+        url: '/pkg_user/views/gift/gift'
+      })
+    },
     showService() {
       this.$refs.serviceWin.show = true
     },
@@ -2086,4 +2100,11 @@ export default {
   margin-bottom: 10rpx;
   box-sizing: border-box;
 }
+.gift-btn{
+  padding: 10rpx;
+}
+.gift-img{
+  width: 34rpx;
+  margin-right: 10rpx;
+}
 </style>
diff --git a/pkg_user/views/gift/gift.vue b/pkg_user/views/gift/gift.vue
new file mode 100644
index 0000000..480421f
--- /dev/null
+++ b/pkg_user/views/gift/gift.vue
@@ -0,0 +1,102 @@
+<template>
+  <view class="gift-page">
+    <view class="top-card">
+      <view class="v12-justify-between v12-pa-2">
+        <view>
+          <view></view>
+          <view class="v12-font-28 v12-secondary-dark-text">送礼寄语</view>
+        </view>
+        <view class="v12-primary-text v12-font-26">
+          <view>默认封面</view>
+          <view>
+          </view>
+        </view>
+      </view>
+      <view class="v12-px-2">
+        <view class="line"></view>
+      </view>
+      <view class="v12-pa-2 ">
+        <textarea class="v12-font-28  v12-secondary-dark-text" placeholder="礼笺轻启，礼藏心意" name="" id="" cols="30" rows="10"></textarea>
+      </view>
+    </view>
+    <view class="gift-good-card"></view>
+    <view class="swich-btn">
+      <view class="v12-font-28 v12-dark-text">是否支持好友转赠</view>
+      <view>
+        <u-switch v-model="value3" ></u-switch>
+      </view>
+    </view>
+    
+    <view class="btn-wrap v12-mt-16 v12-justify-center">
+      <view class="gift-submit">付款并赠送</view>
+    </view>
+    <view class="tip-wrap v12-justify-center">
+      <view class="tip-text v12-mr-1">好友未收下礼包，将于24小时后自动退款</view>
+      <u-icon name="error-circle" color="#666" size="28rpx"></u-icon>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="less" scoped>
+.tip-wrap{
+  position: absolute;
+  bottom: 100rpx;
+  left: 0;
+  margin: auto;
+  right: 0;
+  align-items: center;
+}
+.tip-text{
+  font-family: Source Han Sans SC;
+  font-weight: 500;
+  font-size: 28rpx;
+  color: #666666;
+  line-height: 36rpx;
+}
+.gift-submit{
+  width: 240rpx;
+  height: 80rpx;
+  background: rgba(197,39,51,1);
+  border-radius: 16rpx;
+  color: #fff;
+  line-height: 80rpx;
+  text-align: center;
+  font-size: 32rpx;
+  font-weight: 500;
+}
+.gift-page{
+  padding: 10rpx 20rpx;
+}
+.top-card{
+  height: 280rpx;
+  background: #fff;
+  border-radius: 16rpx;
+}
+.line{
+  width: 100%;
+  height: 2rpx;
+  background: #d2d2d2;
+}
+.gift-good-card{
+  height: 240rpx;
+  background: #fff;
+  border-radius: 16rpx;
+  margin-top: 30rpx;
+}
+.swich-btn{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  height: 60rpx;
+  background: #fff;
+  border-radius: 30rpx;
+  padding: 5rpx 20rpx;
+  margin-top: 30rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pkg_user/views/gift/receive.vue b/pkg_user/views/gift/receive.vue
new file mode 100644
index 0000000..f1d6a38
--- /dev/null
+++ b/pkg_user/views/gift/receive.vue
@@ -0,0 +1,22 @@
+<template>
+  <view>
+    <view class="top-card"></view>
+  </view>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="less" scoped>
+.top-card{
+  width: 710rpx;
+  height: 280rpx;
+  background: #fff;
+  border-radius: 16rpx;
+}
+
+
+</style>
\ No newline at end of file