From 0f5f19d9a0e75f21f984aca257689cc46e0b2d34 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Sun, 23 Feb 2025 21:16:10 +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=E3=80=81=E5=88=86=E4=BA=AB?=
 =?UTF-8?q?=E3=80=82=E6=94=B6=E7=A4=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/User/index.vue                   |  2 +-
 pkg_user/views/gift/components/GiftCard.vue | 24 ++++++++++-----------
 pkg_user/views/gift/gift.vue                |  2 +-
 pkg_user/views/gift/receive.vue             |  7 ++++++
 pkg_user/views/giftList.vue                 |  2 +-
 5 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/pages/user/User/index.vue b/pages/user/User/index.vue
index 485baf3..fe20d78 100644
--- a/pages/user/User/index.vue
+++ b/pages/user/User/index.vue
@@ -43,7 +43,7 @@
                 <image :src="webUrl + '/icon/icon-qrcode.png'" class="code" />
                 <text class="code-txt">会员码</text>
               </view>
-              <view class="v12-align-center v12-mt-2">
+              <view class="v12-align-center v12-mt-2" @click="linkTo('/pkg_user/views/personalData')">
                 <image
                   :src="webUrl + '/icon/icon-setting.png'"
                   class="settings-img v12-mr-1"
diff --git a/pkg_user/views/gift/components/GiftCard.vue b/pkg_user/views/gift/components/GiftCard.vue
index 638257b..c60ec13 100644
--- a/pkg_user/views/gift/components/GiftCard.vue
+++ b/pkg_user/views/gift/components/GiftCard.vue
@@ -29,14 +29,15 @@
       <view v-if="!isReceive && !card.isReceive" class="address-btn v12-white v12-primary-text" @click="setAddress">
         填写地址并收下
       </view>
-      <button open-type="share" class="share-btn v12-white v12-primary-text" v-if="card.canTransfer !== 0 && !isReceive">
-        点击转增给好友
+      <button open-type="share" class="share-btn v12-white v12-primary-text v12-d-flex" v-if="card.canTransfer !== 0 && !isReceive">
+        点击转赠给好友
+        <u-icon :name="webUrl + '/icon/share.png'" ></u-icon>
       </button>
       <view class="tips">
         <view class="tip-text v12-mr-1">
-          未领取礼包，将于24小时后自动
+          未领取礼包，将于24小时后自动退回
         </view>
-        <u-icon @click="showTips" name="error-circle" color="#fff" size="28rpx"></u-icon>
+        <u-icon @click="showTips" name="error-circle" color="#fff" size="24rpx"></u-icon>
       </view>
     </view>
     <giftTips ref="giftTips" :richText="giftNotice"></giftTips>
@@ -71,6 +72,7 @@ export default {
   },
   data() {
     return {
+      webUrl: this.$VUE_APP_RESOURCES_URL,
       // 组件数据
       giftNotice: '',
       isReceive: false,
@@ -88,14 +90,8 @@ export default {
       deep: true  
     } 
   },
-  onShareAppMessage() {
-    return {
-      title: '送朋友',
-      path: `/pkg_user/views/gift/receive?code=${this.card.code}`,
-      imageUrl: this.card.image
-    }
-  },
   methods: {
+    
     // 分享到微信好友
     toShare() {
       // 分享到微信好友
@@ -171,7 +167,7 @@ export default {
 .tip-text{
   font-family: Source Han Sans SC;
   font-weight: 500;
-  font-size: 28rpx;
+  font-size: 26rpx;
   color: #fff;
   opacity: 0.6;
   line-height: 36rpx;
@@ -195,9 +191,11 @@ export default {
 }
 .auto-text-color {
   color: #fff;
-  font-size: 24rpx;
+  font-size: 26rpx;
   opacity: 0.8;
   margin-top: 50rpx;
+  width: 400rpx;
+  text-align: center;
 }
 .share-btn{
   width: fit-content;
diff --git a/pkg_user/views/gift/gift.vue b/pkg_user/views/gift/gift.vue
index 6290806..06aac5f 100644
--- a/pkg_user/views/gift/gift.vue
+++ b/pkg_user/views/gift/gift.vue
@@ -175,7 +175,7 @@ export default {
   computed: mapGetters(["userInfo"]),
   onShareAppMessage() {
     return {
-      title: '送朋友',
+      title: this.message || '礼笺轻启，礼藏心意',
       path: `/pkg_user/views/gift/receive?code=${this.giftKey}`,
       imageUrl: this.giftImage
     }
diff --git a/pkg_user/views/gift/receive.vue b/pkg_user/views/gift/receive.vue
index a214831..40344e0 100644
--- a/pkg_user/views/gift/receive.vue
+++ b/pkg_user/views/gift/receive.vue
@@ -23,6 +23,13 @@ export default {
  onShow() {
     this.giftChooseAddress = uni.getStorageSync('giftChooseAddress') || {}
   },
+  onShareAppMessage() {
+      return {
+        title: this.giftCard.message || '礼笺轻启，礼藏心意',
+        path: `/pkg_user/views/gift/receive?code=${this.giftCard.code}`,
+        imageUrl: this.giftCard.image
+      }
+    },
   methods: {
     getGiftCard(code) {
       getGiftCardDetail({
diff --git a/pkg_user/views/giftList.vue b/pkg_user/views/giftList.vue
index e07e2df..8ad7c5d 100644
--- a/pkg_user/views/giftList.vue
+++ b/pkg_user/views/giftList.vue
@@ -206,7 +206,7 @@ export default {
   },
   onShareAppMessage() {
     return {
-      title: '送朋友',
+      title: this.giftItem.message || '礼笺轻启，礼藏心意',
       path: `/pkg_user/views/gift/receive?code=${this.giftItem.code}`,
       imageUrl: this.giftItem.giftInfo[0].productInfo.image
     }