From 7dcba7c04bb7f6a8f11a81d4cb15ac82271a2133 Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Wed, 1 Jul 2026 15:55:24 +0800 Subject: [PATCH 01/24] =?UTF-8?q?Fix(=E6=8A=BD=E5=A5=96):[#5396]=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg-video/views/county-lottery.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg-video/views/county-lottery.vue b/pkg-video/views/county-lottery.vue index e82e62d..6c21d1d 100644 --- a/pkg-video/views/county-lottery.vue +++ b/pkg-video/views/county-lottery.vue @@ -49,7 +49,7 @@ 奖品池 / prize pool - 实付满{{ buyThresholdText }}元即可获得抽奖码，定时统一开奖 + 实付满{{ buyThresholdText }}元（不包括优惠券金额）即可获得抽奖码，定时统一开奖 Date: Thu, 2 Jul 2026 09:34:56 +0800 Subject: [PATCH 02/24] =?UTF-8?q?Feat=EF=BC=9A=E5=8F=96=E6=B6=88=E9=80=80?= =?UTF-8?q?=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/order.js | 11 +++++++ pagesOrder/order/OrderDetails/index.vue | 38 +++++++++++++++++++++++-- 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/api/order.js b/api/order.js index 83dc391..18c0ca1 100644 --- a/api/order.js +++ b/api/order.js @@ -102,6 +102,17 @@ export function postOrderRefund(data) { return request.post("/order/refund/verify", data); } +/** + * 取消退款申请 + * @param uni + * @returns {*} + */ +export function cancelOrderRefund(uni) { + return request.post("/order/refund/cancel", { + uni + }); +} + /** * 确认收货 * @returns {*} diff --git a/pagesOrder/order/OrderDetails/index.vue b/pagesOrder/order/OrderDetails/index.vue index 75a6a23..b7ad3b9 100644 --- a/pagesOrder/order/OrderDetails/index.vue +++ b/pagesOrder/order/OrderDetails/index.vue @@ -554,8 +554,9 @@ @@ -1057,6 +1061,9 @@ export default { } return imgUrl; }, + isGiftOrder(order = {}) { + return Number(order.isGiftCardSend || 0) === 1 || Number(order.isGiftCardReceive || 0) === 1 + }, subscribePay() { uni.requestSubscribeMessage({ tmplIds: settings.SubscribeMessageTmplIds, From 47ac886d5dac1743f58f033fcdda1b6937645048 Mon Sep 17 00:00:00 2001 From: linxi <957440651@qq.com> Date: Tue, 14 Jul 2026 10:54:55 +0800 Subject: [PATCH 10/24] =?UTF-8?q?Fix=EF=BC=9A5451=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?=E6=9F=A5=E7=9C=8B=E8=B5=84=E8=AE=AF=E8=AF=A6=E6=83=85=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=88=97=E8=A1=A8=E9=A1=B5=E6=97=B6=EF=BC=8C=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E8=87=AA=E5=8A=A8=E6=BB=91=E5=8A=A8=E8=87=B3=E9=A1=B6?= =?UTF-8?q?=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pagesInn/inn/innHome.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pagesInn/inn/innHome.vue b/pagesInn/inn/innHome.vue index fc6fb98..7198152 100644 --- a/pagesInn/inn/innHome.vue +++ b/pagesInn/inn/innHome.vue @@ -588,7 +588,8 @@ export default { pageKeyId: '', shareImg: '', videoPlayers: [], - isView: false + isView: false, + skipRefreshOnShow: false } }, // 必须在页面加 onPageScroll(e){} ，才能滑动显示背景 @@ -679,6 +680,10 @@ export default { if (!this.isLoad) { return } + if (this.skipRefreshOnShow) { + this.skipRefreshOnShow = false + return + } this.fetchInnDetail() if(this.isView) return if(this.activeIndex === 1) { @@ -834,6 +839,7 @@ export default { }) }, infoClick: function (info) { + this.skipRefreshOnShow = true this.$yrouter.push('/pagesInn/inn/innInfoDetail?id=' + info.id) }, coverPlay(){ From ffadc6c501e3e0c4b2107f8a8ae06a2481f28c62 Mon Sep 17 00:00:00 2001 From: linxi <957440651@qq.com> Date: Tue, 14 Jul 2026 11:12:22 +0800 Subject: [PATCH 11/24] =?UTF-8?q?Fix=EF=BC=9A5448=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=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=9B=BE=E5=8C=BA=E5=9F=9F=E4=B8=8A=E4=BC=A0=E5=A4=9A?= =?UTF-8?q?=E5=BC=A0=E5=9B=BE=E7=89=87=EF=BC=8C=E8=AF=A6=E6=83=85=E5=9B=BE?= =?UTF-8?q?=E7=8E=B0=E5=9C=A8=E6=98=AF=E4=B8=80=E5=88=97=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=EF=BC=8C=E6=94=B9=E4=B8=BA=E4=B8=80=E8=A1=8C=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=EF=BC=8C=E5=8F=AF=E5=B7=A6=E5=8F=B3=E6=BB=91=E5=8A=A8=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E5=9B=BE=E7=89=87=EF=BC=8C=E4=B8=8D=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E8=BD=AE=E6=92=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/shop/GoodsCon/index.vue | 40 ------------------ .../views/famousQianxianGraphicGuide.vue | 41 ++++++++++++------- 2 files changed, 26 insertions(+), 55 deletions(-) diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue index 1d7d88b..e0e4a95 100644 --- a/pages/shop/GoodsCon/index.vue +++ b/pages/shop/GoodsCon/index.vue @@ -2258,43 +2258,3 @@ export default { word-break: keep-all; } -} -.gift-wrap{ - position: relative; -} -.gift-bg{ - position: absolute; - left: 0; - width: 100%; -} -.ll-text{ - margin-left: 250rpx; - word-break: keep-all; -} - -.gift-img{ - width: 34rpx; - height: 34rpx; - margin-right: 10rpx; -} -.gift-wrap{ - position: relative; -} -.gift-bg{ - position: absolute; - left: 0; - width: 100%; -} -.ll-text{ - margin-left: 250rpx; - word-break: keep-all; -} - - left: 0; - width: 100%; -} -.ll-text{ - margin-left: 250rpx; - word-break: keep-all; -} - diff --git a/pkg_product/views/famousQianxianGraphicGuide.vue b/pkg_product/views/famousQianxianGraphicGuide.vue index 5cd3733..36de40c 100644 --- a/pkg_product/views/famousQianxianGraphicGuide.vue +++ b/pkg_product/views/famousQianxianGraphicGuide.vue @@ -74,16 +74,23 @@ 定位：{{ item.address }} - - - + + + + + 暂无图文内容 @@ -248,21 +255,25 @@ export default { } .image-list { - display: flex; - flex-wrap: wrap; + display: inline-flex; + flex-wrap: nowrap; +} + +.image-scroll { + width: 100%; margin-top: 24rpx; + white-space: nowrap; } .detail-image { - width: calc(50% - 8rpx); + width: 280rpx; height: 220rpx; margin-right: 16rpx; - margin-bottom: 16rpx; border-radius: 16rpx; display: block; } -.detail-image:nth-child(2n) { +.detail-image:last-child { margin-right: 0; } From b4c1ea20ac4defd1548885c2c7037285aa7321f1 Mon Sep 17 00:00:00 2001 From: linxi <957440651@qq.com> Date: Tue, 14 Jul 2026 11:52:36 +0800 Subject: [PATCH 12/24] =?UTF-8?q?Fix=EF=BC=9A5420=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=8A=BD=E5=A5=96?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=B7=B2=E5=BC=80=E5=A5=96=E5=90=8E=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E9=80=80=E6=AC=BE=EF=BC=8C=E5=9C=A8=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E6=9F=A5=E7=9C=8B=E6=88=91=E7=9A=84=E6=8A=BD?= =?UTF-8?q?=E5=A5=96=E7=A0=81=EF=BC=8C=E2=80=9C=E5=A4=B1=E6=95=88=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0=EF=BC=9A=E8=AE=A2=E5=8D=95=E5=8F=96=E6=B6=88=E2=80=9D?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E2=80=9C=E6=B4=BB=E5=8A=A8=E5=B7=B2=E7=BB=93?= =?UTF-8?q?=E6=9D=9F=EF=BC=8C=E6=8A=BD=E5=A5=96=E7=A0=81=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=81=A2=E5=A4=8D=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg-video/views/county-my-tickets.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg-video/views/county-my-tickets.vue b/pkg-video/views/county-my-tickets.vue index c84a591..7b04e4c 100644 --- a/pkg-video/views/county-my-tickets.vue +++ b/pkg-video/views/county-my-tickets.vue @@ -284,8 +284,7 @@ export default { return [1, 2, -1].includes(Number(item.status)) && !!item.prizeName }, getInvalidReason(item) { - if (Number(item.claimStatus) === -1) return '奖品过期未领取' - return '订单取消' + return item.invalidReason || '' }, formatPrizeText(item = {}) { const prizeName = item.prizeName || '神秘奖品' From 6d963a5bc02974b09c2b702516ad95e010ad1408 Mon Sep 17 00:00:00 2001 From: linxi <957440651@qq.com> Date: Tue, 14 Jul 2026 14:06:41 +0800 Subject: [PATCH 13/24] =?UTF-8?q?Fix=EF=BC=9A5397=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=95=86=E5=93=81?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=EF=BC=8C=E8=BF=9E=E7=BB=AD=E5=BF=AB=E9=80=9F?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E2=80=9C=E9=80=81=E7=BB=99=E6=9C=8B=E5=8F=8B?= =?UTF-8?q?=E2=80=9D=EF=BC=8C=E9=87=8D=E5=A4=8D=E5=BC=B9=E5=87=BA=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E9=80=81=E7=A4=BC=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aiChat/mixins/chatMixinsV2.js | 15 +++++++++++ pages/order/OrderSubmission/index.vue | 38 ++++++++++++++++++--------- pages/shop/GoodsCon/index.vue | 16 ++++++++++- 3 files changed, 56 insertions(+), 13 deletions(-) diff --git a/aiChat/mixins/chatMixinsV2.js b/aiChat/mixins/chatMixinsV2.js index 224950a..a854680 100644 --- a/aiChat/mixins/chatMixinsV2.js +++ b/aiChat/mixins/chatMixinsV2.js @@ -51,6 +51,7 @@ export const chatMixinsV2 = { audioPlayId: '', showGiftBtn: false, buyLoading: false, + buyActionLock: false, exceptionConfig: { model_exception: '您提的问题未能理解，云灵思想跑偏啦，重新整理一下问题或者重新提问，让云灵再试试！', voice_exception: '' @@ -533,6 +534,10 @@ export const chatMixinsV2 = { this.productItemBuyNowOrGiftBuy(item, 2) }, productItemBuyNowOrGiftBuy(item, BuyNowOrGiftBuyType) { + if (this.buyActionLock) { + return + } + this.buyActionLock = true this.audioStopHandle() this.cart_num = 1 this.m_id = item.id @@ -540,6 +545,7 @@ export const chatMixinsV2 = { const { data } = res this.storeInfo = {...data.storeInfo} if(data.storeInfo.stock === 0) { + this.buyActionLock = false uni.showToast({ title: "产品库存不足，请选择其他商品", icon: "none", @@ -577,6 +583,14 @@ export const chatMixinsV2 = { return } this.attr.cartAttr = !this.isOpen ? true : false + this.buyActionLock = false + }).catch(error => { + this.buyActionLock = false + uni.showToast({ + title: error.msg || '操作失败，请稍后重试', + icon: "none", + duration: 3000 + }) }) }, buyNowOrGiftBuyReq(type) { @@ -617,6 +631,7 @@ export const chatMixinsV2 = { }) }).finally(() => { _this.buyLoading = false + _this.buyActionLock = false }) }, closeAttrWindow() { diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue index 040d3cd..47422d0 100644 --- a/pages/order/OrderSubmission/index.vue +++ b/pages/order/OrderSubmission/index.vue @@ -398,7 +398,8 @@ export default { pageKeyId: Object.freeze('orderConfirm'), total: 0, couponTitle: '', - hasCoupon: false + hasCoupon: false, + pageQuery: {} } }, computed: mapGetters(["userInfo", "storeItems"]), @@ -417,17 +418,18 @@ export default { }, onLoad(opts) { const that = this - if (that.$yroute.query.pinkid !== undefined) { - that.pinkId = that.$yroute.query.pinkid + that.pageQuery = Object.assign({}, that.resolvePageQuery(), opts || {}) + if (that.pageQuery.pinkid !== undefined) { + that.pinkId = that.pageQuery.pinkid } - if (that.$yroute.query.id !== undefined) { - that.cartid = that.$yroute.query.id + if (that.pageQuery.id !== undefined) { + that.cartid = that.pageQuery.id console.log(that.cartid) } - if (that.$yroute.query.lotteryRecordId !== undefined) { - that.lotteryRecordId = that.$yroute.query.lotteryRecordId + if (that.pageQuery.lotteryRecordId !== undefined) { + that.lotteryRecordId = that.pageQuery.lotteryRecordId } - that.hasCoupon = opts.couponId !== '' + that.hasCoupon = !!(opts && opts.couponId !== '') that.getCartInfo() }, onShow() { @@ -452,14 +454,26 @@ export default { }, methods: { isNullOrEmpty, + resolvePageQuery() { + if (this.$yroute && this.$yroute.query) { + return this.$yroute.query + } + if (this.$route && this.$route.query) { + return this.$route.query + } + if (this._route && this._route.query) { + return this._route.query + } + return {} + }, isLotteryOrder() { const cartInfo = Array.isArray(this.orderGroupInfo && this.orderGroupInfo.cartInfo) ? this.orderGroupInfo.cartInfo : [] return Boolean( this.lotteryRecordId || - this.$yroute.query.from === 'countyLottery' || - Number(this.$yroute.query.drawActivityId || 0) > 0 || + this.pageQuery.from === 'countyLottery' || + Number(this.pageQuery.drawActivityId || 0) > 0 || cartInfo.some(item => Number( item.drawActivityId || (item.productInfo && item.productInfo.drawActivityId) || @@ -567,8 +581,8 @@ export default { } _this.systemStore = data.systemStore || {} _this.storeSelfMention = data.storeSelfMention - if(_this.$yroute.query.address !== undefined ) { - _this.addressInfo = JSON.parse(_this.$yroute.query.address) || {} + if(_this.pageQuery.address !== undefined ) { + _this.addressInfo = JSON.parse(_this.pageQuery.address) || {} _this.computedPrice() } else { // _this.addressInfo = uni.getStorageSync('sourceAddress') || data.addressInfo || {} diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue index e0e4a95..5474dee 100644 --- a/pages/shop/GoodsCon/index.vue +++ b/pages/shop/GoodsCon/index.vue @@ -655,7 +655,8 @@ export default { pageKeyId: '', couponListLimit2ToShow: [], qualifications: [], - couponId: null + couponId: null, + submitActionLock: false } }, computed: mapGetters(['isLogin', 'location', 'userInfo']), @@ -821,6 +822,7 @@ export default { } }, onShow() { + this.submitActionLock = false this.getMapData() getGiftCardSendBackground().then(res => { if (res.status === 200) { @@ -1500,6 +1502,10 @@ export default { q.drawActivityId = Number(this.activityId || 0) break } + if (that.submitActionLock) { + return + } + that.submitActionLock = true postCartAdd(q).then(function (res) { that.isOpen = false that.attr.cartAttr = false @@ -1516,6 +1522,9 @@ export default { path: "/pages/order/OrderSubmission/index", query: orderQuery }) + setTimeout(() => { + that.submitActionLock = false + }, 1500) return } if(news === 2) { @@ -1532,8 +1541,12 @@ export default { // + '&couponId=' + coupId url: giftUrl }) + setTimeout(() => { + that.submitActionLock = false + }, 1500) } if(news === 0) { + that.submitActionLock = false uni.showToast({ title: "添加购物车成功", icon: "success", @@ -1546,6 +1559,7 @@ export default { } }).catch(error => { that.isOpen = false; + that.submitActionLock = false uni.showToast({ title: error.msg, icon: "none", From 8f7ff49641c3ba86ad4704b413e4746e951c0bce Mon Sep 17 00:00:00 2001 From: linxi <957440651@qq.com> Date: Tue, 14 Jul 2026 14:17:31 +0800 Subject: [PATCH 14/24] =?UTF-8?q?Fix=EF=BC=9A5371=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=84=E9=80=89?= =?UTF-8?q?=E5=A5=BD=E7=A4=BC=E5=AF=B9=E5=BA=94=E5=88=86=E7=B1=BB=E4=B8=8B?= =?UTF-8?q?=E6=97=A0=E5=95=86=E5=93=81=E4=B8=8D=E4=BC=9A=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/home/newZone.vue | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/pages/home/newZone.vue b/pages/home/newZone.vue index c185413..a76ff92 100644 --- a/pages/home/newZone.vue +++ b/pages/home/newZone.vue @@ -36,7 +36,7 @@ - + @@ -53,6 +53,9 @@ + + 暂无数据 + { this.details = res.data - this.tabs = res.data.categories - this.handleClick(0, this.tabs[0]) + this.tabs = Array.isArray(res.data.categories) ? res.data.categories : [] + if (this.tabs.length > 0) { + this.handleClick(0, this.tabs[0]) + } else { + this.products = [] + } }) }, computed: { @@ -112,7 +119,7 @@ export default{ methods: { handleClick(index, tab) { this.activeIndex = index - this.products = tab.products + this.products = Array.isArray(tab && tab.products) ? tab.products : [] }, handleChange(e) { this.current = e.detail.current @@ -144,6 +151,17 @@ export default{ justify-content: space-between; flex-wrap: wrap; } +.empty-wrap{ + min-height: 260rpx; + display: flex; + align-items: center; + justify-content: center; +} +.empty-text{ + font-size: 28rpx; + color: #999999; + text-align: center; +} .tab-line{ position: absolute; bottom: 0; From 62e7776b64c67163b08ec560ffe7f602441a15a9 Mon Sep 17 00:00:00 2001 From: linxi <957440651@qq.com> Date: Tue, 14 Jul 2026 14:21:38 +0800 Subject: [PATCH 15/24] =?UTF-8?q?Fix=EF=BC=9A5349=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=E9=A1=B6=E9=83=A8?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E2=80=9C=E7=89=B9=E8=89=B2=E7=A4=BC=E5=93=81?= =?UTF-8?q?=E2=80=9D=E4=BF=AE=E6=94=B9=E4=B8=BA=E2=80=9C=E5=85=A8=E5=9B=BD?= =?UTF-8?q?=E7=A4=BC=E5=93=81=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages.json b/pages.json index b386bc3..92728cc 100644 --- a/pages.json +++ b/pages.json @@ -490,7 +490,7 @@ { "path": "views/giftList", "style": { - "navigationBarTitleText": "特色礼品" + "navigationBarTitleText": "全国礼品" } }, { From 956d7bf70b286eb40cdb474a50c99e336b7e25d0 Mon Sep 17 00:00:00 2001 From: linxi <957440651@qq.com> Date: Tue, 14 Jul 2026 14:28:00 +0800 Subject: [PATCH 16/24] =?UTF-8?q?Fix=EF=BC=9A5176=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=9C=81=E7=BA=A7?= =?UTF-8?q?=E5=AF=BC=E8=88=AA=E5=9C=A8=E6=90=9C=E7=B4=A2=E6=97=A0=E6=95=88?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=97=B6=E6=97=A0=E5=8F=8D=E9=A6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/chose-city/chose-city.vue | 8 +++++++- pkg_product/views/healthList.vue | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pages/chose-city/chose-city.vue b/pages/chose-city/chose-city.vue index ce34a9c..189d361 100644 --- a/pages/chose-city/chose-city.vue +++ b/pages/chose-city/chose-city.vue @@ -385,7 +385,7 @@ export default { }, search() { if(this.keyword === '') return - this.listGroup.findIndex((group, index) => { + const matchIndex = this.listGroup.findIndex((group, index) => { let result group.city.forEach(item => { result = item.cityName.indexOf(this.keyword, 0) @@ -398,6 +398,12 @@ export default { return result } }) + if (matchIndex === -1) { + uni.showToast({ + title: '未找到该城市，请重新输入城市名称', + icon: 'none' + }) + } }, select(item) { if (this.type === 0 && item.hasData === 0) return diff --git a/pkg_product/views/healthList.vue b/pkg_product/views/healthList.vue index 86837c3..0224766 100644 --- a/pkg_product/views/healthList.vue +++ b/pkg_product/views/healthList.vue @@ -309,6 +309,10 @@ export default { // console.log(searchMap); const filterMap = searchMap.filter(el => el.cityName.includes(this.keyword)) if(filterMap.length === 0) { + uni.showToast({ + title: '未找到该城市，请重新输入城市名称', + icon: 'none' + }) return } else { this.asideIndex = filterMap[0].index From 55ed80acbc14a7f63335832e4709c5463c7b43bf Mon Sep 17 00:00:00 2001 From: linxi <957440651@qq.com> Date: Tue, 14 Jul 2026 14:36:03 +0800 Subject: [PATCH 17/24] =?UTF-8?q?Fix=EF=BC=9A5174=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=B8=B8=E5=AE=A2?= =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E7=9B=B4=E6=8E=A5=E7=82=B9=E5=87=BB=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=BA=95=E9=83=A8=E3=80=90=E5=AE=A2=E6=9C=8D=E3=80=91?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=B9=B6=E5=8F=91=E9=80=81=E6=96=87=E5=AD=97?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E7=A9=BA?= =?UTF-8?q?=E7=99=BD=EF=BC=8C=E4=B8=94=E6=9C=AA=E5=BC=B9=E5=87=BA=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E5=BC=95=E5=AF=BC=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/shop/GoodsCon/index.vue | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue index 5474dee..e2142d0 100644 --- a/pages/shop/GoodsCon/index.vue +++ b/pages/shop/GoodsCon/index.vue @@ -540,7 +540,7 @@ import { getProductSkuBySelected } from '@/api/store' import { userBindParent } from '@/api/user' -import { handleQrCode, isWeixin } from '@/utils' +import { handleLoginFailure, handleQrCode, isWeixin } from '@/utils' import { getHomeData } from '@/api/public' import { getDailyGoods, @@ -878,6 +878,15 @@ export default { }) }, goRoom() { + if (!this.isLogin) { + uni.showToast({ + title: '请先登录后联系客服', + icon: 'none', + duration: 2000 + }) + handleLoginFailure() + return + } console.log(this.storeInfo); const params = { goodsId: this.id, From 76a877f2c2c591c28d3184c2e9cbe33a8bcf1649 Mon Sep 17 00:00:00 2001 From: linxi <957440651@qq.com> Date: Tue, 14 Jul 2026 17:19:39 +0800 Subject: [PATCH 18/24] =?UTF-8?q?Fix=EF=BC=9A=E2=80=85=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=89=80=E6=9C=89=E6=8C=89=E9=92=AE=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E9=83=BD=E6=B2=A1=E5=8F=8D=E5=BA=94=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/MyOrder/index.vue | 210 ++++++++++++++++++++++++++-------- 1 file changed, 160 insertions(+), 50 deletions(-) diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue index 9993449..717ccf3 100644 --- a/pages/order/MyOrder/index.vue +++ b/pages/order/MyOrder/index.vue @@ -61,7 +61,7 @@ v-if="order.experienceOrderInfo" class="shop-info flex jc-between ai-center" style="padding-bottom: 0" - @click.stop="goStore(order)" + @click.stop="goStore(orderListIndex)" > {{ (order.isGiftCardSend || order.isGiftCardReceive) ? '礼包' : (getStatus(order) || (order._status && order._status._title) || '已完成') }} - + 联系商家 去使用 删除订单 更多 联系商家 申请退款 @@ -378,7 +378,7 @@ 联系客服 @@ -389,18 +389,18 @@ parseInt(order._status._type) !== 9 " class="bnt service" - @click="goRoom(order)" + @click="goRoom(orderListIndex)" >联系商家 查看详情 删除订单 @@ -411,61 +411,61 @@ @@ -505,7 +505,7 @@ 联系商家 @@ -519,14 +519,14 @@ " open-type="share" class="gift-btn service v12-primary-text v12-primary-border" - @click="shareGift(order)" + @click="shareGift(orderListIndex)" >送给朋友 - 查看详情 + 查看详情 @@ -930,12 +930,28 @@ export default { uni.hideLoading(); }) }, - editTime(order) { + editTime(orderOrIndex) { + const order = this.getOrderByIndex(orderOrIndex) + if (!order) { + uni.showToast({ + title: '订单信息异常', + icon: 'none' + }) + return + } this.showDatePicker = true this.travelGroupOrderInfo = order.travelGroupOrderInfo this.orderInfo = order }, - applyRefund(order) { + applyRefund(orderOrIndex) { + const order = this.getOrderByIndex(orderOrIndex) + if (!order) { + uni.showToast({ + title: '订单信息异常', + icon: 'none' + }) + return + } // 这里可以添加申请退款的逻辑，比如跳转到退款页面 uni.navigateTo({ url: '/pkg_product/views/sojoumOrderRefund?id=' + order.orderId @@ -951,8 +967,16 @@ export default { } return timeMap[type] }, - shareGift(item) { - this.giftItem = item + shareGift(orderOrIndex) { + const order = this.getOrderByIndex(orderOrIndex) + if (!order) { + uni.showToast({ + title: '订单信息异常', + icon: 'none' + }) + return + } + this.giftItem = order }, getGiftTips(giftCardInfo) { // giftCardStatus int 礼品卡状态 0-未领取 1-已领取 2-已失效 @@ -983,12 +1007,30 @@ export default { }) this.$forceUpdate() }, - delOrder(order) { + getOrderByIndex(orderOrIndex) { + if (typeof orderOrIndex === 'number') { + return this.orderList[orderOrIndex] + } + if (typeof orderOrIndex === 'string' && /^\d+$/.test(orderOrIndex)) { + return this.orderList[Number(orderOrIndex)] + } + return orderOrIndex + }, + delOrder(orderOrIndex) { + const order = this.getOrderByIndex(orderOrIndex) + if (!order) { + uni.showToast({ + title: '订单信息异常', + icon: 'none' + }) + return + } delOrderHandle(order.orderId).then(() => { this.changeType() }) }, - goStore(order) { + goStore(orderOrIndex) { + const order = this.getOrderByIndex(orderOrIndex) if (!order) { return } @@ -1070,14 +1112,30 @@ export default { this.toYuePay(payPwd) this.isShowPayPwdPop = false }, - subscribePay(order) { + subscribePay(orderOrIndex) { + const order = this.getOrderByIndex(orderOrIndex) + if (!order) { + uni.showToast({ + title: '订单信息异常', + icon: 'none' + }) + return + } this.orderInfo = order uni.requestSubscribeMessage({ tmplIds: settings.SubscribeMessageTmplIds, complete: () => this.pay = true }) }, - addressTap(order) { + addressTap(orderOrIndex) { + const order = this.getOrderByIndex(orderOrIndex) + if (!order) { + uni.showToast({ + title: '订单信息异常', + icon: 'none' + }) + return + } this._orderId = order.orderId uni.setStorageSync('updateOrderSourceAddress', { id: order.addressId || order.userAddressId || '', @@ -1095,7 +1153,8 @@ export default { force2Decimal(v) { return this.$force2Decimal(v) }, - callMerPhone(order) { + callMerPhone(orderOrIndex) { + const order = this.getOrderByIndex(orderOrIndex) const phone = String((order && order.merPhone) || '').trim() if (!phone) { uni.showToast({ @@ -1108,10 +1167,17 @@ export default { phoneNumber: phone }) }, - goRoom(order) { - console.log(order); + goRoom(orderOrIndex) { + const order = this.getOrderByIndex(orderOrIndex) + if (!order) { + uni.showToast({ + title: '订单信息异常', + icon: 'none' + }) + return + } if (order.experienceOrderInfo) { - const phone = order.merchantPhone || order.merPhone || order.experienceOrderInfo.phone || order.companyTel; + const phone = order.merchantPhone || order.merPhone || order.experienceOrderInfo.phone || order.companyTel if (phone) { uni.makePhoneCall({ phoneNumber: phone @@ -1142,7 +1208,15 @@ export default { url: `/pkg_common/views/room?id=${order.merId}&name=${order.merName}¶ms=${JSON.stringify(params)}` }) }, - goRefund(order) { + goRefund(orderOrIndex) { + const order = this.getOrderByIndex(orderOrIndex) + if (!order) { + uni.showToast({ + title: '订单信息异常', + icon: 'none' + }) + return + } // fix bug#1631 if (this.type === 4 || parseInt(order._status._type) === 3) { // 打开售后的目的就是开启已完成/待评价订单的退款功能，确认打开售后之后，小程序用户再点击申请退款，就可以进入退款申请填写页面，正常走退款流程，提交退款申请以后，订单状态变为退款中 @@ -1164,7 +1238,15 @@ export default { }) } }, - goLogistics(order) { + goLogistics(orderOrIndex) { + const order = this.getOrderByIndex(orderOrIndex) + if (!order) { + uni.showToast({ + title: '订单信息异常', + icon: 'none' + }) + return + } this.$yrouter.push({ path: "/pagesOrder/order/Logistics/index", query: { @@ -1172,7 +1254,15 @@ export default { } }); }, - goOrderDetails(order) { + goOrderDetails(orderOrIndex) { + const order = this.getOrderByIndex(orderOrIndex) + if (!order) { + uni.showToast({ + title: '订单信息异常', + icon: 'none' + }) + return + } if (order.experienceOrderInfo) { this.$yrouter.push({ path: "/pkg_product/views/experienceCouponOrderDetail", @@ -1238,7 +1328,15 @@ export default { this.orderData = res.data }) }, - takeOrder(order) { + takeOrder(orderOrIndex) { + const order = this.getOrderByIndex(orderOrIndex) + if (!order) { + uni.showToast({ + title: '订单信息异常', + icon: 'none' + }) + return + } const that = this uni.showModal({ title: '是否确认收货?', @@ -1369,7 +1467,11 @@ export default { uni.hideLoading() }); }, - tapShowMore(order, index) { + tapShowMore(index) { + const order = this.getOrderByIndex(index) + if (!order) { + return + } order.showMore = !order.showMore; this.$set(this.orderList, index, order); }, @@ -1409,7 +1511,15 @@ export default { } return status }, - cancelOrder(order) { + cancelOrder(orderOrIndex) { + const order = this.getOrderByIndex(orderOrIndex) + if (!order) { + uni.showToast({ + title: '订单信息异常', + icon: 'none' + }) + return + } cancelOrderHandle(order.orderId).then(() => { this.getOrderData(); this.orderList.splice(this.orderList.indexOf(order), 1) From 6c851d4f2990e1395c70c3a6a430133653007478 Mon Sep 17 00:00:00 2001 From: linxi <957440651@qq.com> Date: Tue, 21 Jul 2026 16:56:39 +0800 Subject: [PATCH 19/24] =?UTF-8?q?Fix=EF=BC=9A5484=20=E3=80=90=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E9=93=BE=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=8E=BF=E5=9F=9F=E4=BB=A3=E7=90=86=E5=95=86=E7=9A=84?= =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E7=A0=81=EF=BC=8C=E5=85=A5=E9=A9=BB=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=8E=A5=E5=8F=A3=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8?= =?UTF-8?q?=EF=BC=8C=E5=BA=94=E6=98=BE=E7=A4=BA=E6=89=80=E6=9C=89=E5=85=A5?= =?UTF-8?q?=E9=A9=BB=E6=8E=A5=E5=8F=A3=EF=BC=88=E9=80=9A=E8=BF=87=E5=8E=BF?= =?UTF-8?q?=E5=9F=9F=E4=BB=A3=E7=90=86=E5=95=86=E5=85=A5=E9=A9=BB=EF=BC=8C?= =?UTF-8?q?=E5=9D=87=E5=AD=98=E5=9C=A8=E4=B8=8A=E4=B8=8B=E7=BA=A7=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E5=85=B3=E7=B3=BB=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg_join/views/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg_join/views/index.vue b/pkg_join/views/index.vue index ce1a9e3..9db3c50 100644 --- a/pkg_join/views/index.vue +++ b/pkg_join/views/index.vue @@ -6,21 +6,21 @@ mode="scaleToFill" /> Date: Tue, 21 Jul 2026 17:01:25 +0800 Subject: [PATCH 20/24] =?UTF-8?q?Fix=EF=BC=9A5485=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=AE=80=E4=BB=8B?= =?UTF-8?q?=E5=92=8C=E5=AE=9A=E4=BD=8D=E7=9A=84=E6=96=87=E5=AD=97=E8=B0=83?= =?UTF-8?q?=E5=A4=A7=E4=B8=80=E7=82=B9=EF=BC=8C=E5=8A=A0=E5=A4=A71?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg_product/views/famousQianxianGraphicGuide.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg_product/views/famousQianxianGraphicGuide.vue b/pkg_product/views/famousQianxianGraphicGuide.vue index 36de40c..7e21f39 100644 --- a/pkg_product/views/famousQianxianGraphicGuide.vue +++ b/pkg_product/views/famousQianxianGraphicGuide.vue @@ -218,7 +218,7 @@ export default { margin-top: 20rpx; padding: 20rpx 0rpx; border-radius: 16rpx; - font-size: 28rpx; + font-size: 30rpx; line-height: 44rpx; color: #333; font-weight: bold; @@ -241,7 +241,7 @@ export default { display: flex; align-items: center; margin-top: 16rpx; - font-size: 26rpx; + font-size: 30rpx; line-height: 40rpx; color: #333; font-weight: bold; From 50363edc6e4585492cc4a38c5f35dc40bbd1674f Mon Sep 17 00:00:00 2001 From: linxi <957440651@qq.com> Date: Tue, 21 Jul 2026 17:09:35 +0800 Subject: [PATCH 21/24] =?UTF-8?q?Fix=EF=BC=9A5498=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=B0=86=E6=8A=BD?= =?UTF-8?q?=E5=A5=96=E5=95=86=E5=93=81=E5=8A=A0=E5=85=A5=E8=B4=AD=E7=89=A9?= =?UTF-8?q?=E8=BD=A6=EF=BC=8C=E4=BB=8E=E8=B4=AD=E7=89=A9=E8=BD=A6=E8=BF=9B?= =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=E9=A1=B5=EF=BC=8C=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E3=80=90=E9=80=81=E7=BB=99=E6=9C=8B=E5=8F=8B=E3=80=91?= =?UTF-8?q?=E4=BB=8D=E5=8F=AF=E4=BD=BF=E7=94=A8=E4=BC=98=E6=83=A0=E5=88=B8?= =?UTF-8?q?=EF=BC=8C=E6=94=B9=E4=B8=BA=E4=B8=8D=E5=8F=AF=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/shop/GoodsCon/index.vue | 21 ++++++++++++++---- pkg_user/views/gift/gift.vue | 40 +++++++++++++++++++++++++++++++---- 2 files changed, 53 insertions(+), 8 deletions(-) diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue index e2142d0..b2bd15f 100644 --- a/pages/shop/GoodsCon/index.vue +++ b/pages/shop/GoodsCon/index.vue @@ -732,6 +732,7 @@ export default { console.log("getLaunchOptionsSync", uni.getLaunchOptionsSync()) console.log("getEnterOptionsSync", uni.getEnterOptionsSync()) uni.removeStorageSync('couponId') + const pageQuery = Object.assign({}, this.resolvePageQuery(), options || {}) const from = options.from const id = options.id switch (from) { @@ -779,10 +780,10 @@ export default { if (url && url.productId) { this.id = url.productId } else if (options.id) { - this.id = options.id || null - this.partnerId = options.partnerId || null - this.activityId = this._route.query.activityId - this.source = this._route.query.from || '' + this.id = pageQuery.id || options.id || null + this.partnerId = pageQuery.partnerId || options.partnerId || null + this.activityId = Number(pageQuery.activityId || pageQuery.drawActivityId || 0) + this.source = pageQuery.from || '' } else { const obj = uni.getEnterOptionsSync() if (options.scene != null || obj.query.scene != null) { @@ -847,6 +848,18 @@ export default { } }, methods: { + resolvePageQuery() { + if (this.$yroute && this.$yroute.query) { + return this.$yroute.query + } + if (this.$route && this.$route.query) { + return this.$route.query + } + if (this._route && this._route.query) { + return this._route.query + } + return {} + }, gift() { this.goCat(2) }, diff --git a/pkg_user/views/gift/gift.vue b/pkg_user/views/gift/gift.vue index 04568d3..dd26b6a 100644 --- a/pkg_user/views/gift/gift.vue +++ b/pkg_user/views/gift/gift.vue @@ -299,11 +299,12 @@ export default { } }, onLoad(opts) { - this.cartId = opts.cartId - this.isGroupBuy = opts.isGroupBuy === '1' - this.isCountyLotteryGift = opts.from === 'countyLottery' || opts.isCountyLotteryGift === '1' || !!opts.drawActivityId + const pageQuery = Object.assign({}, this.resolvePageQuery(), opts || {}) + this.cartId = pageQuery.cartId + this.isGroupBuy = pageQuery.isGroupBuy === '1' + this.isCountyLotteryGift = pageQuery.from === 'countyLottery' || pageQuery.isCountyLotteryGift === '1' || !!pageQuery.drawActivityId // this.couponId = opts.couponId || 0 - this.discount = opts.discount + this.discount = pageQuery.discount if(this.isGroupBuy) { this.getGroupBuyInfo() } else { @@ -332,10 +333,39 @@ export default { } }, methods: { + resolvePageQuery() { + if (this.$yroute && this.$yroute.query) { + return this.$yroute.query + } + if (this.$route && this.$route.query) { + return this.$route.query + } + if (this._route && this._route.query) { + return this._route.query + } + return {} + }, getCouponId() { if (this.isCountyLotteryGift) return 0 return this.couponId || 0 }, + isCountyLotteryCartItem(item) { + return Number( + (item && item.drawActivityId) || + (item && item.productInfo && item.productInfo.drawActivityId) || + 0 + ) > 0 + }, + syncCountyLotteryGiftFlag(item) { + if (!this.isCountyLotteryGift && this.isCountyLotteryCartItem(item)) { + this.isCountyLotteryGift = true + } + if (!this.isCountyLotteryGift) return + this.couponTitle = '' + if (Number(this.couponId || 0) !== 0) { + this.couponId = 0 + } + }, adjustCoverListForProductStory(coverList, productInfo, defaultTemplate) { if (!productInfo || !productInfo.productStory) { return { @@ -436,6 +466,7 @@ export default { this.giftNotice = res.data.giftCardGiftNotice this.orderKey = res.data.orderKey this.goodsInfo = goodsInfo + this.syncCountyLotteryGiftFlag(goodsInfo) this.templateId = template.id this.defaultIndex = this.coverList.findIndex(item => item.id === this.templateId) console.log(this.defaultIndex, 'defaultIndex'); @@ -522,6 +553,7 @@ export default { this.giftNotice = res.data.giftCardGiftNotice this.orderKey = res.data.orderKey this.goodsInfo = goodsInfo + this.syncCountyLotteryGiftFlag(goodsInfo) this.templateId = template.id this.selectedCover = template.cover this.giftImage = template.image From 51e9d8b9663d709ac28f829248f8f22e892ba625 Mon Sep 17 00:00:00 2001 From: linxi <957440651@qq.com> Date: Tue, 21 Jul 2026 17:14:13 +0800 Subject: [PATCH 22/24] =?UTF-8?q?Fix=EF=BC=9A5535=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=85=A8=E5=9B=BD?= =?UTF-8?q?=E7=89=B9=E4=BA=A7=E3=80=81=E6=96=87=E7=8E=A9=E8=89=BA=E6=9C=AF?= =?UTF-8?q?=E6=9D=BF=E5=9D=97=E7=9A=84=E7=9C=81=E7=BA=A7=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=90=9C=E7=B4=A2=E6=A0=8F=EF=BC=8C=E5=9C=A8?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9C=89=E6=95=88=E5=90=8D=E7=A7=B0=E6=97=B6?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E2=80=9C=E6=9C=AA=E6=89=BE=E5=88=B0=E8=AF=A5?= =?UTF-8?q?=E5=9F=8E=E5=B8=82=EF=BC=8C=E8=AF=B7=E9=87=8D=E6=96=B0=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E5=9F=8E=E5=B8=82=E5=90=8D=E7=A7=B0=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/chose-city/chose-city.vue | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/pages/chose-city/chose-city.vue b/pages/chose-city/chose-city.vue index 189d361..3e80905 100644 --- a/pages/chose-city/chose-city.vue +++ b/pages/chose-city/chose-city.vue @@ -384,20 +384,17 @@ export default { this.mescroll && this.mescroll.triggerDownScroll() }, search() { - if(this.keyword === '') return - const matchIndex = this.listGroup.findIndex((group, index) => { - let result - group.city.forEach(item => { - result = item.cityName.indexOf(this.keyword, 0) - if (result !== -1) { - this.asideTap(index); - return null; - } - }) - if (result !== -1) { - return result - } + const keyword = (this.keyword || '').trim() + if (!keyword) return + const matchIndex = this.listGroup.findIndex(group => { + const cityList = Array.isArray(group.city) ? group.city : [] + return cityList.some(item => item && item.cityName && item.cityName.indexOf(keyword) !== -1) }) + if (matchIndex !== -1) { + this.keyword = keyword + this.asideTap(matchIndex) + return + } if (matchIndex === -1) { uni.showToast({ title: '未找到该城市，请重新输入城市名称', From 3cd6f29e322c10a9083ebff7b865ce8cd8c766dd Mon Sep 17 00:00:00 2001 From: linxi <957440651@qq.com> Date: Tue, 21 Jul 2026 17:19:33 +0800 Subject: [PATCH 23/24] =?UTF-8?q?Fix:5536=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=E8=AE=A2=E5=8D=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E7=82=B9=E5=87=BB=E5=95=86=E5=93=81=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E4=B9=8B=E5=89=8D=E6=98=AF=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E8=BF=9B=E5=85=A5=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=E7=9A=84?= =?UTF-8?q?=EF=BC=8C=E7=8E=B0=E5=9C=A8=E7=82=B9=E5=87=BB=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E8=BF=9B=E5=85=A5=E5=95=86=E5=93=81=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/order/MyOrder/index.vue | 54 ++++++++++++++++++++++++++++++----- 1 file changed, 47 insertions(+), 7 deletions(-) diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue index 717ccf3..79a070d 100644 --- a/pages/order/MyOrder/index.vue +++ b/pages/order/MyOrder/index.vue @@ -254,22 +254,22 @@ @@ -1299,9 +1299,39 @@ export default { } } }, - gotoGoodDetail(cart, type, query){ + gotoGoodDetail(orderOrIndex, cartOrIndex) { + const order = this.getOrderByIndex(orderOrIndex) + const cartList = Array.isArray(order && order.cartInfo) ? order.cartInfo : [] + const cart = typeof cartOrIndex === 'number' ? cartList[cartOrIndex] : cartOrIndex + if (!cart) { + uni.showToast({ + title: '未获取到商品信息', + icon: 'none' + }) + return + } + const productInfo = cart.productInfo || {} + let type = 1 + let id = productInfo.id || cart.productId || '' + if (Number(cart.combinationId) > 0) { + type = 2 + id = cart.combinationId + } else if (Number(cart.bargainId) > 0) { + type = 3 + id = cart.bargainId + } else if (Number(cart.seckillId) > 0) { + type = 4 + id = cart.seckillId + } + if (!id) { + uni.showToast({ + title: '未获取到商品详情参数', + icon: 'none' + }) + return + } // isProductStillExist:0-不存在,1-存在 - const isProductStillExist = cart.isProductStillExist || 0 + const isProductStillExist = Number(cart.isProductStillExist || 0) if (isProductStillExist === 0) { this.$dialog.toast({ mes: '商品已下架' }) return @@ -1321,7 +1351,17 @@ export default { path = '/pages/activity/SeckillDetails/index' break } - this.$yrouter.push({ path, query }) + if (!path) { + uni.showToast({ + title: '未找到商品详情页', + icon: 'none' + }) + return + } + this.$yrouter.push({ + path, + query: { id } + }) }, getOrderData() { getOrderData().then(res => { From 37ba27010484bda2997b5a1c2e92f940107bb413 Mon Sep 17 00:00:00 2001 From: linxi <957440651@qq.com> Date: Tue, 21 Jul 2026 17:26:32 +0800 Subject: [PATCH 24/24] =?UTF-8?q?Fix=EF=BC=9A5550=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=8D=83=E5=8E=BF?= =?UTF-8?q?=E5=9B=BE=E6=96=87=E6=94=BB=E7=95=A5=EF=BC=8C=20=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=90=8E=E5=8F=B0=E4=B8=8A=E4=BC=A0=E7=9A=84=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E5=9C=A8=E9=A6=99=E9=81=93=E6=BB=87=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E7=AB=AF=E5=9B=BE=E7=89=87=E6=98=BE=E7=A4=BA=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg_product/views/famousQianxianGraphicGuide.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg_product/views/famousQianxianGraphicGuide.vue b/pkg_product/views/famousQianxianGraphicGuide.vue index 7e21f39..6ccda8c 100644 --- a/pkg_product/views/famousQianxianGraphicGuide.vue +++ b/pkg_product/views/famousQianxianGraphicGuide.vue @@ -184,7 +184,7 @@ export default { .banner-swiper, .banner-fallback { width: 100%; - height: 500rpx; + height: 750rpx; } .banner-image { @@ -267,7 +267,7 @@ export default { .detail-image { width: 280rpx; - height: 220rpx; + height: 280rpx; margin-right: 16rpx; border-radius: 16rpx; display: block;