From 3ea76f40819c779b098646c361a85e0ff3c4e313 Mon Sep 17 00:00:00 2001 From: modendeveloper Date: Wed, 8 Jan 2025 19:33:12 +0800 Subject: [PATCH 001/150] =?UTF-8?q?Fix=EF=BC=9A2983=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=E8=A2=AB=E4=B8=8B?= =?UTF-8?q?=E6=9E=B6=E7=9A=84=E5=95=86=E5=93=81=E5=9C=A8=E8=B4=AD=E7=89=A9?= =?UTF-8?q?=E8=BD=A6=E4=B8=AD=E6=B6=88=E5=A4=B1=EF=BC=88=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=95=B0=E6=8D=AE=E4=BF=9D=E7=95=99=EF=BC=8C?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=97=B6=E6=8F=90=E9=86=92=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=B7=B2=E4=B8=8B=E6=9E=B6=E6=88=96=E8=A2=AB=E5=88=A0=E9=99=A4?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/cart.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/cart.vue b/pages/cart.vue index 571eb40..cf0bb77 100644 --- a/pages/cart.vue +++ b/pages/cart.vue @@ -500,7 +500,7 @@ export default { const res = await getCartGroup() if (res.success) { this.isLoad = true - this.list = res.data['valid'] + this.list = res.data['valid'].concat(res.data['invalid']) this.handleAll(false) const _res = await getUserLike() this.userLikeList = _res.data From 09b677d593aee738dbabfbb7db5b9c190851cd00 Mon Sep 17 00:00:00 2001 From: modendeveloper Date: Wed, 8 Jan 2025 19:42:25 +0800 Subject: [PATCH 002/150] =?UTF-8?q?Fix=EF=BC=9A2984=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?=E6=94=B6=E8=97=8F--=E8=A2=AB=E4=B8=8B=E6=9E=B6=E7=9A=84?= =?UTF-8?q?=E5=95=86=E5=93=81=E5=9C=A8=E5=95=86=E5=93=81=E6=94=B6=E8=97=8F?= =?UTF-8?q?=E4=B8=AD=E6=B6=88=E5=A4=B1=EF=BC=88=E6=94=B9=E4=B8=BA=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E6=95=B0=E6=8D=AE=E4=BF=9D=E7=95=99=EF=BC=8C=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E6=97=B6=E6=8F=90=E9=86=92=E5=95=86=E5=93=81=E5=B7=B2?= =?UTF-8?q?=E4=B8=8B=E6=9E=B6=E6=88=96=E8=A2=AB=E5=88=A0=E9=99=A4=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg_user/views/myFavorite.vue | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkg_user/views/myFavorite.vue b/pkg_user/views/myFavorite.vue index dcaa107..9cf896e 100644 --- a/pkg_user/views/myFavorite.vue +++ b/pkg_user/views/myFavorite.vue @@ -77,16 +77,16 @@ :src="item['image']" mode="scaleToFill" class="cover flex-0" - @click="navToGoods(item['productId'])" + @click="navToGoods(item)" /> {{ item['storeName'] }} - 规格:{{ item['sku'] }} + 规格:{{ item['sku'] }} - + ￥ {{ item['price'] }} ￥{{ item['otPrice'] }} @@ -347,9 +347,16 @@ export default { this.fetchProduct() }, methods: { - navToGoods(id) { + navToGoods(item) { + if(item.isInvalid) { + uni.showToast({ + title: '商品已下架', + icon: 'none' + }) + return + } uni.navigateTo({ - url: "/pages/shop/GoodsCon/index?id=" + id + url: "/pages/shop/GoodsCon/index?id=" + item.productId }) }, changeTabs(index) { From 77953ad6fe16cd32e69d867550540ba0810f80e3 Mon Sep 17 00:00:00 2001 From: modendeveloper Date: Wed, 8 Jan 2025 19:56:20 +0800 Subject: [PATCH 003/150] =?UTF-8?q?Fix=EF=BC=9A2986=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=AF=BB=E8=B6=A3?= =?UTF-8?q?=E5=91=B3=E6=9A=82=E6=97=A0=E5=BA=97=E9=93=BA=E6=A0=87=E8=AF=86?= =?UTF-8?q?=EF=BC=8C=E4=B9=8B=E5=89=8D=E6=94=B9=E4=B8=BA=E6=9C=89=E6=AD=A4?= =?UTF-8?q?=E6=A0=87=E8=AF=86=E4=B9=9F=E5=BC=80=E6=94=BE=E4=B8=BA=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E8=BF=9B=E5=85=A5=E9=A1=B5=E9=9D=A2=EF=BC=8C=E7=8E=B0?= =?UTF-8?q?=E5=9C=A8=E8=BF=98=E8=A6=81=E6=8C=89=E5=A6=82=E4=B8=8B=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9=E4=B8=80=E4=B8=8B=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/chose-city/chose-city.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/chose-city/chose-city.vue b/pages/chose-city/chose-city.vue index 6a6738a..1091797 100644 --- a/pages/chose-city/chose-city.vue +++ b/pages/chose-city/chose-city.vue @@ -314,7 +314,7 @@ export default { }, select(item) { if (this.type === 0 && item.hasData === 0) return - // if ((this.type === 1 || this.type === 2) && item.hasShop === 0) return + if ((this.type === 1 || this.type === 2) && item.hasShop === 0 && item.hasAncientTown === 0) return uni.setStorageSync("cityName", item.cityName) switch (this.type) { From ed006c46c56cb9c34191f92e0bf04c72c07eb58a Mon Sep 17 00:00:00 2001 From: modendeveloper Date: Wed, 8 Jan 2025 20:05:08 +0800 Subject: [PATCH 004/150] =?UTF-8?q?Fix=EF=BC=9A2988=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=89=80=E6=9C=89?= =?UTF-8?q?=E5=8E=BF=E5=9F=8E=E7=9A=84=E7=A7=9F=E5=94=AE=E8=B5=84=E8=AE=AF?= =?UTF-8?q?--=E5=A2=9E=E5=8A=A0=E2=80=9C=E5=85=A8=E9=83=A8=E2=80=9D?= =?UTF-8?q?=E5=88=86=E7=B1=BB=EF=BC=8C=E9=A6=96=E6=AC=A1=E8=BF=9B=E5=85=A5?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=97=B6=EF=BC=8C=E9=BB=98=E8=AE=A4=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E2=80=9C=E5=85=A8=E9=83=A8=E2=80=9D=E5=88=86=E7=B1=BB?= =?UTF-8?q?=EF=BC=8C=E5=B1=95=E7=A4=BA=E6=89=80=E6=9C=89=E5=BA=97=E9=93=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg_product/views/famousQianxianShop.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg_product/views/famousQianxianShop.vue b/pkg_product/views/famousQianxianShop.vue index 2ab3b21..bcc3db0 100644 --- a/pkg_product/views/famousQianxianShop.vue +++ b/pkg_product/views/famousQianxianShop.vue @@ -780,7 +780,7 @@ export default { countyFamousDataId: this.id } getSaleList(params).then(res => { - this.saleList = res.data || [] + this.saleList = [{name: '全部', id: ''}].concat(res.data || []) }) }, goStore(item) { From 4a929f4b32baf455b1ccc2bc43d3dad2d0bb5c51 Mon Sep 17 00:00:00 2001 From: modendeveloper Date: Wed, 8 Jan 2025 20:49:09 +0800 Subject: [PATCH 005/150] =?UTF-8?q?Fix=EF=BC=9A2999=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=9C=A8=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=87=8F=E5=95=86=E5=93=81?= =?UTF-8?q?=E6=95=B0=E9=87=8F=EF=BC=8C=E5=85=B3=E9=97=AD=E8=A7=84=E6=A0=BC?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=90=8E=E5=86=8D=E6=AC=A1=E6=89=93=E5=BC=80?= =?UTF-8?q?=EF=BC=8C=E5=95=86=E5=93=81=E6=95=B0=E9=87=8F=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=BA1=EF=BC=8C=E7=82=B9=E5=87=BB=E5=A2=9E=E5=87=8F?= =?UTF-8?q?=EF=BC=8C=E5=95=86=E5=93=81=E6=95=B0=E9=87=8F=E5=8F=98=E4=B8=BA?= =?UTF-8?q?=E5=9C=A8=E4=B9=8B=E5=89=8D=E5=A1=AB=E5=86=99=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E5=9F=BA=E7=A1=80=E4=B8=8A=E5=A2=9E=E5=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/shop/GoodsCon/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue index 0f59784..18abeda 100644 --- a/pages/shop/GoodsCon/index.vue +++ b/pages/shop/GoodsCon/index.vue @@ -1251,6 +1251,7 @@ export default { changeattr(msg) { // 修改了规格 this.attr.cartAttr = msg + this.$set(this.attr.productSelect, 'cart_num', 1) this.isOpen = false }, // 选择属性 From 02627db52527f7005f68143bf9a3193bbd846776 Mon Sep 17 00:00:00 2001 From: modendeveloper Date: Wed, 8 Jan 2025 21:05:42 +0800 Subject: [PATCH 006/150] =?UTF-8?q?Fix=EF=BC=9A3010=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=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=85=A5=E9=A9=BB=EF=BC=8C=E5=A1=AB=E5=86=99?= =?UTF-8?q?=E8=B5=84=E6=96=99=E8=BF=94=E5=9B=9E=E6=88=96=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=92=A4=E9=94=80=E5=BA=97=E9=93=BA=E7=94=B3=E8=AF=B7=EF=BC=8C?= =?UTF-8?q?=E5=86=8D=E6=AC=A1=E8=BF=9B=E5=85=A5=EF=BC=8C=E5=A1=AB=E5=86=99?= =?UTF-8?q?=E7=9A=84=E8=B5=84=E6=96=99=E6=9C=AA=E4=BF=9D=E7=95=99=EF=BC=88?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=BA=E8=B5=84=E6=96=99=E4=BB=8D=E7=84=B6?= =?UTF-8?q?=E4=BF=9D=E7=95=99=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg_join/views/supplier.vue | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkg_join/views/supplier.vue b/pkg_join/views/supplier.vue index eee1e60..60e4a5b 100644 --- a/pkg_join/views/supplier.vue +++ b/pkg_join/views/supplier.vue @@ -698,6 +698,19 @@ export default { onLoad(options) { this.partnerId = options.partnerId || '' const type = options.type + const local = uni.getStorageSync(type) + this.formSupplier = local || { + name: '', + avatar: '', + contact: '', + phone: '', + captcha: '', + qualification: '', + subType: '', + area: '', + address: '', + position: '' + } this.formSupplier.subType = type if (type === 'goods_supplier') { this.infoTitle = '特产' @@ -711,6 +724,9 @@ export default { }) this.init() }, + onUnload() { + uni.setStorageSync(this.formSupplier.subType, this.formSupplier) + }, onReady() { this.$refs.shopForm.setRules(this.rules) this.$refs.supplierForm.setRules(this.rulesSupplier) From dc8069bca13f539089ddfc40b3e6ab40e55e7a70 Mon Sep 17 00:00:00 2001 From: modendeveloper Date: Wed, 8 Jan 2025 21:17:56 +0800 Subject: [PATCH 007/150] =?UTF-8?q?Fix=EF=BC=9A3002=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=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E8=AF=84=E8=AE=BA=E5=88=97=E8=A1=A8=E4=B8=AD=E5=A4=9A=E4=B8=AA?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E4=B8=8D=E8=83=BD=E5=90=8C=E6=97=B6=E6=92=AD?= =?UTF-8?q?=E6=94=BE=EF=BC=8C=E6=92=AD=E6=94=BE=E4=B8=8B=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E8=87=AA=E5=8A=A8=E6=9A=82=E5=81=9C=E5=89=8D?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=AD=A3=E5=9C=A8=E6=92=AD=E6=94=BE=E7=9A=84?= =?UTF-8?q?=E8=A7=86=E9=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/UserEvaluation.vue | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/components/UserEvaluation.vue b/components/UserEvaluation.vue index 651652e..dae2ac9 100644 --- a/components/UserEvaluation.vue +++ b/components/UserEvaluation.vue @@ -26,7 +26,9 @@ :poster="item.video + '?vframe/jpg/offset/1'" controls play-btn-position="center" + :id="'video' + evaluateWtapperIndex" class="image" + @play="pauseOtherVideo('video' + evaluateWtapperIndex)" /> { + if(item !== video) { + uni.createVideoContext(item, this).pause(); + } + }) + } else { + this.videoPlayers.push(video); + } } } }; From a24bfb2ff2f386b21cb6e07c87eea8057e182be8 Mon Sep 17 00:00:00 2001 From: modendeveloper Date: Wed, 8 Jan 2025 21:23:47 +0800 Subject: [PATCH 008/150] =?UTF-8?q?Fix=EF=BC=9A3011=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?=E4=B8=BB=E9=A1=B5=E5=8F=91=E5=B8=83=E5=8A=A8=E6=80=81=E4=B8=AD?= =?UTF-8?q?=EF=BC=8C=E7=AE=80=E4=BB=8B=E8=BE=93=E5=85=A5=E5=AD=97=E6=95=B0?= =?UTF-8?q?=E8=B6=85=E8=BF=87140=E5=AD=97=E6=97=B6=E6=9C=AA=E5=BC=B9?= =?UTF-8?q?=E5=87=BA=E2=80=9D=E5=AD=97=E6=95=B0=E8=B6=85=E8=BF=87=E9=99=90?= =?UTF-8?q?=E5=88=B6=E2=80=9C=E6=8F=90=E7=A4=BA=EF=BC=8C=E4=B8=94=E4=B8=8B?= =?UTF-8?q?=E6=96=B9=E5=AD=97=E6=95=B0=E6=8F=90=E7=A4=BA=E5=8F=98=E5=8C=96?= =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pagesInn/inn/innInfoPublish.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pagesInn/inn/innInfoPublish.vue b/pagesInn/inn/innInfoPublish.vue index 4121f20..17858b8 100644 --- a/pagesInn/inn/innInfoPublish.vue +++ b/pagesInn/inn/innInfoPublish.vue @@ -30,7 +30,7 @@ placeholder-style="font-size:24rpx;color:#C2C5CC;" class="content-style inp" /> - {{ form.intro.length }} / 140 + {{ form.intro.length > 140 ? 140 : form.intro.length }} / 140 图片(最多9张): From daf0ed691e7bd0300e9f70eaffeb2dc220f01984 Mon Sep 17 00:00:00 2001 From: modendeveloper Date: Wed, 8 Jan 2025 22:03:19 +0800 Subject: [PATCH 009/150] =?UTF-8?q?Fix=EF=BC=9A2987=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=AF=BB=E8=B6=A3?= =?UTF-8?q?=E5=91=B3=E5=88=86=E7=B1=BB=EF=BC=8C=E5=8F=A4=E9=95=87=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E5=A7=8B=E7=BB=88=E5=9B=BA=E5=AE=9A=E5=9C=A8=E5=B7=A6?= =?UTF-8?q?=E4=BE=A7=EF=BC=8C=E7=8E=B0=E5=9C=A8=E5=BE=80=E5=8F=B3=E6=BB=91?= =?UTF-8?q?=E5=8A=A8=E4=BC=9A=E6=8A=8A=E5=8F=A4=E9=95=87=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E6=8C=A4=E6=8E=89=EF=BC=8C=E8=AF=A6=E6=83=85=E8=A7=81=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E9=99=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/cloud/haveFun.vue | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/pages/cloud/haveFun.vue b/pages/cloud/haveFun.vue index c7f24d7..a666696 100644 --- a/pages/cloud/haveFun.vue +++ b/pages/cloud/haveFun.vue @@ -42,7 +42,7 @@ - + - - - - {{ item.name }} + + + + + {{ item.name }} + - - + + From 432177604fef4f202a7e9339cfa3920d62c262aa Mon Sep 17 00:00:00 2001 From: modendeveloper Date: Mon, 13 Jan 2025 22:36:58 +0800 Subject: [PATCH 010/150] =?UTF-8?q?Task=EF=BC=9A=E5=95=86=E5=9F=8E?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BC=98=E6=83=A0=E5=88=B8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/CouponsPopup.vue | 9 ++++++++- pages/shop/GoodsCon/index.vue | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/components/CouponsPopup.vue b/components/CouponsPopup.vue index be18a8a..42463d8 100644 --- a/components/CouponsPopup.vue +++ b/components/CouponsPopup.vue @@ -1,7 +1,11 @@ + + \ No newline at end of file diff --git a/mixins/GuideMixins.js b/mixins/GuideMixins.js new file mode 100644 index 0000000..25596e9 --- /dev/null +++ b/mixins/GuideMixins.js @@ -0,0 +1,37 @@ +export default { + data() { + return { + scrollView: '', + functionGuideData: { + step: 0, + tips: '', + tipsPosition: '', + btnGroupPosition: '', + position: {} + }, + screenWidth: 0, + scrollLeft: 0, + } + }, + onLoad() { + this.$refs.FunctionGuide.init() + }, + methods: { + setFunctionGuideData(data) { + this.functionGuideData = { + ...this.functionGuideData, + ...data + } + this.showFunctionGuide() + }, + getElementData(el, cb) { + const query = uni.createSelectorQuery().in(this) + query.select(el).boundingClientRect().exec((res)=> { + if(res[0]) { + cb(res[0]) + } + }) + }, + + } +} \ No newline at end of file diff --git a/pages/home/index.vue b/pages/home/index.vue index f7afb0a..55a5f3c 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -44,27 +44,30 @@ - + - - - - - {{ item.name }} + + + + + + {{ item.name }} + - + + + @@ -334,6 +338,7 @@ @ok="handleOk" paddingBottom="200rpx" /> + @@ -347,6 +352,8 @@ import { sharpBannar } from '@/api/goods' import { pageListenMixins } from '@/mixins/pageListenMixins' import ProductWindow from '@/components/ProductWindow' import goCartMixin from '@/mixins/goCartMixins' +import FunctionGuide from '@/components/FunctionGuide' +import GuideMixins from '@/mixins/GuideMixins' import { getCurAddress, getLocationPromise, @@ -358,9 +365,10 @@ export default { components: { XddTabbar, XddProductItem, - ProductWindow + ProductWindow, + FunctionGuide }, - mixins: [pageListenMixins, goCartMixin], + mixins: [pageListenMixins, goCartMixin, GuideMixins], data() { return { webUrl: this.$VUE_APP_RESOURCES_URL, @@ -433,6 +441,77 @@ export default { this.scrollTop = e.scrollTop }, methods: { + showFunctionGuide() { + if(this._step == this.functionGuideData.step) return + this._step = this.functionGuideData.step + if(this.functionGuideData.step == 1) { + this.getElementData('#step1', res=>{ + console.log(res); + this.screenWidth = res.width - 20 + this.setFunctionGuideData({ + tips: '介绍模块1，简述一下模块功能', + btnGroupPosition: '-120rpx', + tipsPosition: '420rpx', + position: { + top: 265 + 'px', + left: res.left + 10 + 'px', + width: `${res.width - 20}px`, + height: `${80 + 114 + 8 + 252 + 8}px`, + } + }) + }) + + }else { + this.getElementData(`#box-item${this.functionGuideData.step}`, res=>{ + console.log(res); + this.setFunctionGuideData({ + tips: '介绍模块2，简述一下模块功能', + btnGroupPosition: '', + tipsPosition: '', + position: { + top: res.top + 'px', + left: res.left + 'px', + width: `${res.width}px`, + height: `${res.height}px`, + } + }) + this.$nextTick(()=> { + this.scrollView = `box-item${this.functionGuideData.step}` + }) + }) + } + + // if(this.functionGuideData.step == 2) { + // this.getElementData('#box-item0', res=>{ + // this.setFunctionGuideData({ + // tips: '介绍模块2，简述一下模块功能', + // btnGroupPosition: '', + // tipsPosition: '', + // position: { + // top: res.top + 'px', + // left: res.left - 10 + 'px', + // width: `${res.height}px`, + // height: `${res.height}px` + // } + // }) + // }) + // }else if(this.functionGuideData.step == 3) { + // this.getElementData('#box-item1', res=>{ + // this.setFunctionGuideData({ + // tips: '介绍模块6，模块处于底部，需滚动页面', + // tipsPosition: '', + // position: { + // top: res.top + 'px', + // left: res.left - 10 + 'px', + // width: `${res.height}px`, + // height: `${res.height}px` + // } + // }) + // }) + // }else if(this.functionGuideData.step == 'jump') { + // this.intoView = 'top' + // } + }, played() { this.isPlay = !this.isPlay if(this.isPlay) { @@ -771,15 +850,15 @@ export default { display: flex; flex-shrink: 0; padding: 12rpx 24rpx; - margin: -120rpx 0 0 0; border-radius: 16rpx; background-color: #fff; overflow-x: auto; .item + .item { - margin: 0 0 0 36rpx; + // margin: 0 0 0 36rpx; } .item { width: 150rpx; + padding: 10rpx 20rpx; .img { width: 86rpx; height: 86rpx; From 30c2d1841260d8c1e6765119d3dd9cfc15a98b1b Mon Sep 17 00:00:00 2001 From: linxi Date: Thu, 16 Jan 2025 18:09:07 +0800 Subject: [PATCH 016/150] =?UTF-8?q?Task=EF=BC=9A=E6=8C=87=E5=BC=95?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/FunctionGuide.vue | 6 +++- components/xdd-tabbar/index.vue | 13 ++++++- mixins/GuideMixins.js | 3 ++ pages/home/index.vue | 63 +++++++++++++++++++++++++++------ 4 files changed, 73 insertions(+), 12 deletions(-) diff --git a/components/FunctionGuide.vue b/components/FunctionGuide.vue index 82c66e6..46bdabd 100644 --- a/components/FunctionGuide.vue +++ b/components/FunctionGuide.vue @@ -6,7 +6,7 @@ --> 跳过 - {{ functionGuideData.step==maxStep ? '知道了' : '下一步' }} + {{ functionGuideData.step==maxStep ? '知道了' : '下一步' }} @@ -97,6 +97,10 @@ \ No newline at end of file From f3be58127885f31c7343d9689e5d754313b6d2e3 Mon Sep 17 00:00:00 2001 From: linxi Date: Fri, 17 Jan 2025 18:17:30 +0800 Subject: [PATCH 018/150] =?UTF-8?q?Task=EF=BC=9A=E6=8C=87=E5=BC=95?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/FunctionGuide.vue | 51 +- components/xdd-product-item/index.vue | 47 +- components/xdd-tabbar/index.vue | 10 + pages/home/index.vue | 769 +++++++++++++++++++++++--- 4 files changed, 798 insertions(+), 79 deletions(-) diff --git a/components/FunctionGuide.vue b/components/FunctionGuide.vue index 46bdabd..d78c799 100644 --- a/components/FunctionGuide.vue +++ b/components/FunctionGuide.vue @@ -1,14 +1,27 @@ @@ -25,7 +38,7 @@ type: Object, default: ()=> { return { - step: 0, + step: 2, tips: '', // 介绍 tipsPosition: '', // 介绍 显示位置 btnGroupPosition: '', // 按钮组显示位置 @@ -50,6 +63,17 @@ } }, methods: { + handleImg(img) { + if(!img.isBtn) return + if(img.isBtn === 'next') { + this.next() + return + } + if(img.isBtn === 'jump') { + this.jump() + return + } + }, init() { if (this.show) return setTimeout(() => { @@ -97,6 +121,15 @@ From b07e967e234a54dd79bc75e9e6744112d8e21557 Mon Sep 17 00:00:00 2001 From: modendeveloper Date: Sun, 19 Jan 2025 22:11:27 +0800 Subject: [PATCH 027/150] =?UTF-8?q?Fix=EF=BC=9A3022=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=A1=AB=E5=86=99?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E8=B5=84=E6=96=99=E7=82=B9=E5=87=BB=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=90=8E=E5=86=8D=E6=AC=A1=E8=BF=9B=E5=85=A5=EF=BC=8C?= =?UTF-8?q?=E5=A1=AB=E5=86=99=E5=86=85=E5=AE=B9=E6=9C=AA=E4=BF=9D=E7=95=99?= =?UTF-8?q?=EF=BC=88=E4=BF=AE=E5=A4=8D=E4=B8=BA=E5=A1=AB=E5=86=99=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E4=BB=8D=E7=84=B6=E4=BF=9D=E7=95=99=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- v4/views/attract/attract.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/v4/views/attract/attract.vue b/v4/views/attract/attract.vue index ead0ecd..9581b9d 100644 --- a/v4/views/attract/attract.vue +++ b/v4/views/attract/attract.vue @@ -89,6 +89,13 @@ export default { onLoad: function () { this.init() this.getCityList() + const localData = uni.getStorageSync('investmentIndex') + if (localData) { + this.businessApply = localData + } + }, + onUnload() { + uni.setStorageSync('investmentIndex', this.businessApply) }, methods: { init() { @@ -119,7 +126,7 @@ export default { this.total = data.total this.businessApplyList = data.businessApplyList if (data.businessApply) { - this.businessApply = data.businessApply + // this.businessApply = data.businessApply this.address = { province: data.businessApply.provinceName || "", city: data.businessApply.cityName || "", From a3a0d0c83348f29a7be299cdbfbe2146cd0e1282 Mon Sep 17 00:00:00 2001 From: modendeveloper Date: Mon, 20 Jan 2025 22:56:20 +0800 Subject: [PATCH 028/150] =?UTF-8?q?Task=EF=BC=9A=E7=89=A9=E6=B5=81?= =?UTF-8?q?=E6=8B=86=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/Logistics/index.vue | 23 ++++++++------ pages/order/OrderDetails/index.vue | 49 ++++++++++++++++++------------ 2 files changed, 43 insertions(+), 29 deletions(-) diff --git a/pages/order/Logistics/index.vue b/pages/order/Logistics/index.vue index 2be23ea..453fe09 100644 --- a/pages/order/Logistics/index.vue +++ b/pages/order/Logistics/index.vue @@ -112,6 +112,7 @@ export default { return { webUrl:this.$VUE_APP_RESOURCES_URL, id: "", + index: null, cartInfo: [], orderInfo: {}, expressList: [], @@ -124,6 +125,9 @@ export default { ] }; }, + onLoad(opts) { + this.index = opts.index || 0; + }, watch: { $yroute(n) { if (n.name === NAME && this.$yroute.query.id !== this.id) { @@ -151,16 +155,18 @@ export default { .catch(err => { uni.showToast({ title: - err.msg || err.response.data.msg || err.response.data.message, + err.msg , icon: "none", duration: 2000 }); }); }, getExpress() { + console.log(this.id, "this.id"); + if (!this.id) { uni.showToast({ - title: err.msg || err.response.data.msg || err.response.data.message, + title: '订单信息错误', icon: "none", duration: 2000 }); @@ -169,11 +175,11 @@ export default { this.loaded = false; orderDetail(this.id) .then(res => { - this.orderInfo = { - deliveryId: res.data.deliveryId, - deliveryName: res.data.deliveryName, - deliverySn: res.data.deliverySn - }; + console.log(this.index, "this.orderInfo"); + const { data } = res; + const current = data.deliveryInfo[+this.index ]; + console.log(current, "current"); + this.orderInfo = current; this.getExpressInfo(); // const result = res.data.express.result || {}; // this.cartInfo = res.data.order.cartInfo; @@ -182,8 +188,7 @@ export default { }) .catch(err => { uni.showToast({ - title: - err.msg || err.response.data.msg || err.response.data.message, + title: err.msg , icon: "none", duration: 2000 }); diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue index 462c6f8..e9a532d 100644 --- a/pages/order/OrderDetails/index.vue +++ b/pages/order/OrderDetails/index.vue @@ -28,28 +28,32 @@ - - - - {{ orderInfo.deliveryName }}：{{ orderInfo.deliveryId }} - - 复制 - - - - - - - - {{ logistics.Traces && logistics.Traces.length > 0 ? logistics.Traces[logistics.Traces.length - 1].acceptStation : '暂无轨迹信息'}} - + + - + {{ delivery.deliveryName }}：{{ delivery.deliveryId }} + + 复制 + + + + + + + + {{ logistics.Traces && logistics.Traces.length > 0 ? logistics.Traces[logistics.Traces.length - 1].acceptStation : '暂无轨迹信息'}} + + + + + + + {{ logistics.Traces && logistics.Traces.length > 0 ? logistics.Traces[logistics.Traces.length - 1].acceptTime : '' }} - - {{ logistics.Traces && logistics.Traces.length > 0 ? logistics.Traces[logistics.Traces.length - 1].acceptTime : '' }} + + + + + + + + + + + + + diff --git a/pkg_user/views/gift/components/giftTips.vue b/pkg_user/views/gift/components/giftTips.vue new file mode 100644 index 0000000..1793bcd --- /dev/null +++ b/pkg_user/views/gift/components/giftTips.vue @@ -0,0 +1,59 @@ + + + + + diff --git a/pkg_user/views/gift/gift.vue b/pkg_user/views/gift/gift.vue index 480421f..3c9db1a 100644 --- a/pkg_user/views/gift/gift.vue +++ b/pkg_user/views/gift/gift.vue @@ -7,7 +7,7 @@ 送礼寄语 - 默认封面 + 默认封面 @@ -23,23 +23,82 @@ 是否支持好友转赠 - + - 付款并赠送 + 付款并赠送 好友未收下礼包，将于24小时后自动退款 - + + + From 1fbbbed4f06dea91ecb4c54f4abb2cc784b19403 Mon Sep 17 00:00:00 2001 From: modendeveloper Date: Thu, 20 Feb 2025 08:34:58 +0800 Subject: [PATCH 086/150] =?UTF-8?q?Task=EF=BC=9A=E7=A4=BC=E5=93=81?= =?UTF-8?q?=E8=B5=A0=E9=80=81/=E9=80=81=E7=A4=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/gift/components/CoverPicker.vue | 13 +- pkg_user/views/gift/gift.vue | 121 +++++++++++++++++- 2 files changed, 128 insertions(+), 6 deletions(-) diff --git a/pkg_user/views/gift/components/CoverPicker.vue b/pkg_user/views/gift/components/CoverPicker.vue index 6c9542b..d1d4c08 100644 --- a/pkg_user/views/gift/components/CoverPicker.vue +++ b/pkg_user/views/gift/components/CoverPicker.vue @@ -13,8 +13,8 @@ :circular="true" :indicator-dots="false" @change="onChange" - previous-margin="120rpx" - next-margin="120rpx" + previous-margin="160rpx" + next-margin="160rpx" class="cover-swiper" > @@ -29,6 +29,7 @@ 确定 + 红包封面在对方领取时展示 @@ -66,12 +67,18 @@ export default { \ No newline at end of file From e1328a7825aa7dcf959f9ae217ea08ae3dbcb1c9 Mon Sep 17 00:00:00 2001 From: modendeveloper Date: Fri, 21 Feb 2025 01:21:22 +0800 Subject: [PATCH 088/150] =?UTF-8?q?Task=EF=BC=9A=E7=A4=BC=E5=93=81?= =?UTF-8?q?=E8=B5=A0=E9=80=81/=E9=80=81=E7=A4=BC=E3=80=81=E5=88=86?= =?UTF-8?q?=E4=BA=AB=E3=80=82=E6=94=B6=E7=A4=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/gift.js | 4 +- pkg_user/views/gift/components/GiftCard.vue | 68 +++++ pkg_user/views/gift/components/PayPicker.vue | 106 +++++++ pkg_user/views/gift/gift.vue | 301 +++++++++++++++---- pkg_user/views/gift/receive.vue | 7 +- 5 files changed, 419 insertions(+), 67 deletions(-) create mode 100644 pkg_user/views/gift/components/GiftCard.vue create mode 100644 pkg_user/views/gift/components/PayPicker.vue diff --git a/api/gift.js b/api/gift.js index 592f821..ea1e798 100644 --- a/api/gift.js +++ b/api/gift.js @@ -12,7 +12,7 @@ export function getGiftCardSendOrderConfirm(data) { * 礼品卡送礼订单创建 * @param {*} data */ -export function getGiftCardSendOrder(key) { - return request.post("/giftCard/create/" + key); +export function getGiftCardSendOrder(key, data) { + return request.post("/giftCard/create/" + key, data); } diff --git a/pkg_user/views/gift/components/GiftCard.vue b/pkg_user/views/gift/components/GiftCard.vue new file mode 100644 index 0000000..8b4558e --- /dev/null +++ b/pkg_user/views/gift/components/GiftCard.vue @@ -0,0 +1,68 @@ + + + + + diff --git a/pkg_user/views/gift/components/PayPicker.vue b/pkg_user/views/gift/components/PayPicker.vue new file mode 100644 index 0000000..0d46d27 --- /dev/null +++ b/pkg_user/views/gift/components/PayPicker.vue @@ -0,0 +1,106 @@ + + + + + diff --git a/pkg_user/views/gift/gift.vue b/pkg_user/views/gift/gift.vue index 579d623..e13c4af 100644 --- a/pkg_user/views/gift/gift.vue +++ b/pkg_user/views/gift/gift.vue @@ -1,13 +1,13 @@ From 425821ecf76cae6838b251145739b71667d8a01c Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Fri, 21 Feb 2025 14:23:49 +0800 Subject: [PATCH 089/150] =?UTF-8?q?Feat(=E6=88=91=E7=9A=84=E7=A4=BC?= =?UTF-8?q?=E5=93=81=E5=8D=A1):=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg_user/views/giftList.vue | 59 +++++++++++++++++++++++++------------ 1 file changed, 40 insertions(+), 19 deletions(-) diff --git a/pkg_user/views/giftList.vue b/pkg_user/views/giftList.vue index f3c11c9..17dc497 100644 --- a/pkg_user/views/giftList.vue +++ b/pkg_user/views/giftList.vue @@ -126,27 +126,12 @@ 赠言：{{ item.message }} - 送给朋友 - - - - 已全部领取 - - - 灰色按钮 + {{ getStatus(item) }} @@ -259,6 +244,42 @@ export default { this.isLoad = true }) }, + getStatus(order) { + const type = Number(order._status._type) + let status = '' + switch (type) { + case 0: + status = '待付款' + break + case 1: + status = '礼包待发货' + break + case 2: + status = '礼包待收货' + break + case 3: + status = '礼包已收货' + break + case 4: + status = '已完成' + break + case -1: + status = '退款中' + break + case -2: + status = '已退回' + break + case -3: + status = '退款失败' + break + case 9: + status = '已取消' + break + default: + break + } + return status + }, showTips() { this.$refs.giftTips.showTips = true }, From f0a4a0edf934473bcc4caa09253df73c13f2cf9d Mon Sep 17 00:00:00 2001 From: linxi Date: Fri, 21 Feb 2025 18:25:34 +0800 Subject: [PATCH 090/150] =?UTF-8?q?Task=EF=BC=9A=E6=94=B6=E7=A4=BC?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/gift.js | 24 ++ pages/shop/GoodsCon/index.vue | 2 +- .../views/gift/components/AddressDialog.vue | 287 ++++++++++++++++++ pkg_user/views/gift/components/GiftCard.vue | 103 ++++++- pkg_user/views/gift/gift.vue | 32 +- pkg_user/views/gift/receive.vue | 20 +- 6 files changed, 441 insertions(+), 27 deletions(-) create mode 100644 pkg_user/views/gift/components/AddressDialog.vue diff --git a/api/gift.js b/api/gift.js index ea1e798..2c14841 100644 --- a/api/gift.js +++ b/api/gift.js @@ -16,3 +16,27 @@ export function getGiftCardSendOrder(key, data) { return request.post("/giftCard/create/" + key, data); } + +/** + * 礼品详情 + * @param {*} data + */ +export function getGiftCardDetail(data) { + return request.get("/giftCard/info", data); +} + +/** + * 领取礼品卡 + * @param {*} data + */ +export function getGiftCardReceive(data) { + return request.post("/giftCard/receive", data); +} + +/** + * 礼品卡赠礼须知 + * @param {*} data + */ +export function getGiftCardSendNotice(data) { + return request.get("/giftCard/giftNotice", data); +} \ No newline at end of file diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue index 37755f2..a1b0e69 100644 --- a/pages/shop/GoodsCon/index.vue +++ b/pages/shop/GoodsCon/index.vue @@ -1424,7 +1424,7 @@ export default { } if(news === 2) { uni.navigateTo({ - url: '/pkg_user/views/gift/gift?cartId=' + res.data.cartId + '&couponId=' + that.couponId + url: '/pkg_user/views/gift/gift?cartId=' + res.data.cartId + '&couponId=' + (that.couponId ? that.couponId : '') }) } if(news === 0) { diff --git a/pkg_user/views/gift/components/AddressDialog.vue b/pkg_user/views/gift/components/AddressDialog.vue new file mode 100644 index 0000000..4ba4b26 --- /dev/null +++ b/pkg_user/views/gift/components/AddressDialog.vue @@ -0,0 +1,287 @@ + + + + + diff --git a/pkg_user/views/gift/components/GiftCard.vue b/pkg_user/views/gift/components/GiftCard.vue index 8b4558e..fbc235d 100644 --- a/pkg_user/views/gift/components/GiftCard.vue +++ b/pkg_user/views/gift/components/GiftCard.vue @@ -1,35 +1,127 @@ \ No newline at end of file diff --git a/pkg_user/views/gift/components/CoverPicker.vue b/pkg_user/views/gift/components/CoverPicker.vue index d1d4c08..609976a 100644 --- a/pkg_user/views/gift/components/CoverPicker.vue +++ b/pkg_user/views/gift/components/CoverPicker.vue @@ -13,13 +13,19 @@ :circular="true" :indicator-dots="false" @change="onChange" - previous-margin="160rpx" - next-margin="160rpx" + previous-margin="180rpx" + next-margin="180rpx" class="cover-swiper" > - + - + + + + + + {{ message || '礼笺轻启，礼藏心意' }} + {{ item.name }} @@ -44,6 +50,14 @@ export default { list: { type: Array, default: () => [] + }, + product: { + type: Object, + default: () => {} + }, + message: { + type: String, + default: '' } }, data() { @@ -67,6 +81,34 @@ export default { \ 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 78b86bc..c58104b 100644 --- a/pkg_user/views/gift/components/GiftCard.vue +++ b/pkg_user/views/gift/components/GiftCard.vue @@ -76,7 +76,7 @@ export default { // 组件数据 giftNotice: '', isReceive: false, - address: {}, + address: [], order: '' } }, @@ -84,7 +84,8 @@ export default { addr: { handler(newVal, oldVal) { if (newVal && newVal.id) { - this.address = newVal + // this.address = newVal + this.setAddress() } }, deep: true @@ -132,7 +133,7 @@ export default { if (res.data.length === 0) { this.$refs.addressDialog.open() } else { - this.address = res.data.filter(item => item.isDefault === 1).length === 0 ? res.data[0] : res.data.filter(item => item.isDefault === 1)[0] + this.address = res.data this.$refs.AddressList.open() } }) From 6af05e705ac5355265b696d0a4129f36faf157eb Mon Sep 17 00:00:00 2001 From: linxi Date: Mon, 24 Feb 2025 17:05:08 +0800 Subject: [PATCH 109/150] =?UTF-8?q?Fix=EF=BC=9A3262=20=E3=80=90=E7=A4=BC?= =?UTF-8?q?=E5=93=81=E5=8A=9F=E8=83=BD=E3=80=91=E6=AF=8F=E6=AC=A1=E9=A2=86?= =?UTF-8?q?=E5=8F=96=E7=A4=BC=E5=93=81=E6=97=B6=E8=BE=93=E5=85=A5=E6=96=B0?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=EF=BC=8C=E9=83=BD=E4=BC=9A=E6=8A=8A=E4=B8=8A?= =?UTF-8?q?=E4=B8=80=E6=AC=A1=E4=BF=9D=E5=AD=98=E7=9A=84=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E8=A6=86=E7=9B=96=E6=8E=89=EF=BC=8C=E8=AE=BE=E7=BD=AE=E6=96=B0?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E4=B9=9F=E8=A6=81=E4=BF=9D=E7=95=99=E4=B8=8A?= =?UTF-8?q?=E4=B8=80=E6=AC=A1=E7=9A=84=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/gift/components/AddressList.vue | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkg_user/views/gift/components/AddressList.vue b/pkg_user/views/gift/components/AddressList.vue index 27a79d7..6e2eef3 100644 --- a/pkg_user/views/gift/components/AddressList.vue +++ b/pkg_user/views/gift/components/AddressList.vue @@ -29,7 +29,7 @@ {{ item.province + item.city + item.district + item.detail }} - + @@ -59,13 +59,20 @@ export default { } }, methods: { - editAddress() { + editAddress(item) { + // this.$yrouter.push({ + // path: "/pages/user/address/AddressManagement/index", + // query: { + // choosMode: 3 + // } + // }); this.$yrouter.push({ - path: "/pages/user/address/AddressManagement/index", - query: { - choosMode: 3 + path: "/pages/user/address/AddAddress/index", + query: { + choosMode: 3, + id: item.id } - }); + }) }, // 选择地址 handleSelect(item) { From 1319517a410ec68e6c427f02ecc7009fdccfc0d0 Mon Sep 17 00:00:00 2001 From: linxi Date: Mon, 24 Feb 2025 17:20:18 +0800 Subject: [PATCH 110/150] =?UTF-8?q?Fix=EF=BC=9A3289=20=E3=80=90=E7=A4=BC?= =?UTF-8?q?=E5=93=81=E5=8A=9F=E8=83=BD=E3=80=91=E8=BF=9B=E5=85=A5=E7=A4=BC?= =?UTF-8?q?=E5=8C=85=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=E9=A1=B5=EF=BC=8C?= =?UTF-8?q?=E7=A4=BC=E5=8C=85=E8=B5=A0=E9=80=81=E5=8C=BA=E5=9F=9F=E4=BC=9A?= =?UTF-8?q?=E5=85=88=E9=97=AA=E7=83=81=E5=90=8E=E6=AD=A3=E5=B8=B8=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/shop/GoodsCon/index.vue | 5 +++-- pkg_user/views/gift/components/GiftCard.vue | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue index aea9a3a..3d1eddc 100644 --- a/pages/shop/GoodsCon/index.vue +++ b/pages/shop/GoodsCon/index.vue @@ -64,8 +64,8 @@ {{ storeInfo.storeName }} - - + + 支持礼包赠送 @@ -2130,6 +2130,7 @@ export default { } .gift-img{ width: 34rpx; + height: 34rpx; margin-right: 10rpx; } diff --git a/pkg_user/views/gift/components/GiftCard.vue b/pkg_user/views/gift/components/GiftCard.vue index c58104b..9333b1a 100644 --- a/pkg_user/views/gift/components/GiftCard.vue +++ b/pkg_user/views/gift/components/GiftCard.vue @@ -85,7 +85,7 @@ export default { handler(newVal, oldVal) { if (newVal && newVal.id) { // this.address = newVal - this.setAddress() + this.setAddress(1) } }, deep: true @@ -128,12 +128,13 @@ export default { uni.hideLoading() }) }, - setAddress() { + setAddress(flag) { getAddressList().then(res => { if (res.data.length === 0) { this.$refs.addressDialog.open() } else { this.address = res.data + if(flag) return this.$refs.AddressList.open() } }) From 281249830aae96d5efbeb1b6967bd33d5b4cbfcc Mon Sep 17 00:00:00 2001 From: linxi Date: Mon, 24 Feb 2025 17:22:14 +0800 Subject: [PATCH 111/150] =?UTF-8?q?Fix=EF=BC=9A3286=20=E3=80=90=E7=A4=BC?= =?UTF-8?q?=E5=93=81=E5=8A=9F=E8=83=BD=E3=80=91=E7=A4=BC=E5=8C=85=E9=A2=86?= =?UTF-8?q?=E5=8F=96=E9=A1=B5=E9=9D=A2-=E8=B0=83=E6=95=B4=E5=95=86?= =?UTF-8?q?=E5=93=81=E5=9B=BE=E7=89=87=EF=BC=8C=E5=BA=94=E4=B8=8E=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E6=A1=86=E8=B4=B4=E5=90=88=E6=95=88=E6=9E=9C=EF=BC=8C?= =?UTF-8?q?=E5=9C=86=E8=A7=92=E5=BC=A7=E5=BA=A6=E9=9C=80=E5=86=8D=E7=BC=A9?= =?UTF-8?q?=E5=B0=8F=E7=82=B9?= 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 9333b1a..82fce00 100644 --- a/pkg_user/views/gift/components/GiftCard.vue +++ b/pkg_user/views/gift/components/GiftCard.vue @@ -183,12 +183,13 @@ export default { border: 10rpx solid #FDF0D3; border-radius: 30rpx; position: absolute; + overflow: hidden; top: -60px; } .pro-image{ width: 296rpx; height: 296rpx; - border-radius: 30rpx; + /* border-radius: 30rpx; */ } .auto-text-color { color: #fff; From 60e473db8a4be37d06d3827a053cf40eef26f654 Mon Sep 17 00:00:00 2001 From: linxi Date: Mon, 24 Feb 2025 17:29:59 +0800 Subject: [PATCH 112/150] =?UTF-8?q?Fix=EF=BC=9A3261=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=89=B9=E8=89=B2?= =?UTF-8?q?=E5=BA=97=E9=93=BA=E8=B5=84=E6=96=99=E5=A1=AB=E5=86=99=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E5=90=8E=E7=82=B9=E5=87=BB=E6=8F=90=E4=BA=A4=E4=BC=9A?= =?UTF-8?q?=E5=86=8D=E6=AC=A1=E5=87=BA=E7=8E=B0=E5=85=A5=E9=A9=BB=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E9=A1=BB=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg_join/views/wholesaler.vue | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkg_join/views/wholesaler.vue b/pkg_join/views/wholesaler.vue index fe340d7..5fe2c9e 100644 --- a/pkg_join/views/wholesaler.vue +++ b/pkg_join/views/wholesaler.vue @@ -439,10 +439,7 @@ export default { this.form.areaId = values.district.id }, onSubmit() { - if(!this.isAgree) { - this.show = true - return - } + this.$refs.wholesalerForm.validate().then(res => { // 校验通过 saveWholesaler(this.form).then(res => { From 910991ad69000c8bf1de27e7c63e1a80e19bc234 Mon Sep 17 00:00:00 2001 From: linxi Date: Mon, 24 Feb 2025 17:42:24 +0800 Subject: [PATCH 113/150] =?UTF-8?q?Fix=EF=BC=9A3255=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=9C=B0=E5=9D=80?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=AD=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E5=90=8E=E8=B4=AD=E7=89=A9=E8=BD=A6=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=9C=B0=E5=9D=80=E6=9C=AA=E5=90=8C=E6=AD=A5=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E4=B8=8B=E6=8B=89=E5=88=B7=E6=96=B0=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E5=90=8E=E6=89=8D=E4=BC=9A=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/cart.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pages/cart.vue b/pages/cart.vue index 7bad227..bd9d0dc 100644 --- a/pages/cart.vue +++ b/pages/cart.vue @@ -452,6 +452,7 @@ export default { getAddressList({page: 1, limit: 9999}).then(res => { const { data = [] } = res this.addressList = data + this.addressInfo = data.find(e => e.isDefault == 1) || (data && data[0]) || null if (!this.addressInfo.id) { this.addressInfo = data.find(e => e.isDefault == 1) || (data && data[0]) || null } else { @@ -461,6 +462,7 @@ export default { isExist = true } }) + console.log(2, isExist); if (!isExist) { this.addressInfo = data.find(e => e.isDefault == 1) || (data && data[0]) || null } From 744e6d98f9c7c183aa23294bd18e1cf7299e7132 Mon Sep 17 00:00:00 2001 From: linxi Date: Mon, 24 Feb 2025 18:06:49 +0800 Subject: [PATCH 114/150] =?UTF-8?q?Fix=EF=BC=9A3246=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=82=B9=E5=87=BB?= =?UTF-8?q?=E6=B5=AE=E5=8A=A8=E5=85=B3=E9=94=AE=E8=AF=8D=E8=BF=9B=E5=85=A5?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=A1=86=E6=9C=AA=E5=9B=BA=E5=AE=9A=E6=98=BE=E7=A4=BA=E8=AF=A5?= =?UTF-8?q?=E5=85=B3=E9=94=AE=E8=AF=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/home/index.vue | 19 ++++++++++++++++--- pages/shop/GoodSearch/index.vue | 8 +++++++- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/pages/home/index.vue b/pages/home/index.vue index d369579..b99c3c1 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -23,7 +23,16 @@ /> - + + @@ -418,7 +427,8 @@ export default { isPlay: true, tabIconPostion: {}, messageIcon: {}, - recommendKeyword: [] + recommendKeyword: [], + keywordIndex: 0 } }, onLoad() { @@ -454,6 +464,9 @@ export default { this.scrollTop = e.scrollTop }, methods: { + changeRecommendKeyword(e) { + this.keywordIndex = e + }, getSearch() { getSearchPageConfig().then(res => { const { success, data } = res @@ -1376,7 +1389,7 @@ export default { } }, goGoodSearch() { - this.$yrouter.push('/pages/shop/GoodSearch/index') + this.$yrouter.push('/pages/shop/GoodSearch/index?keywords=' + this.recommendKeyword[this.keywordIndex] ) }, goGoodsCon(item) { if(item.isFarmerShop) { diff --git a/pages/shop/GoodSearch/index.vue b/pages/shop/GoodSearch/index.vue index 1ba30f5..0c38267 100644 --- a/pages/shop/GoodSearch/index.vue +++ b/pages/shop/GoodSearch/index.vue @@ -133,7 +133,8 @@ export default { historyKey: [], rankingArr: [], recommendKeyword: [], - CartCount: 0 + CartCount: 0, + keywords1: '' } }, computed: mapGetters(['isLogin', 'location', 'userInfo']), @@ -141,6 +142,9 @@ export default { this.getData() this.getCartCount() }, + onLoad(opts){ + this.keywords1 = opts.keywords + }, onShow() { this.getHistory() }, @@ -206,6 +210,8 @@ export default { this.rankingArr.push(data.ranking1) this.rankingArr.push(data.ranking2) this.recommendKeyword = data.recommendKeyword.split(',') + const index = this.recommendKeyword.indexOf(this.keywords1) + [this.recommendKeyword[0], this.recommendKeyword[index]] = [this.recommendKeyword[index], this.recommendKeyword[0]]; } }) }, From 12fa155630f03f250c0930202e5b320a2fb3b349 Mon Sep 17 00:00:00 2001 From: modendeveloper Date: Mon, 24 Feb 2025 21:42:50 +0800 Subject: [PATCH 115/150] =?UTF-8?q?Fix=EF=BC=9A=E6=94=B6=E7=A4=BC=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E7=82=B9=E5=87=BB=E5=A1=AB=E5=86=99=E5=9C=B0=E5=9D=80?= =?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/AddressList.vue | 13 +++++++++---- pkg_user/views/gift/components/GiftCard.vue | 5 ++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/pkg_user/views/gift/components/AddressList.vue b/pkg_user/views/gift/components/AddressList.vue index 6e2eef3..2cbe42b 100644 --- a/pkg_user/views/gift/components/AddressList.vue +++ b/pkg_user/views/gift/components/AddressList.vue @@ -37,8 +37,10 @@ - - 添加新地址 + + + 添加新地址 + @@ -114,7 +116,7 @@ export default { margin-bottom: 20rpx; } .address-list { - padding: 20rpx; + padding: 20rpx 20rpx 0rpx; width: 640rpx; height: 800rpx; overflow: auto; @@ -147,13 +149,16 @@ export default { } .add-btn { - margin-top: 30rpx; padding: 20rpx; text-align: center; background-color: #fff; border: 1rpx solid #ddd; border-radius: 100rpx; +} +.btn-wrap{ position: sticky; bottom: 0; + width: 100%; + padding: 20rpx 0; } \ 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 82fce00..cca3c8e 100644 --- a/pkg_user/views/gift/components/GiftCard.vue +++ b/pkg_user/views/gift/components/GiftCard.vue @@ -26,7 +26,7 @@ 去商城看看>> - + 填写地址并收下