diff --git a/pkg_product/views/groupBuyDetails.vue b/pkg_product/views/groupBuyDetails.vue
index a6b05bf..5c73d41 100644
--- a/pkg_product/views/groupBuyDetails.vue
+++ b/pkg_product/views/groupBuyDetails.vue
@@ -140,8 +140,18 @@
{{ detail.price }}
- 联系商家
- 立即购买
+
+
+
+
+ 联系商家
+
+
+
+
+
+ 立即购买
+
-
+
@@ -485,11 +500,13 @@ export default {
margin-top: 30rpx;
.contact-btn {
margin: 0 20rpx;
- padding: 0 40rpx;
+ padding: 0 20rpx;
border-radius: 40rpx;
font-size: 28rpx;
height: 60rpx;
line-height: 60rpx;
+ display: flex;
+ align-items: center;
&.merchant-phone {
background-color: #fff;
border: 2rpx solid #333;
@@ -560,6 +577,8 @@ export default {
background-color: #fff;
border: 2rpx solid #333;
color: #333;
+ display: flex;
+ align-items: center;
}
&.modify-time {
background-color: #fff;
diff --git a/pkg_product/views/submitOrder.vue b/pkg_product/views/submitOrder.vue
index d2c7772..96e2657 100644
--- a/pkg_product/views/submitOrder.vue
+++ b/pkg_product/views/submitOrder.vue
@@ -102,8 +102,18 @@
- 联系商家
- 立即购买
+
+
+
+
+ 联系商家
+
+
+
+
+
+ 立即购买
+
@@ -415,7 +425,23 @@ export default {
.total { font-size: 28rpx; color: #111; font-weight: 700; }
.total .highlight { color: #C52733; font-weight: 700; }
.bar-actions { display: flex; gap: 16rpx; }
-.mini-btn { padding: 16rpx 22rpx; border: 1rpx solid #ccc; border-radius: 32rpx; font-size: 26rpx; color: #333; }
-.buy-btn { padding: 16rpx 28rpx; border-radius: 32rpx; background: #C52733; color: #fff; font-size: 26rpx; }
+.mini-btn {
+ padding: 10rpx 22rpx;
+ border: 1rpx solid #ccc;
+ border-radius: 32rpx;
+ font-size: 26rpx;
+ color: #333;
+ display: flex;
+ align-items: center;
+}
+.buy-btn {
+ padding: 10rpx 28rpx;
+ border-radius: 32rpx;
+ background: #C52733;
+ color: #fff;
+ font-size: 26rpx;
+ display: flex;
+ align-items: center;
+}
.buy-btn.disabled { background: #ccc; pointer-events: none; }
\ No newline at end of file
diff --git a/pkg_user/views/gift/components/GiftCard.vue b/pkg_user/views/gift/components/GiftCard.vue
index c864277..9f2484b 100644
--- a/pkg_user/views/gift/components/GiftCard.vue
+++ b/pkg_user/views/gift/components/GiftCard.vue
@@ -55,15 +55,27 @@
-
+
-
+
+
+ 礼包已被领取
+
+ 去商城看看>>
+
+
+
+ 您已领取礼包，去看看>>
+
+ 我也要送礼
+
@@ -165,6 +177,16 @@ export default {
// 分享到微信好友
},
toOrder() {
+ if (this.isTravelGroup) {
+ this.$yrouter.push({
+ path: '/pkg_product/views/sojoumOrderDetails',
+ query: {
+ id: this.order,
+ isView: 1
+ }
+ })
+ return
+ }
this.$yrouter.push({
path: "/pages/order/OrderDetails/index",
query: {
@@ -231,7 +253,7 @@ export default {
title: '领取成功',
icon: 'success'
});
- uni.redirectTo({ url: '/pkg_user/views/gift/receiveDone' })
+ uni.navigateTo({ url: '/pkg_user/views/gift/receiveDone?obj=' + JSON.stringify(res.data) })
}).catch(() => {
uni.showToast({
title: '领取失败，请重试',
diff --git a/pkg_user/views/gift/gift.vue b/pkg_user/views/gift/gift.vue
index 0e0946a..b8fa003 100644
--- a/pkg_user/views/gift/gift.vue
+++ b/pkg_user/views/gift/gift.vue
@@ -290,7 +290,7 @@ export default {
})
return {
title: '礼笺轻启，礼藏心意',
- path: `/pkg_user/views/gift/receive?code=${this.giftKey}`,
+ path: `/pkg_user/views/gift/receive?code=${this.giftKey}&isTravelGroup=${this.isGroupBuy}`,
imageUrl: this.shareImage
}
},
diff --git a/pkg_user/views/gift/receive.vue b/pkg_user/views/gift/receive.vue
index 9fdfd3d..7242646 100644
--- a/pkg_user/views/gift/receive.vue
+++ b/pkg_user/views/gift/receive.vue
@@ -53,7 +53,7 @@ export default {
})
return {
title: '礼笺轻启，礼藏心意',
- path: `/pkg_user/views/gift/receive?code=${this.giftCard.code}`,
+ path: `/pkg_user/views/gift/receive?code=${this.giftCard.code}&isTravelGroup=${this.isTravelGroup}`,
imageUrl: this.giftCard.image
}
},
diff --git a/pkg_user/views/gift/receiveDone.vue b/pkg_user/views/gift/receiveDone.vue
index ef09e31..90b8200 100644
--- a/pkg_user/views/gift/receiveDone.vue
+++ b/pkg_user/views/gift/receiveDone.vue
@@ -2,24 +2,60 @@
-
+
- {{ mock.product.name }}
+ {{ record.travelGroupOrderInfo.travelGroupProduct.name }}
- 核销码：{{ mock.verify.code }}
+ 核销码：{{ record.verifyCode }}
-
+
注：请提前和商家确认入住时间
-
+
+
+
+
+
+
+
+ 商家电话
+
+
+
+
+
+ 商家微信
+
+
+
+
+
@@ -28,41 +64,58 @@ export default {
name: 'ReceiveDone',
data() {
return {
- mock: {
- product: {
- image: 'https://resource.xdd618.com/1/202501020/1760933080303_%E5%A4%A7%E7%90%86%E9%86%92%E6%9D%A5%20(5).jpg',
- name: '醒来客栈大床房3晚',
- type: 'countyFamous',
- desc: '迎曦楼大床房37-48㎡，房间设计温馨，设施齐全，柔软的床铺和明亮的空间，收容您所有的疲惫。',
- price: 1887
- },
- order: {
- id: '1981535966489214976',
- start: '2025-12-05',
- end: '2025-12-08',
- minDays: 4
- },
- contact: {
- wechat: '19187244812'
- },
- verify: {
- code: '966489214976',
- qrcode: 'https://shop.xdd618.com/api/file/qrcode/966489214976_yshop.jpg'
- }
- }
+ webUrl: this.$VUE_APP_RESOURCES_URL,
+ showPhonePopup: false,
+ popContent: '',
+ title: '',
+ // 模态窗口状态管理
+ showPhoneModal: false,
+ showWechatModal: false,
+ record: {}
}
},
onLoad(query) {
// 可扩展：如果后续需要从 query 读取数据，可在此处理
+ this.record = JSON.parse(decodeURIComponent(query.obj))
+ console.log(this.record);
+
},
methods: {
- copyWechat() {
- uni.setClipboardData({
- data: this.mock.contact.wechat,
- success: () => {
- uni.showToast({ title: '微信号已复制', icon: 'success' })
- }
- })
+ showPop(type) {
+ this.showPhonePopup = true
+ this.title = type === 'phone' ? '商家电话' : '商家微信'
+ this.popContent = type === 'phone' ? this.record.merPhone : this.record.merWechat
+ },
+ contactMerchant(type) {
+ if (type === 'phone') {
+ uni.makePhoneCall({
+ phoneNumber: this.record.merPhone,
+ success: () => {
+ console.log('///');
+
+ uni.showToast({
+ title: '正在拨打电话',
+ icon: 'none'
+ })
+ },
+ fail: () => {
+ uni.showToast({
+ title: '拨打失败',
+ icon: 'none'
+ })
+ }
+ })
+ } else if (type === 'wechat') {
+ uni.setClipboardData({
+ data: this.record.merWechat,
+ success: () => {
+ uni.showToast({
+ title: '微信号已复制',
+ icon: 'success'
+ })
+ }
+ })
+ }
},
goGiftList() {
this.$yrouter.push('/pkg_user/views/giftList')
@@ -75,6 +128,67 @@ export default {