From a86ac4d6e52a318edb2739ea49c7ea5ef0ee3cc3 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Tue, 23 Dec 2025 09:39:09 +0800
Subject: [PATCH 01/21] =?UTF-8?q?Fix=EF=BC=9A=E5=8D=83=E5=8E=BF=E5=BA=97?=
=?UTF-8?q?=E9=93=BA=E6=8F=90=E7=A4=BA=E4=B8=8D=E5=AD=98=E5=9C=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_product/views/famousQianxianShop.vue | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/pkg_product/views/famousQianxianShop.vue b/pkg_product/views/famousQianxianShop.vue
index 29bbd81..a6535df 100644
--- a/pkg_product/views/famousQianxianShop.vue
+++ b/pkg_product/views/famousQianxianShop.vue
@@ -557,7 +557,7 @@
v-for="(shop, shopIndex) in shopList"
:key="shopIndex"
class="village-item v12-white"
- @click="villageItemClick(shop)"
+ @click="hotelItemClick(shop)"
>
Date: Sat, 27 Dec 2025 22:18:22 +0800
Subject: [PATCH 02/21] =?UTF-8?q?Fix=EF=BC=9A4753=20=E3=80=90=E5=95=86?=
=?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E7=9B=B2=E7=9B=92?=
=?UTF-8?q?=E7=A4=BC=E5=8C=85=E9=A2=86=E5=8F=96=E9=A1=B5=E9=9D=A2-?=
=?UTF-8?q?=E9=A2=86=E5=8F=96=E6=8C=89=E9=92=AE=E6=9C=AA=E5=B1=85=E4=B8=AD?=
=?UTF-8?q?=EF=BC=8C=E5=9B=BE=E7=89=87=E8=A2=AB=E9=81=AE=E6=8C=A1=EF=BC=88?=
=?UTF-8?q?=E6=9C=AA=E5=BC=80=E5=90=AF=E5=A5=BD=E5=8F=8B=E8=BD=AC=E8=B5=A0?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_user/views/gift/components/GiftCard.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkg_user/views/gift/components/GiftCard.vue b/pkg_user/views/gift/components/GiftCard.vue
index 9685b3b..badd998 100644
--- a/pkg_user/views/gift/components/GiftCard.vue
+++ b/pkg_user/views/gift/components/GiftCard.vue
@@ -21,12 +21,12 @@
-
+
您收到一份来自朋友的神秘礼物
-
+
From 8e22a48789cc8d490053e3bfe6e3e8e61887a23b Mon Sep 17 00:00:00 2001
From: LinCyJang
Date: Sat, 27 Dec 2025 23:44:05 +0800
Subject: [PATCH 03/21] =?UTF-8?q?Fix=EF=BC=9A4754=20=EF=BC=8C=E3=80=90?=
=?UTF-8?q?=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E9=9D=9E?=
=?UTF-8?q?=E7=9B=B2=E7=9B=92=E7=A4=BC=E5=93=81=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E6=88=91=E4=B9=9F=E8=A6=81=E9=80=81=E7=A4=BC=E6=8C=89=E9=92=AE?=
=?UTF-8?q?=EF=BC=88=E6=94=B6=E7=A4=BC=E6=96=B9=E6=94=B6=E5=8F=96=E7=A4=BC?=
=?UTF-8?q?=E5=93=81=E5=90=8E=EF=BC=8C=E7=9B=B2=E7=9B=92=E7=A4=BC=E5=93=81?=
=?UTF-8?q?=E4=BC=9A=E6=98=BE=E7=A4=BA=E6=88=91=E4=B9=9F=E8=A6=81=E9=80=81?=
=?UTF-8?q?=E7=A4=BC=E6=8C=89=E9=92=AE=EF=BC=8C=E4=BD=86=E6=99=AE=E9=80=9A?=
=?UTF-8?q?=E7=A4=BC=E5=93=81=E7=9B=AE=E5=89=8D=E6=B2=A1=E6=9C=89=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_user/views/gift/components/GiftCard.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pkg_user/views/gift/components/GiftCard.vue b/pkg_user/views/gift/components/GiftCard.vue
index badd998..00b74a1 100644
--- a/pkg_user/views/gift/components/GiftCard.vue
+++ b/pkg_user/views/gift/components/GiftCard.vue
@@ -30,7 +30,7 @@
-
From 36e9c5fca2c6c6870824a311def4d1f10da12603 Mon Sep 17 00:00:00 2001
From: LinCyJang
Date: Sun, 28 Dec 2025 19:30:06 +0800
Subject: [PATCH 04/21] =?UTF-8?q?Task=EF=BC=9A=E4=BA=A7=E5=93=81=E6=95=85?=
=?UTF-8?q?=E4=BA=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_user/views/gift/components/CoverPicker.vue | 18 ++++++++++++++++++
pkg_user/views/gift/components/GiftCard.vue | 18 ++++++++++++++++++
2 files changed, 36 insertions(+)
diff --git a/pkg_user/views/gift/components/CoverPicker.vue b/pkg_user/views/gift/components/CoverPicker.vue
index 3c5587c..cd98e08 100644
--- a/pkg_user/views/gift/components/CoverPicker.vue
+++ b/pkg_user/views/gift/components/CoverPicker.vue
@@ -26,6 +26,14 @@
}">
+
+ {{ line }}
+
@@ -69,6 +77,7 @@ export default {
},
data() {
return {
+ productStory: '源自云南的宣威火腿月饼,/n以匠心手作,外皮酥香,/n内馅甜咸交融。/n每一口,都是月圆情浓的/n团圆滋味,载着滇地独特的/n饮食文化记忆。',
currentIndex: this.index
}
},
@@ -186,4 +195,13 @@ export default {
line-height: 80rpx;
}
}
+.good-story{
+ position: absolute;
+ color: #fff;
+ height: 160px;
+ writing-mode: vertical-rl;
+ color: #ffefd2;
+ font-size: 12px;
+ line-height: 16px;
+}
diff --git a/pkg_user/views/gift/components/GiftCard.vue b/pkg_user/views/gift/components/GiftCard.vue
index 00b74a1..1df5960 100644
--- a/pkg_user/views/gift/components/GiftCard.vue
+++ b/pkg_user/views/gift/components/GiftCard.vue
@@ -13,6 +13,14 @@
+
+ {{ line }}
+
@@ -132,6 +140,7 @@ export default {
},
data() {
return {
+ productStory: '源自云南的宣威火腿月饼,/n以匠心手作,外皮酥香,/n内馅甜咸交融。/n每一口,都是月圆情浓的/n团圆滋味,载着滇地独特的/n饮食文化记忆。',
webUrl: this.$VUE_APP_RESOURCES_URL,
// 组件数据
giftNotice: '',
@@ -440,4 +449,13 @@ export default {
width: 80%;
max-width: 300px;
}
+.good-story{
+ position: absolute;
+ color: #fff;
+ height: 160px;
+ writing-mode: vertical-rl;
+ color: #ffefd2;
+ font-size: 12px;
+ line-height: 16px;
+}
From 5ba8a653a7bf65730e5dfcd8854739cb3a350536 Mon Sep 17 00:00:00 2001
From: LinCyJang
Date: Sun, 28 Dec 2025 19:45:46 +0800
Subject: [PATCH 05/21] =?UTF-8?q?Fix=EF=BC=9A4753=20=E3=80=90=E5=95=86?=
=?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E7=9B=B2=E7=9B=92?=
=?UTF-8?q?=E7=A4=BC=E5=8C=85=E9=A2=86=E5=8F=96=E9=A1=B5=E9=9D=A2-?=
=?UTF-8?q?=E9=A2=86=E5=8F=96=E6=8C=89=E9=92=AE=E6=9C=AA=E5=B1=85=E4=B8=AD?=
=?UTF-8?q?=EF=BC=8C=E5=9B=BE=E7=89=87=E8=A2=AB=E9=81=AE=E6=8C=A1=EF=BC=88?=
=?UTF-8?q?=E6=9C=AA=E5=BC=80=E5=90=AF=E5=A5=BD=E5=8F=8B=E8=BD=AC=E8=B5=A0?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_user/views/gift/components/GiftCard.vue | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/pkg_user/views/gift/components/GiftCard.vue b/pkg_user/views/gift/components/GiftCard.vue
index 1df5960..44c32fb 100644
--- a/pkg_user/views/gift/components/GiftCard.vue
+++ b/pkg_user/views/gift/components/GiftCard.vue
@@ -13,7 +13,9 @@
-
填写地址并收下
-
+
点击转赠给好友
@@ -68,7 +70,7 @@
填写信息并收下
-
+
点击转赠给好友
@@ -403,11 +405,13 @@ export default {
z-index: 999;
align-items: center;
border: 1rpx solid #C52733 ;
- margin-left: 10rpx;
font-weight: bold;
height: 80rpx;
line-height: 80rpx;
}
+.share-btn-second{
+ margin-left: 20rpx;
+}
.share-btn::before{
border: none;
}
From d70440b9480ad24a5995cf8922ee26c275323ecd Mon Sep 17 00:00:00 2001
From: LinCyJang
Date: Sun, 28 Dec 2025 20:00:42 +0800
Subject: [PATCH 06/21] =?UTF-8?q?Task=EF=BC=9A=E4=BA=A7=E5=93=81=E6=95=85?=
=?UTF-8?q?=E4=BA=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_user/views/gift/components/CoverPicker.vue | 3 ++-
pkg_user/views/gift/components/GiftCard.vue | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/pkg_user/views/gift/components/CoverPicker.vue b/pkg_user/views/gift/components/CoverPicker.vue
index cd98e08..971bd88 100644
--- a/pkg_user/views/gift/components/CoverPicker.vue
+++ b/pkg_user/views/gift/components/CoverPicker.vue
@@ -27,12 +27,13 @@
- {{ line }}
+ {{ line }}
diff --git a/pkg_user/views/gift/components/GiftCard.vue b/pkg_user/views/gift/components/GiftCard.vue
index 44c32fb..fea56a7 100644
--- a/pkg_user/views/gift/components/GiftCard.vue
+++ b/pkg_user/views/gift/components/GiftCard.vue
@@ -15,13 +15,13 @@
- {{ line }}
+ {{ line }}
From 6a6da9b3a6c9bb678b6321713819aac136b5b98c Mon Sep 17 00:00:00 2001
From: LinCyJang
Date: Sun, 28 Dec 2025 20:31:09 +0800
Subject: [PATCH 07/21] =?UTF-8?q?Fix=EF=BC=9A4740=20=E3=80=90=E5=95=86?=
=?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=BA=97=E9=93=BA?=
=?UTF-8?q?=E5=B0=81=E9=9D=A2=E4=B8=BA=E8=A7=86=E9=A2=91=EF=BC=8C=E5=B0=81?=
=?UTF-8?q?=E9=9D=A2=E5=9B=BE=E5=9C=A8=E5=BA=B7=E5=85=BB=E9=A1=B6=E9=83=A8?=
=?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=EF=BC=88=E5=AE=89=E5=8D=93=E6=89=8B?=
=?UTF-8?q?=E6=9C=BA=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_product/views/healthSanctum.vue | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/pkg_product/views/healthSanctum.vue b/pkg_product/views/healthSanctum.vue
index 2e2dbf3..f35dd77 100644
--- a/pkg_product/views/healthSanctum.vue
+++ b/pkg_product/views/healthSanctum.vue
@@ -19,8 +19,16 @@
-
-
+
+
旅居预约
@@ -267,4 +275,4 @@ export default {
border-radius: 6rpx;
bottom: 5rpx;
}
-
\ No newline at end of file
+
From 7153ce8e9ea8a02c9bb689ca96affc3dcb72eb47 Mon Sep 17 00:00:00 2001
From: LinCyJang
Date: Sun, 28 Dec 2025 20:38:23 +0800
Subject: [PATCH 08/21] =?UTF-8?q?Fix=EF=BC=9A4736=20=E3=80=90=E5=95=86?=
=?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E6=88=91=E7=9A=84?=
=?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E2=80=94=E2=80=9C=E5=8E=BB=E4=BD=BF?=
=?UTF-8?q?=E7=94=A8=E2=80=9D=E6=8C=89=E9=92=AE=E7=82=B9=E5=87=BB=E5=90=8E?=
=?UTF-8?q?=E9=9C=80=E8=B7=B3=E8=BD=AC=E8=87=B3=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_user/components/Coupons.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkg_user/components/Coupons.vue b/pkg_user/components/Coupons.vue
index cfbface..8ca0af5 100644
--- a/pkg_user/components/Coupons.vue
+++ b/pkg_user/components/Coupons.vue
@@ -52,7 +52,7 @@ export default {
this.isOpen = !this.isOpen
},
goGoods() {
- uni.navigateTo({url: '/pages/home/landMark'})
+ uni.navigateTo({url: 'pages/home/index'})
// this.$global.navToGoods(this.data.productId)
},
selectCoupon() {
From 3caa936e1e880b690e958460e7595a1b3aba012c Mon Sep 17 00:00:00 2001
From: LinCyJang
Date: Sun, 28 Dec 2025 20:47:47 +0800
Subject: [PATCH 09/21] =?UTF-8?q?Fix=EF=BC=9A4738=20=E3=80=90=E5=95=86?=
=?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=9B=A2=E9=98=9F?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E2=80=94=E6=8E=A8=E5=B9=BF=E7=BB=9F=E8=AE=A1?=
=?UTF-8?q?=E3=80=81=E6=8E=A8=E5=B9=BF=E4=BA=BA=E8=AE=A2=E5=8D=95=E6=A0=8F?=
=?UTF-8?q?=E7=82=B9=E5=87=BB=E6=97=A0=E5=8F=8D=E5=BA=94=EF=BC=8C=E6=97=A0?=
=?UTF-8?q?=E6=B3=95=E8=B7=B3=E8=BD=AC=E8=BF=9B=E5=85=A5=E5=AF=B9=E5=BA=94?=
=?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages.json | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/pages.json b/pages.json
index 05e06d0..bfa159f 100644
--- a/pages.json
+++ b/pages.json
@@ -167,6 +167,19 @@
"navigationBarTitleText": "提现结果"
}
},
+ {
+ "path": "pages/user/promotion/PromoterOrder/index",
+ "style": {
+ "navigationBarTitleText": "分销详情"
+ }
+ },
+ {
+ "path": "pages/user/promotion/PromoterList/index",
+ "style": {
+ "navigationBarTitleText": "分销列表",
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ },
{
"path": "pages/user/promotion/UserPromotion/index",
"style": {
From 0c0708477515315e115e50a36fed6a14c3e6f9c2 Mon Sep 17 00:00:00 2001
From: LinCyJang
Date: Tue, 30 Dec 2025 23:21:12 +0800
Subject: [PATCH 10/21] =?UTF-8?q?Fix=EF=BC=9A4777=20=E3=80=90=E5=95=86?=
=?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=A6=82=E6=9E=9C?=
=?UTF-8?q?=E6=9F=90=E5=95=86=E5=93=81=E6=9C=89=E4=BA=A7=E5=93=81=E6=95=85?=
=?UTF-8?q?=E4=BA=8B=E5=B0=81=E9=9D=A2=EF=BC=8C=E5=88=99=E5=B0=86=E4=BA=A7?=
=?UTF-8?q?=E5=93=81=E6=95=85=E4=BA=8B=E5=B0=81=E9=9D=A2=E5=9B=BE=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA=E5=9C=A8=E7=AC=AC=E4=B8=80=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../views/gift/components/CoverPicker.vue | 2 +-
pkg_user/views/gift/components/GiftCard.vue | 2 +-
pkg_user/views/gift/gift.vue | 59 +++++++++++++++----
3 files changed, 49 insertions(+), 14 deletions(-)
diff --git a/pkg_user/views/gift/components/CoverPicker.vue b/pkg_user/views/gift/components/CoverPicker.vue
index 971bd88..9a033fb 100644
--- a/pkg_user/views/gift/components/CoverPicker.vue
+++ b/pkg_user/views/gift/components/CoverPicker.vue
@@ -27,7 +27,7 @@
-
-
- 您已领取礼包
+
+
+ 您已领取礼包,去看看>>
我也要送礼
- 查看礼包详情>>
+
From 1b79ae1678399a601cca41f3942740ac2168062f Mon Sep 17 00:00:00 2001
From: LinCyJang
Date: Sun, 4 Jan 2026 19:39:03 +0800
Subject: [PATCH 16/21] =?UTF-8?q?Fix:4778=20=E3=80=90=E5=95=86=E5=9F=8E?=
=?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E4=BA=A7=E5=93=81=E6=95=85?=
=?UTF-8?q?=E4=BA=8B=E8=8B=B9=E6=9E=9C=E6=89=8B=E6=9C=BA=E5=AD=97=E4=BD=93?=
=?UTF-8?q?=E5=8D=95=E7=8B=AC=E8=B0=83=E6=95=B4=EF=BC=8C=E5=AD=97=E4=BD=93?=
=?UTF-8?q?=E5=8A=A0=E5=A4=A72=E4=B8=AA=E5=AD=97=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_user/views/gift/components/CoverPicker.vue | 9 +++++++++
pkg_user/views/gift/components/GiftCard.vue | 7 +++++++
2 files changed, 16 insertions(+)
diff --git a/pkg_user/views/gift/components/CoverPicker.vue b/pkg_user/views/gift/components/CoverPicker.vue
index 7118bbf..0da84b2 100644
--- a/pkg_user/views/gift/components/CoverPicker.vue
+++ b/pkg_user/views/gift/components/CoverPicker.vue
@@ -27,6 +27,7 @@
{
- // Success.
- uni.hideLoading();
- that.cityName = json.result.ad_info.city
- that.paramCity = json.result.ad_info.city
- //定位成功刷新数据
- that.fetchList()
- }).catch(err => {
- uni.hideLoading()
- })
- // #endif
-
- // #ifndef H5
- uni.request({
- url: 'https://apis.map.qq.com/ws/geocoder/v1/?location=' + latitude + ',' + longitude +
- '&key=' + config.key,
- success: function(res) {
- uni.hideLoading();
-
- that.cityName = res.data.result.ad_info.city
- that.paramCity = res.data.result.ad_info.city
- //定位成功刷新数据
- that.fetchList()
- },
- fail: function(res) {
- uni.hideLoading()
- }
- })
- // #endif
- },
- fail: function(res) {
- uni.hideLoading()
- }
- })
+ const map = await getLocation()
+ if (map.length > 1) {
+ const {latitude, longitude} = map[1]
+ getCurAddress(latitude, longitude, address => {
+ that.cityName = address.city
+ that.paramCity = address.city
+ })
+ }
},
fetchTypeList() {
this.hotelList = []
@@ -195,7 +158,7 @@ export default {
this.fetchList()
uni.removeStorageSync('cityName')
} else {
- this.getCurAddress()
+ this.getCurAddressFn()
}
}
})
diff --git a/pages/cloud/haveFun.vue b/pages/cloud/haveFun.vue
index 780231d..7c5c49e 100644
--- a/pages/cloud/haveFun.vue
+++ b/pages/cloud/haveFun.vue
@@ -457,13 +457,11 @@ export default {
},
async getMapData() {
const map = await getLocation()
- if (map.length > 1) {
+ if (map.length > 1 && !this.cityName) {
const {latitude, longitude} = map[1]
- const address = await getCurAddress(latitude, longitude)
- if(!this.cityName) {
- this.cityName = address[1].data.result.ad_info.city
- }
- // this.search()
+ getCurAddress(latitude, longitude, address => {
+ this.cityName = address.city
+ })
}
},
tapType(index) {
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 6f70caf..9323884 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -1399,13 +1399,12 @@ export default {
getLocationPromise().then(mapData => {
if (mapData.errMsg) {
const { latitude, longitude } = mapData
- getCurAddress(latitude, longitude).then(address => {
- this.cityName = address[1].data.result.ad_info.city
+ getCurAddress(latitude, longitude, address => {
+ console.log(address)
+ this.cityName = address.city
uni.setStorageSync('locationCityName', this.cityName)
this.isLocating = false
this.getPageData()
- }).catch(() => {
- this.getPageData()
})
} else {
this.isLocating = false
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index e3d6b4e..a7fbd87 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -901,17 +901,18 @@ export default {
})
},
async getMapData() {
- let location = uni.getStorageSync('location')
+ const location = uni.getStorageSync('location')
if (location.length === 0) {
const map = await getLocation()
if (map.length > 1) {
const {latitude, longitude} = map[1]
- let address = await getCurAddress(latitude, longitude)
- address = address[1].data.result.ad_info
- location = address.province + address.city + address.district
+ getCurAddress(latitude, longitude, address => {
+ this.postAddress = address.formattedAddress
+ })
}
+ } else {
+ this.postAddress = location
}
- this.postAddress = location
},
// 获取当前位置经纬度
handleLoacation(toast) {
@@ -923,9 +924,9 @@ export default {
const map = await getLocation();
if (map.length > 1) {
const {latitude, longitude} = map[1]
- let address = await getCurAddress(latitude, longitude)
- address = address[1].data.result.ad_info
- that.postAddress = address.province + address.city + address.district
+ getCurAddress(latitude, longitude, address => {
+ that.postAddress = address.formattedAddress
+ })
}
},
fail: err => {
diff --git a/pages/user/address/AddAddress/index.vue b/pages/user/address/AddAddress/index.vue
index 80a2fc0..2dccfbc 100644
--- a/pages/user/address/AddAddress/index.vue
+++ b/pages/user/address/AddAddress/index.vue
@@ -20,7 +20,7 @@
:items="district"
>
-
+
@@ -75,7 +75,7 @@
From 1c06f8af06d7b537ad320d65b007030bf0813d58 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Mon, 5 Jan 2026 17:29:23 +0800
Subject: [PATCH 19/21] =?UTF-8?q?Conf(=E5=9C=B0=E5=9B=BE):=E4=BD=BF?=
=?UTF-8?q?=E7=94=A8=E4=BC=81=E4=B8=9A=E7=9A=84=E6=9B=B4=E6=96=B0key?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
utils/mapConfig.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/utils/mapConfig.js b/utils/mapConfig.js
index 1fa66f2..a402b3f 100644
--- a/utils/mapConfig.js
+++ b/utils/mapConfig.js
@@ -2,6 +2,6 @@
module.exports = {
//key: 'LBZBZ-XAJRO-HKYWF-SOACS-HSTYQ-ZUF44'
- key: '0328840afc957efec4551c87ade9a38e'
+ key: '653f4f2f787ee9d156ab24c663868938'
};
From e90c3d38cc59365918dc50e56946aa24778a0ab6 Mon Sep 17 00:00:00 2001
From: LinCyJang
Date: Mon, 5 Jan 2026 19:51:57 +0800
Subject: [PATCH 20/21] =?UTF-8?q?Fix=EF=BC=9A=E5=B7=B2=E9=A2=86=E5=8F=96?=
=?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_user/views/gift/components/GiftCard.vue | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/pkg_user/views/gift/components/GiftCard.vue b/pkg_user/views/gift/components/GiftCard.vue
index c677762..55d7183 100644
--- a/pkg_user/views/gift/components/GiftCard.vue
+++ b/pkg_user/views/gift/components/GiftCard.vue
@@ -46,20 +46,19 @@
-
-
+
-
-
-
+ -->
+
+
您已领取礼包,去看看>>
- 我也要送礼
+ 我也要送礼
-
+
礼包已被领取
From 9b5847c4ce263383003705ce2abfcd0603f93263 Mon Sep 17 00:00:00 2001
From: LinCyJang
Date: Mon, 5 Jan 2026 20:03:19 +0800
Subject: [PATCH 21/21] =?UTF-8?q?Fix=EF=BC=9A=E4=BA=A7=E5=93=81=E6=95=85?=
=?UTF-8?q?=E4=BA=8Bios=E5=AD=97=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_user/views/gift/components/CoverPicker.vue | 8 ++++----
pkg_user/views/gift/components/GiftCard.vue | 7 +++----
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/pkg_user/views/gift/components/CoverPicker.vue b/pkg_user/views/gift/components/CoverPicker.vue
index 0da84b2..89ce48d 100644
--- a/pkg_user/views/gift/components/CoverPicker.vue
+++ b/pkg_user/views/gift/components/CoverPicker.vue
@@ -18,7 +18,7 @@
class="cover-swiper"
>
-
+
-
+